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

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

@@ -77,20 +77,20 @@
                         class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            <div class="small-box bg-aqua">
-                <div class="inner">
-                    <h3>{{ywcOrderSum}}</h3>
-                    <p>已完成</p>
-                </div>
-                <div class="icon">
-                    <i class="fa fa-shopping-bag"></i>
-                </div>
-                <a class="small-box-footer"></a>
-                <a onclick="vm.toOrderByOrderStatus(402)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
-            </div>
-        </div>
+<!--        <div class="col-md-3 col-sm-6 col-xs-12">-->
+<!--            <div class="small-box bg-aqua">-->
+<!--                <div class="inner">-->
+<!--                    <h3>{{ywcOrderSum}}</h3>-->
+<!--                    <p>已完成</p>-->
+<!--                </div>-->
+<!--                <div class="icon">-->
+<!--                    <i class="fa fa-shopping-bag"></i>-->
+<!--                </div>-->
+<!--                <a class="small-box-footer"></a>-->
+<!--                <a onclick="vm.toOrderByOrderStatus(402)" class="small-box-footer">详情 <i-->
+<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="col-md-3 col-sm-6 col-xs-12">
             <div class="small-box bg-red">
                 <div class="inner">
@@ -284,16 +284,16 @@
             $.getJSON("../order/queryMainTotal", function (r) {//所有订单
                 vue.orderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=300", function (r) {//已发货
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=300&orderType=1", function (r) {//已发货
                 vue.yfOrderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0", function (r) {//待付款
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0&orderType=1", function (r) {//待付款
                 vue.yfkOrderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=402", function (r) {//已完成
-                vue.ywcOrderSum = r.sum;
-            });
-           $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=401", function (r) {//退款订单
+            // $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=402", function (r) {//已完成
+            //     vue.ywcOrderSum = r.sum;
+            // });
+           $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=401&orderType=1", function (r) {//退款订单
                vue.thcOrderSum = r.sum;
            });
             $.getJSON("../mall2memberconsumptionrecords/queryTotal", function (r) {//消费记录总数