From 5bd5dbdda91d830e00e684a7ea9ccc5e63cce5b1 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 16 Jan 2024 19:17:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=B8=8D=E9=80=89=E6=97=B6=E8=AE=A1=E7=AE=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=202024.1.16=20sws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue | 8 ++++++++
 lang/zh.json             | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 74dbfcaa..4759c1ff 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -1001,6 +1001,14 @@
                     }
                 }
                 if (selected_count <= 0) {
+                    this.setData({
+                        preferential_price: 0,
+                        increase_price: 0,
+                        total_price: 0,
+                        all_total_price: 0,
+                        total_num: 0,
+                        discount_detail_list: [],
+                    });
                     return false;
                 }
 
diff --git a/lang/zh.json b/lang/zh.json
index e299de1f..bf78a733 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -6,10 +6,10 @@
 		"es": "西班牙语"
 	},
 	"common": {
-        "home":"首页",
-        "category":"分类",
-        "cart":"购物车",
-        "my":"我的",
+		"home": "首页",
+		"category": "分类",
+		"cart": "购物车",
+		"my": "我的",
 		"confirm": "确认",
 		"cancel": "取消",
 		"not_yet": "暂不",

From a7ce9bbe7a0c3a201fa132795a9e799aa7a14659 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 16 Jan 2024 19:58:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=B4=AD=E7=89=A9=E8=BD=A6=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=BA=97=E5=88=87=E6=8D=A2=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=202024.1.16=20sws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue          | 21 ++++++++++++++-------
 components/nav-back/nav-back.vue  |  2 +-
 pages.json                        | 17 +++++++++++++++--
 pages/cart-page/cart-page.vue     | 14 +++++++-------
 pages/plugins/ask/index/index.vue |  2 +-
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 4759c1ff..b298febb 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -4,10 +4,10 @@
         <block v-if="is_first == 0">
             <block v-if="(plugins_realstore_info || null) != null">
                 <!-- 顶部导航 -->
-                <component-nav-back propClass="bg-white" propNameClass="cr-black" :propFixed="false" :propIsShowBack="false" :propIsRightSlot="false">
-                    <template slot="content">
+                <component-nav-back propClass="bg-white" propColor="#333" :propFixed="false" :propIsShowBack="is_nav_show_back">
+                    <template slot="right" class="flex-1 cart-right-title">
                         <view class="cart-top-nav tc auto">
-                            <view class="cart-top-nav-content bg-grey-f7 round padding-xss">
+                            <view class="cart-top-nav-content bg-grey-f7 round padding-xss cr-black">
                                 <view :class="'item dis-inline-block round cp ' + (cart_type_value == 'shop' ? 'bg-white cr-main' : '')" data-type="shop" @tap="cart_type_event">{{ $t('cart.cart.v37ow8') }}</view>
                                 <view :class="'item dis-inline-block round cp ' + (cart_type_value == 'realstore' ? 'bg-white cr-main' : '')" data-type="realstore" @tap="cart_type_event">{{ $t('cart.cart.09gl3g') }}</view>
                             </view>
@@ -381,6 +381,8 @@
                 discount_detail_goods_list_status: false,
                 // 预下单计算开关
                 pre_order_status: 1,
+                // 商城门户切换开关
+                is_nav_show_back: false,
             };
         },
 
@@ -490,6 +492,12 @@
                     app.globalData.page_share_handle();
                 }
             },
+            cart_nav_back(status){
+                // 请求数据
+                this.setData({
+                    is_nav_show_back: status || false,
+                });
+            },
 
             // 获取数据
             get_data(type = 0) {
@@ -1441,12 +1449,11 @@
     /**
      * 顶部导航
      */
+     .cart-right-title {
+        padding-right: 40rpx;
+     }
     .cart-top-nav {
         width: 260rpx;
-        height: 80rpx;
-        /* #ifdef H5 */
-        padding-top: 20rpx;
-        /* #endif */
     }
     .cart-top-nav .item {
         width: 50%;
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
index 79b16007..d3cca1dc 100644
--- a/components/nav-back/nav-back.vue
+++ b/components/nav-back/nav-back.vue
@@ -3,7 +3,7 @@
         <view class="pa-w" :class="(propFixed ? 'pf z-i left-0 top-0 right-0' : '') + ' ' + propClass" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0) + 'px;background-color:rgba(255,255,255,' + opacity + ');' + propStyle">
             <!-- 返回 -->
             <!-- #ifndef MP-ALIPAY -->
-            <view v-if="(propName || null) != null || propIsRightSlot" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? '' : 'padding-vertical-main')">
+            <view v-if="(propName || null) != null || propIsRightSlot || propIsShowBack" class="nav-back padding-horizontal-main round va-m flex-row align-c" :class="(opacity > 0.3 ? 'cr-black ' : 'cr-white ') + (status_bar_height > 0 ? '' : 'padding-vertical-main')">
                 <view v-if="(propName || null) != null" :class="'text-size-md tc pa left-0 right-0 padding-top-xs '+propNameClass" :style="propNameOpacity ? (opacity ? 'color:rgba(51,51,51,' + opacity + ')' : '') : ''">{{ propName }}</view>
                 <iconfont v-if="propIsShowBack" name="icon-arrow-left" size="40rpx" @tap="top_nav_left_back_event" propClass="pr top-xs z-i" :color="propColor"></iconfont>
                 <slot v-if="propIsRightSlot" name="right"></slot>
diff --git a/pages.json b/pages.json
index d829fbea..773cda13 100644
--- a/pages.json
+++ b/pages.json
@@ -79,9 +79,22 @@
         {
             "path": "pages/cart-page/cart-page",
             "style": {
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+                "navigationStyle": "custom",
+                // #endif
+                // #ifndef MP-ALIPAY
+                "navigationBarTitleText": "购物车",
+                // #endif
+                // #ifdef MP-ALIPAY
+                "transparentTitle": "always",
+                "titlePenetrate": "YES",
+                "navigationBarTitleText": "",
+                // 该页不显示滚动条
+                "scrollIndicator": "none",
+                // #endif
                 "enablePullDownRefresh": false,
-                "disableScroll": true,
-                "navigationBarTitleText": "购物车"
+                // 禁止页面下拉
+                "disableScroll": true
             }
         },
         {
diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue
index c8964874..aa445b2f 100644
--- a/pages/cart-page/cart-page.vue
+++ b/pages/cart-page/cart-page.vue
@@ -9,8 +9,8 @@
 </template>
 <script>
     const app = getApp();
-    import componentQuickNav from "../../components/quick-nav/quick-nav";
-    import componentCart from "../../components/cart/cart";
+    import componentQuickNav from '../../components/quick-nav/quick-nav';
+    import componentCart from '../../components/cart/cart';
     export default {
         data() {
             return {
@@ -19,7 +19,7 @@
         },
         components: {
             componentQuickNav,
-            componentCart
+            componentCart,
         },
 
         onLoad(params) {
@@ -32,13 +32,13 @@
             app.globalData.page_event_onshow_handle();
 
             // 数据加载
-            if((this.$refs.cart || null) != null) {
+            if ((this.$refs.cart || null) != null) {
                 this.$refs.cart.init();
+                this.$refs.cart.cart_nav_back(true);
             }
         },
 
-        methods: {}
+        methods: {},
     };
 </script>
-<style>
-</style>
\ No newline at end of file
+<style></style>
diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue
index 5f8fea9b..d1407c23 100644
--- a/pages/plugins/ask/index/index.vue
+++ b/pages/plugins/ask/index/index.vue
@@ -1,6 +1,6 @@
 <template>
     <view :class="theme_view">
-        <component-nav-back :propFixed="false" propClass="bg-white" propColor="#333">
+        <component-nav-back :propFixed="false" propClass="bg-white cr-black" propColor="#333">
             <template slot="right" :class="is_mp_env ? 'top-search-width' : ''">
                 <view class="margin-left-main" :class="is_mp_env ? '' : 'flex-1 flex-width'">
                     <component-search @onsearch="search_button_event" propIsOnEvent :propIsRequired="false" propIconColor="#ccc" propPlaceholderClass="cr-grey-c" propBgColor="#f6f6f6"></component-search>