统计修改

src/components/mallIndex.vue

@@ -299,7 +299,7 @@
 
 </style>
 <template>
-  <div class="mallIndex">
+  <div class="mallIndex" v-loading="loading">
     <div class="zanTotalTop">数据概况</div>
     <div class="mallIndex_Second">
       <div class="searchDiv">
@@ -517,6 +517,8 @@
   export default {
     data() {
       return {
+        //加载
+        loading: false,
         //基础数据
         activeName: '',
         //销售情况
@@ -557,9 +559,6 @@
       //数据改变
       getChange() {
         this.getBasicData();
-        this.getMallIndexSalesStatistics();
-        this.GetMallIndesSalesIncomeStatistics();
-        this.GetMallIndesSalesUserStatistics();
       },
       //基础数据日期切换
       handleClick(tab, event) {
@@ -577,6 +576,7 @@
       },
       //获取基础数据
       getBasicData() {
+        this.loading = true;
         if (this.dateStr && this.dateStr.length > 0) {
           this.basicQMsg.StartDate = this.dateStr[0];
           this.basicQMsg.EndDate = this.dateStr[1];
@@ -585,53 +585,31 @@
           this.basicQMsg.EndDate = '';
         }
         this.apipost("/api/Tenant/MallIndexStatistics", this.basicQMsg, res => {
+          this.loading = false;
           if (res.data.resultCode == 1) {
-            this.basicData = res.data.data;
-          } else {
-            this.Info(res.data.message);
-          }
-        })
-      },
-      //销售情况统计
-      getMallIndexSalesStatistics() {
-        this.apipost("/api/Tenant/MallIndexSalesStatistics", this.basicQMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.salesData = res.data.data;
-            this.initMap()
-          } else {
-            this.Info(res.data.message);
-          }
-        })
-      },
-      //商品购买力TOP排行
-      GetMallIndesSalesIncomeStatistics() {
-        this.apipost("/api/Tenant/MallIndesSalesIncomeStatistics", this.basicQMsg, res => {
-          if (res.data.resultCode == 1) {
-            var array = res.data.data;
-            if (array) {
-              if (array.length <= 2) {
-                this.saleIncomeData = array;
+            //基础数据统计
+            this.basicData = res.data.data.basicData;
+            //销售情况统计
+            this.salesData = res.data.data.salesData;
+            //商品购买力TOP排行
+            var saleGoodsArray = res.data.data.saleIncomeData;
+            if (saleGoodsArray) {
+              if (saleGoodsArray.length <= 2) {
+                this.saleIncomeData = saleGoodsArray;
               } else {
-                this.saleIncomeData = array.slice(0, 10);
+                this.saleIncomeData = saleGoodsArray.slice(0, 10);
               }
             }
-          } else {
-            this.Info(res.data.message);
-          }
-        })
-      },
-      //用户购买力TOP排行
-      GetMallIndesSalesUserStatistics() {
-        this.apipost("/api/Tenant/MallIndesSalesUserStatistics", this.basicQMsg, res => {
-          if (res.data.resultCode == 1) {
-            var array = res.data.data;
-            if (array) {
-              if (array.length <= 2) {
-                this.saleUserData = array;
+            //用户购买力TOP排行
+            var saleUserArray = res.data.data.saleUserData;
+            if (saleUserArray) {
+              if (saleUserArray.length <= 2) {
+                this.saleUserData = saleUserArray;
               } else {
-                this.saleUserData = array.slice(0, 10);
+                this.saleUserData = saleUserArray.slice(0, 10);
               }
             }
+            this.initMap();
           } else {
             this.Info(res.data.message);
           }