Merge branch 'dev_v3_lqw' into dev_v3

pages/merchantCenter/index.vue

@@ -324,7 +324,7 @@ function formatMoney(value) {
 .container {
   background-color: #f5f5f5;
   min-height: 100vh;
-  padding-bottom: 30rpx;
+  padding-bottom: 180rpx;
 }
 
 /* 顶部用户信息 */

pages/user/index.vue

@@ -651,7 +651,7 @@ const getHistoryList = async () => {
 .container {
   background-color: #f5f5f5;
   min-height: 100vh;
-  padding-bottom: 30rpx;
+  padding-bottom: 180rpx;
 }
 
 /* 顶部用户信息 */