Merge branch 'master' of http://app.tjzhxx.cn:3001/yyky/yyky_web

src/store/modules/user.js

@@ -51,7 +51,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/user.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

src/views/system/profile/index.vue

@@ -802,7 +802,25 @@ export default {
           { required: true, message: '请选择性别', trigger: 'change' }
         ],
         sfzid: [
-          { required: true, message: '请输入身份证号', trigger: 'blur' },
+        {
+            required: true,
+            // message: "请输入身份证号",
+            trigger: "blur",
+            validator: (rule, value, callback) => {
+              const regex =
+                /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
+              if (!value || value === "" || value === undefined) {
+                callback(new Error("请输入身份证号"));
+              } else if (
+                (value.length === 15 || value.length === 18) &&
+                regex.test(value)
+              ) {
+                callback();
+              } else {
+                callback(new Error("请输入正确的身份证号"));
+              }
+            },
+          },
           {max: 18, msg: '最大为18位'}
         ],
         telOne: [
@@ -1299,6 +1317,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.form.serviceType = 0;
       this.title = "添加用户档案";
     },
     /** 修改按钮操作 */