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

src/views/student-register/index.tsx

@@ -514,9 +514,9 @@ export default defineComponent({
         forms.isRegister === 'update'
       ) {
         otherParams.showOtherMessage = `您已绑定【${
-          forms.registerDetails.schoolName || ''
+          forms.studentItem?.schoolName || ''
         }】，提交后将更换到【${
-          forms.studentItem?.schoolName
+          forms.registerDetails.schoolName || ''
         }】，是否确认提交？`;
         otherParams.showOtherSchool = true;
         otherParams.showCloseButton = false;

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

@@ -342,10 +342,8 @@ export default defineComponent({
         forms.isRegister === 'update'
       ) {
         otherParams.showOtherMessage = `您已绑定【${
-          forms.details.name || ''
-        }】，提交后将更换到【${
-          forms.studentItem?.schoolName
-        }】，是否确认提交？`;
+          forms.studentItem?.schoolName || ''
+        }】，提交后将更换到【${forms.details.name || ''}】，是否确认提交？`;
         otherParams.showOtherSchool = true;
         otherParams.showCancelButton = true;
         otherParams.showCloseButton = false;

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

@@ -316,10 +316,8 @@ export default defineComponent({
         forms.isRegister === 'update'
       ) {
         otherParams.showOtherMessage = `您已绑定【${
-          forms.details.name || ''
-        }】，提交后将更换到【${
-          forms.studentItem?.schoolName
-        }】，是否确认提交？`;
+          forms.studentItem?.schoolName || ''
+        }】，提交后将更换到【${forms.details.name || ''}】，是否确认提交？`;
         otherParams.showOtherSchool = true;
         otherParams.showCancelButton = true;
         otherParams.showCloseButton = false;