release 20230904-3 修改自动计算证件日期代码逻辑

src/api/ebiz/sale/sale.js

@@ -1,6 +1,7 @@
 import request from '@/assets/js/utils/request'
 import request1 from '@/assets/js/utils/request1'
 import getUrl from '@/assets/js/utils/get-url'
+import store from '@/store'
 // 保费计算
 export function saveOrUpdateOrderInfo(data) {
   return request({
@@ -99,6 +100,15 @@ export function uploadImg(data) {
     data
   })
 }
+
+// 上传图片
+export function uploadImg2(data) {
+  return request1({
+    url: getUrl('/uploadImage?imgType='+store.getters.getUploadImgType+'&orderNo='+store.getters.getUploadImgOrderNo, 1, 2),
+    method: 'post',
+    data
+  })
+}
 /*
 // 人脸识别
 export function recognition(data) {

src/assets/js/business-common.js

@@ -559,7 +559,10 @@ export default {
     )
 
     if (insuredDTO) {
-      let insuredPersonAge = insuredDTO.birthday?utilsAge.getAge(insuredDTO.birthday, new Date()):insuredDTO.insuredAge
+      let insuredPersonAge = insuredDTO.insuredAge ? insuredDTO.insuredAge : insuredDTO.age
+      if(insuredDTO.birthday){
+        insuredPersonAge = utilsAge.getAge(insuredDTO.birthday, new Date())
+      }
       CacheUtils.setLocItem('saleInsuredPersonInfo',
           JSON.stringify({
             birthday: insuredDTO.birthday,

src/assets/js/utils/countCredentialValidity.js

@@ -0,0 +1,167 @@
+export default {
+  //计算身份证起始日期
+  getStartDate: function(age, endDate) {
+    let startDate = '' //证件起始日期
+    let thisDate = new Date() //当年日期
+    let thisyear = thisDate.getFullYear() //当前年份
+
+    if (age < 16) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁以下的证件有效期为5年
+       * @Date: 2023/7/4
+       **/
+      startDate = String(Number(endDate.slice(0,4)) - 5) + endDate.slice(4,11)
+    } else if (age >= 16 && age <= 21) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁~21周岁的证件有效期为10年或5年
+       * @Date: 2023/7/4
+       **/
+      if (age - (10 - (endDate.slice(0,4) - thisyear)) < 16 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 如果证件有效期为10年 根据证件截止日期 判断10年前的年龄 如果小于16周岁 那么证件有效期就是5年
+         * @Date: 2023/7/5
+         **/
+        startDate = String(Number(endDate.slice(0,4)) - 5) + endDate.slice(4,11)
+      } else {
+        startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+      }
+    } else if(age >= 22 && age <= 25) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 22周岁~25周岁的证件有效期为10年
+       * @Date: 2023/7/4
+       **/
+      startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+    } else if (age >= 26 && age <= 35) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 26周岁~35周岁的证件有效期为20年或10年
+       * @Date: 2023/7/4
+       **/
+      if (age - (20 - (endDate.slice(0,4) - thisyear)) < 26 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 如果证件有效期为20年 根据证件截止日期 判断20年前的年龄 如果小于26周岁 那么证件有效期就是10年
+         * @Date: 2023/7/5
+         **/
+        startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+      } else {
+        startDate = String(Number(endDate.slice(0,4)) - 20) + endDate.slice(4,11)
+      }
+    } else if (age >= 36 && age <= 45) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 36周岁~45周岁的证件有效期为20年
+       * @Date: 2023/7/4
+       **/
+      startDate = String(Number(endDate.slice(0,4)) + 20) + endDate.slice(4,11)
+    } else if (age >= 46 && age <= 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 46周岁~65周岁的证件有效期为20年或长期
+       * @Date: 2023/7/4
+       **/
+      if (age - (20 - (endDate.slice(0,4) - thisyear)) < 46 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 如果证件有效期为20年 根据证件截止日期 判断20年前的年龄 如果小于46周岁 那么证件有效期就是20年
+         * @Date: 2023/7/5
+         **/
+        startDate = String(Number(endDate.slice(0,4)) - 20) + endDate.slice(4,11)
+      }
+    } else if (age > 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 65周岁以上的证件有效期为长期
+       * @Date: 2023/7/4
+       **/
+    }
+    return startDate
+  },
+
+  //计算身份证截止日期
+  getEndDate: function(age, startDate) {
+    let endDate = '' //证件截止日期
+    let thisDate = new Date() //当年日期
+    let thisyear = thisDate.getFullYear() //当前年份
+
+    if (age < 16) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁以下的证件有效期为5年
+       * @Date: 2023/7/4
+       **/
+      endDate = String(Number(startDate.slice(0,4)) + 5) + startDate.slice(4,11)
+    } else if (age >= 16 && age <= 21) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁~21周岁的证件有效期为10年或5年
+       * @Date: 2023/7/4
+       **/
+      if (age - (thisyear - startDate.slice(0,4)) < 16 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 根据证件起始日期计算办证时年龄 如果办证时年龄小于16周岁 那么证件有效期就是5年
+         * @Date: 2023/7/5
+         **/
+        endDate = String(Number(startDate.slice(0,4)) + 5) + startDate.slice(4,11)
+      } else {
+        endDate = String(Number(startDate.slice(0,4)) + 10) + startDate.slice(4,11)
+      }
+    } else if(age >= 22 && age <= 25) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 22周岁~25周岁的证件有效期为10年
+       * @Date: 2023/7/4
+       **/
+      endDate = String(Number(startDate.slice(0,4)) + 10) + startDate.slice(4,11)
+    } else if (age >= 26 && age <= 35) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 26周岁~35周岁的证件有效期为20年或10年
+       * @Date: 2023/7/4
+       **/
+      if (age - (thisyear - startDate.slice(0,4)) < 26 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 根据证件起始日期计算办证时年龄 如果办证时年龄小于26周岁 那么证件有效期就是10年
+         * @Date: 2023/7/5
+         **/
+        endDate = String(Number(startDate.slice(0,4)) + 10) + startDate.slice(4,11)
+      } else {
+        endDate = String(Number(startDate.slice(0,4)) + 20) + startDate.slice(4,11)
+      }
+    } else if (age >= 36 && age <= 45) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 36周岁~45周岁的证件有效期为20年
+       * @Date: 2023/7/4
+       **/
+      endDate = String(Number(startDate.slice(0,4)) + 20) + startDate.slice(4,11)
+    } else if (age >= 46 && age <= 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 46周岁~65周岁的证件有效期为20年或长期
+       * @Date: 2023/7/4
+       **/
+      if (age - (thisyear - startDate.slice(0,4)) < 46 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 根据证件起始日期计算办证时年龄 如果办证时年龄小于46周岁 那么证件有效期就是20年
+         * @Date: 2023/7/5
+         **/
+        endDate = String(Number(startDate.slice(0,4)) + 20) + startDate.slice(4,11)
+      }
+    } else if (age > 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 65周岁以上的证件有效期为长期
+       * @Date: 2023/7/4
+       **/
+    }
+    return endDate
+  }
+}

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

@@ -3777,6 +3777,22 @@ export default {
     {
       code: "GFRS_M0073__cashValue",
       label: "元"
+    },
+    {
+      code: "currentBonus_L",
+      label: "元"
+    },
+    {
+      code: "currentBonus_M",
+      label: "元"
+    },
+    {
+      code: "riskAC_L",
+      label: "元"
+    },
+    {
+      code: "riskAC_M",
+      label: "元"
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/assets/js/utils/permission.js

@@ -5,12 +5,14 @@ import CacheUtils from '@/assets/js/utils/cacheUtils'
 // import 'nprogress/nprogress.css' // Progress 进度条样式
 export function permission() {
   router.beforeEach((to, from, next) => {
-    // NProgress.start()
     //修改title
     const title = to.meta && to.meta.title
     if (title) {
       document.title = title
     }
+    if(from.path == '/sale/signatureConfirmation' && to.path == '/sale/attachmentManagement'){
+      window.location.href = window.location.origin + '#' + from.path + '?orderNo=' + from.query.orderNo
+    }
     //判断是否登录
     let token = CacheUtils.getLocItem('token')
     if (!token) {

src/router/ebiz/agentEenter.js

@@ -1,41 +1,41 @@
 // 入司申请填写基本信息
-const signContract = () => import('@/views/ebiz/agentEenter/SignContract')
-const letterOfKnow = () => import('@/views/ebiz/agentEenter/LetterOfKnow')
-const healthNotice = () => import('@/views/ebiz/agentEenter/HealthNotice')
-const letterOfCommitment = () => import('@/views/ebiz/agentEenter/LetterCommitment')
-const messageLetterOfCommitment = () => import('@/views/ebiz/agentEenter/MessageLetterOfCommitment')
-const illegalLetterOfCommitment = () => import('@/views/ebiz/agentEenter/IllegalLetterOfCommitment')
-const GuizhouSalesPractitioners = () => import('@/views/ebiz/agentEenter/GuizhouSalesPractitioners')
-const guarantee = () => import('@/views/ebiz/agentEenter/Guarantee')
-// const confirmation = () => import('@/views/ebiz/agentEenter/Confirmation')
-const paction = () => import('@/views/ebiz/agentEenter/Paction')
-const agentEenterResult = () => import('@/views/ebiz/agentEenter/Result')
-const entryProcess = () => import('@/views/ebiz/agentEenter/EntryProcess')
-const seeCause = () => import('@/views/ebiz/agentEenter/SeeCause')
-const ShowPDF = () => import('@/views/ebiz/agentEenter/ShowPDF')
-const agentEenterBasicInfor = () => import('@/views/ebiz/agentEenter/AgentEenterBasicInfor')
-const agentEnterGuarantor = () => import('@/views/ebiz/agentEenter/AgentEnterGuarantor')
-const agentEenterBasicFamily = () => import('@/views/ebiz/agentEenter/AgentEenterBasicFamily')
-const agentEenterBasicImage = () => import('@/views/ebiz/agentEenter/AgentEenterBasicImage')
-const agentEenterBasicHealth = () => import('@/views/ebiz/agentEenter/AgentEenterBasicHealth')
-const agentEenterBasicSuccess = () => import('@/views/ebiz/agentEenter/AgentEenterBasicSuccess')
-const ShareInfo = () => import('@/views/ebiz/agentEenter/share/ShareInfo')
-const ShareInfoSuccess = () => import('@/views/ebiz/agentEenter/share/ShareInfoSuccess')
-const ApproveList = () => import('@/views/ebiz/agentEenter/approve/ApproveList')
-const BasicInfo = () => import('@/views/ebiz/agentEenter/approve/BasicInfo')
-const ApproveInfo = () => import('@/views/ebiz/agentEenter/approve/ApproveInfo')
-const SubmitSuccess = () => import('@/views/ebiz/agentEenter/approve/SubmitSuccess')
-const PractisingCertificateInfo = () => import('@/views/ebiz/agentEenter/PractisingCertificate')
-const recordList = () => import('@/views/ebiz/agentEenter/approve/RecordList')
-const recordDetail = () => import('@/views/ebiz/agentEenter/approve/RecordDetail')
-const ResultEnd = () => import('@/views/ebiz/agentEenter/ResultEnd')
-const InformationInspectionAuthorization = () => import('@/views/ebiz/agentEenter/InformationInspectionAuthorization')
-const SelfInsurance = () => import('@/views/ebiz/agentEenter/SelfInsurance')
-const GuizhouLetterOfCommitment = () => import('@/views/ebiz/agentEenter/GuizhouLetterOfCommitment')
-const GuizhouLetterOfGuarantee = () => import('@/views/ebiz/agentEenter/GuizhouLetterOfGuarantee')
-const GuizhouInsuranceAgencyContract = () => import('@/views/ebiz/agentEenter/GuizhouInsuranceAgencyContract')
-const GuizhouPersonalInformationInquiry = () => import('@/views/ebiz/agentEenter/GuizhouPersonalInformationInquiry')
-const Donationagreement = () => import('@/views/ebiz/agentEenter/Donationagreement')
+const signContract = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/SignContract')
+const letterOfKnow = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/LetterOfKnow')
+const healthNotice = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/HealthNotice')
+const letterOfCommitment = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/LetterCommitment')
+const messageLetterOfCommitment = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/MessageLetterOfCommitment')
+const illegalLetterOfCommitment = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/IllegalLetterOfCommitment')
+const GuizhouSalesPractitioners = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/GuizhouSalesPractitioners')
+const guarantee = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/Guarantee')
+// const confirmation = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/Confirmation')
+const paction = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/Paction')
+const agentEenterResult = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/Result')
+const entryProcess = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/EntryProcess')
+const seeCause = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/SeeCause')
+const ShowPDF = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/ShowPDF')
+const agentEenterBasicInfor = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/AgentEenterBasicInfor')
+const agentEnterGuarantor = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/AgentEnterGuarantor')
+const agentEenterBasicFamily = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/AgentEenterBasicFamily')
+const agentEenterBasicImage = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/AgentEenterBasicImage')
+const agentEenterBasicHealth = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/AgentEenterBasicHealth')
+const agentEenterBasicSuccess = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/AgentEenterBasicSuccess')
+const ShareInfo = () => import(/* webpackChunkName: 'agentEenter_share' */ '@/views/ebiz/agentEenter/share/ShareInfo')
+const ShareInfoSuccess = () => import(/* webpackChunkName: 'agentEenter_share' */ '@/views/ebiz/agentEenter/share/ShareInfoSuccess')
+const ApproveList = () => import(/* webpackChunkName: 'agentEenter_approve' */ '@/views/ebiz/agentEenter/approve/ApproveList')
+const BasicInfo = () => import(/* webpackChunkName: 'agentEenter_approve' */ '@/views/ebiz/agentEenter/approve/BasicInfo')
+const ApproveInfo = () => import(/* webpackChunkName: 'agentEenter_approve' */ '@/views/ebiz/agentEenter/approve/ApproveInfo')
+const SubmitSuccess = () => import(/* webpackChunkName: 'agentEenter_approve' */ '@/views/ebiz/agentEenter/approve/SubmitSuccess')
+const PractisingCertificateInfo = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/PractisingCertificate')
+const recordList = () => import(/* webpackChunkName: 'agentEenter_approve' */ '@/views/ebiz/agentEenter/approve/RecordList')
+const recordDetail = () => import(/* webpackChunkName: 'agentEenter_approve' */ '@/views/ebiz/agentEenter/approve/RecordDetail')
+const ResultEnd = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/ResultEnd')
+const InformationInspectionAuthorization = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/InformationInspectionAuthorization')
+const SelfInsurance = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/SelfInsurance')
+const GuizhouLetterOfCommitment = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/GuizhouLetterOfCommitment')
+const GuizhouLetterOfGuarantee = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/GuizhouLetterOfGuarantee')
+const GuizhouInsuranceAgencyContract = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/GuizhouInsuranceAgencyContract')
+const GuizhouPersonalInformationInquiry = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/GuizhouPersonalInformationInquiry')
+const Donationagreement = () => import(/* webpackChunkName: 'agentEenter' */ '@/views/ebiz/agentEenter/Donationagreement')
 
 export default [
   {

src/router/ebiz/allowance.js

@@ -1,17 +1,15 @@
 //津贴 定义相关组件
-const applicationList = () => import('@/views/ebiz/allowance/application/List')
-const applicationBaseInfo = () => import('@/views/ebiz/allowance/application/BaseInfo')
-const applicationAccountInfo = () => import('@/views/ebiz/allowance/application/AccountInfo')
-const applicationAttachmentManagement = () => import('@/views/ebiz/allowance/application/AttachmentManagement')
-const applicationSignatureConfirmation = () => import('@/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation')
-const applicationProcess = () => import('@/views/ebiz/allowance/application/process')
-
-const myInfoBaseInfo = () => import('@/views/ebiz/allowance/myInfo/BaseInfo')
-const myInfoAccountInfo = () => import('@/views/ebiz/allowance/myInfo/AccountInfo')
-const myInfoAttachmentManagement = () => import('@/views/ebiz/allowance/myInfo/AttachmentManagement')
-const approvalList = () => import('@/views/ebiz/allowance/approval/List')
-
-const approvalDetail = () => import('@/views/ebiz/allowance/Detail')
+const applicationList = () => import(/* webpackChunkName: 'allowance_application' */ '@/views/ebiz/allowance/application/List')
+const applicationBaseInfo = () => import(/* webpackChunkName: 'allowance_application' */ '@/views/ebiz/allowance/application/BaseInfo')
+const applicationAccountInfo = () => import(/* webpackChunkName: 'allowance_application' */ '@/views/ebiz/allowance/application/AccountInfo')
+const applicationAttachmentManagement = () => import(/* webpackChunkName: 'allowance_application' */ '@/views/ebiz/allowance/application/AttachmentManagement')
+const applicationSignatureConfirmation = () => import(/* webpackChunkName: 'allowance_application_SignatureConfirmation' */ '@/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation')
+const applicationProcess = () => import(/* webpackChunkName: 'allowance_application' */ '@/views/ebiz/allowance/application/process')
+const myInfoBaseInfo = () => import(/* webpackChunkName: 'allowance_myInfo' */ '@/views/ebiz/allowance/myInfo/BaseInfo')
+const myInfoAccountInfo = () => import(/* webpackChunkName: 'allowance_myInfo' */ '@/views/ebiz/allowance/myInfo/AccountInfo')
+const myInfoAttachmentManagement = () => import(/* webpackChunkName: 'allowance_myInfo' */ '@/views/ebiz/allowance/myInfo/AttachmentManagement')
+const approvalList = () => import(/* webpackChunkName: 'allowance_approval' */ '@/views/ebiz/allowance/approval/List')
+const approvalDetail = () => import(/* webpackChunkName: 'allowance' */ '@/views/ebiz/allowance/Detail')
 
 export default [
   //津贴申请

src/router/ebiz/attendance.js

@@ -1,5 +1,5 @@
-const attendance = () => import('@/views/ebiz/attendance/Attendance')
-const monthly = () => import('@/views/ebiz/attendance/Monthly')
+const attendance = () => import(/* webpackChunkName: 'attendance' */ '@/views/ebiz/attendance/Attendance')
+const monthly = () => import(/* webpackChunkName: 'attendance' */ '@/views/ebiz/attendance/Monthly')
 
 
 export default [

src/router/ebiz/billingDetail.js

@@ -1,4 +1,4 @@
-const billingDetail = () => import('@/views/ebiz/billingDetail/billingDetail')
+const billingDetail = () => import(/* webpackChunkName: 'billingDetail' */ '@/views/ebiz/billingDetail/billingDetail')
 
 
 export default [

src/router/ebiz/cardList.js

@@ -1,22 +1,22 @@
 // 卡单路由
-const information = () => import('@/views/ebiz/cardList/information')
-const cardTotreasure = () => import('@/views/ebiz/cardList/CardTotreasure')
-const productDetails = () => import('@/views/ebiz/cardList/productDetails')
-const pay = () => import('@/views/ebiz/cardList/Pay')
-const payResult = () => import('@/views/ebiz/cardList/PayResult')
-const paySuccess = () => import('@/views/ebiz/cardList/PaySuccess')
-const payLoser = () => import('@/views/ebiz/cardList/PayLoser')
-const ShowPDF = () => import('@/views/ebiz/cardList/ShowPDF')
-const phoneCode = () => import('@/views/ebiz/cardList/phoneCode')
-const cardDetail = () => import('@/views/ebiz/cardList/cardDetail')
-const SignatureConfirmation = () => import('@/views/ebiz/cardList/SignatureConfirmation')
-const Result = () => import('@/views/ebiz/cardList/Result')
+const information = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/information')
+const cardTotreasure = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/CardTotreasure')
+const productDetails = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/productDetails')
+const pay = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/Pay')
+const payResult = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/PayResult')
+const paySuccess = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/PaySuccess')
+const payLoser = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/PayLoser')
+const ShowPDF = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/ShowPDF')
+const phoneCode = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/phoneCode')
+const cardDetail = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/cardDetail')
+const SignatureConfirmation = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/SignatureConfirmation')
+const Result = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/Result')
 //团险模块
-const GroupAppntInfo = () => import('@/views/ebiz/cardList/GroupAppntInfo')
-const GroupInsuredInfo = () => import('@/views/ebiz/cardList/GroupInsuredInfo')
-const GroupInsuredList = () => import('@/views/ebiz/cardList/GroupInsuredList')
-const GroupAttachmentManagement = () => import('@/views/ebiz/cardList/GroupAttachmentManagement')
-const GroupCheckInfo = () => import('@/views/ebiz/cardList/GroupCheckInfo')
+const GroupAppntInfo = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/GroupAppntInfo')
+const GroupInsuredInfo = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/GroupInsuredInfo')
+const GroupInsuredList = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/GroupInsuredList')
+const GroupAttachmentManagement = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/GroupAttachmentManagement')
+const GroupCheckInfo = () => import(/* webpackChunkName: 'cardList' */ '@/views/ebiz/cardList/GroupCheckInfo')
 
 export default [
   {

src/router/ebiz/claims.js

@@ -1,23 +1,23 @@
 //理赔 定义相关组件
-const ProblemList = () => import('@/views/ebiz/claims/ProblemList')
-const FillImage = () => import('@/views/ebiz/claims/FillImage')
-const success = () => import('@/views/ebiz/claims/Success')
-const fail = () => import('@/views/ebiz/claims/Fail')
-const claimsList = () => import('@/views/ebiz/claims/ClaimsList')
-const claimApprovalList = () => import('@/views/ebiz/claims/ClaimApprovalList')
-const searchCustomer = () => import('@/views/ebiz/claims/SearchCustomer')
-const searchHospital = () => import('@/views/ebiz/claims/SearchHospital')
-const insuredInfo = () => import('@/views/ebiz/claims/InsuredInfo')
-const reportInfo = () => import('@/views/ebiz/claims/ReportInfo')
-const imageData = () => import('@/views/ebiz/claims/ImageData')
-const signatureConfirmation = () => import('@/views/ebiz/claims/SignatureConfirmation')
-const claimsSignature = () => import('@/views/ebiz/claims/ClaimsSignature')
-const claimsDetail = () => import('@/views/ebiz/claims/ClaimsDetail')
-const accident = () => import('@/views/ebiz/claims/Accident')
-const applyInfo = () => import('@/views/ebiz/claims/ApplyInfo')
-const reportApply = () => import('@/views/ebiz/claims/ReportApply')
-const reportSuccess = () => import('@/views/ebiz/claims/ReportSuccess')
-const reportFail = () => import('@/views/ebiz/claims/ReportFail')
+const ProblemList = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ProblemList')
+const FillImage = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/FillImage')
+const success = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/Success')
+const fail = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/Fail')
+const claimsList = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ClaimsList')
+const claimApprovalList = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ClaimApprovalList')
+const searchCustomer = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/SearchCustomer')
+const searchHospital = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/SearchHospital')
+const insuredInfo = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/InsuredInfo')
+const reportInfo = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ReportInfo')
+const imageData = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ImageData')
+const signatureConfirmation = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/SignatureConfirmation')
+const claimsSignature = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ClaimsSignature')
+const claimsDetail = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ClaimsDetail')
+const accident = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/Accident')
+const applyInfo = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ApplyInfo')
+const reportApply = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ReportApply')
+const reportSuccess = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ReportSuccess')
+const reportFail = () => import(/* webpackChunkName: 'claims' */ '@/views/ebiz/claims/ReportFail')
 export default [
   {
     path: '/claims/ProblemList',

src/router/ebiz/common.js

@@ -1,10 +1,10 @@
 //建议书 定义相关组件
-const selectedProduct = () => import('@/views/ebiz/common/SelectedProduct')
-const mainRiskList = () => import('@/views/ebiz/common/MainRiskList')
-const addRiskList = () => import('@/views/ebiz/common/AddRiskList')
-const calculatePremium = () => import('@/views/ebiz/common/CalculatePremium')
-const defalut = () => import('@/views/ebiz/common/Defalut')
-const companyIntroduce = () => import('@/views/ebiz/common/CompanyIntroduce')
+const selectedProduct = () => import(/* webpackChunkName: 'common' */ '@/views/ebiz/common/SelectedProduct')
+const mainRiskList = () => import(/* webpackChunkName: 'common' */ '@/views/ebiz/common/MainRiskList')
+const addRiskList = () => import(/* webpackChunkName: 'common' */ '@/views/ebiz/common/AddRiskList')
+const calculatePremium = () => import(/* webpackChunkName: 'common' */ '@/views/ebiz/common/CalculatePremium')
+const defalut = () => import(/* webpackChunkName: 'common' */ '@/views/ebiz/common/Defalut')
+const companyIntroduce = () => import(/* webpackChunkName: 'common' */ '@/views/ebiz/common/CompanyIntroduce')
 
 export default [
   {

src/router/ebiz/congratulation.js

@@ -1,7 +1,7 @@
 //保全 定义相关组件
-const congratulationTop = () => import('@/views/ebiz/congratulation/CongratulationTop')
-const congratulationList = () => import('@/views/ebiz/congratulation/CongratulationList')
-const congratulationPreview = () => import('@/views/ebiz/congratulation/CongratulationPreview')
+const congratulationTop = () => import(/* webpackChunkName: 'congratulation' */ '@/views/ebiz/congratulation/CongratulationTop')
+const congratulationList = () => import(/* webpackChunkName: 'congratulation' */ '@/views/ebiz/congratulation/CongratulationList')
+const congratulationPreview = () => import(/* webpackChunkName: 'congratulation' */ '@/views/ebiz/congratulation/CongratulationPreview')
 
 export default [
   {

src/router/ebiz/cooperativeUnit.js

@@ -1,7 +1,7 @@
 //产品列表 定义相关组件
-const cooperativeList = () => import('@/views/ebiz/cooperativeUnit/CooperativeList')
-const cooperativeDetail = () => import('@/views/ebiz/cooperativeUnit/CooperativeDetail')
-const CooperativeDocument = () => import('@/views/ebiz/cooperativeUnit/CooperativeDocument')
+const cooperativeList = () => import(/* webpackChunkName: 'cooperativeUnit' */ '@/views/ebiz/cooperativeUnit/CooperativeList')
+const cooperativeDetail = () => import(/* webpackChunkName: 'cooperativeUnit' */ '@/views/ebiz/cooperativeUnit/CooperativeDetail')
+const CooperativeDocument = () => import(/* webpackChunkName: 'cooperativeUnit' */ '@/views/ebiz/cooperativeUnit/CooperativeDocument')
 
 export default [
   {

src/router/ebiz/customer.js

@@ -1,8 +1,8 @@
 //客户管理 定义相关组件
-const customerList = () => import('@/views/ebiz/customer/customerList')
-const addCustomer = () => import('@/views/ebiz/customer/addCustomer')
-const editCustomer = () => import('@/views/ebiz/customer/editCustomer')
-const customerInfo = () => import('@/views/ebiz/customer/customerInfo')
+const customerList = () => import(/* webpackChunkName: 'customer' */ '@/views/ebiz/customer/customerList')
+const addCustomer = () => import(/* webpackChunkName: 'customer' */ '@/views/ebiz/customer/addCustomer')
+const editCustomer = () => import(/* webpackChunkName: 'customer' */ '@/views/ebiz/customer/editCustomer')
+const customerInfo = () => import(/* webpackChunkName: 'customer' */ '@/views/ebiz/customer/customerInfo')
 
 export default [
   {

src/router/ebiz/customerService.js

@@ -1,4 +1,4 @@
-const customerService = () => import('@/views/ebiz/customerService/customerService')
+const customerService = () => import(/* webpackChunkName: 'customerService' */ '@/views/ebiz/customerService/customerService')
 
 
 export default [

src/router/ebiz/eqiVisit.js

@@ -1,11 +1,11 @@
 // e起陪访
-const VisitInfoRegister = () => import('@/views/ebiz/eqiVisit/VisitInfoRegister')
-const RegisterResult = () => import('@/views/ebiz/eqiVisit/RegisterResult')
-const NewcomerList = () => import('@/views/ebiz/eqiVisit/NewcomerList')
-const ScoreRanking = () => import('@/views/ebiz/eqiVisit/ScoreRanking')
-const VisitHistory = () => import('@/views/ebiz/eqiVisit/VisitHistory')
-const HistoryDetail = () => import('@/views/ebiz/eqiVisit/HistoryDetail')
-const ScoreHistory = () => import('@/views/ebiz/eqiVisit/ScoreHistory')
+const VisitInfoRegister = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/VisitInfoRegister')
+const RegisterResult = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/RegisterResult')
+const NewcomerList = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/NewcomerList')
+const ScoreRanking = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/ScoreRanking')
+const VisitHistory = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/VisitHistory')
+const HistoryDetail = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/HistoryDetail')
+const ScoreHistory = () => import(/* webpackChunkName: 'eqiVisit' */ '@/views/ebiz/eqiVisit/ScoreHistory')
 
 export default [
   {

src/router/ebiz/exercising.js

@@ -1,9 +1,9 @@
 //活动邀请 定义相关组件
-const ExercisingDetails = () => import('@/views/ebiz/exercising/ExercisingDetails')
-const SignUp = () => import('@/views/ebiz/exercising/SignUp')
-const SignUpDetails = () => import('@/views/ebiz/exercising/SignUpDetails')
-const PlayerDetails = () => import('@/views/ebiz/exercising/PlayerDetails')
-const SignUpResult = () => import('@/views/ebiz/exercising/SignUpResult')
+const ExercisingDetails = () => import(/* webpackChunkName: 'exercising' */ '@/views/ebiz/exercising/ExercisingDetails')
+const SignUp = () => import(/* webpackChunkName: 'exercising' */ '@/views/ebiz/exercising/SignUp')
+const SignUpDetails = () => import(/* webpackChunkName: 'exercising' */ '@/views/ebiz/exercising/SignUpDetails')
+const PlayerDetails = () => import(/* webpackChunkName: 'exercising' */ '@/views/ebiz/exercising/PlayerDetails')
+const SignUpResult = () => import(/* webpackChunkName: 'exercising' */ '@/views/ebiz/exercising/SignUpResult')
 
 export default [
   {

src/router/ebiz/goodStart.js

@@ -1,13 +1,13 @@
 // 开门红业绩排名
-const PerformanceReport = () => import('@/views/ebiz/goodStart/PerformanceReport')
+const PerformanceReport = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/PerformanceReport')
 // 开门红专区
-const Prefecture = () => import('@/views/ebiz/goodStart/Prefecture')
-const Treasure = () => import('@/views/ebiz/goodStart/Treasure')
-const TreasureDetail = () => import('@/views/ebiz/goodStart/TreasureDetail')
-const GoodStartScheme = () => import('@/views/ebiz/goodStart/GoodStartScheme')
-const businessMap = () => import('@/views/ebiz/goodStart/BusinessMap')
-const issueList = () => import('@/views/ebiz/goodStart/IssueList')
-const newsPaper = () => import('@/views/ebiz/goodStart/NewsPaper')
+const Prefecture = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/Prefecture')
+const Treasure = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/Treasure')
+const TreasureDetail = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/TreasureDetail')
+const GoodStartScheme = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/GoodStartScheme')
+const businessMap = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/BusinessMap')
+const issueList = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/IssueList')
+const newsPaper = () => import(/* webpackChunkName: 'goodStart' */ '@/views/ebiz/goodStart/NewsPaper')
 
 const spreadParams = function(route) {
   const params = {}

src/router/ebiz/hgb.js

@@ -1,6 +1,6 @@
 // 惠桂保路由信息
 const HgbIndex = () => import('@/views/ebiz/hgb')
-const Detail = () => import('@/views/ebiz/hgb/Detail')
+const Detail = () => import(/* webpackChunkName: 'hgb' */ '@/views/ebiz/hgb/Detail')
 export default [
   {
     name: 'HgbIndex',

src/router/ebiz/institutionalPerform.js

@@ -1,15 +1,14 @@
 //客户管理 定义相关组件
-const BranchOffice = () => import('@/views/ebiz/institutionalPerform/BranchOffice')
-const UnderOffice = () => import('@/views/ebiz/institutionalPerform/UnderOffice')
-const DistrictOffice = () => import('@/views/ebiz/institutionalPerform/DistrictOffice')
-const DepartmentOffice = () => import('@/views/ebiz/institutionalPerform/DepartmentOffice')
-const GroupOffice = () => import('@/views/ebiz/institutionalPerform/GroupOffice')
-const PersonalOffice = () => import('@/views/ebiz/institutionalPerform/PersonalOffice')
-const ServiceDepartOffice = () => import('@/views/ebiz/institutionalPerform/ServiceDepartOffice')
-const RegionalOffice = () => import('@/views/ebiz/institutionalPerform/RegionalOffice')
-
-const InstitutionalManpower = () => import('@/views/ebiz/institutionalPerform/InstitutionalManpower')
-const institutionalPerform = () => import('@/views/ebiz/institutionalPerform/institutionalPerform')
+const BranchOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/BranchOffice')
+const UnderOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/UnderOffice')
+const DistrictOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/DistrictOffice')
+const DepartmentOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/DepartmentOffice')
+const GroupOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/GroupOffice')
+const PersonalOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/PersonalOffice')
+const ServiceDepartOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/ServiceDepartOffice')
+const RegionalOffice = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/RegionalOffice')
+const InstitutionalManpower = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/InstitutionalManpower')
+const institutionalPerform = () => import(/* webpackChunkName: 'institutionalPerform' */ '@/views/ebiz/institutionalPerform/institutionalPerform')
 export default [
   // 分公司
   {

src/router/ebiz/insureAgain.js

@@ -6,24 +6,24 @@
  * @Description: 
  * @FilePath: \ebiz-h5\src\router\ebiz\insureAgain.js
  */
-const InsureAgain = () => import('@/views/ebiz/insureAgain')
-const UncommitInsureDetail = () => import('@/views/ebiz/insureAgain/UncommitInsureDetail')
-const CommitInsureDetail = () => import('@/views/ebiz/insureAgain/CommitInsureDetail')
-const InsureInformation = () => import('@/views/ebiz/insureAgain/InsureInformation')
-const ProductInformation = () => import('@/views/ebiz/insureAgain/ProductInformation')
-const Notification = () => import('@/views/ebiz/insureAgain/Notification')
-const SignatureConfirmation = () => import('@/views/ebiz/insureAgain/SignatureConfirmation')
-const InsureAgainPayment = () => import('@/views/ebiz/insureAgain/Payment')
-const PaymentResult = () => import('@/views/ebiz/insureAgain/PaymentResult')
-const payResultFail = () => import('@/views/ebiz/insureAgain/PayResultFail')
-const ProductTip = () => import('@/views/ebiz/insureAgain/ProductTip')
-const InsuranceTip = () => import('@/views/ebiz/insureAgain/InsuranceTip')
-const SignatureOfElectronic = () => import('@/views/ebiz/insureAgain/SignatureOfElectronic')
-const InsuranceInformation = () => import('@/views/ebiz/insureAgain/InsuranceInformation')
-const AvoidDutyTip = () => import('@/views/ebiz/insureAgain/AvoidDutyTip')
-const ApointValidDoc = () => import('@/views/ebiz/insureAgain/ApointValidDoc')
-const DoubleRecordTip = () => import('@/views/ebiz/insureAgain/DoubleRecordTip')
-const Result = () => import('@/views/ebiz/insureAgain/Result')
+const InsureAgain = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain')
+const UncommitInsureDetail = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/UncommitInsureDetail')
+const CommitInsureDetail = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/CommitInsureDetail')
+const InsureInformation = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/InsureInformation')
+const ProductInformation = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/ProductInformation')
+const Notification = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/Notification')
+const SignatureConfirmation = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/SignatureConfirmation')
+const InsureAgainPayment = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/Payment')
+const PaymentResult = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/PaymentResult')
+const payResultFail = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/PayResultFail')
+const ProductTip = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/ProductTip')
+const InsuranceTip = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/InsuranceTip')
+const SignatureOfElectronic = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/SignatureOfElectronic')
+const InsuranceInformation = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/InsuranceInformation')
+const AvoidDutyTip = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/AvoidDutyTip')
+const ApointValidDoc = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/ApointValidDoc')
+const DoubleRecordTip = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/DoubleRecordTip')
+const Result = () => import(/* webpackChunkName: 'insureAgain' */ '@/views/ebiz/insureAgain/Result')
 let riskName = localStorage.riskName
 export default [
   {

src/router/ebiz/laurelClub.js

@@ -1,10 +1,10 @@
 // 卡单路由
-const LaurelClub = () => import('@/views/ebiz/laurelClub/LaurelClub')
-const LaurelData = () => import('@/views/ebiz/laurelClub/LaurelData')
-const MembershipList = () => import('@/views/ebiz/laurelClub/MembershipList')
-const StarProcess = () => import('@/views/ebiz/laurelClub/StarProcess')
-const ExclusivePosters = () => import('@/views/ebiz/laurelClub/ExclusivePosters')
-const LaurelDonation = () => import('@/views/ebiz/laurelClub/LaurelDonation')
+const LaurelClub = () => import(/* webpackChunkName: 'laurelClub' */ '@/views/ebiz/laurelClub/LaurelClub')
+const LaurelData = () => import(/* webpackChunkName: 'laurelClub' */ '@/views/ebiz/laurelClub/LaurelData')
+const MembershipList = () => import(/* webpackChunkName: 'laurelClub' */ '@/views/ebiz/laurelClub/MembershipList')
+const StarProcess = () => import(/* webpackChunkName: 'laurelClub' */ '@/views/ebiz/laurelClub/StarProcess')
+const ExclusivePosters = () => import(/* webpackChunkName: 'laurelClub' */ '@/views/ebiz/laurelClub/ExclusivePosters')
+const LaurelDonation = () => import(/* webpackChunkName: 'laurelClub' */ '@/views/ebiz/laurelClub/LaurelDonation')
 
 
 export default [

src/router/ebiz/manpower.js

@@ -1,28 +1,22 @@
 //人力发展 定义相关组件
 
-const Navigation = () => import('@/views/ebiz/manpower/Navigation')
-const PersonalCenter = () => import('@/views/ebiz/manpower/PersonalCenter')
-
-const IncreaseStaffTools = () => import('@/views/ebiz/manpower/IncreaseStaffTools')
-const CompanyIntroduction = () => import('@/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction')
-const PolicyOptions = () => import('@/views/ebiz/manpower/increaseStaffTools/PolicyOptions')
-const PolicyOptionsPdfShare = () => import('@/views/ebiz/manpower/increaseStaffTools/PdfShare')
-
-const Training = () => import('@/views/ebiz/manpower/Training')
-
-const ActiveManagement = () => import('@/views/ebiz/manpower/ActiveManagement')
-
-const TalentPoolList = () => import('@/views/ebiz/manpower/talentPool/List')
-const TalentPoolAdd = () => import('@/views/ebiz/manpower/talentPool/Add')
-const TalentPoolEdit = () => import('@/views/ebiz/manpower/talentPool/Edit')
-
-const ActivityLogList = () => import('@/views/ebiz/manpower/activityLog/List')
-const ActivityLogEdit = () => import('@/views/ebiz/manpower/activityLog/Edit')
-
-const DiscAnalysisList = () => import('@/views/ebiz/manpower/discAnalysis/List')
-const DiscAnalysisQuestion = () => import('@/views/ebiz/manpower/discAnalysis/Question')
-const DiscAnalysisResult = () => import('@/views/ebiz/manpower/discAnalysis/Result')
-const DiscAnalysisShare = () => import('@/views/ebiz/manpower/discAnalysis/Share')
+const Navigation = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/Navigation')
+const PersonalCenter = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/PersonalCenter')
+const IncreaseStaffTools = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/IncreaseStaffTools')
+const CompanyIntroduction = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction')
+const PolicyOptions = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/increaseStaffTools/PolicyOptions')
+const PolicyOptionsPdfShare = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/increaseStaffTools/PdfShare')
+const Training = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/Training')
+const ActiveManagement = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/ActiveManagement')
+const TalentPoolList = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/talentPool/List')
+const TalentPoolAdd = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/talentPool/Add')
+const TalentPoolEdit = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/talentPool/Edit')
+const ActivityLogList = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/activityLog/List')
+const ActivityLogEdit = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/activityLog/Edit')
+const DiscAnalysisList = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/discAnalysis/List')
+const DiscAnalysisQuestion = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/discAnalysis/Question')
+const DiscAnalysisResult = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/discAnalysis/Result')
+const DiscAnalysisShare = () => import(/* webpackChunkName: 'manpower' */ '@/views/ebiz/manpower/discAnalysis/Share')
 
 export default [
   {

src/router/ebiz/milestone.js

@@ -1,7 +1,7 @@
 //重要事件 定义相关组件
-const list = () => import('@/views/ebiz/milestone/milestoneList')
-const addMilestone = () => import('@/views/ebiz/milestone/addMilestone')
-const editMilestone = () => import('@/views/ebiz/milestone/editMilestone')
+const list = () => import(/* webpackChunkName: 'milestone' */ '@/views/ebiz/milestone/milestoneList')
+const addMilestone = () => import(/* webpackChunkName: 'milestone' */ '@/views/ebiz/milestone/addMilestone')
+const editMilestone = () => import(/* webpackChunkName: 'milestone' */ '@/views/ebiz/milestone/editMilestone')
 
 export default [
   {

src/router/ebiz/my.js

@@ -1,12 +1,12 @@
 //我的 定义相关组件
-const userCenter = () => import('@/views/ebiz/my/UserCenter')
-const userSetting = () => import('@/views/ebiz/my/UserSetting')
-const userInfo = () => import('@/views/ebiz/my/UserInfo')
-const userIncome = () => import('@/views/ebiz/my/UserIncome')
-const PrivacyPolicy = () => import('@/views/ebiz/my/PrivacyPolicy')
-const LogoutAgent = () => import('@/views/ebiz/my/LogoutAgent')
-const UserWxHead = () => import('@/views/ebiz/my/UserWxHead')
-const UserWxHead2 = () => import('@/views/ebiz/my/UserWxHead2')
+const userCenter = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/UserCenter')
+const userSetting = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/UserSetting')
+const userInfo = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/UserInfo')
+const userIncome = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/UserIncome')
+const PrivacyPolicy = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/PrivacyPolicy')
+const LogoutAgent = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/LogoutAgent')
+const UserWxHead = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/UserWxHead')
+const UserWxHead2 = () => import(/* webpackChunkName: 'my' */ '@/views/ebiz/my/UserWxHead2')
 
 export default [
   {

src/router/ebiz/nbs.js

@@ -1,16 +1,16 @@
-let nbsList = () => import('@/views/ebiz/nbs/List')
-let nbsNav = () => import('@/views/ebiz/nbs/Nav')
-let nbsChart = () => import('@/views/ebiz/nbs/Chart')
-let nbsResult = () => import('@/views/ebiz/nbs/Result')
-let nbsCrewList = () => import('@/views/ebiz/nbs/CrewList')
-let nbsBase = () => import('@/views/ebiz/nbs/Base')
-let nbsNecessary = () => import('@/views/ebiz/nbs/Necessary')
-let nbsPrepared = () => import('@/views/ebiz/nbs/Prepared')
-let nbsDetail = () => import('@/views/ebiz/nbs/Detail')
-let nbsPDF = () => import('@/views/ebiz/nbs/PDF')
-let internal = () => import('@/views/ebiz/nbs/InternalService')
-let internalItem = () => import('@/views/ebiz/nbs/InternalServiceItem')
-let internalItem_2 = () => import('@/views/ebiz/nbs/InternalServiceItem_2')
+let nbsList = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/List')
+let nbsNav = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Nav')
+let nbsChart = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Chart')
+let nbsResult = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Result')
+let nbsCrewList = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/CrewList')
+let nbsBase = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Base')
+let nbsNecessary = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Necessary')
+let nbsPrepared = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Prepared')
+let nbsDetail = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/Detail')
+let nbsPDF = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/PDF')
+let internal = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/InternalService')
+let internalItem = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/InternalServiceItem')
+let internalItem_2 = () => import(/* webpackChunkName: 'nbs' */ '@/views/ebiz/nbs/InternalServiceItem_2')
 export default [
   {
     path: '/nbs/list',

src/router/ebiz/performance.js

@@ -1,7 +1,7 @@
-const performance = () => import('@/views/ebiz/performance/Performance')
-const attendanceInfo = () => import('@/views/ebiz/performance/AttendanceInfo')
-const PerformanceList = () => import('@/views/ebiz/performance/PerformanceList')
-const PerformanceInfo = () => import('@/views/ebiz/performance/PerformanceInfo')
+const performance = () => import(/* webpackChunkName: 'performance' */ '@/views/ebiz/performance/Performance')
+const attendanceInfo = () => import(/* webpackChunkName: 'performance' */ '@/views/ebiz/performance/AttendanceInfo')
+const PerformanceList = () => import(/* webpackChunkName: 'performance' */ '@/views/ebiz/performance/PerformanceList')
+const PerformanceInfo = () => import(/* webpackChunkName: 'performance' */ '@/views/ebiz/performance/PerformanceInfo')
 
 export default [
   {

src/router/ebiz/poster.js

@@ -1,7 +1,7 @@
 //保全 定义相关组件
-const posterList = () => import('@/views/ebiz/poster/PosterList')
-const posterPreview = () => import('@/views/ebiz/poster/PosterPreview')
-const posterLoading = () => import('@/views/ebiz/poster/PosterLoading')
+const posterList = () => import(/* webpackChunkName: 'poster' */ '@/views/ebiz/poster/PosterList')
+const posterPreview = () => import(/* webpackChunkName: 'poster' */ '@/views/ebiz/poster/PosterPreview')
+const posterLoading = () => import(/* webpackChunkName: 'poster' */ '@/views/ebiz/poster/PosterLoading')
 
 export default [
   {

src/router/ebiz/preserve.js

@@ -1,42 +1,42 @@
 //保全 定义相关组件
 //common公用页面
-const Search = () => import('@/views/ebiz/preserve/common/Search')
-const HandleResult = () => import('@/views/ebiz/preserve/common/HandleResult')
-const SubmitResult = () => import('@/views/ebiz/preserve/common/SubmitResult')
-const PolicyList = () => import('@/views/ebiz/preserve/common/PolicyList')
+const Search = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/common/Search')
+const HandleResult = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/common/HandleResult')
+const SubmitResult = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/common/SubmitResult')
+const PolicyList = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/common/PolicyList')
 //PC 续期账户变更
-const RenewalInfo = () => import('@/views/ebiz/preserve/pc/RenewalInfo')
-const PcImageUpload = () => import('@/views/ebiz/preserve/pc/ImageUpload')
-const RenewalConfirmation = () => import('@/views/ebiz/preserve/pc/RenewalConfirmation')
+const RenewalInfo = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/pc/RenewalInfo')
+const PcImageUpload = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/pc/ImageUpload')
+const RenewalConfirmation = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/pc/RenewalConfirmation')
 const AutopayAuthorization = () => import('@/views/ebiz/preserve/pc/AutopayAuthorization')
 //BB 联系方式变更
-const contactInfo = () => import('@/views/ebiz/preserve/bb/ContactInfo')
-const contacAgreement = () => import('@/views/ebiz/preserve/bb/ContacAgreement')
-const contactConfirmation = () => import('@/views/ebiz/preserve/bb/ContactConfirmation')
+const contactInfo = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bb/ContactInfo')
+const contacAgreement = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bb/ContacAgreement')
+const contactConfirmation = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bb/ContactConfirmation')
 //BC 受益人变更
-const BeneficiaryInfo = () => import('@/views/ebiz/preserve/bc/BeneficiaryInfo')
-const BcImageUpload = () => import('@/views/ebiz/preserve/bc/ImageUpload')
-const BeneficiaryInfoAdd = () => import('@/views/ebiz/preserve/bc/BeneficiaryInfoAdd')
-const BeneficiaryInfoDetail = () => import('@/views/ebiz/preserve/bc/BeneficiaryInfoDetail')
-const BeneficiaryConfirmation = () => import('@/views/ebiz/preserve/bc/BeneficiaryConfirmation')
+const BeneficiaryInfo = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bc/BeneficiaryInfo')
+const BcImageUpload = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bc/ImageUpload')
+const BeneficiaryInfoAdd = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bc/BeneficiaryInfoAdd')
+const BeneficiaryInfoDetail = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bc/BeneficiaryInfoDetail')
+const BeneficiaryConfirmation = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/bc/BeneficiaryConfirmation')
 //退保
-const SurrenderInfo = () => import('@/views/ebiz/preserve/ct/SurrenderInfo')
-const SurrenderConfirmation = () => import('@/views/ebiz/preserve/ct/SurrenderConfirmation')
-const SurrenderTip = () => import('@/views/ebiz/preserve/ct/SurrenderTip')
-const CtImageUpload = () => import('@/views/ebiz/preserve/ct/ImageUpload')
+const SurrenderInfo = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/ct/SurrenderInfo')
+const SurrenderConfirmation = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/ct/SurrenderConfirmation')
+const SurrenderTip = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/ct/SurrenderTip')
+const CtImageUpload = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/ct/ImageUpload')
 //犹豫期退保
-const WSurrenderInfo = () => import('@/views/ebiz/preserve/wt/WSurrenderInfo')
-const WSurrenderConfirmation = () => import('@/views/ebiz/preserve/wt/WSurrenderConfirmation')
-const WSurrenderTip = () => import('@/views/ebiz/preserve/wt/WSurrenderTip')
-const WtImageUpload = () => import('@/views/ebiz/preserve/wt/ImageUpload')
+const WSurrenderInfo = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/wt/WSurrenderInfo')
+const WSurrenderConfirmation = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/wt/WSurrenderConfirmation')
+const WSurrenderTip = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/wt/WSurrenderTip')
+const WtImageUpload = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/wt/ImageUpload')
 //保全进度查询及详情页面
-const Progress = () => import('@/views/ebiz/preserve/Progress')
-const Contact = () => import('@/views/ebiz/preserve/detail/Contact')
-const Beneficiary = () => import('@/views/ebiz/preserve/detail/Beneficiary')
-const BeneficiaryInfoD = () => import('@/views/ebiz/preserve/detail/BeneficiaryInfo')
-const Renewal = () => import('@/views/ebiz/preserve/detail/Renewal')
-const CoolingOffperiodSurrender = () => import('@/views/ebiz/preserve/detail/CoolingOffperiodSurrender')
-const Surrender = () => import('@/views/ebiz/preserve/detail/Surrender')
+const Progress = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/Progress')
+const Contact = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/detail/Contact')
+const Beneficiary = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/detail/Beneficiary')
+const BeneficiaryInfoD = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/detail/BeneficiaryInfo')
+const Renewal = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/detail/Renewal')
+const CoolingOffperiodSurrender = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/detail/CoolingOffperiodSurrender')
+const Surrender = () => import(/* webpackChunkName: 'preserve' */ '@/views/ebiz/preserve/detail/Surrender')
 
 export default [
   {

src/router/ebiz/product-store.js

@@ -1,10 +1,10 @@
 //商品商城
-const ForwardRecord = () => import('@/views/ebiz/product-store/ForwardRecord')
-const LoginMsg = () => import('@/views/ebiz/product-store/LoginMsg')
-const StoreDetail = () => import('@/views/ebiz/product-store/StoreDetail')
-const StoreList = () => import('@/views/ebiz/product-store/StoreList')
-const Agreement = () => import('@/views/ebiz/product-store/Agreement')
-const Protocol = () => import('@/views/ebiz/product-store/Protocol')
+const ForwardRecord = () => import(/* webpackChunkName: 'productstore' */ '@/views/ebiz/product-store/ForwardRecord')
+const LoginMsg = () => import(/* webpackChunkName: 'productstore' */ '@/views/ebiz/product-store/LoginMsg')
+const StoreDetail = () => import(/* webpackChunkName: 'productstore' */ '@/views/ebiz/product-store/StoreDetail')
+const StoreList = () => import(/* webpackChunkName: 'productstore' */ '@/views/ebiz/product-store/StoreList')
+const Agreement = () => import(/* webpackChunkName: 'productstore' */ '@/views/ebiz/product-store/Agreement')
+const Protocol = () => import(/* webpackChunkName: 'productstore' */ '@/views/ebiz/product-store/Protocol')
 export default [
   {
     path: '/productStore/forwardRecord',

src/router/ebiz/product.js

@@ -1,8 +1,8 @@
 //产品列表 定义相关组件
-const productList = () => import('@/views/ebiz/product/ProductList')
-const productDetail = () => import('@/views/ebiz/product/ProductDetail')
-const productDocument = () => import('@/views/ebiz/product/ProductDocument')
-const homeProduct = () => import('@/views/ebiz/product/HomeProduct')
+const productList = () => import(/* webpackChunkName: 'product' */ '@/views/ebiz/product/ProductList')
+const productDetail = () => import(/* webpackChunkName: 'product' */ '@/views/ebiz/product/ProductDetail')
+const productDocument = () => import(/* webpackChunkName: 'product' */ '@/views/ebiz/product/ProductDocument')
+const homeProduct = () => import(/* webpackChunkName: 'product' */ '@/views/ebiz/product/HomeProduct')
 
 export default [
   {

src/router/ebiz/productionSay.js

@@ -1,8 +1,8 @@
 //产说会列表 定义相关组件
-const List = () => import('@/views/ebiz/productionSay/List')
-const createChangeItem = () => import('@/views/ebiz/productionSay/createChangeItem')
-const statistics = () => import('@/views/ebiz/productionSay/statistics')
-const statisticsItem = () => import('@/views/ebiz/productionSay/statisticsItem')
+const List = () => import(/* webpackChunkName: 'productionSay' */ '@/views/ebiz/productionSay/List')
+const createChangeItem = () => import(/* webpackChunkName: 'productionSay' */ '@/views/ebiz/productionSay/createChangeItem')
+const statistics = () => import(/* webpackChunkName: 'productionSay' */ '@/views/ebiz/productionSay/statistics')
+const statisticsItem = () => import(/* webpackChunkName: 'productionSay' */ '@/views/ebiz/productionSay/statisticsItem')
 
 export default [
   {

src/router/ebiz/proposal.js

@@ -1,15 +1,15 @@
 //建议书 定义相关组件
-const list = () => import('@/views/ebiz/proposal/List')
-const appnt = () => import('@/views/ebiz/proposal/Appnt')
-const chooseInsuredPerson = () => import('@/views/ebiz/proposal/ChooseInsuredPerson')
-const insuredPerson = () => import('@/views/ebiz/proposal/InsuredPerson')
-const exhibition = () => import('@/views/ebiz/proposal/Exhibition')
-const companyProfile = () => import('@/views/ebiz/proposal/CompanyProfile')
-const pdf = () => import('@/views/ebiz/proposal/PDF')
-const proposalInfo = () => import('@/views/ebiz/proposal/ProposalInfo')
-const caluePdf = () => import('@/views/ebiz/proposal/CaluePDF')
-const newAppnt = () => import('@/views/ebiz/proposal/NewAppnt')
-const newInsuredPerson = () => import('@/views/ebiz/proposal/NewInsuredPerson')
+const list = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/List')
+const appnt = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/Appnt')
+const chooseInsuredPerson = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/ChooseInsuredPerson')
+const insuredPerson = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/InsuredPerson')
+const exhibition = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/Exhibition')
+const companyProfile = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/CompanyProfile')
+const pdf = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/PDF')
+const proposalInfo = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/ProposalInfo')
+const caluePdf = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/CaluePDF')
+const newAppnt = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/NewAppnt')
+const newInsuredPerson = () => import(/* webpackChunkName: 'proposal' */ '@/views/ebiz/proposal/NewInsuredPerson')
 
 export default [
   {

src/router/ebiz/renewalManage.js

@@ -1,11 +1,11 @@
-const list = () => import('@/views/ebiz/renewalManage/List')
-const customerList = () => import('@/views/ebiz/renewalManage/customerList')
-const policyList = () => import('@/views/ebiz/renewalManage/policyList')
-const detail = () => import('@/views/ebiz/renewalManage/Detail')
-const policyDetail = () => import('@/views/ebiz/renewalManage/policyDetail')
-const msgTemplate = () => import('@/views/ebiz/renewalManage/MsgTemplate')
-const shortPolicyList = () => import('@/views/ebiz/renewalManage/shortPolicyList')
-const shortPolicyDetail = () => import('@/views/ebiz/renewalManage/shortPolicyDetail')
+const list = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/List')
+const customerList = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/customerList')
+const policyList = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/policyList')
+const detail = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/Detail')
+const policyDetail = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/policyDetail')
+const msgTemplate = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/MsgTemplate')
+const shortPolicyList = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/shortPolicyList')
+const shortPolicyDetail = () => import(/* webpackChunkName: 'renewalManage' */ '@/views/ebiz/renewalManage/shortPolicyDetail')
 export default [
   {
     path: '/renewalManage/list',

src/router/ebiz/report.js

@@ -1,6 +1,6 @@
 //数据报表 定义相关组件
-const reportList = () => import('@/views/ebiz/report/reportList')
-const reportDetail = () => import('@/views/ebiz/report/reportDetail')
+const reportList = () => import(/* webpackChunkName: 'report' */ '@/views/ebiz/report/reportList')
+const reportDetail = () => import(/* webpackChunkName: 'report' */ '@/views/ebiz/report/reportDetail')
 
 export default [
   {

src/router/ebiz/sale.js

@@ -1,43 +1,40 @@
 //电子投保 定义相关组件
-const list = () => import('@/views/ebiz/sale/List')
-const insuredPerson = () => import('@/views/ebiz/sale/InsuredPerson')
-const insuredInfo = () => import('@/views/ebiz/sale/InsuredInfo')
-const result = () => import('@/views/ebiz/sale/Result')
-const beneficiary = () => import('@/views/ebiz/sale/Beneficiary')
-const attachmentManagement = () => import('@/views/ebiz/sale/AttachmentManagement')
-
-const addBeneficiaryInfo = () => import('@/views/ebiz/sale/AddBeneficiaryInfo')
-
-const signatureConfirmation = () => import('@/views/ebiz/sale/SignatureConfirmation')
-const notifyingMessage = () => import('@/views/ebiz/sale/NotifyingMessage')
-const universalRiskNotifyingMessage = () => import('@/views/ebiz/sale/universalRiskNotifyingMessage')
-const answerPage = () => import('@/views/ebiz/sale/answerPage')
-const answerSuccess = () => import('@/views/ebiz/sale/answerSuccess')
-const accountInformation = () => import('@/views/ebiz/sale/AccountInformation')
-const insuranceInformation = () => import('@/views/ebiz/sale/InsuranceInformation')
-const insuranceClauses = () => import('@/views/ebiz/sale/insuranceClauses')
-const insuranceTip = () => import('@/views/ebiz/sale/InsuranceTip')
-const universalRiskNotifyingMessageTip = () => import('@/views/ebiz/sale/universalRiskNotifyingMessageTip')
-const InsuranceRiskReminder = () => import('@/views/ebiz/sale/InsuranceRiskReminder')
-const signatureOfElectronic = () => import('@/views/ebiz/sale/SignatureOfElectronic')
-const PersonalInformation = () => import('@/views/ebiz/sale/PersonalInformation')
-const AnswerTip = () => import('@/views/ebiz/sale/AnswerTip')
-const payResult = () => import('@/views/ebiz/sale/PayResult')
-const cardScan = () => import('@/views/ebiz/sale/CardScan')
-const identitycardScan = () => import('@/views/ebiz/sale/identityCardScan')
-const payMent = () => import('@/views/ebiz/sale/PayMent')
-const backShow = () => import('@/views/ebiz/sale/BackShow')
-const Test = () => import('@/views/ebiz/sale/test')
-const detail = () => import('@/views/ebiz/sale/Detail')
-const productTip = () => import('@/views/ebiz/sale/productTip')
-const avoidDutyTip = () => import('@/views/ebiz/sale/AvoidDutyTip')
-const doubleRecordTip = () => import('@/views/ebiz/sale/DoubleRecordTip')
-const PayResultFail = () => import('@/views/ebiz/sale/PayResultFail')
-const apointValidDoc = () => import('@/views/ebiz/sale/apointValidDoc')
-const shortPeriodProduct = () => import('@/views/ebiz/sale/shortPeriodProduct')
-const commitmentSelfProtect = () => import('@/views/ebiz/sale/commitmentSelfProtect')
+const list = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/List')
+const insuredPerson = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/InsuredPerson')
+const insuredInfo = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/InsuredInfo')
+const result = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/Result')
+const beneficiary = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/Beneficiary')
+const attachmentManagement = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/AttachmentManagement')
+const addBeneficiaryInfo = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/AddBeneficiaryInfo')
+const signatureConfirmation = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/SignatureConfirmation')
+const notifyingMessage = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/NotifyingMessage')
+const universalRiskNotifyingMessage = () => import(/* webpackChunkName: 'sale1' */ '@/views/ebiz/sale/universalRiskNotifyingMessage')
+const answerPage = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/answerPage')
+const answerSuccess = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/answerSuccess')
+const accountInformation = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/AccountInformation')
+const insuranceInformation = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/InsuranceInformation')
+const insuranceClauses = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/insuranceClauses')
+const insuranceTip = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/InsuranceTip')
+const universalRiskNotifyingMessageTip = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/universalRiskNotifyingMessageTip')
+const InsuranceRiskReminder = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/InsuranceRiskReminder')
+const signatureOfElectronic = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/SignatureOfElectronic')
+const PersonalInformation = () => import(/* webpackChunkName: 'sale2' */ '@/views/ebiz/sale/PersonalInformation')
+const AnswerTip = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/AnswerTip')
+const payResult = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/PayResult')
+const cardScan = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/CardScan')
+const identitycardScan = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/identityCardScan')
+const payMent = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/PayMent')
+const backShow = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/BackShow')
+const Test = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/test')
+const detail = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/Detail')
+const productTip = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/productTip')
+const avoidDutyTip = () => import(/* webpackChunkName: 'sale3' */ '@/views/ebiz/sale/AvoidDutyTip')
+const doubleRecordTip = () => import(/* webpackChunkName: 'sale4' */ '@/views/ebiz/sale/DoubleRecordTip')
+const PayResultFail = () => import(/* webpackChunkName: 'sale4' */ '@/views/ebiz/sale/PayResultFail')
+const apointValidDoc = () => import(/* webpackChunkName: 'sale4' */ '@/views/ebiz/sale/apointValidDoc')
+const shortPeriodProduct = () => import(/* webpackChunkName: 'sale4' */ '@/views/ebiz/sale/shortPeriodProduct')
+const commitmentSelfProtect = () => import(/* webpackChunkName: 'sale4' */ '@/views/ebiz/sale/commitmentSelfProtect')
 let riskName = localStorage.riskName
-console.log('sale/riskName==', riskName)
 export default [
   {
     path: '/sale/list',

src/router/ebiz/serve.js

@@ -1,11 +1,11 @@
 //服务 定义相关组件
-const list = () => import('@/views/ebiz/serve/List')
-const detail = () => import('@/views/ebiz/serve/Detail')
-const policyList = () => import('@/views/ebiz/serve/PolicyList')
-const caseApplication = () => import('@/views/ebiz/serve/CaseApplication')
-const Result = () => import('@/views/ebiz/serve/Result')
-const airSign = () => import('@/views/ebiz/serve/AirSign')
-const crossPolicyList = () => import('@/views/ebiz/serve/CrossPolicyList')
+const list = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/List')
+const detail = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/Detail')
+const policyList = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/PolicyList')
+const caseApplication = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/CaseApplication')
+const Result = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/Result')
+const airSign = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/AirSign')
+const crossPolicyList = () => import(/* webpackChunkName: 'serve' */ '@/views/ebiz/serve/CrossPolicyList')
 
 export default [
   {

src/router/ebiz/survey.js

@@ -1,7 +1,7 @@
 //服务 定义相关组件
-const surveyList = () => import('@/views/ebiz/survey/SurveyList')
-const surveyDetail = () => import('@/views/ebiz/survey/SurveyDetail')
-const shareCover = () => import('@/views/ebiz/survey/ShareCover')
+const surveyList = () => import(/* webpackChunkName: 'survey' */ '@/views/ebiz/survey/SurveyList')
+const surveyDetail = () => import(/* webpackChunkName: 'survey' */ '@/views/ebiz/survey/SurveyDetail')
+const shareCover = () => import(/* webpackChunkName: 'survey' */ '@/views/ebiz/survey/ShareCover')
 
 export default [
   {

src/router/ebiz/train.js

@@ -1,5 +1,5 @@
 //培训系统 定义相关组件
-const trainLoading = () => import('@/views/ebiz/train/TrainLoading')
+const trainLoading = () => import(/* webpackChunkName: 'train' */ '@/views/ebiz/train/TrainLoading')
 
 export default [
   {

src/store/index.js

@@ -28,6 +28,11 @@ export default new Vuex.Store({
     secondManageCode: '', //内勤所需参数
     orderDetail: {},//无优卡分享微信端订单信息
     answerType: false,//风险测评tab是否显示
+    YBidNo: '', //银保代理人电子化合同签署证件号码
+    YBname: '', //银保代理人电子化合同签署姓名
+    YBuuid: '', //银保代理人电子化合同签署代理人uuid
+    uploadImgType: '',
+    uploadImgOrderNo: '',
   },
   mutations: {
     setOrderDetail (state, data) {
@@ -75,8 +80,23 @@ export default new Vuex.Store({
       state.pcList = val
     },
     //更新 风险测评是否显示状态
-    updateAnswerType (state, val) {
-      state.answerType = val
+    updateUploadImgType (state, val) {
+      state.uploadImgType = val
+    },
+    updateUploadImgOrderNo (state, val) {
+      state.uploadImgOrderNo = val
+    },
+    //更新 银保代理人电子化合同签署证件号码
+    updateYBidNo (state, val) {
+      state.YBidNo = val
+    },
+    //更新 银保代理人电子化合同签署姓名
+    updateYBname (state, val) {
+      state.YBname = val
+    },
+    //更新 银保代理人电子化合同签署代理人uuid
+    updateYBuuid (state, val) {
+      state.YBuuid = val
     },
   },
   getters: {
@@ -104,6 +124,21 @@ export default new Vuex.Store({
     getAnswerType (state) {
       return state.answerType
     },
+    getUploadImgType (state) {
+      return state.uploadImgType
+    },
+    getUploadImgOrderNo (state) {
+      return state.uploadImgOrderNo
+    },
+    getYBidNo (state) {
+      return state.YBidNo
+    },
+    getYBname (state) {
+      return state.YBname
+    },
+    getYBuuid (state) {
+      return state.YBuuid
+    },
   }
 })
 

src/views/ebiz/cardList/CardTotreasure.vue

@@ -329,6 +329,7 @@ export default {
       let orderStatus = order.orderStatus
       console.log(order.orderStatus,'fdkfa')
       let cardOrderNo = order.orderNo
+      localStorage.setItem('orderNo', JSON.stringify(cardOrderNo))
       let url
       if(orderStatus == '59'){
         url =`/cardList/GroupAppntInfo?cardOrderNo=${cardOrderNo}&editOrder=1`

src/views/ebiz/cardList/GroupCheckInfo.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon ,Collapse, CollapseItem} from 'vant'
+  import {Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon, Collapse, CollapseItem, Dialog} from 'vant'
 import {cardOrderDetail } from '@/api/ebiz/cardList/cardList.js'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
 import afterDate from '@/assets/js/utils/getAfterDate.js'
@@ -79,7 +79,8 @@ export default {
       riskDTO: {},
       productDate: '',
       orderInfoDTO:{},
-      isGroupCard:''
+      isGroupCard:'',
+      mainRiskCode: ''
     //   isLessEighteen: true   // 被保人手机号和邮箱默认展示
     }
   },
@@ -101,6 +102,11 @@ export default {
         this.orderInfoDTO = res.orderDTO.orderInfoDTO
         this.insuredInfo = res.orderDTO.insuredDTOs
         this.insuredInfo.forEach(item => {
+          item.riskDTOLst.forEach(ii=>{
+            if(ii.isMainRisk == '0'){
+              this.mainRiskCode = ii.mainRiskCode
+            }
+          })
           item.homeName = getAreaName([{ code: item.homeProvince }, { code: item.homeCity }, { code: item.homeArea }])
         })
         // this.riskDTO = res.orderDTO.insuredDTOs[0].riskDTOLst[0]
@@ -132,15 +138,37 @@ export default {
   },
   methods: {
     nextStep() {
-      this.$jump({
-        flag: 'h5',
-        extra: {
-          url: location.origin + `/#/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
-        },
-        routerInfo: {
-          path: `/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
-        }
-      })
+      if(this.mainRiskCode == 'GFRS_M0058'){
+        Dialog.alert({
+          title: '特别提醒',
+          messageAlign: 'left',
+          confirmButtonText: '确认',
+          message: `2023年9月1日起生效的惠桂保保单，不能参保的5类既往症中增加了“神经性耳聋”，敬请注意！`,
+        })
+        .then(() => {
+          this.$jump({
+            flag: 'h5',
+            extra: {
+              url: location.origin + `/#/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+            },
+            routerInfo: {
+              path: `/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+            }
+          })
+        })
+        .catch(() => {
+        })
+      }else{
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            url: location.origin + `/#/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+          },
+          routerInfo: {
+            path: `/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+          }
+        })
+      }
     }
   }
 }

src/views/ebiz/cardList/Pay.vue

@@ -290,6 +290,7 @@ export default {
       accBankProvince: '',
       accBankCity: '',
       areaStr: '',
+      mainRiskCode: '',
       isGroupCard:'' //1 团险标识
     }
   },
@@ -310,17 +311,13 @@ export default {
       this.bankListName = orderDetail.orderAccountDTO.bankName
       this.orderStatus = orderDetail.orderInfoDTO.orderStatus
       localStorage.orderNo = orderDetail.orderInfoDTO.orderNo
-      // this.radio = '3'
-      // this.isLoading = true
-      // this.$toast.loading({
-      //   duration: 0, // 持续展示 toast
-      //   forbidClick: true, // 禁用背景点击
-      //   loadingType: 'spinner',
-      //   message: '加载中……'
-      // })
-      // setTimeout(() => {
-      //   this.pay()
-      // }, 500)
+      orderDetail.insuredDTOs.forEach(item=>{
+        item.riskDTOLst.forEach(ii=>{
+          if(ii.isMainRisk == '0'){
+            this.mainRiskCode = ii.mainRiskCode
+          }
+        })
+      })
     } else {
       document.title = '支付分享'
       // 再次支付 调详情 获取信息
@@ -513,6 +510,13 @@ export default {
       getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => {
         if (res.result == '0') {
           this.insuredDTOs = res.orderDTO.insuredDTOs
+          res.orderDTO.insuredDTOs.forEach(item=>{
+            item.riskDTOLst.forEach(ii=>{
+              if(ii.isMainRisk == '0'){
+                this.mainRiskCode = ii.mainRiskCode
+              }
+            })
+          })
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
           try {
             if (this.noEdit) {
@@ -742,58 +746,69 @@ export default {
           支付之前要先保存银行账户信息
         */
         let res = await saveOrUpdateAccount(data)
-        // .then(res => {
-        console.log('res', res)
         this.$toast.clear()
         if (res.result == '0') {
+          if(this.mainRiskCode == 'GFRS_M0058'){
+            Dialog.alert({
+              title: '特别提醒',
+              messageAlign: 'left',
+              confirmButtonText: '确认',
+              message: `2023年9月1日起生效的惠桂保保单，不能参保的5类既往症中增加了“神经性耳聋”，敬请注意！`,
+            })
+            .then(() => {
+              this.$toast.loading({
+                duration: 0, // 持续展示 toast
+                forbidClick: true, // 禁用背景点击
+                loadingType: 'spinner',
+                message: '加载中……'
+              })
+              this.acceptInsurance()
+            })
+            .catch(() => {
+            })
+          }else{
+            this.$toast.loading({
+              duration: 0, // 持续展示 toast
+              forbidClick: true, // 禁用背景点击
+              loadingType: 'spinner',
+              message: '加载中……'
+            })
+            this.acceptInsurance()
+          }
+
+        } else {
+          this.$toast(res.resultMessage)
+          this.isLoading = false
+        }
+      } else {
+        if(this.mainRiskCode == 'GFRS_M0058'){
+          Dialog.alert({
+            title: '特别提醒',
+            messageAlign: 'left',
+            confirmButtonText: '确认',
+            message: `2023年9月1日起生效的惠桂保保单，不能参保的5类既往症中增加了“神经性耳聋”，敬请注意！`,
+          })
+          .then(() => {
+            this.$toast.loading({
+              duration: 0, // 持续展示 toast
+              forbidClick: true, // 禁用背景点击
+              loadingType: 'spinner',
+              message: '加载中……'
+            })
+            this.acceptInsurance()
+          })
+          .catch(() => {
+          })
+        }else{
           this.$toast.loading({
             duration: 0, // 持续展示 toast
             forbidClick: true, // 禁用背景点击
             loadingType: 'spinner',
             message: '加载中……'
           })
-
-          // if (!flag) {
-          //   let rs = await this.underWrite()
-
-          //   if (rs.result != '0') {
-          //     this.$toast.clear()
-          //     return this.$toast(rs.resultMessage)
-          //   }
-
-          //   if (rs.uwResult != '02') {
-          //     return this.$toast(rs.message)
-          //   }
-          // }
-
           this.acceptInsurance()
-        } else {
-          this.$toast(res.resultMessage)
-          this.isLoading = false
         }
-        // })
-      } else {
-        this.$toast.loading({
-          duration: 0, // 持续展示 toast
-          forbidClick: true, // 禁用背景点击
-          loadingType: 'spinner',
-          message: '加载中……'
-        })
 
-        // if (!flag) {
-        //   let rs = await this.underWrite()
-
-        //   if (rs.result != '0') {
-        //     this.$toast.clear()
-        //     return this.$toast(rs.resultMessage)
-        //   }
-
-        //   if (rs.uwResult != '02') {
-        //     return this.$toast(rs.message)
-        //   }
-        // }
-
-        this.acceptInsurance()
       }
     },
     // 选择微信支付校验身份证类型

src/views/ebiz/cardList/cardDetail.vue

@@ -127,7 +127,8 @@ export default {
     productDate = new Date(parseInt(hoDate) * 1000)
     insuYearM = productDate.getMonth() + 1 < 10 ? '0' + (productDate.getMonth() + 1) : productDate.getMonth() + 1
     insuYearD = productDate.getDate() < 10 ? '0' + productDate.getDate() : productDate.getDate()
-    productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
+    // productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
+    productDateTime = afterDate.getAfterDateTime(insuYear.cvaliDate,1)
     this.productDate = currentData + '0时至' + productDateTime + '24时止'
     this.orderAmount = this.orderDTO.orderInfoDTO.orderAmount
   },

src/views/ebiz/common/CalculatePremium.vue

@@ -353,8 +353,17 @@
     <van-dialog v-model="trialResultsShow" title="核保试算结果" :show-cancel-button="false">
       <div class="pl40 pr40 mt10">
         <div class="flex justify-content-s fs12" v-for="(item, index) in verifyResultList" :key="index">
-           <div><img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/ruleType0'+ item.ruleType +'.png')" alt=""><span class="v-middle">{{item.ruleType | ruleTypeFilter}}</span></div>
-           <div><span class="v-middle">{{item.status | approvedFilter}}</span><img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved'+ item.status +'.png')" alt=""></div>
+           <div>
+             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/ruleType0'+ item.ruleType +'.png')" alt="">
+             <span class="v-middle">{{item.ruleType | ruleTypeFilter}}</span>
+           </div>
+           <div>
+<!--             <span class="v-middle">{{item.status | approvedFilter}}</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>绿色✔表示 未触发规则、红色×表示 触发规则</p>
         </div>
       </div>
     </van-dialog>
@@ -367,6 +376,7 @@ import { saveOrUpdateOrderInfo, getOrderDetail,orderTrial } from '@/api/ebiz/sal
 import { saveProposal, getTrialRecordInfo, saveOrUpdateTrialRecordInfo } from '@/api/ebiz/proposal/proposal.js'
 import { getAgentInfo } from '@/api/ebiz/my/my.js'
 import occupationList from '@/components/ebiz/occipation/data/occupation'
+import utilsAge from '@/assets/js/utils/age'
 import riskRules from "./risk-rules";
 
   //险种GFRS_M0016的责任的验证规则
@@ -655,6 +665,9 @@ export default {
       if (this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) {
         this.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
         this.saleInsuredPersonInfo.insuredAge = this.saleInsuredPersonInfo.insuredAge ? this.saleInsuredPersonInfo.insuredAge : this.saleInsuredPersonInfo.age
+        if(this.saleInsuredPersonInfo.birthday){
+          this.saleInsuredPersonInfo.insuredAge = utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date())
+        }
         if (this.isFrom == 'proposal' && !this.saleInsuredPersonInfo.name) {
           // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
           let sex = this.saleInsuredPersonInfo.sex == '0'?'男':'女'
@@ -2338,7 +2351,7 @@ export default {
             this.saleInsuredInfo.sex,
             this.saleInsuredInfo.occupationCode,
             this.saleInsuredInfo.occupationName,
-            this.saleInsuredInfo.insuredAge?this.saleInsuredInfo.insuredAge:this.saleInsuredInfo.age,
+            this.saleInsuredPersonInfo.insuredAge
           ]
         } else {
           ;[birthday, sex, occupationCode, occupationName, age] = [
@@ -2346,7 +2359,7 @@ export default {
             this.saleInsuredPersonInfo.sex,
             this.saleInsuredPersonInfo.occupationCode,
             this.saleInsuredPersonInfo.occupationName,
-            this.saleInsuredPersonInfo.insuredAge?this.saleInsuredPersonInfo.insuredAge:this.saleInsuredPersonInfo.age
+            this.saleInsuredPersonInfo.insuredAge
           ]
         }
         trialInfo = Object.assign(trialInfo, {
@@ -2404,25 +2417,161 @@ export default {
     },
     //保额份数变化
     stepperChange(defalutValue, productIndex, calFactorIndex, min, max, riskFactor) {
-        let currentEle =
-                localStorage.isTrial !== '1' && this.chooseProducts[productIndex].isMainRisk == '0'
-                        ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex]
-                        : this.chooseProducts[productIndex].calFactorLst[calFactorIndex]
-        //改动原因：孝心保产品有对年龄的特殊要求
-        //添加判断，是否是孝心保产品
-        let showHint = this.chooseProducts[productIndex].hint
-        let productCode = localStorage.trialList == '' ? '' : JSON.parse(localStorage.trialList)[0].productCode
-        if (productCode == 'GFRS_M0014') {
-          //被保险人年龄如果在50-65区间
-          if (this.saleInsuredPersonInfo.insuredAge >= 50 && this.saleInsuredPersonInfo.insuredAge <= 65) {
-            //使用rules规则里的第二条控制保额份数
-            if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+      let currentEle = ''
+      let params = this.getParams()
+      if(localStorage.isTrial !== '1' && this.chooseProducts[productIndex].isMainRisk == '0'){
+        // params[productIndex].payEndYear == '1000' 交费期间为一次性交清
+        this.chooseProducts[productIndex].productTrialYearDTOS.forEach(item=>{
+          if(params.trialInfos[productIndex].payEndYear == '1000') {
+            if(item.yearWay == '一次性交清'){
+              currentEle = item
+            }
+          } else {
+            if(item.yearWay == params.trialInfos[productIndex].payEndYear){
+              currentEle = item
+            }
+          }
+        })
+      } else {
+        currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex]
+      }
+      //改动原因：孝心保产品有对年龄的特殊要求
+      //添加判断，是否是孝心保产品
+      let showHint = this.chooseProducts[productIndex].hint
+      let productCode = localStorage.trialList == '' ? '' : JSON.parse(localStorage.trialList)[0].productCode
+      if (productCode == 'GFRS_M0014') {
+        //被保险人年龄如果在50-65区间
+        if (this.saleInsuredPersonInfo.insuredAge >= 50 && this.saleInsuredPersonInfo.insuredAge <= 65) {
+          //使用rules规则里的第二条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+            this.$toast(showHint)
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
               this.$toast(showHint)
               this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+          //被保险人年龄如果在66-75之间
+        } else if (this.saleInsuredPersonInfo.insuredAge >= 66 && this.saleInsuredPersonInfo.insuredAge <= 75) {
+          //使用rules规则里的第一条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
+            this.$toast(showHint)
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast(showHint)
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        }
+        //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
+      }
+      else if (productCode == 'GFRS_M0035' || productCode == 'GFRS_M0044'
+              || productCode == 'GFRS_M0056' || productCode == 'GFRS_M0057' || productCode == 'GFRS_M0060') {
+        console.log('defalutValue==', defalutValue)
+        console.log("currentEle['amt']==", currentEle['amt'])
+        console.log('riskFactor.rules', riskFactor.rules)
+        console.log('this.saleInsuredPersonInfo.insuredAge ', this.saleInsuredPersonInfo.insuredAge)
+        //被保险人年龄如果在50-65区间
+        if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
+          //使用rules规则里的第二条控制保额份数
+          // 年龄在56周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
+          if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+            this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+          //年龄在0-55周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
+        } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 55) {
+          //使用rules规则里的第一条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
+            this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        }
+        //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
+      }
+      else if (productCode == 'GFRS_M0040') {
+        // 惠企保保额限制
+        //被保险人年龄如果在41-60区间
+        if (this.saleInsuredPersonInfo.insuredAge >= 41) {
+          //使用rules规则里的第二条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+            this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 40) {
+          //使用rules规则里的第一条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
+            this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        }
+        //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
+      }
+      else if (productCode == 'GFRS_M0046') {
+        //被保险人年龄如果在50-65区间
+        if(this.branchTypeVal == 'Z'){  //中介渠道规则
+          if (this.saleInsuredPersonInfo.insuredAge >= 51 && this.saleInsuredPersonInfo.insuredAge <= 60) {
+            //使用rules规则里的第二条控制保额份数
+            // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
+            if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+              this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
+              this.nextStepFlag = true
             } else {
               if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
                 // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast(showHint)
+                this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
                 this.nextStepFlag = true
               } else {
                 this.mainRiskInfluenceAddRisk()
@@ -2430,16 +2579,15 @@ export default {
                 this.getTrial()
               }
             }
-            //被保险人年龄如果在66-75之间
-          } else if (this.saleInsuredPersonInfo.insuredAge >= 66 && this.saleInsuredPersonInfo.insuredAge <= 75) {
+            //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
+          } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 50) {
             //使用rules规则里的第一条控制保额份数
             if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-              this.$toast(showHint)
+              this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
               this.nextStepFlag = true
             } else {
               if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast(showHint)
+                this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
                 this.nextStepFlag = true
               } else {
                 this.mainRiskInfluenceAddRisk()
@@ -2448,17 +2596,11 @@ export default {
               }
             }
           }
-          //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
-        } else if (productCode == 'GFRS_M0035' || productCode == 'GFRS_M0044'
-                || productCode == 'GFRS_M0056' || productCode == 'GFRS_M0057' || productCode == 'GFRS_M0060') {
-          console.log('defalutValue==', defalutValue)
-          console.log("currentEle['amt']==", currentEle['amt'])
-          console.log('riskFactor.rules', riskFactor.rules)
-          console.log('this.saleInsuredPersonInfo.insuredAge ', this.saleInsuredPersonInfo.insuredAge)
+        }else if(this.branchTypeVal == 'G' || this.branchTypeVal == 'T'|| this.branchTypeVal == 'Y' ){ //世纪无忧中介渠道规则（银销个,健销个投保规则同个险规则）
           //被保险人年龄如果在50-65区间
           if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
             //使用rules规则里的第二条控制保额份数
-            // 年龄在56周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
+            // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
             if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
               this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
               this.nextStepFlag = true
@@ -2473,7 +2615,7 @@ export default {
                 this.getTrial()
               }
             }
-            //年龄在0-55周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
+            //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
           } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 55) {
             //使用rules规则里的第一条控制保额份数
             if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
@@ -2481,7 +2623,6 @@ export default {
               this.nextStepFlag = true
             } else {
               if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
                 this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
                 this.nextStepFlag = true
               } else {
@@ -2491,190 +2632,83 @@ export default {
               }
             }
           }
-          //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
-        } else if (productCode == 'GFRS_M0040') {
-          // 惠企保保额限制
-          //被保险人年龄如果在41-60区间
-          if (this.saleInsuredPersonInfo.insuredAge >= 41) {
-            //使用rules规则里的第二条控制保额份数
-            if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
-              this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
-              this.nextStepFlag = true
-            } else {
-              if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                this.mainRiskInfluenceAddRisk()
-                currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                this.getTrial()
-              }
-            }
-          } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 40) {
-            //使用rules规则里的第一条控制保额份数
-            if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-              this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
-              this.nextStepFlag = true
-            } else {
-              if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                this.mainRiskInfluenceAddRisk()
-                currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                this.getTrial()
-              }
-            }
+        }
+        // 国富人寿富桂金生养老年金保险（GFRS_M0053）中介渠道鑫享金生养老年金保险（GFRS_M0061）
+      }
+      else if (productCode == 'GFRS_M0053' || productCode == 'GFRS_M0061') {
+        if (Number(defalutValue) < Number(min)) {
+          if (riskFactor.yearWay == "一次性交清") {
+            this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
+          } else {
+            this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
           }
-          //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
-        } else if (productCode == 'GFRS_M0046') {
-          //被保险人年龄如果在50-65区间
-          if(this.branchTypeVal == 'Z'){  //中介渠道规则
-            if (this.saleInsuredPersonInfo.insuredAge >= 51 && this.saleInsuredPersonInfo.insuredAge <= 60) {
-              //使用rules规则里的第二条控制保额份数
-              // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
-              if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
-                this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                  this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-              //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
-            } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 50) {
-              //使用rules规则里的第一条控制保额份数
-              if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-                this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-            }
-          }else if(this.branchTypeVal == 'G' || this.branchTypeVal == 'T'|| this.branchTypeVal == 'Y' ){ //世纪无忧中介渠道规则（银销个,健销个投保规则同个险规则）
-            //被保险人年龄如果在50-65区间
-            if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
-              //使用rules规则里的第二条控制保额份数
-              // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
-              if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
-                this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                  this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-              //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
-            } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 55) {
-              //使用rules规则里的第一条控制保额份数
-              if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-                this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-            }
+          this.nextStepFlag = true
+        }else{
+          this.nextStepFlag = false
+          this.mainRiskInfluenceAddRisk()
+          currentEle['amt'] = Number(defalutValue) * Number(riskFactor.moneyUnit)
+          this.getTrial()
+        }
+      }
+      else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') {
+        if (Number(defalutValue) < Number(min)) {
+          if (riskFactor.yearWay == "一次性交清") {
+            this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
+          } else {
+            this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
           }
-          // 国富人寿富桂金生养老年金保险（GFRS_M0053）中介渠道鑫享金生养老年金保险（GFRS_M0061）
-        } else if (productCode == 'GFRS_M0053' || productCode == 'GFRS_M0061') {
-          if (Number(defalutValue) < Number(min)) {
-            if (riskFactor.yearWay == "一次性交清") {
-              this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            } else {
-              this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            }
+          this.nextStepFlag = true
+        } else {
+          if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+            // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+            this.$toast(`超过最低保费部分金额需为1000元整数倍`)
             this.nextStepFlag = true
-          }else{
+          } else {
             this.nextStepFlag = false
             this.mainRiskInfluenceAddRisk()
             currentEle['amt'] = Number(defalutValue) * Number(riskFactor.moneyUnit)
             this.getTrial()
           }
-        } else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') {
-          if (Number(defalutValue) < Number(min)) {
-            if (riskFactor.yearWay == "一次性交清") {
-              this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            } else {
-              this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            }
-            this.nextStepFlag = true
-          } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-              this.$toast(`超过最低保费部分金额需为1000元整数倍`)
-              this.nextStepFlag = true
-            } else {
-              this.nextStepFlag = false
-              this.mainRiskInfluenceAddRisk()
-              currentEle['amt'] = Number(defalutValue) * Number(riskFactor.moneyUnit)
-              this.getTrial()
-            }
-          }
-          //其他产品按照原先的逻辑判断
-        } else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '1') {
-          if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+        }
+        //其他产品按照原先的逻辑判断
+      }
+      else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '1') {
+        if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+          this.$toast('投保本险种最低基本保险金额为10000元，超过最低基本保险金额为1000元整数倍')
+          this.nextStepFlag = true
+        } else {
+          if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+            // defalutValue = currentEle.rules[productIndex].displayAmount
             this.$toast('投保本险种最低基本保险金额为10000元，超过最低基本保险金额为1000元整数倍')
             this.nextStepFlag = true
           } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              // defalutValue = currentEle.rules[productIndex].displayAmount
-              this.$toast('投保本险种最低基本保险金额为10000元，超过最低基本保险金额为1000元整数倍')
-              this.nextStepFlag = true
-            } else {
-              this.mainRiskInfluenceAddRisk()
-              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-              this.getTrial()
-            }
+            this.mainRiskInfluenceAddRisk()
+            currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+            this.getTrial()
           }
+        }
+      }
+      else {
+        if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+          this.$toast(showHint)
+          this.nextStepFlag = true
         } else {
-          if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+          if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+            // defalutValue = currentEle.rules[productIndex].displayAmount
             this.$toast(showHint)
             this.nextStepFlag = true
           } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              // defalutValue = currentEle.rules[productIndex].displayAmount
-              this.$toast(showHint)
-              this.nextStepFlag = true
-            } else {
-              this.mainRiskInfluenceAddRisk()
-              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-              this.getTrial()
-            }
+            this.mainRiskInfluenceAddRisk()
+            currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+            this.getTrial()
           }
         }
-        // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex]
-        // defalutValue = value
-        console.log('进来几次')
-        this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue))
-      },
+      }
+      // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex]
+      // defalutValue = value
+      console.log('进来几次')
+      this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue))
+    },
     //下一步
     async nextStep(isFrom) {
       //GFRS_M0016需要验证责任
@@ -2845,7 +2879,7 @@ export default {
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })
       if (!insuredDTOItem.insuredAge) {
-        insuredDTOItem.insuredAge = insuredDTOItem.age
+        insuredDTOItem.insuredAge = insuredDTOItem.birthday ? utilsAge.getAge(insuredDTOItem.birthday, new Date()) : insuredDTOItem.age
       }
       let orderNo = localStorage.isFrom == 'proposal'?this.$route.query.proposalOrderNo:this.$route.query.orderNo
       let params = {
@@ -2956,7 +2990,7 @@ export default {
           }
         })
         let data = {
-          serialNo:this.$CacheUtils.getLocItem('proposalNo'),
+          serialNo:this.$route.query.proposalOrderNo,
           mainRiskId:insuanceId+'',
           trialJsonStr:localStorage.chooseProducts
         }

src/views/ebiz/product/HomeProduct.vue

@@ -44,7 +44,7 @@
           <div class="pcenter-list mr20 mb10 ml15">
             <template v-if="branchType != '6'">
               <div class="pcenter-item text-center">
-                <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0056')" />
+                <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0073')" />
               </div>
               <div class="pcenter-item text-center">
                 <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
@@ -122,7 +122,7 @@
         <div class="home-product-pcenter">
           <div class="pcenter-list mr20 mb10 ml15">
             <div class="pcenter-item text-center">
-              <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0056')" />
+              <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0073')" />
             </div>
             <div class="pcenter-item text-center">
               <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />

src/views/ebiz/proposal/PDF.vue

@@ -4,11 +4,12 @@
   </div>
 </template>
 <script>
-import { makePdf, share } from '@/api/ebiz/proposal/proposal.js'
+import { makePdf, share, getDemo } from '@/api/ebiz/proposal/proposal.js'
 import { Toast } from 'vant'
 import config from '@/config'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //使用数据字典中的险种类型
 import { weixinShare } from '@/assets/js/utils/wxShare.js'
+import { getAgentInfo } from '@/api/ebiz/my/my.js'
 import { queryPersonal } from '@/api/ebiz/laurelClub/laurelClub'
 export default {
   data() {
@@ -16,7 +17,8 @@ export default {
     return {
       pdfUrl: '',
       isWeixin,
-      title: ''
+      title: '',
+      agent:{}
     }
   },
   components: {
@@ -31,7 +33,7 @@ export default {
       this.init()
     }
   },
-  mounted() {
+  async mounted() {
     let riskCode = localStorage.pdfShareCode
     dataDictionary.riskType.some(item => {
       if (item.code == riskCode) {
@@ -39,10 +41,78 @@ export default {
         return true
       }
     })
+    if(this.$route.query.proposalOrderNo){
+      let params = {
+        proposalInfoDTO: {
+          proposalNo: this.$route.query.proposalOrderNo
+        }
+      }
+      let res = await getDemo(params)
+      if(res.result == 0){
+        let mainRiskNameList = []
+        res.content.orderDTO.insuredDTOs.forEach(item => {
+          item.riskDTOLst.forEach(item01 => {
+            if (item01.isMainRisk == '0') {
+              mainRiskNameList.push(item01.riskName)
+            }
+          })
+        })
+        // 一、单个被保险人
+        // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
+        // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
+        // 二、有多个被保险人
+        // 都显示“家庭保障计划”
+        if(mainRiskNameList.length == 1){
+          if (res.content.orderDTO.insuredDTOs.length > 1) {
+            this.title = '家庭保障计划'
+          } else {
+            this.title = mainRiskNameList[0]
+          }
+        }else{
+          if (res.content.orderDTO.insuredDTOs.length > 1) {
+            this.title = '家庭保障计划'
+          } else {
+            this.title = '保险产品组合计划'
+          }
+        }
+      }
+    }
+    let agentResult = await getAgentInfo({}) //调取代理人查询接口
+    if (agentResult.result == '0'){
+      let { agent } = this
+      let { name } = agentResult
+      agent.name = name
+    }
+    let date = new Date()
+    let month = date.getMonth() + 1
+    if (month <= 9) {
+      month = '0' + month
+    }
+    let reqData = {
+      mdType: 'm',
+      monthStr:date.getFullYear() + month
+    }
+    let shareContent;
+    let resData = await queryPersonal(reqData)
+    if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade) {
+      if(resData.content[0].glevel<3){
+        resData.content[0].ggrade='00'
+      }
+    }
+    if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
+      let sgrade =this.memberConversion(resData.content[0].sgrade);
+      shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+    }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&resData.content[0].ggrade!='00') {
+      let ggrade =this.memberConversion(resData.content[0].ggrade);
+      shareContent='国富桂冠精英'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+    } else {
+      shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
+    }
+
     weixinShare({
       title: this.title,
       imgUrl: this.$assetsUrl + 'images/logo.png',
-      desc: '国富为您量身定制的保险产品，请查收'
+      desc: shareContent
     })
     //重置左上角按钮，变成返回
     window.EWebBridge.webCallAppInJs("webview_left_button",{
@@ -109,10 +179,15 @@ export default {
         if(resData.content[0].glevel<3){
           resData.content[0].ggrade='00'
         }
+      }
+      if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
+        let sgrade =this.memberConversion(resData.content[0].sgrade);
+        shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+      }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&resData.content[0].ggrade!='00') {
         let ggrade =this.memberConversion(resData.content[0].ggrade);
-        shareContent='国富桂冠人力'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+        shareContent='国富桂冠精英'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
       } else {
-        shareContent='国富为您量身定制的保险产品，请查收';
+        shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
       }
       if (data.trigger == 'right_button_click') {
         // eslint-disable-next-line no-undef

src/views/ebiz/proposal/ProposalInfo.vue

@@ -4,7 +4,7 @@
       <div>
         <div class="mb50">
           <img class="w178 h41 div_1" src="@/assets/images/proposal/proposal_logo.png" />
-          <div class="white fw500 fs18 div_2">家庭保障计划</div>
+          <div class="white fw500 fs18 div_2">{{mainRiskName}}</div>
           <van-sticky @scroll="testSticky">
             <div class="pl15 pt15 flex justify-content-fs align-items-c sticky_div" :class="pageShowType.isFixed ? 'divbg_1' : 'divbg_2'">
               <div class="mr9 title_item" v-for="(item, index) in pageShowInfo.insuredDTOs" :key="index" @click="checkInsure(item.insuredId)">
@@ -199,7 +199,11 @@
                   <div class="text-left" style="width: 75%;">
                     <span>{{ moneyItem.contentLabel }}</span>
                   </div>
-                  <div class="text-right">
+                  <div class="text-right" v-if="moneyItem.content == 'currentBonus_M'">
+                    <span class="color_3A81F6">{{ moneyItem.value | numFormat2 }}</span
+                    >{{ moneyItem.content | productRateUnit }}
+                  </div>
+                  <div class="text-right" v-else>
                     <span class="color_3A81F6">{{ moneyItem.value | numFormatNo }}</span
                     >{{ moneyItem.content | productRateUnit }}
                   </div>
@@ -279,7 +283,7 @@
       </div>
       <div class="div_02">
         <div class="text-center div_021">
-          <div class="text-center div_022">家庭保障计划</div>
+          <div class="text-center div_022">{{mainRiskName}}</div>
           <!-- 如果没有姓名的话，根据性别展示男士或女士 -->
           <div class="text-center div_023">尊敬的<span v-if="pageShowInfo.appntDTO.name">{{ pageShowInfo.appntDTO.name.substr(0, 1) }}</span>{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}</div>
         </div>
@@ -382,6 +386,7 @@ export default {
       mainRiskCodes: [],
       time: 5,
       proposalNo:'',
+      mainRiskName: ''
     }
   },
   filters: {
@@ -395,6 +400,13 @@ export default {
     numFormat(str) {
       return str.replace(/\.00/, '')
     },
+    numFormat2(str) {
+      if (str) {
+        return Number(str.replace(/,/g, '')).toFixed(2)
+      } else {
+        return '-'
+      }
+    },
     numFormatNo(str) {
       if (str) {
         return Number(str.replace(/,/g, '')).toFixed(0)
@@ -437,6 +449,7 @@ export default {
       })
     }, 1000)
     window['appCallBack'] = this.appCallBack*/
+    // init方法在微信端存储token，接口请求用此token，所以init方法前不要请求接口，会影响分享微信功能，接口会报token为空
     this.init()
     //校验当前用户权限
     funcPermCheck({}).then(res => {
@@ -596,7 +609,7 @@ export default {
       }
     },
     async sharePeople() {
-      console.log(this.agent,'this.agent.name')
+      console.log(this.pageShowInfo.insuredDTOs,'this.pageShowInfo.insuredDTOs')
       let date = new Date()
       let month = date.getMonth() + 1
       if (month <= 9) {
@@ -608,25 +621,34 @@ export default {
       }
       let shareContent;
       let resData = await queryPersonal(reqData)
+      // debugger
+      //准会员话术改为普通人话术
+      if(resData.content.length&&resData.content[0].slevel<3){
+        resData.content[0].sgrade='00'
+      }
+      if(resData.content.length&&resData.content[0].glevel<3){
+        resData.content[0].ggrade='00'
+      }
       if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
-        if(resData.content[0].slevel<3){
-          resData.content[0].sgrade='00'
-        }
+        // if(resData.content[0].slevel<3){
+        //   resData.content[0].sgrade='00'
+        // }
         let sgrade =this.memberConversion(resData.content[0].sgrade);
         shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
-      }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&!resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
-        if(resData.content[0].glevel<3){
-          resData.content[0].ggrade='00'
-        }
+      }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&resData.content[0].ggrade!='00') {
+        // if(resData.content[0].glevel<3){
+        //   resData.content[0].ggrade='00'
+        // }
         let ggrade =this.memberConversion(resData.content[0].ggrade);
         shareContent='国富桂冠精英'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
       } else {
-        shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
+        shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！'; 
       }
+      console.log(shareContent,'shareContent')
       let title
       let riskList = [] //所有险种
       let riskCodeList = [] //所有险种code
-      this.pageShowInfo.insuredDTOs.map(item => { 
+      this.pageShowInfo.insuredDTOs.map(item => {
         item.mainRisk.map(item01 => {
           if (item01.isMainRisk == '0') { //主险
             riskList.push(item01)
@@ -637,11 +659,23 @@ export default {
         riskCodeList.push(item.riskCode)
       })
       let sameRisk = isAllEqual(riskCodeList)
-      // 以主险为单位，一个主险，显示主险名称。 多个主险，显示“家庭综合保障计划”，跟被保人人数无关
+      // 一、单个被保险人
+      // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
+      // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
+      // 二、有多个被保险人
+      // 都显示“家庭保障计划”
       if(sameRisk){
-        title= riskList[0].riskName
+        if(this.pageShowInfo.insuredDTOs.length > 1){
+          title='家庭保障计划'
+        }else{
+          title= riskList[0].riskName
+        }
       }else{
-        title='家庭综合保障计划'
+        if(this.pageShowInfo.insuredDTOs.length > 1){
+          title='家庭保障计划'
+        }else{
+          title= '保险产品组合计划'
+        }
       }
       let res = await getSharingToken({ shareType: 'proposal_demonstrate' })
       if (res.result == '0') {
@@ -691,6 +725,32 @@ export default {
         this.pageShowInfo.appntDTO = res.content.orderDTO.appntDTO
         this.pageShowInfo.insuredDTOs = res.content.orderDTO.insuredDTOs
         this.pageShowInfo.showInsuredDTO = this.pageShowInfo.insuredDTOs[0]
+        let mainRiskNameList = []
+        that.pageShowInfo.insuredDTOs.forEach(item => {
+          item.riskDTOLst.forEach(item01 => {
+            if (item01.isMainRisk == '0') {
+              mainRiskNameList.push(item01.riskName)
+            }
+          })
+        })
+        // 一、单个被保险人
+        // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
+        // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
+        // 二、有多个被保险人
+        // 都显示“家庭保障计划”
+        if(mainRiskNameList.length == 1){
+          if (this.pageShowInfo.insuredDTOs.length > 1) {
+            that.mainRiskName = '家庭保障计划'
+          } else {
+            that.mainRiskName = mainRiskNameList[0]
+          }
+        }else{
+          if (this.pageShowInfo.insuredDTOs.length > 1) {
+            that.mainRiskName = '家庭保障计划'
+          } else {
+            that.mainRiskName = '保险产品组合计划'
+          }
+        }
         //投保人年龄
         // this.pageShowInfo.appntDTO.age = getAge.getAge(this.pageShowInfo.appntDTO.birthdayLabel, new Date())
         let { insuredLabelResult, insuredResult, insuredInfoResult } = res.content.calculusResDTO
@@ -880,7 +940,17 @@ export default {
     },
     //跳转到pdf 进入建议书后 根据建议书编码来查找相应的pdf
     async goPDF() {
-      this.$router.push({ path: '/proposal/pdf' })
+      if(this.$route.query.proposalOrderNo){
+        this.$router.push({
+          path: '/proposal/pdf',
+          query: {
+            proposalOrderNo:this.$route.query.proposalOrderNo
+          }
+        })
+      }else{
+        this.$router.push({ path: '/proposal/pdf' })
+      }
+
       // this.$jump({
       //   flag: 'h5',
       //   extra: {

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -241,6 +241,7 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
+import countCredentialValidity from '@/assets/js/utils/countCredentialValidity'
 import filter from '@/filters/index'
 import utilsAge from '@/assets/js/utils/age'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
@@ -640,6 +641,9 @@ export default {
             if (this.userInfo.idType == '1') {
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               this.effectiveDateTypeAble = age <= 45
+              if(this.userInfo.birthday){
+                this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,val)
+              }
             }
           }
           break
@@ -664,63 +668,9 @@ export default {
             if (this.userInfo.idType == '1') {
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-              console.log(age)
-              //年龄在16周岁以下
-              if (age < 16) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁以下的证件有效期为5年')
-                }
-              //年龄在16-21周岁之间
-              }else if (age >= 16 && age <= 21) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
-                }
-              //年龄在22-25周岁之间
-              }else if (age >= 22 && age <= 25) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('22周岁~25周岁的证件有效期为10年')
-                }
-              //年龄在26-35周岁之间
-              }else if (age >= 26 && age <= 35) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
-                }
-                //年龄在36-45周岁之间
-              } else if (age >= 36 && age <= 45) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('36周岁~45周岁的证件有效期为20年')
-                }
-                //年龄在46-65周岁之间
-              } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.effectiveDateType == false) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
-                }
-                //年龄在65周岁以上
-              } else if (age > 65) {
-                if (this.userInfo.effectiveDateType == false) { 
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('65周岁以上的证件有效期为长期')
-                }   
-              } 
-              //此外的年龄段不支持
-              // else {
-              //   this.userInfo.certiexpiredate = ''
-              //   this.$refs.certiexpiredate.date = ''
-              //   return this.$toast('身份证不支持此年龄段')
-              // }
+              if(this.userInfo.birthday){
+                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
+              }
             }
           }
           break
@@ -746,6 +696,13 @@ export default {
                 return this.$toast('出生证有效期或出生日期有误')
               }
             }
+            let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+            if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
+              this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,this.userInfo.certificateValidate)
+            }
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(age,this.userInfo.certiexpiredate)
+            }
           }
           break
       }
@@ -966,50 +923,36 @@ export default {
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁以下的证件有效期为5年')
             }
             //年龄在16-21周岁之间
           }else if (age >= 16 && age <= 21) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
             }
             //年龄在22-25周岁之间
           }else if (age >= 22 && age <= 25) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('22周岁~25周岁的证件有效期为10年')
             }
             //年龄在26-35周岁之间
           }else if (age >= 26 && age <= 35) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
             }
             //年龄在36-45周岁之间
           } else if (age >= 36 && age <= 45) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('36周岁~45周岁的证件有效期为20年')
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
             }
             //年龄在65周岁以上
           } else if (age > 65) {
             if (this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('65周岁以上的证件有效期为长期')
             }
           }
@@ -1312,7 +1255,7 @@ export default {
       let month = date.getMonth() + 1
       month = month.toString().padStart(2, '0')
       let day = date.getDate()
-      day = day.toString().padStart(2, '0')
+      day = Number(day.toString().padStart(2, '0')) + 1
       return `${year}-${month}-${day}`
     },
     getRelatedData(val, from) {
@@ -1347,6 +1290,14 @@ export default {
         }
         this.effectiveDateTypeAble = false
       }
+      //如果选择户口本
+      if (this.userInfo.idType == '2') {
+        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+        this.userInfo.certificateValidate = this.userInfo.birthday
+        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+        this.idLimit = true
+        //如果选择出生证明
+      }
     }
   },
   filters: {

src/views/ebiz/sale/AnswerTip.vue

@@ -131,13 +131,19 @@ export default {
     },
     // 获取签名状态
     getOrderDetail() {
-      openLoading()
       let that = this
       let data = {
         orderNo: that.$route.query.orderNo
       }
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       return new Promise((resolve) => {
         getOrderDetail1(data).then(res => {
+          this.$toast.clear()
           if (res.result == '0') {
             res.orderDTO.ebizSignDTOS.map(item => {
               if (item.signType == '0' || item.signType == '2') {

src/views/ebiz/sale/AvoidDutyTip.vue

@@ -2,7 +2,6 @@
   <div class="insuranceInformation-container pb50 redRadioCheckbox">
     <van-notice-bar :scrollable="false" v-if="!Time" class="notice">{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
     <iframe :src="src + pdfUrl" class="iframe"></iframe>
-
     <van-radio-group v-model="radio" class="pb10 pt20 pl30 fs14">
       <van-radio name="1" @click="click">
         本人确认已阅读
@@ -75,11 +74,7 @@ export default {
     [NoticeBar.name]: NoticeBar
   },
   mounted() {
-    let that = this
-    that.timeOut()
     document.body.style.backgroundColor = '#fff'
-  },
-  async created() {
     if (!this.isWeixin) {
       setTimeout(() => {
         // eslint-disable-next-line no-undef
@@ -98,53 +93,33 @@ export default {
     if (this.isWeixin) {
       that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
     }
-
     if (this.detailJump != '1') {
       // 投被保险人是否同人
       that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-      // 获取被保险人信息
-      // that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
     }
-    // if (this.detailJump != '1') {
-    //   this.getOrderDetail()
-    // }
     if (this.isWeixin) {
       let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
       let wxSigned = JSON.parse(sessionStorage.getItem('twowxSigned'))
-      // let wxSigned = false
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-      console.log('`````````````````````````````````')
-
-      console.log('imgBase64Data: twoimgBase64Data:' + imgBase64Data)
-      console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
-        console.log('第二次进入电子保单')
-        console.log('````````````````````````````````')
         this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
-          console.log('signInfo.status:' + signInfo.status)
           if (signInfo.status == '0') {
-            // this.appntSign.documentStatus = '3'
-            console.log('``````````````````')
             //因签字后微信端签字面板无法返回状态，导致签字状态不变，下一步按钮无法点击
             this.$set(this.appntSign, 'documentStatus', '3')
-            console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
             this.isSign = false
             this.isDisabledComplite = false
-            // this.isDisable = false
           } else {
             this.$set(this.insuredSign, 'documentStatus', '3')
-            // this.insuredSign.documentStatus = '3'
             this.isDisabledComplite = false
             this.isSign = false
           }
         })
       } else {
-        console.log('第一次进入电子保单')
         this.timeOut()
         this.getOrderDetail()
       }
@@ -154,6 +129,10 @@ export default {
         this.getOrderDetail()
       }
     }
+    this.timeOut()
+  },
+  created() {
+
   },
   methods: {
     appCallBack(data) {
@@ -209,6 +188,12 @@ export default {
       let data = {
         orderNo: that.$route.query.orderNo
       }
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       return new Promise((resolve, reject) => {
         getOrderDetail(data).then(res => {
           if (res.result == '0') {

src/views/ebiz/sale/DoubleRecordTip.vue

@@ -74,12 +74,11 @@ export default {
     [Dialog.name]: Dialog,
     [NoticeBar.name]: NoticeBar
   },
-  mounted() {
-    let that = this
-    that.timeOut()
-    document.body.style.backgroundColor = '#fff'
+  created() {
+
   },
-  async created() {
+  async mounted() {
+    document.body.style.backgroundColor = '#fff'
     if (!this.isWeixin) {
       setTimeout(() => {
         // eslint-disable-next-line no-undef
@@ -98,52 +97,32 @@ export default {
     if (this.isWeixin) {
       that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
     }
-
     if (this.detailJump != '1') {
       // 投被保险人是否同人
       that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-      // 获取被保险人信息
-      // that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
     }
-    // if (this.detailJump != '1') {
-    //   this.getOrderDetail()
-    // }
     if (this.isWeixin) {
       let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
       let wxSigned = JSON.parse(sessionStorage.getItem('twowxSigned'))
-      // let wxSigned = false
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-      console.log('`````````````````````````````````')
-
-      console.log('imgBase64Data: twoimgBase64Data:' + imgBase64Data)
-      console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
-        console.log('第二次进入电子保单')
-        console.log('````````````````````````````````')
         this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
-          console.log('signInfo.status:' + signInfo.status)
           if (signInfo.status == '0') {
-            // this.appntSign.documentStatus = '3'
-            console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
-            console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
             this.isSign = false
             this.isDisabledComplite = false
-            // this.isDisable = false
           } else {
             this.$set(this.insuredSign, 'documentStatus', '3')
-            // this.insuredSign.documentStatus = '3'
             this.isDisabledComplite = false
             this.isSign = false
           }
         })
       } else {
-        console.log('第一次进入电子保单')
         this.timeOut()
         this.getOrderDetail()
       }
@@ -153,6 +132,7 @@ export default {
         this.getOrderDetail()
       }
     }
+    this.timeOut()
   },
   methods: {
     appCallBack(data) {

src/views/ebiz/sale/InsuranceTip.vue

@@ -83,89 +83,70 @@ export default {
     [Dialog.name]: Dialog,
     [NoticeBar.name]: NoticeBar
   },
-  mounted() {
-    let that = this
-    that.timeOut()
-    document.body.style.backgroundColor = '#fff'
+  created() {
+
   },
-  async created() {
-     // 当前代理人渠道--个险渠道，中介渠道
+  async mounted() {
+    let that = this
+    document.body.style.backgroundColor = '#fff'
+    // 当前代理人渠道--个险渠道，中介渠道
     let dataReturn = await riskRules.getAgentInfoFunc(this)
     this.branchTypeVal = dataReturn.branchTypeVal
-    
-    if (!this.isWeixin) {
+
+    if (!that.isWeixin) {
       setTimeout(() => {
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('webview_left_button', {
-          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+          img: that.$assetsUrl + 'images/del-close-btn@3x.png',
           intercept: '1' //是否拦截原生返回事件 1是 其他否
         })
       }, 100)
-      window.appCallBack = this.appCallBack
+      window.appCallBack = that.appCallBack
     }
-    let that = this
     that.detailJump = window.localStorage.getItem('detailJump')
     that.signVal = window.localStorage.getItem('sign-val')
     // 获取投保人信息
-    that.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
-    if (this.isWeixin) {
-      that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
+    that.saleInsuredInfo = JSON.parse(that.$CacheUtils.getLocItem('saleInsuredInfo'))
+    if (that.isWeixin) {
+      that.relationToAppnt = JSON.parse(that.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
     }
 
-    if (this.detailJump != '1') {
+    if (that.detailJump != '1') {
       // 投被保险人是否同人
-      that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-      // 获取被保险人信息
-      // that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
+      that.relationToAppnt = JSON.parse(that.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
     }
-    // if (this.detailJump != '1') {
-    //   this.getOrderDetail()
-    // }
     if (this.isWeixin) {
       let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
       let wxSigned = JSON.parse(sessionStorage.getItem('twowxSigned'))
-      // let wxSigned = false
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-      console.log('`````````````````````````````````')
-
-      console.log('imgBase64Data: twoimgBase64Data:' + imgBase64Data)
-      console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
-        console.log('第二次进入电子保单')
-        console.log('````````````````````````````````')
-        this.getOrderDetail().then(() => {
-          this.Time = true
-          this.isOver = true
-          this.radio = '1'
-          this.base64 = imgBase64Data
-          this.isDisabledComplite = false
-          console.log('signInfo.status:' + signInfo.status)
+        that.getOrderDetail().then(() => {
+          that.Time = true
+          that.isOver = true
+          that.radio = '1'
+          that.base64 = imgBase64Data
+          that.isDisabledComplite = false
           if (signInfo.status == '0') {
-            // this.appntSign.documentStatus = '3'
-            console.log('``````````````````')
-            this.$set(this.appntSign, 'documentStatus', '3')
-            console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
-            this.isSign = false
-            this.isDisabledComplite = false
-            // this.isDisable = false
+            that.$set(that.appntSign, 'documentStatus', '3')
+            that.isSign = false
+            that.isDisabledComplite = false
           } else {
-            this.$set(this.insuredSign, 'documentStatus', '3')
-            // this.insuredSign.documentStatus = '3'
-            this.isDisabledComplite = false
-            this.isSign = false
+            that.$set(that.insuredSign, 'documentStatus', '3')
+            that.isDisabledComplite = false
+            that.isSign = false
           }
         })
       } else {
-        console.log('第一次进入电子保单')
-        this.timeOut()
-        this.getOrderDetail()
+        that.timeOut()
+        that.getOrderDetail()
       }
     } else {
-      this.timeOut()
-      if (this.detailJump != '1') {
-        this.getOrderDetail()
+      that.timeOut()
+      if (that.detailJump != '1') {
+        that.getOrderDetail()
       }
     }
+    that.timeOut()
   },
   methods: {
     appCallBack(data) {
@@ -221,8 +202,15 @@ export default {
       let data = {
         orderNo: that.$route.query.orderNo
       }
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       return new Promise((resolve, reject) => {
         getOrderDetail(data).then(res => {
+          this.$toast.clear()
           if (res.result == '0') {
             if(res.orderDTO.universalRiskNotifyDTO && res.orderDTO.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint){
               this.isUniversalRiskNotifyShowPoint = res.orderDTO.universalRiskNotifyDTO.isUniversalRiskNotifyShowPoint

src/views/ebiz/sale/InsuredInfo.vue

@@ -388,6 +388,7 @@ import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
+import countCredentialValidity from '@/assets/js/utils/countCredentialValidity'
 import areaLists from '@/assets/js/utils/areaNewForSale'
 import { saveOrUpdateOrderInfo, getAuthCode, getOrderDetail, getCompany } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
@@ -858,20 +859,14 @@ export default {
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
+              if(this.userInfo.birthday){
+                this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,val)
+              }
             }
           }
           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())) {
@@ -881,65 +876,10 @@ export default {
             }
             //身份证证件类型的判断
             if (this.userInfo.idType == '1') {
-              //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-              console.log(age)
-              //年龄在16周岁以下
-              if (age < 16) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁以下的证件有效期为5年')
-                }
-              //年龄在16-21周岁之间
-              }else if (age >= 16 && age <= 21) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
-                }
-              //年龄在22-25周岁之间
-              }else if (age >= 22 && age <= 25) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('22周岁~25周岁的证件有效期为10年')
-                }
-              //年龄在26-35周岁之间
-              }else if (age >= 26 && age <= 35) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
-                }
-                //年龄在36-45周岁之间
-              } else if (age >= 36 && age <= 45) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('36周岁~45周岁的证件有效期为20年')
-                }
-                //年龄在46-65周岁之间
-              } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
-                }
-                //年龄在65周岁以上
-              } else if (age > 65) {
-                if (this.userInfo.effectiveDateType == false) { 
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('65周岁以上的证件有效期为长期')
-                }   
-              } 
-              //此外的年龄段不支持
-              // else {
-              //   this.userInfo.certiexpiredate = ''
-              //   this.$refs.certiexpiredate.date = ''
-              //   return this.$toast('身份证不支持此年龄段')
-              // }
+              if(this.userInfo.birthday){
+                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
+              }
             }
           }
           break
@@ -961,6 +901,12 @@ export default {
             if (age < 18) {
               this.userInfo.workcompany = this.userInfo.workcompany || '无'
             }
+            if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
+              this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,this.userInfo.certificateValidate)
+            }
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(age,this.userInfo.certiexpiredate)
+            }
           }
           break
       }
@@ -1054,32 +1000,9 @@ export default {
 
         //如果证件类型是身份证
         if (this.userInfo.idType == '1') {
-          console.log('证件类型是身份证')
-
           if (this.userInfo.nativeplace != '1') {
             return this.$toast('证件类型”为“身份证，国籍必须为中国哦')
           }
-
-          //校验性别是否与身份证号码位相符
-          // if (this.userInfo.idNo.length == '15') {
-          //   //15位身份证第15位是性别位, 奇男偶女
-          //   let sexSign = this.userInfo.idNo.substr(14, 1)
-          //   console.log('性别位' + sexSign)
-          //   if ((parseInt(sexSign) % 2 == 0 && this.userInfo.sex != 1) || (parseInt(sexSign) % 2 != 0 && this.userInfo.sex != 0)) {
-          //     return this.$toast('性别录入与身份证不符')
-          //   }
-
-          //   //15位身份证第7-12位是生日位, 年月日
-          //   let birthSign = this.userInfo.idNo.substr(6, 6)
-          //   console.log('生日位' + birthSign)
-          //   if (
-          //     this.userInfo.birthday.substr(2, 2) != birthSign.substr(0, 2) ||
-          //     this.userInfo.birthday.substr(5, 2) != birthSign.substr(2, 2) ||
-          //     this.userInfo.birthday.substr(8, 2) != birthSign.substr(4, 2)
-          //   ) {
-          //     return this.$toast('生日录入与身份证不符')
-          //   }
-          // } else
           if (this.userInfo.idNo.length == '18') {
             //18位身份证第17位是性别位, 奇男偶女
             let sexSign = this.userInfo.idNo.substr(16, 1)
@@ -1119,71 +1042,39 @@ export default {
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁以下的证件有效期为5年')
             }
           //年龄在16-21周岁之间
           }else if (age >= 16 && age <= 21) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
             }
           //年龄在22-25周岁之间
           }else if (age >= 22 && age <= 25) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('22周岁~25周岁的证件有效期为10年')
             }
           //年龄在26-35周岁之间
           }else if (age >= 26 && age <= 35) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
             }
             //年龄在36-45周岁之间
           } else if (age >= 36 && age <= 45) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('36周岁~45周岁的证件有效期为20年')
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
             }
             //年龄在65周岁以上
           } else if (age > 65) {
-            if (this.userInfo.effectiveDateType == false) { 
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
+            if (this.userInfo.effectiveDateType == false) {
               return this.$toast('65周岁以上的证件有效期为长期')
             }   
-          } 
-              
-          // 年龄在 16-25 周岁之间
-          // if (age >= 16 && age <= 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) {
-          //   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年')
-          //   }
-          // }
+          }
           //证件类型是户口本
         } else if (this.userInfo.idType == '2') {
           if (age > 16) {

src/views/ebiz/sale/InsuredPerson.vue

@@ -452,6 +452,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
 import areaLists from '@/assets/js/utils/areaNewForSale'
+import countCredentialValidity from '@/assets/js/utils/countCredentialValidity'
 import { saveOrUpdateOrderInfo, getAuthCode, getOrderDetail } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
@@ -1062,6 +1063,9 @@ export default {
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
+              if(this.userInfo.birthday){
+                this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,val)
+              }
             }
           }
           break
@@ -1088,62 +1092,9 @@ export default {
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               console.log(age)
-              //年龄在16周岁以下
-              if (age < 16) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁以下的证件有效期为5年')
-                }
-              //年龄在16-21周岁之间
-              }else if (age >= 16 && age <= 21) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
-                }
-              //年龄在22-25周岁之间
-              }else if (age >= 22 && age <= 25) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('22周岁~25周岁的证件有效期为10年')
-                }
-              //年龄在26-35周岁之间
-              }else if (age >= 26 && age <= 35) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
-                }
-                //年龄在36-45周岁之间
-              } else if (age >= 36 && age <= 45) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('36周岁~45周岁的证件有效期为20年')
-                }
-                //年龄在46-65周岁之间
-              } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
-                }
-                //年龄在65周岁以上
-              } else if (age > 65) {
-                if (this.userInfo.effectiveDateType == false) { 
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('65周岁以上的证件有效期为长期')
-                }   
-              } 
-              //此外的年龄段不支持
-              // else {
-              //   this.userInfo.certiexpiredate = ''
-              //   this.$refs.certiexpiredate.date = ''
-              //   return this.$toast('身份证不支持此年龄段')
-              // }
+              if(this.userInfo.birthday){
+                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
+              }
             }
           }
           break
@@ -1170,24 +1121,14 @@ export default {
                 this.userInfo.otherSalarySource = '无'
                 this.userInfo.averageAnnualIncome = '0'
                 this.userInfo.liabilitiesMoney = '0'
-                // this.userInfo.jobStatus = '3'
-                // this.userInfo.marriage = '2'
-              } else {
-                // this.userInfo.salarySource = ''
-                // this.userInfo.averageAnnualIncome = ''
-                // this.userInfo.liabilitiesMoney = ''
-                // this.userInfo.jobStatus = ''
-                // this.userInfo.marriage = ''
               }
             }
-            //出生证有效期
-            // if (this.userInfo.idType == '3') {
-            //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(val) > Date.parse('1973-01-01')) {
-            //     this.userInfo.birthday = ''
-            //     this.$refs.birthday.date = ''
-            //     return this.$toast('出生证有效期或出生日期有误')
-            //   }
-            // }
+            if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
+              this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,this.userInfo.certificateValidate)
+            }
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(age,this.userInfo.certiexpiredate)
+            }
           }
           break
       }
@@ -1477,53 +1418,39 @@ export default {
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁以下的证件有效期为5年')
             }
           //年龄在16-21周岁之间
           }else if (age >= 16 && age <= 21) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
             }
           //年龄在22-25周岁之间
           }else if (age >= 22 && age <= 25) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('22周岁~25周岁的证件有效期为10年')
             }
           //年龄在26-35周岁之间
           }else if (age >= 26 && age <= 35) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
             }
             //年龄在36-45周岁之间
           } else if (age >= 36 && age <= 45) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('36周岁~45周岁的证件有效期为20年')
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
             }
             //年龄在65周岁以上
           } else if (age > 65) {
-            if (this.userInfo.effectiveDateType == false) { 
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
+            if (this.userInfo.effectiveDateType == false) {
               return this.$toast('65周岁以上的证件有效期为长期')
             }   
-          } 
+          }
           //年龄在0-15周岁之间
           // if (age <= 15) {
           //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
@@ -1910,7 +1837,7 @@ export default {
       let month = date.getMonth() + 1
       month = month.toString().padStart(2, '0')
       let day = date.getDate()
-      day = day.toString().padStart(2, '0')
+      day = Number(day.toString().padStart(2, '0')) + 1
       return `${year}-${month}-${day}`
     },
     //地区选择
@@ -1958,7 +1885,6 @@ export default {
       }
     },
     getRelatedData(val, from) {
-      // debugger
       if (this.userInfo.idType != '1' && this.userInfo.idType != '2') {
         return
       }
@@ -2008,36 +1934,27 @@ export default {
           this.userInfo.otherSalarySource = '无'
           this.userInfo.averageAnnualIncome = '0'
           this.userInfo.liabilitiesMoney = '0'
-          // this.userInfo.jobStatus = '3'
-          // this.userInfo.marriage = '2'
         } else {
           this.userInfo.salarySource = ''
           this.userInfo.averageAnnualIncome = ''
           this.userInfo.liabilitiesMoney = ''
-          // this.userInfo.jobStatus = ''
-          // this.userInfo.marriage = ''
         }
       }
       if (idToData(val).age > 45) {
-        // this.idLimit = true
-        // this.isRequired = false
         if (from) {
           this.userInfo.effectiveDateType = true
         }
         this.effectiveDateTypeAble = false
-      } else {
-        // this.idLimit = false
-        // this.isRequired = true
-        // this.userInfo.effectiveDateType = false
       }
       //如果选择户口本
-      // if (this.userInfo.idType == '2') {
-      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
-      //   this.userInfo.certificateValidate = this.userInfo.birthday
-      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-      //   this.idLimit = true
-      //   //如果选择出生证明
-      // } else if (this.userInfo.idType == '3') {
+      if (this.userInfo.idType == '2') {
+        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+        this.userInfo.certificateValidate = this.userInfo.birthday
+        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+        this.idLimit = true
+        //如果选择出生证明
+      }
+      // else if (this.userInfo.idType == '3') {
       //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1972-12-31')
       //   this.userInfo.certificateValidate = this.userInfo.birthday
       //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)

src/views/ebiz/sale/List.vue

@@ -13,16 +13,7 @@
       </van-tabs>
     </van-sticky>
 
-    <van-list
-      v-model="loading"
-      :immediate-check="false"
-      :finished="finished"
-      :finished-text="finishedText"
-      error-text="请求失败，点击重新加载"
-      :error.sync="error"
-      @load="loadMore"
-      class="pb45"
-    >
+    <van-list v-model="loading" :immediate-check="false" :finished="finished" :finished-text="finishedText" error-text="请求失败，点击重新加载" :error.sync="error" @load="loadMore" class="pb45">
       <div v-if="isSuccess">
         <div v-if="saleList.length > 0">
           <div v-for="(order, index) in saleList" :key="index">
@@ -83,57 +74,38 @@
               </div>
 
               <div class="text-right mt15 ">
-                <van-button v-if="active == 'uncommit'" round @click="goDetail(order)" size="small" class="mr5" type="danger" v-no-more-click="1000"
-                  >编辑</van-button
-                >
-                <van-button
-                  v-if="active == 'uncommit'"
-                  plain
-                  round
-                  @click.stop="del(order, index)"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  v-no-more-click="1000"
-                  >删除</van-button
-                >
-                <van-button
-                  @click="againPay(order)"
-                  v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '19'"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >重新支付</van-button
-                >
-                <van-button
-                  @click="changeCard(order)"
-                  v-if="(active == 'commit' && order.orderInfoDTO.orderStatus == '48') || (active == 'commit' && order.orderInfoDTO.orderStatus == '49')"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >修改卡号</van-button
-                >
+                <van-button v-if="active == 'uncommit'" round @click="goDetail(order)" size="small" class="mr5" type="danger" v-no-more-click="1000">
+                  编辑
+                </van-button>
+                <van-button v-if="active == 'uncommit'" plain round @click.stop="del(order, index)" size="small" class="mr5" type="danger" v-no-more-click="1000">
+                  删除
+                </van-button>
+                <van-button @click="againPay(order)" v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '19'" size="small" class="mr5" type="danger" round>
+                  重新支付
+                </van-button>
+                <van-button @click="changeCard(order)" v-if="(active == 'commit' && order.orderInfoDTO.orderStatus == '48') || (active == 'commit' && order.orderInfoDTO.orderStatus == '49')" size="small" class="mr5" type="danger" round>
+                  修改卡号
+                </van-button>
                 <template v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '55'">
-                  <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>修改卡号</van-button>
-                  <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>重新支付</van-button>
+                  <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>
+                    修改卡号
+                  </van-button>
+                  <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>
+                    重新支付
+                  </van-button>
                 </template>
                 <template v-if="active == 'commit' && (order.orderInfoDTO.orderStatus == '02' || order.orderInfoDTO.orderStatus == '58')">
-                  <van-button @click="goPay(order)" size="small" class="mr5" type="danger" round>去支付</van-button>
+                  <van-button @click="goPay(order)" size="small" class="mr5" type="danger" round>
+                    去支付
+                  </van-button>
                 </template>
                 <!-- doubleFlag 1-否  0-是，doubleFlag为0双录时，canRevokeDouble加 orderStatus 16 -->
-                <van-button
-                  @click="revokeOrder(order)"
-                  v-if="active == 'commit' && ((canRevoke[order.orderInfoDTO.orderStatus] && (order.orderInfoDTO.doubleFlag == '1' || order.orderInfoDTO.doubleFlag == null || order.orderInfoDTO.doubleFlag == ''))
-                  || (canRevokeDouble[order.orderInfoDTO.orderStatus] && order.orderInfoDTO.doubleFlag == '0'))"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >撤单</van-button
-                >
-                <van-button @click="seePolicy(order)" v-if="active == 'commit'" size="small" type="danger" round>查看投保单</van-button>
+                <van-button @click="revokeOrder(order)" v-if="active == 'commit' && ((canRevoke[order.orderInfoDTO.orderStatus] && (order.orderInfoDTO.doubleFlag == '1' || order.orderInfoDTO.doubleFlag == null || order.orderInfoDTO.doubleFlag == ''))|| (canRevokeDouble[order.orderInfoDTO.orderStatus] && order.orderInfoDTO.doubleFlag == '0'))" size="small" class="mr5" type="danger" round>
+                  撤单
+                </van-button>
+                <van-button @click="seePolicy(order)" v-if="active == 'commit'" size="small" type="danger" round>
+                  查看投保单
+                </van-button>
               </div>
             </div>
           </div>
@@ -147,16 +119,7 @@
     </van-list>
 
     <van-button type="danger" class="bottom-btn" @click="add" v-no-more-click="1000">点我新增</van-button>
-    <van-dialog
-      class="dialog-delete"
-      @confirm="checkCaptchaCode"
-      @cancel="cancelCaptchaCode"
-      :before-close="beforeClose"
-      confirm-button-color="#fff"
-      v-model="revokePanelShow"
-      title="短信验证"
-      show-cancel-button
-    >
+    <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>
@@ -538,44 +501,6 @@ export default {
       }else if(orderStatus == '63'){//风险测评保存成功, 跳到账户信息--
         url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
       }
-      // switch (orderStatus) {
-      //   case '01': //已签名待客户确认, 跳到签名确认页面
-      //     url = '/sale/SignatureConfirmation?edit=1'
-      //     break
-      //   case '43': //未签名待客户确认, 跳到签名确认页面
-      //     url = '/sale/SignatureConfirmation?edit=1'
-      //     break
-      //   case '35': //投保人保存成功, 跳到被保险人页面--
-      //     url = '/sale/insuredPerson?edit=1'
-      //     break
-      //   case '36': //被保险人保存成功, 跳到已选产品列表
-      //     url = '/common/selectedProduct?edit=1'
-      //     break
-      //   case '37': //受益人保存成功, 跳到告知信息--
-      //     url = '/sale/NotifyingMessage?edit=1'
-      //     break
-      //   case '38': //账户信息保存成功, 跳到附件管理--
-      //     url = '/sale/AttachmentManagement?edit=1'
-      //     break
-      //   case '39': //险种信息保存成功, 跳到已选产品列表
-      //     url = '/common/selectedProduct?edit=1'
-      //     break
-      //   case '40': //告知信息保存成功, 跳到风险测评--
-      //      url = '/sale/answerPage?edit=1'
-      //     break
-      //   case '': //跳到投保人
-      //     url = '/sale/insuredInfo?edit=1'
-      //     break
-      //   case '44': //建议书转投保, 跳到投保人
-      //     url = '/sale/insuredInfo?edit=1'
-      //     break
-      //   case '62': //风险测评保存成功, 跳到账户信息--
-      //     //  url = '/sale/AccountInformation?edit=1'
-      //      url = '/sale/answerSuccess?edit=1'
-      //     break
-      //   default:
-      //     break
-      // }
       this.$jump({
         flag: 'h5',
         extra: {

src/views/ebiz/sale/PersonalInformation.vue

@@ -56,9 +56,10 @@ export default {
     [NoticeBar.name]: NoticeBar
   },
   created() {
-    this.init()
+
   },
-  mounted() {
+  async mounted() {
+    await this.init()
     let readingType = localStorage.getItem('readingProtocolType')
     if (readingType && readingType === '1') {
       this.protocol = true
@@ -86,7 +87,7 @@ export default {
     }
   },
   methods: {
-    async init(){
+    init(){
       this.getOrderDetail()
     },
     timeOut() {
@@ -110,11 +111,18 @@ export default {
     // 获取PDF的路径
     getOrderDetail() {
       let that = this
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       let data = {
         orderNo: that.$route.query.orderNo
       }
       return new Promise((resolve, reject) => {
         getOrderDetail(data).then(res => {
+          this.$toast.clear()
           if (res.result == '0') {
             res.orderDTO.ebizSignDTOS.map(item => {
               if (item.documentCode == '12') {

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -7,8 +7,8 @@
       <div v-if="isWeixin" class="bg-white mt10 p20 fs14 tips">
         <p>
           尊敬的
-          <span>{{ tipsName }}</span
-          >先生/女士，您好！
+          <span>{{ tipsName }}</span>
+          先生/女士，您好！
         </p>
         <p>该保单由国富人寿保险股份有限公司进行承保，具体确认信息如下：</p>
       </div>
@@ -47,16 +47,9 @@
             </div>
             <p class="start" v-if="airSign != '1'">点击【开始】，进行相关操作</p>
             <div v-if="!isInvalid" class="flex justify-content-a mt20">
-              <van-button
-                      type="danger"
-                      size="normal"
-                      class="w150"
-                      plain
-                      :disabled="changeCard ? agentSign.documentStatus == '1' : agentSignStatus == '3'"
-                      v-no-more-click="1000"
-                      @click="start_agent('3')"
-              >开始</van-button
-              >
+              <van-button type="danger" size="normal" class="w150" plain :disabled="changeCard ? agentSign.documentStatus == '1' : agentSignStatus == '3'" v-no-more-click="1000" @click="start_agent('3')">
+                开始
+              </van-button>
             </div>
             <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
           </van-collapse-item>
@@ -89,28 +82,13 @@
             </div>
             <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
             <div v-if="!isInvalid" class="flex justify-content-a mt20">
-              <van-button
-                v-if="isShow"
-                type="danger"
-                size="normal"
-                class="w150"
-                plain
-                v-no-more-click="1000"
-                :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
-                @click="share(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')"
-                >分享</van-button
-              >
+              <van-button v-if="isShow" type="danger" size="normal" class="w150" plain v-no-more-click="1000" :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" @click="share(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')">
+                分享
+              </van-button>
               <!-- 前端测试 -->
-              <van-button
-                type="danger"
-                size="normal"
-                class="w150"
-                plain
-                :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
-                v-no-more-click="1000"
-                @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')"
-                >开始</van-button
-              >
+              <van-button type="danger" size="normal" class="w150" plain :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" v-no-more-click="1000" @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')">
+                开始
+              </van-button>
             </div>
             <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
           </van-collapse-item>
@@ -134,20 +112,12 @@
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
               <div v-if="!isInvalid" class="flex justify-content-a mt20">
-                <van-button
-                  v-if="isShow"
-                  type="danger"
-                  size="normal"
-                  class="w150"
-                  :disabled="insuredSignStatus == '3'"
-                  @click="share('1')"
-                  plain
-                  v-no-more-click="1000"
-                  >分享</van-button
-                >
-                <van-button type="danger" size="normal" plain class="w150" :disabled="insuredSignStatus == '3'" @click="start_ocr('1')" v-no-more-click="1000"
-                  >开始</van-button
-                >
+                <van-button v-if="isShow" type="danger" size="normal" class="w150" :disabled="insuredSignStatus == '3'" @click="share('1')" plain v-no-more-click="1000">
+                  分享
+                </van-button>
+                <van-button type="danger" size="normal" plain class="w150" :disabled="insuredSignStatus == '3'" @click="start_ocr('1')" v-no-more-click="1000">
+                  开始
+                </van-button>
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -183,16 +153,9 @@
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
               <div v-if="!isInvalid" class="flex justify-content-a mt20">
-                <van-button
-                  type="danger"
-                  size="normal"
-                  style="width: 157px"
-                  plain
-                  :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
-                  v-no-more-click="1000"
-                  @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')"
-                  >开始</van-button
-                >
+                <van-button type="danger" size="normal" style="width: 157px" plain :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" v-no-more-click="1000" @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')">
+                  开始
+                </van-button>
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -216,16 +179,9 @@
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
               <div v-if="!isInvalid" class="flex justify-content-a mt20">
-                <van-button
-                  type="danger"
-                  size="normal"
-                  plain
-                  style="width: 157px"
-                  :disabled="insuredSignStatus == '3'"
-                  @click="start_ocr('1')"
-                  v-no-more-click="1000"
-                  >开始</van-button
-                >
+                <van-button type="danger" size="normal" plain style="width: 157px" :disabled="insuredSignStatus == '3'" @click="start_ocr('1')" v-no-more-click="1000">
+                  开始
+                </van-button>
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -236,27 +192,17 @@
     <div v-if="!isWeixin">
       <div v-if="changeCard">
         <div class="bottom-btn bg-white" v-if="appntSign.documentStatus == '1'">
-          <van-button
-            type="danger"
-            v-if="relationToAppnt == '1' ? true : appntSign.documentStatus == '1' ? true : false"
-            size="large"
-            @click="rePayMent"
-            v-no-more-click="1000"
-            >支付</van-button
-          >
+          <van-button type="danger" v-if="relationToAppnt == '1' ? true : appntSign.documentStatus == '1' ? true : false" size="large" @click="rePayMent" v-no-more-click="1000">
+            支付
+          </van-button>
         </div>
       </div>
       <div v-else>
         <!--判断代理人自保件承诺书是否签名  或者不是自保件 投保人是否都签名-->
         <div class="bottom-btn bg-white" v-if="(agentSignStatus == '3'&& appntSignStatus == '3')||(agentSignStatus == ''&& appntSignStatus == '3')">
-          <van-button
-            type="danger"
-            v-if="relationToAppnt == '1' ? true : insuredSignStatus == '3' ? true : false"
-            size="large"
-            @click="next"
-            v-no-more-click="1000"
-            >提交</van-button
-          >
+          <van-button type="danger" v-if="relationToAppnt == '1' ? true : insuredSignStatus == '3' ? true : false" size="large" @click="next" v-no-more-click="1000">
+            提交
+          </van-button>
         </div>
       </div>
     </div>
@@ -264,13 +210,7 @@
       <!-- <video controls style="width: 100%; max-height: calc(100vh - 60px)" src="/app/video/rlsb.mp4"></video> -->
       <div class="" v-if="videoShow" style="height: calc(100vh - 60px); display: flex; align-items: center; flex-flow: column; justify-content: center">
         <!-- <van-notice-bar :scrollable="false" class="notice" style="width: 100%">为维护您的合法权益，请您务必观看防范销售误导视频。</van-notice-bar> -->
-        <video
-          controls
-          style="width: 100%; max-height: calc(100vh - 60px)"
-          :src="'https://gf-dev-202005-1254138932.cos.ap-shanghai-fsi.myqcloud.com/gfapp/pub01/2021/04/28/guofulive.MP4'"
-          ref="vid"
-          @timeupdate="timeupdate"
-        ></video>
+        <video controls style="width: 100%; max-height: calc(100vh - 60px)" :src="'https://gf-dev-202005-1254138932.cos.ap-shanghai-fsi.myqcloud.com/gfapp/pub01/2021/04/28/guofulive.MP4'" ref="vid" @timeupdate="timeupdate"></video>
       </div>
       <div class="bottom-btn bg-white">
         <van-button type="danger" size="large" @click="isVideoUrlClick()" v-no-more-click="1000">下一步</van-button>
@@ -286,18 +226,10 @@
         }}</van-button>
       </van-cell-group>
     </van-dialog>
-    <!-- <UploadImageFile
-      :typeface="idcardData.typeface && faceAuthCount.weixin < smsAuthNum"
-      :realName="idcardData.idcardName"
-      :idno="idcardData.idcardNumber"
-      @sendimage="sendimage"
-    >
-    </UploadImageFile> -->
   </div>
 </template>
 
 <script>
-// import UploadImageFile from '@/components/ebiz/sale/UploadImageFile'
 import { Field, Cell, CellGroup, Collapse, CollapseItem, Dialog, NoticeBar } from 'vant'
 import {
   underWrite,
@@ -412,171 +344,170 @@ export default {
     }
   },
   methods: {
-  timeupdate() {
-    console.log(this.$refs['vid'].paused)
-    if (!this.$refs['vid'].paused) {
-      this.isVideoNext = true
-    }
-  },
-  fakeFaceAuth(expect) {
-    console.log('模拟调用人脸识别')
-    return new Promise(function (resolve, reject) {
-      setTimeout(() => {
-        console.log('模拟人脸识别完成')
-        if (expect) {
-          resolve({ state: '0' })
-        } else {
-          reject({ state: '0' })
-        }
-      }, 2000)
-    })
-  },
-  appCallBack(data) {
-    if (data.trigger == 'left_button_click') {
-      if (this.videoShow) {
-        this.$jump({
-          flag: 'navigation',
-          extra: {
-            title: '签名确认',
-            hiddenRight: '1'
-          }
-        })
-        return (this.videoShow = false)
-      }
-      return this.$dialog
-        .confirm({
-          className: 'dialog-delete',
-          title: '提示',
-          message: '退出流程可能会丢失部分数据，是否确认退出？',
-          cancelButtonColor: '#E9332E',
-          confirmButtonColor: '#FFFFFF'
-        })
-        .then(() => {
-          this.$jump({
-            flag: 'h5',
-            extra: {
-              title: '电子投保单列表',
-              forbidSwipeBack: 1, //当前页面禁止右滑返回
-              url: location.origin + `/#/sale/list`
-            },
-            routerInfo: {
-              path: `/sale/list`,
-              type: '1'
-            }
-          })
-        })
-        .catch(() => {
-          return
-        })
-    }
-  },
-  isVideoUrlClick() {
-    console.log(this.isVideoUrl)
-    if (!this.isVideoNext) {
-      this.$dialog
-        .alert({
-          className: 'dialog-alert',
-          title: '提示',
-          message: '为维护您的合法权益，请您务必认真观看防范销售误导视频。',
-          confirmButtonColor: '#ee0a24',
-          confirmButtonText: '确认'
-        })
-        .then(() => {})
-    } else {
-      this.isVideoNext = !this.isVideoNext
-      this.isVideoUrl == 'goUrl' ? this.goUrl() : this.insuredUrl()
-    }
-  },
-  // 初始化
-  async init() {
-    localStorage.doubleRecordFlag = '0' //0不是双录单 1是双录单
-    if (this.isWeixin) {
-      if (this.$route.query.airSign) {
-        sessionStorage.setItem('airSign', this.$route.query.airSign)
-      }
-      // this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
-      // window.localStorage.setItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
-      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)
-      if (this.$route.query.changeCard == '0') {
-        localStorage.setItem('changeCard', true)
-      } else {
-        localStorage.removeItem('changeCard')
-      }
-      if (this.$route.query.signInvalid) {
-        sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
-      }
-      if (this.$route.query.shareCode) {
-        sessionStorage.setItem('shareCode', this.$route.query.shareCode)
-      }
-      let signInvalid = sessionStorage.getItem('signInvalid')
-      let rs = await this.checkSignInvalid(signInvalid)
-      console.log('````````````')
-      console.log('rs: ' + rs)
-      if (rs == '1') {
-        this.isInvalid = false
-      } else {
-        this.isInvalid = true
-      }
-      this.airSign = sessionStorage.getItem('airSign')
-      this.shareCode = sessionStorage.getItem('shareCode')
-      this.changeCard = localStorage.getItem('changeCard')
-      this.relationToAppnt = this.$route.query.relationToAppnt
-      this.isShow = false
-      await this.getOrderDetail()
-
-        console.log('初始化this.appntSign ==', this.appntSign)
-        if (
-          (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '0') ||
-          (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '2')
-        ) {
-          // this.$toast('签名成功，请联系业务员进行后续流程！')
-          Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
-        } else if (this.insuredSignStatus == '3' && sessionStorage.getItem('shareCode') == '1') {
-          Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
-        }
-        if (this.changeCard && this.appntSign.documentStatus == '1') {
-          Dialog.alert({ title: '提示', message: '确认完成，请联系业务员完成后续流程！' })
-        }
-        // 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']))
-        }
-
-        if (sessionStorage.shareCode == '1') {
-          console.log('进来被保险人')
-          this.tipsName = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).name
-        } else if(sessionStorage.shareCode == '3'){
-          console.log('进来代理人')
-          this.tipsName =this.recmd.name
-        }else {
-          console.log('进来投保人')
-          this.tipsName = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).name
-          // console.log('localStorage.saleInsuredInfo', localStorage.saleInsuredInfo)
-          // console.log('localStorage.saleInsuredInfo.name', localStorage.saleInsuredInfo.name)
-          // console.log('this.tipName', this.tipsName)
-        }
-        weixinShare({
-          title: '国富人寿计划书',
-          imgUrl: 'http://47.96.143.111:8000/app/images/logo.png',
-          desc: '国富为您量身定制的保险产品，请查收'
-        })
-        // let params = {
-        //   orderNo: ''
-        // }
-        this.faceAuthCount.appnt = this.$route.query.faceAuthCountAppnt == undefined ? 0 : Number(this.$route.query.faceAuthCountAppnt)
-        this.faceAuthCount.insured = this.$route.query.faceAuthCountInsured == undefined ? 0 : Number(this.$route.query.faceAuthCountInsured)
-        this.faceAuthCount.weixin = this.$route.query.faceAuthCountWeixin == undefined ? 0 : Number(this.$route.query.faceAuthCountWeixin)
-      } else {
-        // 获取详情消息
-
-        this.getOrderDetail()
-        this.getSignInvalid()
-        this.isShow = true
+    timeupdate() {
+      console.log(this.$refs['vid'].paused)
+      if (!this.$refs['vid'].paused) {
+        this.isVideoNext = true
       }
     },
+    fakeFaceAuth(expect) {
+      console.log('模拟调用人脸识别')
+      return new Promise(function (resolve, reject) {
+        setTimeout(() => {
+          console.log('模拟人脸识别完成')
+          if (expect) {
+            resolve({ state: '0' })
+          } else {
+            reject({ state: '0' })
+          }
+        }, 2000)
+      })
+    },
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        if (this.videoShow) {
+          this.$jump({
+            flag: 'navigation',
+            extra: {
+              title: '签名确认',
+              hiddenRight: '1'
+            }
+          })
+          return (this.videoShow = false)
+        }
+        return this.$dialog
+          .confirm({
+            className: 'dialog-delete',
+            title: '提示',
+            message: '退出流程可能会丢失部分数据，是否确认退出？',
+            cancelButtonColor: '#E9332E',
+            confirmButtonColor: '#FFFFFF'
+          })
+          .then(() => {
+            this.$jump({
+              flag: 'h5',
+              extra: {
+                title: '电子投保单列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
+                url: location.origin + `/#/sale/list`
+              },
+              routerInfo: {
+                path: `/sale/list`,
+                type: '1'
+              }
+            })
+          })
+          .catch(() => {
+            return
+          })
+      }
+    },
+    isVideoUrlClick() {
+      console.log(this.isVideoUrl)
+      if (!this.isVideoNext) {
+        this.$dialog
+          .alert({
+            className: 'dialog-alert',
+            title: '提示',
+            message: '为维护您的合法权益，请您务必认真观看防范销售误导视频。',
+            confirmButtonColor: '#ee0a24',
+            confirmButtonText: '确认'
+          })
+          .then(() => {})
+      } else {
+        this.isVideoNext = !this.isVideoNext
+        this.isVideoUrl == 'goUrl' ? this.goUrl() : this.insuredUrl()
+      }
+    },
+    // 初始化
+    async init() {
+      localStorage.doubleRecordFlag = '0' //0不是双录单 1是双录单
+      if (this.isWeixin) {
+        if (this.$route.query.airSign) {
+          sessionStorage.setItem('airSign', this.$route.query.airSign)
+        }
+        // this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
+        // window.localStorage.setItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
+        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)
+        if (this.$route.query.changeCard == '0') {
+          localStorage.setItem('changeCard', true)
+        } else {
+          localStorage.removeItem('changeCard')
+        }
+        if (this.$route.query.signInvalid) {
+          sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
+        }
+        if (this.$route.query.shareCode) {
+          sessionStorage.setItem('shareCode', this.$route.query.shareCode)
+        }
+        let signInvalid = sessionStorage.getItem('signInvalid')
+        let rs = await this.checkSignInvalid(signInvalid)
+        console.log('````````````')
+        console.log('rs: ' + rs)
+        if (rs == '1') {
+          this.isInvalid = false
+        } else {
+          this.isInvalid = true
+        }
+        this.airSign = sessionStorage.getItem('airSign')
+        this.shareCode = sessionStorage.getItem('shareCode')
+        this.changeCard = localStorage.getItem('changeCard')
+        this.relationToAppnt = this.$route.query.relationToAppnt
+        this.isShow = false
+        await this.getOrderDetail()
+          console.log('初始化this.appntSign ==', this.appntSign)
+          if (
+            (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '0') ||
+            (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '2')
+          ) {
+            // this.$toast('签名成功，请联系业务员进行后续流程！')
+            Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
+          } else if (this.insuredSignStatus == '3' && sessionStorage.getItem('shareCode') == '1') {
+            Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' })
+          }
+          if (this.changeCard && this.appntSign.documentStatus == '1') {
+            Dialog.alert({ title: '提示', message: '确认完成，请联系业务员完成后续流程！' })
+          }
+          // 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']))
+          }
+
+          if (sessionStorage.shareCode == '1') {
+            console.log('进来被保险人')
+            this.tipsName = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).name
+          } else if(sessionStorage.shareCode == '3'){
+            console.log('进来代理人')
+            this.tipsName =this.recmd.name
+          }else {
+            console.log('进来投保人')
+            this.tipsName = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).name
+            // console.log('localStorage.saleInsuredInfo', localStorage.saleInsuredInfo)
+            // console.log('localStorage.saleInsuredInfo.name', localStorage.saleInsuredInfo.name)
+            // console.log('this.tipName', this.tipsName)
+          }
+          weixinShare({
+            title: '国富人寿计划书',
+            imgUrl: 'http://47.96.143.111:8000/app/images/logo.png',
+            desc: '国富为您量身定制的保险产品，请查收'
+          })
+          // let params = {
+          //   orderNo: ''
+          // }
+          this.faceAuthCount.appnt = this.$route.query.faceAuthCountAppnt == undefined ? 0 : Number(this.$route.query.faceAuthCountAppnt)
+          this.faceAuthCount.insured = this.$route.query.faceAuthCountInsured == undefined ? 0 : Number(this.$route.query.faceAuthCountInsured)
+          this.faceAuthCount.weixin = this.$route.query.faceAuthCountWeixin == undefined ? 0 : Number(this.$route.query.faceAuthCountWeixin)
+        } else {
+          // 获取详情消息
+
+          this.getOrderDetail()
+          this.getSignInvalid()
+          this.isShow = true
+        }
+      },
     // 获取消息和阅读状态
     realPeopelCheck() {
       this.$toast.loading({
@@ -726,27 +657,6 @@ export default {
     },
     // 人脸识别
     async start_ocr(val) {
-      // val  0投保人 1被保险人 2本人
-      // return this.$dialog
-      //       .alert({
-      //         className: 'dialog-alert',
-      //         title: '提示',
-      //         message: '为维护您的合法权益，请您务必认真观看防范销售误导视频。',
-      //         confirmButtonColor: '#ee0a24',
-      //         confirmButtonText: '确认'
-      //       })
-      //       .then(() => {
-      //         this.$jump({
-      //           flag: 'navigation',
-      //           extra: {
-      //             title: '防范销售误导',
-      //             hiddenRight: '1'
-      //           }
-      //         })
-      //         this.videoShow = true
-      //         this.isVideo = true
-      //         this.isVideoUrl = 'goUrl'
-      //       })
       console.log('人脸识别')
       console.log(val)
       let that = this
@@ -757,9 +667,10 @@ export default {
           //idtype不为身份证跳过人脸识别
           if (JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).idType != '1') {
             that.goUrl()
-          } else {
+          }
+          else {
             // 白名单校验
-            const res = await getWhitelist({
+            let res = await getWhitelist({
               idNo: this.saleInsuredInfo.idNo,
               name: this.saleInsuredInfo.name,
               whiteType: 'sale_face_show'
@@ -777,9 +688,16 @@ export default {
             //RID 状态--有效
             if (this.realPeopleRidInfo.appntRidFlag && this.realPeopleRidInfo.appntRidFlag == '0') {
               // 手机号鉴权 --通过
-              let res = await this.realPeopleCheckMobile('appnt')
-              if (res && res.result == '0') {
-                that.goUrl()
+              let insuredData = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
+              let data = {
+                name: insuredData.name,
+                idType: insuredData.idType,
+                idNo: insuredData.idNo,
+                mobile: insuredData.mobile
+              }
+              let res1 = await checkPhone(data)
+              if (res1 && res1.result == '0') {
+                that.insuredUrl()
                 return
               }
             }
@@ -809,7 +727,7 @@ export default {
             that.insuredUrl()
           } else {
             // 白名单校验
-            const res = await getWhitelist({
+            let res = await getWhitelist({
               idNo: this.saleInsuredPersonInfo.idNo,
               name: this.saleInsuredPersonInfo.name,
               whiteType: 'sale_face_show'
@@ -861,7 +779,7 @@ export default {
               }
             }
             // 白名单校验
-            const res = await getWhitelist({
+            let res = await getWhitelist({
               idNo: this.saleInsuredInfo.idNo,
               name: this.saleInsuredInfo.name,
               whiteType: 'sale_face_show'
@@ -1416,6 +1334,19 @@ export default {
     },
     // 获取消息和阅读状态
     getOrderDetail() {
+      if(!this.$route.query.orderNo || this.$route.query.orderNo == 'undefined'){
+        Dialog.confirm({
+          title: '提示',
+          message: '订单号信息缺失，跳转订单系统重新获取',
+          showCancelButton: false
+        }).then(() => {
+          this.$router.push({
+            path:'/sale/list'
+          })
+        })
+        return false
+      }
+
       let that = this
       this.$toast.loading({
         // 持续展示 toast
@@ -1627,7 +1558,17 @@ export default {
             })
           }
           resolve('success')
-        }
+        } else {
+            Dialog.confirm({
+              title: '提示',
+              message: res.resultMessage,
+              showCancelButton: false
+            }).then(() => {
+              this.$router.push({
+                path:'/sale/list'
+              })
+            })
+          }
       })
     })
   },
@@ -1696,20 +1637,20 @@ export default {
     this.$toast.loading({
       duration: 0, // 持续展示 toast
 
-        forbidClick: true, // 禁用背景点击
+          forbidClick: true, // 禁用背景点击
 
-        loadingType: 'spinner',
+          loadingType: 'spinner',
 
-        message: '加载中……'
-      })
-      let data = {}
-      getSignInvalid(data).then((res) => {
-        if (res.result == '0') {
-          this.$toast.clear()
-          this.signInvalid = res.content.sign
-        }
-      })
-    },
+          message: '加载中……'
+        })
+        let data = {}
+        getSignInvalid(data).then((res) => {
+          if (res.result == '0') {
+            this.$toast.clear()
+            this.signInvalid = res.content.sign
+          }
+        })
+      },
     async checkSignInvalid(signInvalid) {
       let that = this
       this.$toast.loading({
@@ -1805,9 +1746,18 @@ export default {
       })
     },
     getRecognitionResult(requestId, bizToken) {
+      this.$toast.loading({
+        // 持续展示 toast
+        duration: 0,
+        // 禁用背景点击s
+        forbidClick: true,
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       return new Promise(() => {
         getRecognitionResult({ requestId, bizToken }).then(
           (res) => {
+            this.$toast.clear()
             if (res.result == '0') {
               this.recognizeResult = res.result
             } else {

src/views/ebiz/sale/SignatureOfElectronic.vue

@@ -881,147 +881,8 @@ export default {
       }
     }
   },
-  async created() {
-      let data = {
-        orderNo: this.$route.query.orderNo
-      }
-      getOrderDetail(data).then(res => {
-        if (res.result == '0') {
-          let array = []
-          res.orderDTO.ebizSignDTOS.map(item => {
-            array.push(item.documentCode)
-          })
-          this.isPersonalInformation = array.findIndex(item => item === '12')
-        }
-      })
-    if (!this.isWeixin) {
-      setTimeout(() => {
-        // eslint-disable-next-line no-undef
-        EWebBridge.webCallAppInJs('webview_left_button', {
-          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
-          intercept: '1' //是否拦截原生返回事件 1是 其他否
-        })
-      }, 100)
-      window.appCallBack = this.appCallBack
-    }
-    let that = this
-    // 获取当前时间的时间戳
-    // var day2 = new Date()
-    // var day = day2.setTime(day2.getTime())
-    // console.log(day)
-    // console.log(new Date('2020-01-01 23:59:59').getTime())
-    // if (day > new Date('2020-01-01 23:59:59').getTime()) {
-    //   this.dayShow = true
-    // }
+  created() {
 
-    // 获取产品编码
-    // this.chooseProductCodes = JSON.parse(localStorage.chooseProductCodes)
-    that.detailJump = window.localStorage.getItem('detailJump')
-    if (this.detailJump == '1') {
-      this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${localStorage.getItem('insurance-policyUrl')}`)
-    }
-    that.signVal = window.localStorage.getItem('sign-val')
-    // 判断是不是万能险
-    let comment = window.localStorage.getItem('productCode')
-
-    // if (comment == 'GFRS_M0003') {
-    if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017') {
-      this.isComment = true
-    }
-
-    // 获取投保人信息
-    that.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
-    // 在微信
-    if (this.isWeixin) {
-      // 在微信且不是回执签收
-      if (this.detailJump != '1') {
-        that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-        let imgBase64Data = sessionStorage.getItem('imgBase64Data')
-        let wxSigned = sessionStorage.getItem('wxSigned')
-        let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-        console.log('`````````````````````````````````')
-        console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
-        console.log('wxSigned: ' + wxSigned)
-        if (wxSigned) {
-          console.log('第二次进入电子保单!')
-          console.log('that222222222222', that)
-          this.getOrderDetail().then(() => {
-            this.Time = true
-            this.isOver = true
-            this.radio = '1'
-            this.base64 = imgBase64Data
-            this.isDisabledComplite = false
-            console.log('signInfo.status:' + signInfo.status)
-            if (signInfo.status == '0') {
-              // this.appntSign.documentStatus = '3'
-              console.log('``````````````````')
-              this.$set(this.appntSign, 'documentStatus', '3')
-              console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
-              this.isSign = false
-              this.isDisabledComplite = false
-              // this.isDisable = false
-            } else {
-              this.$set(this.insuredSign, 'documentStatus', '3')
-              // this.insuredSign.documentStatus = '3'
-              this.isDisabledComplite = false
-              this.isSign = false
-            }
-          })
-        } else {
-          console.log('````````````````````````')
-          console.log('第一次进入电子保单')
-          this.timeOut()
-          this.getOrderDetail()
-        }
-      } else {
-        // 在微信而且是回执签收
-        document.title = '保险合同签收回执电子确认书签名'
-        let imgBase64Data = sessionStorage.getItem('imgBase64Data')
-        let wxSigned = sessionStorage.getItem('wxSigned')
-        let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-        console.log('`````````````````````````````````')
-        console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data)
-        console.log('wxSigned: ' + wxSigned)
-        if (wxSigned) {
-          console.log('第二次进入电子保单!')
-          console.log('that222222222222', that)
-          this.Time = true
-          this.isOver = true
-          this.radioSure = '1'
-          this.base64 = imgBase64Data
-          this.isDisabledComplite = false
-          console.log('signInfo.status:' + signInfo.status)
-          if (signInfo.status == '0') {
-            // this.appntSign.documentStatus = '3'
-            console.log('``````````````````')
-            this.$set(this.appntSign, 'documentStatus', '3')
-            console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
-            this.isSign = false
-            this.isDisabledComplite = false
-            this.isSubmit = false
-          } else {
-            this.$set(this.insuredSign, 'documentStatus', '3')
-            // this.insuredSign.documentStatus = '3'
-            this.isDisabledComplite = false
-            this.isSign = false
-          }
-        }
-      }
-    } else {
-      // 不在微信且不是回执签收
-
-      if (this.detailJump != '1') {
-        // 投被保险人是否同人
-        that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-        // 获取被保险人信息
-        that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
-        this.timeOut()
-        this.getOrderDetail()
-      } else {
-        //  不在微信但是在回执签收
-        document.title = '保险合同签收回执电子确认书签名'
-      }
-    }
   },
   computed: {
     listenChange() {
@@ -1080,19 +941,109 @@ export default {
       }
     }
   },
-  mounted() {
+  async mounted() {
     document.body.style.backgroundColor = '#fff'
-
-    // console.log('---签名：投保单PDFurl:', this.pdfUrl, 'insurance-policyUrl', window.localStorage.getItem('insurance-policyUrl'))
-    // this.pdfUrl = "http://10.10.100.98:7012/updown/returnDirectStream?imgPath=Ra4LpmZv2h6FrwZPS48QIETiI2AcWWLx6RavVjoAkoMMdje9Cf6YWX3FlAKn%2FwOBIMX%2BfXJaM6sn%0D%0AiUe41vurjQJ65teJQwdrc2wcOn%2FJtQSVGLphInLPv0HGtHpZ3OhD"
-    // this.src = 'http://139.199.50.151:7000/pdfjs/web/viewer.html?file='
-    // console.log('------pdf url:', this.src + this.pdfUrl)
-    //实例化
-    // this.pdfh5 = new Pdfh5('#pdf', {
-    //   pdfurl: config.imgDomain + `/returnDirectStream?imgPath=${window.localStorage.getItem('insurance-policyUrl')}`
-    //   // pdfurl: res.data.content.content
-    // })
-    // 获取签名信息
+    let data = {
+      orderNo: this.$route.query.orderNo
+    }
+    getOrderDetail(data).then(res => {
+      if (res.result == '0') {
+        let array = []
+        res.orderDTO.ebizSignDTOS.map(item => {
+          array.push(item.documentCode)
+        })
+        this.isPersonalInformation = array.findIndex(item => item === '12')
+      }
+    })
+    if (!this.isWeixin) {
+      setTimeout(() => {
+        EWebBridge.webCallAppInJs('webview_left_button', {
+          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+          intercept: '1' //是否拦截原生返回事件 1是 其他否
+        })
+      }, 100)
+      window.appCallBack = this.appCallBack
+    }
+    let that = this
+    that.detailJump = window.localStorage.getItem('detailJump')
+    if (this.detailJump == '1') {
+      this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${localStorage.getItem('insurance-policyUrl')}`)
+    }
+    that.signVal = window.localStorage.getItem('sign-val')
+    // 判断是不是万能险
+    let comment = window.localStorage.getItem('productCode')
+    if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017') {
+      this.isComment = true
+    }
+    // 获取投保人信息
+    that.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
+    // 在微信
+    if (this.isWeixin) {
+      // 在微信且不是回执签收
+      if (this.detailJump != '1') {
+        that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
+        let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+        let wxSigned = sessionStorage.getItem('wxSigned')
+        let signInfo = JSON.parse(localStorage.getItem('signInfo'))
+        if (wxSigned) {
+          this.getOrderDetail().then(() => {
+            this.Time = true
+            this.isOver = true
+            this.radio = '1'
+            this.base64 = imgBase64Data
+            this.isDisabledComplite = false
+            if (signInfo.status == '0') {
+              this.$set(this.appntSign, 'documentStatus', '3')
+              this.isSign = false
+              this.isDisabledComplite = false
+            } else {
+              this.$set(this.insuredSign, 'documentStatus', '3')
+              this.isDisabledComplite = false
+              this.isSign = false
+            }
+          })
+        } else {
+          this.timeOut()
+          this.getOrderDetail()
+        }
+      } else {
+        // 在微信而且是回执签收
+        document.title = '保险合同签收回执电子确认书签名'
+        let imgBase64Data = sessionStorage.getItem('imgBase64Data')
+        let wxSigned = sessionStorage.getItem('wxSigned')
+        let signInfo = JSON.parse(localStorage.getItem('signInfo'))
+        if (wxSigned) {
+          this.Time = true
+          this.isOver = true
+          this.radioSure = '1'
+          this.base64 = imgBase64Data
+          this.isDisabledComplite = false
+          if (signInfo.status == '0') {
+            this.$set(this.appntSign, 'documentStatus', '3')
+            this.isSign = false
+            this.isDisabledComplite = false
+            this.isSubmit = false
+          } else {
+            this.$set(this.insuredSign, 'documentStatus', '3')
+            this.isDisabledComplite = false
+            this.isSign = false
+          }
+        }
+      }
+    } else {
+      // 不在微信且不是回执签收
+      if (this.detailJump != '1') {
+        // 投被保险人是否同人
+        that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
+        // 获取被保险人信息
+        that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
+        this.timeOut()
+        this.getOrderDetail()
+      } else {
+        //  不在微信但是在回执签收
+        document.title = '保险合同签收回执电子确认书签名'
+      }
+    }
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''

src/views/ebiz/sale/SignatureOfNotice.vue

@@ -556,34 +556,7 @@ export default {
     }
   },
   created() {
-    if (!this.isWeixin) {
-      setTimeout(() => {
-        // eslint-disable-next-line no-undef
-        EWebBridge.webCallAppInJs('webview_left_button', {
-          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
-          intercept: '1' //是否拦截原生返回事件 1是 其他否
-        })
-      }, 100)
-      window.appCallBack = this.appCallBack
-    }
 
-    let that = this
-
-    that.detailJump = window.localStorage.getItem('detailJump')
-    that.signVal = window.localStorage.getItem('sign-val')
-
-    // 获取投保人信息
-    that.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
-    if (this.isWeixin) {
-      that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-    }
-
-    if (this.detailJump != '1') {
-      // 投被保险人是否同人
-      that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-      // 获取被保险人信息
-      that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
-    }
   },
   computed: {
     listenChange() {
@@ -623,6 +596,30 @@ export default {
     }
   },
   async mounted() {
+    if (!this.isWeixin) {
+      setTimeout(() => {
+        // eslint-disable-next-line no-undef
+        EWebBridge.webCallAppInJs('webview_left_button', {
+          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+          intercept: '1' //是否拦截原生返回事件 1是 其他否
+        })
+      }, 100)
+      window.appCallBack = this.appCallBack
+    }
+    let that = this
+    that.detailJump = window.localStorage.getItem('detailJump')
+    that.signVal = window.localStorage.getItem('sign-val')
+    // 获取投保人信息
+    that.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
+    if (this.isWeixin) {
+      that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
+    }
+    if (this.detailJump != '1') {
+      // 投被保险人是否同人
+      that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
+      // 获取被保险人信息
+      that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
+    }
     if (this.detailJump != '1') {
       this.getOrderDetail()
     }
@@ -630,39 +627,22 @@ export default {
       let imgBase64Data = sessionStorage.getItem('threeimgBase64Data')
       let wxSigned = sessionStorage.getItem('threewxSigned')
       let signInfo = localStorage.getItem('signInfo')
-      console.log('`````````````````````````````````')
-      console.log('imgBase64Data:threeimgBase64Data ' + imgBase64Data)
-      console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
-        console.log('第二次进入电子保单')
-        console.log('````````````````````````````````')
         let rs = await this.getOrderDetail()
-        console.log(rs)
         if (rs === 'success') {
           this.Time = true
           this.radio = '1'
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
           if (signInfo.status == '1') {
-            // this.appntSign.signStatus = '1'
-            console.log('``````````````````')
-            console.log('appntSign:' + this.appntSign)
             this.$set(this.appntSign, 'signStatus', '1')
             this.isSubmit = false
             this.isSign = false
           } else {
-            // this.insuredSign.signStatus = '1'
-            console.log('````````````````````')
-            console.log('insuredSign:' + this.insuredSign)
             this.$set(this.insuredSign, 'signStatus', '1')
-            // this.isDisabledComplite = false
           }
         }
-        console.log('第二次进入保单，完成状态查看')
-        console.log(this.isDisabledComplite)
       } else {
-        console.log('````````````````````````')
-        console.log('第一次进入电子保单')
         this.timeOut()
         this.getOrderDetail()
       }
@@ -674,12 +654,6 @@ export default {
     }
     document.body.style.backgroundColor = '#fff'
     this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${window.localStorage.getItem('insurance-policyUrl')}`)
-    //实例化
-    // this.pdfh5 = new Pdfh5('#pdf', {
-    //   pdfurl: config.imgDomain + `/returnDirectStream?imgPath=${window.localStorage.getItem('insurance-policyUrl')}`
-    //   // pdfurl: res.data.content.content
-    // })
-    // 获取签名信息
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''

src/views/ebiz/sale/insuranceClauses.vue

@@ -60,33 +60,10 @@ export default {
     [NoticeBar.name]: NoticeBar
   },
   created() {
-    this.init()
+
   },
   mounted() {
-    // let readingType = localStorage.getItem('readingProtocolType')
-    // if (readingType && readingType === '1') {
-    //   this.protocol = true
-    // }
-    // let that = this
-    // // {{switchFlag.Time?pageVariable.msg:pageVariable.number}}
-    // that.timeOut()
-    // that.activeType = window.localStorage.getItem('activeType')
-    // // Notify({
-    // //   type: 'warning',
-    // //   message: `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上`,
-    // //   duration: 10000,
-    // //   background: '#999999',
-    // //   className: 'notify'
-    // // })
-
-    // document.body.style.backgroundColor = '#fff'
-    // that.signVal = window.localStorage.getItem('sign-val')
-    // // if (JSON.parse(window.localStorage.getItem('sign-insured'))) {
-    // //   that.insuredSign = JSON.parse(window.localStorage.getItem('sign-insured'))
-    // // }
-    // // if (JSON.parse(window.localStorage.getItem('sign-appnt'))) {
-    // //   that.appntSign = JSON.parse(window.localStorage.getItem('sign-appnt'))
-    // // }
+    this.init()
   },
   methods: {
     async init(){
@@ -140,14 +117,26 @@ export default {
     // 获取PDF的路径
     getOrderDetail() {
       let that = this
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       let data = {
         orderNo: that.$route.query.orderNo
       }
       return new Promise((resolve, reject) => {
         getOrderDetail(data).then(res => {
+          this.$toast.clear()
           if (res.result == '0') {
             res.orderDTO.insuredDTOs[0].riskDTOLst.forEach(item => {
               if(item.isMainRisk == '0'){
+                /**
+                 * @Author: LiuXiaoFeng
+                 * @Description: 保险期间大于1年或者是保终身的才展示产品说明书
+                 * @Date: 2023/7/4
+                 **/
                 if(item.insuYearFlag == 'Y' && item.insuYear > 1){
                   this.hasProductTip = true
                 }

src/views/ebiz/sale/productTip.vue

@@ -62,6 +62,7 @@
     mounted() {
       let that = this
       document.body.style.backgroundColor = '#fff'
+      that.getOrderDetail();
       setTimeout(function() {
         closeLoading()
         that.timeOut()
@@ -78,7 +79,6 @@
         }, 100)
         window.appCallBack = this.appCallBack
       }
-      this.getOrderDetail();
       let that = this;
       that.signVal = window.localStorage.getItem('sign-val')
     },
@@ -131,13 +131,19 @@
       },
       // 获取签名状态
       getOrderDetail() {
-        openLoading()
         let that = this
         let data = {
           orderNo: that.$route.query.orderNo
         }
+        that.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
         return new Promise((resolve) => {
           getOrderDetail1(data).then(res => {
+            that.$toast.clear()
             if (res.result == '0') {
               for(let i = 0;i<res.orderDTO.ebizSignDTOS.length;i++){
                 if (res.orderDTO.ebizSignDTOS[i].signType == '0' || res.orderDTO.ebizSignDTOS[i].signType == '2') {

src/views/ebiz/sale/universalRiskNotifyingMessageTip.vue

@@ -82,16 +82,15 @@ export default {
     [Dialog.name]: Dialog,
     [NoticeBar.name]: NoticeBar
   },
-  mounted() {
-    let that = this
-    that.timeOut()
-    document.body.style.backgroundColor = '#fff'
+  created() {
+
   },
-  async created() {
-     // 当前代理人渠道--个险渠道，中介渠道
+  async mounted() {
+    document.body.style.backgroundColor = '#fff'
+    // 当前代理人渠道--个险渠道，中介渠道
     let dataReturn = await riskRules.getAgentInfoFunc(this)
     this.branchTypeVal = dataReturn.branchTypeVal
-    
+
     if (!this.isWeixin) {
       setTimeout(() => {
         // eslint-disable-next-line no-undef
@@ -114,48 +113,29 @@ export default {
     if (this.detailJump != '1') {
       // 投被保险人是否同人
       that.relationToAppnt = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt
-      // 获取被保险人信息
-      // that.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
     }
-    // if (this.detailJump != '1') {
-    //   this.getOrderDetail()
-    // }
     if (this.isWeixin) {
       let imgBase64Data = sessionStorage.getItem('twoimgBase64Data')
       let wxSigned = JSON.parse(sessionStorage.getItem('twowxSigned'))
-      // let wxSigned = false
       let signInfo = JSON.parse(localStorage.getItem('signInfo'))
-      console.log('`````````````````````````````````')
-
-      console.log('imgBase64Data: twoimgBase64Data:' + imgBase64Data)
-      console.log('wxSigned: ' + wxSigned)
       if (wxSigned) {
-        console.log('第二次进入电子保单')
-        console.log('````````````````````````````````')
         this.getOrderDetail().then(() => {
           this.Time = true
           this.isOver = true
           this.radio = '1'
           this.base64 = imgBase64Data
           this.isDisabledComplite = false
-          console.log('signInfo.status:' + signInfo.status)
           if (signInfo.status == '0') {
-            // this.appntSign.documentStatus = '3'
-            console.log('``````````````````')
             this.$set(this.appntSign, 'documentStatus', '3')
-            console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus)
             this.isSign = false
             this.isDisabledComplite = false
-            // this.isDisable = false
           } else {
             this.$set(this.insuredSign, 'documentStatus', '3')
-            // this.insuredSign.documentStatus = '3'
             this.isDisabledComplite = false
             this.isSign = false
           }
         })
       } else {
-        console.log('第一次进入电子保单')
         this.timeOut()
         this.getOrderDetail()
       }
@@ -165,6 +145,7 @@ export default {
         this.getOrderDetail()
       }
     }
+    this.timeOut()
   },
   methods: {
     appCallBack(data) {
@@ -220,8 +201,15 @@ export default {
       let data = {
         orderNo: that.$route.query.orderNo
       }
+      that.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       return new Promise((resolve, reject) => {
         getOrderDetail(data).then(res => {
+          that.$toast.clear()
           if (res.result == '0') {
             // 截取代理人机构号的前六位，用于去判断是否属于柳州代理人
             if(res.orderDTO.recmdDTO.managerOrg && res.orderDTO.recmdDTO.managerOrg.length >= 6){

vue.config.js

@@ -32,14 +32,12 @@ module.exports = {
   chainWebpack: config => {
     // 移除 prefetch 插件
     config.plugins.delete('prefetch')
-
-    // 或者
-    // 修改它的选项：
-    // config.plugin('prefetch').tap(options => {
-    //   options[0].fileBlacklist = options[0].fileBlacklist || []
-    //   options[0].fileBlacklist.push(/myasyncRoute(.)+?\.js$/)
-    //   return options
-    // })
+    // 压缩代码
+    config.optimization.minimize(true)
+    // 分割代码
+    config.optimization.splitChunks({
+      chunks: 'all',
+    })
   },
   devServer: {
     port: 8082