Przeglądaj źródła

Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

mo 2 lat temu
rodzic
commit
32a37e7b30

+ 8 - 3
public/project/schoolRegister.html

@@ -88,9 +88,8 @@
           </template>
         </van-field>
 
-        <van-field required label="邮箱地址" v-model="forms.email"
-          :rules="[{ required: true, message: '请输入学校邮箱地址' }, { pattern: emailPattern, message: '输入邮箱地址有误' }]"
-          name="email" placeholder="请输入学校邮箱地址">
+        <van-field label="邮箱地址" v-model="forms.email" :rules="[{validator: validatorEmail}]" name="email"
+          placeholder="请输入学校邮箱地址">
         </van-field>
       </van-cell-group>
 
@@ -233,6 +232,12 @@
         this.setLoading(false)
       },
       methods: {
+        validatorEmail(val) {
+          console.log(val)
+          if (val && !this.emailPattern.test(val)) {
+            return '输入邮箱地址有误'
+          }
+        },
         onLinkUrl() {
           this.submitStatus = false
           window.location.href = window.location.origin + '/orchestra-student/#/download?type=manage'

+ 2 - 1
src/views/information/index.tsx

@@ -24,6 +24,7 @@ export default defineComponent({
       params: {
         keyword: null,
         status: true,
+        type: 'HOT_CONSULTATION',
         page: 1,
         rows: 20
       }
@@ -109,7 +110,7 @@ export default defineComponent({
                 }}
               >
                 {{
-                  icon: () => <Image src={item.coverImage} class={styles.img} />,
+                  icon: () => <Image src={item.coverImage} class={styles.img} fit="cover" />,
                   title: () => (
                     <>
                       <div class={[styles.title, 'van-ellipsis']}>{item.title}</div>