From e768e1efb309d87d6486fd4e2b9c14d9d3b2b3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=91=E5=BA=B7?=
 <zhangshaokang@zhangshaokangdeMacBook-Pro.local>
Date: Fri, 20 Oct 2023 17:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E6=95=B0=E6=8D=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../userinfo/usercenter/components/dataStatistics.vue          | 10 +++++++++-
 src/views/merchantBack.vue                                     |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 19ba21e..c8e2f73 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -103,7 +103,7 @@
 
         <span slot="billDate">{{dateType}}</span>
       </a-table>
-      <div class="pagecontainer">
+      <div class="pagecontainer" v-if="billList.length > 0">
         <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="10" :total="billPagination.total" @change="onChange" />
         <div class="ant-pagination-options-quick-jumper ml12">
           <span>共{{ billPagination.total }}条，</span>跳至
@@ -827,6 +827,7 @@ export default {
 	    font-size: 14px;
 	}
 	
+	
 .dataStatisticsContainer {
   height: 100%;
 
@@ -1111,4 +1112,11 @@ td:empty:before {
 		    height: 44px;
 		    line-height: 44px;
 	}
+	.ant-empty-description{
+		font-size: 14px;
+		color: rgba(0, 0, 0, 0.25);
+	}
+	.ant-table-placeholder{
+		    margin-bottom: 16px;
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index 84b97a6..0c804d0 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -8,7 +8,7 @@
               <router-link to="/main">
                 <img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/daotianLogo.svg" alt />
                 <!-- <router-link :to="{name:'home'}"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/adminLogo.svg" alt=""> -->
-                <h1>商家控制台</h1>
+                <h1>商家管理后台</h1>
                 <!-- style="position: relative;top: -1px;" -->
               </router-link>
             </div>