Merge branch 'fix/goods' into 'master'

Fix/goods

See merge request !165

src/api/detail.huatai.zhongjixian.js

@@ -4,7 +4,7 @@
  * @Description:华太30万轻重疾险
  * @Date: 2020-07-27 15:46:37
  * @LastEditors: gzw
- * @LastEditTime: 2020-08-31 15:43:06
+ * @LastEditTime: 2020-08-31 17:37:32
  */
 
 import goodsBg from "@/assets/images/goods/detail/zhongjixian/bg.png";
@@ -42,7 +42,7 @@ export default {
     { content: "华泰财险附加保险费分期支付条款", offset: true },
     { content: "备案编号：C00015431912018061501152；", offset: false },
     { content: "C00015432622017111500872；", offset: true },
-    { content: "C00015431922018061503991", offset: true }
+    { content: "C00015431922020082800111", offset: true }
   ],
   navBarOptions: [
     { label: "我要投保", value: "insure" },
@@ -240,7 +240,7 @@ export default {
   processDetail: [
     {
       title: "电话报案",
-      desc: "请拨打华泰财险400-609-5509进行报案。华泰财险会有理赔专员1对1指导理赔事宜。 "
+      desc: "请拨打华泰财险4006095509进行报案。华泰财险会有理赔专员1对1指导理赔事宜。 "
     },
     {
       title: "提交资料",
@@ -260,7 +260,7 @@ export default {
   processDetailLite: [
     {
       title: "电话报案",
-      desc: "请拨打华泰财险400-609-5509进行报案。华泰财险会有理赔专员1对1指导理赔事宜。 "
+      desc: "请拨打华泰财险4006095509进行报案。华泰财险会有理赔专员1对1指导理赔事宜。 "
     },
     {
       title: "提交资料",

src/api/shareInfo.js

@@ -42,27 +42,31 @@ const shareList = {
     url: currentOrigin + "/user",
     imgUrl: logo
   },
-  midetail: {
+  tkylx001detail: {
     title: "【芒果保险】万家保·百万医疗险",
     desc:
       "「报销型医疗险」最高600万全面医疗保障，120种重大疾病医疗0免赔，30天~65周岁均可保，70种抗癌特药定期上新，免费提供住院费用垫付服务等一站式就医服务。",
+    url: currentOrigin + "/goods/detail?id=TKYLX001",
     imgUrl: currentOrigin + "/shareImg/goods-01.png"
   },
-  ciidetail: {
+  htdqzjx001detail: {
     title: "【芒果保险】万家保·重疾轻症险",
     desc:
       "「给付型重疾险」100种重症+40种轻症确诊即赔，轻症赔付后，重疾保障继续有效。30天~60周岁均可保。",
+    url: currentOrigin + "/goods/detail?id=HTDQZJX001",
     imgUrl: currentOrigin + "/shareImg/goods-02.png"
   },
-  aidetail: {
+  zaywx001detail: {
     title: "【芒果保险】万家保·综合意外险",
     desc: "「给付型意外险」意外风险覆盖全，保额最高100万，猝死也可赔。",
+    url: currentOrigin + "/goods/detail?id=ZAYWX001",
     imgUrl: currentOrigin + "/shareImg/goods-03.png"
   },
-  lidetail: {
+  hgsx001detail: {
     title: "【芒果保险】华贵大麦2020定期寿险",
     desc:
       "「定期寿险」家庭主要收入贡献者的必备保险，最高可赔350万。免体检，责任免除仅3条，1~6类职业均可保，健康告知仅3条。",
+    url: currentOrigin + "/goods/detail?id=HGSX001",
     imgUrl: currentOrigin + "/shareImg/goods-04.png"
   },
   policydetail: {
@@ -86,7 +90,7 @@ export const getShare = to => {
   } else if (_path.includes("smart-measure")) {
     shareName = "SmartMeasure";
   } else if (to.name === "GoodsDetail") {
-    shareName = to.query.type + "detail";
+    shareName = to.query.id + "detail";
   } else if (_path.includes("goods") || to.name === "AddPolicy") {
     shareName = "Goods";
   } else if (to.name === "PolicyDetail") {

src/components/CompactCellGroup.vue

@@ -13,8 +13,8 @@
       :value="item.value.tpl || item.value"
       :class="{
         'compact-cell': 1,
-        'compact-cell_divider': item.divider,
-        'compact-cell_inline': item.inline
+        'compact-cell_divider': item && item.divider,
+        'compact-cell_inline': item && item.inline
       }"
       :style="{ fontSize: fontSize + 'px' }"
       @click="cellClick(item)"

src/service/wxJsSdk.js

@@ -2,14 +2,14 @@
  * @Description: weixin-js-sdk
  * @LastEditors: gzw
  * @Date: 20120-08-30 18:40:11
- * @LastEditTime: 2020-08-30 20:41:55
+ * @LastEditTime: 2020-08-31 17:40:33
  */
 import cfg from "@/config/index";
 import { getwxAuth } from "@/api/user";
 import wx from "weixin-js-sdk";
 
 export default async function({ title = "", desc = "", link = window.location.href, imgUrl = "" }) {
-  console.log(title, desc, link, imgUrl);
+  // console.log(title, desc, link, imgUrl);
   const res = await getwxAuth({
     appId: cfg.wxAppId,
     url: window.location.href

src/views/Consultant/Exclusive/index.vue

@@ -49,8 +49,6 @@
           <a class="cul-tel-num" :href="`tel:${info.tel}`">
             <svg-icon icon-class="call" />{{ info.tel }}
           </a>
-          <a class="cul-tel-num" :href="`tel://${info.tel}`">1312312312</a>
-          <a class="cul-tel-num" :href="`callto:${info.tel}`">1312312312</a>
           <div class="cul-time">服务时间 {{ info.date }}</div>
         </div>
         <div class="cul-slogan">

src/views/Goods/Detail/AIDetail.vue

@@ -330,7 +330,7 @@ export default {
       const { selfSecId: holderUserId, selfIdNo: holderIdNoMask } = this.formData;
       let currentIdNo = !relation || relation === "1" ? holderIdNoMask : idNoMask;
       const currentUserId = !relation || relation === "1" ? holderUserId : userId;
-      const familyList = this.$refs["insureForm"].familyList || [];
+      const familyList = this.$refs["insureForm"]?.familyList || [];
       if (!currentIdNo) return "";
       currentIdNo =
         currentIdNo.indexOf("**") > -1

src/views/Goods/Detail/CIIDetail.vue

@@ -346,7 +346,7 @@ export default {
       const { selfSecId: holderUserId, selfIdNo: holderIdNoMask } = this.formData;
       let currentIdNo = !relation || relation === "1" ? holderIdNoMask : idNoMask;
       const currentUserId = !relation || relation === "1" ? holderUserId : userId;
-      const familyList = this.$refs["insureForm"].familyList || [];
+      const familyList = this.$refs["insureForm"]?.familyList || [];
       if (!currentIdNo) return "";
       currentIdNo =
         currentIdNo.indexOf("**") > -1

src/views/Goods/Detail/MIDetail.vue

@@ -339,7 +339,7 @@ export default {
       const { selfSecId: holderUserId, selfIdNo: holderIdNoMask } = this.formData;
       let currentIdNo = !relation || relation === "1" ? holderIdNoMask : idNoMask;
       const currentUserId = !relation || relation === "1" ? holderUserId : userId;
-      const familyList = this.$refs["insureForm"].familyList || [];
+      const familyList = this.$refs["insureForm"]?.familyList || [];
       if (!currentIdNo) return "";
       currentIdNo =
         currentIdNo.indexOf("**") > -1

src/views/Goods/Detail/index.vue

@@ -37,6 +37,9 @@ export default {
       userBackState: false
     };
   },
+  computed: {
+    ...mapState(["showAuthXyqb"])
+  },
   beforeRouteLeave(to, from, next) {
     const blackList = ["Goods", "Home", "Detail", "ConsultantPlan", "User"];
     if (isXyqb && this.showAuthXyqb == 2) {
@@ -52,10 +55,7 @@ export default {
   },
   mounted() {
     this.getOrderInfo();
-    this.detailType = this.$route.query.type;
-  },
-  computed: {
-    ...mapState(["showAuthXyqb"])
+    this.setDetailType();
   },
   methods: {
     ...mapActions(["setAuthXyqb"]),
@@ -74,6 +74,27 @@ export default {
       if (e === 2) {
         this.$router.replace({ path: "/consultant" });
       }
+    },
+    setDetailType() {
+      const _id = this.$route.query.id;
+      let detailType = "";
+      switch (_id) {
+        case "HTDQZJX001":
+          detailType = "cii";
+          break;
+        case "TKYLX001":
+          detailType = "mi";
+          break;
+        case "ZAYWX001":
+          detailType = "ai";
+          break;
+        case "HGSX001":
+          detailType = "li";
+          break;
+        default:
+          break;
+      }
+      this.detailType = detailType;
     }
   }
 };

src/views/Goods/Plan/index.vue

@@ -76,15 +76,20 @@ export default {
         break;
     }
     setTimeout(() => {
-      console.log(document.getElementById("dtp"));
-      document.getElementById("dtp").onclick = () => {
-        this.pupopData = this.planInfo[5].options[0];
-        this.popupShow = true;
-      };
-      document.getElementById("70zhongyao").onclick = () => {
-        this.pupopData = this.planInfo[5].options[1];
-        this.popupShow = true;
-      };
+      const dtp = document.getElementById("dtp");
+      const zhongyao = document.getElementById("70zhongyao");
+      if (dtp) {
+        dtp.onclick = () => {
+          this.pupopData = this.planInfo[5].options[0];
+          this.popupShow = true;
+        };
+      }
+      if (zhongyao) {
+        zhongyao.onclick = () => {
+          this.pupopData = this.planInfo[5].options[1];
+          this.popupShow = true;
+        };
+      }
     }, 500);
   },
   methods: {

src/views/Policy/Detail/modules/InsuranceService.vue

@@ -33,11 +33,11 @@
       </div>
     </div>
     <popup-with-iframe
-        v-model="popupShow"
-        :title="pupopData.title"
-        :content="pupopData.content"
-        :url="pupopData.url"
-      />
+      v-model="popupShow"
+      :title="pupopData.title"
+      :content="pupopData.content"
+      :url="pupopData.url"
+    />
   </div>
 </template>
 <script>

src/views/Policy/PayWaiting/index.vue

@@ -7,6 +7,7 @@
 <script>
 import detailPayMixin from "@/views/Goods/Detail/modules/detailPay.mixin";
 // import qs from "qs";
+import localStorage from "@/service/localStorage";
 import { isXyqb } from "@/service/validation";
 export default {
   name: "PayWaiting",
@@ -25,8 +26,12 @@ export default {
     // }
     this.isPayWait = true;
     this.orderInfo = this.$route.query;
+    let thirdParams = "";
+    if (this.orderInfo.third) {
+      thirdParams = decodeURIComponent(this.orderInfo.third);
+    }
     // 如果存在isXyqb，同时当前不是在信用钱包环境
-    if ((this.orderInfo.isXyqb == 1 && !isXyqb) || this.orderInfo.third == 1) {
+    if ((this.orderInfo.isXyqb == 1 && !isXyqb) || thirdParams.indexOf("1") === 0) {
       window.location.href = "xyqb://my";
       if (localStorage.get("mongoToken")) {
         this.$router.replace("/policy");