Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/webapp/WEB-INF/page/shop/brand.html

@@ -38,7 +38,7 @@
             </Form-item>
             <Row>
                 <i-col span="16">
-                    <Form-item label="图片" prop="imageUrl">
+                    <Form-item label="图片" prop="listPicUrl">
                         <i-input v-model="brand.listPicUrl" placeholder="图片" readonly/>
                     </Form-item>
                 </i-col>

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

@@ -74,6 +74,27 @@ var vm = new Vue({
         ruleValidate: {
             name: [
                 {required: true, message: '品牌名称不能为空', trigger: 'blur'}
+            ],
+            listPicUrl: [
+                {required: true, message: '品牌图片不能为空', trigger: 'blur'}
+            ],
+            simpleDesc: [
+                {required: true, message: '品牌描述不能为空', trigger: 'blur'}
+            ],
+            picUrl: [
+                {required: true, message: '品牌图片不能为空', trigger: 'blur'}
+            ],
+            // sortOrder: [
+            //     {required: true, message: '排序不能为空', trigger: 'blur'}
+            // ],
+            // floorPrice: [
+            //     {required: true, message: '展示价格不能为空', trigger: 'blur'}
+            // ],
+            appListPicUrl: [
+                {required: true, message: 'app显示图片不能为空', trigger: 'blur'}
+            ],
+            newPicUrl: [
+                {required: true, message: '新品牌图片不能为空', trigger: 'blur'}
             ]
         },
         q: {

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

@@ -62,6 +62,24 @@ var vm = new Vue({
         ruleValidate: {
             name: [
                 {required: true, message: '分类名称不能为空', trigger: 'blur'}
+            ],
+            frontDesc: [
+                {required: true, message: '描述不能为空', trigger: 'blur'}
+            ],
+            bannerUrl: [
+                {required: true, message: 'banner图片不能为空', trigger: 'blur'}
+            ],
+            iconUrl: [
+                {required: true, message: 'icon链接不能为空', trigger: 'blur'}
+            ],
+            imgUrl: [
+                {required: true, message: '图片不能为空', trigger: 'blur'}
+            ],
+            wapBannerUrl: [
+                {required: true, message: '手机banner不能为空', trigger: 'blur'}
+            ],
+            frontName: [
+                {required: true, message: 'frontName不能为空', trigger: 'blur'}
             ]
         },
         q: {