积分兑换规则修改

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

@@ -19,7 +19,33 @@
       <span>{{item.ruleExplain}}</span>
     </li>
   </ul>
-
+  <p>说明：</p>
+  <ul>
+    <li style="display: flex;"><span>（1）</span><span>积分的发放：每季度初根据以上项目统计上季度情况，统一进行积分发放；</span></li>
+    <li style="display: flex;"><span>（2）</span><span>积分有效期：积分有效期至积分发放的次年末，举例：2022 年4 月发放的积分，有效期至2023 年12 月31 日。</span></li>
+  </ul>
+  <h5>3. 积分兑换</h5>
+  <p>经纪人可以用积分来兑换银盾内部的付费培训，旅游奖励等项目。银盾会公布支持积分兑换的项目以及需要的积分数。</p>
+  <ul class="rules exchange">
+    <li>
+      <span>积分可兑换的奖品</span>
+      <span>需支付的积分</span>
+      <span>说明</span>
+      <span>奖励兑现时间</span>
+    </li>
+    <li *ngFor="let item of integralExchangeRuleInfos">
+      <span>{{item.ruleName}}</span>
+      <span>{{item.integralNumber}}</span>
+      <span>{{item.ruleExplain}}</span>
+      <span>{{item.remark}}</span>
+    </li>
+  </ul>
+  <h5>4. 其他说明</h5>
+  <ul>
+    <li style="display: flex;"><span>（1）</span><span>银盾运营部负责该积分管理办法的执行，包括发放与兑换，如有任何问题，请与运营部联系；</span></li>
+    <li style="display: flex;"><span>（2）</span><span>如根据业务的发展情况，需要修改该办法，公司将进行调整并公布最新版本；</span></li>
+    <li style="display: flex;"><span>（3）</span><span>本积分管理办法最终解释权利归上海银盾保险经纪有限公司所有。</span></li>
+  </ul>
 
 
 

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

@@ -41,6 +41,14 @@
                 }
             }
         }
+        &.exchange{
+            span{
+                &:nth-of-type(4){
+                    border-left: none;
+                }
+            }
+           
+        }
            
      }
         

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

@@ -7,7 +7,11 @@ import { MyService } from '../my.service';
   styleUrls: ['./integration-rule.component.scss']
 })
 export class IntegrationRuleComponent implements OnInit {
+  // 积分项目
   integralRuleInfos:Array<any>;
+  // 积分兑换项目
+  integralExchangeRuleInfos:Array<any>;
+
   constructor(private myService:MyService) { }
 
   ngOnInit() {
@@ -16,7 +20,12 @@ export class IntegrationRuleComponent implements OnInit {
   queryIntegralRuleList(){
     this.myService.queryIntegralRuleList().subscribe(res=>{
       if(res['success']){
-        this.integralRuleInfos = res['data']['integralRuleInfos']
+        if(res['data']['integralRuleInfos']){
+          const result = res['data']['integralRuleInfos'];
+          this.integralRuleInfos = result.filter(item=>item.integralType=='1');
+          this.integralExchangeRuleInfos = result.filter(item=>item.integralType=='2')
+        }
+        
       }
     })
   }

src/app/my/my.service.ts

@@ -861,7 +861,7 @@ export class MyService {
   // 积分规则信息
   queryIntegralRuleList(){
     const url = this.API + "/integral/queryIntegralRuleList";
-    return this.http.post(url,JSON.stringify({isActive:1, integralType:1}))
+    return this.http.post(url,JSON.stringify({isActive:1}))
   }
 
   // 删除商机

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

@@ -47,6 +47,7 @@
     .content {
       padding: 10px 5px;
       position: relative;
+      padding-bottom: 60px;
       > .iconfont {
         width: 55px;
         height: 55px;

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

@@ -484,8 +484,8 @@ export class RecruitingDetailComponent implements OnInit {
       //   return;
       // }
       if(this.employQuery.mentorPractitionerId || this.employQuery.mentor){
-        if(!this.employQuery.subsystemId || !this.employQuery.subsystem){
-          this.openPopInfo('该辅导人在系统里还没有归属到某一个体系，请重新选择辅导人！')
+        if(!this.employQuery.s3SubordinateSystemName && !this.employQuery.s2SubordinateSystemName && !this.employQuery.s1SubordinateSystemName){
+          this.openPopInfo('该辅导人在系统里还没有归属到某一个分部、体系或纵队，请重新选择辅导人！')
           return;
         }
       }

src/app/my/team-rank/team-rank.component.scss

@@ -95,43 +95,33 @@
         width: 100%;
         float: left;
         .rankContent{
-            float: left;
-            width: 100%;
-            overflow: auto;
-            background: #fff;
-            box-shadow: 0 0px 2.5px #eceaea;
-            border-radius: 6px;
-            padding: 5px;
             ul{
                 width: 100%;
+                display: flex;
                 li{
-                    float: left;
-                    width: 23%;
+                    flex: 0 0 100px;
+                    white-space: nowrap;
                     text-align: right;
-                    margin-right: 1%;
-                    position: relative;
-                    margin-bottom: 5px;
-                    overflow: hidden;
+                    margin-right: 5px;
                     height: 32px;
                     line-height: 32px;
-                    font-size: 12px;
-                    li.icon .iconfont{
-                        position: absolute;
+                    font-size: 14px;
+                    margin-bottom: 5px;
+                    &.count{
+                        flex-basis: 38px;
+                    }
+                    &.rank{
+                        text-align: center;
+                        flex-basis: 28px;
+                    }
+                    &.name{
+                        text-align: center;
+                        flex-basis: 70px;
+                    }
+                    &.remark{
+                        font-weight: bold;
+                        color: #ff002a;
                     }
-                }
-                li.rank{
-                    width: 8%;
-                    text-align: center;
-                }
-                li.name,li.count{
-                    width: 8%;
-                }
-                li.name{
-                    text-align: center;
-                }
-                li.remark{
-                    font-weight: bold;
-                    color: #ff002a;
                 }
             }
         }