合并动态公告佣金

src/app/my/commission/commission.component.html

-<div class="rich_media_content" >
+<div class="rich_media_content" *ngIf="isActive==1">
   <div [innerHTML]="commission | safeHtml">
   <div [innerHTML]="commission | safeHtml">
   </div>
   </div>
+</div>
+<div class="wrapper" *ngIf="isActive==2">
+    <div class="top">
+      <div class="title">基础公告佣金政策</div>
+      <div class="subtitle">*本产品适用 <span style="color: #333;font-weight: bold;">{{settlementRuleType}}</span> <span style="color: red;">（基本法类型取自产品基本信息-基本法）</span></div>
+    </div>
+    <div class="content">
+      <ul>
+        <li class="name">产品名称</li>
+        <li class="pay">保障期间</li>
+        <li>缴费年期</li>
+        <li>第1年佣率</li>
+        <li>第2年佣率</li>
+        <li>第3年佣率</li>
+        <li>第4年佣率</li>
+        <li>第5年佣率</li>
+      </ul>
+      <ul *ngFor="let commissionItem of commissionInfoList">
+        <li class="name">{{commissionItem.productName}}</li>
+        <li class="pay">{{commissionItem.coverTermName}}</li>
+        <li>{{commissionItem.paymentTermStart}}-{{commissionItem.paymentTermEnd}}</li>
+        <li>{{commissionItem.firstYearRate?commissionItem.firstYearRate+'%':'-'}}</li>
+        <li>{{commissionItem.secondYearRate?commissionItem.secondYearRate+'%':'-'}}</li>
+        <li>{{commissionItem.thirdYearRate?commissionItem.thirdYearRate+'%':'-'}}</li>
+        <li>{{commissionItem.fourthYearRate?commissionItem.fourthYearRate+'%':'-'}}</li>
+        <li>{{commissionItem.fifthYearRate?commissionItem.fifthYearRate+'%':'-'}}</li>
+      </ul>
+    </div>
+    <div>
+      <p>*温馨提示：</p> 
+      <p>根据基本法规定，如因客户退保产生保险公司追佣的情形，公司将向经纪人扣回或追偿相应损失。</p>
+    </div>
 </div>
 </div>
\ No newline at end of file

src/app/my/commission/commission.component.scss

 .rich_media_content{
 .rich_media_content{
     padding: calc(20px + env(safe-area-inset-top)) calc(16px + env(safe-area-inset-right)) 12px calc(16px + env(safe-area-inset-left));
     padding: calc(20px + env(safe-area-inset-top)) calc(16px + env(safe-area-inset-right)) 12px calc(16px + env(safe-area-inset-left));
+}
+
+.wrapper{
+    padding: 10px;
+    .top{
+        .title{
+            font-size: 18px;
+            color: #333;
+            font-weight: bold;
+            text-align: center;
+        }
+    }
+    .content{
+        width: 100%;
+        overflow-x: auto;
+        margin: 10px auto;
+        ul{
+            display: flex;
+            width: 600px;
+            align-items: center;
+            height: 40px;
+            // border: 1px #333 solid;
+            // border-bottom: none;
+            li{
+                width: 15%;
+                text-align: center;
+                border:1px #333 solid;
+                height: 40px;
+                line-height: 40px;
+                border-right: none;
+                border-bottom: none;
+            }
+            li.name,li.pay{
+                width: 20%;
+            }
+            li:nth-child(8){
+                border-right: 1px #333 solid;
+            }
+        }
+        ul:last-child{
+            border-bottom: 1px #333 solid;
+        }
+    }
 }
 }
\ No newline at end of file

src/app/my/commission/commission.component.ts

 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
+import { Router,ActivatedRoute } from "@angular/router";
+import { MyService } from '../my.service';
 
 
 @Component({
 @Component({
   selector: 'ydlife-commission',
   selector: 'ydlife-commission',
@@ -7,11 +9,33 @@ import { Component, OnInit } from '@angular/core';
 })
 })
 export class CommissionComponent implements OnInit {
 export class CommissionComponent implements OnInit {
   commission:any;
   commission:any;
-  constructor() { }
+  productId:any;
+  planId:any;
+  isActive:any;
+  settlementRuleType:any;
+  commissionInfoList:Array<any>;
+  constructor(private activatedRoute: ActivatedRoute,private myService:MyService) { }
 
 
   ngOnInit() {
   ngOnInit() {
-    this.commission = sessionStorage.getItem('commission')
-    console.log(this,this.commission)
+    this.planId = this.activatedRoute.snapshot.queryParams.planId?this.activatedRoute.snapshot.queryParams.planId:null;
+    this.productId = this.activatedRoute.snapshot.queryParams.productId?this.activatedRoute.snapshot.queryParams.productId:null;
+    this.isActive = this.activatedRoute.snapshot.queryParams.isActive?this.activatedRoute.snapshot.queryParams.isActive:null;
+    this.commission = sessionStorage.getItem('commission');
+    if(this.isActive == 2){
+      this.queryCommissionInfoByYdLife();
+    }
+    
   }
   }
 
 
+  queryCommissionInfoByYdLife(){    
+    this.myService.queryCommissionInfoByYdLife({productId:this.productId,planId:this.planId}).subscribe((res)=>{
+      console.log(res)
+       if(res['success']){
+        this.settlementRuleType = res['data']['settlementRuleType'];
+        this.commissionInfoList = res['data']['commissionInfoList'];
+       }else{
+          alert(res['success'])
+       }
+    })
+  }
 }
 }

src/app/my/my.service.ts

@@ -900,4 +900,56 @@ export class MyService {
     const url = this.API + "/videoPlay/queryVideoPlayback";
     const url = this.API + "/videoPlay/queryVideoPlayback";
     return this.http.post(url,JSON.stringify(params))
     return this.http.post(url,JSON.stringify(params))
   }
   }
+<<<<<<< HEAD
+=======
+
+  // 讲师信息查询
+  lecturerQuery(params){
+    const url = this.API + "/college/lecturerQuery";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  // 消息列表
+  querySystemMessage(params){
+    const url = this.API + "/systemMessage/querySystemMessage";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  // 消息详情
+  querySystemMessageDetail(params){
+    const url = this.API + "/systemMessage/querySystemMessageDetail";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  // 一键已读
+  oneKeyRead(params){
+    const url = this.API + "/systemMessage/oneKeyRead";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  //我的管理个人数据
+  personalCompletionRate(params){
+    const url = this.API + "/videoPlay/personalCompletionRate";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  //我的管理团队数据
+  teamCompletionRate(params){
+    const url = this.API + "/videoPlay/teamCompletionRate";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  //学习明细接口
+  queryLearningProgressDetail(params){
+    const url = this.API + "/videoPlay/queryLearningProgressDetail";
+    return this.http.post(url,JSON.stringify(params))
+  }
+
+  //动态公告佣
+  queryCommissionInfoByYdLife(params){
+    const url = this.API + "/commission/queryCommissionInfoByYdLife";
+    return this.http.post(url,JSON.stringify(params))
+  }
+  
+>>>>>>> 338ece1... 动态公告佣金显示
 }
 }

src/app/my/product-data/product-data.component.ts

@@ -15,6 +15,7 @@ export class ProductDataComponent implements OnInit {
   posterUrl:any;
   posterUrl:any;
   posterInfo:any;
   posterInfo:any;
   sellingPointDescList:Array<any>;
   sellingPointDescList:Array<any>;
+  isActive:any;
   constructor(private router: Router,private myService:MyService,private activatedRoute: ActivatedRoute,private _toast: ToastService) {
   constructor(private router: Router,private myService:MyService,private activatedRoute: ActivatedRoute,private _toast: ToastService) {
   }
   }
 
 
@@ -37,6 +38,7 @@ export class ProductDataComponent implements OnInit {
           this.posterUrl = this.posterInfo[0]['fileInfos']['0']['ossFilePath'];
           this.posterUrl = this.posterInfo[0]['fileInfos']['0']['ossFilePath'];
         }
         }
         this.sellingPointDescList = res['data']['sellingPointDescList'];
         this.sellingPointDescList = res['data']['sellingPointDescList'];
+        this.isActive = res['data']['isActive'];
       }else{
       }else{
         const toast = ToastService.show(`${res['message']}`, 0);
         const toast = ToastService.show(`${res['message']}`, 0);
         setTimeout(() => {
         setTimeout(() => {
@@ -50,8 +52,16 @@ export class ProductDataComponent implements OnInit {
     if(urlItem['categoryId'] != 35){
     if(urlItem['categoryId'] != 35){
       this.router.navigate(['/filelist'],{queryParams:{planId:this.planId,productId:this.productId,categoryId:urlItem['categoryId']}})
       this.router.navigate(['/filelist'],{queryParams:{planId:this.planId,productId:this.productId,categoryId:urlItem['categoryId']}})
     }else{
     }else{
-      sessionStorage.setItem('commission',urlItem['fileInfos'][0]['description'])
-      this.router.navigate(['/commission']);
+      sessionStorage.setItem('commission',urlItem['fileInfos'][0]['description']);
+      if(this.isActive == null){
+        const toast = ToastService.show('暂未配置公告佣金', 0);
+        setTimeout(() => {
+          ToastService.hide();
+        }, 3000);
+      }else{
+        this.router.navigate(['/commission'],{queryParams:{productId:this.productId,planId:this.planId,isActive:this.isActive}});
+
+      }
     }
     }
   }
   }