Merge remote-tracking branch 'origin/dev' into dev

src/api/system/motionInfo.js

@@ -38,7 +38,7 @@ export function updateMotionInfo(data) {
 // 删除运动处方字典
 export function delMotionInfo(id) {
     return request({
-        url: '/system/motionInfo' + id,
+        url: '/system/motionInfo/' + id,
         method: 'delete'
     })
 }

src/views/system/classconstitution/index.vue

@@ -51,7 +51,7 @@
       append-to-body
       :before-close="classcancel"
     >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px">
+      <el-table :data="classinfoList" align="center" style="margin-top: 10px" @cell-dblclick="classclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button

src/views/system/kindergartenInfo/index.vue

@@ -250,7 +250,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联系人" prop="contacts">
-          <el-input v-model="form.contacts" placeholder="请输入联系人" />
+          <el-input v-model="form.contacts" placeholder="请输入联系人" maxlength="15" />
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input
@@ -287,22 +287,28 @@ export default {
   data() {
     // 验证手机号的规则
     var checkMobile = (rule, value, cb) => {
+      console.log(value);
+      var str = String(value);
+      console.log(str);
       // 验证手机号的正则表达式
       const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+      /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+
       const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
       const isTel = reg.test(value);
-      if (value.length == 11) {
-        if (regMobile.test(value)) {
+
+      if (str.length == 11) {
+        if (regMobile.test(str)) {
           return cb();
         }
-      } else if (11 < value.length <= 13) {
+      } else if (11 < str.length <= 13) {
         if (isTel) {
           return cb();
         }
       }
       cb(new Error("请输入正确的联系电话"));
     };
+
     return {
       // 遮罩层
       loading: true,