Merge branch 'fix/goods' into 'master'

fix: 分享url异常问题修复

See merge request !179

src/api/shareInfo.js

 import getWxShareInfo from "@/service/wxJsSdk";
-const currentOrigin = window.location.origin;
+const currentOrigin = window.location.origin + "/share?path=";
 const logo = currentOrigin + "/shareImg/index.png";
 const shareList = {
   home: {
     title: "【芒果保险】好保险，省钱买",
     desc:
       "	「芒果保险」是专注于健康保障的互联网保险严选平台，为用户挑选性价比高、更适合自己的保险产品，让每个家庭都有备无患。",
-    url: currentOrigin + "/home",
+    url: currentOrigin + "home",
     imgUrl: logo
   },
   smartmeasure: {
     title: "【芒果保险】智能风险评测",
     desc: "「芒果保险」不知道怎么买保险？AI小果为您提供30S快速评测，推荐最适合你的保险。",
-    url: currentOrigin + "/home/smart-measure",
+    url: currentOrigin + "home%2Fsmart-measure",
     imgUrl: currentOrigin + "/shareImg/ai.png"
   },
   activity: {
     title: "最高18888元红包 抽!抽!抽！",
     desc: "100%中奖！「芒果保险」老用户专享，参与投票即可抽取最高18888元红包",
-    url: currentOrigin + "/home/activity",
+    url: currentOrigin + "home%2Factivity",
     imgUrl: currentOrigin + "/shareImg/activity.jpg"
   },
   goods: {
     title: "【芒果保险】好保险，省钱买",
     desc:
       "「芒果保险」是专注于健康保障的互联网保险严选平台，为用户挑选性价比高、更适合自己的保险产品，让每个家庭都有备无患。",
-    url: currentOrigin + "/goods",
+    url: currentOrigin + "goods",
     imgUrl: logo
   },
   consultant: {
     title: "【芒果保险】限时优惠！0.99元聘请芒果保险顾问，1对1量身定制",
     desc:
       "「芒果保险」1对1保险顾问，帮您最高节省50%保费，为你量身选保险！顾问团队是由资深保险精算师组成，将秉承中立客观的服务态度，进行条款解读。",
-    url: currentOrigin + "/consultant",
+    url: currentOrigin + "consultant",
     imgUrl: currentOrigin + "/shareImg/advisor.png"
   },
   user: {
     title: "【芒果保险】好保险，省钱买",
     desc:
       "「芒果保险」是专注于健康保障的互联网保险严选平台，为用户挑选性价比高、更适合自己的保险产品，让每个家庭都有备无患。",
-    url: currentOrigin + "/user",
+    url: currentOrigin + "user",
     imgUrl: logo
   },
   tkylx001detail: {
     title: "【芒果保险】万家保·百万医疗险",
     desc:
       "「报销型医疗险」最高600万全面医疗保障，120种重大疾病医疗0免赔，30天~65周岁均可保，70种抗癌特药定期上新，免费提供住院费用垫付服务等一站式就医服务。",
-    url: currentOrigin + "/goods/detail?id=TKYLX001",
+    url: currentOrigin + "goods%2Fdetail%3Fid%3DTKYLX001",
     imgUrl: currentOrigin + "/shareImg/goods-01.png"
   },
   htdqzjx001detail: {
     title: "【芒果保险】万家保·重疾轻症险",
     desc:
       "「给付型重疾险」100种重症+40种轻症确诊即赔，轻症赔付后，重疾保障继续有效。30天~60周岁均可保。",
-    url: currentOrigin + "/goods/detail?id=HTDQZJX001",
+    url: currentOrigin + "goods%2Fdetail%3Fid%3DHTDQZJX001",
     imgUrl: currentOrigin + "/shareImg/goods-02.png"
   },
   zaywx001detail: {
     title: "【芒果保险】万家保·综合意外险",
     desc: "「给付型意外险」意外风险覆盖全，保额最高100万，猝死也可赔。",
-    url: currentOrigin + "/goods/detail?id=ZAYWX001",
+    url: currentOrigin + "goods%2Fdetail%3Fid%3DZAYWX001",
     imgUrl: currentOrigin + "/shareImg/goods-03.png"
   },
   hgsx001detail: {
     title: "【芒果保险】华贵大麦2020定期寿险",
     desc:
       "「定期寿险」家庭主要收入贡献者的必备保险，最高可赔350万。免体检，责任免除仅3条，1~6类职业均可保，健康告知仅3条。",
-    url: currentOrigin + "/goods/detail?id=HGSX001",
+    url: currentOrigin + "goods%2Fdetail%3Fid%3DHGSX001",
     imgUrl: currentOrigin + "/shareImg/goods-04.png"
   },
   policydetail: {
     title: "【芒果保险】好保险，省钱买",
     desc:
       "「芒果保险」是专注于健康保障的互联网保险严选平台，为用户挑选性价比高、更适合自己的保险产品，让每个家庭都有备无患。",
-    url: currentOrigin + "/user",
+    url: currentOrigin + "user",
     imgUrl: logo
   }
 };

src/views/Consultant/Buy/index.vue

@@ -264,6 +264,7 @@ export default {
               params: {
                 tradeType: this.tradeType,
                 openId: this.openId,
+                isConsultant: 1,
                 state: 1
               }
             };
@@ -279,6 +280,7 @@ export default {
               url: res.payUrl,
               params: {
                 tradeType: this.tradeType,
+                isConsultant: 1,
                 openId: this.openId,
                 state: 1
               }

src/views/Home/Share/index.vue

@@ -9,6 +9,14 @@ export default {
   data() {
     return {};
   },
-  created() {}
+  created() {
+    let _path = this.$route.query.path;
+    if (_path) {
+      _path = decodeURIComponent(_path);
+    } else {
+      _path = "/home";
+    }
+    this.$router.replace(_path);
+  }
 };
 </script>

src/views/Policy/PayWaiting/index.vue

@@ -27,6 +27,10 @@ export default {
     this.isPayWait = true;
     this.orderInfo = this.$route.query;
     // 如果存在isXyqb，同时当前不是在信用钱包环境
+    if (this.orderInfo.isConsultant) {
+      this.$router.replace("/consultant");
+      return;
+    }
     if (
       (this.orderInfo.isXyqb == 1 ||
         (this.orderInfo.third && this.orderInfo.third.indexOf("1") === 0)) &&