Merge branch 'iteration-20240723' into jenkins-test

src/views/activation-code/activation-register/index.tsx

@@ -813,13 +813,13 @@ export default defineComponent({
                 clearable={false}
                 label="联系方式"
                 placeholder="请输入手机号码"
-                type="tel"
+                type="digit"
                 required
                 autocomplete="off"
                 inputAlign="right"
                 v-model={studentInfo.username}
                 maxlength={11}
-                onUpdate:modelValue={() => {
+                onUpdate:modelValue={(val: any) => {
                   phoneChangeEmptyInfo();
                 }}></Field>
 

src/views/activation-code/instrument-registration/index.tsx

@@ -6,7 +6,7 @@ import loginError from './images/login-error.png';
 import bannerBg from './images/banner.png';
 import request from '@/helpers/request';
 import { useRouter } from 'vue-router';
-import { browser } from '@/helpers/utils';
+import { browser, checkPhone } from '@/helpers/utils';
 
 export default defineComponent({
   name: 'instrument-registration',
@@ -19,9 +19,8 @@ export default defineComponent({
       loading: false
     });
     const onSubmit = async () => {
-      if (!state.mobile) {
-        showToast('请输入手机号');
-        return;
+      if (!checkPhone(state.mobile)) {
+        return showToast('请输入正确的手机号码');
       }
       state.loading = true;
       try {
@@ -49,6 +48,7 @@ export default defineComponent({
           if (item.code !== 200) {
             state.statusShow = true;
             state.progressRate = 0;
+            state.loading = false;
           } else {
             router.push({
               path: '/activationRegistrationDetail',
@@ -57,7 +57,6 @@ export default defineComponent({
               }
             });
           }
-          state.loading = false;
         } else {
           state.progressRate += 4;
         }
@@ -75,7 +74,7 @@ export default defineComponent({
               v-model={state.mobile}
               autocomplete="off"
               maxlength={11}
-              type="tel"
+              type="digit"
               placeholder="请输入【音乐数字课堂】激活成功时的手机号"
             />
 

src/views/activation-code/record.tsx

@@ -163,7 +163,7 @@ export default defineComponent({
                   </div>
                   <div class={styles.itemTime}>
                     激活时间：
-                    <span>{dayjs(item.activateTime).format('YYYY-MM-DD')}</span>
+                    <span>{item.activateTime}</span>
                   </div>
                 </div>
               ))}