样式调整

src/app/app.component.ts

@@ -77,13 +77,6 @@ export class AppComponent implements OnInit, OnDestroy {
       }
     });
 
-    // 查询是否有续期提醒订单
-    if(sessionStorage.getItem('hadView')){
-      this.viewStatus = 1;
-    }else{
-      this.queryNoticeList();
-    }
-
     this.getVersion();
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart) {
@@ -102,8 +95,16 @@ export class AppComponent implements OnInit, OnDestroy {
           this.selectedMenuKey = 2
         }else if(event.url.indexOf('/todo')===0){
           this.selectedMenuKey = 3
-        }else if(event.url == '/'){
+        }else if(event.url == '/' || event.url == '/my'){
           this.selectedMenuKey = 1
+          // 查询是否有续期提醒订单
+          if(sessionStorage.getItem('hadView')){
+            this.viewStatus = 1;
+          }else{
+            if(this.lifeCustomerInfo){
+              this.queryNoticeList();
+            }
+          }
         }else if(event.url.indexOf('/mine')===0){
           this.selectedMenuKey = 4
         }else{

src/app/my/mine/mine.component.html

 
 <section class="header">
-  <div class="topContent">
-    <i class="iconfont icon-fanhui"></i>
+  <!-- <div class="topContent">
+    <i></i>
     <i [routerLink]="'/news'">
       <img src="assets/images/indexIcons/news.png" alt="" srcset="">
     </i>
-  </div>
+  </div> -->
 
     <!--头部经纪人信息START-->
   <div class="brokerInfoContent">

src/app/my/mine/mine.component.scss

@@ -66,6 +66,7 @@
     padding-left: 16px;
     padding-right: 15px;
     padding-bottom: 100px;
+    padding-top: 10px;
     .topContent{
         padding-top: 10px;
         display: flex;

src/app/my/mine/mine.component.ts

@@ -16,6 +16,7 @@ export class MineComponent implements OnInit {
     {id:3,name:'新人入口',link:'/newPeople',params:null},
     {id:4,name:'我的薪资',link:'/salary',params:null},
     {id:5,name:'我的积分',link:'/integration',params:null},
+    {id:6,name:'我的消息',link:'/news',params:null},
   ]
   performanceList:Array<any>;
   performanceSelectedFlag: string = '1';

src/app/my/my-center-home/my-center-home.component.html

@@ -90,8 +90,8 @@
 </section>
 
 <!-- 未开放模块弹窗 -->
-<Modal [(ngModel)]="this.state.modal1" [transparent]="true" [closable]="true" (onClose)="onClose('modal1')">
-  <div [ngStyle]="{ height: 100, overflow: 'scroll' }">
+<Modal [(ngModel)]="this.state.modal1" [transparent]="true" [maskClosable]="true" (onClose)="onClose('modal1')">
+  <div [ngStyle]="{ height: 100, overflow: 'scroll',color:'#000' }">
     此模块暂未开放，敬请期待。
   </div>
 </Modal>
\ No newline at end of file

src/app/my/my-news/my-news.component.scss

 .wrapper{
     position: relative;
     width: 100%;
-    height: 100%;
+    height: calc(100vh - 70px);
     padding: 10px 5px;
     background: #efefef;
     .item{

src/app/my/my-routing.module.ts

@@ -111,7 +111,7 @@ const myRoutes: Routes = [
   { path: 'target', component: MyTargetComponent, canActivate: [AuthGuard],data:[{title:'目标设置'}] },
   { path: 'teamPanel', component: TeamPanelComponent, canActivate: [AuthGuard],data:[{title:'我的团队'}] },
   { path: 'teamPanel/:type', component: TeamSalesScoreComponent, canActivate: [AuthGuard] ,data:[{title:'活动量得分'}]},
-  { path: 'scoreDeatil', component: ScoreDetailsComponent, canActivate: [AuthGuard],data:[{title:'团队战绩'}] },
+  { path: 'scoreDeatil', component: ScoreDetailsComponent, canActivate: [AuthGuard],data:[{title:'活动量统计'}] },
   { path: 'scoreDeatil/:practitionerId', component: ScoreDetailsComponent, canActivate: [AuthGuard],data:[{title:'团队战绩'}] },
   { path: 'businessCard', component: BusinessCardComponent, canActivate: [AuthGuard] ,data:[{title:'我的名片'}]},
   { path: 'orderDetail', component: OrderDetailComponent, canActivate: [AuthGuard] ,data:[{title:'订单详情'}]},

src/app/my/my-setting/my-setting.component.scss

 .wrapper{
     position: relative;
     width: 100%;
-    height: 100%;
+    height: calc(100vh - 70px);
     padding: 10px 5px;
     background: #efefef;
     .item{

src/app/my/product/product.component.scss

@@ -90,7 +90,7 @@
             top: 0;
             background: #fff;
             width: 100%;
-            height: 100%;
+            height: 100vh;
             padding: 20px 0 20px 10px;
             z-index: 1000;
             overflow-y: auto;
@@ -156,7 +156,7 @@
             -webkit-box-flex: 1;
             -ms-flex: 1;
             flex: 1;
-            height: 100%;
+            height: 100vh;
             overflow-x: hidden;
             overflow-y: scroll;
             -webkit-overflow-scrolling: touch;

src/app/my/thanks/thanks.component.ts

+import { Location } from '@angular/common';
 import { Component, OnInit, ViewChild, AfterViewInit, ElementRef ,Input} from '@angular/core';
 import { ActivatedRoute, Router } from "@angular/router";
 @Component({
@@ -19,7 +20,10 @@ export class ThanksComponent implements OnInit, AfterViewInit {
   sCaret: any;
   brokerInfo: any;
   type:string;
-  constructor(private router: Router,private activateRoute:ActivatedRoute) {console.log(activateRoute) 
+  constructor(private router: Router,
+    private activateRoute:ActivatedRoute,
+    private location:Location
+    ) {console.log(activateRoute) 
     this.type = activateRoute.snapshot.queryParams['type']
     
   }
@@ -43,7 +47,7 @@ export class ThanksComponent implements OnInit, AfterViewInit {
     if(this.type==='1'){
       this.router.navigate(['/newsDetail/2'],{queryParams:{type:1}})
     }else{
-      this.router.navigate(['/my']);
+      this.router.navigate(['/news']);
     }
     
   }

src/app/my/underwriting-knowledge/underwriting-knowledge.component.scss

@@ -193,7 +193,7 @@
     background: #ffffff;
     padding: 10px;
     position: fixed;
-    bottom: 70px;
+    bottom: 0;
     width: 100%;
     height: 45%;
     background-color: #fff;