Merge remote-tracking branch 'origin/development' into development

src/views/home/components/go-examine.vue

@@ -129,26 +129,43 @@ const getInCome = async () => {
 const handleVerify = async () => {
   // 调用验券接口
   if (!voucherCode.value) return;
-  const res: any = await verifyOrder({ orderCode: voucherCode.value });
-  if (res.code == 200) {
+
+  try {
+    const res: any = await verifyOrder({ orderCode: voucherCode.value });
+
+    // 如果第一个接口返回错误
+    if (res.code !== 200) {
+      ElMessage.error(res.msg || "验券失败");
+      voucherCode.value = "";
+      return;
+    }
+
+    // 第一个接口成功，调用第二个接口
     let i = {
       quanCode: voucherCode.value,
       storeId: userInfo.storeId
     };
     const res1: any = await verifyCoupon(i);
-    if (res && res1.data.code === 200) {
-      ElMessage.success(res.msg);
+
+    // 检查第二个接口的返回结果
+    if (res1 && res1.data && res1.data.code === 200) {
+      ElMessage.success(res.msg || "验券成功");
       voucherCode.value = "";
+      getOrder();
+      getInCome();
     } else {
-      ElMessage.success(res.msg);
+      // 第二个接口返回错误
+      const errorMsg = res1?.data?.msg || res1?.msg || res.msg || "验券失败";
+      ElMessage.error(errorMsg);
+      voucherCode.value = "";
     }
+  } catch (error: any) {
+    // 捕获异常情况
+    console.error("验券失败:", error);
+    const errorMsg = error?.response?.data?.msg || error?.msg || error?.message || "验券失败，请重试";
+    ElMessage.error(errorMsg);
     voucherCode.value = "";
-    getOrder();
-    getInCome();
-  } else {
-    ElMessage.success(res.msg);
   }
-  console.log("verify voucher:", voucherCode.value);
 };
 </script>
 

src/views/home/components/go-flow.vue

@@ -412,14 +412,6 @@ onMounted(() => {
   }
 });
 
-const changeRefuse = () => {
-  currentStep.value = 2;
-};
-
-// 跳转到 go-enter 组件（首页）
-const handleGoToEnter = () => {
-  setStep(0);
-};
 const setStep = (val: number) => {
   currentStep.value = val;
   emit("update:currentStep", val);