置顶公众号以及我的提问可以拖动

src/app/app.component.ts

@@ -32,15 +32,15 @@ export class AppComponent implements OnInit, OnDestroy {
     this.subscription = lifeCommonService.shareStatus$.subscribe(status => {
       this.shareGuidePageEnable = status == '1';
     });
-    // this.router.events.forEach(event=>{
-    //   if (event instanceof NavigationEnd){
-    //     if(!localStorage.getItem('lifeCustomerInfo')){
-    //       this.iconShowFlag = false;
-    //     }else{
-    //       this.iconShowFlag = true;
-    //     }
-    //   }
-    // })
+    this.router.events.forEach(event=>{
+      if (event instanceof NavigationEnd){
+        if(!localStorage.getItem('lifeCustomerInfo')){
+          this.iconShowFlag = false;
+        }else{
+          this.iconShowFlag = true;
+        }
+      }
+    })
     
 
   

src/app/auth/login/login.component.ts

@@ -108,7 +108,7 @@ export class LoginComponent implements OnInit, OnDestroy {
                         this.redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/my';
                         this.router.navigateByUrl(this.redirect);
                       } else {
-                        this.redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/thanks';
+                        this.redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/thanks?type=1';
                         this.router.navigateByUrl(this.redirect);
                       }
                     }
@@ -117,7 +117,7 @@ export class LoginComponent implements OnInit, OnDestroy {
                       this.redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/my';
                       this.router.navigateByUrl(this.redirect);
                     } else {
-                      this.redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/thanks';
+                      this.redirect = this.authService.redirectUrl ? this.router.parseUrl(this.authService.redirectUrl) : '/thanks?type=1';
                       this.router.navigateByUrl(this.redirect);
                     }
                   }

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

@@ -5,5 +5,11 @@
       <span class="iconfont icon-ar-r"></span>
     </div>
   </div>
+  <div class="item" [routerLink]="['/newsDetail/2']">
+    <span>银盾保险经纪置顶公众号操作指南</span>
+    <div class="content">
+      <span class="iconfont icon-ar-r"></span>
+    </div>
+  </div>
 
 </div>
\ No newline at end of file

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

@@ -76,6 +76,7 @@ import { IntegrationDetailComponent } from './integration-detail/integration-det
 import { IntegrationRuleComponent } from './integration-rule/integration-rule.component';
 import { VideoComponent } from '../common/video/video.component';
 import { QrcodeUploadComponent } from './application-process/qrcode-upload/qrcode-upload.component';
+import { NewsDetailComponent } from './news-detail/news-detail.component';
 
 
 const myRoutes: Routes = [
@@ -173,9 +174,10 @@ const myRoutes: Routes = [
   { path: 'joint_sales_detail/:unionSalesId',component:JointSaleDetailComponent,canActivate:[AuthGuard],data:{title: '联合销售签署'}},
   { path: 'integration',component:IntegrationComponent,canActivate:[AuthGuard],data:{title: '我的积分'}},
   { path: 'integration_detail',component:IntegrationDetailComponent,canActivate:[AuthGuard],data:{title: '积分明细'}},
-  { path: 'integration_rule',component:IntegrationRuleComponent,canActivate:[AuthGuard],data:{tttle: '积分规则'}},
-  { path: 'video',component:VideoComponent,canActivate:[AuthGuard],data:{ttitle: '视频播放'}},
-  { path: 'pdfView',component:VideoComponent,canActivate:[AuthGuard],data:{ttitle: 'PDF查看'}},
+  { path: 'integration_rule',component:IntegrationRuleComponent,canActivate:[AuthGuard],data:{title: '积分规则'}},
+  { path: 'video',component:VideoComponent,canActivate:[AuthGuard],data:{title: '视频播放'}},
+  { path: 'pdfView',component:VideoComponent,canActivate:[AuthGuard],data:{title: 'PDF查看'}},
+  { path: 'newsDetail/:id',component:NewsDetailComponent,canActivate:[AuthGuard],data:{title: '消息详情'}},
 
 ];
 

src/app/my/my.module.ts

@@ -91,9 +91,10 @@ import { IntegrationDetailComponent } from './integration-detail/integration-det
 import { IntegrationRuleComponent } from './integration-rule/integration-rule.component';
 import { VideoComponent } from '../common/video/video.component';
 import { QrcodeUploadComponent } from './application-process/qrcode-upload/qrcode-upload.component';
+import { NewsDetailComponent } from './news-detail/news-detail.component';
 
 @NgModule({
-  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe,SafeResourceUrlPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent, MedicalServiceComponent, InvitationComponent, RegisterComponent, EmployeeInfoComponent, EmployeeBasicInfoComponent, WorkExperienceComponent, PersonalPhotosComponent, EmployeeIdCardComponent, EmployeeEducationComponent, PersonalStatementComponent, SignatureComponent, EmployeeSubmitComponent, BankCardComponent, MemberDetailComponent, ApprovalListComponent, ApprovalCommentsComponent, ApprovalResultListComponent, MyApplicationComponent, SuggestionComponent, EmployeeSalaryComponent, HistoricalRankComponent, TeamAreaPanelComponent, ArticleComponent, ArticleDetailComponent, ArticleReadComponent,SalaryDetailComponent,SalaryFirstYearComponent,DetailModalComponent, ProductComponent, ProductDataComponent, CommissionComponent, FileListComponent,MyCustomerComponent, CustomerRelationComponent, MyCustomerPolicyComponent, UnderwritingKnowledgeComponent, MyQuestionComponent, AskComponent, MenuItemComponent, MemberListComponent, ENoticeComponent, ENoticeSignComponent, RenewalReminderComponent, RenewalReminderDetailComponent, JointSalesComponent, JointSaleDetailComponent, IntegrationComponent, IntegrationDetailComponent, IntegrationRuleComponent, VideoComponent, QrcodeUploadComponent],
+  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe,SafeResourceUrlPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent, MedicalServiceComponent, InvitationComponent, RegisterComponent, EmployeeInfoComponent, EmployeeBasicInfoComponent, WorkExperienceComponent, PersonalPhotosComponent, EmployeeIdCardComponent, EmployeeEducationComponent, PersonalStatementComponent, SignatureComponent, EmployeeSubmitComponent, BankCardComponent, MemberDetailComponent, ApprovalListComponent, ApprovalCommentsComponent, ApprovalResultListComponent, MyApplicationComponent, SuggestionComponent, EmployeeSalaryComponent, HistoricalRankComponent, TeamAreaPanelComponent, ArticleComponent, ArticleDetailComponent, ArticleReadComponent,SalaryDetailComponent,SalaryFirstYearComponent,DetailModalComponent, ProductComponent, ProductDataComponent, CommissionComponent, FileListComponent,MyCustomerComponent, CustomerRelationComponent, MyCustomerPolicyComponent, UnderwritingKnowledgeComponent, MyQuestionComponent, AskComponent, MenuItemComponent, MemberListComponent, ENoticeComponent, ENoticeSignComponent, RenewalReminderComponent, RenewalReminderDetailComponent, JointSalesComponent, JointSaleDetailComponent, IntegrationComponent, IntegrationDetailComponent, IntegrationRuleComponent, VideoComponent, QrcodeUploadComponent, NewsDetailComponent],
   imports: [
     CommonModule,
     LifeCommonModule,

src/app/my/news-detail/news-detail.component.html

+<div class="newsDetailContainer">
+  <div class="newsDetailContent">
+    <div>
+      <div><img src="assets/images/topOfficalAccountGuideBg.png" alt=""></div>
+      <h3>为了便于更好的服务您，三步就可轻松置顶银盾保险经纪公众号哦~<img src="assets/images/downArrow.gif" alt="" style="width: 25px"></h3>
+      <div><img src="assets/images/topOfficalAccountGuide.png" alt=""></div>
+    </div>
+  </div>
+  <div class="closeBtn">
+    <i class="iconfont icon-jia" (click)="close()"></i>
+  </div>
+</div>
\ No newline at end of file

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

+.newsDetailContainer{
+    background-color: rgba(0, 0, 0, 0.5);
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    padding: 30px;
+    .newsDetailContent{
+        background-color: #fff;
+        padding-bottom: 10px;
+        border-radius: 10px;
+    }
+}
+
+
+
+.closeBtn{
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    i{
+        font-size: 30px;
+        text-align: center;
+        width: 45px;
+        height: 45px;
+        line-height: 42px;
+        margin: 10px auto;
+        border-radius: 50%;
+        color: #fff; 
+        transform: rotate(45deg);
+    }
+}
+h3{
+    padding: 10px 30px;
+    color: #1b5b99;
+    font-weight: bold;
+    font-size: 15px;
+    text-align: justify;
+    img{
+        margin-left: 6px;
+    }
+}
\ No newline at end of file

src/app/my/news-detail/news-detail.component.spec.ts

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NewsDetailComponent } from './news-detail.component';
+
+describe('NewsDetailComponent', () => {
+  let component: NewsDetailComponent;
+  let fixture: ComponentFixture<NewsDetailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NewsDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NewsDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/my/news-detail/news-detail.component.ts

+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'ydlife-news-detail',
+  templateUrl: './news-detail.component.html',
+  styleUrls: ['./news-detail.component.scss']
+})
+export class NewsDetailComponent implements OnInit {
+  type:string;
+  constructor(private router:Router,private activatedRoute:ActivatedRoute) { 
+    this.type = activatedRoute.snapshot.queryParams['type']
+  }
+
+  ngOnInit() {
+    
+  }
+
+  close()
+  {
+    if(this.type==='1'){
+      this.router.navigate(['/my'])
+    }else{
+      this.router.navigate(['/news'])
+    }
+  }
+
+}

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

 import { Component, OnInit, ViewChild, AfterViewInit, ElementRef ,Input} from '@angular/core';
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 @Component({
   selector: 'ydlife-thanks',
   templateUrl: './thanks.component.html',
@@ -18,7 +18,11 @@ export class ThanksComponent implements OnInit, AfterViewInit {
   sCurCaret: any;
   sCaret: any;
   brokerInfo: any;
-  constructor(private router: Router) { }
+  type:string;
+  constructor(private router: Router,private activateRoute:ActivatedRoute) {console.log(activateRoute) 
+    this.type = activateRoute.snapshot.queryParams['type']
+    
+  }
   ngOnInit() {
     this.brokerInfo = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerBasicInfo']
 
@@ -36,7 +40,12 @@ export class ThanksComponent implements OnInit, AfterViewInit {
     // this.doStep();
   }
   close() {
-    this.router.navigate(['/my']);
+    if(this.type==='1'){
+      this.router.navigate(['/newsDetail/2'],{queryParams:{type:1}})
+    }else{
+      this.router.navigate(['/my']);
+    }
+    
   }
 
   doStep() {