fix: 华贵试算校验修复，添加阻断验证；第三方h5支付跳转修复

src/service/pay.js

@@ -2,7 +2,7 @@
  * @Description: 支付微信h5, jsapi, 第三方收银台，跳转）
  * @Date: 2020-07-28 15:03:52
  * @LastEditors: gzw
- * @LastEditTime: 2020-08-24 19:59:04
+ * @LastEditTime: 2020-08-24 22:02:45
  */
 
 // import cherry from "@qg/cherry-ui";
@@ -97,15 +97,13 @@ export function payByWay(type = "THIRD", payInfo) {
         // }
         resolve();
       });
-    } else if (type === "MWEB") {
+    } else {
       if (payInfo.url.indexOf("weixin") > -1) {
         payByWeixinH5(payInfo);
       } else {
         payByThirdPartyCashier(payInfo);
       }
       resolve();
-    } else {
-      resolve();
     }
   });
 }

src/views/Goods/Detail/LIDetail.vue

@@ -228,6 +228,13 @@ export default {
       this.popupShow = true;
     },
     onSubmit() {
+      const { payPeriod, payType, policyPeriod, birth } = this.formData;
+      if (!payPeriod || !payType || !policyPeriod || !birth) {
+        this.$notify({ type: "warning", message: "请选择保费方案" });
+        this.popupShow = true;
+        this.currentPupopIndex = 6;
+        return;
+      }
       this.showLoginPopup();
       this.popupShow = false;
     },

src/views/Goods/Detail/modules/liCalFee.mixin.js

@@ -24,7 +24,7 @@ export default {
       const { age } = this;
       let _index = 0;
       const ageRangeList = [
-        [18, 35],
+        [18, 30],
         [31, 35],
         [36, 40],
         [41, 45],
@@ -32,12 +32,7 @@ export default {
         [51, 55],
         [56, 60]
       ];
-      // 特殊情况
-      if (31 <= age && age <= 35) {
-        _index = 1;
-      } else {
-        _index = ageRangeList.findIndex(item => item[0] <= age && age <= item[1]);
-      }
+      _index = ageRangeList.findIndex(item => item[0] <= age && age <= item[1]);
       if (this.ageIndexCache !== _index) {
         this.ageIndexCache = _index;
         this.isAgeIndexChange = true;
@@ -66,7 +61,7 @@ export default {
       return termOptions.map((item, index) => {
         switch (index) {
           case 0:
-            item.disabled = p === "3";
+            item.disabled = p === "3" || p === "4";
             break;
           case 1:
             item.disabled = p === "4" || a > 4;
@@ -78,7 +73,7 @@ export default {
             item.disabled = (a > 0 && p === "4") || (a > 2 && p === "3") || a > 4;
             break;
           case 4:
-            item.disabled = (a > 1 && p === "4") || (a > 3 && p === "3") || a === 4;
+            item.disabled = (a > 1 && p === "4") || (a > 3 && p === "3") || a > 5;
             break;
           case 5:
             item.disabled = (a > 2 && p === "4") || (a > 4 && p === "3");
@@ -102,7 +97,8 @@ export default {
             item.disabled = p === "1" || (+p >= 4 && +p <= 6 && a > 2);
             break;
           case 3:
-            item.disabled = a > 2;
+            item.disabled =
+              +p < 3 || (a > 1 && +p !== 6) || (a === 1 && +p === 4) || (a > 3 && +p === 6);
             break;
           default:
             break;