Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/ebiz/claims/ApplyInfo.vue

@@ -912,11 +912,11 @@ export default {
         this.certiexpiredateRequired = false
         this.userInfo.certiIsLong = '1'
       } else {
-        this.userInfo.applyerCertiEndDate = ''
+        // this.userInfo.applyerCertiEndDate = ''
         this.certiexpiredateRequired = true
         this.userInfo.certiIsLong = '0'
       }
-      effectiveDataTypeChange(this, val)
+      // effectiveDataTypeChange(this, val)
     },
     chooseOccupation() {
       this.occupationShowPicker = false

src/views/ebiz/common/AddRiskList.vue

@@ -75,6 +75,7 @@ export default {
         resultData = resultData.trialDTOS[0]
         localStorage.isAutoPay = localStorage.isAutoPay == '0' ? '0' : resultData.isAutoPay //自动垫交
         localStorage.isRenew = localStorage.isRenew == '0' ? '0' : resultData.isRenew //自动续保
+        localStorage.isForceRenew = localStorage.isForceRenew == '0' ? '0' : resultData.isForceRenew //自动续保默认是否选中 0-是 1-否
         /********start 附加险选择限制 start******/
         //豁免险与其他附加险年龄险种
         if (resultData.productTrialInfoDTO.isRemit == '0' && resultData.productTrialInfoDTO.remitType == '0') {

src/views/ebiz/common/CalculatePremium.vue

@@ -788,6 +788,7 @@ export default {
         console.log('trialInfo == ', trialInfo)
         //通用规则1：交费方式为一次交情，无交费期限
         if (trialInfo['payIntv'] == '0') {
+          console.log(11111)
           trialInfo['payEndYear'] = '1000'
           trialInfo['payEndYearFlag'] = 'Y'
           // 福宝宝和万能险传A

src/views/ebiz/common/MainRiskList.vue

@@ -136,6 +136,7 @@ export default {
         localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst)
         localStorage.isAutoPay = resultData.isAutoPay
         localStorage.isRenew = resultData.isRenew
+        localStorage.isForceRenew = resultData.isForceRenew
         localStorage.isRelated = resultData.isRelated
         let calFactorLst = this.getFactorList(resultData)
         let productTrialYearDTOS = resultData.productTrialInfoDTO.productTrialYearDTOS != null ? resultData.productTrialInfoDTO.productTrialYearDTOS : null

src/views/ebiz/proposal/Exhibition.vue

@@ -360,12 +360,15 @@ export default {
             }
 
             if (risk.payEndYearFlag == 'Y') {
+              console.log(111)
               if (risk.payEndYear == '1000') {
                 risk.payName = '一次交清'
               } else {
+                console.log(222)
                 risk.payName = risk.payEndYear + '年'
               }
             } else {
+              console.log(333)
               risk.payName = risk.payEndYear + '岁'
             }
             // risk.demoValue[demoLabel.content] == dutyLst.dutyCode

src/views/ebiz/sale/AccountInformation.vue

@@ -42,7 +42,7 @@
           />
         </van-cell-group>
         <van-cell-group class="flex align-items-c" v-if="isRenew == '0' && !changeCard">
-          <van-switch-cell v-model="isChecked" title="自动续保" active-color="#E9332E" inactive-color="#fff" class="ml15 pr30" />
+          <van-switch-cell v-model="isChecked" title="自动续保" :disabled="isForceRenew" active-color="#E9332E" inactive-color="#fff" class="ml15 pr30" />
         </van-cell-group>
         <div class="fs12 mt10 ml20 w250 h15">
           <span>温馨提示：该账户将用于首期、续期保费缴费</span>
@@ -143,6 +143,8 @@ export default {
       isAutoPay: '',
       // 是否显示自动续保
       isRenew: '',
+      //自动续保按钮是否不允许更改
+      isForceRenew: false,
       changeCard: localStorage.changeCard
     }
   },
@@ -408,6 +410,9 @@ export default {
     this.isAutoPay = localStorage.isAutoPay
     // 是否显示自动续保
     this.isRenew = localStorage.isRenew
+    //自动续保按钮是否禁用
+    this.isForceRenew = localStorage.isForceRenew == '0' ? true : false
+    this.isChecked = localStorage.isForceRenew == '0' ? true : false
   },
   mounted() {
     document.body.style.backgroundColor = '#F5F5F5'