Merge branch 'iteration-20240401' into jenkins-test

src/views/student-register/index.tsx

@@ -650,14 +650,16 @@ export default defineComponent({
             return true;
           }
           if (isPadding && forms.joinType === 'digitalize') {
-            // forms.dialogStatus = true;
-            // forms.dialogMessage = '您有待支付的报名订单，是否继续支付';
-            // forms.cancelButtonText = '重新下单';
-            // forms.confirmButtonText = '继续支付';
-            // forms.dialogConfig = paddingConfig;
-            // forms.messageAlign = 'center';
-            // return true;
+            // 会选判断逻辑 -
+            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;
+            }
             // 最终确认，有待支付订单直接去支付，没有则才会创建订单
             state.config = paddingConfig?.paymentConfig;
             state.orderNo = paddingConfig?.orderNo;