验证码输入错误不能经行倒计时问题修复

src/components/common/CheckAgent.vue

@@ -185,7 +185,7 @@ export default {
       } else {
         this.checkModel.show = true
         this.checkModel.codeDisabled = true
-        window.clearInterval(this.checkModel.timeId)
+        // window.clearInterval(this.checkModel.timeId)
         this.$toast(checkModelResult.resultMessage)
       }
     },

src/components/ebiz/customer/formBlock.vue

@@ -653,12 +653,6 @@ export default {
             //   return
             // }
             this.userInfo.effectiveDateType = false
-            //如果录入日期早于当前日期
-            if (Date.parse(val) < Date.parse(new Date())) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
-              return this.$toast('您的证件已过期')
-            }
           }
           break
         case '2':

src/config/index.js

@@ -27,29 +27,29 @@ function getSearchString (key) {
   }
   return obj[key]
 }
-let apiVersion = 'v1'
-// var ua = window.navigator.userAgent.toLowerCase()
-// //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
-// if (localStorage.getItem('apiVersion')) {
-//   apiVersion = localStorage.getItem('apiVersion')
-// } else {
-//   if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-//     //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
-//     if (window.location.href.indexOf('apiVersion') > 0) {
-//       apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
-//     } else {
-//       apiVersion = 'v3'
-//     }
-//   } else {
-//     // 在app
-//     if (navigator.userAgent.indexOf('JZG_') > 0) {
-//       apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
-//     }
-//   }
-//   window.localStorage.setItem('apiVersion', apiVersion)
-// }
-// // 可以多个接口域名，按需添加
-// console.log('环境：', process.env.VUE_APP_FLAG)
+let apiVersion = 'v2'
+var ua = window.navigator.userAgent.toLowerCase()
+//通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
+if (localStorage.getItem('apiVersion')) {
+  apiVersion = localStorage.getItem('apiVersion')
+} else {
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+    //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
+    if (window.location.href.indexOf('apiVersion') > 0) {
+      apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
+    } else {
+      apiVersion = 'v3'
+    }
+  } else {
+    // 在app
+    if (navigator.userAgent.indexOf('JZG_') > 0) {
+      apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
+    }
+  }
+  window.localStorage.setItem('apiVersion', apiVersion)
+}
+// 可以多个接口域名，按需添加
+console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {
   case 'dev':
     apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/' + apiVersion // 国富api ///api/v1

src/views/ebiz/common/CalculatePremium.vue

@@ -2956,7 +2956,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,10 +44,10 @@
           <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_M0002')" />
+                <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0056')" />
               </div>
               <div class="pcenter-item text-center">
-                <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0035')" />
+                <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
               </div>
             </template>
             <template v-else-if="branchType == '6'">
@@ -122,10 +122,10 @@
         <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_M0002')" />
+              <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0056')" />
             </div>
             <div class="pcenter-item text-center">
-              <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0046')" />
+              <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
             </div>
           </div>
         </div>

src/views/ebiz/proposal/InsuredPerson.vue

@@ -326,11 +326,11 @@ export default {
     //点击下一步
     nextStep() {
       // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
-      let sex = this.insured.sex == '0'?'男':'女'
-      let name = sex + this.insured.insuredAge+'岁'
-      if(this.insured.name == name){
-        this.insured.name = ''
-      }
+      // let sex = this.insured.sex == '0'?'男':'女'
+      // let name = sex + this.insured.insuredAge+'岁'
+      // if(this.insured.name == name){
+      //   this.insured.name = ''
+      // }
       //保存有没有社保，在保费计算用到
       //localStorage.setItem('proposalMedical', this.insured.medical == '0' ? '1' : '0')
       localStorage.proposalMedical = this.insured.medical == '0' ? '1' : '0'

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -958,6 +958,11 @@ export default {
           }
           //证件止期
           let val = this.userInfo.certiexpiredate
+          if (Date.parse(val) < Date.parse(new Date())) {
+            this.userInfo.certiexpiredate = ''
+            this.$refs.certiexpiredate.date = ''
+            return this.$toast('您的证件已过期')
+          }
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {

src/views/ebiz/sale/InsuredInfo.vue

@@ -1110,7 +1110,12 @@ export default {
 
           //身份证证件类型的判断
           //证件止期
-          let val = this.userInfo.certiexpiredate 
+          let val = this.userInfo.certiexpiredate
+          if (Date.parse(val) < Date.parse(new Date())) {
+            this.userInfo.certiexpiredate = ''
+            this.$refs.certiexpiredate.date = ''
+            return this.$toast('您的证件已过期')
+          }
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {

src/views/ebiz/sale/InsuredPerson.vue

@@ -1469,6 +1469,11 @@ export default {
 
           //证件止期
           let val = this.userInfo.certiexpiredate
+          if (Date.parse(val) < Date.parse(new Date())) {
+            this.userInfo.certiexpiredate = ''
+            this.$refs.certiexpiredate.date = ''
+            return this.$toast('您的证件已过期')
+          }
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {