Merge branch 'iteration-20240401' into jenkins-test

src/views/student-register/index.tsx

@@ -651,15 +651,15 @@ export default defineComponent({
           }
           if (isPadding && forms.joinType === 'digitalize') {
             // 会选判断逻辑 -
-            const schoolInfo = await request.get(
-              '/edu-app/userPaymentOrder/registerStatus/' + forms.schoolId
-            );
-            const vipList = studentRegisterStore.getVip;
+            // const schoolInfo = await request.get(
+            //   '/edu-app/userPaymentOrder/registerStatus/' + forms.schoolId
+            // );
+            // const vipList = studentRegisterStore.getVip;
 
-            if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
-              forms.dialogConfirmStatus = true;
-              return true;
-            }
+            // if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
+            //   forms.dialogConfirmStatus = true;
+            //   return true;
+            // }
             // 最终确认，有待支付订单直接去支付，没有则才会创建订单
             state.config = paddingConfig?.paymentConfig;
             state.orderNo = paddingConfig?.orderNo;