lex há 1 ano atrás
pai
commit
45285c9730

+ 5 - 5
src/views/student-register/index.tsx

@@ -516,11 +516,11 @@ export default defineComponent({
       ) {
       ) {
         otherParams.showOtherMessage = `您已绑定【${
         otherParams.showOtherMessage = `您已绑定【${
           forms.studentItem?.schoolName || ''
           forms.studentItem?.schoolName || ''
-        }】,提交后将更换到
-        <span style="color: #2B85FF">${
+        }】,提交后将更换到
+        <span style="color: #2B85FF">${
           forms.registerDetails.schoolName || ''
           forms.registerDetails.schoolName || ''
-        }</span>
-        ,是否确认提交?`;
+        }</span>
+        ,是否确认提交?`;
         otherParams.showOtherSchool = true;
         otherParams.showOtherSchool = true;
         otherParams.showCloseButton = false;
         otherParams.showCloseButton = false;
         otherParams.showCancelButton = true;
         otherParams.showCancelButton = true;
@@ -1995,7 +1995,7 @@ export default defineComponent({
 
 
         <MMessageTip
         <MMessageTip
           show={otherParams.showOtherSchool}
           show={otherParams.showOtherSchool}
-          showCloseButton={otherParams.showCloseButton}
+          // showCloseButton={otherParams.showCloseButton}
           messageAlign={otherParams.messageAlign}
           messageAlign={otherParams.messageAlign}
           message={otherParams.showOtherMessage}
           message={otherParams.showOtherMessage}
           showCancelButton={otherParams.showCancelButton}
           showCancelButton={otherParams.showCancelButton}

+ 2 - 0
src/views/student-register/register-member/index.module.less

@@ -252,6 +252,8 @@
   background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
   background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
   border-radius: 6px;
   border-radius: 6px;
   margin-left: 12px;
   margin-left: 12px;
+  font-size: 14px;
+  font-weight: 500;
 }
 }
 
 
 .radioItem {
 .radioItem {

+ 8 - 3
src/views/student-register/register-member/index.tsx

@@ -206,6 +206,11 @@ export default defineComponent({
           forms.showMessage = '报名信息更新,请刷新后重新提交';
           forms.showMessage = '报名信息更新,请刷新后重新提交';
           forms.showButton = true;
           forms.showButton = true;
         } else {
         } else {
+          studentRegisterStore.setToken(
+            result.data.token_type + ' ' + result.data.access_token
+          );
+          setLoginInit();
+
           const { extra, username } = studentInfo;
           const { extra, username } = studentInfo;
           const registerResult = await request.post(
           const registerResult = await request.post(
             '/edu-app/student/register',
             '/edu-app/student/register',
@@ -371,9 +376,9 @@ export default defineComponent({
       ) {
       ) {
         otherParams.showOtherMessage = `您已绑定【${
         otherParams.showOtherMessage = `您已绑定【${
           forms.studentItem?.schoolName || ''
           forms.studentItem?.schoolName || ''
-        }】,提交后将更换到<span style="color: #2B85FF">${
+        }】,提交后将更换到<span style="color: #2B85FF">${
           forms.details.name || ''
           forms.details.name || ''
-        }</span>,是否确认提交?`;
+        }</span>,是否确认提交?`;
         otherParams.showOtherSchool = true;
         otherParams.showOtherSchool = true;
         otherParams.showCancelButton = true;
         otherParams.showCancelButton = true;
         otherParams.showCloseButton = false;
         otherParams.showCloseButton = false;
@@ -792,7 +797,7 @@ export default defineComponent({
 
 
         <MMessageTip
         <MMessageTip
           show={otherParams.showOtherSchool}
           show={otherParams.showOtherSchool}
-          showCloseButton={otherParams.showCloseButton}
+          // showCloseButton={otherParams.showCloseButton}
           messageAlign={otherParams.messageAlign}
           messageAlign={otherParams.messageAlign}
           message={otherParams.showOtherMessage}
           message={otherParams.showOtherMessage}
           showCancelButton={otherParams.showCancelButton}
           showCancelButton={otherParams.showCancelButton}

+ 2 - 0
src/views/student-register/register-new/index.module.less

@@ -285,6 +285,8 @@
   background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
   background: linear-gradient(135deg, #31C7FF 0%, #007AFE 100%);
   border-radius: 6px;
   border-radius: 6px;
   margin-left: 12px;
   margin-left: 12px;
+  font-size: 14px;
+  font-weight: 500;
 }
 }
 
 
 .radioItem {
 .radioItem {

+ 10 - 4
src/views/student-register/register-new/index.tsx

@@ -36,6 +36,7 @@ import vipGiftIcon from '../images/vip-gift-icon.png';
 // import agreeNo from '../images/agree-no.png';
 // import agreeNo from '../images/agree-no.png';
 import MMessageTip from '@/components/m-message-tip';
 import MMessageTip from '@/components/m-message-tip';
 import SelectStudent from '../modal/select-student';
 import SelectStudent from '../modal/select-student';
+import { setLoginInit } from '@/state';
 
 
 const classList: any = [];
 const classList: any = [];
 for (let i = 1; i <= 40; i++) {
 for (let i = 1; i <= 40; i++) {
@@ -317,9 +318,9 @@ export default defineComponent({
       ) {
       ) {
         otherParams.showOtherMessage = `您已绑定【${
         otherParams.showOtherMessage = `您已绑定【${
           forms.studentItem?.schoolName || ''
           forms.studentItem?.schoolName || ''
-        }】,提交后将更换到
-        <span style="color: #2B85FF">${forms.details.name || ''}</span>
-        ,是否确认提交?`;
+        }】,提交后将更换到
+        <span style="color: #2B85FF">${forms.details.name || ''}</span>
+        ,是否确认提交?`;
         otherParams.showOtherSchool = true;
         otherParams.showOtherSchool = true;
         otherParams.showCancelButton = true;
         otherParams.showCancelButton = true;
         otherParams.showCloseButton = false;
         otherParams.showCloseButton = false;
@@ -378,6 +379,11 @@ export default defineComponent({
           forms.showMessage = '报名信息更新,请刷新后重新提交';
           forms.showMessage = '报名信息更新,请刷新后重新提交';
           forms.showButton = true;
           forms.showButton = true;
         } else {
         } else {
+          studentRegisterStore.setToken(
+            result.data.token_type + ' ' + result.data.access_token
+          );
+          setLoginInit();
+
           const { extra, username } = studentInfo;
           const { extra, username } = studentInfo;
           const registerResult = await request.post(
           const registerResult = await request.post(
             '/edu-app/student/register',
             '/edu-app/student/register',
@@ -852,7 +858,7 @@ export default defineComponent({
 
 
         <MMessageTip
         <MMessageTip
           show={otherParams.showOtherSchool}
           show={otherParams.showOtherSchool}
-          showCloseButton={otherParams.showCloseButton}
+          // showCloseButton={otherParams.showCloseButton}
           messageAlign={otherParams.messageAlign}
           messageAlign={otherParams.messageAlign}
           message={otherParams.showOtherMessage}
           message={otherParams.showOtherMessage}
           showCancelButton={otherParams.showCancelButton}
           showCancelButton={otherParams.showCancelButton}