From cb1dc467753661fab78d03c0cae4c614251f82d4 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 28 Sep 2024 15:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                           | 7 ++++++-
 components/cart/cart.vue                      | 4 +---
 components/diy/footer.vue                     | 3 +--
 pages/cart-page/cart-page.vue                 | 2 +-
 pages/cart/cart.vue                           | 2 +-
 pages/user-address-save/user-address-save.vue | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 112448e3..0a3f5d21 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -45,7 +45,6 @@ iframe,
 .quick-movable-container,
 .online-service-movable-container,
 .buy-nav,
-.cart-buy-nav,
 .plugins-realstore-cart-content {
     left: auto !important;
 }
@@ -57,6 +56,12 @@ iframe,
     width: 100% !important;
     max-height: 500rpx !important;
 }
+@media only screen and (min-width: 1600rpx) {
+    .cart-buy-nav {
+        left: calc(50% - 780rpx) !important;
+        width: 1560rpx !important;
+    }
+}
 
 /**
  * 隐藏导航栏内容、仅展示返回按钮
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 69830c52..dd0769fb 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -1411,11 +1411,9 @@
     .cart-buy-nav {
         position: fixed;
         z-index: 1;
-        left: auto;
+        left: 20rpx;
         bottom: 20rpx;
-        margin-left: 20rpx;
         width: calc(100% - 40rpx);
-        max-width: calc(800px - 40rpx);
         box-shadow: 0rpx 4rpx 8rpx 0px rgba(0, 0, 0, 0.16);
     }
     .cart-nav-base {
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index 11561137..f5a32983 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -119,7 +119,7 @@
 </script>
 <style lang="scss" scoped>
     .footer-nav {
-        z-index: 9;
+        z-index: 102;
         position: fixed;
         bottom: 0;
         left: 0;
@@ -130,7 +130,6 @@
         /* #endif */
         margin: 0 auto;
         background-color: transparent;
-        z-index: 102;
         .footer-nav-content {
             min-height: 140rpx;
             box-sizing: border-box;
diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue
index 9723eab2..449a41cd 100644
--- a/pages/cart-page/cart-page.vue
+++ b/pages/cart-page/cart-page.vue
@@ -7,7 +7,7 @@
         <component-quick-nav :propIsBar="true"></component-quick-nav>
 
         <!-- 公共 -->
-        <component-common @footer-height="footer_height_value_event"></component-common>
+        <component-common @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 <script>
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index dfb4b623..8e7c57d7 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -10,7 +10,7 @@
         <component-app-admin ref="app_admin"></component-app-admin>
 
         <!-- 公共 -->
-        <component-common @footer-height="footer_height_value_event"></component-common>
+        <component-common @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 <script>
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index daf0b021..e978b9b7 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -153,11 +153,11 @@
         </view>
         <view v-else>
             <!-- 提示信息 -->
-            <component-no-data :propIsShowAddressChoice="false" :propStatus="data_list_loding_status"></component-no-data>
+            <component-no-data :propStatus="data_list_loding_status"></component-no-data>
         </view>
 
         <!-- 位置选择 -->
-        <component-choice-location ref="choice_location" @onback="user_back_choice_location"></component-choice-location>
+        <component-choice-location ref="choice_location" :propIsShowAddressChoice="false" @onback="user_back_choice_location"></component-choice-location>
 
         <!-- 公共 -->
         <component-common></component-common>