1.优化会员扫码充值订单状态查询

src/components/payCard/scanModal.vue

@@ -58,7 +58,7 @@ import { scanpay, queryOrder, quickPay, queryQuickPayStatus, accountPay, querySc
 import { useUser } from "@/store/user.js";
 import { useGlobal } from '@/store/global.js'
 import { formatDecimal } from '@/utils'
-import { microPay, queryOrderStatus, microPayVip, vipPay } from '@/api/order.js'
+import { microPay, queryOrderStatus, microPayVip, vipPay, queryPayStatus } from '@/api/order.js'
 
 const store = useUser();
 const global = useGlobal()
@@ -113,6 +113,7 @@ const userPayWait = ref(false);
 const checkPayStatusLoading = ref(false);
 
 const fastOrder = ref('')
+const vipPayOrder = ref('')
 
 // 提交扫码支付
 async function submitHandle() {
@@ -210,8 +211,11 @@ async function checkPayStauts(tips = true) {
   try {
     if (props.selecttype == 1) {
       // 会员扫码充值
-      const res = await queryScanPay({ flowId: fastOrder.value.id });
-      if (res.status == 0) {
+      const res = await queryPayStatus({
+        shopId: store.shopInfo.id,
+        payOrderNo: fastOrder.value.payOrderNo,
+      });
+      if (res == 'TRADE_SUCCESS') {
         userPayWait.value = false
         loading.value = false;
         scanCode.value = "";
@@ -220,8 +224,7 @@ async function checkPayStauts(tips = true) {
         clearAutoCheckOrder()
         emits("success");
         return;
-      }
-      if (res.status == 7) {
+      } else if (res == 'TRADE_AWAIT') {
         if (tips) {
           ElMessage.warning("用户支付中...");
         }
@@ -263,7 +266,6 @@ async function checkPayStauts(tips = true) {
           userPayWait.value = false
           loading.value = false;
           scanCode.value = "";
-          ElMessage.success("支付成功");
           dialogVisible.value = false;
           clearAutoCheckOrder()
           emits("success");
@@ -276,7 +278,7 @@ async function checkPayStauts(tips = true) {
           return;
         } else {
           clearAutoCheckOrder()
-          ElMessage.error(res.msg);
+          ElMessage.error(res.msg || '');
           return;
         }
       }
@@ -292,7 +294,9 @@ function resetScanCode() {
   userPayWait.value = false;
   loading.value = false;
   scanCode.value = "";
-  inputRef.value.focus();
+  setTimeout(() => {
+    inputRef.value.focus();
+  }, 500)
 }
 
 // 输入