Merge branch 'track' into dev

src/app/my/application-process/signature/signature.component.ts

@@ -58,7 +58,9 @@ export class SignatureComponent implements OnInit {
     if(this.isSignatureShow == false){
     if(this.isSignatureShow == false){
       this.saveDigitalSignatures();
       this.saveDigitalSignatures();
     }else{
     }else{
-      this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
+      this.myService.customerBehaviorTrackSave(`经纪人合同签署 - ${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.insurerBranchName}、${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.subordinateName}体系下，经纪人${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.name}点击了【我自愿签订经纪人合同书】`).subscribe(res=>{
+        this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
+      })
     }
     }
   }
   }
 
 
@@ -76,6 +78,8 @@ export class SignatureComponent implements OnInit {
       return;
       return;
     }
     }
     if(this.type=='eNotice'){
     if(this.type=='eNotice'){
+      this.myService.customerBehaviorTrackSave(`客户告知书 - 客户点击了【确认提交】，告知书ID为${sessionStorage.getItem('eNoticeId')}`).subscribe(res=>{
+      })
       this.myService.signInformedSheet({'id':sessionStorage.getItem('eNoticeId'),imgStr:this.imgStr}).subscribe(res=>{
       this.myService.signInformedSheet({'id':sessionStorage.getItem('eNoticeId'),imgStr:this.imgStr}).subscribe(res=>{
         if(res['success']){
         if(res['success']){
           // 确认提交
           // 确认提交
@@ -85,6 +89,8 @@ export class SignatureComponent implements OnInit {
         }
         }
       })
       })
     }else if(this.type == 'continuationRate'){
     }else if(this.type == 'continuationRate'){
+      this.myService.customerBehaviorTrackSave(`保单继续率承诺书 - ${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.insurerBranchName}、${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.subordinateName}体系下，经纪人${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.name}点击了【确认提交】`).subscribe(res=>{
+    })
       console.log('继续率承诺书');
       console.log('继续率承诺书');
       const param = {
       const param = {
         practitionerId: localStorage.getItem('lifeCustomerInfo')?JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']:null,
         practitionerId: localStorage.getItem('lifeCustomerInfo')?JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']:null,

src/app/my/e-notice-sign/e-notice-sign.component.ts

 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';
+import { MyService } from '../my.service';
 
 
 @Component({
 @Component({
   selector: 'ydlife-e-notice-sign',
   selector: 'ydlife-e-notice-sign',
@@ -8,13 +9,15 @@ import { Router } from '@angular/router';
 })
 })
 export class ENoticeSignComponent implements OnInit {
 export class ENoticeSignComponent implements OnInit {
 
 
-  constructor(private router:Router) { }
+  constructor(private router:Router,private myService:MyService) { }
 
 
   ngOnInit() {
   ngOnInit() {
   }
   }
 
 
   agree(){
   agree(){
-    this.router.navigate(['/eNoticeSignature'],{ queryParams: { type:'eNotice'} })
+    this.myService.customerBehaviorTrackSave(`客户告知书 - 客户点击了【同意并签署】`).subscribe(res=>{
+      this.router.navigate(['/eNoticeSignature'],{ queryParams: { type:'eNotice'} })
+    })
   }
   }
 
 
 }
 }

src/app/my/e-notice/e-notice.component.ts

 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from "@angular/router";
 import { ActivatedRoute } from "@angular/router";
 import { Router } from '@angular/router';
 import { Router } from '@angular/router';
+import { MyService } from '../my.service';
 
 
 @Component({
 @Component({
   selector: 'ydlife-e-notice',
   selector: 'ydlife-e-notice',
@@ -9,16 +10,17 @@ import { Router } from '@angular/router';
 })
 })
 export class ENoticeComponent implements OnInit {
 export class ENoticeComponent implements OnInit {
   pageType:any
   pageType:any
-  constructor(private activatedRoute: ActivatedRoute,private router:Router) {
-    
+  constructor(private activatedRoute: ActivatedRoute,private router:Router,private myService:MyService) {
+
    }
    }
 
 
   ngOnInit() {
   ngOnInit() {
     this.pageType = this.activatedRoute.url['value'][0]['path'];
     this.pageType = this.activatedRoute.url['value'][0]['path'];
-    console.log(this.pageType)
   }
   }
 
 
   agree(){
   agree(){
-    this.router.navigate(['/eNoticeSignature'],{ queryParams: { type:'continuationRate'} })
+    this.myService.customerBehaviorTrackSave(`保单继续率承诺书 - ${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.insurerBranchName}、${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.subordinateName}体系下，经纪人${JSON.parse(localStorage.getItem('lifeCustomerInfo')).practitionerBasicInfo.name}点击了【同意并签署】`).subscribe(res=>{
+      this.router.navigate(['/eNoticeSignature'],{ queryParams: { type:'continuationRate'} })
+    })
   }
   }
 }
 }

src/app/my/my.service.ts

 import { Injectable } from '@angular/core';
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '../../environments/environment';
 import { environment } from '../../environments/environment';
-import { parse } from 'querystring';
 
 
 @Injectable({
 @Injectable({
   providedIn: 'root'
   providedIn: 'root'
@@ -776,4 +775,20 @@ export class MyService {
       const url = this.ydapi + "/practitioner/queryCommitmentByPractitionerId";
       const url = this.ydapi + "/practitioner/queryCommitmentByPractitionerId";
       return this.http.post(url, JSON.stringify(param));
       return this.http.post(url, JSON.stringify(param));
     }
     }
+
+    /**
+   * 用户行为跟踪
+   * @returns {Observable<A>}
+   */
+  customerBehaviorTrackSave(processMemo) {
+    const url = this.API + '/customerBehaviorTrackSave';
+    const behaviorInfo = {
+        'serialsNo': null,
+        'customerId': localStorage.getItem('lifeCustomerInfo') ? JSON.parse(localStorage.getItem('lifeCustomerInfo')).customerId : null,
+        'orderId': null,
+        'processMemo': processMemo,
+        'mediaFrom': '银盾保经'
+      };
+    return this.http.post(url, JSON.stringify(behaviorInfo));
+  }
 }
 }

src/app/my/salary/salary.component.html

@@ -21,13 +21,13 @@
           <div class="price" *ngIf="!payScaleItem.pdfOssPath">￥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}</div>
           <div class="price" *ngIf="!payScaleItem.pdfOssPath">￥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}</div>
         </div>
         </div>
       </div>
       </div>
-      <div class="iconfont icon-ar-r" 
+      <div class="iconfont icon-ar-r"
       style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
       style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
     </div>
     </div>
     <div style="text-align: center;margin-top: 20px;" *ngIf="payScaleInfos?.length<=0">暂无数据</div>
     <div style="text-align: center;margin-top: 20px;" *ngIf="payScaleInfos?.length<=0">暂无数据</div>
   </div>
   </div>
 
 
-  <div id="salesContent" *ngIf="selectedId == 2">
+  <div id="salesContent" *ngIf="selectedId == 1">
     <div *ngIf="nowYear>2021">
     <div *ngIf="nowYear>2021">
       <div class="salesItem" *ngFor="let historyPartItem of historyPart2" (click)="enterDetail(historyPartItem.years,historyPartItem.month,historyPartItem.loginName,historyPartItem.isBasic)">
       <div class="salesItem" *ngFor="let historyPartItem of historyPart2" (click)="enterDetail(historyPartItem.years,historyPartItem.month,historyPartItem.loginName,historyPartItem.isBasic)">
         <div class="icon_bolck" style="top: 16px;"><span class="iconfont icon-xinzidan"></span></div>
         <div class="icon_bolck" style="top: 16px;"><span class="iconfont icon-xinzidan"></span></div>
@@ -41,7 +41,7 @@
             <div class="price">￥{{historyPartItem.monDtlRAmount | number: "1.2-2"}}</div>
             <div class="price">￥{{historyPartItem.monDtlRAmount | number: "1.2-2"}}</div>
           </div>
           </div>
         </div>
         </div>
-        <div class="iconfont icon-ar-r" 
+        <div class="iconfont icon-ar-r"
         style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
         style="width: 20px;height: 20px;position: absolute;right: 2px;top: 23px;"></div>
       </div>
       </div>
     </div>
     </div>
@@ -79,4 +79,4 @@
 
 
 </div>
 </div>
 
 
-<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
+<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
\ No newline at end of file

src/app/my/salary/salary.component.ts

@@ -33,7 +33,7 @@ export class SalaryComponent implements OnInit {
     this.payScaleListQuery();
     this.payScaleListQuery();
     this.tabList = [
     this.tabList = [
       {name:`${this.nowYear}年`,id:0},
       {name:`${this.nowYear}年`,id:0},
-      {name:'历史薪资',id:2}
+      {name:'历史薪资',id:1}
     ]
     ]
   }
   }