Merge remote-tracking branch 'origin/master'

src/components/ImagePreview/index.vue

@@ -39,7 +39,8 @@ export default {
       if (isExternal(real_src)) {
         return real_src;
       }
-      return process.env.VUE_APP_BASE_API + real_src;
+
+      return process.env.VUE_APP_IMAGE_URL + real_src;
     },
     realSrcList() {
       if (!this.src) {

src/views/company/staff/form/StaffForm.vue

@@ -216,11 +216,7 @@ export default {
         password: [
           { required: true, message: '登录密码不能为空', trigger: 'blur' },
           { min: 6, max: 20, message: '登录密码长度在6~20个字符', trigger: 'blur' },
-          {
-            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+{}\[\]:;<>,.?~\\-])\S{6,}$/,
-            message: '登录密码必须由大小写字母、数字、特殊字符组成',
-            trigger: 'blur'
-          }
+
         ],
         workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
         joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }]

src/views/login.vue

@@ -133,8 +133,7 @@ export default {
   },
   data() {
     return {
-      tenantCode:"lighting", // TODO 这里手动改还是不太合理
-      // tenantCode:"lanan",
+      tenantCode:"lanan",
       codeUrl: "",
       //是否开启图形验证码
       captchaEnable: false,