增加页面参数判断条件

kmall-admin/src/main/webapp/js/shop/merch.js

@@ -53,22 +53,37 @@ let vm = new Vue({
 	data: {
         showList: true,
         title: null,
-		merch: {merchSn:'',merchName:'',merchShortName:'',sortOrder:'',isShow:1},
-		ruleValidate: {
+        merch: {merchSn:'',merchName:'',merchShortName:'',sortOrder:'',isShow:1},
+        ruleValidate: {
             merchSn: [
-				{required: true, message: '商户编号不能为空', trigger: 'blur'}
-			],
+                {required: true, message: '商户编号不能为空', trigger: 'blur'},
+                {max: 32, message: '商户编号长度不能超过32', trigger: 'blur'}
+            ],
             merchName: [
-                {required: true, message: '商户名称不能为空', trigger: 'blur'}
+                {required: true, message: '商户名称不能为空', trigger: 'blur'},
+                {max: 32, message: '商户名称长度不能超过32', trigger: 'blur'}
             ],
             merchShortName: [
-                {required: true, message: '商户简称不能为空', trigger: 'blur'}
+                {required: true, message: '商户简称不能为空', trigger: 'blur'},
+                {max: 10, message: '商户简称长度不能超过10', trigger: 'blur'}
+            ],
+            sortOrder: [
+                {
+                    type: 'integer', message: '排序只能输入正整数，最大不超过9999', trigger: 'blur', min: 0, max: 9999,
+                    transform(value) {
+                        return Number(value);
+                    }
+                },
+                {pattern: /^[1-9]\d*$/, message: '排序只能输入正整数', trigger: 'blur'}
+            ],
+            remark: [
+                {max: 32, message: '备注长度不能超过32', trigger: 'blur'}
             ]
-		},
-		q: {
+        },
+        q: {
             merchName: '',
             merchSn: ''
-		}
+        }
 	},
 	methods: {
 		query: function () {

kmall-admin/src/main/webapp/js/shop/thirdmerchantbiz.js

@@ -98,7 +98,13 @@ let vm = new Vue({
 		ruleValidate: {
 			name: [
 				{required: true, message: '名称不能为空', trigger: 'blur'}
-			]
+			],
+            thirdPartyMerchCode: [
+                {max: 32, message: '第三方商户代码长度不能超过32', trigger: 'blur'}
+            ],
+            thirdPartyMerchName: [
+                {max: 64, message: '第三方商户名称长度不能超过64', trigger: 'blur'}
+            ]
 		},
 		q: {
 		    name: ''