Merge branch 'iteration-20240424' into jenkins-test

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

@@ -532,9 +532,9 @@ export default defineComponent({
         !forms.isChangeSchool &&
         forms.isRegister === 'update'
       ) {
-        otherParams.showOtherMessage = `您已绑定【${
+        otherParams.showOtherMessage = `您已绑定<span style="color: #2B85FF">【${
           forms.studentItem?.schoolName || ''
-        }】，提交后将更换到
+        }】</span>，提交后将更换到
         <span style="color: #2B85FF">【${
           forms.registerDetails.schoolName || ''
         }】</span>
@@ -1634,6 +1634,8 @@ export default defineComponent({
               center
               onClick={() => {
                 // console.log(forms.joinType, 'joinType');
+                if (forms.registerType !== 'SELECT_BUY_GOODS') return;
+
                 if (forms.joinType === 'digitalize') {
                   otherParams.showOtherMessage = `没有陪练工具，将无法实现同步练习`;
                   otherParams.showOtherSchool = true;

src/views/student-register/index.tsx

@@ -47,7 +47,7 @@ import MDialog from '@/components/m-dialog';
 // import functionBg from './images/new/function-bg.png';
 import tuangou from './images/new/tuangou.png';
 import icon3 from './images/new/icon-3.png';
-import icon5 from './images/new/icon-5.png';
+import icon5 from './images/new/icon-7.png';
 import icon6 from './images/new/icon-6.png';
 import giftTip from './images/new/icon-4.png';
 import iconGift from './images/new/icon-gift.png';