添加判断

src/views/student-register/index.tsx

@@ -450,6 +450,9 @@ export default defineComponent({
       } else if (!studentInfo.extra.nickname) {
         status && showToast('请输入学生姓名');
         return true;
+      } else if (![0, 1].includes(studentInfo.extra.gender)) {
+        status && showToast('请选择性别');
+        return true;
       } else if (!studentInfo.extra.currentGradeNum) {
         status && showToast('请选择所在年级');
         return true;
@@ -834,22 +837,16 @@ export default defineComponent({
             return true;
           }
           if (isPadding && forms.joinType === 'digitalize') {
-            // 会选判断逻辑 -
-            // 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;
-            const updateStatus = await updateStudentInfo();
-            if (!updateStatus) return;
-            await lastSubmit();
+            // state.config = paddingConfig?.paymentConfig;
+            // state.orderNo = paddingConfig?.orderNo;
+            // const updateStatus = await updateStudentInfo();
+            // if (!updateStatus) return;
+            // await lastSubmit();
+
+            // 为了处理，有待支付订单，然后后台改了金额，会导致金额不一致
+            await cancelPaymentOrder();
+            await paymentContinue();
             return true;
           }
 
@@ -916,62 +913,6 @@ export default defineComponent({
           });
         });
         // 创建订单
-        // const { extra, username } = studentInfo;
-        // const result = await request.post('/edu-app/student/register', {
-        //   data: {
-        //     schoolId: forms.schoolId,
-        //     clientType: 'STUDENT',
-        //     ...extra,
-        //     giftVipDay:
-        //       forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
-        //     mobile: username,
-        //     newRegUser: forms.isRegister === 'create' ? true : false,
-        //     orderReq: {
-        //       buryId: forms.saveUserId,
-        //       registerType: forms.registerType,
-        //       paymentType: forms.paymentType,
-        //       bizId: forms.schoolId, // 乐团编号
-        //       orderType: 'SCHOOL_REGISTER',
-        //       paymentCashAmount: calcPrice.value.amount || 0,
-        //       paymentCouponAmount: 0,
-        //       goodsInfos: params,
-        //       orderName: '学生登记',
-        //       orderDesc: '学生登记'
-        //     }
-        //   }
-        // });
-
-        // if (result !== 200) {
-        //   if (result.code === 5436) {
-        //     forms.showTips = true;
-        //     forms.showMessage = '二维码已经失效，详情请咨询学校老师';
-        //     forms.showButton = false;
-        //   } else if (result.code === 5435) {
-        //     forms.showTips = true;
-        //     forms.showMessage = result.message;
-        //     forms.showButton = true;
-        //   } else if (result.code === 5437) {
-        //     forms.showTips = true;
-        //     forms.showMessage = '团购时间已截止，感谢您的参与'; //result.message;
-        //     forms.showButton = false;
-        //   } else if (result.code === 5436) {
-        //     forms.showTips = true;
-        //     forms.showMessage = '二维码已经失效，详情请咨询学校老师';
-        //     forms.showButton = false;
-        //   } else if (result.code === 5435) {
-        //     forms.showTips = true;
-        //     forms.showMessage = result.message;
-        //     forms.showButton = true;
-        //   }
-        // } else {
-        //   console.log(result.data, 1);
-        //   state.config = {
-        //     ...result.data.paymentConfig,
-        //     paymentType: result.data.paymentType
-        //   };
-        //   state.orderNo = result.data.orderNo;
-        //   await lastSubmit();
-        // }
         const updateStatus = await updateStudentInfo();
         console.log(updateStatus, 'updateStatus');
         if (!updateStatus) return;

src/views/student-register/register-member/index.tsx

@@ -259,21 +259,24 @@ export default defineComponent({
     };
 
     const checkForm = () => {
-      if (!studentInfo.extra.nickname) {
+      if (!checkPhone(studentInfo.username)) {
+        showToast('请输入正确的手机号码');
+        return true;
+      } else if (!studentInfo.password) {
+        showToast('请输入验证码');
+        return true;
+      } else if (!studentInfo.extra.nickname) {
         showToast('请输入学生姓名');
         return true;
+      } else if (![0, 1].includes(studentInfo.extra.gender)) {
+        showToast('请选择性别');
+        return true;
       } else if (!studentInfo.extra.currentGradeNum) {
         showToast('请选择所在年级');
         return true;
       } else if (!studentInfo.extra.currentClass) {
         showToast('请选择所在班级');
         return true;
-      } else if (!checkPhone(studentInfo.username)) {
-        showToast('请输入正确的手机号码');
-        return true;
-      } else if (!studentInfo.password) {
-        showToast('请输入验证码');
-        return true;
       }
       return false;
     };

src/views/student-register/register-new/index.tsx

@@ -435,6 +435,9 @@ export default defineComponent({
       } else if (!studentInfo.extra.nickname) {
         showToast('请输入学生姓名');
         return true;
+      } else if (![0, 1].includes(studentInfo.extra.gender)) {
+        showToast('请选择性别');
+        return true;
       } else if (!studentInfo.extra.currentGradeNum) {
         showToast('请选择所在年级');
         return true;