Merge branch 'dev-purchase-0901' of...

Merge branch 'dev-purchase-0901' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-purchase-0901

* 'dev-purchase-0901' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam:
  修改提示

src/views/goods-detail.vue

@@ -68,11 +68,13 @@
         {{ goods.isSale === 2 ? '商品已下架' : '确认支付' }}
       </div>
     </div>
+    <Loading v-show="showLoading" />
   </div>
 </template>
 
 <script>
 import { Swipe, SwipeItem } from 'vant';
+import Loading from "@/components/common/common-loading";
 import { wxConfig, chooseWXPay } from '@/utils/wxShare';
 import { getAPPID, getWebPageUrl, isWeiXin, wxOauth, debounce } from '@/utils';
 const isWechat = isWeiXin();
@@ -82,6 +84,7 @@ export default {
   components: {
     Swipe,
     SwipeItem,
+    Loading,
   },
   data() {
     return {
@@ -95,6 +98,7 @@ export default {
       tabs: [],
       curtTabIdx: 0,
       tabW: 0, // tab的宽度
+      showLoading: false,
     }
   },
   computed: {
@@ -223,6 +227,10 @@ export default {
         this.$toast('已达最大限购数量')
         return;
       }
+      if (this.goods.goodsStocks && num >= this.goods.goodsStocks) {
+        this.$toast('库存不足')
+        return;
+      }
       this.curtGoodsNum = num + 1;
       this.countTotalPrice();
     },
@@ -261,6 +269,10 @@ export default {
         wxOauth();
         return;
       }
+      // 避免多次支付
+      if (this.showLoading) {
+        return;
+      }
       const { id, couponDTO, isSale } = this.goods;
       const { preferentialPrice, costPrice } = this.totalPrice;
       // if (!id || isSale !== 1) {
@@ -274,6 +286,7 @@ export default {
         preferentialPrice: preferentialPrice,
         price: costPrice,
       }
+      this.showLoading = true;
       this.POST('trade/center/order/createV2', orderData).then(res => {
         if (res.code == "000000") {
           const orderId = res.data.orderId;
@@ -287,28 +300,11 @@ export default {
           }
         } else {
           this.$toast(res.message);
+          this.showLoading = false;
         }
-      })
-    },
-    // 站外微信支付
-    goWxPayOut(orderId) {
-      const data = {
-        // openId: getAPPID(),
-        orderId,
-        payChannel: 1,
-        tradeType: 4,
-      }
-      this.POST('trade/center/mweb_prepay', data).then(res => {
-        if (res.code == "000000") {
-          if (res.data) {
-            let redirectUrl = this.getRedirectUrl(orderId);
-            let jumpLink = res.data + '&redirect_url=' + encodeURIComponent(redirectUrl);
-            window.location.href = jumpLink;
-          }
-        } else {
-          this.$toast(res.message || '暂时不能支付');
-        }
-      })
+      }).catch(() => {
+        this.showLoading = false;
+      });
     },
     // 微信内支付
     goWxPayInner(orderId) {
@@ -341,7 +337,7 @@ export default {
               that.$toast('支付失败，请重试~');
             },
             cancel: function() {
-              that.$toast('支付取消~');
+              // that.$toast('支付取消~');
             },
             complete: function() {},
           };
@@ -349,6 +345,32 @@ export default {
         } else {
           this.$toast(res.message);
         }
+        this.showLoading = false;
+      }).catch(() => {
+        this.showLoading = false;
+      })
+    },
+    // 站外微信支付
+    goWxPayOut(orderId) {
+      const data = {
+        // openId: getAPPID(),
+        orderId,
+        payChannel: 1,
+        tradeType: 4,
+      }
+      this.POST('trade/center/mweb_prepay', data).then(res => {
+        if (res.code == "000000") {
+          if (res.data) {
+            let redirectUrl = this.getRedirectUrl(orderId);
+            let jumpLink = res.data + '&redirect_url=' + encodeURIComponent(redirectUrl);
+            window.location.href = jumpLink;
+          }
+        } else {
+          this.$toast(res.message || '暂时不能支付');
+        }
+        this.showLoading = false;
+      }).catch(() => {
+        this.showLoading = false;
       })
     },
     getRedirectUrl(orderId) {