fix: 修复变量错误的问题

src/assets/js/utils/data-dictionary.js

@@ -3947,6 +3947,35 @@ export default {
     {
       code: "GFRS_M0094__cashValue",
       label: "元"
+    },
+    {
+      //养老年金开始领取年龄
+      code: 'pensionAge',
+      label: '岁'
+    },
+    {
+      code: 'AppntCriticalDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'AppntModerateOrMinorDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'AppntDeathOrTotalDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'InsuredCriticalDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'InsuredModerateOrMinorDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'InsuredDeathOrTotalDiseaseExemptionPremiumD',
+      label: '元'
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/views/YB_APP/renewalList.vue

@@ -52,10 +52,10 @@
                 <span>保单号</span><span>{{ item.contNo }}</span>
               </p>
               <p>
-                <span>被保人</span><span>{{ item.insuredName }}</span>
+                <span>投保人</span><span>{{ item.appntName }}</span>
               </p>
               <p>
-                <span>被保险人</span><span>{{ item.appntName }}</span>
+                <span>被保险人</span><span>{{ item.insuredName }}</span>
               </p>
               <p v-if="active == 3">
                 <span>转账银行</span><span>{{ item.bankName }}</span>

src/views/ebiz/agentEenter/SignContract.vue

@@ -204,7 +204,9 @@ export default {
     //初始化信息
     async init() {
       if (this.isWeixin) {
-        window.localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.token) {
+          window.localStorage.setItem('token', this.$route.query.token)
+        }
         if (this.$route.query.signInvalid) {
           sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
         }

src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue

@@ -151,7 +151,9 @@ export default {
     // 初始化
     async init() {
       if (this.isWeixin) {
-        window.localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.token) {
+          window.localStorage.setItem('token', this.$route.query.token)
+        }
         // let signInvalid = sessionStorage.getItem('signInvalid')
         // let rs = await this.checkSignInvalid(signInvalid) // 微信分享验证校验值
         // if (rs == '1') {
@@ -163,7 +165,11 @@ export default {
 
         //获取腾讯人脸识别URL后，重新跳回页面，验证腾讯人脸识别结果，成功的话调签字面板
         if (localStorage['faceAuthWeXin-requestId'] && localStorage['faceAuthWeXin-bizToken'] && this.$route.query.faceAuthCountWeixin != undefined) {
-          this.getRecognitionResult(JSON.parse(localStorage['faceAuthWeXin-requestId']), JSON.parse(localStorage['faceAuthWeXin-bizToken']), JSON.parse(localStorage['orderNo']))
+          this.getRecognitionResult(
+            JSON.parse(localStorage['faceAuthWeXin-requestId']),
+            JSON.parse(localStorage['faceAuthWeXin-bizToken']),
+            JSON.parse(localStorage['orderNo'])
+          )
         }
         this.faceAuthCount.enjoy = this.$route.query.faceAuthCountAppnt == undefined ? 0 : Number(this.$route.query.faceAuthCountAppnt)
         this.faceAuthCount.weixin = this.$route.query.faceAuthCountWeixin == undefined ? 0 : Number(this.$route.query.faceAuthCountWeixin)

src/views/ebiz/billingDetail/billingDetail.vue

@@ -834,8 +834,8 @@ export default {
         let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
         console.log(y, m)
         this.monthValue = y + '-' + m
-        this.dialogForm.startDate = y + '-' + m + '-' + '01' // "2024-09-01",
-        this.dialogForm.endDate = y + '-' + m + '-' + '30'//"2024-09-30",
+        this.dialogForm.startDate = y + '-' + m + '-' + '01' // "2024-08-01",
+        this.dialogForm.endDate = y + '-' + m + '-' + '31'//"2024-08-31",
       })
       this.overlayShow = false
     },

src/views/ebiz/cardList/GroupAppntInfo.vue

@@ -42,7 +42,7 @@
                     @click="selectClick('3', '', '1')">证件扫描
         </van-button>
       </van-field>
-      <FieldDatePicter
+      <!-- <FieldDatePicter
         :v-validate='{ required: certiexpiredateRequired }'
         required
         label='证件截止日期'
@@ -59,7 +59,7 @@
         <van-checkbox v-model='userInfo.effectiveDateType' :disabled='effectiveDateTypeAble'
                       @change='effectiveDataTypeChange'>长期
         </van-checkbox>
-      </div>
+      </div> -->
       <select-radio required :radios='sexRadio' label='性别' name='性别' v-validate="'required'"
                     :value.sync='userInfo.sex'></select-radio>
       <FieldDatePicter
@@ -154,7 +154,7 @@
         v-validate="'required'"
         @click="toSelect('11')"
       />
-      <van-field
+      <!-- <van-field
         v-model='userInfo.homeName'
         readonly
         label='联系地址'
@@ -166,7 +166,7 @@
         @click="areaSelect('1')"
       />
       <van-field v-model='userInfo.homeAddress' label name='详细地址' placeholder='请输入详细地址' v-validate="'required'"
-                 clearable maxlength='30' />
+                 clearable maxlength='30' /> -->
       <!-- </template> -->
     </van-cell-group>
     <van-goods-action style='z-index: 99'>
@@ -331,7 +331,7 @@ export default {
         idType: '1', //证件类型
         idNo: '', //证件号码
         certiexpiredate: '', //证件到期时间
-        effectiveDateType: false, //是否长期
+        effectiveDateType: null, //是否长期
         occupationCode: '', //职业代码
         occupationName: '', //职业名称
         averageAnnualIncome: '', //平均年收入
@@ -339,9 +339,9 @@ export default {
         healthGrade: '', //健康等级
         nativeplace: '1', //国家地区
         marriageStatus: '', //婚姻状况
-        homeProvince: '450000', //家庭省
-        homeCity: '450100', //家庭市
-        homeArea: '450101', //家庭区
+        homeProvince: '', //家庭省
+        homeCity: '', //家庭市
+        homeArea: '', //家庭区
         homeName: '', //联系地址
         homeAddress: '', //详细地址
         mobile: '', //移动电话
@@ -380,7 +380,7 @@ export default {
     }
   },
   created() {
-    this.userInfo.homeName = getAreaName([{ code: 450000 }, { code: 450100 }, { code: 450101 }]) //家庭地址
+    // this.userInfo.homeName = getAreaName([{ code: 450000 }, { code: 450100 }, { code: 450101 }]) //家庭地址
   },
   async mounted() {
     let that = this
@@ -404,17 +404,17 @@ export default {
       cardOrderDetail(cardInfoDTO).then(res => {
         if (res.result == '0') {
           Object.assign(that.userInfo,res.orderDTO.appntDTO)
-          that.userInfo.effectiveDateType = that.userInfo.effectiveDateType == 'true'?true:false
-          that.userInfo.certiexpiredate = that.userInfo.effectiveDateType == 'true'?'':that.userInfo.certiexpiredate
-          that.userInfo.homeName = getAreaName([
-            { code: that.userInfo.homeProvince },
-            { code: that.userInfo.homeCity },
-            { code: that.userInfo.homeArea }
-          ])
-          if (this.userInfo.birthday) {
-            let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-            this.effectiveDateTypeAble = !(age >= 45)
-          }
+          // that.userInfo.effectiveDateType = that.userInfo.effectiveDateType == 'true'?true:false
+          // that.userInfo.certiexpiredate = that.userInfo.effectiveDateType == 'true'?'':that.userInfo.certiexpiredate
+          // that.userInfo.homeName = getAreaName([
+          //   { code: that.userInfo.homeProvince },
+          //   { code: that.userInfo.homeCity },
+          //   { code: that.userInfo.homeArea }
+          // ])
+          // if (this.userInfo.birthday) {
+          //   let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+          //   this.effectiveDateTypeAble = !(age >= 45)
+          // }
         }
       })
     }
@@ -517,7 +517,7 @@ export default {
     areaSelect(insureType) {
       ;[this.homeShow, this.insureType] = [true, insureType]
       if (insureType === '1') {
-        this.areaCode = this.userInfo.homeArea
+        // this.areaCode = this.userInfo.homeArea
       }
     },
     //监听名字变化
@@ -581,14 +581,14 @@ export default {
       } else if (this.pickerType == '2') {
         //身份证以外的证件类型可以使用长期
         //value.id 1 居民身份证 todo
-        if (value.id != '1') {
-          this.effectiveDateTypeAble = false
-        } else {
-          if (this.userInfo.birthday) {
-            let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-            this.effectiveDateTypeAble = !(age >= 45)
-          }
-        }
+        // if (value.id != '1') {
+        //   this.effectiveDateTypeAble = false
+        // } else {
+        //   if (this.userInfo.birthday) {
+        //     let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+        //     this.effectiveDateTypeAble = !(age >= 45)
+        //   }
+        // }
         this.userInfo.idType = value.id
       } else if (this.pickerType == '3') {
         this.userInfo.degree = value.id
@@ -632,50 +632,50 @@ export default {
           // }
         }
           break
-        case '1': {
-          console.log('证件截止日期')
-          //证件截止日期
-          //如果已经勾选了长期
-          if (this.userInfo.effectiveDateType) {
-            //清空数据并返回
-            this.userInfo.certiexpiredate = ''
-            this.$refs.certiexpiredate.date = ''
-            return
-          }
-          this.userInfo.effectiveDateType = false
-          //如果录入日期早于当前日期
-          if (Date.parse(val) < Date.parse(new Date())) {
-            this.userInfo.certiexpiredate = ''
-            this.$refs.certiexpiredate.date = ''
-            return this.$toast('您的证件已过期')
-          }
-          //不同证件类型的判断
-          // if (this.userInfo.idType) {
-          //   //获取年龄
-          //   let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-          //   console.log(age)
-          //   //年龄在16-25周岁之间
-          //   if (age >= 16 && age <= 25) {
-          //     if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-          //       this.userInfo.certiexpiredate = ''
-          //       this.$refs.certiexpiredate.date = ''
-          //       return this.$toast('16周岁~25周岁的证件有效期为10年')
-          //     }
-          //     //年龄在26-45周岁之间
-          //   } else if (age >= 26 && age <= 45) {
-          //     if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-          //       this.userInfo.certiexpiredate = ''
-          //       this.$refs.certiexpiredate.date = ''
-          //       return this.$toast('26周岁~45周岁的证件有效期为20年')
-          //     }
-          //     //此外的年龄段不支持
-          //   } else {
-          //     this.userInfo.certiexpiredate = ''
-          //     this.$refs.certiexpiredate.date = ''
-          //     return this.$toast('身份证不支持此年龄段')
-          //   }
-          // }
-        }
+        // case '1': {
+        //   console.log('证件截止日期')
+        //   //证件截止日期
+        //   //如果已经勾选了长期
+        //   if (this.userInfo.effectiveDateType) {
+        //     //清空数据并返回
+        //     this.userInfo.certiexpiredate = ''
+        //     this.$refs.certiexpiredate.date = ''
+        //     return
+        //   }
+        //   this.userInfo.effectiveDateType = false
+        //   //如果录入日期早于当前日期
+        //   if (Date.parse(val) < Date.parse(new Date())) {
+        //     this.userInfo.certiexpiredate = ''
+        //     this.$refs.certiexpiredate.date = ''
+        //     return this.$toast('您的证件已过期')
+        //   }
+        //   //不同证件类型的判断
+        //   // if (this.userInfo.idType) {
+        //   //   //获取年龄
+        //   //   let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+        //   //   console.log(age)
+        //   //   //年龄在16-25周岁之间
+        //   //   if (age >= 16 && age <= 25) {
+        //   //     if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
+        //   //       this.userInfo.certiexpiredate = ''
+        //   //       this.$refs.certiexpiredate.date = ''
+        //   //       return this.$toast('16周岁~25周岁的证件有效期为10年')
+        //   //     }
+        //   //     //年龄在26-45周岁之间
+        //   //   } else if (age >= 26 && age <= 45) {
+        //   //     if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
+        //   //       this.userInfo.certiexpiredate = ''
+        //   //       this.$refs.certiexpiredate.date = ''
+        //   //       return this.$toast('26周岁~45周岁的证件有效期为20年')
+        //   //     }
+        //   //     //此外的年龄段不支持
+        //   //   } else {
+        //   //     this.userInfo.certiexpiredate = ''
+        //   //     this.$refs.certiexpiredate.date = ''
+        //   //     return this.$toast('身份证不支持此年龄段')
+        //   //   }
+        //   // }
+        // }
           break
         case '2': {
           //出生日期
@@ -720,22 +720,22 @@ export default {
         this.userInfo.birthday = data.birthday //出生日期
         this.userInfo.idType = data.customerIdType //证件类型
         this.userInfo.idNo = data.customerIdNumber //证件类别
-        if (data.idEffectEndDate == '9999-12-31') {
-          this.userInfo.effectiveDateType = true //是否长期
-        } else {
-          this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
-          this.userInfo.effectiveDateType = false //是否长期
-        }
+        // if (data.idEffectEndDate == '9999-12-31') {
+        //   this.userInfo.effectiveDateType = true //是否长期
+        // } else {
+        //   this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
+        //   this.userInfo.effectiveDateType = false //是否长期
+        // }
         this.userInfo.email = data.email //电子邮箱
 
         this.userInfo.mobile = data.customerPhone //移动电话
-        this.userInfo.homeProvince = data.homeProvince //家庭省
-        this.userInfo.homeCity = data.homeCity //家庭市
-        this.userInfo.homeArea = data.homeArea //家庭区
-        if (data.homeProvince && data.homeCity && data.homeArea) {
-          this.userInfo.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
-        }
-        this.userInfo.homeAddress = data.homeAddress //家庭详细地址
+        // this.userInfo.homeProvince = data.homeProvince //家庭省
+        // this.userInfo.homeCity = data.homeCity //家庭市
+        // this.userInfo.homeArea = data.homeArea //家庭区
+        // if (data.homeProvince && data.homeCity && data.homeArea) {
+        //   this.userInfo.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
+        // }
+        // this.userInfo.homeAddress = data.homeAddress //家庭详细地址
         // this.userInfo.occupationCode = data.occupationCode
         // this.userInfo.occupationName = data.occupationName
         // this.userInfo.occupationType = data.lifeGrade
@@ -821,36 +821,36 @@ export default {
               console.log('证件号码校验有误')
               return this.$toast('您填写的证件号码有误')
             }
-            if (age < 46 && this.userInfo.effectiveDateType == true) {
-              return this.$toast('证件有效期错误，年龄小于46周岁的公民身份证有效期不能为长期')
-            }
+            // if (age < 46 && this.userInfo.effectiveDateType == true) {
+            //   return this.$toast('证件有效期错误，年龄小于46周岁的公民身份证有效期不能为长期')
+            // }
             // 年龄在 16-25 周岁之间
-            if (age <= 15) {
-              if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
-                this.userInfo.certiexpiredate = ''
-                this.$refs.certiexpiredate.date = ''
-                // this.effectiveDateTypeAble = true
-                return this.$toast('证件有效期错误，未满16周岁的公民身份证有效期应小于等于5年')
-              }
-              //年龄在 16-25 周岁之间
-            } else if (age >= 16 && age <= 25) {
-              console.log('年龄在16-25周岁之间')
-              if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1980-01-01')) {
-                this.userInfo.certiexpiredate = ''
-                this.$refs.certiexpiredate.date = ''
-                this.effectiveDateTypeAble = true
-                return this.$toast('证件有效期不正常，16周岁至25周岁公民身份证有效期应小于等于10年')
-              }
-              //年龄在 26-45 周岁之间
-            } else if (age >= 26 && age <= 45) {
-              console.log('年龄在26-45周岁之间')
-              if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1990-01-01')) {
-                this.userInfo.certiexpiredate = ''
-                this.$refs.certiexpiredate.date = ''
-                this.effectiveDateTypeAble = true
-                return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年')
-              }
-            }
+            // if (age <= 15) {
+            //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
+            //     this.userInfo.certiexpiredate = ''
+            //     this.$refs.certiexpiredate.date = ''
+            //     // this.effectiveDateTypeAble = true
+            //     return this.$toast('证件有效期错误，未满16周岁的公民身份证有效期应小于等于5年')
+            //   }
+            //   //年龄在 16-25 周岁之间
+            // } else if (age >= 16 && age <= 25) {
+            //   console.log('年龄在16-25周岁之间')
+            //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1980-01-01')) {
+            //     this.userInfo.certiexpiredate = ''
+            //     this.$refs.certiexpiredate.date = ''
+            //     this.effectiveDateTypeAble = true
+            //     return this.$toast('证件有效期不正常，16周岁至25周岁公民身份证有效期应小于等于10年')
+            //   }
+            //   //年龄在 26-45 周岁之间
+            // } else if (age >= 26 && age <= 45) {
+            //   console.log('年龄在26-45周岁之间')
+            //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1990-01-01')) {
+            //     this.userInfo.certiexpiredate = ''
+            //     this.$refs.certiexpiredate.date = ''
+            //     this.effectiveDateTypeAble = true
+            //     return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年')
+            //   }
+            // }
           }
           if (this.manageComCode == '45' && (this.userInfo.isNewPeopleFlag == '' || this.userInfo.isNewPeopleFlag == null || this.userInfo.isNewPeopleFlag == undefined)) {
             return this.$toast('投保人新市民身份不能为空')
@@ -910,13 +910,13 @@ export default {
           ;[this.userInfo.companyProvince, this.userInfo.companyCity, this.userInfo.companyArea] = [area[0].code, area[1].code, area[2].code]
           this.areaShow = false
           break
-        case '2': //家庭地址
-          if (this.insureType === '1') {
-            this.userInfo.homeName = getAreaName(area)
-            ;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
-            this.homeShow = false
-          }
-          break
+        // case '2': //家庭地址
+        //   if (this.insureType === '1') {
+        //     this.userInfo.homeName = getAreaName(area)
+        //     ;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
+        //     this.homeShow = false
+        //   }
+        //   break
         case '3': //户籍
           this.census = getAreaName(area)
           ;[this.userInfo.householdProvince, this.userInfo.householdCity] = [area[0].code, area[1].code]

src/views/ebiz/cardList/GroupCheckInfo.vue

@@ -6,8 +6,8 @@
       <van-field :value="appntInfo.idType | idToText('insuredIdType')" label='证件类型' name='证件类型' readonly />
       <van-field :value='appntInfo.idNo' label='证件号码' name='证件号码' readonly />
       <van-field :value='appntInfo.mobile' label='手机号码' name='手机号码' readonly />
-      <van-field :value='appntInfo.homeName' label='联系地址' name='联系地址' readonly />
-      <van-field :value='appntInfo.homeAddress' label='' name='详细地址' readonly />
+      <van-field :value='appntInfo.homeName' label='联系地址' name='联系地址' readonly v-if="appntInfo.homeName"/>
+      <van-field :value='appntInfo.homeAddress' label='' name='详细地址' readonly v-if="appntInfo.homeAddress"/>
     </van-cell-group>
     <van-cell-group class='mt10'>
       <p style='border-bottom: 1px solid #ebedf0' class='fs15 fwb pl10 pv12'>产品信息</p>
@@ -32,8 +32,8 @@
           <van-field :value='item.idNo' label='证件号码' name='证件号码' readonly />
           <!-- <van-field v-if='item.isLessEighteen' :value='item.mobile' label='手机号码' name='手机号码' readonly /> -->
           <!-- <van-field v-if='item.isLessEighteen' :value='item.email' label='电子邮箱' name='电子邮箱' readonly /> -->
-          <van-field :value='item.homeName' label='联系地址' name='联系地址' readonly />
-          <van-field :value='item.homeAddress' label='' name='详细地址' readonly />
+          <van-field :value='item.homeName' label='联系地址' name='联系地址' readonly v-if="item.homeName" />
+          <van-field :value='item.homeAddress' label='' name='详细地址' readonly v-if="item.homeAddress"/>
           <van-field :value='bnfTypeVal' label='受益人类型' name='受益人类型' readonly />
         </van-collapse-item>
       </van-collapse>

src/views/ebiz/cardList/GroupInsuredInfo.vue

@@ -42,7 +42,7 @@
                     @click="selectClick('3', '', '2')">证件扫描
         </van-button>
       </van-field>
-      <FieldDatePicter
+      <!-- <FieldDatePicter
         v-if="isInsuredCertiexpiredate"
         :v-validate='{ required: certiexpiredateRequiredInsured }'
         required
@@ -62,7 +62,7 @@
         >长期
         </van-checkbox
         >
-      </div>
+      </div> -->
       <select-radio required :radios='sexRadio' label='性别' name='性别' :disabled="isAppnt" v-validate="'required'"
                     :value.sync='insuredInfo.sex'></select-radio>
       <FieldDatePicter
@@ -170,7 +170,7 @@
         v-validate="'required'"
         @click="toSelect('npType')"
       />
-      <van-field
+      <!-- <van-field
         v-model='insuredInfo.homeName'
         readonly
         label='联系地址'
@@ -181,11 +181,11 @@
         @click="areaSelect('2')"
       />
       <van-field v-model='insuredInfo.homeAddress' :readonly="isAppnt" label name='详细地址'
-                 placeholder='请输入详细地址' clearable maxlength='30' />
+                 placeholder='请输入详细地址' clearable maxlength='30' /> -->
 
-      <div class='pl10 pt10 pb10 pr10 address fs14 redRadioCheckbox'>
+      <!-- <div class='pl10 pt10 pb10 pr10 address fs14 redRadioCheckbox'>
         <van-checkbox v-model='withRootUser.value' :disabled="isAppnt">同投保人</van-checkbox>
-      </div>
+      </div> -->
     </van-cell-group>
     <!-- 受益人信息 -->
     <van-cell-group class='mt10'>
@@ -406,7 +406,7 @@ export default {
         idType: '1', //证件类型
         idNo: '', //证件号码
         certiexpiredate: '', //证件到期时间
-        effectiveDateType: false, //是否长期
+        effectiveDateType: null, //是否长期
         occupationCode: '', //职业代码
         occupationName: '', //职业名称
         averageAnnualIncome: '', //平均年收入
@@ -414,9 +414,9 @@ export default {
         healthGrade: '', //健康等级
         nativeplace: '1', //国家地区
         marriageStatus: '', //婚姻状况
-        homeProvince: '450000', //家庭省
-        homeCity: '450100', //家庭市
-        homeArea: '450101', //家庭区
+        homeProvince: '', //家庭省
+        homeCity: '', //家庭市
+        homeArea: '', //家庭区
         homeName: '', //联系地址
         homeAddress: '', //详细地址
         mobile: '', //移动电话
@@ -445,9 +445,9 @@ export default {
         nativeplace: '1', //国家地区
         marriageStatus: '', //婚姻状况
         marriage: '',
-        homeProvince: '450000', //家庭省
-        homeCity: '450100', //家庭市
-        homeArea: '450101', //家庭区
+        homeProvince: '', //家庭省
+        homeCity: '', //家庭市
+        homeArea: '', //家庭区
         homeName: '', //联系地址
         homeAddress: '', //详细地址
         mobile: '', //移动电话
@@ -479,7 +479,7 @@ export default {
       // showFirstOr: false,
       withRootUser: {
         load: false, //防止重复请求
-        value: false
+        value: null
       },
       occupationalType: DataDictionary.queryOccupationalByType[0].id,
       isInsuredCertiexpiredate:true, //被保人有效止期是否显示
@@ -545,27 +545,27 @@ export default {
       if (res.result == '0') {
         Object.assign(this.userInfo,res.orderDTO.appntDTO)
         //被保险人联系地址默认投保人地址，支持修改。
-        this.insuredInfo.homeName = getAreaName([
-          { code: this.userInfo.homeProvince },
-          { code: this.userInfo.homeCity },
-          { code: this.userInfo.homeArea }
-        ])
-        this.insuredInfo.homeProvince = this.userInfo.homeProvince
-        this.insuredInfo.homeCity = this.userInfo.homeCity
-        this.insuredInfo.homeArea = this.userInfo.homeArea
-        this.insuredInfo.homeAddress = this.userInfo.homeAddress
+        // this.insuredInfo.homeName = getAreaName([
+        //   { code: this.userInfo.homeProvince },
+        //   { code: this.userInfo.homeCity },
+        //   { code: this.userInfo.homeArea }
+        // ])
+        // this.insuredInfo.homeProvince = this.userInfo.homeProvince
+        // this.insuredInfo.homeCity = this.userInfo.homeCity
+        // this.insuredInfo.homeArea = this.userInfo.homeArea
+        // this.insuredInfo.homeAddress = this.userInfo.homeAddress
         if(that.$route.query.insuredId){  //编辑
           res.orderDTO.insuredDTOs.forEach(item => {
             if(that.$route.query.insuredId == item.insuredId){
               Object.assign(that.insuredInfo,item)
-              that.insuredInfo.effectiveDateType = that.insuredInfo.effectiveDateType == 'true'?true:false
-              that.insuredInfo.certiexpiredate = that.insuredInfo.effectiveDateType == 'true'?'':that.insuredInfo.certiexpiredate
-              that.insuredInfo.homeName = getAreaName([
-                { code: that.insuredInfo.homeProvince },
-                { code: that.insuredInfo.homeCity },
-                { code: that.insuredInfo.homeArea }
-              ])
-              that.proScheme = that.insuredInfo.riskDTOLst[0].proScheme
+              // that.insuredInfo.effectiveDateType = that.insuredInfo.effectiveDateType == 'true'?true:false
+              // that.insuredInfo.certiexpiredate = that.insuredInfo.effectiveDateType == 'true'?'':that.insuredInfo.certiexpiredate
+              // that.insuredInfo.homeName = getAreaName([
+              //   { code: that.insuredInfo.homeProvince },
+              //   { code: that.insuredInfo.homeCity },
+              //   { code: that.insuredInfo.homeArea }
+              // ])
+              // that.proScheme = that.insuredInfo.riskDTOLst[0].proScheme
               that.proSchemeCode = that.insuredInfo.riskDTOLst[0].proSchemeCode
               that.allPrice = that.insuredInfo.riskDTOLst[0].prem
               that.insuanceId = that.insuredInfo.riskDTOLst[0].insuanceId
@@ -574,6 +574,7 @@ export default {
                 let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
                 this.effectiveDateTypeAbleInsured = !(age >= 45)
               }
+              console.log(123133,this.insureInfo, 'that.insuredInfo')
               //编辑时走试算接口
               this.insureTrial(1)
             }
@@ -581,13 +582,13 @@ export default {
         } else {
           if(that.$route.query.relationToAppnt == '1'){  //新增关系为本人
             Object.assign(this.insuredInfo,res.orderDTO.appntDTO)
-            that.insuredInfo.effectiveDateType = that.insuredInfo.effectiveDateType == 'true'?true:false
-            that.insuredInfo.certiexpiredate = that.insuredInfo.effectiveDateType == 'true'?'':that.userInfo.certiexpiredate
-            this.insuredInfo.homeName = getAreaName([
-              { code: this.insuredInfo.homeProvince },
-              { code: this.insuredInfo.homeCity },
-              { code: this.insuredInfo.homeArea }
-            ])
+            // that.insuredInfo.effectiveDateType = that.insuredInfo.effectiveDateType == 'true'?true:false
+            // that.insuredInfo.certiexpiredate = that.insuredInfo.effectiveDateType == 'true'?'':that.userInfo.certiexpiredate
+            // this.insuredInfo.homeName = getAreaName([
+            //   { code: this.insuredInfo.homeProvince },
+            //   { code: this.insuredInfo.homeCity },
+            //   { code: this.insuredInfo.homeArea }
+            // ])
             that.insuredInfo.medical = '0'
             if (this.insuredInfo.birthday) {
               let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
@@ -680,7 +681,7 @@ export default {
       }
       ;[this.homeShow, this.insureType] = [true, insureType]
       if (insureType === '2') {
-        this.areaCode = this.insuredInfo.homeArea
+        // this.areaCode = this.insuredInfo.homeArea
       }
     },
     //监听名字变化
@@ -827,44 +828,44 @@ export default {
         //选择保障方案时走试算接口
         await this.insureTrial(0) 
       } else if (this.pickerType == '22') {
-        this.idLimitInsured = false
-        //选择证件类型后，清空证件号，证件截止日期，出生日期
-        this.insuredInfo.idNo = this.insuredInfo.certiexpiredate = this.insuredInfo.birthday = ''
+        // this.idLimitInsured = false
+        // //选择证件类型后，清空证件号，证件截止日期，出生日期
+        // this.insuredInfo.idNo = this.insuredInfo.certiexpiredate = this.insuredInfo.birthday = ''
         //身份证以外的证件类型可以使用长期
         //value.id 1 居民身份证 todo
-        if (value.id != '1') {
-          //2516--三个学平险--被保险人身份信息选择仅保留“身份证、户口本”，目前选择户口本仍要填写身份证到期
-          //时间，如果选择户口本项，默认为长期。
-          if (this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050') {
-            this.insuredInfo.effectiveDateType = true
-          }
-          this.effectiveDateTypeAbleInsured = false
-        } else {
-          //身份证
-          if (this.insuredInfo.birthday) {
-            let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
-            this.effectiveDateTypeAbleInsured = !(age >= 45)
-            //身份证，年龄小于等于45，不可选长期
-            this.insuredInfo.effectiveDateType = false
-          }
-        }
+        // if (value.id != '1') {
+        //   //2516--三个学平险--被保险人身份信息选择仅保留“身份证、户口本”，目前选择户口本仍要填写身份证到期
+        //   //时间，如果选择户口本项，默认为长期。
+        //   if (this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050') {
+        //     this.insuredInfo.effectiveDateType = true
+        //   }
+        //   this.effectiveDateTypeAbleInsured = false
+        // } else {
+        //   //身份证
+        //   if (this.insuredInfo.birthday) {
+        //     let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
+        //     this.effectiveDateTypeAbleInsured = !(age >= 45)
+        //     //身份证，年龄小于等于45，不可选长期
+        //     this.insuredInfo.effectiveDateType = false
+        //   }
+        // }
         // 去掉--选择户口本时，是否长期默认为是，不可点击，有效止期隐藏（证件类型为户口本时，被保人年龄小于16周岁时，户口本有效止期长期变更为第16周岁日期）
-        if(value.id==2){
-          this.idLimitInsured = true
-          //证件类型户口本时，证件截止日期和是否长期不可选择
-          this.effectiveDateTypeAbleInsured = true //长期按钮是否禁用--被保人
-          this.insuredInfo.effectiveDateType = false    //是否长期
-          // this.insuredInfo.effectiveDateType = true
-          // this.insuredInfo.certiexpiredate = '9999-12-31'
-          // this.effectiveDateTypeAbleInsured = true
-          // this.isInsuredCertiexpiredate = false
-          // this.isInsuredCertiexpiredate = true
-        }else{
-          this.insuredInfo.certiexpiredate = ''
-          this.insuredInfo.effectiveDateType = false
-          this.effectiveDateTypeAbleInsured = false
-          // this.isInsuredCertiexpiredate = true
-        }
+        // if(value.id==2){
+        //   this.idLimitInsured = true
+        //   //证件类型户口本时，证件截止日期和是否长期不可选择
+        //   this.effectiveDateTypeAbleInsured = true //长期按钮是否禁用--被保人
+        //   this.insuredInfo.effectiveDateType = false    //是否长期
+        //   // this.insuredInfo.effectiveDateType = true
+        //   // this.insuredInfo.certiexpiredate = '9999-12-31'
+        //   // this.effectiveDateTypeAbleInsured = true
+        //   // this.isInsuredCertiexpiredate = false
+        //   // this.isInsuredCertiexpiredate = true
+        // }else{
+        //   this.insuredInfo.certiexpiredate = ''
+        //   this.insuredInfo.effectiveDateType = false
+        //   this.effectiveDateTypeAbleInsured = false
+        //   // this.isInsuredCertiexpiredate = true
+        // }
         this.insuredInfo.idType = value.id
       } else if(this.pickerType == 'npType') {
         this.userInfo.npType = value.id
@@ -1026,25 +1027,25 @@ export default {
           this.productDate = currentData + '0时至' + productDateTime + '24时止'
         }
           break
-        case '7': {
-          console.log('证件截止日期')
-          //被保人--证件截止日期
-          //如果已经勾选了长期
-          if (this.insuredInfo.effectiveDateType) {
-            //清空数据并返回
-            this.insuredInfo.certiexpiredate = ''
-            this.$refs.certiexpiredate.date = ''
-            return
-          }
-          this.insuredInfo.effectiveDateType = false
-          //如果录入日期早于当前日期
-          if (Date.parse(val) < Date.parse(new Date())) {
-            this.insuredInfo.certiexpiredate = ''
-            this.$refs.certiexpiredate.date = ''
-            return this.$toast('您的证件已过期')
-          }
-        }
-          break
+        // case '7': {
+        //   console.log('证件截止日期')
+        //   //被保人--证件截止日期
+        //   //如果已经勾选了长期
+        //   if (this.insuredInfo.effectiveDateType) {
+        //     //清空数据并返回
+        //     this.insuredInfo.certiexpiredate = ''
+        //     this.$refs.certiexpiredate.date = ''
+        //     return
+        //   }
+        //   this.insuredInfo.effectiveDateType = false
+        //   //如果录入日期早于当前日期
+        //   if (Date.parse(val) < Date.parse(new Date())) {
+        //     this.insuredInfo.certiexpiredate = ''
+        //     this.$refs.certiexpiredate.date = ''
+        //     return this.$toast('您的证件已过期')
+        //   }
+        // }
+        //   break
       }
     },
     //选择客户
@@ -1071,45 +1072,45 @@ export default {
         this.insuredInfo.birthday = data.birthday //出生日期
         this.insuredInfo.idType = data.customerIdType //证件类型
         this.insuredInfo.idNo = data.customerIdNumber //证件类别
-        if(this.insuredInfo.idType == '2' && idToData(this.insuredInfo.idNo).age <16){
-          // 获取出生日期年份＋16，证件类型为户口本时，被保人年龄小于16周岁时，卡单户口本有效止期长期变更为第16周岁日期
-          let year = Number(this.insuredInfo.birthday.substr(0,4)) + 16
-          if(this.insuredInfo.birthday.substr(5,5) == '02-29'){
-            // 获取某年某月一共多少天
-            let date = new Date(year, 2, 1)
-            let dayEnd = new Date(date.getTime() - 864e5).getDate()
-            this.insuredInfo.certiexpiredate = year +'-02-'+ dayEnd
-          }else{
-            this.insuredInfo.certiexpiredate = year +'-'+ this.insuredInfo.birthday.substr(5,5)
-          }
-        }
+        // if(this.insuredInfo.idType == '2' && idToData(this.insuredInfo.idNo).age <16){
+        //   // 获取出生日期年份＋16，证件类型为户口本时，被保人年龄小于16周岁时，卡单户口本有效止期长期变更为第16周岁日期
+        //   let year = Number(this.insuredInfo.birthday.substr(0,4)) + 16
+        //   if(this.insuredInfo.birthday.substr(5,5) == '02-29'){
+        //     // 获取某年某月一共多少天
+        //     let date = new Date(year, 2, 1)
+        //     let dayEnd = new Date(date.getTime() - 864e5).getDate()
+        //     this.insuredInfo.certiexpiredate = year +'-02-'+ dayEnd
+        //   }else{
+        //     this.insuredInfo.certiexpiredate = year +'-'+ this.insuredInfo.birthday.substr(5,5)
+        //   }
+        // }
         //户口本
-        if (data.customerIdType == 2) {
-          this.insuredInfo.effectiveDateType = true
-          this.insuredInfo.certiexpiredate = '9999-12-31'
-          this.effectiveDateTypeAbleInsured = true
-          // this.isInsuredCertiexpiredate = false
-        }else{
-          // this.isInsuredCertiexpiredate = true         
-          if (data.idEffectEndDate == '9999-12-31') {
-            this.insuredInfo.certiexpiredate = ''
-            this.insuredInfo.effectiveDateType = true //是否长期
-            this.effectiveDateTypeAbleInsured = true
-          } else {
-            this.insuredInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
-            this.insuredInfo.effectiveDateType = false
-            this.effectiveDateTypeAbleInsured = false
-          }          
-        }
+        // if (data.customerIdType == 2) {
+        //   this.insuredInfo.effectiveDateType = true
+        //   this.insuredInfo.certiexpiredate = '9999-12-31'
+        //   this.effectiveDateTypeAbleInsured = true
+        //   // this.isInsuredCertiexpiredate = false
+        // }else{
+        //   // this.isInsuredCertiexpiredate = true         
+        //   if (data.idEffectEndDate == '9999-12-31') {
+        //     this.insuredInfo.certiexpiredate = ''
+        //     this.insuredInfo.effectiveDateType = true //是否长期
+        //     this.effectiveDateTypeAbleInsured = true
+        //   } else {
+        //     this.insuredInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
+        //     this.insuredInfo.effectiveDateType = false
+        //     this.effectiveDateTypeAbleInsured = false
+        //   }          
+        // }
         this.insuredInfo.email = data.email //电子邮箱
         this.insuredInfo.mobile = data.customerPhone //移动电话
-        this.insuredInfo.homeProvince = data.homeProvince?data.homeProvince:this.userInfo.homeProvince//家庭省
-        this.insuredInfo.homeCity = data.homeCity?data.homeCity:this.userInfo.homeCity //家庭市
-        this.insuredInfo.homeArea = data.homeArea?data.homeArea:this.userInfo.homeArea //家庭区
-        if (data.homeProvince && data.homeCity && data.homeArea) {
-          this.insuredInfo.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
-        }
-        this.insuredInfo.homeAddress = data.homeAddress //家庭详细地址
+        // this.insuredInfo.homeProvince = data.homeProvince?data.homeProvince:this.userInfo.homeProvince//家庭省
+        // this.insuredInfo.homeCity = data.homeCity?data.homeCity:this.userInfo.homeCity //家庭市
+        // this.insuredInfo.homeArea = data.homeArea?data.homeArea:this.userInfo.homeArea //家庭区
+        // if (data.homeProvince && data.homeCity && data.homeArea) {
+        //   this.insuredInfo.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
+        // }
+        // this.insuredInfo.homeAddress = data.homeAddress //家庭详细地址
         this.insuredInfo.medical = data.socialSecurity //有无社保
         // this.insuredInfo.occupationCode = data.occupationCode
         // this.insuredInfo.occupationName = data.occupationName
@@ -1180,12 +1181,12 @@ export default {
           if (!this.insuredInfo.marriage) {
             return this.$toast('被保人婚姻状况不能为空')
           }
-          if (!this.insuredInfo.homeName) {
-            return this.$toast('被保人联系地址不能为空')
-          }
-          if (!this.insuredInfo.homeAddress) {
-            return this.$toast('被保人详细地址不能为空')
-          }
+          // if (!this.insuredInfo.homeName) {
+          //   return this.$toast('被保人联系地址不能为空')
+          // }
+          // if (!this.insuredInfo.homeAddress) {
+          //   return this.$toast('被保人详细地址不能为空')
+          // }
           if (this.insuredInfo.relationToAppnt == 2 && this.userInfo.sex == this.insuredInfo.sex) {
             return this.$toast('哦~配偶性别不能相同的哟~')
           }
@@ -1237,36 +1238,36 @@ export default {
               console.log('证件号码校验有误')
               return this.$toast('您填写的证件号码有误')
             }
-            if (insuredAge < 46 && this.insuredInfo.effectiveDateType == true) {
-              return this.$toast('证件有效期错误，年龄小于46周岁的公民身份证有效期不能为长期')
-            }
+            // if (insuredAge < 46 && this.insuredInfo.effectiveDateType == true) {
+            //   return this.$toast('证件有效期错误，年龄小于46周岁的公民身份证有效期不能为长期')
+            // }
 
             // 年龄在 16-25 周岁之间
-            if (insuredAge <= 15) {
-              if (Date.parse(this.insuredInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
-                this.insuredInfo.certiexpiredate = ''
-                this.$refs.certiexpiredate.date = ''
-                // this.effectiveDateTypeAble = true
-                return this.$toast('证件有效期错误，未满16周岁的公民身份证有效期应小于等于5年')
-              }
-              //年龄在 16-25 周岁之间
-            } else if (insuredAge >= 16 && insuredAge <= 25) {
-              console.log('年龄在16-25周岁之间')
-              if (Date.parse(this.insuredInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1980-01-01')) {
-                this.insuredInfo.certiexpiredate = ''
-                this.$refs.certiexpiredate.date = ''
-                this.certiexpiredateRequiredInsured = true
-                return this.$toast('证件有效期不正常，16周岁至25周岁公民身份证有效期应小于等于10年')
-              }
-              //年龄在 26-45 周岁之间
-            } else if (insuredAge >= 26 && insuredAge <= 45) {
-              if (Date.parse(this.insuredInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1990-01-01')) {
-                this.insuredInfo.certiexpiredate = ''
-                this.$refs.certiexpiredate.date = ''
-                this.certiexpiredateRequiredInsured = true
-                return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年')
-              }
-            }
+            // if (insuredAge <= 15) {
+            //   if (Date.parse(this.insuredInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
+            //     this.insuredInfo.certiexpiredate = ''
+            //     this.$refs.certiexpiredate.date = ''
+            //     // this.effectiveDateTypeAble = true
+            //     return this.$toast('证件有效期错误，未满16周岁的公民身份证有效期应小于等于5年')
+            //   }
+            //   //年龄在 16-25 周岁之间
+            // } else if (insuredAge >= 16 && insuredAge <= 25) {
+            //   console.log('年龄在16-25周岁之间')
+            //   if (Date.parse(this.insuredInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1980-01-01')) {
+            //     this.insuredInfo.certiexpiredate = ''
+            //     this.$refs.certiexpiredate.date = ''
+            //     this.certiexpiredateRequiredInsured = true
+            //     return this.$toast('证件有效期不正常，16周岁至25周岁公民身份证有效期应小于等于10年')
+            //   }
+            //   //年龄在 26-45 周岁之间
+            // } else if (insuredAge >= 26 && insuredAge <= 45) {
+            //   if (Date.parse(this.insuredInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1990-01-01')) {
+            //     this.insuredInfo.certiexpiredate = ''
+            //     this.$refs.certiexpiredate.date = ''
+            //     this.certiexpiredateRequiredInsured = true
+            //     return this.$toast('证件有效期不正常，26周岁至45周岁公民身份证有效期应小于等于20年')
+            //   }
+            // }
           }else if(this.insuredInfo.idType == '2'){
             if (idToData(this.insuredInfo.idNo).age >= 16) {
               return this.$toast('客户年龄在16周岁以上，不能使用户口本作为有效证件')
@@ -1356,10 +1357,10 @@ export default {
           if (this.insuredInfo.medical == '1') {
             return this.$toast('被保险人需有社保，才可投保此险种。')
           }
-          // 是否长期选项 赋值
-          if (this.insuredInfo.effectiveDateType) {
-            this.insuredInfo.certiexpiredate = '9999-12-31'
-          }
+          // // 是否长期选项 赋值
+          // if (this.insuredInfo.effectiveDateType) {
+          //   this.insuredInfo.certiexpiredate = '9999-12-31'
+          // }
           if (this.manageComCode == '45' && (this.insuredInfo.isNewPeopleFlag == '' || this.insuredInfo.isNewPeopleFlag == null || this.insuredInfo.isNewPeopleFlag == undefined)) {
             return this.$toast('投保人新市民身份不能为空')
           }
@@ -1601,17 +1602,17 @@ export default {
           this.idLimitInsured = false
         }
         // 获取出生日期年份＋16，证件类型为户口本时，被保人年龄小于16周岁时，卡单户口本有效止期长期变更为第16周岁日期
-        if(this.insuredInfo.idType == '2' && idToData(this.insuredInfo.idNo).age <16){
-          let year = Number(this.insuredInfo.birthday.substr(0,4)) + 16
-          if(this.insuredInfo.birthday.substr(5,5) == '02-29'){
-            // 获取某年某月一共多少天
-            let date = new Date(year, 2, 1)
-            let dayEnd = new Date(date.getTime() - 864e5).getDate()
-            this.insuredInfo.certiexpiredate = year+'-02-'+ dayEnd
-          }else{
-            this.insuredInfo.certiexpiredate =  year+'-'+ this.insuredInfo.birthday.substr(5,5)
-          }
-        }
+        // if(this.insuredInfo.idType == '2' && idToData(this.insuredInfo.idNo).age <16){
+        //   let year = Number(this.insuredInfo.birthday.substr(0,4)) + 16
+        //   if(this.insuredInfo.birthday.substr(5,5) == '02-29'){
+        //     // 获取某年某月一共多少天
+        //     let date = new Date(year, 2, 1)
+        //     let dayEnd = new Date(date.getTime() - 864e5).getDate()
+        //     this.insuredInfo.certiexpiredate = year+'-02-'+ dayEnd
+        //   }else{
+        //     this.insuredInfo.certiexpiredate =  year+'-'+ this.insuredInfo.birthday.substr(5,5)
+        //   }
+        // }
         this.insuredInfo.sex = idToData(val).sex       
         if (this.insuredInfo.birthday) {
           let age = utilsAge.getAge(this.insuredInfo.birthday, new Date())
@@ -1768,47 +1769,47 @@ export default {
     //   immediate: true,
     //   deep: true
     // },
-    'userInfo.homeName': {
-      handler(newV) {
-        if (this.withRootUser.value) {
-          this.insuredInfo.homeName = getAreaName([
-            { code: this.userInfo.homeProvince },
-            { code: this.userInfo.homeCity },
-            { code: this.userInfo.homeArea }
-          ])
-          this.insuredInfo.homeProvince = this.userInfo.homeProvince
-          this.insuredInfo.homeCity = this.userInfo.homeCity
-          this.insuredInfo.homeArea = this.userInfo.homeArea
-          this.insuredInfo.homeAddress = this.userInfo.homeAddress
-        }
-      },
-      immediate: true,
-      deep: true
-    },
-    'userInfo.homeAddress': {
-      handler(newV) {
-        if (this.withRootUser.value) {
-          this.insuredInfo.homeAddress = this.userInfo.homeAddress
-        }
-      },
-      immediate: true,
-      deep: true
-    },
-    async 'withRootUser.value'(n) {
-      if (n) {
-        this.insuredInfo.homeName = getAreaName([
-          { code: this.userInfo.homeProvince },
-          { code: this.userInfo.homeCity },
-          { code: this.userInfo.homeArea }
-        ])
-        this.insuredInfo.homeProvince = this.userInfo.homeProvince
-        this.insuredInfo.homeCity = this.userInfo.homeCity
-        this.insuredInfo.homeArea = this.userInfo.homeArea
-        this.insuredInfo.homeAddress = this.userInfo.homeAddress
-      } else {
-        this.insuredInfo.homeName = this.insuredInfo.homeAddress = ''
-      }
-    }
+    // 'userInfo.homeName': {
+    //   handler(newV) {
+    //     if (this.withRootUser.value) {
+    //       this.insuredInfo.homeName = getAreaName([
+    //         { code: this.userInfo.homeProvince },
+    //         { code: this.userInfo.homeCity },
+    //         { code: this.userInfo.homeArea }
+    //       ])
+    //       this.insuredInfo.homeProvince = this.userInfo.homeProvince
+    //       this.insuredInfo.homeCity = this.userInfo.homeCity
+    //       this.insuredInfo.homeArea = this.userInfo.homeArea
+    //       this.insuredInfo.homeAddress = this.userInfo.homeAddress
+    //     }
+    //   },
+    //   immediate: true,
+    //   deep: true
+    // },
+    // 'userInfo.homeAddress': {
+    //   handler(newV) {
+    //     if (this.withRootUser.value) {
+    //       this.insuredInfo.homeAddress = this.userInfo.homeAddress
+    //     }
+    //   },
+    //   immediate: true,
+    //   deep: true
+    // },
+    // async 'withRootUser.value'(n) {
+    //   if (n) {
+    //     this.insuredInfo.homeName = getAreaName([
+    //       { code: this.userInfo.homeProvince },
+    //       { code: this.userInfo.homeCity },
+    //       { code: this.userInfo.homeArea }
+    //     ])
+    //     this.insuredInfo.homeProvince = this.userInfo.homeProvince
+    //     this.insuredInfo.homeCity = this.userInfo.homeCity
+    //     this.insuredInfo.homeArea = this.userInfo.homeArea
+    //     this.insuredInfo.homeAddress = this.userInfo.homeAddress
+    //   } else {
+    //     this.insuredInfo.homeName = this.insuredInfo.homeAddress = ''
+    //   }
+    // }
   }
 }
 </script>

src/views/ebiz/cardList/cardDetail.vue

@@ -7,8 +7,8 @@
       <van-field :value='appntInfo.idNo' label='证件号码' name='证件号码' readonly />
       <van-field :value='appntInfo.mobile' label='手机号码' name='手机号码' readonly />
       <van-field :value='appntInfo.email' label='电子邮箱' name='电子邮箱' readonly />
-      <van-field :value='appntInfo.homeName' label='联系地址' name='联系地址' readonly />
-      <van-field :value='appntInfo.homeAddress' label='详细地址' name='详细地址' readonly />
+      <van-field :value='appntInfo.homeName' label='联系地址' name='联系地址' readonly v-if="appntInfo.homeName"/>
+      <van-field :value='appntInfo.homeAddress' label='详细地址' name='详细地址' readonly v-if="appntInfo.homeAddress"/>
     </van-cell-group>
     <van-cell-group class='mt10'>
       <p style='border-bottom: 1px solid #ebedf0' class='fs15 fwb pl10 pv12'>被保人信息</p>
@@ -17,8 +17,8 @@
       <van-field :value='insuredInfo.idNo' label='证件号码' name='证件号码' readonly />
       <van-field v-if='isLessEighteen' :value='insuredInfo.mobile' label='手机号码' name='手机号码' readonly />
       <van-field v-if='isLessEighteen' :value='insuredInfo.email' label='电子邮箱' name='电子邮箱' readonly />
-      <van-field :value='insuredInfo.homeName' label='联系地址' name='联系地址' readonly />
-      <van-field :value='insuredInfo.homeAddress' label='详细地址' name='详细地址' readonly />
+      <van-field :value='insuredInfo.homeName' label='联系地址' name='联系地址' readonly v-if="insuredInfo.homeName" />
+      <van-field :value='insuredInfo.homeAddress' label='详细地址' name='详细地址' readonly v-if="insuredInfo.homeAddress"/>
     </van-cell-group>
     <van-cell-group class='mt10'>
       <p style='border-bottom: 1px solid #ebedf0' class='fs15 fwb pl10 pv12'>受益人信息</p>

src/views/ebiz/claims/SignatureConfirmation.vue

@@ -213,7 +213,9 @@ export default {
           //从签名页调过来的标识
           sessionStorage.setItem('airSign', this.$route.query.airSign)
         }
-        localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.token) {
+          localStorage.setItem('token', this.$route.query.token)
+        }
         if (this.$route.query.signInvalid) {
           sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
         }

src/views/ebiz/common/CalculatePremium.vue

@@ -353,6 +353,7 @@
           item.productCode != 'GFRS_M0080' &&
           item.productCode != 'GFRS_M0083' &&
           item.productCode != 'GFRS_M0098' &&
+          item.productCode != 'GFRS_M0103' &&
           item.productCode != 'GFRS_M0085'
         "
       >
@@ -840,14 +841,17 @@ export default {
             this.isEnterAddtionRiskListFunc()
           }
         }
-        if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') {
+        if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0103' || item.mainRiskCode == 'GFRS_M0085') {
           this.disabledShow = true
         }
         if (item.hasPredictTransferPrem == '1') {
           this.disabledShow = false
         }
 
-        if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') {
+        if (
+          (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0103' || item.mainRiskCode == 'GFRS_M0085') &&
+          this.isFrom == 'proposal'
+        ) {
           item.calFactorLst.forEach((i) => {
             if (i.code == 'inputPrem') {
               i.minPrem = 0.01
@@ -961,10 +965,14 @@ export default {
       }
       //键盘小数点无法输入，试了一下iOS16以下没这个问题，iOS16以上有这个问题， type="number"改成type="digit"就可以输入了，
       this.$nextTick(() => {
-        var div1 = document.getElementsByClassName('van-stepper__input')
-        //拿到的是一个数组集合，遍历修改每一个input
-        for (var x in div1) {
-          div1[x].setAttribute('type', 'digit')
+        try {
+          var div1 = document.getElementsByClassName('van-stepper__input')
+          //拿到的是一个数组集合，遍历修改每一个input
+          for (var x in div1) {
+            div1[x].setAttribute('type', 'digit')
+          }
+        } catch (e) {
+          console.error(e)
         }
       })
     },
@@ -1095,10 +1103,11 @@ export default {
       }
     },
     //弹框选择
-    toSelect(index, index1, columns) {
+    toSelect(productIndex, factorIndex, columns) {
       this.columns = []
-      ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1]
-      let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
+      ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, productIndex, factorIndex]
+      let currentProduct = this.chooseProducts[productIndex]
+      let currentFactor = currentProduct.calFactorLst
       let currentEle = currentFactor[this.calFactorIndex]
       let sex = this.saleInsuredPersonInfo.sex //0男 1女
       //性别男女，养老保险金领取年龄不一致
@@ -1108,9 +1117,37 @@ export default {
             this.columns.push(item)
           }
         })
-      } else {
-        this.columns = columns
+        return
       }
+      if (currentProduct.mainRiskCode === 'GFRS_M0111') {
+        // 国富人寿鑫盈嘉两全保险（分红型） 交费期间payEndYear: 1次交清和3年交 ，保险期间insuYear: 5年和6年
+        // 现要求payEndYear选择一次交清insuYear只能选5年，payEndYear选择3年交payEndYear只能选6年保险期间
+        if (currentEle.code == 'insuYear') {
+          let payEndYearFactor = currentFactor.find((factor) => factor.code == 'payEndYear')
+          if (!payEndYearFactor) {
+            return
+          }
+          let payEndYear = payEndYearFactor.showContent
+          if (!payEndYear) {
+            // 保险期间未选择, 提示选择
+            this.$toast(`请先选择${payEndYearFactor.name}`)
+            return
+          }
+          let payEndYearOption = payEndYearFactor.columns.find((item) => item.text == payEndYear)
+          let payEndYearVal = payEndYearOption.value
+          console.log('payEndYearVal--->', payEndYearVal, columns)
+          // 如果有值，则需约定可选择项
+          if (payEndYearVal) {
+            columns.forEach((item) => {
+              if ((payEndYearVal == '1000' && item.value == '5') || (payEndYearVal == '3' && item.value == '6')) {
+                this.columns.push(item)
+              }
+            })
+          }
+          return
+        }
+      }
+      this.columns = columns
     },
     //取消picker
     onCancel() {
@@ -1126,7 +1163,7 @@ export default {
       let currentEle = currentFactor[this.calFactorIndex]
       if (currentEle.code == 'insuYear') {
         if (value.value == '70') {
-          this.chooseProducts.forEach((item, index) => {
+          this.chooseProducts.forEach((item) => {
             if (item.mainRiskCode == 'GFRS_M0086') {
               item.calFactorLst.forEach((i) => {
                 if (i.code == 'inputAmt') {
@@ -1138,7 +1175,7 @@ export default {
             }
           })
         } else if (value.value == '106') {
-          this.chooseProducts.forEach((item, index) => {
+          this.chooseProducts.forEach((item) => {
             if (item.mainRiskCode == 'GFRS_M0086') {
               item.calFactorLst.forEach((i) => {
                 if (i.code == 'inputAmt') {
@@ -1151,17 +1188,24 @@ export default {
           })
         }
       }
-      // let sex = this.saleInsuredPersonInfo.sex //0男 1女
 
-      // //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1
-      // if (currentEle.code == 'payEndYear' && this.isTrial == '0') {
-      //   currentEle['columns'].forEach((item, index) => {
-      //     if (item.value == value.value) {
-      //       this.payEndYearColumnsIndex = index
-      //     }
-      //   })
-      //   this.defalutAmt = 1
-      // }
+      if (this.chooseProducts[this.productIndex].mainRiskCode === 'GFRS_M0111') {
+        // 国富人寿鑫盈嘉两全保险（分红型） 交费期间payEndYear: 1次交清和3年交 ，保险期间insuYear: 5年和6年
+        // 现要求payEndYear选择一次交清insuYear只能选5年，payEndYear选择3年交payEndYear只能选6年保险期间
+        if (currentEle.code == 'payEndYear') {
+          // 获取当前的值
+          let payEndYear = value.value
+          console.log('payEndYear--->', payEndYear)
+          const insuYearFactor = currentFactor.find((factor) => factor.code == 'insuYear')
+          if (insuYearFactor) {
+            console.log('insuYearFactor--->', insuYearFactor)
+            let matchInsureYearValue = payEndYear == '1000' ? '5' : payEndYear == '3' ? '6' : null
+            let matchedOption = insuYearFactor.columns.find((item) => item.value == matchInsureYearValue)
+            insuYearFactor.showContent = matchedOption ? matchedOption.text : ''
+            insuYearFactor['insuYear'] = matchedOption ? matchedOption.value : ''
+          }
+        }
+      }
       //中介渠道，交费期间为一次性交清时，附加险GFRS_A0007，GFRS_A0009，GFRS_A0010去掉后，附加险list就为空--隐藏’附‘icon
       if (currentEle.code == 'payEndYear' && value.value == '1000') {
         this.isEnterAddtionRiskListFunc()
@@ -1174,7 +1218,6 @@ export default {
       } else {
         this.isEnterAddtionRisk = true
       }
-
       if (currentEle.showContent != value.text) {
         //通用规则校验
         if (await this.payExceedInsured(currentEle, currentFactor, value.value)) {
@@ -1200,18 +1243,9 @@ export default {
           })
           this.defalutAmt = 1
         }
-        // if(this.ruleExpression[productCode]){
-        //   this.errorMsg = []
-        //   this.ruleExpression[productCode].eventList.forEach(item => {
-        //     this.$emit(item,currentFactor,currentEle.code,value);
-        //   })
-        //   if(this.errorMsg.length > 0){
-        //     this.$toast(this.errorMsg[0]);
-        //     this.popupShow = false
-        //     return false
-        //   }
-        // }
+
         let productCode = this.chooseProducts[this.productIndex].productCode
+
         if (this.ruleExpression[productCode]) {
           this.errorMsg = []
           let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
@@ -1755,10 +1789,22 @@ export default {
             }
           })
           this.chooseProducts.forEach((item, index) => {
-            if (item.productCode == 'GFRS_A0010' || item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014' || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016') {
+            if (
+              item.productCode == 'GFRS_A0010' ||
+              item.productCode == 'GFRS_A0009' ||
+              item.productCode == 'GFRS_A0013' ||
+              item.productCode == 'GFRS_A0014' ||
+              item.productCode == 'GFRS_A0015' ||
+              item.productCode == 'GFRS_A0016'
+            ) {
               //(投保人)国富人寿附加豁免保险费重大疾病保险(B款）
               // 投被不同人：投保人豁免险单独搭配主险时，投保人豁免险，豁免主险保费，当投保人豁免险加两全（有长险附加险时），豁免主险保费加两全保费
-              if (item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016') {
+              if (
+                item.productCode == 'GFRS_A0009' ||
+                item.productCode == 'GFRS_A0013' ||
+                item.productCode == 'GFRS_A0015' ||
+                item.productCode == 'GFRS_A0016'
+              ) {
                 if (this.saleInsuredPersonInfo.relationToAppnt != 1) {
                   //不同人
                   if (showPrem001) {
@@ -2181,14 +2227,14 @@ export default {
       let thisproductInfo = JSON.parse(window.localStorage.getItem('chooseProducts'))
       if (thisproductInfo && thisproductInfo.length != 0) {
         thisproductInfo.forEach((item) => {
-          if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' || item.productCode == 'GFRS_M0085') {
+          if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' || item.productCode == 'GFRS_M0103' || item.productCode == 'GFRS_M0085') {
             productCode = item.productCode
             hasPredictTransferPrem = item.hasPredictTransferPrem
           }
         })
       }
       if (this.isFrom != 'proposal') {
-        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') {
+        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0103' || productCode == 'GFRS_M0085') {
           if (!that.policyNo) {
             this.disabledShow = true
             that.chooseProducts.forEach((item) => {
@@ -2389,6 +2435,13 @@ export default {
               trialFlag = false
             }
           }
+        } else if (item.productCode == 'GFRS_M0101' || item.productCode == 'GFRS_M0102') {
+          //  当投保人年龄≥75周岁时，需转人工核保。核心提示语，投保人年龄≥75周岁。前端提示语为：投保人年龄≥75周岁，需进一步人工审核
+          let appntAge = this.saleInsuredInfo.age
+          if (appntAge >= 75) {
+            this.nextStepFlag = true
+            this.$toast('投保人年龄≥75周岁，需进一步人工审核！')
+          }
         }
       })
       if (!trialFlag) {
@@ -2965,7 +3018,7 @@ export default {
             }
           }
         }
-      } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') {
+      } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0103' || productCode == 'GFRS_M0085') {
         if (this.isFrom != 'proposal') {
           if (!this.policyNo && defalutValue < 5) {
             this.$toast('单独投保，保费为大于等于50000元')
@@ -3088,7 +3141,7 @@ export default {
           return this.$toast('关联保单的格式不正确')
         }
       }
-
+      this.$CacheUtils.setLocItem('associatedPolicyNo', this.policyNo || null)
       //组装险种提交数据
       let [mainRiskCode, riskDTOLst] = ['', []]
       let rollInResult = '' //校验预计转入保费结果

src/views/ebiz/common/risk-rules.js

@@ -43,12 +43,12 @@ export default {
   },
   //投、被保险人年龄对险种的限制
   ageLimit(resultData, vm, isApplicant,riskProductCode) {
-    let age, tips
+    let age, tips,maxAge
     if (isApplicant) {
       age = this.getSaleInsuredInfo().age
       tips = '投保人年龄不适合此款险种，请选择其他险种！'
     } else {
-      if(riskProductCode == 'GFRS_M0061'){
+      if(riskProductCode == 'GFRS_M0061' || riskProductCode == 'GFRS_M0102' || riskProductCode == 'GFRS_M0101'){
         age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAge29(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge
       }else{
         age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAgeByValue(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge
@@ -56,7 +56,22 @@ export default {
       tips = '被保险人年龄不适合此款险种，请选择其他险种！'
     }
     let minAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.minAge
-    let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge
+    if(riskProductCode == 'GFRS_M0111'){
+      if(this.getSaleInsuredPersonInfo().sex==0){
+        maxAge=70
+      }else {
+        maxAge=73
+      }
+    }else if(riskProductCode == 'GFRS_M0110'){
+      if(this.getSaleInsuredPersonInfo().sex==0){
+        maxAge=68
+      }else {
+        maxAge=70
+      }
+    }else{
+      maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge
+    }
+
     ;[age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)]
     if (age > maxAge || age < minAge) {
       vm.$toast(tips)

src/views/ebiz/goodStart/Organization.vue

@@ -64,9 +64,9 @@ export default {
       needGettingKey: ['name', 'ysbb', 'ysjs', 'bzbf', 'cbjs'],
       tableColumns: [
         { name: '机构', key: 'name' },
-        { name: '预收期交(万元)', key: 'ysbb' },
+        { name: '预收保费(万元)', key: 'ysbb' },
         { name: '预收件数(件)', key: 'ysjs' },
-        { name: '承保期交(万元)', key: 'bzbf' },
+        { name: '承保保费(万元)', key: 'bzbf' },
         { name: '承保件数(件)', key: 'cbjs' }
       ],
       values: [],

src/views/ebiz/goodStart/PerformanceReport.vue

@@ -5,7 +5,7 @@
         <div class="header-left">
           <van-button>
             <img :src="point" />
-            <span class="ml5 mr5">期交</span>
+            <span class="ml5 mr5">保费</span>
           </van-button>
         </div>
         <div class="header-center">

src/views/ebiz/institutionalPerform/Organization.vue

@@ -94,30 +94,30 @@ export default {
         [
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收保费(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收保费(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' },
             { isInt: false, name: '承保同比', key: 'cbtb' },
             { isInt: false, name: '承保环比', key: 'cbhb' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
-            { isInt: false, name: '期交目标', key: 'bbmb' },
-            { isInt: false, name: '期交目标达成率', key: 'bbmbdcl' },
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' },
+            { isInt: false, name: '保费目标', key: 'bbmb' },
+            { isInt: false, name: '保费目标达成率', key: 'bbmbdcl' },
             { isInt: false, name: '差距', key: 'cj' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' }
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' }
           ]
         ],
         [
@@ -131,7 +131,7 @@ export default {
         ],
         [
           { isInt: false, name: '产品', key: 'productName' },
-          { isInt: false, name: '承保期交(万元)', key: 'cbbb' },
+          { isInt: false, name: '承保保费(万元)', key: 'cbbb' },
           { isInt: true, name: '承保件数(件)', key: 'cbItems' },
           { isInt: false, name: '保费占比(%)', key: 'percent' }
         ]

src/views/ebiz/institutionalPerform/Summarizing.vue

@@ -11,7 +11,7 @@
             <th>达成</th>
           </tr>
           <tr>
-            <td class="bleft bright">预收期交</td>
+            <td class="bleft bright">预收保费</td>
             <td class="bright">{{ performance.ysbb | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -19,7 +19,7 @@
             <td class="bright">{{ performance.ysjs | unitFilter(2) | blankFilter }}</td>
           </tr>
           <tr>
-            <td class="bleft bright">承保期交</td>
+            <td class="bleft bright">承保保费</td>
             <td class="bright">{{ performance.bzbf | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -77,7 +77,7 @@
         <table class="myTable" style="min-width: 140vw;" cellspacing="0" cellpadding="0">
           <tr>
             <th class="sticky">产品名称</th>
-            <th>承保期交(万元)</th>
+            <th>承保保费(万元)</th>
             <th>承保件数(件)</th>
             <th>保费占比(%)</th>
           </tr>

src/views/ebiz/institutionalPerform/UnderOffice.vue

@@ -125,7 +125,7 @@ export default {
       dayTimeCondition: currentDate,
       // 0: 期交, 1: 人力, 2: 产品
       typeIndex: 0,
-      dataTypes: ['期交', '人力指标', '产品'],
+      dataTypes: ['保费', '人力指标', '产品'],
       active: 0,
       // 侧边栏是否显示
       isSideBarShow: false,

src/views/ebiz/insureAgain/SignatureConfirmation.vue

@@ -396,7 +396,9 @@ export default {
         }
         // this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
         // window.localStorage.setItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
-        window.localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.token) {
+          window.localStorage.setItem('token', this.$route.query.token)
+        }
         window.localStorage.setItem('orderNo', this.$route.query.orderNo)
         // window.localStorage.setItem('relationToAppnt', this.$route.query.relationToAppnt)
         // window.localStorage.setItem('productCode', this.$route.query.productCode)

src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue

@@ -4,7 +4,7 @@
     <p class="fs18 fwb">一、公司介绍</p>
     <van-image width="100%" height="150" :src="img1" class="mt15" />
     <p class="fs14 indent">
-     国富人寿保险股份有限公司是经中国银保监会批准，于2018年6月成立的全国性寿险公司。公司由广西投资集团、唯品会、吉安新年等8家知名企业共同出资创立，注册资本金15亿元，总部位于南宁市，是广西壮族自治区首家寿险法人机构。公司以“因为国富、所以民安”为使命，用心研发实惠产品，用爱提供实在服务，守护幸福美好生活。
+      国富人寿保险股份有限公司是经中国银保监会批准，于2018年6月成立的全国性寿险公司。公司由广西投资集团、唯品会、吉安新年等8家知名企业共同出资创立，注册资本金15亿元，总部位于南宁市，是广西壮族自治区首家寿险法人机构。公司以“因为国富、所以民安”为使命，用心研发实惠产品，用爱提供实在服务，守护幸福美好生活。
     </p>
     <!-- <p class="fs14 indent">
       国富人寿将秉持“老有所养，病有所医，红利共享，国富民安”的核心理念，以“让更多的人过上有尊严的健康快乐的生活”作为企业使命，树立并践行“简单、专注、诚信、激情、关爱、领先”的价值观。专注于客户体验，研发满足客户需求的产品，为客户提供有温度的服务。依法合规、稳健经营，立足广西、深耕广西、面向全国，更好地回馈社会、回报股东、与时俱进、超越自我。
@@ -75,7 +75,9 @@ export default {
     this.redisKey = this.$route.query.redisKey
     if (this.redisKey) {
       this.saveShareRecord('1')
-      localStorage.setItem('token', this.$route.query.token)
+      if (this.$route.query.token) {
+        localStorage.setItem('token', this.$route.query.token)
+      }
     } else {
       this.getShareKey()
     }
@@ -117,7 +119,7 @@ export default {
         url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction`
       }
       getShareKey(data)
-        .then(res => {
+        .then((res) => {
           console.log(res)
           if (res.result == 0) {
             this.redisKey = res.content
@@ -125,7 +127,7 @@ export default {
             this.$toast(res.resultMessage)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },

src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <iframe :src="src + pdfUrl" style="width:100vw;height:100vh"></iframe>
+    <iframe :src="src + pdfUrl" style="width: 100vw; height: 100vh"></iframe>
   </div>
 </template>
 
@@ -38,7 +38,9 @@ export default {
     this.redisKey = this.$route.query.redisKey
     if (this.redisKey) {
       this.saveShareRecord('1')
-      localStorage.setItem('token', this.$route.query.token)
+      if (this.$route.query.token) {
+        localStorage.setItem('token', this.$route.query.token)
+      }
     } else {
       this.getShareKey()
     }
@@ -83,7 +85,7 @@ export default {
         url: `${location.origin}/pdfjs/web/viewer.html?file=${this.pdfUrl}`
       }
       getShareKey(data)
-        .then(res => {
+        .then((res) => {
           console.log(res)
           if (res.result == 0) {
             this.redisKey = res.content
@@ -91,7 +93,7 @@ export default {
             this.$toast(res.resultMessage)
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err)
         })
     },

src/views/ebiz/product-store/StoreDetail.vue

@@ -48,7 +48,7 @@
     </div>
     <div v-else>
       <template v-if="redirectUrl">
-        <iframe v-show="thirdUrlReady" style="width: 100vw; min-height: 100vh;" :src="redirectUrl" frameborder="0"></iframe>
+        <iframe v-show="thirdUrlReady" style="width: 100vw; min-height: 100vh" :src="redirectUrl" frameborder="0"></iframe>
       </template>
       <template v-if="detailImg">
         <img id="detailImg" v-if="detailImg" :src="$assetsUrl + detailImg" />
@@ -151,7 +151,9 @@ export default {
   },
   async mounted() {
     if (this.isWeixin) {
-      window.localStorage.setItem('token', this.$route.query.token)
+      if (this.$route.query.token) {
+        window.localStorage.setItem('token', this.$route.query.token)
+      }
       this.loginInfo.aname = decodeURI(this.$route.query.aname)
       this.loginInfo.password = decodeURI(this.$route.query.password)
       this.shareId = this.$route.query.shareId
@@ -162,7 +164,7 @@ export default {
   },
   methods: {
     prevImg(i) {
-      let imgs = this.imgList.map(img => {
+      let imgs = this.imgList.map((img) => {
         return this.$assetsUrl + img
       })
       ImagePreview(imgs, i)
@@ -259,7 +261,7 @@ export default {
     //分享轨迹保存
     saveShareTrack(data) {
       return new Promise((resolve, reject) => {
-        saveShareTrack(data).then(res => {
+        saveShareTrack(data).then((res) => {
           if (res.result == '0') {
             resolve()
           } else {

src/views/ebiz/product/HomeProduct.vue

@@ -157,7 +157,7 @@ export default {
       isGoodStart: '0',    // 是否开门红 0-默认
       isPersonalInsu: true, // 是否个险渠道
       isInner: false,
-      organizationTheads: ['排名', '机构', '当日预收(期交)', '月预收期交', '日承保期交', '月承保期交'],
+      organizationTheads: ['排名', '机构', '当日预收(保费)', '月预收保费', '日承保保费', '月承保保费'],
       performanceTheads: ['排名', '姓名', '营销服务部', '预收期交', '承保期交'],
       organizationData: [],
       performanceData: [],

src/views/ebiz/proposal/ProposalInfo.vue

@@ -6,14 +6,18 @@
           <img class="w178 h41 div_1" src="@/assets/images/proposal/proposal_logo.png" />
           <div class="white fw500 fs18 div_2">{{ mainRiskName }}</div>
           <van-sticky @scroll="testSticky">
-            <div class="pl15 pt15 flex justify-content-fs align-items-c sticky_div" :class="pageShowType.isFixed ? 'divbg_1' : 'divbg_2'">
-              <div class="mr9 title_item" v-for="(item, index) in pageShowInfo.insuredDTOs" :key="index" @click="checkInsure(item.insuredId)">
+            <div class="pl15 pt15 flex justify-content-fs align-items-c sticky_div"
+                 :class="pageShowType.isFixed ? 'divbg_1' : 'divbg_2'">
+              <div class="mr9 title_item" v-for="(item, index) in pageShowInfo.insuredDTOs" :key="index"
+                   @click="checkInsure(item.insuredId)">
                 <div class="relative sub_insure_item">
-                  <div class="bg-white insured_item" :class="item.insuredId == pageShowInfo.showInsuredDTO.insuredId ? 'shadow' : ''">
+                  <div class="bg-white insured_item"
+                       :class="item.insuredId == pageShowInfo.showInsuredDTO.insuredId ? 'shadow' : ''">
                     <div class="insured_item_1">
                       <img :src="headPicture[item.relationToAppnt + '_' + item.sex]" />
                     </div>
-                    <div class="text-center fs12" :class="item.insuredId == pageShowInfo.showInsuredDTO.insuredId ? 'color_3A81F6' : ''">
+                    <div class="text-center fs12"
+                         :class="item.insuredId == pageShowInfo.showInsuredDTO.insuredId ? 'color_3A81F6' : ''">
                       {{ relationToAppntType[item.relationToAppnt + '_' + item.sex] }}<br />
                       {{ item.name }}
                     </div>
@@ -33,37 +37,49 @@
                   <div class="text-center">
                     <label class="fs14 color_3A81F6 fw600 lh24">被保险人</label><br />
                     <label class="fs13 color_666666 lh20"
-                      >{{ pageShowInfo.showInsuredDTO.sex == '0' ? '男' : '女' }}&nbsp;{{ pageShowInfo.showInsuredDTO.insuredAge }}周岁</label
+                    >{{ pageShowInfo.showInsuredDTO.sex == '0' ? '男' : '女'
+                      }}&nbsp;{{ pageShowInfo.showInsuredDTO.insuredAge }}周岁</label
                     >
                   </div>
                   <div class="line_gray"></div>
                   <div class="text-center">
                     <label class="fs14 color_3A81F6 fw600 lh24">投保人</label><br />
-                    <label class="fs13 color_666666 lh20">{{ pageShowInfo.appntDTO.sex == '0' ? '男' : '女' }}&nbsp;{{ pageShowInfo.appntDTO.age }}周岁</label>
+                    <label class="fs13 color_666666 lh20">{{ pageShowInfo.appntDTO.sex == '0' ? '男' : '女'
+                      }}&nbsp;{{ pageShowInfo.appntDTO.age }}周岁</label>
                   </div>
                   <div class="line_gray"></div>
                   <div class="text-center">
                     <label class="fs14 color_3A81F6 fw600 lh24">首年保费</label><br />
-                    <label class="fs13 color_FFA42F lh20">{{ pageShowInfo.showInsuredDTO.totalPrem | numFormat }}元</label>
+                    <label class="fs13 color_FFA42F lh20">{{ pageShowInfo.showInsuredDTO.totalPrem | numFormat
+                      }}元</label>
                   </div>
                 </div>
                 <div class="fs15 line_title">产品计划</div>
                 <div class="fs12 div_4">
                   <div class="risk_head flex text-center line-height table fs12 bg_DBEFFE">
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7">投保险种</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="ispremshow">保额(元）</div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="ispremshow">
+                      保额(元）
+                    </div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">保险期间</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">交费期间</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">首年保费(元)</div>
                   </div>
-                  <div class="risk_body flex text-center table bg_f7fbff" v-for="(riskItem, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
+                  <div class="risk_body flex text-center table bg_f7fbff"
+                       v-for="(riskItem, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7">{{ riskItem.riskName }}</div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border" v-if="ispremshow">
                       {{ riskItem.amt ? riskItem.amt : '--' }}
                     </div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.insureName }}</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.payName }}</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.showPrem ? riskItem.showPrem : '--' }}</div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                      {{ riskItem.insureName }}
+                    </div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.payName
+                      }}
+                    </div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                      {{ riskItem.showPrem ? riskItem.showPrem : '--' }}
+                    </div>
                   </div>
                 </div>
 
@@ -72,23 +88,33 @@
                 <div class="fs12 div_4" v-if="pageShowInfo.showInsuredDTO.riskDTOLstNew.length">
                   <div class="risk_head flex text-center line-height table fs12 bg_DBEFFE">
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7">投保险种</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">养老保险金开始领取年龄</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">养老保险金领取方式</div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                      养老保险金开始领取年龄
+                    </div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">养老保险金领取方式
+                    </div>
                     <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">保证给付期</div>
-                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">每次养老保险金(元)</div>
+                    <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">每次养老保险金(元)
+                    </div>
                   </div>
                   <div v-for="(riskItem, index) in pageShowInfo.showInsuredDTO.riskDTOLstNew" :key="index">
                     <div class="risk_body flex text-center table bg_f7fbff">
                       <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7">{{ riskItem.riskName }}</div>
-                      <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.pensionAge }} 周岁</div>
+                      <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                        {{ riskItem.pensionAge }} 周岁
+                      </div>
                       <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
                         {{ riskItem.receivePensionWay == '0' ? '年领' : '月领' }}
                       </div>
-                      <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">{{ riskItem.guaranteedYear }} 年</div>
-                      <div v-if="riskItem.receivePensionWay == '0'" class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                      <div class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                        {{ riskItem.guaranteedYear }} 年
+                      </div>
+                      <div v-if="riskItem.receivePensionWay == '0'"
+                           class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
                         {{ riskItem.amt }}
                       </div>
-                      <div v-if="riskItem.receivePensionWay == '1'" class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
+                      <div v-if="riskItem.receivePensionWay == '1'"
+                           class="flex justify-content-c align-items-c pl7 pr7 pt7 pb7 table_border">
                         {{ riskItem.amt | fillNumber }}
                       </div>
                     </div>
@@ -98,7 +124,8 @@
                 <div class="h20">&ensp;</div>
               </div>
               <div class="up_down_div">
-                <img src="@/assets/images/proposal/proposal_down.png" :class="pageShowType.productCheckStatus ? '' : 'img180'" @click="testProductCheck" />
+                <img src="@/assets/images/proposal/proposal_down.png"
+                     :class="pageShowType.productCheckStatus ? '' : 'img180'" @click="testProductCheck" />
               </div>
             </div>
             <!--保险责任-->
@@ -123,9 +150,11 @@
               </div>
               <div :class="pageShowType.riskCheckStatus ? '' : 'hideInfo'" class="text-left div_5">
                 <div v-if="pageShowType.dutyShowType == '01'">
-                  <div class="div_6 duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.riskDTOLst" :key="index">
+                  <div class="div_6 duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.riskDTOLst"
+                       :key="index">
                     <div v-if="item.riskDutySortResult">
-                      <div v-for="(subItem3, subIndex3) in getObjectKeys(item.riskDutySortResult)" :key="subIndex3"></div>
+                      <div v-for="(subItem3, subIndex3) in getObjectKeys(item.riskDutySortResult)"
+                           :key="subIndex3"></div>
                     </div>
                     <div class="fw600 fs15 color_3A81F6 show_risk_name">
                       {{ item.riskName }}
@@ -140,7 +169,8 @@
                           <div class="fs13 color_333333 div_17">
                             <div v-html="initDutyColor(subItem4.dutyStairExplain)"></div>
                           </div>
-                          <div class="fs13 color_666666 div_17" v-if="subItem4.dutyDetailExplain && subItem4.dutyDetailExplain != ''">
+                          <div class="fs13 color_666666 div_17"
+                               v-if="subItem4.dutyDetailExplain && subItem4.dutyDetailExplain != ''">
                             <div v-html="showDutyDetailExplain(subItem4.dutyDetailExplain)"></div>
                           </div>
                         </div>
@@ -149,7 +179,8 @@
                   </div>
                 </div>
                 <div v-if="pageShowType.dutyShowType == '00'">
-                  <div class="duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.dutySortResult" :key="index">
+                  <div class="duty_by_duty" v-for="(item, index) in pageShowInfo.showInsuredDTO.dutySortResult"
+                       :key="index">
                     <div v-for="(subItem1, subIndex1) in getObjectKeys(item)" :key="subIndex1">
                       <div class="fw600 fs15 color_3A81F6 show_risk_name">
                         {{ subItem1 }}
@@ -162,7 +193,8 @@
                         <div class="fs13 div_17 color_333333">
                           <div v-html="initDutyColor(subItem2.dutyStairExplain)"></div>
                         </div>
-                        <div class="fs13 div_17 color_666666" v-if="subItem2.dutyDetailExplain && subItem2.dutyDetailExplain != ''">
+                        <div class="fs13 div_17 color_666666"
+                             v-if="subItem2.dutyDetailExplain && subItem2.dutyDetailExplain != ''">
                           <div v-html="showDutyDetailExplain(subItem2.dutyDetailExplain)"></div>
                         </div>
                       </div>
@@ -171,7 +203,8 @@
                 </div>
               </div>
               <div class="up_down_div">
-                <img src="@/assets/images/proposal/proposal_down.png" :class="pageShowType.riskCheckStatus ? '' : 'img180'" @click="testRiskCheck" />
+                <img src="@/assets/images/proposal/proposal_down.png"
+                     :class="pageShowType.riskCheckStatus ? '' : 'img180'" @click="testRiskCheck" />
               </div>
             </div>
             <!--产品条款-->
@@ -214,12 +247,14 @@
               <div class="text-center flex justify-content-e align-items-c fs14 check_age">
                 <div>当被保险人在</div>
                 <div class="check_one flex justify-content-fe align-items-c" @click="popupShow = true">
-                  {{ pageShowInfo.showInsuredDTO.checkAge }}&emsp;<img class="img_10" src="@/assets/images/proposal/proposal_select_down.png" />
+                  {{ pageShowInfo.showInsuredDTO.checkAge }}&emsp;<img class="img_10"
+                                                                       src="@/assets/images/proposal/proposal_select_down.png" />
                 </div>
                 <div>岁时</div>
               </div>
               <div class="flex justify-content-s align-items-c mt15 mb20 ml15 mr15">
-                <img class="w20" src="@/assets/images/proposal/proposal_lessen.png" @click="reduce(pageShowInfo.showInsuredDTO)" />
+                <img class="w20" src="@/assets/images/proposal/proposal_lessen.png"
+                     @click="reduce(pageShowInfo.showInsuredDTO)" />
                 <van-slider
                   class="w220"
                   active-color="#9EC2FC"
@@ -231,7 +266,8 @@
                 >
                   <div slot="button" class="customer_button"></div>
                 </van-slider>
-                <img class="w20" src="@/assets/images/proposal/proposal_add.png" @click="exhibitionAdd(pageShowInfo.showInsuredDTO)" />
+                <img class="w20" src="@/assets/images/proposal/proposal_add.png"
+                     @click="exhibitionAdd(pageShowInfo.showInsuredDTO)" />
               </div>
               <select-radio
                 class="mb10"
@@ -246,7 +282,7 @@
               <!-- 国富人寿富贵尊享终身寿险（分红型）添加利益演示提示 -->
               <div v-if="mainRiskCodes.includes('GFRS_M0095')" class="fs13 div_11 text-left">
                 <b
-                  >本利益演示基于公司的精算及其他假设，不代表公司的历史经营业绩，也不代表对公司未来经营业绩的预期，保单的红利分配是不确定的，红利水平是不保证的，在某些年度红利可能为零。
+                >本利益演示基于公司的精算及其他假设，不代表公司的历史经营业绩，也不代表对公司未来经营业绩的预期，保单的红利分配是不确定的，红利水平是不保证的，在某些年度红利可能为零。
                 </b>
               </div>
               <div class="div_10"></div>
@@ -273,7 +309,8 @@
                 </div>
                 <div class="h20">&ensp;</div>
                 <div class="up_down_div">
-                  <img src="@/assets/images/proposal/proposal_down.png" :class="pageShowType.dutyCheckStatus ? '' : 'img180'" @click="dutyCheck" />
+                  <img src="@/assets/images/proposal/proposal_down.png"
+                       :class="pageShowType.dutyCheckStatus ? '' : 'img180'" @click="dutyCheck" />
                 </div>
               </div>
             </div>
@@ -291,17 +328,33 @@
                 </div>
                 <div class="h20">&ensp;</div>
                 <div class="up_down_div">
-                  <img src="@/assets/images/proposal/proposal_down.png" :class="pageShowType.hesitateCheckStatus ? '' : 'img180'" @click="hesitateCheck" />
+                  <img src="@/assets/images/proposal/proposal_down.png"
+                       :class="pageShowType.hesitateCheckStatus ? '' : 'img180'" @click="hesitateCheck" />
+                </div>
+              </div>
+            </div>
+            <!-- 风险提示 -->
+            <div class="pt15 pb17 bg-white relative" v-if="showDangerInfo">
+              <div :class="pageShowType.hesitateCheckStatus ? '' : 'hideInfo_hesitate'">
+                <div class="fs16 color_3A81F6 lh24 fw600 text-center">风险提示</div>
+                <div class="line_C8DBFB"></div>
+                <div class="fs14 div_height div_11">
+                  <b>本产品为分红保险，您可以保单红利的形式享有本产品的盈余分配权，但未来的保单红利为非保证利益，其红利分配是不确定的，在某些年度红利可能为零。</b>
+                </div>
+                <div class="h20">&ensp;</div>
+                <div class="up_down_div">
+                  <img src="@/assets/images/proposal/proposal_down.png"
+                       :class="pageShowType.hesitateCheckStatus ? '' : 'img180'" @click="hesitateCheck" />
                 </div>
               </div>
             </div>
-
             <!-- 温馨提示-->
             <div class="pt15 pb17 bg-white model_title">
               <div class="fs16 color_3A81F6 lh24 fw600 text-center">温馨提示</div>
               <div class="line_C8DBFB"></div>
               <div class="fs13 div_11">
-                <b> 本资料仅供客户理解产品条款所用，有关产品的说明、解释、承诺或保证，如与产品条款不一致，均以产品条款为准。 </b>
+                <b>
+                  本资料仅供客户理解产品条款所用，有关产品的说明、解释、承诺或保证，如与产品条款不一致，均以产品条款为准。 </b>
               </div>
               <div class="div_12"></div>
             </div>
@@ -327,7 +380,8 @@
           </div>
         </div>
         <van-popup v-model="popupShow" position="bottom">
-          <van-picker show-toolbar :columns="pageShowInfo.showInsuredDTO.ageColums" @confirm="checkAge" @cancel="popupShow = false" />
+          <van-picker show-toolbar :columns="pageShowInfo.showInsuredDTO.ageColums" @confirm="checkAge"
+                      @cancel="popupShow = false" />
         </van-popup>
       </div>
     </div>
@@ -341,7 +395,7 @@
           <!-- 如果没有姓名的话，根据性别展示男士或女士 -->
           <div class="text-center div_023">
             尊敬的<span v-if="pageShowInfo.appntDTO.name">{{ pageShowInfo.appntDTO.name.substr(0, 1) }}</span
-            >{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}
+          >{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}
           </div>
         </div>
         <img class="img_13" src="@/assets/images/proposal/proposal_share_bg.png" />
@@ -389,6 +443,7 @@ import getAge from '@/assets/js/utils/age.js'
 import dataDictionary from '@/assets/js/utils/data-dictionary'
 import riskRules from '../common/risk-rules.js'
 import { queryPersonal } from '@/api/ebiz/laurelClub/laurelClub'
+
 export default {
   data() {
     let isWeixin = this.$utils.device().isWeixin //判断环境
@@ -447,6 +502,13 @@ export default {
       ispremshow: true // 是否展示保额
     }
   },
+  computed: {
+    showDangerInfo() {
+      if (this.pageShowInfo.showInsuredDTO.riskDTOLst) {
+        return this.pageShowInfo.showInsuredDTO.riskDTOLst.some(e => e.riskName.includes('分红型'))
+      }
+    }
+  },
   filters: {
     productRateUnit(code) {
       for (let i = 0; i < dataDictionary.productRateUnit.length; i++) {
@@ -514,7 +576,9 @@ export default {
       this.isCheck = res.result
     })
   },
-  created() {},
+  created() {
+  },
+
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
     next()
@@ -804,6 +868,7 @@ export default {
                 item01.mainRiskCode == 'GFRS_M0083' ||
                 item01.mainRiskCode == 'GFRS_M0085' ||
                 item01.mainRiskCode == 'GFRS_M0098' ||
+                item01.mainRiskCode == 'GFRS_M0103' ||
                 item01.mainRiskCode == 'GFRS_M0100'
               ) {
                 that.ispremshow = false
@@ -1132,36 +1197,45 @@ export default {
 <style lang="scss">
 .proposal-exhibition-container {
   padding-bottom: 10px;
+
   .sex-radio {
     .van-cell-group {
       background: transparent;
+
       .van-cell {
         background: transparent;
         justify-content: center;
+
         .van-field__label {
           width: 0;
           flex: 0;
         }
       }
     }
+
     .ph30 {
       padding: 0px !important;
     }
   }
+
   &::before {
     content: '';
     display: table;
   }
+
   width: 100%;
   background: url('../../../assets/images/proposal/proposal_bg.png') no-repeat;
   background-color: #f7f7f7;
   background-size: 100% auto;
+
   .line-height {
     line-height: 35px;
   }
+
   .lh40 {
     line-height: 40px;
   }
+
   .van-divider {
     margin: 0 0 15px;
   }
@@ -1170,84 +1244,105 @@ export default {
     & > div {
       width: 19%;
     }
+
     & > div:last-child {
       width: 25%;
     }
   }
+
   .wx {
     img {
       width: 100%;
     }
   }
+
   div::-webkit-scrollbar {
     width: 0;
   }
+
   .divbg_1 {
     /*background-color: #9ec2fc;*/
     background-color: #f5fbff;
   }
+
   .divbg_2 {
     background-color: none;
   }
+
   .hideInfo {
     height: 140px;
     overflow: hidden;
   }
+
   .hideInfo_insure {
     height: 60px;
     overflow: hidden;
   }
+
   .hideInfo_hesitate {
     height: 60px;
     overflow: hidden;
   }
+
   .insured_item {
     position: absolute;
     z-index: 98;
     border-radius: 8px;
     width: 67px;
     height: 100px;
+
     .insured_item_1 {
       margin: 0px 13.5px 0px 13.5px;
       padding-top: 9px;
+
       img {
         width: 40px;
         height: 40px;
       }
     }
   }
+
   .color_3A81F6 {
     color: #3a81f6;
   }
+
   .bg_3A81F6 {
     background-color: #3a81f6;
   }
+
   .color_666666 {
     color: #666666;
   }
+
   .color_333333 {
     color: #333333;
   }
+
   .color_FFA42F {
     color: #ffa42f;
   }
+
   .lh24 {
     line-height: 24px;
   }
+
   .lh20 {
     line-height: 20px;
   }
+
   .line_gray {
     width: 1px;
     height: 19px;
     background-color: #999999;
     line-height: 24px;
   }
+
   .sticky_div {
     width: 100%;
     overflow-x: auto;
     box-sizing: border-box;
   }
+
   .line_title {
     border-left: 6px solid #3a81f6;
     padding-left: 6px;
@@ -1255,6 +1350,7 @@ export default {
     margin-top: 25px;
     margin-bottom: 15px;
   }
+
   .risk_head {
     border-top-right-radius: 6px;
     border-top-left-radius: 6px;
@@ -1264,43 +1360,53 @@ export default {
     border: 1px solid #acc5e6;
     line-height: 18px;
   }
+
   .risk_body {
     border: 1px solid #acc5e6;
     border-top: 0px;
     margin: 0px 10px;
     line-height: 18px;
   }
+
   .risk_body_last {
     border-bottom-right-radius: 6px;
     border-bottom-left-radius: 6px;
   }
+
   .up_down_div {
+    z-index: 2;
     position: absolute;
     width: 100%;
     height: 24px;
     left: 0;
     bottom: -12px;
     text-align: center;
+
     img {
       width: 24px;
       height: 24px;
     }
+
     .img180 {
       transform: rotate(180deg);
     }
   }
+
   .model_title {
     margin: 29px 15px;
     padding-top: 15px;
     border-radius: 5px;
+
     .cheeck_risk_type_left {
       border-bottom-left-radius: 15px;
       border-top-left-radius: 15px;
     }
+
     .cheeck_risk_type_right {
       border-bottom-right-radius: 15px;
       border-top-right-radius: 15px;
     }
+
     .checked_risk_type {
       height: 30px;
       line-height: 30px;
@@ -1309,6 +1415,7 @@ export default {
       padding: 0px 25px;
       color: #ffffff;
     }
+
     .no_check_risk_type {
       height: 30px;
       line-height: 30px;
@@ -1318,15 +1425,18 @@ export default {
       padding: 0px 25px;
     }
   }
+
   .line_C8DBFB {
     height: 1px;
     margin: 17px;
     border-top: 1px dashed #c8dbfb;
   }
+
   .calue_name {
     width: 80%;
     text-align: left !important;
   }
+
   .calue_button {
     width: 20%;
     height: 26px;
@@ -1338,12 +1448,14 @@ export default {
     margin-bottom: 5px;
     color: #3a81f6;
   }
+
   .customer_button {
     width: 20px;
     height: 20px;
     border-radius: 10px;
     background-color: #3a81f6;
   }
+
   .last_fix_div {
     bottom: 0px;
     left: 0px;
@@ -1352,10 +1464,12 @@ export default {
     line-height: 40px;
     box-shadow: 0px 0px 10px 5px #aaa;
     z-index: 999;
+
     div {
       width: 50%;
     }
   }
+
   .fix_bottom {
     position: fixed;
     height: 40px;
@@ -1368,42 +1482,51 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .fix_bottom_sub {
       display: flex;
       justify-content: flex-start;
       align-items: center;
       margin: 10px;
       font-size: 14px;
+
       img {
         width: 16px;
         height: 16px;
       }
+
       div {
         padding-left: 10px;
       }
     }
   }
+
   .table_border {
     border-left: 1px solid #acc5e6;
   }
+
   .title_item {
     height: 115px;
   }
+
   .lh_30 {
     height: 30px;
     line-height: 30px;
   }
+
   .check_age {
     height: 20px;
     line-height: 20px;
     width: 15em;
     margin: 5px auto;
+
     .check_one {
       border-bottom: 1px solid gray;
       width: 5em;
       text-align: right;
     }
   }
+
   .show_risk_name {
     border-left: 5px solid #3a81f6;
     padding-left: 7px;
@@ -1412,6 +1535,7 @@ export default {
     margin-top: 20px;
     margin-bottom: 10px;
   }
+
   .duty_by_duty {
     .head_radis {
       width: 6px;
@@ -1419,72 +1543,89 @@ export default {
       background-color: black;
       border-radius: 3px;
     }
+
     .title_2 {
       padding-left: 5px;
       line-height: 25px;
     }
+
     .content_1 {
       padding-left: 23px;
       line-height: 25px;
     }
   }
 }
+
 .div_1 {
   margin-top: 13px;
   margin-left: 14px;
 }
+
 .div_2 {
   margin-top: 37px;
   margin-left: 17px;
 }
+
 .div_3 {
   border-radius: 5px;
   margin: 7px 15px 14px 15px;
 }
+
 .div_4 {
   position: relative;
 }
+
 .div_5 {
   margin-top: 15px;
 }
+
 .div_6 {
   margin-bottom: 20px;
 }
+
 .div_7 {
   padding-left: 12px;
   padding-right: 12px;
 }
+
 .div_8 {
   line-height: 25px;
 }
+
 .div_9 {
   padding-top: 30px;
   width: 100%;
   height: 1px;
 }
+
 .img_10 {
   width: 16px;
   height: 16px;
 }
+
 .div_10 {
   padding-top: 10px;
   width: 100%;
   height: 1px;
 }
+
 .div_11 {
   padding: 10px 13px;
 }
+
 .div_12 {
   padding-top: 20px;
   width: 100%;
   height: 1px;
 }
+
 .div_13 {
   right: 0px;
   top: 40%;
   width: 30px;
   /*width: 23px;*/
 }
+
 .img_11 {
   width: 22px;
   height: 80px;
@@ -1494,6 +1635,7 @@ export default {
   background-color: transparent;
   border: 0;
 }
+
 .img_12 {
   width: 22px;
   height: 80px;
@@ -1504,14 +1646,17 @@ export default {
   background-color: transparent;
   border: 0;
 }
+
 .div_14 {
   height: 40px;
   width: 100%;
 }
+
 .shadow {
   //box-shadow: 2px 2px 2px 3px #3b72f9;
   box-shadow: 0 0 4px #3b72f9;
 }
+
 .triangle {
   border-left: 10px solid transparent;
   border-right: 10px solid transparent;
@@ -1522,6 +1667,7 @@ export default {
   z-index: 99;
   margin-left: -10px;
 }
+
 .triangle_shadow {
   border-left: 10px solid transparent;
   border-right: 10px solid transparent;
@@ -1533,16 +1679,20 @@ export default {
   z-index: 96;
   filter: blur(2px);
 }
+
 .sub_insure_item {
   width: 67px;
   height: 105px;
 }
+
 .bg_f7fbff {
   background-color: #f5fbff;
 }
+
 .bg_DBEFFE {
   background-color: #dbeffe;
 }
+
 .div_16 {
   border-bottom: 1px solid #edeef0;
   margin-left: 12px;
@@ -1550,61 +1700,75 @@ export default {
   padding-bottom: 10px;
   padding-top: 10px;
 }
+
 .div_17 {
   padding-left: 11px;
   line-height: 25px;
 }
+
 .img_13 {
   width: 100%;
   height: 100%;
 }
+
 .img_14 {
   width: 200px;
   height: 70px;
 }
+
 .img_15 {
   margin-left: 18px;
   width: 142px;
   height: 27px;
 }
+
 .share_content {
   height: 100vh;
+
   .div_01 {
     width: 100%;
     height: 43px;
     padding-top: 16px;
   }
+
   .div_02 {
     width: 100%;
     height: 497px;
     position: relative;
+
     .div_021 {
       position: absolute;
       top: 30px;
       left: 0px;
       width: 100%;
     }
+
     .div_022 {
       font-size: 25px;
     }
+
     .div_023 {
       font-size: 16px;
       margin-top: 28px;
       color: #073190;
     }
   }
+
   .div_03 {
     color: #666666;
     margin-bottom: 12px;
   }
 }
+
 .div_last {
   line-height: 20px;
   margin: 5px 0px;
 }
+
 .div_height {
   line-height: 24px;
 }
+
 .van-button::before {
   position: absolute;
   top: 50%;

src/views/ebiz/sale/InsuredInfo.vue

@@ -64,6 +64,7 @@
               :flag="true"
       ></FieldDatePicter>
       <FieldDatePicter
+              v-if="!userInfo.effectiveDateType"
               :v-validate="{ required: certiexpiredateRequired }"
               required
               label="证件截止日期"
@@ -1085,7 +1086,7 @@
         this.userInfo.idType = data.customerIdType //证件类型
         this.userInfo.idNo = data.customerIdNumber //证件类别
         this.userInfo.certificateValidate = data.idEffectStartDate //证件起始日期
-        if (data.idEffectEndDate == '9999-12-31') {
+        if (data.idEffectEndDate == '9999-12-31' && !data.idEffectEndDate) {
           this.userInfo.effectiveDateType = true //是否长期
         } else {
           this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
@@ -1557,9 +1558,10 @@
       effectiveDataTypeChange(val) {
         //勾选长期状态时,证件截止日期置空
         if (val) {
-          this.userInfo.certiexpiredate = ''
+          this.userInfo.certiexpiredate = '9999-12-31'
           this.certiexpiredateRequired = false
         } else {
+          this.userInfo.certiexpiredate = ''
           this.certiexpiredateRequired = true
         }
       },

src/views/ebiz/sale/InsuredPerson.vue

@@ -82,6 +82,7 @@
               :readonly="isAppnt"
       ></FieldDatePicter>
       <FieldDatePicter
+              v-if="!userInfo.effectiveDateType"
               v-validate="{ required: certiexpiredateRequired }"
               label="证件截止日期"
               name="证件截止日期"
@@ -1274,7 +1275,7 @@
         this.userInfo.certificateValidate = data.idEffectStartDate //证件起始日期
         // this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
         // this.userInfo.effectiveDateType = data.idEffectEndDate == '9999-12-31' //是否长期
-        if (data.idEffectEndDate == '9999-12-31') {
+        if (data.idEffectEndDate == '9999-12-31' && !data.idEffectEndDate) {
           this.userInfo.effectiveDateType = true //是否长期
         } else {
           this.userInfo.certiexpiredate = data.idEffectEndDate //证件截止日期
@@ -1875,11 +1876,12 @@
       effectiveDataTypeChange(val) {
         //勾选长期状态时,证件截止日期置空
         if (val) {
-          this.userInfo.certiexpiredate = ''
+          this.userInfo.certiexpiredate = '9999-12-31'
           // this.isRequired = false
           // this.idLimit = true
           this.certiexpiredateRequired = false
         } else {
+          this.userInfo.certiexpiredate = ''
           this.certiexpiredateRequired = true
           // this.isRequired = true
           // this.idLimit = false

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -696,7 +696,9 @@ export default {
         if (this.$route.query.airSign) {
           sessionStorage.setItem('airSign', this.$route.query.airSign)
         }
-        window.localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.token) {
+          window.localStorage.setItem('token', this.$route.query.token)
+        }
         window.localStorage.setItem('orderNo', this.$route.query.orderNo)
         if (this.$route.query.changeCard == '0') {
           localStorage.setItem('changeCard', true)
@@ -1198,6 +1200,7 @@ export default {
       }
     },
     goUrl() {
+      window.localStorage.setItem('isFirstRead', '1')
       let that = this
       if (window.localStorage.getItem('sign-val') == '3') {
         if (that.agentSignStatus == '3') {
@@ -1326,7 +1329,6 @@ export default {
                 }
               }
             }
-
             if (path) {
               that.$jump({
                 flag: 'h5',

src/views/ebiz/sale/SignatureConfirmationOld.vue

@@ -315,7 +315,9 @@ export default {
 
         this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
         this.$CacheUtils.setLocItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
-        window.localStorage.setItem('token', this.$route.query.token)
+        if (this.$route.query.token) {
+          window.localStorage.setItem('token', this.$route.query.token)
+        }
         window.localStorage.setItem('orderNo', this.$route.query.orderNo)
         window.localStorage.setItem('relationToAppnt', this.$route.query.relationToAppnt)
         if (this.$route.query.signInvalid) {

src/views/ebiz/sale/readDocuments.vue

@@ -38,6 +38,17 @@
         </van-button>
       </div>
     </div>
+    <van-dialog v-model="specialAgreementShow" :showConfirmButton="false">
+      <div slot="title">
+        <p style="font-weight: 600">特别约定</p>
+      </div>
+      <div style="padding: 20px 30px 10px;font-size: 14px;">
+        <div style="line-height: 25px;text-indent: 2em;">在{{riskName}}合同有效的情况下，投保单号/保单号{{ associatedPolicyNo }}的生产类保险金及现金红利（如有），自动转为{{riskName}}的保险费。</div>
+      </div>
+      <div style="text-align: center;margin-bottom: 15px;">
+        <van-button plain type="primary" color="#1989fa" style="padding:0px 35px;font-size: 14px;" @click="specialAgreementShow = false">本人已阅读并通义上述特别约定内容</van-button>
+      </div>
+    </van-dialog>
   </div>
 </template>
 <script>
@@ -63,6 +74,11 @@
         chaoluButtonDisabled: true,
         chaoluStatus: false,
         productType: '',
+        specialAgreementShow: false,
+        associatedPolicyNo: null,
+        chooseProductCodes: null,
+        riskName: null,
+        isFirstRead: null,
       }
     },
     components: {
@@ -72,6 +88,13 @@
       [NoticeBar.name]: NoticeBar
     },
     created(){
+      this.associatedPolicyNo = window.localStorage.getItem('associatedPolicyNo')
+      this.riskName = window.localStorage.getItem('riskName')
+      this.chooseProductCodes = window.localStorage.getItem('chooseProductCodes') && JSON.parse(window.localStorage.getItem('chooseProductCodes'))
+      if(window.localStorage.getItem('isFirstRead') && window.localStorage.getItem('isFirstRead') == '1' && this.associatedPolicyNo && this.associatedPolicyNo != 'null' && this.chooseProductCodes && this.chooseProductCodes.includes('GFRS_M0098')){
+        window.localStorage.setItem('isFirstRead', '0')
+        this.specialAgreementShow = true
+      }
       if(this.$route.query.currentIndex){
         this.Time = true
         this.isPreview = true
@@ -222,6 +245,7 @@
               window.localStorage.setItem('insuredSignFile',JSON.stringify(this.fileList))
             }
             if(this.fileList[this.current - 1].documentCode == '5') {
+              window.localStorage.setItem('isFirstRead', '1')
               this.$router.push({
                 path: '/sale/SignatureConfirmation',
                 query: {

src/views/ebiz/sale/signDocuments.vue

@@ -1,18 +1,12 @@
 <template>
-  <div class='insuranceInformation-container' style="padding: 15px;">
-    <div style="display: flex;align-items: center;font-weight: bold;" class="fs20">
-      <span style="width: 3px;background: red;height: 25px;"></span>
-      <span v-if="signVal == '0' || signVal == '2'" style="margin-left: 5px;">
-        投保人：{{signName}}
-      </span>
-      <span v-if="signVal == '1'" style="margin-left: 5px;">
-        被保险人：{{signName}}
-      </span>
-      <span v-if="signVal == '3'" style="margin-left: 5px;">
-        代理人：{{signName}}
-      </span>
+  <div class="insuranceInformation-container" style="padding: 15px">
+    <div style="display: flex; align-items: center; font-weight: bold" class="fs20">
+      <span style="width: 3px; background: red; height: 25px"></span>
+      <span v-if="signVal == '0' || signVal == '2'" style="margin-left: 5px"> 投保人：{{ signName }} </span>
+      <span v-if="signVal == '1'" style="margin-left: 5px"> 被保险人：{{ signName }} </span>
+      <span v-if="signVal == '3'" style="margin-left: 5px"> 代理人：{{ signName }} </span>
     </div>
-    <div style="margin-top: 15px;font-weight: bold;line-height: 32px;font-size: 16px;" class="fs20">
+    <div style="margin-top: 15px; font-weight: bold; line-height: 32px; font-size: 16px" class="fs20">
       <span v-if="signVal == '3'">
         1.接下来您作为代理人将进行投保文件的签字，请在签字前确保您已仔细阅读投保文件并了解投保文件的内容和含义，确定投保单各项信息准确无误。签字完成并成功提交说明您正式向我司提交投保申请。
       </span>
@@ -26,208 +20,209 @@
         1.接下来您作为被保险人/监护人将进行投保文件的签字，请在签字前确保您已仔细阅读投保文件并了解投保文件的内容和含义，确定投保单各项信息准确无误。签字完成并成功提交说明您正式向我司提交投保申请。
       </span>
     </div>
-    <div style="border-bottom: 1px dashed #eee;padding-bottom: 15px;margin-top: 15px;">
-      <p style="font-size: 16px;font-weight: bold;">2.您将为以下文件进行统一签名：</p>
-      <div v-for="item in fileList" style="margin-top: 15px;display: flex;justify-content: space-between;">
-        <span style="font-size: 16px;color: red;opacity: 0.7;width: 60%;display: inline-block;">{{item.name}}</span>
-        <span v-if="signstatus == '1'" style="display: flex;align-items: center;display: inline-block;width: 40%;">
-          <img :src="src" style="margin-left: 15px;width: 16px;"/>
-          <span style="font-size: 16px;color: #03ceaf;margin-left: 10px;">签署完成</span>
+    <div style="border-bottom: 1px dashed #eee; padding-bottom: 15px; margin-top: 15px">
+      <p style="font-size: 16px; font-weight: bold">2.您将为以下文件进行统一签名：</p>
+      <div v-for="item in fileList" style="margin-top: 15px; display: flex; justify-content: space-between">
+        <span style="font-size: 16px; color: red; opacity: 0.7; width: 60%; display: inline-block">{{ item.name }}</span>
+        <span v-if="signstatus == '1'" style="display: flex; align-items: center; display: inline-block; width: 40%">
+          <img :src="src" style="margin-left: 15px; width: 16px" />
+          <span style="font-size: 16px; color: #03ceaf; margin-left: 10px">签署完成</span>
         </span>
       </div>
     </div>
-    <div style="margin-top: 15px;display: flex;align-items: center;" class="fs20">
-      <span v-if="signVal == '3'" style="font-size: 16px;font-weight: bold;">代理人签名：</span>
-      <span v-if="signVal == '0' || signVal == '2'" style="font-size: 16px;font-weight: bold;">投保人签名：</span>
-      <span v-if="signVal == '1' && insuredAge >= 18" style="font-size: 16px;font-weight: bold;">被保险人签名：</span>
-      <span v-if="signVal == '1' && insuredAge < 18" style="font-size: 16px;font-weight: bold;">被保险人/监护人签名：</span>
-      <van-button type="danger" size="small" round style="margin-left: 20px;height: 32px;font-size: 16px;" @click="gosign" class="fs20">
-        {{signstatus ? '重新签名' : '签名'}}
+    <div style="margin-top: 15px; display: flex; align-items: center" class="fs20">
+      <span v-if="signVal == '3'" style="font-size: 16px; font-weight: bold">代理人签名：</span>
+      <span v-if="signVal == '0' || signVal == '2'" style="font-size: 16px; font-weight: bold">投保人签名：</span>
+      <span v-if="signVal == '1' && insuredAge >= 18" style="font-size: 16px; font-weight: bold">被保险人签名：</span>
+      <span v-if="signVal == '1' && insuredAge < 18" style="font-size: 16px; font-weight: bold">被保险人/监护人签名：</span>
+      <van-button type="danger" size="small" round style="margin-left: 20px; height: 32px; font-size: 16px" @click="gosign" class="fs20">
+        {{ signstatus ? '重新签名' : '签名' }}
       </van-button>
     </div>
     <div>
-      <img v-if="signstatus" :src="signImgUrl" style="height: 34px;margin-left: 20px;width: auto;"/>
+      <img v-if="signstatus" :src="signImgUrl" style="height: 34px; margin-left: 20px; width: auto" />
     </div>
-    <div class='bg-white bottom-btn'>
-      <van-button :disabled="nextDisabled" type='danger' size='normal' style="font-size: 16px;" block v-no-more-click='1000' @click="gonext">
+    <div class="bg-white bottom-btn">
+      <van-button :disabled="nextDisabled" type="danger" size="normal" style="font-size: 16px" block v-no-more-click="1000" @click="gonext">
         完成阅读并签署
       </van-button>
     </div>
 
     <van-dialog v-model="guardianshow" :showConfirmButton="false">
       <div slot="title">
-        <p style="color: #E9332E;">监护人姓名</p>
+        <p style="color: #e9332e">监护人姓名</p>
       </div>
-      <div class="guardianContent" style="padding: 20px 30px 30px;font-size: 14px;">
-        <van-field v-model="guardianName" label="" name="监护人姓名" placeholder="请输入"/>
+      <div class="guardianContent" style="padding: 20px 30px 30px; font-size: 14px">
+        <van-field v-model="guardianName" label="" name="监护人姓名" placeholder="请输入" />
       </div>
-      <div style="text-align: center;margin-bottom: 30px;">
-        <van-button round type="danger" size="small" style="padding:0px 35px;font-size: 14px;" @click="gosign">确定</van-button>
+      <div style="text-align: center; margin-bottom: 30px">
+        <van-button round type="danger" size="small" style="padding: 0px 35px; font-size: 14px" @click="gosign">确定</van-button>
       </div>
     </van-dialog>
   </div>
 </template>
 <script>
-  import { saveInformation } from '@/api/ebiz/sale/sale'
-  import isChoose from '@/assets/images/u20257.png'
-  export default {
-    data() {
-      return {
-        src: isChoose,
-        fileList:[],
-        signImgUrl:'data:image/gif;base64,',
-        signstatus: false,
-        signVal: '',
-        signName: '',
-        insuredAge: '',
-        guardianshow: false,
-        guardianName: '',
-        nextDisabled:true,
-      }
-    },
-    components: {},
-    created(){
-      setTimeout(() => {
-        // eslint-disable-next-line no-undef
-        EWebBridge.webCallAppInJs('webview_left_button', {
-          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
-          intercept: '1' //是否拦截原生返回事件 1是 其他否
+import { saveInformation } from '@/api/ebiz/sale/sale'
+import isChoose from '@/assets/images/u20257.png'
+export default {
+  data() {
+    return {
+      src: isChoose,
+      fileList: [],
+      signImgUrl: 'data:image/gif;base64,',
+      signstatus: false,
+      signVal: '',
+      signName: '',
+      insuredAge: '',
+      guardianshow: false,
+      guardianName: '',
+      nextDisabled: true
+    }
+  },
+  components: {},
+  created() {
+    setTimeout(() => {
+      // eslint-disable-next-line no-undef
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
+    window.appCallBack = this.appCallBack
+  },
+  mounted() {
+    this.signVal = window.localStorage.getItem('sign-val')
+    this.insuredAge = window.localStorage.getItem('insuredAge')
+    document.body.style.backgroundColor = '#fff'
+    let thisfilelist = ''
+    if (this.signVal == '3') {
+      thisfilelist = JSON.parse(window.localStorage.getItem('agentSignFile'))
+      this.signName = window.localStorage.getItem('recmdName')
+    } else if (this.signVal == '0' || this.signVal == '2') {
+      thisfilelist = JSON.parse(window.localStorage.getItem('appntSignFile'))
+      this.signName = window.localStorage.getItem('appntName')
+    } else if (this.signVal == '1') {
+      thisfilelist = JSON.parse(window.localStorage.getItem('insuredSignFile'))
+      this.signName = window.localStorage.getItem('insuredName')
+    }
+    console.log(thisfilelist)
+    thisfilelist.forEach((item) => {
+      if (item.documentType == '1') {
+        this.fileList.push({
+          name: item.documentName,
+          status: '1'
         })
-      }, 100)
-      window.appCallBack = this.appCallBack
-    },
-    mounted() {
-      this.signVal = window.localStorage.getItem('sign-val')
-      this.insuredAge = window.localStorage.getItem('insuredAge')
-      document.body.style.backgroundColor = '#fff'
-      let thisfilelist = ''
-      if(this.signVal == '3') {
-        thisfilelist = JSON.parse(window.localStorage.getItem('agentSignFile'))
-        this.signName = window.localStorage.getItem('recmdName')
-      } else if(this.signVal == '0' || this.signVal == '2') {
-        thisfilelist = JSON.parse(window.localStorage.getItem('appntSignFile'))
-        this.signName = window.localStorage.getItem('appntName')
-      } else if(this.signVal == '1') {
-        thisfilelist = JSON.parse(window.localStorage.getItem('insuredSignFile'))
-        this.signName = window.localStorage.getItem('insuredName')
       }
-      console.log(thisfilelist)
-      thisfilelist.forEach(item => {
-        if(item.documentType == '1') {
-          this.fileList.push({
-            name:item.documentName,
-            status: '1'
+    })
+    this.signH5Img = sessionStorage.getItem('signH5Img')
+    if (JSON.parse(window.sessionStorage.getItem('signH5Img'))) {
+      if (JSON.parse(window.sessionStorage.getItem('signH5Img')).type == '签名' && JSON.parse(window.sessionStorage.getItem('signH5Img')).val)
+        this.signstatus = true
+      this.signImgUrl = this.signImgUrl + JSON.parse(window.sessionStorage.getItem('signH5Img')).val
+    }
+    if (window.sessionStorage.getItem('signH5Val')) {
+      this.nextDisabled = false
+    }
+  },
+  methods: {
+    gosign() {
+      window.localStorage.setItem('orderNo', this.$route.query.orderNo)
+      let signInfo = {
+        type: '签名',
+        text: '',
+        keyWord: ''
+      }
+      if (this.signVal == '0' || this.signVal == '2') {
+        signInfo.text = window.localStorage.getItem('appntName')
+        signInfo.keyWord = '投保锟斤拷：'
+      }
+      if (this.signVal == '1') {
+        signInfo.text = window.localStorage.getItem('insuredName')
+        signInfo.keyWord = '被保锟斤拷：'
+      }
+      if (this.signVal == '3') {
+        signInfo.text = window.localStorage.getItem('recmdName')
+        signInfo.keyWord = '代理锟斤拷：'
+      }
+      if (this.insuredAge < 18 && !this.guardianName && this.signVal == '1') {
+        this.guardianshow = true
+      } else {
+        if (this.insuredAge < 18 && this.signVal == '1') {
+          signInfo.text = this.guardianName
+        }
+        window.sessionStorage.setItem('signInfo', JSON.stringify(signInfo))
+        setTimeout(() => {
+          window.location.href = this.$mainUrl + '/signH5/1.html?time=' + new Date().getTime()
+        }, 0)
+      }
+    },
+    gonext() {
+      let params = {
+        orderType: 'SIGN_MERGED_ORDER',
+        orderDTO: {
+          orderInfoDTO: {
+            orderNo: this.$route.query.orderNo
+          },
+          baseEncryp: window.sessionStorage.getItem('signH5Val'),
+          signValue: JSON.parse(window.sessionStorage.getItem('signH5Img')).val,
+          signType: window.localStorage.getItem('sign-val'),
+          ebizSignDTOS: []
+        }
+      }
+      let thisfilelist = ''
+      if (this.signVal == '3') {
+        thisfilelist = JSON.parse(window.localStorage.getItem('agentSignFile'))
+      } else if (this.signVal == '0' || this.signVal == '2') {
+        thisfilelist = JSON.parse(window.localStorage.getItem('appntSignFile'))
+      } else if (this.signVal == '1') {
+        thisfilelist = JSON.parse(window.localStorage.getItem('insuredSignFile'))
+      }
+      thisfilelist.forEach((item) => {
+        if (item.documentType == '1') {
+          params.orderDTO.ebizSignDTOS.push({
+            signOrRead: 'sign',
+            signId: item.signId,
+            orderNo: this.$route.query.orderNo,
+            documentCode: item.documentCode,
+            documentStatus: '3',
+            documentType: '1',
+            signType: item.signType
           })
         }
       })
-      this.signH5Img = sessionStorage.getItem('signH5Img')
-      if(JSON.parse(window.sessionStorage.getItem('signH5Img'))) {
-        if(JSON.parse(window.sessionStorage.getItem('signH5Img')).type == '签名' && JSON.parse(window.sessionStorage.getItem('signH5Img')).val)
-          this.signstatus = true
-          this.signImgUrl = this.signImgUrl + JSON.parse(window.sessionStorage.getItem('signH5Img')).val
-      }
-      if(window.sessionStorage.getItem('signH5Val')){
-        this.nextDisabled = false
-      }
-    },
-    methods: {
-      gosign(){
-        window.localStorage.setItem('orderNo',this.$route.query.orderNo)
-        let signInfo = {
-          type:'签名',
-          text:'',
-          keyWord: ''
-        }
-        if(this.signVal == '0' || this.signVal == '2') {
-          signInfo.text = window.localStorage.getItem('appntName')
-          signInfo.keyWord = '投保锟斤拷：'
-        }
-        if(this.signVal == '1'){
-          signInfo.text = window.localStorage.getItem('insuredName')
-          signInfo.keyWord = '被保锟斤拷：'
-        }
-        if(this.signVal == '3') {
-          signInfo.text = window.localStorage.getItem('recmdName')
-          signInfo.keyWord = '代理锟斤拷：'
-        }
-        if(this.insuredAge < 18 && !this.guardianName && this.signVal == '1') {
-          this.guardianshow = true
-        } else {
-          if(this.insuredAge < 18 && this.signVal == '1') {
-            signInfo.text = this.guardianName
-          }
-          window.sessionStorage.setItem('signInfo',JSON.stringify(signInfo))
-          window.location.href = this.$mainUrl + '/signH5/1.html'
-          // window.location.href = 'http://'+window.location.host + '/signH5/1.html'
-        }
-
-      },
-      gonext(){
-        let params = {
-          orderType: 'SIGN_MERGED_ORDER',
-          orderDTO: {
-            orderInfoDTO: {
-              orderNo: this.$route.query.orderNo
-            },
-            baseEncryp: window.sessionStorage.getItem('signH5Val'),
-            signValue: JSON.parse(window.sessionStorage.getItem('signH5Img')).val,
-            signType: window.localStorage.getItem('sign-val'),
-            ebizSignDTOS: []
-          }
-        }
-        let thisfilelist = ''
-        if(this.signVal == '3') {
-          thisfilelist = JSON.parse(window.localStorage.getItem('agentSignFile'))
-        } else if(this.signVal == '0' || this.signVal == '2') {
-          thisfilelist = JSON.parse(window.localStorage.getItem('appntSignFile'))
-        } else if(this.signVal == '1') {
-          thisfilelist = JSON.parse(window.localStorage.getItem('insuredSignFile'))
-        }
-        thisfilelist.forEach(item => {
-          if(item.documentType == '1') {
-            params.orderDTO.ebizSignDTOS.push({
-              signOrRead: 'sign',
-              signId:item.signId,
-              orderNo: this.$route.query.orderNo,
-              documentCode: item.documentCode,
-              documentStatus: '3',
-              documentType: '1',
-              signType: item.signType
+      saveInformation(params).then((res) => {
+        if (res.result == '0') {
+          if (window.sessionStorage.getItem('shareUrl')) {
+            this.$router.push({
+              path: '/sale/SignatureConfirmation' + window.sessionStorage.getItem('shareUrl')
             })
-          }
-        })
-        saveInformation(params).then(res=>{
-          if(res.result == '0') {
-            if(window.sessionStorage.getItem('shareUrl')){
-              this.$router.push({
-                path: '/sale/SignatureConfirmation'+window.sessionStorage.getItem('shareUrl')
-              })
-            } else {
-              this.$router.push({
-                path: '/sale/SignatureConfirmation',
-                query: {
-                  orderNo: this.$route.query.orderNo
-                }
-              })
-            }
           } else {
-            this.$toast(res.resultMessage)
-          }
-        })
-      },
-      appCallBack(data) {
-        if (data.trigger == 'left_button_click') {
-          if (this.videoShow) {
-            this.$jump({
-              flag: 'navigation',
-              extra: {
-                title: '签名确认',
-                hiddenRight: '1'
+            this.$router.push({
+              path: '/sale/SignatureConfirmation',
+              query: {
+                orderNo: this.$route.query.orderNo
               }
             })
-            return (this.videoShow = false)
           }
-          return this.$dialog.confirm({
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        if (this.videoShow) {
+          this.$jump({
+            flag: 'navigation',
+            extra: {
+              title: '签名确认',
+              hiddenRight: '1'
+            }
+          })
+          return (this.videoShow = false)
+        }
+        return this.$dialog
+          .confirm({
             className: 'dialog-delete',
             title: '提示',
             message: '是否确认退出？',
@@ -251,34 +246,30 @@
           .catch(() => {
             return
           })
-        }
-      },
-    },
-    computed: {
-
-    },
-    beforeRouteLeave(to, from, next) {
-      document.body.style.backgroundColor = ''
-      window.sessionStorage.removeItem('signH5Img')
-      window.sessionStorage.removeItem('signH5Val')
-      window.sessionStorage.removeItem('signInfo')
-      next()
-    },
-    watch: {
-
+      }
     }
-  }
+  },
+  computed: {},
+  beforeRouteLeave(to, from, next) {
+    document.body.style.backgroundColor = ''
+    window.sessionStorage.removeItem('signH5Img')
+    window.sessionStorage.removeItem('signH5Val')
+    window.sessionStorage.removeItem('signInfo')
+    next()
+  },
+  watch: {}
+}
 </script>
-<style lang='scss' scoped>
-  .guardianContent{
-    /deep/ .van-cell{
-      border: 1px solid #eee;
-    }
+<style lang="scss" scoped>
+.guardianContent {
+  /deep/ .van-cell {
+    border: 1px solid #eee;
   }
-  .fs20{
-    font-size: 16px;
-    .van-button__text{
-      padding: 8px 16px;
-    }
+}
+.fs20 {
+  font-size: 16px;
+  .van-button__text {
+    padding: 8px 16px;
   }
+}
 </style>

src/views/ebiz/serve/AirSign.vue

@@ -15,10 +15,15 @@
         <van-field maxlength="6" placeholder="请输入短信验证码" v-model="authCode" clearable label-width="0" />
         <van-button type="danger" plain size="small" class="w160 p0" @click="getAuthCode" :disabled="codeDisabled" v-no-more-click="2000">{{
           codeDisabled ? `${countDown}s后重新获取` : '获取验证码'
-          }}</van-button>
+        }}</van-button>
       </van-cell-group>
     </van-dialog>
-    <UploadImageFile :typeface="idcardData.typeface && (faceAuthCount.weixin < smsAuthNum)" :realName="idcardData.idcardName" :idno="idcardData.idcardNumber" @sendimage="sendimage">
+    <UploadImageFile
+      :typeface="idcardData.typeface && faceAuthCount.weixin < smsAuthNum"
+      :realName="idcardData.idcardName"
+      :idno="idcardData.idcardNumber"
+      @sendimage="sendimage"
+    >
     </UploadImageFile>
     <div class="p60">
       <van-button type="danger" @click="uploadComparison" size="large">上传照片与证件照对比</van-button>
@@ -82,7 +87,9 @@ export default {
   created() {
     if (this.isWeixin) {
       this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
-      window.localStorage.setItem('token', this.$route.query.token)
+      if (this.$route.query.token) {
+        window.localStorage.setItem('token', this.$route.query.token)
+      }
       window.localStorage.setItem('policyNo', this.$route.query.policyNo)
       this.idcardData.idcardName = JSON.parse(this.$route.query.saleInsuredInfo).name
       this.idcardData.idcardNumber = JSON.parse(this.$route.query.saleInsuredInfo).idNo
@@ -120,7 +127,7 @@ export default {
         operateCode: this.customerMobile,
         system: 'agentApp',
         operateCodeType: '0'
-      }).then(res => {
+      }).then((res) => {
         console.log(res)
         if (res.result == 0) {
           this.sid = res.sessionId
@@ -178,7 +185,7 @@ export default {
       this.authCode = null
       // eslint-disable-next-line no-unused-vars
       return new Promise((resolve, reject) => {
-        checkPhone(data).then(res => {
+        checkPhone(data).then((res) => {
           if (res.result == '0') {
             console.log(res)
             this.show = true
@@ -203,7 +210,7 @@ export default {
       if (e) {
         that.disabled = false
       } else {
-        this.faceAuthCount.weixin++;
+        this.faceAuthCount.weixin++
         if (this.faceAuthCount.weixin >= this.smsAuthNum) {
           this.realPeopelCheck()
         }
@@ -219,7 +226,7 @@ export default {
     },
     //根据数据字典 将后端返回的数据渲染到页面中
     filterData(dictionary, key, pageData) {
-      dictionary.forEach(item => {
+      dictionary.forEach((item) => {
         if (pageData[key] == item.id) {
           pageData[key + 'Text'] = item.text //渲染页面使用的字段
         }
@@ -231,7 +238,7 @@ export default {
       let data = {
         policyNo: this.$route.query.policyNo
       }
-      getPolicyDetail(data).then(res => {
+      getPolicyDetail(data).then((res) => {
         if (res.result == '0') {
           let appntDTO = res.content.appntDTO
           let orderInfoDTO = res.content.orderInfoDTO
@@ -249,8 +256,8 @@ export default {
           this.filterData(dataDictionary.idType, 'idType', appntDTO)
           that.appntDTO = appntDTO
           // 被保险人信息
-          res.content.insuredDTOs.map(insured => {
-            insured.riskDTOLst.map(risk => {
+          res.content.insuredDTOs.map((insured) => {
+            insured.riskDTOLst.map((risk) => {
               Number(risk.payIntv)
               switch (risk.payIntv) {
                 case -1:
@@ -287,7 +294,7 @@ export default {
             this.filterData(dataDictionary.sex, 'sex', insured)
             this.filterData(dataDictionary.idType, 'idType', insured)
             this.filterData(dataDictionary.relationToAppnt, 'relation', insured)
-            insured.bnfDTOs.map(bnf => {
+            insured.bnfDTOs.map((bnf) => {
               this.filterData(dataDictionary.bnfType, 'bnfType', bnf)
               this.filterData(dataDictionary.sex, 'sex', bnf)
               this.filterData(dataDictionary.idType, 'idType', bnf)
@@ -307,7 +314,7 @@ export default {
       let params = {
         contNo: this.$route.query.policyNo
       }
-      getReceiptSign(params).then(res => {
+      getReceiptSign(params).then((res) => {
         if (res.result == '0') {
           console.log('res', res)
           this.$toast.clear()