Merge branch 'master' of zyh/kmall-haikong into master

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

@@ -164,14 +164,15 @@
     var vm = new Vue({
         el: '#rrapp',
         data: {
-            orderSum: 0,
+            orderSum: 0,//所有订单
             dfOrderSum: 0,//待发货
             yfOrderSum: 0,//已发货
             yfkOrderSum: 0,//待付款
             ywcOrderSum: 0,//已完成
-            thcOrderSum: 0,//退款
+            thcOrderSum: 0,//退款订单
             userSum: 0,//消费记录总数
             goodsSum: 0,//所有商品数
+
             yfkOrderUserSum: 0,//已付款订单会员数
             oderUserSum: 0,//有订单会员数
             todayUserOrder: 0,//今日订单数
@@ -283,7 +284,7 @@
             $.getJSON("../order/queryMainTotal", function (r) {
                 vue.orderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?orderStatus=201&payStatus=2&isOnfiilineOrder=0", function (r) {
+            $.getJSON("../order/queryTotal?orderStatus=201&payStatus=2&isOnfiilineOrder=1", function (r) {
                 vue.dfOrderSum = r.sum;
                 if (r.sum > 0) {
                     iview.Notice.info({
@@ -306,21 +307,20 @@
                     iN.setTitle(true).player();
                 }
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=0&shippingStatus=1", function (r) {
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&shippingStatus=1", function (r) {
                 vue.yfOrderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=0&orderStatus=0", function (r) {
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0", function (r) {
                 vue.yfkOrderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=0&orderStatus=402", function (r) {
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=402", function (r) {
                 vue.ywcOrderSum = r.sum;
             });
            $.getJSON("../orderrefund/queryMainTotal", function (r) {
-               console.log(r.sum)
                vue.thcOrderSum = r.sum;
            });
-            $.get("../orderrefund/queryTotal?isOnfflineOrder=0&refundStatus=1", function (r) {
-                vue.thcOrderSum = r.sum;
+            $.get("../orderrefund/queryTotal?isOnfflineOrder=1&refundStatus=1", function (r) {
+                // vue.thcOrderSum = r.sum;
                 if (r.sum > 0) {
                     iview.Notice.info({
                         title: '您有退款申请订单',
@@ -342,6 +342,13 @@
                     iN.setTitle(true).player();
                 }
             });
+            $.getJSON("../mall2memberconsumptionrecords/queryTotal", function (r) {
+                vue.userSum = r.userSum;
+            });
+            $.getJSON("../goods/queryTotal", function (r) {
+                vue.goodsSum = r.goodsSum;
+            });
+
             $.getJSON("../order/getUserOrderInfo?type=yfkOrderUserSum", function (r) {
                 vue.yfkOrderUserSum = r.result;
             });
@@ -364,12 +371,7 @@
                 vue.hitCount = r.hitCount;
             });
 
-            $.getJSON("../mall2memberconsumptionrecords/queryTotal", function (r) {
-                vue.userSum = r.userSum;
-            });
-            $.getJSON("../goods/queryTotal", function (r) {
-                vue.goodsSum = r.goodsSum;
-            });
+
         },
         updated: function () {
             let vue = this;