Merge remote-tracking branch 'origin/master'

src/pages/assistingAgriculture/cart/ConfirmOrder.vue

@@ -385,6 +385,10 @@ const payNow = async (data) => {
   params.value.id = orderInfo.value.key;
   params.value.tradeType = data.selectType;
   params.value.basketIds = basketIds.value;
+  xma.showLoading({
+    title: '正在支付',
+    mask: true,
+  });
   if (types.value === 'qg') {
     const qgParams = {
       id: orderInfo.value.key,
@@ -394,6 +398,7 @@ const payNow = async (data) => {
     };
     groupBuyCreate(qgParams).then((res) => {
       if (res.code === 0) {
+        xma.hideLoading();
         openUrl(res.data.result);
         xma.removeStorageSync('address');
       } else {
@@ -403,6 +408,7 @@ const payNow = async (data) => {
   } else {
     znsgyOrderCreate(params.value).then((res) => {
       if (res.code === 0) {
+        xma.hideLoading();
         openUrl(res.data.result);
         xma.removeStorageSync('address');
       } else {

src/pages/shop/confirmOrder.vue

@@ -285,10 +285,15 @@ const submitOrder = debounce(() => {
     payWayCode: 5,
     tradeType: selectType.value,
   };
+  xma.showLoading({
+    title:'正在支付',
+    mask:true,
+  })
   groupBuyCreate(params).then((res) => {
     if (res.code === 0) {
       const { paymentUrl, outTradeNo } = res.data.result;
       outTradeNos.value = outTradeNo;
+      xma.hideLoading()
       window.location.href = paymentUrl;
       // 设置一个延时器
       const start = Date.now();