Browse Source

修改样式

lex 1 year ago
parent
commit
b4c7f967cb

+ 1 - 1
src/views/collection-record-detail/index.tsx

@@ -123,7 +123,7 @@ export default defineComponent({
         PASS: '已退回',
         REJECT: '退回失败',
         REFUNDING: '退款中',
-        REFUNDED: '已退'
+        REFUNDED: '已退'
       };
       return temp[status];
     };

+ 1 - 1
src/views/member-center/index.tsx

@@ -43,7 +43,7 @@ export default defineComponent({
   async mounted() {
     useEventListener(document, 'scroll', () => {
       const { y } = useWindowScroll();
-      if (y.value > 52) {
+      if (y.value > 20) {
         this.background = '#fff';
         this.color = '#323333';
       } else {

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

@@ -162,13 +162,7 @@ export default defineComponent({
     };
 
     const checkForm = () => {
-      if (!checkPhone(studentInfo.username)) {
-        showToast('请输入正确的手机号码');
-        return true;
-      } else if (!studentInfo.password) {
-        showToast('请输入验证码');
-        return true;
-      } else if (!studentInfo.extra.nickname) {
+      if (!studentInfo.extra.nickname) {
         showToast('请输入学生姓名');
         return true;
       } else if (!studentInfo.extra.currentGradeNum) {
@@ -177,6 +171,12 @@ export default defineComponent({
       } else if (!studentInfo.extra.currentClass) {
         showToast('请选择所在班级');
         return true;
+      } else if (!checkPhone(studentInfo.username)) {
+        showToast('请输入正确的手机号码');
+        return true;
+      } else if (!studentInfo.password) {
+        showToast('请输入验证码');
+        return true;
       }
       return false;
     };
@@ -217,54 +217,6 @@ export default defineComponent({
         <Form labelAlign="top" class={styles.registerForm}>
           <Field
             clearable
-            label="联系方式(直接监护人)"
-            placeholder="请输入手机号码"
-            type="tel"
-            autocomplete="off"
-            v-model={studentInfo.username}
-            maxlength={11}>
-            {{
-              label: () => (
-                <div>
-                  联系方式(直接监护人)
-                  <p class={styles.tips}>手机号是音乐数字课堂的唯一登录账户</p>
-                </div>
-              )
-            }}
-          </Field>
-          <Field
-            center
-            clearable
-            label="验证码"
-            placeholder="请输入验证码"
-            autocomplete="off"
-            type="number"
-            v-model={studentInfo.password}
-            maxlength={6}>
-            {{
-              button: () =>
-                forms.countDownStatus ? (
-                  <span
-                    class={[
-                      styles.codeText,
-                      !validatePhone.value ? styles.codeTextDisabled : ''
-                    ]}
-                    onClick={onSendCode}>
-                    获取验证码
-                  </span>
-                ) : (
-                  <CountDown
-                    ref={(el: any) => (countDownRef.value = el)}
-                    auto-start={false}
-                    time={forms.countDownTime}
-                    onFinish={onFinished}
-                    format="ss秒"
-                  />
-                )
-            }}
-          </Field>
-          <Field
-            clearable
             label="学生姓名"
             placeholder="请输入学生姓名"
             autocomplete="off"
@@ -334,6 +286,54 @@ export default defineComponent({
             modelValue={forms.currentClassText}
             onClick={() => (forms.classStatus = true)}
           />
+          <Field
+            clearable
+            label="联系方式(直接监护人)"
+            placeholder="请输入手机号码"
+            type="tel"
+            autocomplete="off"
+            v-model={studentInfo.username}
+            maxlength={11}>
+            {{
+              label: () => (
+                <div>
+                  联系方式(直接监护人)
+                  <p class={styles.tips}>手机号是音乐数字课堂的唯一登录账户</p>
+                </div>
+              )
+            }}
+          </Field>
+          <Field
+            center
+            clearable
+            label="验证码"
+            placeholder="请输入验证码"
+            autocomplete="off"
+            type="number"
+            v-model={studentInfo.password}
+            maxlength={6}>
+            {{
+              button: () =>
+                forms.countDownStatus ? (
+                  <span
+                    class={[
+                      styles.codeText,
+                      !validatePhone.value ? styles.codeTextDisabled : ''
+                    ]}
+                    onClick={onSendCode}>
+                    获取验证码
+                  </span>
+                ) : (
+                  <CountDown
+                    ref={(el: any) => (countDownRef.value = el)}
+                    auto-start={false}
+                    time={forms.countDownTime}
+                    onFinish={onFinished}
+                    format="ss秒"
+                  />
+                )
+            }}
+          </Field>
         </Form>
         {/* <MProtocol
           center

+ 55 - 55
src/views/student-register/register-modal/index.tsx

@@ -154,13 +154,7 @@ export default defineComponent({
     };
 
     const checkForm = () => {
-      if (!checkPhone(studentInfo.username)) {
-        showToast('请输入正确的手机号码');
-        return true;
-      } else if (!studentInfo.password) {
-        showToast('请输入验证码');
-        return true;
-      } else if (!studentInfo.extra.nickname) {
+      if (!studentInfo.extra.nickname) {
         showToast('请输入学生姓名');
         return true;
       } else if (!studentInfo.extra.currentGradeNum) {
@@ -169,6 +163,12 @@ export default defineComponent({
       } else if (!studentInfo.extra.currentClass) {
         showToast('请选择所在班级');
         return true;
+      } else if (!checkPhone(studentInfo.username)) {
+        showToast('请输入正确的手机号码');
+        return true;
+      } else if (!studentInfo.password) {
+        showToast('请输入验证码');
+        return true;
       }
       return false;
     };
@@ -180,54 +180,6 @@ export default defineComponent({
         <Form labelAlign="top" class={styles.registerForm}>
           <Field
             clearable
-            label="联系方式(直接监护人)"
-            placeholder="请输入手机号码"
-            type="tel"
-            autocomplete="off"
-            v-model={studentInfo.username}
-            maxlength={11}>
-            {{
-              label: () => (
-                <div>
-                  联系方式(直接监护人)
-                  <p class={styles.tips}>手机号是音乐数字课堂的唯一登录账户</p>
-                </div>
-              )
-            }}
-          </Field>
-          <Field
-            center
-            clearable
-            label="验证码"
-            placeholder="请输入验证码"
-            autocomplete="off"
-            type="number"
-            v-model={studentInfo.password}
-            maxlength={6}>
-            {{
-              button: () =>
-                forms.countDownStatus ? (
-                  <span
-                    class={[
-                      styles.codeText,
-                      !validatePhone.value ? styles.codeTextDisabled : ''
-                    ]}
-                    onClick={onSendCode}>
-                    获取验证码
-                  </span>
-                ) : (
-                  <CountDown
-                    ref={(el: any) => (countDownRef.value = el)}
-                    auto-start={false}
-                    time={forms.countDownTime}
-                    onFinish={onFinished}
-                    format="ss秒"
-                  />
-                )
-            }}
-          </Field>
-          <Field
-            clearable
             label="学生姓名"
             placeholder="请输入学生姓名"
             autocomplete="off"
@@ -297,6 +249,54 @@ export default defineComponent({
             modelValue={forms.currentClassText}
             onClick={() => (forms.classStatus = true)}
           />
+          <Field
+            clearable
+            label="联系方式(直接监护人)"
+            placeholder="请输入手机号码"
+            type="tel"
+            autocomplete="off"
+            v-model={studentInfo.username}
+            maxlength={11}>
+            {{
+              label: () => (
+                <div>
+                  联系方式(直接监护人)
+                  <p class={styles.tips}>手机号是音乐数字课堂的唯一登录账户</p>
+                </div>
+              )
+            }}
+          </Field>
+          <Field
+            center
+            clearable
+            label="验证码"
+            placeholder="请输入验证码"
+            autocomplete="off"
+            type="number"
+            v-model={studentInfo.password}
+            maxlength={6}>
+            {{
+              button: () =>
+                forms.countDownStatus ? (
+                  <span
+                    class={[
+                      styles.codeText,
+                      !validatePhone.value ? styles.codeTextDisabled : ''
+                    ]}
+                    onClick={onSendCode}>
+                    获取验证码
+                  </span>
+                ) : (
+                  <CountDown
+                    ref={(el: any) => (countDownRef.value = el)}
+                    auto-start={false}
+                    time={forms.countDownTime}
+                    onFinish={onFinished}
+                    format="ss秒"
+                  />
+                )
+            }}
+          </Field>
         </Form>
         {/* <MProtocol
           center

+ 1 - 1
src/views/student-register/tenant-apply-data/index.module.less

@@ -57,7 +57,7 @@
 
 
     .price {
-      font-size: 24px;
+      font-size: 22px;
       font-family: DINAlternate-Bold, DINAlternate;
       font-weight: bold;
       line-height: 28px;