diff --git a/mall4v/src/views/modules/admin/indexImg-add-or-update.vue b/mall4v/src/views/modules/admin/indexImg-add-or-update.vue
index f8b3bd1..1839475 100644
--- a/mall4v/src/views/modules/admin/indexImg-add-or-update.vue
+++ b/mall4v/src/views/modules/admin/indexImg-add-or-update.vue
@@ -11,7 +11,10 @@
+ prop="seq"
+ :rules="[
+ { required: false, pattern: /\s\S+|S+\s|\S/, message: '请输入正确的顺序', trigger: 'blur' }
+ ]">
+ :rules="[
+ { required: true, message: '产品名称不能为空'},
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的产品名称', trigger: 'blur' }
+ ]">
+ prop="brief":rules="[
+ { required: false, pattern: /\s\S+|S+\s|\S/, message: '请输入正确的产品卖点', trigger: 'blur' }
+ ]">
diff --git a/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue b/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue
index 3dd6585..138df8c 100644
--- a/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue
+++ b/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue
@@ -14,6 +14,8 @@
@@ -21,7 +23,10 @@
prop="content">
{
if (!value.trim()) {
this.dataForm.title = ''
+ callback(new Error('公告标题不能为空'))
} else {
callback()
}
diff --git a/mall4v/src/views/modules/shop/pickAddr-add-or-update.vue b/mall4v/src/views/modules/shop/pickAddr-add-or-update.vue
index a23bb5f..d37cf3a 100644
--- a/mall4v/src/views/modules/shop/pickAddr-add-or-update.vue
+++ b/mall4v/src/views/modules/shop/pickAddr-add-or-update.vue
@@ -106,9 +106,13 @@ export default {
},
dataRule: {
addrName: [
- { required: true, message: '自提点名称不能为空', trigger: 'blur' }
+ { required: true, message: '自提点名称不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的自提点名称', trigger: 'blur' }
+ ],
+ addr: [
+ { required: true, message: '地址不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的地址', trigger: 'blur' }
],
- addr: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
city: [{ required: true, message: '城市不能为空', trigger: 'blur' }],
province: [
{ required: true, message: '省份不能为空', trigger: 'blur' }
diff --git a/mall4v/src/views/modules/shop/transport-add-or-update.vue b/mall4v/src/views/modules/shop/transport-add-or-update.vue
index adc929f..49d1cfc 100644
--- a/mall4v/src/views/modules/shop/transport-add-or-update.vue
+++ b/mall4v/src/views/modules/shop/transport-add-or-update.vue
@@ -11,7 +11,10 @@
label-width="80px">
+ :rules="[
+ { required: true, message: '模板名称不能为空'},
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的模板名称', trigger: 'blur' }
+ ]">
diff --git a/mall4v/src/views/modules/sys/area-add-or-update.vue b/mall4v/src/views/modules/sys/area-add-or-update.vue
index a1af431..a07bfab 100644
--- a/mall4v/src/views/modules/sys/area-add-or-update.vue
+++ b/mall4v/src/views/modules/sys/area-add-or-update.vue
@@ -55,7 +55,8 @@ export default {
},
dataRule: {
areaName: [
- { required: true, message: '区域名称不能为空', trigger: 'blur' }
+ { required: true, message: '区域名称不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的区域名称', trigger: 'blur' }
]
},
areaList: [],
@@ -99,11 +100,6 @@ export default {
dataFormSubmit: Debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
- if (!this.dataForm.areaName.trim()) {
- this.dataForm.areaName = ''
- this.$message.error('地区名称不能为空')
- return
- }
this.$http({
url: this.$http.adornUrl('/admin/area'),
method: this.dataForm.areaId ? 'put' : 'post',
diff --git a/mall4v/src/views/modules/sys/config-add-or-update.vue b/mall4v/src/views/modules/sys/config-add-or-update.vue
index f6d6655..368bff8 100644
--- a/mall4v/src/views/modules/sys/config-add-or-update.vue
+++ b/mall4v/src/views/modules/sys/config-add-or-update.vue
@@ -34,10 +34,12 @@
},
dataRule: {
paramKey: [
- { required: true, message: '参数名不能为空', trigger: 'blur' }
+ { required: true, message: '参数名不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的参数名', trigger: 'blur' }
],
paramValue: [
- { required: true, message: '参数值不能为空', trigger: 'blur' }
+ { required: true, message: '参数值不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的参数值', trigger: 'blur' }
]
}
}
diff --git a/mall4v/src/views/modules/sys/menu-add-or-update.vue b/mall4v/src/views/modules/sys/menu-add-or-update.vue
index 168dd5e..f8e5825 100644
--- a/mall4v/src/views/modules/sys/menu-add-or-update.vue
+++ b/mall4v/src/views/modules/sys/menu-add-or-update.vue
@@ -96,7 +96,8 @@
},
dataRule: {
name: [
- { required: true, message: '菜单名称不能为空', trigger: 'blur' }
+ { required: true, message: '菜单名称不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的菜单名称', trigger: 'blur' }
],
url: [
{ validator: validateUrl, trigger: 'blur' }
diff --git a/mall4v/src/views/modules/sys/role-add-or-update.vue b/mall4v/src/views/modules/sys/role-add-or-update.vue
index b73f1ed..2f535ad 100644
--- a/mall4v/src/views/modules/sys/role-add-or-update.vue
+++ b/mall4v/src/views/modules/sys/role-add-or-update.vue
@@ -46,7 +46,11 @@
},
dataRule: {
roleName: [
- { required: true, message: '角色名称不能为空', trigger: 'blur' }
+ { required: true, message: '角色名称不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的角色名称', trigger: 'blur' }
+ ],
+ remark: [
+ { required: false, pattern: /\s\S+|S+\s|\S/, message: '输入格式有误', trigger: 'blur' }
]
},
tempKey: -666666 // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
diff --git a/mall4v/src/views/modules/sys/user-add-or-update.vue b/mall4v/src/views/modules/sys/user-add-or-update.vue
index c8db30a..7ef50d3 100644
--- a/mall4v/src/views/modules/sys/user-add-or-update.vue
+++ b/mall4v/src/views/modules/sys/user-add-or-update.vue
@@ -52,6 +52,7 @@
}
var validateComfirmPassword = (rule, value, callback) => {
if (!this.dataForm.id && !/\S/.test(value)) {
+ this.dataForm.password = ''
callback(new Error('确认密码不能为空'))
} else if (this.dataForm.password !== value) {
callback(new Error('确认密码与密码输入不一致'))
@@ -88,7 +89,8 @@
},
dataRule: {
userName: [
- { required: true, message: '用户名不能为空', trigger: 'blur' }
+ { required: true, message: '用户名不能为空', trigger: 'blur' },
+ { pattern: /\s\S+|S+\s|\S/, message: '请输入正确的用户名', trigger: 'blur' }
],
password: [
{ validator: validatePassword, trigger: 'blur' }