1

src/components/userinfo/usercenter/components/dataStatistics.vue

@@ -103,8 +103,8 @@
 
         <span slot="billDate">{{dateType}}</span>
       </a-table>
-      <div class="pagecontainer">
-        <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="8" :total="billPagination.total" @change="onChange" />
+      <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>跳至
           <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
@@ -827,6 +827,7 @@ table {
 	    font-size: 14px;
 	}
 	
+	
 .dataStatisticsContainer {
   height: 100%;
 
@@ -1106,4 +1107,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>

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>