Merge remote-tracking branch 'origin/feature/FCRS-935鑫管家c万能险关联富贵相伴养老年金投保特别约定弹窗提醒' into origin/release/【20250806】关于健康险渠道对核心部分功能做优化调整的请示（第三期）

# Conflicts:
#	src/views/ebiz/proposal/ProposalInfo.vue

.gitignore

@@ -3,4 +3,5 @@ dist
 
 .eslintrc.js
 .prettierrc
-.idea
+.idea
+.history

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/components/common/CheckAgent.vue

@@ -16,7 +16,7 @@
           <van-field
             minlength="6"
             class="pt5 mt10"
-            style="border-top:1px solid #eaeaea;border-bottom:1px solid #eaeaea"
+            style="border-top: 1px solid #eaeaea; border-bottom: 1px solid #eaeaea"
             v-model="checkModel.pwd"
             clearable
             type="password"
@@ -207,7 +207,7 @@ export default {
         operateCodeType: '0'
       }
       //获取验证码
-      getAuthCode(data).then(res => {
+      getAuthCode(data).then((res) => {
         if (res.result == 0) {
           this.checkModel.smsId = res.sessionId
           this.checkModel.smsCode = null
@@ -225,6 +225,18 @@ export default {
         }
       })
     }
+  },
+  watch: {
+    /**
+     * 监听弹窗显示隐藏
+     */
+    'checkModel.show'(val) {
+      console.log('checkModel.show', val)
+      // 显示时禁止截屏，不显示时恢复截屏
+      EWebBridge.webCallAppInJs('enable_screen_capture', {
+        enable: !val
+      })
+    }
   }
 }
 </script>

src/components/ebiz/sale/UploadImageFile.vue

@@ -127,7 +127,7 @@ export default {
       num++
       await this.getRecognitionUrl(val, num)
       if (this.requestId && this.bizToken) {
-        await this.getRecognitionResult(this.requestId, this.bizToken)
+        await this.getRecognitionResult(this.requestId, this.bizToken, JSON.parse(localStorage['orderNo']))
       } else {
         return
       }
@@ -155,9 +155,9 @@ export default {
         )
       })
     },
-    getRecognitionResult(requestId, bizToken) {
+    getRecognitionResult(requestId, bizToken, orderNo) {
       return new Promise((resolve, reject) => {
-        getRecognitionResult({ requestId, bizToken }).then(
+        getRecognitionResult({ requestId, bizToken, orderNo }).then(
           res => {
             console.log('getRecognitionResult', res)
             if (res.result == '0') {

src/views/GBC/home.vue

@@ -43,7 +43,7 @@
       <div slot="title">
         <p style="color: #E9332E;">请选择项目</p>
       </div>
-      <div class="chooseProjectDialog" style="padding: 20px 30px 30px;font-size: 14px;">
+      <div class="chooseProjectDialog" style="padding: 20px 30px 30px;font-size: 14px;height:425px;overflow-y:auto">
         <van-radio-group v-model="chooseTeamCode">
           <van-radio v-for="(item,index) in projectList" :key="index" :name="item.teamCode" style="margin: 10px;">
             <span style="margin-left: 20px;">

src/views/YB_APP/renewalDetail.vue

@@ -104,13 +104,16 @@ export default {
       this.show = true // 显示确认对话框
     },
     contact() {
-      const a = document.createElement('a')
-      a.href = `tel:'${this.ybOrderDTOList.appntPhone}'`
-      a.click()
-      this.show = false
+      EWebBridge.webCallAppInJs('callSystem', {
+        system: 'tel',
+        number: this.ybOrderDTOList.appntPhone
+      })
     },
     callPhone(phoneNumber) {
-      window.location.href = 'tel://' + phoneNumber
+      EWebBridge.webCallAppInJs('callSystem', {
+        system: 'tel',
+        number: phoneNumber
+      })
     },
     getYBRenewalInfo() {
       // let params = {

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/app/Login.vue

@@ -2,17 +2,16 @@
   <div class="login-container ph10">
     <h3 class="text-center pv30">欢迎登录</h3>
     <van-cell-group cl>
-      <van-field v-model="username" clearable label="用户名" placeholder="请输入用户名" left-icon="contact"/>
-      <van-field v-model="password" type="password" label="密码" placeholder="请输入密码" left-icon="bag-o"/>
+      <van-field v-model="username" clearable label="用户名" placeholder="请输入用户名" left-icon="contact" />
+      <van-field v-model="password" type="password" label="密码" placeholder="请输入密码" left-icon="bag-o" />
     </van-cell-group>
-    <van-button type="info" size="large" class="mt30" @click="login" :loading="loading" loading-text="登录中...">登录
-    </van-button>
+    <van-button type="info" size="large" class="mt30" @click="login" :loading="loading" loading-text="登录中...">登录 </van-button>
   </div>
 </template>
 
 <script>
-import {CellGroup, Field} from 'vant'
-import {loginTest} from '@/api/ebiz/my/my.js'
+import { CellGroup, Field } from 'vant'
+import { loginTest } from '@/api/ebiz/my/my.js'
 
 export default {
   name: 'login',
@@ -28,6 +27,14 @@ export default {
       redirect: this.$route.query.redirect
     }
   },
+  mounted() {
+    setTimeout(() => {
+      EWebBridge.webCallAppInJs('enable_screen_capture', {
+        enable: false
+      })
+    }, 500)
+  },
+
   methods: {
     login() {
       if (this.username == '' || this.password == '') {
@@ -35,30 +42,31 @@ export default {
         return
       }
       this.loading = true
-      let that = this;
+      let that = this
       let reqData = {
         password: this.$MD5(that.password),
-        system: "agentApp",
-        graphCode: "",
-        graphId: "",
+        system: 'agentApp',
+        graphCode: '',
+        graphId: '',
         name: this.username,
-        loginflag: "agentPassword",
+        loginflag: 'agentPassword'
       }
 
-      loginTest(reqData).then(res => {
-        this.loading = false
-        if (res.result == 0) {
-          console.log(res)
-          this.$CacheUtils.setLocItem("token",res.token)
-          this.$router.push({ path: this.redirect || '/' })
-        }else {
-          this.$toast(res.resultMessage)
-        }
-      }) .catch(err => {
-        console.log(err)
-        this.loading = false
-      })
-
+      loginTest(reqData)
+        .then((res) => {
+          this.loading = false
+          if (res.result == 0) {
+            console.log(res)
+            this.$CacheUtils.setLocItem('token', res.token)
+            this.$router.push({ path: this.redirect || '/' })
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+        .catch((err) => {
+          console.log(err)
+          this.loading = false
+        })
     }
   }
 }

src/views/ebiz/agentEenter/SignContract.vue

@@ -34,14 +34,12 @@
         点击【开始】按钮，进行相关操作<br /><span class="red">温馨提示：请尽量使用正楷文字进行签名</span>
       </div>
       <div class="text-center mt20">
-        <van-button @click="faceAuth('0')" v-no-more-click="1000" :disabled="isAgentSubmit" type="danger" size="normal" style="width:30%">开始</van-button>
+        <van-button @click="faceAuth('0')" v-no-more-click="1000" :disabled="isAgentSubmit" type="danger" size="normal" style="width: 30%">开始</van-button>
       </div>
     </div>
     <div class="ebizGuarantor">
       <van-field readonly label-width="120px" label="担保人" v-model="ebizGuarantor.name"></van-field>
-      <p class="p15 line-height">
-        以下内容需要您按照顺序阅读并签字确认：
-      </p>
+      <p class="p15 line-height">以下内容需要您按照顺序阅读并签字确认：</p>
       <div class="p15 line-height">
         需签署：
         <ul>
@@ -63,9 +61,9 @@
         </ul>
         点击【开始】或【分享】，进行相关操作<br /><span class="red">温馨提示：请尽量使用正楷文字进行签名</span>
       </div>
-      <div v-if="!isInvalid" class="flex justify-content-a  mb60 mt20">
-        <van-button v-if="!isWeixin" @click="share" v-no-more-click="1000" type="danger" size="normal" style="width:30%">分享</van-button>
-        <van-button @click="faceAuth('1')" v-no-more-click="1000" :disabled="isguranteeSubmit" type="danger" size="normal" style="width:30%">开始</van-button>
+      <div v-if="!isInvalid" class="flex justify-content-a mb60 mt20">
+        <van-button v-if="!isWeixin" @click="share" v-no-more-click="1000" type="danger" size="normal" style="width: 30%">分享</van-button>
+        <van-button @click="faceAuth('1')" v-no-more-click="1000" :disabled="isguranteeSubmit" type="danger" size="normal" style="width: 30%">开始</van-button>
       </div>
       <div v-else class="ml15">操作时间已失效，请联系销售人员！</div>
     </div>
@@ -206,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)
         }
@@ -238,8 +238,8 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      return new Promise(resolve => {
-        agreementQuery(data).then(res => {
+      return new Promise((resolve) => {
+        agreementQuery(data).then((res) => {
           if (res.result == '0') {
             this.$toast.clear()
             this.agentInfo = res.content.ebizEnterCustomerDto
@@ -251,10 +251,10 @@ export default {
             this.agentInfo.createdDate = this.agentInfo.createdDate.substring(0, 10)
             this.agentSignList = filtSignList(this, this.signList).agentSignList
             this.guaranteeSignList = filtSignList(this, this.signList).guaranteeSignList
-            this.isAgentSubmit = this.agentSignList.every(item => {
+            this.isAgentSubmit = this.agentSignList.every((item) => {
               return item.signState == '1'
             })
-            this.isguranteeSubmit = this.guaranteeSignList.every(item => {
+            this.isguranteeSubmit = this.guaranteeSignList.every((item) => {
               return item.signState == '1'
             })
             resolve()
@@ -285,7 +285,7 @@ export default {
         message: '加载中……'
       })
       let data = {}
-      getSignInvalid(data).then(res => {
+      getSignInvalid(data).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           this.signInvalid = res.content.sign
@@ -321,8 +321,8 @@ export default {
       let data = {
         sign: signInvalid
       }
-      return new Promise(resolve => {
-        checkSignInvalid(data).then(res => {
+      return new Promise((resolve) => {
+        checkSignInvalid(data).then((res) => {
           if (res.result == '0') {
             that.$toast.clear()
             let status = res.content.status
@@ -338,7 +338,7 @@ export default {
 
       if (code == '0') {
         if (this.agentInfo.idType == '1') {
-              this.goUrl(code)
+          this.goUrl(code)
           // 人脸识别次数小于3次
           this.$toast.loading({
             duration: 0, // 持续展示 toast
@@ -366,7 +366,8 @@ export default {
                   const authRes = await EWebBridge.webCallAppInJs('face_auth', {
                     businessSource: '2', //业务来源:1-电投，2-入司，3-理赔，4-保全
                     number: this.agentInfo.idNo, //身份证号码
-                    name: this.agentInfo.name //姓名
+                    name: this.agentInfo.name, //姓名
+                    orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
                   })
                   // const authRes = await this.fakeFaceAuth(true)
                   console.log(authRes)
@@ -395,7 +396,7 @@ export default {
     },
     fakeFaceAuth(expect) {
       console.log('模拟调用人脸识别')
-      return new Promise(function(resolve, reject) {
+      return new Promise(function (resolve, reject) {
         setTimeout(() => {
           console.log('模拟人脸识别完成')
           if (expect) {
@@ -409,11 +410,11 @@ export default {
     goUrl(code) {
       let path = ''
       if (code == '0') {
-        path = this.agentSignList.filter(v => {
+        path = this.agentSignList.filter((v) => {
           return v.signState == '0'
         })[0].path
       } else if (code == '1') {
-        path = this.guaranteeSignList.filter(v => {
+        path = this.guaranteeSignList.filter((v) => {
           return v.signState == '0'
         })[0].path
       }
@@ -437,7 +438,7 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      signAgreement(data).then(res => {
+      signAgreement(data).then((res) => {
         console.log(res)
         if (res.result == '0') {
           this.$toast.clear()

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

@@ -1,27 +1,24 @@
 <template>
-  <div class='orderDetail-container'>
-    <index-bar :allowance-no='$route.query.allowanceNo' :reapply-no='$route.query.reapply' v-if='!isWeixin'></index-bar>
-    <div v-for='(item, index) in allowanceSignDTOLst' :key='index'>
+  <div class="orderDetail-container">
+    <index-bar :allowance-no="$route.query.allowanceNo" :reapply-no="$route.query.reapply" v-if="!isWeixin"></index-bar>
+    <div v-for="(item, index) in allowanceSignDTOLst" :key="index">
       <!-- 申请人 -->
-      <div v-if='item.type == 1 && !isWeixin'>
-        <p class='fw600 border-gb'>
-          <span>申请人</span><span class='ml60'>{{ allowanceApplyDTO.name }}</span>
+      <div v-if="item.type == 1 && !isWeixin">
+        <p class="fw600 border-gb">
+          <span>申请人</span><span class="ml60">{{ allowanceApplyDTO.name }}</span>
         </p>
         <p>点击【签名】按钮，进行申请人签名</p>
-        <p class='border-gb'>
+        <p class="border-gb">
           <span>申请人：</span>
-          <van-button type='danger' color='#2E4591' class='ml5' size='small' @click='signFunc(item.type, item.id)'
-                      :disabled='isSure' v-no-more-click='1000'>{{
-              item.signStatus == '0' ? '签名' : '已签名'
-            }}
+          <van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000"
+            >{{ item.signStatus == '0' ? '签名' : '已签名' }}
           </van-button>
-          <img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
-               alt='' /><br />
+          <img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
         </p>
       </div>
 
-      <div v-if='item.type == 2'>
-        <div v-if='isWeixin' class='bg-white mt10 fs14 tips'>
+      <div v-if="item.type == 2">
+        <div v-if="isWeixin" class="bg-white mt10 fs14 tips">
           <p>
             尊敬的
             <span>{{ allowanceEnjoyDTO.name }}</span
@@ -29,83 +26,54 @@
           </p>
           <p>恭喜您获得国富人寿桂冠专属父母赡养津贴，需要您点击【签字】按钮，进行签字申请：</p>
         </div>
-        <p v-if='!isWeixin' class='fw600 border-gb'>
-          <span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
+        <p v-if="!isWeixin" class="fw600 border-gb">
+          <span>享受人</span><span class="ml60">{{ allowanceEnjoyDTO.name }}</span>
         </p>
-        <p v-if='!isWeixin'>点击【签名】按钮，进行享受人签名</p>
-        <p class='border-gb'>
+        <p v-if="!isWeixin">点击【签名】按钮，进行享受人签名</p>
+        <p class="border-gb">
           <span>享受人：</span>
-          <van-button type='danger' color='#2E4591' class='ml5' size='small' @click='signFunc(item.type, item.id)'
-                      :disabled='isSure' v-no-more-click='1000'>{{
-              item.signStatus == '0' ? '签名' : '已签名'
-            }}
+          <van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000"
+            >{{ item.signStatus == '0' ? '签名' : '已签名' }}
           </van-button>
-          <img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
-               alt='' /><br />
+          <img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
           <!-- 享受人有分享功能 -->
           <van-button
-            type='danger'
-            color='#2E4591'
-            class='ml65 mt10'
-            v-if='!isWeixin'
-            size='small'
+            type="danger"
+            color="#2E4591"
+            class="ml65 mt10"
+            v-if="!isWeixin"
+            size="small"
             @click="share('0')"
-            :disabled='isSure'
-            v-no-more-click='1000'
-          >分享
-          </van-button
-          >
+            :disabled="isSure"
+            v-no-more-click="1000"
+            >分享
+          </van-button>
         </p>
       </div>
     </div>
-    <van-button v-if='!isWeixin' type='danger' color='#2E4591' class='bottom-btn ffcb6b' @click='nextStep'
-                v-no-more-click='1000'>提交审批
-    </van-button>
-    <SignTure :SignShow='SignShow' :signInfo='allowanceEnjoyDTO' @close='SignClose'
-              @SignSuccessful='SignSuccessful'></SignTure>
+    <van-button v-if="!isWeixin" type="danger" color="#2E4591" class="bottom-btn ffcb6b" @click="nextStep" v-no-more-click="1000">提交审批 </van-button>
+    <SignTure :SignShow="SignShow" :signInfo="allowanceEnjoyDTO" @close="SignClose" @SignSuccessful="SignSuccessful"></SignTure>
     <!-- 短信验证 -->
-    <van-dialog v-model='show' title='提示' show-cancel-button @confirm='authConfirm(authCode)' @cancel='clearTimer'>
-      <p class='p10 fs14'>为确保是您本人操作，短信验证码已发送至您手机号{{ encyCustomerMobile }}，请您输入验证码以完成后续投保操作。</p>
-      <van-cell-group class='flex align-items-c pr5 mb15'>
-        <van-field maxlength='6' placeholder='请输入短信验证码' v-model='authCode' clearable label-width='0' />
-        <van-button type='danger' color='#2E4591' plain size='small' class='w160 p0' @click='getAuthCode'
-                    :disabled='codeDisabled' v-no-more-click='2000'>{{
-            codeDisabled ? `${countDown}s后重新获取` : '获取验证码'
-          }}
+    <van-dialog v-model="show" title="提示" show-cancel-button @confirm="authConfirm(authCode)" @cancel="clearTimer">
+      <p class="p10 fs14">为确保是您本人操作，短信验证码已发送至您手机号{{ encyCustomerMobile }}，请您输入验证码以完成后续投保操作。</p>
+      <van-cell-group class="flex align-items-c pr5 mb15">
+        <van-field maxlength="6" placeholder="请输入短信验证码" v-model="authCode" clearable label-width="0" />
+        <van-button type="danger" color="#2E4591" plain size="small" class="w160 p0" @click="getAuthCode" :disabled="codeDisabled" v-no-more-click="2000"
+          >{{ codeDisabled ? `${countDown}s后重新获取` : '获取验证码' }}
         </van-button>
       </van-cell-group>
     </van-dialog>
   </div>
 </template>
 <script>
-import {
-  Toast,
-  CellGroup,
-  Field,
-  Dialog,
-  Collapse,
-  CollapseItem,
-  Cell,
-  Popup,
-  Divider,
-  RadioGroup,
-  Radio,
-  Tag
-} from 'vant'
+import { Toast, CellGroup, Field, Dialog, Collapse, CollapseItem, Cell, Popup, Divider, RadioGroup, Radio, Tag } from 'vant'
 import { getAllowanceDetail, saveOrUpdateAllowanceUrl, approveInit } from '@/api/ebiz/allowance/allowance'
 import SignTure from './component/SignTure'
 import config from '@/config'
 import { getWhitelist } from '@/api/ebiz/whitelist'
 import { weixinShare } from '@/assets/js/utils/wxShare.js'
 import { checkPhone } from '@/api/ebiz/customer/customer'
-import {
-  getSignInvalid,
-  checkSignInvalid,
-  getAuthCode,
-  autchCodeCheck,
-  getRecognitionUrl,
-  getRecognitionResult
-} from '@/api/ebiz/sale/sale'
+import { getSignInvalid, checkSignInvalid, getAuthCode, autchCodeCheck, getRecognitionUrl, getRecognitionResult } from '@/api/ebiz/sale/sale'
 import { getShareParam } from '@/api/ebiz/cardList/cardList.js'
 import IndexBar from '@/components/ebiz/allowance/application/IndexBar'
 
@@ -183,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') {
@@ -195,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']))
+          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)
@@ -291,9 +265,9 @@ export default {
       return str
     },
     //微信初始化--获取腾讯人脸识别结果接口
-    getRecognitionResult(requestId, bizToken) {
+    getRecognitionResult(requestId, bizToken, orderNo) {
       return new Promise(() => {
-        getRecognitionResult({ requestId, bizToken }).then(
+        getRecognitionResult({ requestId, bizToken, orderNo }).then(
           (res) => {
             if (res.result == '0') {
               this.recognizeResult = res.result
@@ -497,7 +471,8 @@ export default {
               const authRes = await EWebBridge.webCallAppInJs('face_auth', {
                 businessSource: '5', //业务来源:1-电投，2-入司，3-理赔，4-保全 5津贴
                 number: that.allowanceEnjoyDTO.idNo, //身份证号码
-                name: that.allowanceEnjoyDTO.name //姓名
+                name: that.allowanceEnjoyDTO.name, //姓名
+                orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
               }).then((data) => {
                 console.log(JSON.parse(data), 'APP人脸识别结果')
                 if (JSON.parse(data).state == '1') {
@@ -669,7 +644,7 @@ export default {
         extra: {
           title: `国富人寿桂冠专属父母赡养津贴申请`,
           content: '点击去签字',
-          shareScene:0,// 0只分享好友，1 只分享朋友圈 不传默认所有
+          shareScene: 0, // 0只分享好友，1 只分享朋友圈 不传默认所有
           url: location.origin + '/#/allowance/application/signatureConfirmation?allowanceNo=' + this.allowanceNo + '&token=' + res.content,
           // '&relationToAppnt=' +
           // JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt +
@@ -728,7 +703,7 @@ export default {
   }
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 #app {
   .van-dialog__confirm,
   .van-dialog__confirm:active {
@@ -736,7 +711,7 @@ export default {
   }
 }
 </style>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .orderDetail-container {
   background-color: #fff;
   min-height: 100vh;

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

@@ -23,7 +23,7 @@
             <van-button
               type="danger"
               size="normal"
-              style="width: 157px;"
+              style="width: 157px"
               plain
               v-no-more-click="1000"
               @click="share(3)"
@@ -34,7 +34,7 @@
             <van-button
               type="danger"
               size="normal"
-              style="width: 157px;"
+              style="width: 157px"
               plain
               v-no-more-click="1000"
               @click="start_ocr(3)"
@@ -132,7 +132,11 @@ export default {
     }
 
     if (localStorage['faceAuthWeXin-requestId'] && localStorage['faceAuthWeXin-bizToken']) {
-      this.getRecognitionResult(JSON.parse(localStorage['faceAuthWeXin-requestId']), JSON.parse(localStorage['faceAuthWeXin-bizToken']))
+      this.getRecognitionResult(
+        JSON.parse(localStorage['faceAuthWeXin-requestId']),
+        JSON.parse(localStorage['faceAuthWeXin-bizToken']),
+        JSON.parse(localStorage['orderNo'])
+      )
     }
   },
   methods: {
@@ -209,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)
         }
@@ -237,7 +243,7 @@ export default {
         caseStatus: 'applying',
         businessNo: localStorage.businessNo
       }
-      progressDetail(data).then(res => {
+      progressDetail(data).then((res) => {
         if (res.result == 0) {
           console.log(res)
           this.list = res.content
@@ -253,7 +259,7 @@ export default {
         message: '加载中……'
       })
       let data = {}
-      getSignInvalid(data).then(res => {
+      getSignInvalid(data).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           this.signInvalid = res.content.sign
@@ -273,7 +279,7 @@ export default {
         sign: signInvalid
       }
       return new Promise((resolve, reject) => {
-        checkSignInvalid(data).then(res => {
+        checkSignInvalid(data).then((res) => {
           if (res.result == '0') {
             that.$toast.clear()
             let status = res.content.status
@@ -354,7 +360,8 @@ export default {
                 number: that.list.applyerCertiCode,
                 //姓名
                 name: that.list.applyerName,
-                businessSource: '3'
+                businessSource: '3',
+                orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
               })
               // const authRes = await new Promise(resolve => {
               //   resolve(JSON.stringify({ state: '0' }))
@@ -380,7 +387,7 @@ export default {
         let data = { realName: this.idcardData.idcardName, idno: this.idcardData.idcardNumber, redirectUrl: location.origin + '/#' + this.$route.fullPath }
         console.log('获取URL请求参数', data)
         getRecognitionUrl(data).then(
-          res => {
+          (res) => {
             console.log('getRecognitionUrl', res)
             if (res.result == '0') {
               localStorage.setItem('faceAuthWeXin-requestId', JSON.stringify(res.content.requestId))
@@ -390,15 +397,15 @@ export default {
               this.$toast(res.resultMessage)
             }
           },
-          error => {
+          (error) => {
             console.log(error)
           }
         )
       })
     },
-    getRecognitionResult(requestId, bizToken) {
-      getRecognitionResult({ requestId, bizToken })
-        .then(res => {
+    getRecognitionResult(requestId, bizToken, orderNo) {
+      getRecognitionResult({ requestId, bizToken, orderNo })
+        .then((res) => {
           console.log('getRecognitionResult', res)
           if (res.result == '0') {
             this.showRead()
@@ -406,7 +413,7 @@ export default {
             this.$toast(res.resultMessage)
           }
         })
-        .catch(error => {
+        .catch((error) => {
           console.log(error)
         })
       localStorage.setItem('faceAuthWeXin-requestId', '')
@@ -445,7 +452,7 @@ export default {
       localStorage.setItem('successClaimNo', '')
       let that = this
       let data = { businessNo: localStorage.getItem('businessNo') }
-      submit(data).then(res => {
+      submit(data).then((res) => {
         if (res.result == '0') {
           localStorage.successClaimNo = res.content.claimNo
           that.$jump({

src/views/ebiz/common/AddRiskList.vue

@@ -82,7 +82,8 @@ export default {
             if (
               currentMainRiskInfo.mainRiskPayEndYearFlag == 'Y' &&
               currentMainRiskInfo.mainRiskPayEndYear == '1000' &&
-              (item.productCode == 'GFRS_A0007' || item.productCode == 'GFRS_A0009'|| item.productCode == 'GFRS_A0010'|| item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014')
+              (item.productCode == 'GFRS_A0007' || item.productCode == 'GFRS_A0009'|| item.productCode == 'GFRS_A0010'|| item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014'
+                  || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016')
             ) {
               item.isHidden = 1
             }

src/views/ebiz/common/CalculatePremium.vue

@@ -348,7 +348,14 @@
       </div>
       <div
         class="flex justify-content-s pv10 border-bottom prem"
-        v-if="item.productCode != 'GFRS_M0080' && item.productCode != 'GFRS_M0083' && item.productCode != 'GFRS_M0098' && item.productCode != 'GFRS_M0085'"
+        v-if="
+          item.productCode != 'GFRS_M0100' &&
+          item.productCode != 'GFRS_M0080' &&
+          item.productCode != 'GFRS_M0083' &&
+          item.productCode != 'GFRS_M0098' &&
+          item.productCode != 'GFRS_M0103' &&
+          item.productCode != 'GFRS_M0085'
+        "
       >
         <!-- trialType 0-保额算保费，1-保费算保额 -->
         <!-- isTrial是否需存在特殊配置(规则) 0-是 1-否-->
@@ -392,20 +399,22 @@
             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved' + item.status + '.png')" alt="" />
           </div>
         </div>
-        <div class="flex justify-content-s align-items-c fs12" v-for='item in  riskAmntList'>
+        <div class="flex justify-content-s align-items-c fs12" v-for="item in riskAmntList">
           <div>
             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/coin.png')" alt="" />
-            <span class="v-middle">{{ item.accuRiskDesc  }}：</span>
+            <span class="v-middle">{{ item.accuRiskDesc }}：</span>
           </div>
           <div>
-                         <span class="w20 h20 p10 v-middle">{{item.accuRiskAmnt}}</span>
-<!--            <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved' + item.status + '.png')" alt="" />-->
+            <span class="w20 h20 p10 v-middle">{{ item.accuRiskAmnt }}</span>
+            <!--            <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved' + item.status + '.png')" alt="" />-->
           </div>
         </div>
         <div style="padding: 25px 0px 10px 10px; font-size: 10px; color: #999">
-          <p style="line-height: 20px"><span style="width: 40px; display: inline-block">说明：</span><br/>
-          1.绿色✔表示 未触发规则、红色×表示 触发规则;<br/>
-          2.已累计本次投保的风险保额;<br/>3.展示的风险保额为常见风险类别。</p>
+          <p style="line-height: 20px">
+            <span style="width: 40px; display: inline-block">说明：</span><br />
+            1.绿色✔表示 未触发规则、红色×表示 触发规则;<br />
+            2.已累计本次投保的风险保额;<br />3.展示的风险保额为常见风险类别。
+          </p>
         </div>
       </div>
     </van-dialog>
@@ -609,7 +618,7 @@ export default {
       richChildrenFlag: false,
       isCrossChannel: '0', //是否交叉渠道 1-是 0-否
       trialResultsShow: false, //核保试算结果
-      riskAmntList:[],//累计寿险风险保额（元）、累计重大疾病风险保额（元）、累计意外伤害风险保额（元）、意外住院津贴日额（元）、一般住院津贴日额（元）、特定疾病住院津贴日额（元）
+      riskAmntList: [], //累计寿险风险保额（元）、累计重大疾病风险保额（元）、累计意外伤害风险保额（元）、意外住院津贴日额（元）、一般住院津贴日额（元）、特定疾病住院津贴日额（元）
       verifyResultList: [] //核保试算返回数据结构
     }
   },
@@ -832,14 +841,14 @@ 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') {
+        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
@@ -1042,7 +1051,9 @@ export default {
         this.chooseProducts[productIndex].productCode === 'GFRS_A0009' ||
         this.chooseProducts[productIndex].productCode === 'GFRS_A0014' ||
         this.chooseProducts[productIndex].productCode === 'GFRS_A0013' ||
-        this.chooseProducts[productIndex].productCode === 'GFRS_A0010'
+        this.chooseProducts[productIndex].productCode === 'GFRS_A0010' ||
+        this.chooseProducts[productIndex].productCode === 'GFRS_A0015' ||
+        this.chooseProducts[productIndex].productCode === 'GFRS_A0016'
       ) {
         setTimeout(() => {
           this.getTrial()
@@ -1245,7 +1256,9 @@ export default {
           item01.productCode != 'GFRS_A0010' &&
           item01.productCode != 'GFRS_A0012' &&
           item01.productCode != 'GFRS_A0013' &&
-          item01.productCode != 'GFRS_A0014'
+          item01.productCode != 'GFRS_A0014' &&
+          item01.productCode != 'GFRS_A0015' &&
+          item01.productCode != 'GFRS_A0016'
         ) {
           chooseProductsNew.push(item01)
         }
@@ -1559,7 +1572,9 @@ export default {
             item.productCode != 'GFRS_A0010' &&
             item.productCode != 'GFRS_A0012' &&
             item.productCode != 'GFRS_A0013' &&
-            item.productCode != 'GFRS_A0014'
+            item.productCode != 'GFRS_A0014' &&
+            item.productCode != 'GFRS_A0015' &&
+            item.productCode != 'GFRS_A0016'
           ) {
             list.push(item)
           }
@@ -1741,10 +1756,10 @@ export default {
             }
           })
           this.chooseProducts.forEach((item, index) => {
-            if (item.productCode == 'GFRS_A0010' || item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014') {
+            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') {
+              if (item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016') {
                 if (this.saleInsuredPersonInfo.relationToAppnt != 1) {
                   //不同人
                   if (showPrem001) {
@@ -1814,10 +1829,11 @@ export default {
         }
       }
 
-      //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间
+      //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间 -1 (附加险D款时提出的需求)
       let remitIndex = this.getRemitIndex()
       //if (!remitIndex) return
       for (let itemRemitIndex of remitIndex) {
+        console.log('mainRiskInfo---->', mainRiskInfo)
         this.chooseProducts[itemRemitIndex].calFactorLst.forEach((item) => {
           if (item.code == 'payIntv') {
             for (let key in mainRiskInfo.payIntv) {
@@ -1827,13 +1843,13 @@ export default {
           if (item.code == 'payEndYear') {
             item.hasFlag = '1'
             item.payEndYearFlag = 'Y'
-            item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear)
+            item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1
             item.showContent = item.payEndYear + '年交'
           }
           if (item.code == 'insuYear') {
             item.hasFlag = '1'
             item.insuYearFlag = 'Y'
-            item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear)
+            item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1
             item.showContent = item.insuYear + '年'
           }
           if (item.code == 'amt') {
@@ -1848,7 +1864,9 @@ export default {
             this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0009' ||
             this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0010' ||
             this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0013' ||
-            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0014'
+            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0014' ||
+            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0015' ||
+            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0016'
           ) {
             //此附加险的缴费期间=主险缴费期间；保险期间=主险保险期间
             if (item.code == 'insuYear') {
@@ -1875,7 +1893,7 @@ export default {
                     })
                     this.chooseProducts[0].productTrialYearDTOS.forEach((item, index) => {
                       //因交费方式为一次性交清时，不会有豁免险，所以这里不判断一次性交清的情况
-                      if (payEndYearVal == item.yearWay + '年交') {
+                      if (payEndYearVal == Number(item.yearWay) - 1 + '年交') {
                         v.amt = item.displayAmount * item.moneyUnit
                       }
                     })
@@ -2164,14 +2182,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) => {
@@ -2195,7 +2213,7 @@ export default {
           }
         }
       }
-      if(hasPredictTransferPrem == '1') { 
+      if (hasPredictTransferPrem == '1') {
         this.disabledShow = false
       }
       this.nextStepFlag = true
@@ -2372,6 +2390,14 @@ 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) {
@@ -2454,7 +2480,6 @@ export default {
                   dutyCode: dutyItem.duty,
                   dutyName: dutyItem.dutyName
                 })
-                
               }
             })
             trialInfo.duty = result
@@ -2949,7 +2974,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元')
@@ -3072,7 +3097,7 @@ export default {
           return this.$toast('关联保单的格式不正确')
         }
       }
-
+      this.$CacheUtils.setLocItem('associatedPolicyNo',this.policyNo || null)
       //组装险种提交数据
       let [mainRiskCode, riskDTOLst] = ['', []]
       let rollInResult = '' //校验预计转入保费结果
@@ -3133,7 +3158,7 @@ export default {
               this.trialList[index].productCode == 'GFRS_M0057' ||
               this.trialList[index].productCode == 'GFRS_M0086' ||
               this.trialList[index].productCode == 'GFRS_M0092' ||
-                this.trialList[index].productCode == 'GFRS_M0096'
+              this.trialList[index].productCode == 'GFRS_M0096'
             ) {
               riskItem['dutyLst'] = this.trialInfos[index].duty
             }
@@ -3174,7 +3199,9 @@ export default {
             item.productCode == 'GFRS_A0010' ||
             item.productCode == 'GFRS_A0013' ||
             item.productCode == 'GFRS_A0014' ||
-            item.productCode == 'GFRS_M0077'
+            item.productCode == 'GFRS_M0077' ||
+            item.productCode == 'GFRS_A0015' ||
+            item.productCode == 'GFRS_A0016'
           ) {
             this.trialInfos[index].amt = this.trialList[index].duty[0].amt
           }

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

@@ -48,7 +48,7 @@ export default {
       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

src/views/ebiz/generateImg/generateImg.vue

@@ -10,7 +10,10 @@
         <div class="pName">{{ orderList.productNameFull }}</div>
         <div class="type">{{ orderList.outOrderType == 'accept' ? '承保规保' : '预收规保' }}</div>
         <div class="yuan">{{ orderList.prem }}<span style="color: #333333">元</span></div>
-        <div class="time">{{ orderList.outOrderType == 'accept' ? '承保时间：' : '预收时间：' }}{{ orderList.appntDate }}</div>
+        <div class="time">{{ orderList.outOrderType == 'accept' ? '承保时间：' : '预收时间：' }}
+          <span v-if="orderList.outOrderType == 'accept'">{{ orderList.signDate }}</span>
+          <span v-if="orderList.outOrderType != 'accept'">{{ orderList.appntDate }}</span>
+        </div>
       </div>
     </div>
     <div class="flex justify-content-s bottom-btn border-color">
@@ -53,6 +56,7 @@ export default {
   methods: {
     getList() {
       this.orderList = JSON.parse(localStorage.getItem('orderList'))
+      console.log('页面数据',this.orderList);
     },
     // 将 Blob转base64
     blobToBase64(blob) {

src/views/ebiz/insureAgain/SignatureConfirmation.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="insure-again">    
-     <div class="signature-content pb40">
+  <div class="insure-again">
+    <div class="signature-content pb40">
       <div v-if="!isWeixin">
         <ProgressBar :active.sync="active" />
       </div>
@@ -144,7 +144,7 @@
                 <van-button
                   type="danger"
                   size="normal"
-                  style="width: 157px;"
+                  style="width: 157px"
                   plain
                   :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
                   v-no-more-click="1000"
@@ -178,7 +178,7 @@
                   type="danger"
                   size="normal"
                   plain
-                  style="width: 157px;"
+                  style="width: 157px"
                   :disabled="insuredSignStatus == '3'"
                   @click="start_ocr('1')"
                   v-no-more-click="1000"
@@ -342,12 +342,12 @@ export default {
     [CollapseItem.name]: CollapseItem,
     [Dialog.name]: Dialog,
     [Field.name]: Field,
-    ProgressBar  
+    ProgressBar
   },
   methods: {
     fakeFaceAuth(expect) {
       console.log('模拟调用人脸识别')
-      return new Promise(function(resolve, reject) {
+      return new Promise(function (resolve, reject) {
         setTimeout(() => {
           console.log('模拟人脸识别完成')
           if (expect) {
@@ -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)
@@ -442,7 +444,11 @@ export default {
         }
         // localStorage['faceAuthWeXin-requestId'] localStorage['faceAuthWeXin-bizToken']--微信端人脸识别获取腾讯认证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']))
+          this.getRecognitionResult(
+            JSON.parse(localStorage['faceAuthWeXin-requestId']),
+            JSON.parse(localStorage['faceAuthWeXin-bizToken']),
+            JSON.parse(localStorage['orderNo'])
+          )
         }
 
         if (sessionStorage.shareCode == '1') {
@@ -509,7 +515,7 @@ export default {
       }
       // 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
@@ -578,7 +584,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
@@ -746,12 +752,13 @@ export default {
               this.$toast(res.resultMessage)
             }
             if (this.faceAuthCount.appnt < this.smsAuthNum) {
-              // eslint-disable-next-line no-undef 
-               const authRes = await EWebBridge.webCallAppInJs('face_auth', {
+              // eslint-disable-next-line no-undef
+              const authRes = await EWebBridge.webCallAppInJs('face_auth', {
                 businessSource: '1', //业务来源:1-电投，2-入司，3-理赔，4-保全
                 number: that.saleInsuredInfo.idNo, //身份证号码
-                name: that.saleInsuredInfo.name //姓名
-              }).then(data => {
+                name: that.saleInsuredInfo.name, //姓名
+                orderNo: CacheUtils.getLocItem('orderNo') //订单号
+              }).then((data) => {
                 if (JSON.parse(data).state == '1') {
                   // 保存rid 数据
                   that.saveCustomerRidInfo('appnt_rid', 'B')
@@ -766,8 +773,8 @@ export default {
               })
               // todo 测试去掉人脸识别 start=====================
               // 保存rid 数据
-                  // that.saveCustomerRidInfo('appnt_rid', 'B')
-                  // that.goUrl()
+              // that.saveCustomerRidInfo('appnt_rid', 'B')
+              // that.goUrl()
               // todo 测试去掉人脸识别 end=====================
 
               // const authRes = await this.fakeFaceAuth(true)
@@ -824,8 +831,9 @@ export default {
               const authRes = await EWebBridge.webCallAppInJs('face_auth', {
                 businessSource: '1', //业务来源:1-电投，2-入司，3-理赔，4-保全
                 number: that.saleInsuredPersonInfo.idNo, //身份证号码
-                name: that.saleInsuredPersonInfo.name //姓名
-              }).then(data => {
+                name: that.saleInsuredPersonInfo.name, //姓名
+                orderNo: CacheUtils.getLocItem('orderNo') //订单号
+              }).then((data) => {
                 if (JSON.parse(data).state == '1') {
                   that.saveCustomerRidInfo('insured_rid', 'B')
                   that.insuredUrl()
@@ -981,19 +989,21 @@ export default {
           }
         })
       } else {
-        console.log(location.origin +
-              '/#/insureAgain/signatureConfirmation?orderNo=' +
-              localStorage.orderNo +
-              '&token=' +
-              localStorage.token +
-              '&relationToAppnt=' +
-              JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt +
-              '&shareCode=' +
-              code +
-              '&signInvalid=' +
-              this.signInvalid +
-              '&productCode=' +
-              localStorage.productCode)
+        console.log(
+          location.origin +
+            '/#/insureAgain/signatureConfirmation?orderNo=' +
+            localStorage.orderNo +
+            '&token=' +
+            localStorage.token +
+            '&relationToAppnt=' +
+            JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt +
+            '&shareCode=' +
+            code +
+            '&signInvalid=' +
+            this.signInvalid +
+            '&productCode=' +
+            localStorage.productCode
+        )
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
@@ -1041,7 +1051,7 @@ export default {
         }
       }
       // /insure/selfToHuman
-      underWrite(data).then(res => {
+      underWrite(data).then((res) => {
         this.$toast.clear()
         let that = this
         if (res.result == '0') {
@@ -1144,12 +1154,12 @@ export default {
         message: '加载中……'
       })
       let data = {
-        orderNo: CacheUtils.getLocItem('orderNo'),        
+        orderNo: CacheUtils.getLocItem('orderNo'),
         getOtherType: 'RID'
       }
       localStorage.setItem('riskName', '')
-      return new Promise(resolve => {
-        getOrderDetail(data).then(res => {
+      return new Promise((resolve) => {
+        getOrderDetail(data).then((res) => {
           if (res.result == '0') {
             if (res.orderDTO && res.orderDTO.prtType) {
               localStorage.setItem('readingProtocolType', res.orderDTO.prtType)
@@ -1165,9 +1175,8 @@ export default {
               !!res.orderDTO.productDTO.special.content &&
               res.orderDTO.productDTO.special.content !== ''
             ) {
-    
               let content = res.orderDTO.productDTO.special.content
-      
+
               try {
                 const config = JSON.parse(content)
                 config.message = '&emsp;&emsp;' + config.message
@@ -1180,8 +1189,8 @@ export default {
                   confirmButtonText: '本人已阅读并同意上述特别约定内容',
                   messageAlign: 'left'
                 })
-              }             
-            }     
+              }
+            }
             localStorage.setItem('lastOrderNo', data.orderNo)
             localStorage.setItem('AppntidType', res.orderDTO.appntDTO.idType)
             this.$toast.clear()
@@ -1219,7 +1228,7 @@ export default {
             }
             that.appnt = res.orderDTO.appntDTO
             that.date = res.orderDTO.orderInfoDTO.appntDateLabel
-            res.orderDTO.ebizSignDTOS.map(item => {
+            res.orderDTO.ebizSignDTOS.map((item) => {
               if (item.signType == '0' || item.signType == '2') {
                 if (!localStorage.changeCard) {
                   if (item.documentCode != '5') {
@@ -1238,11 +1247,11 @@ export default {
             })
             if (!that.changeCard) {
               //将投保人数组排序
-              that.appntSign.sort(function(a, b) {
+              that.appntSign.sort(function (a, b) {
                 return a.key - b.key
               })
               //获取投保和被保险人电子投保单签字状态
-              that.appntSign.map(item => {
+              that.appntSign.map((item) => {
                 // 判断是否双录
                 if (item.documentCode == '6') {
                   localStorage.doubleRecordFlag = '1'
@@ -1251,7 +1260,7 @@ export default {
                   that.appntSignStatus = item.documentStatus
                 }
               })
-              that.insuredSign.map(item => {
+              that.insuredSign.map((item) => {
                 if (item.documentCode == '2') {
                   that.insuredSignStatus = item.documentStatus
                 }
@@ -1299,7 +1308,7 @@ export default {
         message: '加载中……'
       })
       let data = {}
-      getSignInvalid(data).then(res => {
+      getSignInvalid(data).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           this.signInvalid = res.content.sign
@@ -1320,8 +1329,8 @@ export default {
       let data = {
         sign: signInvalid
       }
-      return new Promise(resolve => {
-        checkSignInvalid(data).then(res => {
+      return new Promise((resolve) => {
+        checkSignInvalid(data).then((res) => {
           if (res.result == '0') {
             that.$toast.clear()
             let status = res.content.status
@@ -1385,7 +1394,7 @@ export default {
           businessSource: this.idcardData.businessSource
         }
         getRecognitionUrl(data).then(
-          res => {
+          (res) => {
             if (res.result == '0') {
               localStorage.setItem('faceAuthWeXin-requestId', JSON.stringify(res.content.requestId))
               localStorage.setItem('faceAuthWeXin-bizToken', JSON.stringify(res.content.bizToken))
@@ -1394,16 +1403,16 @@ export default {
               this.$toast(res.resultMessage)
             }
           },
-          error => {
+          (error) => {
             console.log(error)
           }
         )
       })
     },
-    getRecognitionResult(requestId, bizToken) {
+    getRecognitionResult(requestId, bizToken, orderNo) {
       return new Promise(() => {
-        getRecognitionResult({ requestId, bizToken }).then(
-          res => {
+        getRecognitionResult({ requestId, bizToken, orderNo }).then(
+          (res) => {
             if (res.result == '0') {
               this.recognizeResult = res.result
             } else {
@@ -1411,7 +1420,7 @@ export default {
             }
             this.sendimage(this.recognizeResult)
           },
-          error => {
+          (error) => {
             console.log(error)
           }
         )
@@ -1450,13 +1459,13 @@ export default {
         }
       }
       // 保存rid 认证结果 不阻断流程
-      saveCustomerRid(param).then(res => {
+      saveCustomerRid(param).then((res) => {
         console.log('saveCustomerRid', res)
       })
     }
   },
   created() {
-    setTimeout(() => {      
+    setTimeout(() => {
       EWebBridge.webCallAppInJs('webview_left_button', {
         img: this.$assetsUrl + 'images/del-close-btn@3x.png',
         intercept: '1' //是否拦截原生返回事件 1是 其他否
@@ -1469,11 +1478,11 @@ export default {
     // localStorage.setItem('salePageFlag', this.salePageFlag)
     if (!this.$route.query.salePageFlag) {
       CacheUtils.setLocItem('active', this.active)
-    }    
+    }
     let that = this
     document.title = this.changeCard ? '修改银行卡号确认' : '签名确认'
     // 初始化
-    that.init()    
+    that.init()
     if (window.localStorage.getItem('jumpFromSign') != '1' && window.localStorage.getItem('attachmentShow') == '0') {
       Dialog.confirm({
         title: '提示',
@@ -1487,7 +1496,7 @@ export default {
       // 获取投被保险人是否同一个人
       that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
     }
-  }, 
+  },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
     next()

src/views/ebiz/insureAgain/index.vue

@@ -30,7 +30,9 @@
               <div v-if="active === 'uncommit'">
                 <van-button size="small" round type="danger" @click="uncommitInsureDetail(order)" plain>查看详情</van-button>
                 <van-button v-if="canRevoke[order.newOrderStatus]" class="ml10" size="small" round type="danger" @click="revokeOrder(order)">撤单</van-button>
-                <van-button class="ml10" size="small" round type="danger" @click="insureAgain(order)">{{ order.newOrderStatus == '02'?'待支付':'重新投保'}}</van-button>
+                <van-button class="ml10" size="small" round type="danger" @click="insureAgain(order)">{{
+                  order.newOrderStatus == '02' ? '待支付' : '重新投保'
+                }}</van-button>
               </div>
               <div v-if="active === 'commit'">
                 <van-button v-if="canRevoke[order.newOrderStatus]" class="ml10" size="small" round type="danger" @click="revokeOrder(order)">撤单</van-button>
@@ -45,88 +47,92 @@
           <div class="mt20" v-if="errMessage != ''">{{ errMessage }}</div>
         </div>
       </van-pull-refresh>
-        <van-dialog
-                class="dialog-delete"
-                @confirm="checkCaptchaCode"
-                @cancel="cancelCaptchaCode"
-                :before-close="beforeClose"
-                confirm-button-color="#fff"
-                v-model="revokePanelShow"
-                title="短信验证"
-                show-cancel-button
-        >
-          <p class="captchaReceiver">投保人手机号: {{ captchaReceiver | phoneNumFilter }}</p>
-          <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
-            <template #button>
-              <van-button :disabled="sendTime !== 0" v-no-more-click="1000" @click="getCaptchaCode" size="small" type="danger">{{
-                sendTime ? `${sendTime}s后获取` : '获取验证码'
-                }}</van-button>
-            </template>
-          </van-field>
-        </van-dialog>
-      </div>
-
-      <van-popup v-model="isAgreementShow" position="right" :style="{ height: '100vh', width: '100vw' }">
-        <ReadingAgreement :needTime="false">
-          <h3 class="p10" style="text-align: center">重新投保声明提示</h3>
-          <p style="text-indent: 28px">尊敬的{{ orderInfo.appntName }}{{ orderInfo.sex == 0 ? '先生' : '女士' }}：</p>
-          <div class="p10 mb90" v-if="orderInfo.riskCode !== 'GFRS_A0008'">
-            <p style="text-indent: 28px">
-              您好！感谢您选择购买国富人寿保险股份有限公司（以下简称我们）保险产品，您于{{ orderInfo.cvaliDate }}投保的旧保单{{
-                orderInfo.policyNo
-              }}，产品名称为{{ orderInfo.riskName }}即将到期或已到期（到期日期详见保单），为保护您的权益，您可向我们提交重新投保申请。以下是申请重新投保的注意事项和声明，请您仔细阅读和确认：
-            </p>
-            <p style="text-indent: 28px">1.{{ orderInfo.riskName }}保险期间为一年，到期后需要您重新投保。</p>
-            <p style="text-indent: 28px">
-              2.本次重新投保，我们将按照{{ orderInfo.riskName }}费率表中的“在上一保险期间届满后60日内申请重新投保时对应的费率”计算保费。
-            </p>
-            <p style="text-indent: 28px">3.若本次重新投保成功，新保单免除等待期。</p>
-            <p style="text-indent: 28px">
-              4.本次重新投保仅限于无其他补充告知的情况，若您有其他补充告知，您的条件不符合本次重新投保流程。您可联系保单服务专员，通过其他途径进行投保申请。
-            </p>
-            <p style="text-indent: 28px">
-              5.若您于旧保单满期前申请重新投保，且于旧保单满期前成功支付保险费，则新保单在旧保单保险期满日对应日的次日零时生效，旧保单在保险期满日24时终止。若您于旧保单满期后重新投保申请，且成功支付保险费，则新保单于支付次日零时生效，旧保单在保险期满日24时终止。
-            </p>
-            <!-- <p style="text-indent: 28px">
-              6.若您未在旧保单满期后60天（包含）内申请重新投保，则您的重新投保资格将被取消。后续您可再次申请投保，但新单不再与旧保单关联，需重新计算等待期。具体详情，可咨询保单服务专员。
-            </p> -->
-          </div>
-          <div class="p10 mb90" v-else>
-            <p style="text-indent: 28px">
-              您好！感谢您选择购买国富人寿保险股份有限公司（以下简称我们）保险产品，您于{{ orderInfo.cvaliDate }}投保的旧保单{{
-                orderInfo.policyNo
-              }}，产品名称为：{{ orderInfo.riskName }}即将到期或已到期（到期日期详见保单），为保护您的权益，您可向我们提交重新投保申请。以下是申请重新投保的注意事项和声明，请您仔细阅读和确认：
-            </p>
-            <p style="text-indent: 28px">1.{{ orderInfo.riskName }}保险期间为一年，到期后需要您重新投保。</p>
-            <p style="text-indent: 28px">
-              2.本次重新投保，我们将按照{{ orderInfo.riskName }}费率表中的“在上一保险期间届满后60日内申请重新投保时对应的费率”计算保费。
-            </p>
-            <p style="text-indent: 28px">3.若本次重新投保成功，新保单免除等待期。</p>
-            <p style="text-indent: 28px">
-              4.本次重新投保仅限于无其他补充告知的情况，若您有其他补充告知，您的条件不符合本重新投保申请。您可联系保单服务专员，通过其他途径进行投保申请。
-            </p>
-            <p style="text-indent: 28px">
-              5.若您于旧保单满期前申请重新投保，且于旧保单满期前成功支付保险费，则新保单在旧保单保险期满日对应日的次日零时生效，旧保单在保险期满日24时终止。若您于旧保单满期后重新投保申请，且成功支付保险费，则新保单于支付次日零时生效，旧保单在保险期满日24时终止。
-            </p>
-            <!-- <p style="text-indent: 28px">
-              6.若您未在旧保单满期后60天（包含）内申请重新投保，则您的重新投保资格将被取消。后续您可再次申请投保，但新单不再与旧保单关联，需重新计算等待期。具体详情，可咨询保单服务专员。
-            </p> -->
-            <p style="text-indent: 28px">
-              6.国富人寿附加住院医疗保险已停售，您可选择投保同类产品国富人寿附加住院医疗保险（B款），我们将按照国富人寿附加住院医疗保险（B款）费率表中的“在上一保险期间届满后60日内申请重新投保时对应的费率”计算保费。
-            </p>
-          </div>
-          <template #action>
-            <van-radio-group class="m10" v-model="radio">
-              <van-radio :name="false">
-                <span style="font-size: 14px">本人已阅读、知晓本投保声明内容，同意重新投保</span>
-              </van-radio>
-            </van-radio-group>
-            <div class="btns">
-              <van-button type="danger" :disabled="radio" block @click="nextStep">下一步</van-button>
-            </div>
+      <van-dialog
+        class="dialog-delete"
+        @confirm="checkCaptchaCode"
+        @cancel="cancelCaptchaCode"
+        :before-close="beforeClose"
+        confirm-button-color="#fff"
+        v-model="revokePanelShow"
+        title="短信验证"
+        show-cancel-button
+      >
+        <p class="captchaReceiver">投保人手机号: {{ captchaReceiver | phoneNumFilter }}</p>
+        <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
+          <template #button>
+            <van-button :disabled="sendTime !== 0" v-no-more-click="1000" @click="getCaptchaCode" size="small" type="danger">{{
+              sendTime ? `${sendTime}s后获取` : '获取验证码'
+            }}</van-button>
           </template>
-        </ReadingAgreement>
-      </van-popup>
+        </van-field>
+      </van-dialog>
+    </div>
+
+    <van-popup v-model="isAgreementShow" position="right" :style="{ height: '100vh', width: '100vw' }">
+      <ReadingAgreement :needTime="false">
+        <h3 class="p10" style="text-align: center">重新投保声明提示</h3>
+        <p style="text-indent: 28px">尊敬的{{ orderInfo.appntName }}{{ orderInfo.sex == 0 ? '先生' : '女士' }}：</p>
+        <div class="p10 mb90" v-if="orderInfo.riskCode !== 'GFRS_A0008'">
+          <p style="text-indent: 28px">
+            您好！感谢您选择购买国富人寿保险股份有限公司（以下简称我们）保险产品，您于{{ orderInfo.cvaliDate }}投保的旧保单{{
+              orderInfo.policyNo
+            }}，产品名称为{{
+              orderInfo.riskName
+            }}即将到期或已到期（到期日期详见保单），为保护您的权益，您可向我们提交重新投保申请。以下是申请重新投保的注意事项和声明，请您仔细阅读和确认：
+          </p>
+          <p style="text-indent: 28px">1.{{ orderInfo.riskName }}保险期间为一年，到期后需要您重新投保。</p>
+          <p style="text-indent: 28px">
+            2.本次重新投保，我们将按照{{ orderInfo.riskName }}费率表中的“在上一保险期间届满后60日内申请重新投保时对应的费率”计算保费。
+          </p>
+          <p style="text-indent: 28px">3.若本次重新投保成功，新保单免除等待期。</p>
+          <p style="text-indent: 28px">
+            4.本次重新投保仅限于无其他补充告知的情况，若您有其他补充告知，您的条件不符合本次重新投保流程。您可联系保单服务专员，通过其他途径进行投保申请。
+          </p>
+          <p style="text-indent: 28px">
+            5.若您于旧保单满期前申请重新投保，且于旧保单满期前成功支付保险费，则新保单在旧保单保险期满日对应日的次日零时生效，旧保单在保险期满日24时终止。若您于旧保单满期后重新投保申请，且成功支付保险费，则新保单于支付次日零时生效，旧保单在保险期满日24时终止。
+          </p>
+          <!-- <p style="text-indent: 28px">
+              6.若您未在旧保单满期后60天（包含）内申请重新投保，则您的重新投保资格将被取消。后续您可再次申请投保，但新单不再与旧保单关联，需重新计算等待期。具体详情，可咨询保单服务专员。
+            </p> -->
+        </div>
+        <div class="p10 mb90" v-else>
+          <p style="text-indent: 28px">
+            您好！感谢您选择购买国富人寿保险股份有限公司（以下简称我们）保险产品，您于{{ orderInfo.cvaliDate }}投保的旧保单{{
+              orderInfo.policyNo
+            }}，产品名称为：{{
+              orderInfo.riskName
+            }}即将到期或已到期（到期日期详见保单），为保护您的权益，您可向我们提交重新投保申请。以下是申请重新投保的注意事项和声明，请您仔细阅读和确认：
+          </p>
+          <p style="text-indent: 28px">1.{{ orderInfo.riskName }}保险期间为一年，到期后需要您重新投保。</p>
+          <p style="text-indent: 28px">
+            2.本次重新投保，我们将按照{{ orderInfo.riskName }}费率表中的“在上一保险期间届满后60日内申请重新投保时对应的费率”计算保费。
+          </p>
+          <p style="text-indent: 28px">3.若本次重新投保成功，新保单免除等待期。</p>
+          <p style="text-indent: 28px">
+            4.本次重新投保仅限于无其他补充告知的情况，若您有其他补充告知，您的条件不符合本重新投保申请。您可联系保单服务专员，通过其他途径进行投保申请。
+          </p>
+          <p style="text-indent: 28px">
+            5.若您于旧保单满期前申请重新投保，且于旧保单满期前成功支付保险费，则新保单在旧保单保险期满日对应日的次日零时生效，旧保单在保险期满日24时终止。若您于旧保单满期后重新投保申请，且成功支付保险费，则新保单于支付次日零时生效，旧保单在保险期满日24时终止。
+          </p>
+          <!-- <p style="text-indent: 28px">
+              6.若您未在旧保单满期后60天（包含）内申请重新投保，则您的重新投保资格将被取消。后续您可再次申请投保，但新单不再与旧保单关联，需重新计算等待期。具体详情，可咨询保单服务专员。
+            </p> -->
+          <p style="text-indent: 28px">
+            6.国富人寿附加住院医疗保险已停售，您可选择投保同类产品国富人寿附加住院医疗保险（B款），我们将按照国富人寿附加住院医疗保险（B款）费率表中的“在上一保险期间届满后60日内申请重新投保时对应的费率”计算保费。
+          </p>
+        </div>
+        <template #action>
+          <van-radio-group class="m10" v-model="radio">
+            <van-radio :name="false">
+              <span style="font-size: 14px">本人已阅读、知晓本投保声明内容，同意重新投保</span>
+            </van-radio>
+          </van-radio-group>
+          <div class="btns">
+            <van-button type="danger" :disabled="radio" block @click="nextStep">下一步</van-button>
+          </div>
+        </template>
+      </ReadingAgreement>
+    </van-popup>
   </div>
 </template>
 
@@ -180,15 +186,15 @@ export default {
       isShow: false,
       orderInfo: {},
       canRevoke: {
-        '19': true,
+        19: true,
         '02': true,
-        '48': true,
-        '49': true,
-        '55': true,
-        '58': true,
-        '46': true,
-        '50': true,
-        '51': true
+        48: true,
+        49: true,
+        55: true,
+        58: true,
+        46: true,
+        50: true,
+        51: true
       },
       revokePanelShow: false,
       sms: '',
@@ -206,7 +212,12 @@ export default {
     NewItems() {
       var NewItems = []
       this.policyListDTOList.map((item) => {
-        if (item.riskName.search(this.searchName) != -1 || item.policyNo.search(this.searchName) != -1 || item.appntName.search(this.searchName) != -1 || item.insuredName.search(this.searchName) != -1) {
+        if (
+          item.riskName.search(this.searchName) != -1 ||
+          item.policyNo.search(this.searchName) != -1 ||
+          item.appntName.search(this.searchName) != -1 ||
+          item.insuredName.search(this.searchName) != -1
+        ) {
           if (item.reInsuranceState != null && item.reInsuranceState != '') {
             if (this.active === 'uncommit') {
               if (
@@ -297,7 +308,7 @@ export default {
           if (order.newOrderStatus == '02') {
             this.goUrl(res, order)
             return
-          }else {
+          } else {
             this.orderInfo.sex = res.orderDTO.appntDTO.sex
             if (res.orderDTO.appntDTO.idType == '1') {
               // 白名单校验
@@ -316,7 +327,8 @@ export default {
                   window.EWebBridge.webCallAppInJs('face_auth', {
                     businessSource: '1', //业务来源:1-电投，2-入司，3-理赔，4-保全
                     number: res.orderDTO.appntDTO.idNo, //身份证号码
-                    name: res.orderDTO.appntDTO.name //姓名
+                    name: res.orderDTO.appntDTO.name, //姓名,
+                    orderNo: CacheUtils.getLocItem('orderNo') //订单号
                   }).then((data) => {
                     if (JSON.parse(data).state == '1') {
                       this.goUrl(res, order)
@@ -501,28 +513,28 @@ export default {
     },
     revokeOrder(order) {
       this.$dialog
-      .confirm({
-        className: 'dialog-delete',
-        title: '提示',
-        message: '撤单后,数据将不可恢复,您确定要撤单吗?',
-        cancelButtonColor: '#E9332E',
-        confirmButtonColor: '#FFFFFF'
-      })
-      .then(() => {
-        this.revokePanelShow = true
-        this.captchaReceiver = order.appntMobile
-        this.revokeOrderNo = order.newOrderNo
-      })
+        .confirm({
+          className: 'dialog-delete',
+          title: '提示',
+          message: '撤单后,数据将不可恢复,您确定要撤单吗?',
+          cancelButtonColor: '#E9332E',
+          confirmButtonColor: '#FFFFFF'
+        })
+        .then(() => {
+          this.revokePanelShow = true
+          this.captchaReceiver = order.appntMobile
+          this.revokeOrderNo = order.newOrderNo
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .captchaReceiver {
-    margin-left: 1em;
-    padding-bottom: 1em;
-    border-bottom: 1px solid #eaeaea;
-    font-size: 14px;
-  }
+.captchaReceiver {
+  margin-left: 1em;
+  padding-bottom: 1em;
+  border-bottom: 1px solid #eaeaea;
+  font-size: 14px;
+}
 </style>

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/my/LogoutAgent.vue

@@ -2,8 +2,8 @@
   <div class="insured-info-container">
     <van-field v-model="pwd" clearable required type="password" label="登陆密码" name="密码" placeholder="请输入登陆密码" />
 
-    <p style="color: #ff0000; font-size: 14px;" class="bg-white p10 pb0 mb0">温馨提示：</p>
-    <p style="color: #ff0000; font-size: 14px;" class="bg-white pl10">停用账号将无法再次登陆使用，请您谨慎操作。</p>
+    <p style="color: #ff0000; font-size: 14px" class="bg-white p10 pb0 mb0">温馨提示：</p>
+    <p style="color: #ff0000; font-size: 14px" class="bg-white pl10">停用账号将无法再次登陆使用，请您谨慎操作。</p>
 
     <van-button type="danger" size="large" class="logout_button mt10" :disabled="!Boolean(pwd)" @click="logoutAgent">停用账户 </van-button>
 
@@ -41,6 +41,14 @@ export default {
     }
   },
 
+  mounted() {
+    setTimeout(() => {
+      EWebBridge.webCallAppInJs('enable_screen_capture', {
+        enable: false
+      })
+    }, 500)
+  },
+
   methods: {
     // 注销
     logoutAgent() {
@@ -55,7 +63,7 @@ export default {
         password: this.$MD5(this.pwd)
       }
       // 调用注销接口
-      logoutAgent(req).then(res => {
+      logoutAgent(req).then((res) => {
         this.show = false
         if (res.result == 0) {
           this.$toast('用户注销成功')

src/views/ebiz/preserve/common/HandleResult.vue

@@ -177,7 +177,8 @@ export default {
           this.toFace({
             number: this.customerInfo.idNo, //身份证号码
             name: this.customerInfo.customerName, //姓名
-            businessSource: '4' //业务来源:1-电投，2-入司，3-理赔，4-保全
+            businessSource: '4', //业务来源:1-电投，2-入司，3-理赔，4-保全
+            orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
           })
         }
       } else if (this.entry == 'BC') {
@@ -193,7 +194,8 @@ export default {
             this.toFace({
               number: this.policy.insuredInfo.idNo, //身份证号码
               name: this.policy.insuredInfo.insuredName, //姓名
-              businessSource: '4' //业务来源:1-电投，2-入司，3-理赔，4-保全
+              businessSource: '4', //业务来源:1-电投，2-入司，3-理赔，4-保全
+              orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
             })
           }
         } else {
@@ -204,7 +206,8 @@ export default {
             this.toFace({
               number: this.policy.appntInfo.idNo, //身份证号码
               name: this.policy.appntInfo.appntName, //姓名
-              businessSource: '4' //业务来源:1-电投，2-入司，3-理赔，4-保全
+              businessSource: '4', //业务来源:1-电投，2-入司，3-理赔，4-保全
+              orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
             })
           }
         }
@@ -244,7 +247,7 @@ export default {
           //   console.log('--跳过人脸识别--返回识别成功')
           //   resolve(JSON.stringify({ state: '0' }))
           // })
-          .then(data => {
+          .then((data) => {
             if (JSON.parse(data).state == '1') {
               this.jumpNextPage(this.path)
             } else {

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/proposal/ProposalInfo.vue

@@ -242,7 +242,7 @@
                 :value.sync="pageShowInfo.showInsuredDTO.tap"
               ></select-radio>
               <div class="fs12 text-center pb15" style="color: #999999">拖动按钮查看不同年龄的保单利益</div>
-            
+
               <!-- 国富人寿富贵尊享终身寿险（分红型）添加利益演示提示 -->
               <div v-if="mainRiskCodes.includes('GFRS_M0095')" class="fs13 div_11 text-left">
                 <b
@@ -547,7 +547,11 @@ export default {
     /*end*/
     callPhone() {
       console.log('callPhone')
-      window.location.href = 'tel://' + this.agent.phoneNo
+      // window.location.href = 'tel://' + this.agent.phoneNo
+      EWebBridge.webCallAppInJs('callSystem', {
+        system: 'tel',
+        number: this.agent.phoneNo
+      })
     },
     checkInsure(insureId) {
       let that = this
@@ -795,7 +799,14 @@ export default {
         that.pageShowInfo.insuredDTOs.forEach((item) => {
           item.riskDTOLst.forEach((item01) => {
             if (item01.isMainRisk == '0') {
-              if (item01.mainRiskCode == 'GFRS_M0080' || item01.mainRiskCode == 'GFRS_M0083' || item01.mainRiskCode == 'GFRS_M0085' || item01.mainRiskCode == 'GFRS_M0098') {
+              if (
+                item01.mainRiskCode == 'GFRS_M0080' ||
+                item01.mainRiskCode == 'GFRS_M0083' ||
+                item01.mainRiskCode == 'GFRS_M0085' ||
+                item01.mainRiskCode == 'GFRS_M0098' ||
+                item01.mainRiskCode == 'GFRS_M0103' ||
+                item01.mainRiskCode == 'GFRS_M0100'
+              ) {
                 that.ispremshow = false
               }
               mainRiskNameList.push(item01.riskName)

src/views/ebiz/renewalManage/policyDetail.vue

@@ -180,7 +180,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
@@ -238,7 +238,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
@@ -260,7 +260,7 @@ export default {
         // policyNo: '809920190000597308'
       }
 
-      getPolicyDetail(data).then(res => {
+      getPolicyDetail(data).then((res) => {
         if (res.result == '0') {
           let appntDTO = res.content.appntDTO
           let orderInfoDTO = res.content.orderInfoDTO
@@ -282,8 +282,8 @@ export default {
           that.appntDTO = appntDTO
           this.$CacheUtils.setLocItem('saleInsuredInfo', JSON.stringify(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:
@@ -320,7 +320,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)
@@ -337,7 +337,7 @@ export default {
     },
     //根据数据字典 将后端返回的数据渲染到页面中
     filterData(dictionary, key, pageData) {
-      dictionary.forEach(item => {
+      dictionary.forEach((item) => {
         if (pageData[key] == item.id) {
           pageData[key + 'Text'] = item.text //渲染页面使用的字段
         }
@@ -351,8 +351,9 @@ export default {
           //证件类型为身份证时，进行人脸识别
           EWebBridge.webCallAppInJs('face_auth', {
             number: this.appntDTO.idNo, //身份证号码
-            name: this.appntDTO.name //姓名
-          }).then(data => {
+            name: this.appntDTO.name, //姓名
+            orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
+          }).then((data) => {
             this.$toast.loading({
               duration: 0, // 持续展示 toast
               forbidClick: true, // 禁用背景点击
@@ -380,7 +381,7 @@ export default {
       let params = {
         contNo: window.localStorage.getItem('policyNo')
       }
-      getReceiptSign(params).then(res => {
+      getReceiptSign(params).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           window.localStorage.setItem('insurance-policyUrl', res.signUrl)

src/views/ebiz/renewalManage/shortPolicyDetail.vue

@@ -179,7 +179,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
@@ -237,7 +237,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
@@ -259,7 +259,7 @@ export default {
         // policyNo: '809920190000597308'
       }
 
-      getPolicyDetail(data).then(res => {
+      getPolicyDetail(data).then((res) => {
         if (res.result == '0') {
           let appntDTO = res.content.appntDTO
           let orderInfoDTO = res.content.orderInfoDTO
@@ -281,8 +281,8 @@ export default {
           that.appntDTO = appntDTO
           this.$CacheUtils.setLocItem('saleInsuredInfo', JSON.stringify(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:
@@ -319,7 +319,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)
@@ -336,7 +336,7 @@ export default {
     },
     //根据数据字典 将后端返回的数据渲染到页面中
     filterData(dictionary, key, pageData) {
-      dictionary.forEach(item => {
+      dictionary.forEach((item) => {
         if (pageData[key] == item.id) {
           pageData[key + 'Text'] = item.text //渲染页面使用的字段
         }
@@ -350,8 +350,9 @@ export default {
           //证件类型为身份证时，进行人脸识别
           EWebBridge.webCallAppInJs('face_auth', {
             number: this.appntDTO.idNo, //身份证号码
-            name: this.appntDTO.name //姓名
-          }).then(data => {
+            name: this.appntDTO.name, //姓名
+            orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
+          }).then((data) => {
             this.$toast.loading({
               duration: 0, // 持续展示 toast
               forbidClick: true, // 禁用背景点击
@@ -379,7 +380,7 @@ export default {
       let params = {
         contNo: window.localStorage.getItem('policyNo')
       }
-      getReceiptSign(params).then(res => {
+      getReceiptSign(params).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           window.localStorage.setItem('insurance-policyUrl', res.signUrl)

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/SignatureConfirmationOld.vue

@@ -47,16 +47,17 @@
                 v-if="isShow"
                 type="danger"
                 size="normal"
-                  class="w150"
+                class="w150"
                 plain
                 v-no-more-click="1000"
                 :disabled="appntSign.signStatus == '1'"
                 @click="share(insured.length == '0' ? '2' : '0')"
-              >分享</van-button>
+                >分享</van-button
+              >
               <van-button
                 type="danger"
                 size="normal"
-               class="w150"
+                class="w150"
                 plain
                 :disabled="appntSign.signStatus == '1'"
                 v-no-more-click="1000"
@@ -96,17 +97,18 @@
                   v-if="isShow"
                   type="danger"
                   size="normal"
-                 class="w150"
+                  class="w150"
                   :disabled="insuredSign.signStatus == '1'"
                   @click="share('1')"
                   plain
                   v-no-more-click="1000"
-                >分享</van-button>
+                  >分享</van-button
+                >
                 <van-button
                   type="danger"
                   size="normal"
                   plain
-                 class="w150"
+                  class="w150"
                   :disabled="insuredSign.signStatus == '1'"
                   @click="start_ocr('1')"
                   v-no-more-click="1000"
@@ -119,7 +121,7 @@
         </div>
       </div>
       <div v-else>
-             <!-- 在微信 -->
+        <!-- 在微信 -->
         <div v-if="shareCode != '1'" class="mt10">
           <van-collapse v-model="activeNames">
             <van-collapse-item name="1">
@@ -158,7 +160,7 @@
                 <van-button
                   type="danger"
                   size="normal"
-                  style="width: 157px;"
+                  style="width: 157px"
                   plain
                   :disabled="appntSign.signStatus == '1'"
                   v-no-more-click="1000"
@@ -210,7 +212,7 @@
                   type="danger"
                   size="normal"
                   plain
-                  style="width: 157px;"
+                  style="width: 157px"
                   :disabled="insuredSign.signStatus == '1'"
                   @click="start_ocr('1')"
                   v-no-more-click="1000"
@@ -306,17 +308,17 @@ export default {
   methods: {
     // 初始化
     async init() {
-     
- 
       if (this.isWeixin) {
         if (this.$route.query.airSign) {
           sessionStorage.setItem('airSign', this.$route.query.airSign)
         }
-     
+
         this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
         this.$CacheUtils.setLocItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
-        window.localStorage.setItem('token', this.$route.query.token)
-              window.localStorage.setItem('orderNo', this.$route.query.orderNo)
+        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) {
           sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
@@ -337,7 +339,7 @@ export default {
         this.shareCode = sessionStorage.getItem('shareCode')
         this.relationToAppnt = this.$route.query.relationToAppnt
         this.isShow = false
-       await this.getOrderDetail()
+        await this.getOrderDetail()
         if (this.shareCode == '1') {
           this.tipsName = this.saleInsuredPersonInfo.name
         } else {
@@ -475,13 +477,14 @@ export default {
             // 原人脸识别
             EWebBridge.webCallAppInJs('face_auth', {
               number: that.saleInsuredInfo.idNo, //身份证号码
-              name: that.saleInsuredInfo.name //姓名
+              name: that.saleInsuredInfo.name, //姓名
+              orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
               // })
               // 跳过人脸识别
               // new Promise(resolve => {
               //   console.log('--跳过人脸识别--返回识别成功')
               //   resolve(JSON.stringify({ state: '1' }))
-            }).then(data => {
+            }).then((data) => {
               if (JSON.parse(data).state == '1') {
                 if (that.appntSign.readStatus == '0') {
                   console.log('--跳过人脸识别--返回识别成功zzzzzzzzzz')
@@ -537,12 +540,13 @@ export default {
             // 跳过人脸识别
             EWebBridge.webCallAppInJs('face_auth', {
               number: that.saleInsuredInfo.idNo, //身份证号码
-              name: that.saleInsuredInfo.name //姓名
+              name: that.saleInsuredInfo.name, //姓名
+              orderNo: this.$CacheUtils.getLocItem('orderNo') //订单号
               // })
               // new Promise(resolve => {
               //   console.log('--跳过人脸识别--返回识别成功')
               //   resolve(JSON.stringify({ state: '1' }))
-            }).then(data => {
+            }).then((data) => {
               if (JSON.parse(data).state == '1') {
                 if (that.insuredSign.readStatus == '0') {
                   this.$jump({
@@ -657,7 +661,7 @@ export default {
         }
       }
       // /insure/selfToHuman
-      underWrite(data).then(res => {
+      underWrite(data).then((res) => {
         this.$toast.clear()
         let that = this
         if (res.result == '0') {
@@ -747,7 +751,7 @@ export default {
       let data = {
         orderNo: window.localStorage.getItem('orderNo')
       }
-      getOrderDetail(data).then(res => {
+      getOrderDetail(data).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           this.$utils.intLocalStorage(res)
@@ -767,7 +771,7 @@ export default {
           that.appnt = res.orderDTO.appntDTO
           that.date = res.orderDTO.orderInfoDTO.appntDateLabel
 
-          res.orderDTO.signDTOS.map(item => {
+          res.orderDTO.signDTOS.map((item) => {
             if (item.signType == '0') {
               that.appntSign = item
             } else if (item.signType == '1') {
@@ -791,7 +795,7 @@ export default {
         message: '加载中……'
       })
       let data = {}
-      getSignInvalid(data).then(res => {
+      getSignInvalid(data).then((res) => {
         if (res.result == '0') {
           this.$toast.clear()
           this.signInvalid = res.content.sign
@@ -813,7 +817,7 @@ export default {
         sign: signInvalid
       }
       return new Promise((resolve, reject) => {
-        checkSignInvalid(data).then(res => {
+        checkSignInvalid(data).then((res) => {
           if (res.result == '0') {
             that.$toast.clear()
             let status = res.content.status

src/views/ebiz/sale/SignatureOfElectronic.vue

@@ -1087,7 +1087,7 @@
       that.signVal = window.localStorage.getItem('sign-val')
       // 判断是不是万能险
       let comment = window.localStorage.getItem('productCode')
-      if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017' || comment == 'GFRS_M0075' || comment == 'GFRS_M0080') {
+      if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017' || comment == 'GFRS_M0075' || comment == 'GFRS_M0080'|| comment == 'GFRS_M0100') {
         this.isComment = true
       }
       // 获取投保人信息

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/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()

src/views/ebiz/survey/ShareCover.vue

@@ -2,17 +2,17 @@
   <div class="policy-list-container">
     <!--封面-->
     <div v-if="showType == 'Cover'" class="mr2 ml2 mb60">
-      <img style="width: 100%;" src="@/assets/images/gf_wjdc.png" />
+      <img style="width: 100%" src="@/assets/images/gf_wjdc.png" />
       <div class="mt30 mr2 ml2">
-        <van-button type="danger" style="width: 100%;" @click="clickEnter" :disabled="enterFlag">立即参加</van-button>
+        <van-button type="danger" style="width: 100%" @click="clickEnter" :disabled="enterFlag">立即参加</van-button>
       </div>
     </div>
     <!-- 数据提交页 -->
-    <div v-if="showType == 'Detail'" style="margin-top: 10px;" class="mb60">
+    <div v-if="showType == 'Detail'" style="margin-top: 10px" class="mb60">
       <van-row v-for="(item, index) in questionList" :key="index">
         <div v-if="item.options">
           <van-col span="24" class="pb10 pt10 pl10 pr10 bg-white"> {{ item.orderCode }}.{{ item.title }} </van-col>
-          <van-col span="24" class="bg-white" style="margin-bottom: 10px;">
+          <van-col span="24" class="bg-white" style="margin-bottom: 10px">
             <van-radio-group v-model="anwerJson[item.orderCode]" class="flex pb10 pt10 pl10 pr10 justify-content-fs">
               <van-radio
                 icon-size="20px"
@@ -33,19 +33,19 @@
             <van-field v-if="item.orderCode == '6'" :label="item.title" input-align="right" v-model="anwerJson[item.orderCode]" />
             <van-field v-if="item.orderCode == '8'" :label="item.title" maxlength="3" input-align="right" v-model="anwerJson[item.orderCode]" />
           </van-col>
-          <van-col span="24" class="pl10 pr10 bg-white" style="height:2px;"><div style="width: 100%;height: 100%;background-color: #f5f5f5;"></div></van-col>
+          <van-col span="24" class="pl10 pr10 bg-white" style="height: 2px"><div style="width: 100%; height: 100%; background-color: #f5f5f5"></div></van-col>
         </div>
       </van-row>
       <div class="mt10 mr2 ml2">
-        <van-button type="danger" style="width: 100%;" @click="submitForm()">提交</van-button>
+        <van-button type="danger" style="width: 100%" @click="submitForm()">提交</van-button>
       </div>
     </div>
     <!--提交结果页-->
     <div v-if="showType == 'Result'" class="mr2 ml2">
-      <img v-show="resultImgUrl == 'PHYSICAL'" style="width: 100%;" src="@/assets/images/shareSurveyResult.png" />
-      <img v-show="resultImgUrl != 'PHYSICAL'" style="width: 100%;" src="@/assets/images/shareSurveyResult_1.png" />
+      <img v-show="resultImgUrl == 'PHYSICAL'" style="width: 100%" src="@/assets/images/shareSurveyResult.png" />
+      <img v-show="resultImgUrl != 'PHYSICAL'" style="width: 100%" src="@/assets/images/shareSurveyResult_1.png" />
       <div class="mt30 mr2 ml2">
-        <van-button type="danger" style="width: 100%;" @click="closeWXWindow">返回</van-button>
+        <van-button type="danger" style="width: 100%" @click="closeWXWindow">返回</van-button>
       </div>
     </div>
     <!-- 底部透明 -->
@@ -143,9 +143,9 @@ export default {
     // detail 页面
     getSurveyQuestionInfo() {
       let that = this
-      getSurveyQuestion(that.surveyDetailReqDTO).then(res => {
+      getSurveyQuestion(that.surveyDetailReqDTO).then((res) => {
         if (res.result == '0') {
-          that.questionList.map(item => {
+          that.questionList.map((item) => {
             that.anwerJson[item.orderCode + ''] = ''
           })
           that.questionList = res.content.questionList
@@ -158,7 +158,7 @@ export default {
     // 获取代理人信息
     getSurveyAgentInfo() {
       let that = this
-      getSurveyAgentInfo(that.surveyAgentInfoReqDTO).then(res => {
+      getSurveyAgentInfo(that.surveyAgentInfoReqDTO).then((res) => {
         if (res.result == '0') {
           that.agentInfo = res.content
           that.enterFlag = false
@@ -171,7 +171,7 @@ export default {
       // 校验是否选择
       let that = this
       let returnFlag = true
-      that.questionList.map(item => {
+      that.questionList.map((item) => {
         if (!that.anwerJson[item.orderCode + '']) {
           that.$toast('请认真填写问卷的全部内容！')
           returnFlag = false
@@ -197,7 +197,7 @@ export default {
       that.surveyAnswerReqDTO.agentCode = that.agentInfo.agentCode
       that.surveyAnswerReqDTO.agentName = that.agentInfo.name
       that.surveyAnswerReqDTO.tableId = that.tableId
-      saveSurveyAnswer(that.surveyAnswerReqDTO).then(res => {
+      saveSurveyAnswer(that.surveyAnswerReqDTO).then((res) => {
         if (res.result == '0') {
           //跳转结果页面
           that.resultImgUrl = res.content
@@ -221,7 +221,11 @@ export default {
     },
     callPhone() {
       console.log('callPhone')
-      window.location.href = 'tel://' + this.agentInfo.mobile
+      // window.location.href = 'tel://' + this.agentInfo.mobile
+      EWebBridge.webCallAppInJs('callSystem', {
+        system: 'tel',
+        number: this.agentInfo.mobile
+      })
     },
     closeWXWindow() {
       closeWindow()

src/views/example/EncryotBack.vue

@@ -26,7 +26,7 @@
 import { Field, CellGroup, Popup, Picker, Checkbox, Area } from 'vant'
 import { getAgentInfo } from '@/api/ebiz/my/my.js'
 import { getAuthCode } from '@/api/ebiz/sale/sale'
-import {AESEncrypt,AESDecrypt} from '@/assets/js/utils/cryptoJsUtil'
+import { AESEncrypt, AESDecrypt } from '@/assets/js/utils/cryptoJsUtil'
 export default {
   name: 'logoutAgent',
   components: {
@@ -53,19 +53,24 @@ export default {
     }
   },
   async mounted() {
+    setTimeout(() => {
+      EWebBridge.webCallAppInJs('enable_screen_capture', {
+        enable: false
+      })
+    }, 500)
+
     // 获取代理人信息
     this.$CacheUtils.setLocItem('cacheTest', JSON.stringify(this.logoutDTO))
     console.log(this.$CacheUtils.getLocItem('cacheTest'))
     this.$CacheUtils.setSessionItem('cacheTest1', 'nsjdfi')
     console.log(this.$CacheUtils.getSessionItem('cacheTest1'))
-    const res = await getAgentInfo({ '89': '890' })
+    const res = await getAgentInfo({ 89: '890' })
     console.log(res)
     if (res.result == 0) {
       this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
       if (this.branchType == '0') {
         this.logoutDTO.mobile = res.phoneNo
         this.codeDisabled = false
-      } else {
       }
     } else {
       return this.$toast(res.resultMessage)
@@ -96,7 +101,7 @@ export default {
         operateCodeType: '0'
       }
       //获取验证码
-      getAuthCode(data).then(res => {
+      getAuthCode(data).then((res) => {
         //倒计时
         this.timeId = setInterval(() => {
           this.countDown--