Merge branch 'dev_v3_lqw' into dev_v3

pages.json

@@ -117,7 +117,8 @@
           "style": {
             "navigationBarTitleText": "登录",
             "navigationBarBackgroundColor": "#ffe079",
-            "navigationBarTextStyle": "black"
+            "navigationBarTextStyle": "black",
+            "navigationStyle": "custom"
           }
         },
         {

pages/goods_cate/goods_cate.vue

@@ -109,7 +109,7 @@ const infoScroll = () => {
   // 设置商品列表高度
   uni.getSystemInfo({
     success: (res) => {
-      height.value = (res.windowHeight) * (750 / res.windowWidth) - 98;
+      height.value = (res.windowHeight) * (750 / res.windowWidth) - 188;
     },
   });
 

pages/index/index.vue

@@ -1053,6 +1053,8 @@ page {
   position: relative;
   z-index: 1;
   height: 100%;
+  padding-bottom: 200rpx;
+  box-sizing: border-box;
 
   .top-box {
     padding-top: 168rpx;

pages/order_addcart/order_addcart.vue

@@ -1246,6 +1246,7 @@ const toMerchant = (obj) => {
 
 .shoppingCart {
   // .labelNav
+  padding-bottom: 200rpx;
   .labelNav {
     position: sticky;
     height: 178rpx;