Merge branch 'fix/goods' into 'master'

fix: 分享测试

See merge request !186

src/service/http.js

@@ -5,6 +5,7 @@ import axios from "axios";
 import cherry from "@qg/cherry-ui";
 import config from "../config";
 import localStorage from "./localStorage";
+import { debounce } from "lodash-es";
 
 const ERR_MESSAGE_MAP = {
   status: {
@@ -31,6 +32,9 @@ axios.defaults.timeout = 30000;
 
 const wait = async seconds => new Promise(resolve => setTimeout(resolve, seconds));
 
+let showLoading = debounce(function() {
+  beforeRequest();
+}, 3000);
 function beforeRequest() {
   reqNum++;
   store.dispatch("setIsLoading", true);
@@ -50,7 +54,7 @@ function clearRequest() {
 // 请求拦截器
 axios.interceptors.request.use(
   config => {
-    beforeRequest();
+    showLoading();
 
     // 发起请求时，取消掉当前正在进行的相同请求
     if (pending[config.url]) {
@@ -74,7 +78,7 @@ axios.interceptors.request.use(
 axios.interceptors.response.use(
   response => {
     afterRequest();
-
+    showLoading.cancel();
     delete pending[response.config.url];
     if (response.data.code === "0") return response.data.data;
     // 特殊处理，下单已存在时，跳转到保单列表

src/service/wxJsSdk.js

@@ -2,13 +2,14 @@
  * @Description: weixin-js-sdk
  * @LastEditors: gzw
  * @Date: 20120-08-30 18:40:11
- * @LastEditTime: 2020-09-01 18:12:00
+ * @LastEditTime: 2020-09-01 18:36:05
  */
 import cfg from "@/config/index";
 import { getwxAuth } from "@/api/user";
 import wx from "weixin-js-sdk";
 import { isWeixinBrower } from "@/service/validation";
 import localStorage from "@/service/localStorage";
+
 /**
  * @description: 微信分享
  */
@@ -69,7 +70,9 @@ export async function setShare({
 export function checkOpenId() {
   const openId = localStorage.get("openId");
   const local = window.location.href;
+  alert(!openId && isWeixinBrower);
   if (!openId && isWeixinBrower) {
+    alert("无openid");
     var nextPage = document.createElement("a");
     nextPage.setAttribute(
       "href",

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

@@ -87,9 +87,11 @@ export default {
           .catch(() => {
             console.log("h5支付");
             // tradeType === "JSAPI" && this.$notify({ type: "warning", message: "支付异常" });
-            this.$router.replace({
-              path: "/policy"
-            });
+            setTimeout(() => {
+              this.$router.replace({
+                path: "/policy"
+              });
+            }, 3000);
             return;
           });
       } else {

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

@@ -39,7 +39,7 @@ export default {
       } else {
         this.isAgeIndexChange = false;
       }
-      return _index;
+      return _index === -1 ? 0 : _index;
     },
     amountOptions() {
       const { ageIndex, countOptions } = this;