Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/admin/home/order.vue

@@ -350,12 +350,14 @@ export default {
         page: this.list.page,
       }).then((res) => {
         this.completes(res);
-        if (this.$util.isEmpty(res.data)) return false;
-        this.tabs[0].value = res.data.allNum || 0;
-        this.tabs[1].value = res.data.unPayNum || 0;
-        this.tabs[2].value = res.data.unSendNum || 0;
-        this.tabs[3].value = res.data.sendingNum || 0;
-        this.tabs[4].value = res.data.finishNum || 0;
+        if (this.$util.isEmpty(res.data)){
+          return false
+        }
+        this.tabs[0].value = res.data.shop.totalOrder || 0;
+        this.tabs[1].value = res.data.shop.unPayOrder || 0;
+        this.tabs[2].value = res.data.shop.unSendOrder || 0;
+        this.tabs[3].value = res.data.shop.sendingOrder || 0;
+        this.tabs[4].value = res.data.shop.finishOrder || 0;
       });
     },
     change(e) {