Merge branch 'fix/consultant_pay' into 'master'

JSAPI支付跳转异常

See merge request !206

package.json

@@ -16,9 +16,9 @@
     "@qg/qg-scroll": "^1.4.2",
     "amfe-flexible": "^2.2.1",
     "axios": "^0.19.2",
-    "cookies-js": "^1.2.3",
     "core-js": "^3.6.5",
     "date-fns": "^2.15.0",
+    "js-cookie": "^2.2.1",
     "lodash-es": "^4.17.15",
     "raven-js": "^3.27.2",
     "sa-sdk-javascript": "^1.15.16",

src/service/http.js

@@ -97,6 +97,9 @@ axios.interceptors.response.use(
       message: response.data.msg || "后端服务异常",
       duration: notifyType === "warning" ? 6000 : 3000
     });
+    if (response.data.code === "40100") {
+      localStorage.remove("mongoToken");
+    }
     return Promise.reject(response.data);
   },
   async err => {
@@ -129,7 +132,6 @@ axios.interceptors.response.use(
       err.message = "连接到服务器失败";
     }
     Notify({ type: "danger", message: err.message });
-
     return Promise.reject(err.response);
   }
 );

src/service/localStorage.js

-import cookies from "cookies-js";
+import cookies from "js-cookie";
 
 export default {
   get(key) {
@@ -26,6 +26,9 @@ export default {
     return window.localStorage.setItem(key, value);
   },
   remove(key) {
+    if (key === "mongoToken") {
+      cookies.remove(key);
+    }
     return window.localStorage.removeItem(key);
   },
   clear() {

src/service/pay.js

@@ -2,7 +2,7 @@
  * @Description: 支付微信h5, jsapi, 第三方收银台，跳转）
  * @Date: 2020-07-28 15:03:52
  * @LastEditors: gzw
- * @LastEditTime: 2020-09-01 15:14:57
+ * @LastEditTime: 2020-09-03 11:20:12
  */
 
 import qs from "qs";
@@ -20,7 +20,6 @@ function payByWeixinJsapi(info = {}, callback) {
     // eslint-disable-next-line no-undef
     WeixinJSBridge.invoke("getBrandWCPayRequest", info, function(res) {
       console.log(res);
-      callback();
       if (res.err_msg == "get_brand_wcpay_request:ok") {
         // 使用以上方式判断前端返回,微信团队郑重提示：
         //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。

src/service/wxJsSdk.js

@@ -2,7 +2,7 @@
  * @Description: weixin-js-sdk
  * @LastEditors: gzw
  * @Date: 20120-08-30 18:40:11
- * @LastEditTime: 2020-09-01 21:00:22
+ * @LastEditTime: 2020-09-03 10:19:35
  */
 import cfg from "@/config/index";
 import { getwxAuth } from "@/api/user";

src/views/Consultant/Buy/index.vue

@@ -248,11 +248,16 @@ export default {
     },
     async generateOrder() {
       this.isPayWait = true;
-      const res = await create();
-      if (res) {
-        this.consultantOrderNo = res.consultantOrderNo;
-        this.updateRemain();
-        this.goPay();
+      try {
+        const res = await create();
+        if (res) {
+          this.consultantOrderNo = res.consultantOrderNo;
+          this.updateRemain();
+          this.goPay();
+        }
+      } catch (error) {
+        this.isPayWait = false;
+        this.checkLogin();
       }
     },
     async goPay() {
@@ -289,11 +294,19 @@ export default {
               }
             };
           }
-          payByWay(this.tradeType, payInfo).then(() => {
-            setTimeout(() => {
-              this.$parent.getOrderInfo(true);
-            }, 1000);
-          });
+          payByWay(this.tradeType, payInfo)
+            .then(() => {
+              setTimeout(() => {
+                this.isPayWait = false;
+                this.$parent.getOrderInfo(true);
+              }, 1000);
+            })
+            .catch(() => {
+              setTimeout(() => {
+                this.isPayWait = false;
+                this.$parent.getOrderInfo(true);
+              }, 1000);
+            });
         }
       } catch (error) {
         this.isPayWait = false;

src/views/Policy/PayWaiting/index.vue

@@ -30,8 +30,7 @@ export default {
     if (this.orderInfo.isConsultant) {
       this.$router.replace("/consultant");
       return;
-    }
-    if (
+    } else if (
       (this.orderInfo.isXyqb == 1 ||
         (this.orderInfo.third && this.orderInfo.third.indexOf("1") === 0)) &&
       !isXyqb

yarn.lock

@@ -2600,11 +2600,6 @@ cookie@0.4.0:
   resolved "http://npmprivate.quantgroups.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
-cookies-js@^1.2.3:
-  version "1.2.3"
-  resolved "http://npmprivate.quantgroups.com/cookies-js/-/cookies-js-1.2.3.tgz#03315049e7c52bee3f73186a69167eab0ddb2d31"
-  integrity sha1-AzFQSefFK+4/cxhqaRZ+qw3bLTE=
-
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "http://npmprivate.quantgroups.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -5042,6 +5037,11 @@ js-base64@^2.1.9:
   resolved "http://npmprivate.quantgroups.com/js-base64/-/js-base64-2.6.3.tgz#7afdb9b57aa7717e15d370b66e8f36a9cb835dc3"
   integrity sha512-fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg==
 
+js-cookie@^2.2.1:
+  version "2.2.1"
+  resolved "http://npmprivate.quantgroups.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+
 js-message@1.0.5:
   version "1.0.5"
   resolved "http://npmprivate.quantgroups.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15"