更新

src/views/student-register/index.tsx

@@ -685,10 +685,9 @@ export default defineComponent({
     const onRegisterSubmit = async () => {
       try {
         // 请求是否有待支付订单，如果有则自动关闭
-        if (forms.joinType !== 'tradition') {
-          const status = await paymentOrderUnpaid();
-          if (status) return;
-        }
+
+        const status = await paymentOrderUnpaid();
+        if (status) return;
 
         const schoolInfo = await request.get(
           '/edu-app/userPaymentOrder/registerStatus/' + forms.schoolId
@@ -819,13 +818,15 @@ export default defineComponent({
             }
           });
 
+          // 60s 关单提示文案
+
           // 判断是否有完成订单 并且选择 自备
           if (isFinal && forms.joinType === 'tradition') {
-            const studentResult = await updateStudentInfo();
-            if (!studentResult) return;
-            // setTimeout(() => {
-            //   showToast('您已通过数字化方式报名成功');
-            // }, 100);
+            // const studentResult = await updateStudentInfo();
+            // if (!studentResult) return;
+            setTimeout(() => {
+              showToast('您已通过数字化方式报名成功');
+            }, 100);
             return false;
           }
 
@@ -838,10 +839,10 @@ export default defineComponent({
             // forms.confirmButtonText = '关闭';
             // forms.dialogConfig = paddingConfig;
             // forms.messageAlign = 'left';
-            // const cancelStatus = await cancelPaymentOrder();
-            // if (cancelStatus) {
-            // await paymentContinue();
-            // }
+            const cancelStatus = await cancelPaymentOrder();
+            if (cancelStatus) {
+              await paymentContinue();
+            }
             return false;
           }
           if (isPadding && forms.joinType === 'digitalize') {