瀏覽代碼

fix: loading修复

liangan 4 周之前
父節點
當前提交
896c948367

+ 22 - 18
src/pages/productDetail/checkOut.vue

@@ -100,27 +100,31 @@ const loading = ref<boolean>(false)
 // 下单处理
 async function handlePlaceOrder() {
   loading.value = true
-  const params = {
-    preOrderNo: queryParams.value.preOrderId,
-    type: queryParams.value.groupType,
-    pinkId: queryParams.value.pinkId,
-    cid: queryParams.value.cid,
-    groupType: queryParams.value.groupType,
-  }
-  const orderRes = await createOrder(params)
-  console.log(orderRes)
-  if (orderRes.code === '200') {
-    const payRes = await payOrder({
-      orderId: orderRes?.data?.columns?.orderNo,
+  try {
+    const params = {
+      preOrderNo: queryParams.value.preOrderId,
       type: queryParams.value.groupType,
-    })
-    console.log(payRes)
-    if (payRes.code === '8000') {
-      showInsufficientBalanceDialog()
+      pinkId: queryParams.value.pinkId,
+      cid: queryParams.value.cid,
+      groupType: queryParams.value.groupType,
     }
-    else {
-      toPage('/pages/myOrders/myOrders', {}, true)
+    const orderRes = await createOrder(params)
+    console.log(orderRes)
+    if (orderRes.code === '200') {
+      const payRes = await payOrder({
+        orderId: orderRes?.data?.columns?.orderNo,
+        type: queryParams.value.groupType,
+      })
+      console.log(payRes)
+      if (payRes.code === '8000') {
+        showInsufficientBalanceDialog()
+      }
+      else {
+        toPage('/pages/myOrders/myOrders', {}, true)
+      }
     }
+  }
+  finally {
     loading.value = false
   }
 }

+ 25 - 21
src/pages/productDetail/productDetail.vue

@@ -303,29 +303,33 @@ async function preOrder() {
     return
   }
   loading.value = true
-  const data = {
-    orderDetails: {
-      attrValueId: matchedAttrValue.value.id,
-      productId: productId.value,
-      cid: detail.value.cid,
-      productNum: formData.value.productNum,
-    },
-    preOrderType: 'buyNow',
-  }
-  const res = await _preOrder(data)
-  if (res.code === '200') {
-    showSku.value = false
-    loading.value = false
-    toPage(
-      '/pages/productDetail/checkOut',
-      {
-        preOrderId: res.data,
-        joinOrderId: joinOrderId.value,
-        pinkId: pinkId.value,
+  try {
+    const data = {
+      orderDetails: {
+        attrValueId: matchedAttrValue.value.id,
+        productId: productId.value,
         cid: detail.value.cid,
-        groupType: groupType.value,
+        productNum: formData.value.productNum,
       },
-    )
+      preOrderType: 'buyNow',
+    }
+    const res = await _preOrder(data)
+    if (res.code === '200') {
+      showSku.value = false
+      toPage(
+        '/pages/productDetail/checkOut',
+        {
+          preOrderId: res.data,
+          joinOrderId: joinOrderId.value,
+          pinkId: pinkId.value,
+          cid: detail.value.cid,
+          groupType: groupType.value,
+        },
+      )
+    }
+  }
+  finally {
+    loading.value = false
   }
 }
 

+ 8 - 4
src/pages/wallet/recharge.vue

@@ -84,10 +84,14 @@ const loading = ref<boolean>(false)
 
 async function submit() {
   loading.value = true
-  const amount = selectData.value.customAmount || selectData.value.amount
-  const addRes = await rechargeAdd({ amount, methodId: selectData.value.methodId })
-  if (addRes.code === '200') {
-    toPage('/pages/webLink/webLink', { link: addRes.data.payUrl }, true)
+  try {
+    const amount = selectData.value.customAmount || selectData.value.amount
+    const addRes = await rechargeAdd({ amount, methodId: selectData.value.methodId })
+    if (addRes.code === '200') {
+      toPage('/pages/webLink/webLink', { link: addRes.data.payUrl }, true)
+    }
+  }
+  finally {
     loading.value = false
   }
 }

+ 14 - 10
src/pages/wallet/withdraw.vue

@@ -58,18 +58,22 @@ async function submit() {
     return
   }
   loading.value = true
-  const res = await withdrawAdd({ ...formData.value, accountType: queryParams.value.type, channel: formData.value.bank })
-  console.log(res)
-  if (res.code === '200') {
-    toast.success(t('wallet.withdraw.success'))
-    setTimeout(() => {
-      goBack()
-    }, 1500)
+  try {
+    const res = await withdrawAdd({ ...formData.value, accountType: queryParams.value.type, channel: formData.value.bank })
+    console.log(res)
+    if (res.code === '200') {
+      toast.success(t('wallet.withdraw.success'))
+      setTimeout(() => {
+        goBack()
+      }, 1500)
+    }
+    else {
+      toast.error(res.message || t('wallet.withdraw.fail'))
+    }
   }
-  else {
-    toast.error(res.message || t('wallet.withdraw.fail'))
+  finally {
+    loading.value = false
   }
-  loading.value = false
 }
 const withdrawRate = ref<any>()
 async function getConfig() {