优化

0a037f46 · Chao Sun · 539dc04a · 0a037f46 · 0a037f46 · 0a037f46
Commit 0a037f46 authored Jun 01, 2020 by Chao Sun
6 changed files
--- a/src/app/my/my-center-home/my-center-home.component.html
+++ b/src/app/my/my-center-home/my-center-home.component.html
@@ -50,7 +50,7 @@
            </li>
            <li>首年佣金</li>
            <li>件数</li>
-            <li>排名</li>
+            <li>完成率</li>
          </ul>
          <ul class="performance_list">
            <li>线上</li>
@@ -62,7 +62,7 @@
            </li>
            <li class="markPrice">{{onlineInfo?.count?onlineInfo.count:'-'}}</li>
            <li class="markPrice">
-              {{onlineInfo?.rank?onlineInfo.rank:'-'}}
+              {{onlineInfo?.completionRate?onlineInfo.completionRate + '%':'-'}}
            </li>
          </ul>
          <ul class="performance_list">
@@ -75,7 +75,7 @@
            </li>
            <li class="markPrice">{{offlineInfo?.count?offlineInfo.count:'-'}}</li>
            <li class="markPrice">
-              {{offlineInfo?.rank?offlineInfo.rank:'-'}}
+              {{offlineInfo?.completionRate?offlineInfo.completionRate + '%':'-'}}
            </li>
          </ul>
        </div>

--- a/src/app/my/my-center-home/my-center-home.component.ts
+++ b/src/app/my/my-center-home/my-center-home.component.ts
@@ -89,7 +89,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
      {
        title: '我的团队',
        content: [
-          { no: 15, subtitle: '我的团队', icon: 'icon-tuandui', path: '', routerLink: 'teamPanel' },
+          { no: 15, subtitle: '我的团队', icon: 'icon-tuandui', path: '', routerLink: '' },
          // { no: 16, subtitle: '团队增员', icon: 'icon-tuanduiguanlisvg', path: '', routerLink: '' },
          { no: 16, subtitle: '团队增员', icon: 'icon-tuanduiguanlisvg', path: '', routerLink: 'recruiting' },
          { no: 18, subtitle: '招募海报', icon: 'icon-haibao-1', path: '', routerLink: '' },
@@ -134,6 +134,8 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
      this.router.navigate(['/salesDetail'], { queryParams: { searchType: this.performanceSelectedFlag, showType: 'orderform' } });
    } else if (item.no === 14) {
      this.router.navigate(['/salesDetail'], { queryParams: { searchType: this.performanceSelectedFlag, showType: 'sales' } });
+    } else if (item.no === 15) {
+      this.router.navigate(['/teamPanel'])
    } else if (!item.subtitle) {
      return;
    } else if (item.no === 18) {

--- a/src/app/my/my-setting/my-setting.component.html
+++ b/src/app/my/my-setting/my-setting.component.html
@@ -37,5 +37,5 @@
      <span class="iconfont icon-ar-r"></span>
    </div>
  </div>
-  <div class="saveBtn" (click)="getOut()">退出</div>
+  <div class="saveBtn" (click)="getOut()">退出系统</div>
 </div>
\ No newline at end of file
--- a/src/app/my/my-target/my-target.component.html
+++ b/src/app/my/my-target/my-target.component.html
@@ -18,9 +18,11 @@
  <div class="content_target" *ngIf="searchType===1">
    <div class="content_target_wrapper">
      <div class="line">
-        <i class="iconfont icon-bianji" *ngIf="personalSalesReadonlyFlag"
+        <i class="iconfont icon-bianji" *ngIf="personalSalesReadonlyFlag" (click)="personalSalesReadonlyFlag = false;">
-          (click)="personalSalesReadonlyFlag = false;"></i>
+        </i>
-        <i class="iconfont icon-save" *ngIf="!personalSalesReadonlyFlag" (click)="salesTargetSave(1)"></i>
+        <i class="iconfont icon-save" *ngIf="!personalSalesReadonlyFlag" (click)="salesTargetSave(1)">
+          <span class="save">保存</span>
+        </i>
        <div class="title">个人年度销售目标</div>
        <div class="content_target_item">
          <span>首年保费FYP</span>
@@ -78,7 +80,9 @@
        <i class="iconfont icon-bianji" *ngIf="personalSalesActivityFlag"
          (click)="personalSalesActivityFlag = false;"></i>
        <i class="iconfont icon-save" *ngIf="!readonlyFlag && salesTargetFlag && !personalSalesActivityFlag"
-          (click)="salesTargetMonthSave(1)"></i>
+          (click)="salesTargetMonthSave(1)">
+          <span class="save">保存</span>
+        </i>
        <div class="title">月均销售活动量目标</div>
        <div *ngIf="!salesTargetActions || salesTargetActions.length<=0" style="text-align: center;">请先设置销售目标</div>
        <div class="content_target_item" *ngFor="let salesTargetActionItem of salesTargetActions">
@@ -94,7 +98,9 @@
    <div class="content_target_wrapper">
      <div class="line">
        <i class="iconfont icon-bianji" *ngIf="recruitsReadonlyFlag" (click)="recruitsReadonlyFlag = false;"></i>
-        <i class="iconfont icon-save" *ngIf="!recruitsReadonlyFlag" (click)="potentialGoalsSetting()"></i>
+        <i class="iconfont icon-save" *ngIf="!recruitsReadonlyFlag" (click)="potentialGoalsSetting()">
+          <span class="save">保存</span>
+        </i>
        <div class="title">年增员目标</div>
        <div class="content_target_item">
          <span>年度增员目标</span>
@@ -129,7 +135,7 @@
        <i class="iconfont icon-bianji" *ngIf="recruitsActivityReadonlyFlag"
          (click)="recruitsActivityReadonlyFlag = false;"></i>
        <i class="iconfont icon-save" *ngIf="!readonlyFlag && recruitingTargetFlag && !recruitsActivityReadonlyFlag"
-          (click)="potentialGoalsActionsUpdate()"></i>
+          (click)="potentialGoalsActionsUpdate()"> <span class="save">保存</span></i>
        <div class="title">月均增员活动量目标</div>
        <div *ngIf="!goalsActionsInfoList || goalsActionsInfoList.length<=0" style="text-align: center;">请先设置增员目标</div>
        <div class="content_target_item" *ngFor="let goalsActionsInfoItem of goalsActionsInfoList">
@@ -147,7 +153,8 @@
      <div class="line">
        <i class="iconfont icon-bianji" *ngIf="personalSalesReadonlyFlag"
          (click)="personalSalesReadonlyFlag = false;"></i>
-        <i class="iconfont icon-save" *ngIf="!personalSalesReadonlyFlag" (click)="salesTargetSave(2)"></i>
+        <i class="iconfont icon-save" *ngIf="!personalSalesReadonlyFlag" (click)="salesTargetSave(2)">
+          <span class="save">保存</span></i>
        <div class="title">团队年度销售目标</div>
        <div class="content_target_item">
          <span>首年保费FYP</span>
@@ -173,7 +180,6 @@
        </div>
      </div>
      <div class="line">
        <div class="title">团队月销售目标</div>
        <div class="month_target_item_wrapper" *ngFor="let salesTargetMonthsItem of salesTargetMonths">
          <span class="dot" style="font-weight: bold;">{{salesTargetMonthsItem.monthNum}}月</span>

--- a/src/app/my/my-target/my-target.component.scss
+++ b/src/app/my/my-target/my-target.component.scss
@@ -47,7 +47,6 @@ ul li,ol li{
                .iconfont{
                    width: 55px;
                    height: 55px;
-                    line-height: 55px;
                    border-radius: 50%;
                    position: absolute;
                    right: 10px;
@@ -56,13 +55,21 @@ ul li,ol li{
                    background: #0767bf;
                    text-align: center;
                    top: -5px;
+                    .save{
+                        font-size: 12px;
+                        position: absolute;
+                        left: 30%;
+                        top: 60%;
+                    }
+                }
+                .iconfont.icon-bianji{
+                    line-height: 55px;
                }
                .title{
                    font-size: 16px;
                    font-weight: bold;
                    margin: 10px 0 15px 0;
                }
                .content_target_item{
                    display: flex;
                    justify-content: space-between;
@@ -78,18 +85,18 @@ ul li,ol li{
                        box-shadow: none;
                        display: flex;
                        flex-wrap: wrap;
+                        font-size: 18px;
                    }
                    .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
-                        opacity:.7;
+                        opacity:.75;
                    }
                }
                .month_target_item_wrapper{
                    margin-bottom: 15px;
                    .dot{
-                        width: 30px;
+                        width: 35px;
-                        height: 30px;
+                        height: 35px;
-                        line-height: 30px; 
+                        line-height: 35px; 
                        background: #ff002a;
                        border-radius: 50%;
                        color: #fff;

--- a/src/app/my/sales-rank/sales-rank.component.scss
+++ b/src/app/my/sales-rank/sales-rank.component.scss
@@ -7,22 +7,19 @@
        list-style: none;
    }
    .title{
-        width: 100%;
+        display: flex;
-        float: left;
        margin-bottom: 10px;
-        padding: 10px 0;
+        padding: 10px 15px;
+        justify-content: space-between;
+        width: 100%;
+        align-items: center;
        ul.tab{
-            float: left;
+            display: flex;
-            // width: 21%;
-            width: 30%;
-            margin-right: 5%;
            li{
-                float: left;
                margin-right: 5px;
                text-align: left;
                height: 30px;
                line-height: 30px;
-                margin-right: 5%;
                color: #fff;
            }
            li.selected{
@@ -30,7 +27,7 @@
                font-weight: bold;
                border-bottom: 2px #ff002a solid;
            }
-            li:nth-child(3){
+            li:last-child{
                margin-right: 0;
            }
        }