Merge remote-tracking branch 'origin/release/1.0' into release/1.0

@@ -50,7 +50,7 @@ export default {
             let mid = value[1];
             let min = value[2];
 
-            if (!max.value) {
+            if (!max || !max.value) {
                 return callback(new Error('一级类目不能为空'));
             } else if (!mid.value) {
 
@@ -84,6 +84,8 @@ export default {
             this.$refs.formData.validate((valid) => {
                 if (valid) {
                     this.goNext();
+                } else {
+                    this.$Message.error('请填写必填项!');
                 }
             });
         },

@@ -449,7 +449,7 @@ export default {
                 this.beforeSubmit();
                 return api.saveBaseProductInfo(this.product);
             }, () => {
-                this.$Message.error('表单验证失败!');
+                this.$Message.error('请填写必填项!');
             });
         },
         nextStep: function(go) {

@@ -528,7 +528,7 @@ export default {
                     if (r1 & r2) {
                         return Promise.resolve();
                     } else {
-                        this.$Message.error('验证未通过');
+                        this.$Message.error('请填写必填项');
                         return Promise.reject();
                     }
                 })

@@ -103,7 +103,7 @@
                 return service.getCategoryList(this.pageData.current, this.pageData.pageSize).then((result) => {
                     if (result.code === 200) {
                         this.pageData.total = result.data.total;
-                        this.pageData.current = result.data.currentPage;
+                        this.pageData.current = result.data.currentPage || 1;
                         this.tableData = result.data.rows;
                     }
                 });

@@ -57,11 +57,7 @@
         },
         methods: {
             allotPrintExpressDetail() {
-                service.allotPrintExpressDetail(this.expressNo)
-                    .then(res => {
-                        this.resolveData(res.data);
-                    });
-
+                this.$Loading.start();
                 service.allotWarehouseInfo()
                     .then(res => {
                         const data = res.data;
@@ -69,6 +65,11 @@
                         this.destAddress = `发往：${data.address} ${data.adminName} ${data.phone}`;
                     });
 
+                service.allotPrintExpressDetail(this.expressNo)
+                    .then(res => {
+                        this.$Loading.finish();
+                        this.resolveData(res.data);
+                    });
             },
             resolveData(data) {
                 _.each(data, item => {
@@ -85,19 +86,21 @@
         margin-bottom: 20px;
         color: #333;
 
-        .exp-no {
-            font-size: 25px;
-        }
+        .detail-header {
+            .exp-no {
+                font-size: 25px;
+            }
 
-        .supply {
-            font-size: 15px;
-        }
+            .supply {
+                font-size: 15px;
+            }
 
-        .address {
-            font-size: 15px;
+            .address {
+                font-size: 15px;
 
-            &.high-light {
-                 color: #ff0000;
+                &.high-light {
+                     color: #ff0000;
+                }
             }
         }
 

 {
   "name": "yoho-shop-manage",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "main": "app.js",
   "scripts": {