我的积分

src/app/my/file-upload/file-upload.component.html

@@ -19,7 +19,8 @@
           </div>
           <div style="flex-basis: 30px;text-align: right;">
             <i class="iconfont icon-xiazai" style="margin-right: 0;" *ngIf="!judgmentFile(fileUploadItem.filePath)"></i>
-            <img src="assets/images/playIcon.png" alt="播放" *ngIf="judgmentFile(fileUploadItem.filePath)" style=" width: 26px;">
+            <img src="assets/images/playIcon.png" alt="播放" *ngIf="judgmentFile(fileUploadItem.filePath)"
+              style=" width: 26px;">
           </div>
         </a>
       </li>

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

+<div class="integrationDetailContainer">
+  <ul class="tabs">
+    <li (click)="queryLists(0)"><span [ngClass]="{'actived':status===0}">全部</span></li>
+    <li (click)="queryLists(1)"><span [ngClass]="{'actived':status===1}">积分</span></li>
+    <li (click)="queryLists(2)"><span [ngClass]="{'actived':status===2}">兑换</span></li>
+  </ul>
+  <ul class="dateContent">
+    <li>2022年</li>
+  </ul>
+  <ul class="detailLists">
+    <li *ngFor="let item of lists">
+      <div>
+        <p>{{item.integralRuleName}}</p>
+        <p>{{item.grantDate}}</p>
+      </div>
+      <div [ngStyle]="{'color':item.integralType=='1' ? '#E56124' : '#333','font-weight':'bold'}"><span>{{item.integralType=='1' ? '+' : '-'}}</span><span>{{item.integralNumber}}</span></div>
+    </li>
+  </ul>
+</div>

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

+.tabs{
+    display: flex;
+    padding: 0 20px;
+    justify-content: space-between;
+    li{
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        span{
+            border-bottom: 1px solid transparent;
+            height: 100%;
+            display: inline-block;
+            &.actived{
+                border-color: #1B5B99;
+            }
+        }
+    }
+}
+.dateContent{
+    background-color: #f9f9f9;
+    li{
+        height: 34px;
+        padding-left: 20px;
+        line-height: 34px;
+    }
+}
+.detailLists{
+    li{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #f9f9f9;
+        padding: 10px 20px;
+        div{
+            p:last-child{
+                color: #8c8c8c;
+                font-size: 12px;
+            }
+        }
+    }
+}
\ No newline at end of file

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

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

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

+import { Component, OnInit } from '@angular/core';
+import { MyService } from '../my.service';
+
+@Component({
+  selector: 'ydlife-integration-detail',
+  templateUrl: './integration-detail.component.html',
+  styleUrls: ['./integration-detail.component.scss']
+})
+export class IntegrationDetailComponent implements OnInit {
+  integralGrantInfos:Array<any>;
+  lists:Array<any>;
+  status:number = 0;
+  constructor(private myService:MyService) { }
+
+  ngOnInit() {
+    this.queryPractitionerIntegralList();
+  }
+  queryLists(status){
+    this.status = status;
+    if(status!==0){
+      this.lists = this.integralGrantInfos.filter(item=>item.integralType == status)
+    }else{
+      this.lists = this.integralGrantInfos;
+    }
+  }
+  queryPractitionerIntegralList(queryDateStart=null,queryDateEnd=null){
+    this.myService.queryPractitionerIntegralList({queryStatus:1,practitionerId:localStorage.getItem('lifeCustomerInfo')?JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']:null,queryDateStart:queryDateStart,queryDateEnd:queryDateEnd}).subscribe(res=>{
+      if(res['success']){
+        this.lists = this.integralGrantInfos = res['data']['integralGrantInfos']
+      }
+    })
+  }
+
+}

src/app/my/integration-rule/integration-rule.component.html

+<div class="integrationRuleContainer">
+  <h4>银盾经纪人积分规则</h4>
+  <p>为了支持和激励各职级经纪人的从业行为，在公司基本法的佣奖之外，银盾特设立内部 积分制度，使用积分兑换相应公司福利。具体规则如下：</p>
+  <h5>1. 适用范围及生效日</h5>
+  <ul>
+    <li style="display: flex;"><span>（1）</span><span>适用范围：所有适用银盾基本法（含标准基本法和简单基本法）的寿险经纪人均 可享受积分福利。</span></li>
+    <li style="display: flex;"><span>（2）</span><span>生效日：该积分管理办法自 2022 年 3 月 1 日起试运行。</span></li>
+  </ul>
+  <h5>2. 积分项目及积分数</h5>
+  <ul class="rules">
+    <li>
+      <span>项目</span>
+      <span>积分</span>
+      <span>说明</span>
+    </li>
+    <li *ngFor="let item of integralRuleInfos">
+      <span>{{item.ruleName}}</span>
+      <span>{{item.integralNumber}}</span>
+      <span>{{item.ruleExplain}}</span>
+    </li>
+  </ul>
+
+
+
+
+
+
+</div>
\ No newline at end of file

src/app/my/integration-rule/integration-rule.component.scss

+.integrationRuleContainer{
+    font-size: 14px;
+    padding: 10px 12px;
+    h4{
+        text-align: center;
+        margin-bottom: 10px;
+        font-size: 15px;
+        font-weight: bold;
+    }
+    h5{
+        font-weight: bold;
+        margin: 10px 0;
+    }
+    ul.rules{
+        li{
+            display: flex;
+            span{
+                flex: 1;
+                text-align: center;
+                border: 1px solid #666;
+                padding: 6px 2px;
+                white-space: wrap;
+                &:nth-child(2){
+                    border-left: none;
+                    border-right: none;
+                }
+            }
+            &:first-child{
+                background-color: #8DB4E2;
+                color: #fff;
+            }
+            &:nth-child(2n){
+                span{
+                    border-top: none;
+                    border-bottom: none;
+                }
+            }
+        }
+           
+     }
+        
+}
\ No newline at end of file

src/app/my/integration-rule/integration-rule.component.spec.ts

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

src/app/my/integration-rule/integration-rule.component.ts

+import { Component, OnInit } from '@angular/core';
+import { MyService } from '../my.service';
+
+@Component({
+  selector: 'ydlife-integration-rule',
+  templateUrl: './integration-rule.component.html',
+  styleUrls: ['./integration-rule.component.scss']
+})
+export class IntegrationRuleComponent implements OnInit {
+  integralRuleInfos:Array<any>;
+  constructor(private myService:MyService) { }
+
+  ngOnInit() {
+    this.queryIntegralRuleList()
+  }
+  queryIntegralRuleList(){
+    this.myService.queryIntegralRuleList().subscribe(res=>{
+      if(res['success']){
+        this.integralRuleInfos = res['data']['integralRuleInfos']
+      }
+    })
+  }
+}

src/app/my/integration/integration.component.html

+<div class="integrationContainer">
+  <header>
+    <div class="left">
+      <div><strong>{{practitionerIntegrals?.integralCountNumber}}</strong><i class="iconfont icon-zhuyishixiang" [routerLink]="'/integration_rule'"></i></div>
+      <div style="font-size: 12px;">{{practitionerIntegrals?.integralNumberOld}} 积分有效期至 {{practitionerIntegrals?.effectiveOld}}</div>
+    </div>
+    <div class="right">
+      <div [routerLink]="'/integration_detail'">积分明细</div>
+    </div>
+  </header>
+  <section>
+    <img src="assets/images/integrationBanner.png" alt="" class="img-responsive">
+  </section>
+</div>

src/app/my/integration/integration.component.scss

+header{
+    border-radius: 8px;
+    margin: 5px;
+    position: relative;
+    background: url('../../../assets/images/bg.png') no-repeat;
+    background-size: cover;
+    color: #fff;
+    padding: 8px 8px 8px 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    strong{
+        font-size: 20px;
+        margin-right: 10px;
+    }
+    .right{
+        div{
+            border-radius: 20px;
+            padding: 6px 16px;
+            background: #fff;
+            color: #666;
+        }
+    }
+}
+
+section{
+    padding-bottom: 30px;
+}
\ No newline at end of file

src/app/my/integration/integration.component.spec.ts

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

src/app/my/integration/integration.component.ts

+import { Component, OnInit } from '@angular/core';
+import { MyService } from '../my.service';
+
+@Component({
+  selector: 'ydlife-integration',
+  templateUrl: './integration.component.html',
+  styleUrls: ['./integration.component.scss']
+})
+export class IntegrationComponent implements OnInit {
+  practitionerIntegrals:any
+  constructor(private myService:MyService) { }
+
+  ngOnInit() {
+    this.queryPractitionerIntegral();
+  }
+
+  queryPractitionerIntegral(){
+    this.myService.queryPractitionerIntegral({status:1,practitionerId:localStorage.getItem('lifeCustomerInfo')?JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']:null}).subscribe(res=>{
+      if(res['success']){
+        this.practitionerIntegrals = res['data']['practitionerIntegrals'][0]
+      }
+    })
+  }
+
+}

src/app/my/menu-item/menu-item.component.ts

@@ -93,6 +93,7 @@ export class MenuItemComponent implements OnInit {
           { no: 10, subtitle: '职业类别', icon: 'job', path: 'https://www.ydinsurance.cn/occupationQry/', routerLink: '',showSubMenu:true },
           { no: 11, subtitle: '文件下载', icon: 'download', path: 'https://www.ydinsurance.cn/?page_id=13957', routerLink: 'fileUpload',showSubMenu:true },
           { no: 36, subtitle: '培训视频', icon: 'trainVideo', path: '', routerLink: 'trainingVideo',showSubMenu:true },
+          { no: 37, subtitle: '我的积分', icon: 'integration', path: '', routerLink: 'integration',showSubMenu:true },
         ],
         isShow: true
       },{

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

@@ -71,6 +71,9 @@ import { RenewalReminderComponent } from './renewal-reminder/renewal-reminder.co
 import { RenewalReminderDetailComponent } from './renewal-reminder-detail/renewal-reminder-detail.component';
 import { JointSalesComponent } from './joint-sales/joint-sales.component';
 import { JointSaleDetailComponent } from './joint-sale-detail/joint-sale-detail.component';
+import { IntegrationComponent } from './integration/integration.component';
+import { IntegrationDetailComponent } from './integration-detail/integration-detail.component';
+import { IntegrationRuleComponent } from './integration-rule/integration-rule.component';
 
 
 const myRoutes: Routes = [
@@ -159,7 +162,10 @@ const myRoutes: Routes = [
   { path: 'renewal_reminder_detail/:orderPayId',component:RenewalReminderDetailComponent,canActivate:[AuthGuard],data:{type:1,title: '续期订单提醒'}},
   { path: 'reminder_detail/:orderPayId',component:RenewalReminderDetailComponent,data:{type:2,title: '续期订单详情信息'}},
   { path: 'joint_sales',component:JointSalesComponent,canActivate:[AuthGuard],data:{title: '联合销售列表'}},
-  { path: 'joint_sales_detail/:unionSalesId',component:JointSaleDetailComponent,canActivate:[AuthGuard],data:{ttitle: '联合销售签署'}}
+  { path: 'joint_sales_detail/:unionSalesId',component:JointSaleDetailComponent,canActivate:[AuthGuard],data:{ttitle: '联合销售签署'}},
+  { path: 'integration',component:IntegrationComponent,canActivate:[AuthGuard],data:{ttitle: '我的积分'}},
+  { path: 'integration_detail',component:IntegrationDetailComponent,canActivate:[AuthGuard],data:{ttitle: '积分明细'}},
+  { path: 'integration_rule',component:IntegrationRuleComponent,canActivate:[AuthGuard],data:{ttitle: '积分规则'}},
 
 ];
 

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

@@ -26,25 +26,25 @@
         </i>
         <div class="title">个人年度销售目标</div>
         <div class="content_target_item">
-          <span>首年保费FYP</span>
+          <span>首年保费FYP（元）</span>
           <input class="form-control" type="text" [(ngModel)]="premium" (ngModelChange)="getMonthAverage('premium');"
-            (blur)="inputBlur()" placeholder="{{personalSalesReadonlyFlag?'暂无预计年保费':'请输入预计年保费'}}"
+            (blur)="inputBlur()" placeholder="{{personalSalesReadonlyFlag?'暂无预计年保费':'请输入数字'}}"
             [disabled]="personalSalesReadonlyFlag" *ngIf="!personalSalesReadonlyFlag" />
           <div *ngIf="personalSalesReadonlyFlag">{{premium  | number:'1.0-2'}}</div>
         </div>
         <div class="content_target_item">
-          <span>首年佣金FYC</span>
+          <span>首年佣金FYC（元）</span>
           <input class="form-control" type="text" [(ngModel)]="commission"
             (ngModelChange)="getMonthAverage('commission')" (blur)="inputBlur()"
-            placeholder="{{personalSalesReadonlyFlag?'暂无预计年佣金':'请输入预计年佣金'}}" [disabled]="personalSalesReadonlyFlag"
+            placeholder="{{personalSalesReadonlyFlag?'暂无预计年佣金':'请输入数字'}}" [disabled]="personalSalesReadonlyFlag"
             *ngIf="!personalSalesReadonlyFlag" />
           <div *ngIf="personalSalesReadonlyFlag">{{commission  | number:'1.0-2'}}</div>
         </div>
         <div class="content_target_item">
-          <span>件均保费</span>
+          <span>件均保费（元）</span>
           <input class="form-control" type="text" [(ngModel)]="pieceAveragePremium"
             (ngModelChange)="getMonthAverage('pieceAveragePremium')" (blur)="inputBlur()"
-            *ngIf="!personalSalesReadonlyFlag" placeholder="{{personalSalesReadonlyFlag?'暂无件均保费':'请输入年度件均保费'}}"
+            *ngIf="!personalSalesReadonlyFlag" placeholder="{{personalSalesReadonlyFlag?'暂无件均保费':'请输入数字'}}"
             [disabled]="personalSalesReadonlyFlag" />
           <div *ngIf="personalSalesReadonlyFlag">{{pieceAveragePremium  | number:'1.0-2'}}</div>
         </div>
@@ -166,24 +166,24 @@
           <span class="save">保存</span></i>
         <div class="title">团队年度销售目标</div>
         <div class="content_target_item">
-          <span>首年保费FYP</span>
+          <span>首年保费FYP（元）</span>
           <input class="form-control" type="text" [(ngModel)]="premium" (ngModelChange)="getMonthAverage('premium')"
-            placeholder="{{personalSalesReadonlyFlag?'暂无预计年保费':'请输入预计年保费'}}" [disabled]="personalSalesReadonlyFlag"
+            placeholder="{{personalSalesReadonlyFlag?'暂无预计年保费':'请输入数字'}}" [disabled]="personalSalesReadonlyFlag"
             *ngIf="!personalSalesReadonlyFlag" />
           <div *ngIf="personalSalesReadonlyFlag">{{premium  | number:'1.0-2'}}</div>
         </div>
         <div class="content_target_item">
-          <span>首年佣金FYC</span>
+          <span>首年佣金FYC（元）</span>
           <input class="form-control" type="text" [(ngModel)]="commission"
             (ngModelChange)="getMonthAverage('commission')" *ngIf="!personalSalesReadonlyFlag"
-            placeholder="{{personalSalesReadonlyFlag?'暂无预计年佣金':'请输入预计年佣金'}}" [disabled]="personalSalesReadonlyFlag" />
+            placeholder="{{personalSalesReadonlyFlag?'暂无预计年佣金':'请输入数字'}}" [disabled]="personalSalesReadonlyFlag" />
           <div *ngIf="personalSalesReadonlyFlag">{{commission  | number:'1.0-2'}}</div>
         </div>
         <div class="content_target_item">
-          <span>件均保费</span>
+          <span>件均保费（元）</span>
           <input class="form-control" type="text" [(ngModel)]="pieceAveragePremium"
             (ngModelChange)="getMonthAverage('pieceAveragePremium')" *ngIf="!personalSalesReadonlyFlag"
-            placeholder="{{personalSalesReadonlyFlag?'暂无件均保费':'请输入年度件均保费'}}" [disabled]="personalSalesReadonlyFlag" />
+            placeholder="{{personalSalesReadonlyFlag?'暂无件均保费':'请输入数字'}}" [disabled]="personalSalesReadonlyFlag" />
           <div *ngIf="personalSalesReadonlyFlag">{{pieceAveragePremium  | number:'1.0-2'}}</div>
         </div>
         <div class="content_target_item" style="border-bottom: none;">

src/app/my/my.module.ts

@@ -85,9 +85,12 @@ import { RenewalReminderComponent } from './renewal-reminder/renewal-reminder.co
 import { RenewalReminderDetailComponent } from './renewal-reminder-detail/renewal-reminder-detail.component';
 import { JointSalesComponent } from './joint-sales/joint-sales.component';
 import { JointSaleDetailComponent } from './joint-sale-detail/joint-sale-detail.component';
+import { IntegrationComponent } from './integration/integration.component';
+import { IntegrationDetailComponent } from './integration-detail/integration-detail.component';
+import { IntegrationRuleComponent } from './integration-rule/integration-rule.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, 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],
+  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, 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],
   imports: [
     CommonModule,
     LifeCommonModule,

src/app/my/my.service.ts

@@ -848,4 +848,19 @@ export class MyService {
     const url = this.API + "/orderPay/queryNoticeDetail";
     return this.http.post(url,JSON.stringify(params))
   }
+  // 经纪人积分总数状态
+  queryPractitionerIntegral(params){
+    const url = this.API + "/integral/queryPractitionerIntegral";
+    return this.http.post(url,JSON.stringify(params))
+  }
+  // 积分明细查询
+  queryPractitionerIntegralList(params){
+    const url = this.API + "/integral/queryPractitionerIntegralList";
+    return this.http.post(url,JSON.stringify(params))
+  }
+  // 积分规则信息
+  queryIntegralRuleList(){
+    const url = this.API + "/integral/queryIntegralRuleList";
+    return this.http.post(url,JSON.stringify({isActive:1}))
+  }
 }