From 783c6df0a4c69f23cfaf550a923f81f5c8a057c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 10 Aug 2021 16:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E4=B8=8A?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=B8=8D=E5=8A=A0=E8=BD=BDbug=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=9B=BEantV=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E9=BD=90=E5=85=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/home/home.vue                  | 6 +++---
 manager/src/views/lili-components/affix-time.vue | 3 ++-
 manager/src/views/statistics/member.vue          | 2 +-
 manager/src/views/statistics/order.vue           | 2 +-
 manager/src/views/statistics/traffic.vue         | 2 +-
 seller/src/views/statistics/order.vue            | 2 +-
 seller/src/views/statistics/traffic.vue          | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
index bf697ff1..d9306b9e 100644
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -338,7 +338,7 @@ export default {
             container: "orderChart",
             autoFit: true,
             height: 500,
-            padding: [70, 35, 70, 35],
+            padding: [70, 70, 70, 70],
           });
         }
 
@@ -448,7 +448,7 @@ export default {
               container: "pvChart",
               autoFit: true,
               height: 500,
-              padding: [70, 35, 70, 35],
+              padding: [70, 70, 70, 70],
             });
           }
           this.initPvChart();
@@ -466,7 +466,7 @@ export default {
             container: "historyMemberChart",
             autoFit: true,
             height: 500,
-            padding: [70, 35, 70, 35],
+            padding: [70, 70, 70, 70],
           });
         }
 
diff --git a/manager/src/views/lili-components/affix-time.vue b/manager/src/views/lili-components/affix-time.vue
index 7dc7d6e4..795a692e 100644
--- a/manager/src/views/lili-components/affix-time.vue
+++ b/manager/src/views/lili-components/affix-time.vue
@@ -71,8 +71,9 @@ export default {
   methods: {
     // 页面触底
     handleReachBottom() {
+     
       setTimeout(() => {
-        if (this.params.pageNumber * this.params.pageSize <= this.total) {
+        if (this.params.pageNumber * this.params.pageSize <= this.shopTotal) {
           this.params.pageNumber++;
           this.getShopList();
         }
diff --git a/manager/src/views/statistics/member.vue b/manager/src/views/statistics/member.vue
index c9803663..4ff721c7 100644
--- a/manager/src/views/statistics/member.vue
+++ b/manager/src/views/statistics/member.vue
@@ -189,7 +189,7 @@ export default {
               container: "orderChart",
               autoFit: true,
               height: 500,
-              padding: [70, 35, 70, 35],
+              padding: [70, 70, 70, 70],
             });
           }
           this.initMemberChart();
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index d3f3d294..300dc812 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -525,7 +525,7 @@ export default {
             container: "orderChart",
             autoFit: true,
             height: 500,
-            padding: [70, 35, 70, 35],
+            padding: [70, 70, 70, 70],
           });
         }
 
diff --git a/manager/src/views/statistics/traffic.vue b/manager/src/views/statistics/traffic.vue
index 9b11f8ad..1f5b9f06 100644
--- a/manager/src/views/statistics/traffic.vue
+++ b/manager/src/views/statistics/traffic.vue
@@ -197,7 +197,7 @@ export default {
               container: "orderChart",
               autoFit: true,
               height: 500,
-              padding: [70, 35, 70, 35],
+              padding: [70, 70, 70, 70],
             });
           }
           this.initChart();
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 4136acff..8654494c 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -527,7 +527,7 @@ export default {
             container: "orderChart",
             autoFit: true,
             height: 500,
-            padding: [70, 35, 70, 35],
+            padding: [70, 70, 70, 70],
           });
         }
 
diff --git a/seller/src/views/statistics/traffic.vue b/seller/src/views/statistics/traffic.vue
index 4ad03794..348e1315 100644
--- a/seller/src/views/statistics/traffic.vue
+++ b/seller/src/views/statistics/traffic.vue
@@ -203,7 +203,7 @@ export default {
               container: "orderChart",
               autoFit: true,
               height: 500,
-              padding: [70, 35, 70, 35],
+              padding: [70, 70, 70, 70],
             });
           }
           this.initChart();