From 2435a74119c0ee0153c2eda7fce6d935ffb2e1e2 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 18 Dec 2024 02:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue         | 7 ++++---
 components/nav-back/nav-back.vue | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index a83ed9c6..48e8fd3e 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -3,7 +3,7 @@
         <block v-if="is_first == 0">
             <block v-if="(plugins_realstore_info || null) != null">
                 <!-- 顶部导航 -->
-                <component-nav-back propClass="bg-white" propColor="#333" :propFixed="false" :propIsShowBack="propSourceType !== 'page' ? false : true">
+                <component-nav-back propClass="bg-white" propColor="#333" :propFixed="false" :propIsShowBack="propSourceType == 'page'">
                     <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 cr-black">
@@ -35,7 +35,7 @@
             </block>
             <block v-else>
                 <!-- #ifndef MP-TOUTIAO -->
-                <component-nav-back propClass="bg-white" propColor="#333" propNameClass="cr-black" :propName="$t('common.cart')" :propFixed="false" :propIsShowBack="propSourceType !== 'page' ? false : true" :propIsRightSlot="false"></component-nav-back>
+                <component-nav-back propClass="bg-white" propColor="#333" propNameClass="cr-black" :propName="$t('common.cart')" :propFixed="false" :propIsShowBack="propSourceType == 'page'" :propIsRightSlot="false"></component-nav-back>
                 <!-- #endif -->
             </block>
         </block>
@@ -490,7 +490,8 @@
                         this.get_data_list(1);
                     }
                 } else {
-                    this.setData({
+                    this.setData({
+                        is_first: 0,
                         user: null,
                         data_list: [],
                         plugins_realstore_info: null,
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
index 0f4f23ab..e6d17034 100644
--- a/components/nav-back/nav-back.vue
+++ b/components/nav-back/nav-back.vue
@@ -81,6 +81,7 @@
             this.setData({
                 is_show_back: this.propIsShowBack && !app.globalData.is_tabbar_pages()
             });
+            console.log(this.is_show_back, this.propIsShowBack)
         },
         mounted() {
             var self = this;