Merge remote-tracking branch 'origin/master'

src/views/customer/AddCustomer.vue

@@ -305,7 +305,12 @@ export default {
                     { required: true, message: '请输入联系人姓名', trigger: 'blur' }
                 ],
                 account: [
-                    { required: true, message: '请输入账号', trigger: 'blur' }
+                    { required: true, message: '请输入账号', trigger: 'blur' },
+                    {
+                        pattern: /^[A-Za-z0-9]*$/,
+                        message: "请输入正确的账号",
+                        trigger: "blur"
+                    }
                 ],
                 phone: [
                     // { required: true, message: '请输入手机号', trigger: 'blur' },