Merge branch 'iteration-20240403-apply' into dev

src/views/student-register/index.tsx

@@ -461,7 +461,7 @@ export default defineComponent({
           forms.submitLoading = false;
           return;
         }
-        const { extra, loginType, autoRegister, password, ...res } =
+        const { extra, loginType, autoRegister, password, multiUser, ...res } =
           studentInfo;
         if (
           forms.studentItem.nickname !== extra.nickname &&
@@ -519,38 +519,26 @@ export default defineComponent({
           otherParams.messageAlign = 'left';
           return;
         }
-        // if (!isRegister) {
-        //   const checkSchool = await request.get(
-        //     `/edu-app/open/student/studentSchool?mobile=${studentInfo.username}&code=${studentInfo.password}&type=REGISTER`
-        //   );
-        //   if (checkSchool.data?.schoolId !== forms.schoolId) {
-        //     forms.showOtherSchool = true;
-        //     forms.showOtherMessage = `您已绑定【${
-        //       forms.registerDetails.schoolName || ''
-        //     }】，提交后将更换到【${
-        //       checkSchool.data?.schoolName
-        //     }】，是否确认提交？`;
-        //     return;
-        //   }
-        // }
 
         /*
-      新用户：
-      autoRegister: true
-      loginType: 'SMS'
-
-      已存在用户：
-      autoRegister： false
-      loginType: 'TOKEN'
-      password: xxx
-    */
+          新用户：
+          autoRegister: true
+          loginType: 'SMS'
+
+          已存在用户：
+          autoRegister： false
+          loginType: 'TOKEN'
+          password: xxx
+        */
         let tLoginType = loginType,
           tAutoRegister = autoRegister,
-          tPassword = password;
+          tPassword = password,
+          tMultiUser = multiUser;
         if (forms.isRegister === 'update') {
           tLoginType = 'TOKEN';
           tAutoRegister = false;
           tPassword = forms.studentItem.token;
+          tMultiUser = false;
         }
         const result = await request.post('/edu-app/userlogin', {
           requestType: 'form',
@@ -558,14 +546,13 @@ export default defineComponent({
             loginType: tLoginType,
             autoRegister: tAutoRegister,
             password: tPassword,
+            multiUser: tMultiUser,
             ...res,
             extra: JSON.stringify({
               ...extra,
               giftVipDay:
                 forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
-              schoolId: forms.isChangeSchool
-                ? forms.studentItem.schoolId
-                : forms.schoolId
+              schoolId: forms.schoolId
             })
           }
         });
@@ -614,7 +601,7 @@ export default defineComponent({
           });
           setLogin(res.data);
 
-          // await onRegisterSubmit();
+          await onRegisterSubmit();
         }
       } catch {
         // 重置信息
@@ -678,7 +665,6 @@ export default defineComponent({
         const { data } = await request.get(
           `/edu-app/open/student/studentInfo?mobile=${studentInfo.username}&code=${studentInfo.password}&type=REGISTER`
         );
-        console.log(data, 'studentInfo');
         forms.studentList = data || [];
 
         if (forms.studentList.length > 0) {
@@ -703,6 +689,17 @@ export default defineComponent({
             }
           });
           studentInfo.extra.gender = firstStudent.gender;
+
+          forms.isRegister = 'update';
+        } else {
+          forms.isRegister = 'create';
+          forms.isChangeSchool = false;
+          studentInfo.extra.nickname = '';
+          studentInfo.extra.currentGradeNum = '';
+          studentInfo.extra.currentClass = '';
+          studentInfo.extra.gender = 1;
+          forms.currentClassText = '';
+          forms.gradeNumText = '';
         }
       } catch {
         //
@@ -1885,6 +1882,7 @@ export default defineComponent({
                   }
                 });
                 studentInfo.extra.gender = firstStudent.gender;
+                forms.isRegister = 'update';
               } else {
                 forms.isRegister = 'create';
                 forms.isChangeSchool = false;
@@ -1892,6 +1890,8 @@ export default defineComponent({
                 studentInfo.extra.currentGradeNum = '';
                 studentInfo.extra.currentClass = '';
                 studentInfo.extra.gender = 1;
+                forms.currentClassText = '';
+                forms.gradeNumText = '';
               }
             }}
           />

src/views/student-register/modal/select-student/index.tsx

@@ -70,6 +70,7 @@ export default defineComponent({
               color="linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)"
               onClick={() => {
                 //
+                radioChecked.value = null;
                 emit('confirm', {});
                 emit('close');
               }}>