Browse Source

Merge branch 'Nov16thResetMusic' into online

wolyshaw 4 years ago
parent
commit
9a76dbbea1
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/components/copy-text/index.vue
  2. 1 1
      src/views/studentManager/studentList.vue

+ 1 - 1
src/components/copy-text/index.vue

@@ -1,7 +1,7 @@
 <template>
   <span class="copy" v-if="$slots.default || text">
     <slot/>{{text}}
-    <i @click="copyText" title="复制" class="el-icon-document-copy"></i>
+    <i v-if="!!text" @click="copyText" title="复制" class="el-icon-document-copy"></i>
   </span>
 </template>
 

+ 1 - 1
src/views/studentManager/studentList.vue

@@ -295,7 +295,7 @@
           :rules="[
             { required: true, message: '请输入手机号' },
             {
-              pattern: /^1[3456789]\d{9}$/,
+              pattern: /^1\d{10}$/,
               message: '请输入正确的手机号',
               trigger: 'blur',
             },