Merge branch 'iteration-20240403-apply' into jenkins-test

src/views/student-register/index.tsx

@@ -708,7 +708,7 @@ export default defineComponent({
 
         if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
           // forms.dialogConfirmStatus = true;
-          otherParams.showOtherMessage = `该学员已购买会员，是否确认购买？`;
+          otherParams.showOtherMessage = `该学员已购买会员，是否再次购买？`;
           otherParams.showOtherSchool = true;
           otherParams.showCloseButton = false;
           otherParams.showCancelButton = true;
@@ -2066,8 +2066,8 @@ export default defineComponent({
             list={forms.studentList}
             onClose={() => (forms.showSelectStudent = false)}
             onConfirm={(val: any) => {
-              forms.studentItem = val;
               if (val.userId) {
+                forms.studentItem = val;
                 const firstStudent = val;
                 studentInfo.extra.nickname = firstStudent.nickname;
                 const tempGrade: any = forms.gradeList || [];
@@ -2101,14 +2101,29 @@ export default defineComponent({
                 forms.isRegister = 'update';
                 changeTipStatus(true, false);
               } else {
-                forms.isRegister = 'create';
-                changeTipStatus(false, false);
-                studentInfo.extra.nickname = '';
-                studentInfo.extra.currentGradeNum = '';
-                studentInfo.extra.currentClass = '';
-                studentInfo.extra.gender = 1;
-                forms.currentClassText = '';
-                forms.gradeNumText = '';
+                // 判断新建学员是否上限了
+                if (forms.studentList.length >= forms.multi_user_limit) {
+                  otherParams.showOtherMessage = `同一手机号最多创建${forms.multi_user_limit}个学生`;
+                  otherParams.showOtherSchool = true;
+                  otherParams.showCancelButton = false;
+                  otherParams.showCloseButton = true;
+                  otherParams.confirmButtonColor =
+                    'linear-gradient( 305deg, #40C8FF 0%, #3192FF 100%)';
+                  otherParams.confirmButtonText = '我知道了';
+                  otherParams.otherType = 'limit';
+                  otherParams.messageAlign = 'center';
+                  return true;
+                } else {
+                  forms.studentItem = val;
+                  forms.isRegister = 'create';
+                  changeTipStatus(false, false);
+                  studentInfo.extra.nickname = '';
+                  studentInfo.extra.currentGradeNum = '';
+                  studentInfo.extra.currentClass = '';
+                  studentInfo.extra.gender = 1;
+                  forms.currentClassText = '';
+                  forms.gradeNumText = '';
+                }
               }
             }}
           />

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

@@ -225,7 +225,7 @@ export default defineComponent({
             }
           );
 
-          if (registerResult !== 200) {
+          if (registerResult.code !== 200) {
             if (registerResult.code === 5436) {
               forms.showTips = true;
               forms.showMessage = '二维码已经失效，详情请咨询学校老师';

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

@@ -398,7 +398,7 @@ export default defineComponent({
             }
           );
 
-          if (registerResult !== 200) {
+          if (registerResult.code !== 200) {
             if (result.code === 5435 || result.code === 5436) {
               forms.showTips = true;
               forms.showMessage = '报名信息更新，请刷新后重新提交';