From e45f69c687126b56b4cbf43092e5f820d695be42 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 28 Oct 2025 15:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                         |  2 ++
 components/nav-back/nav-back.vue                |  6 +++++-
 pages.json                                      |  4 ++--
 pages/index/index.vue                           |  8 --------
 pages/plugins/ask/detail/detail.vue             |  3 ---
 pages/plugins/blog/detail/detail.vue            |  3 ---
 .../shop/components/shop-header/shop-header.vue | 17 +++++++++++++----
 pages/plugins/shop/design/design.vue            |  5 -----
 pages/plugins/shop/detail/detail.vue            |  4 ----
 pages/plugins/shop/diy/diy.vue                  |  5 -----
 pages/plugins/shop/index/index.vue              |  6 ------
 11 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/App.vue b/App.vue
index 0f34e1a1..9c2a0ae5 100644
--- a/App.vue
+++ b/App.vue
@@ -3167,6 +3167,8 @@
                 if(client_value == 'alipay') {
                     // 自定义头页面
                     var pages_always = [
+                        'pages/plugins/shop/index/index',
+                        'pages/plugins/shop/detail/detail',
                         'pages/plugins/realstore/detail/detail',
                         'pages/plugins/seckill/index/index',
                         'pages/plugins/points/index/index',
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
index 60847ccc..f7299d5f 100644
--- a/components/nav-back/nav-back.vue
+++ b/components/nav-back/nav-back.vue
@@ -69,6 +69,7 @@
                 theme_view: app.globalData.get_theme_value_view(),
                 client_value: app.globalData.application_client_type(),
                 status_bar_height: 0,
+                is_show_back: true,
                 // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || H5 || APP
                 status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0, true)),
                 // #endif
@@ -94,7 +95,10 @@
         methods: {
             // 返回事件
             top_nav_left_back_event() {
-                app.globalData.page_back_prev_event();
+                var arr = ['alipay', 'baidu'];
+                if(arr.indexOf(this.client_value) == -1) {
+                    app.globalData.page_back_prev_event();
+                }
             },
         },
     };
diff --git a/pages.json b/pages.json
index eaf24137..7a9af231 100644
--- a/pages.json
+++ b/pages.json
@@ -1294,7 +1294,7 @@
                         "navigationStyle": "custom",
                         // #endif
                         // #ifdef MP-ALIPAY
-                        "transparentTitle": "auto",
+                        "transparentTitle": "always",
                         "titlePenetrate": "YES",
                         // #endif
                         "enablePullDownRefresh": true,
@@ -1308,7 +1308,7 @@
                         "navigationStyle": "custom",
                         // #endif
                         // #ifdef MP-ALIPAY
-                        "transparentTitle": "auto",
+                        "transparentTitle": "always",
                         "titlePenetrate": "YES",
                         // #endif
                         "navigationBarTitleText": "",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6727d1a7..1c79f280 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -289,14 +289,6 @@
             <!-- 公共 -->
             <component-common ref="common" :propIsGrayscale="plugins_mourning_data_is_app"></component-common>
         </block>
-        
-        
-        <!-- <view class="margin-top-xxxxl padding-top-xxxxl padding-bottom-xxxxl tc">
-            <navigator data-value="/pages/plugins/live/push/push" @tap="url_event">推流</navigator>
-            <view class="margin-top-lg">
-                <navigator data-value="/pages/plugins/live/pull/pull" @tap="url_event">拉流</navigator>
-            </view>
-        </view> -->
     </view>
 </template>
 <script>
diff --git a/pages/plugins/ask/detail/detail.vue b/pages/plugins/ask/detail/detail.vue
index 5a9085a5..85415775 100644
--- a/pages/plugins/ask/detail/detail.vue
+++ b/pages/plugins/ask/detail/detail.vue
@@ -203,9 +203,6 @@
                                         query: 'id=' + info.id,
                                     },
                                 });
-
-                                // 标题
-                                uni.setNavigationBarTitle({ title: info.title || info.content });
                             }
                         } else {
                             this.setData({
diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue
index 155caa97..c5937ae1 100644
--- a/pages/plugins/blog/detail/detail.vue
+++ b/pages/plugins/blog/detail/detail.vue
@@ -211,9 +211,6 @@
                                         img: info.share_images || info.cover,
                                     },
                                 });
-
-                                // 标题
-                                uni.setNavigationBarTitle({ title: info.title });
                             }
                         } else {
                             this.setData({
diff --git a/pages/plugins/shop/components/shop-header/shop-header.vue b/pages/plugins/shop/components/shop-header/shop-header.vue
index 44435a27..f57d8f0a 100644
--- a/pages/plugins/shop/components/shop-header/shop-header.vue
+++ b/pages/plugins/shop/components/shop-header/shop-header.vue
@@ -3,7 +3,7 @@
         <!-- 搜索 -->
         <view class="flex-row jc-sb align-c padding-main bg-white oh bs-bb z-i search-content" :style="'padding-top:' + (status_bar_height > 0 ? status_bar_height + 5 : 0)+'px;'">
             <view v-if="top_nav_left_back_status == 1" @tap="top_nav_left_back_event" class="dis-inline-block padding-right-sm">
-                <iconfont name="icon-arrow-left" size="40rpx" propClass="pr top-xs z-i"></iconfont>
+                <iconfont name="icon-arrow-left" size="40rpx" propClass="pr top-xs z-i" :color="(client_value == 'alipay' || client_value == 'baidu') ? 'transparent' : propColor"></iconfont>
             </view>
             <view class="flex-1 wh-auto">
                 <view class="search flex-row jc-sb align-c round border-color-main bg-white">
@@ -182,6 +182,11 @@
     var common_static_url = app.globalData.get_static_url('common');
     export default {
         props: {
+            // 箭头颜色
+            propColor: {
+                type: String,
+                default: '',
+            },
             propBase: {
                 type: [Object,String],
                 default: '',
@@ -222,7 +227,7 @@
                 // 左侧返回按钮
                 top_nav_left_back_status: app.globalData.data.is_shop_top_nav_back || 0,
                 // #ifdef MP-TOUTIAO
-                top_nav_left_back_status : 0,
+                top_nav_left_back_status: 0,
                 // #endif
                 // 状态栏高度
                 status_bar_height: 0,
@@ -247,6 +252,7 @@
             // 初始化
             init() {
                 var upd_data = {
+                    client_value: app.globalData.application_client_type(),
                     is_shop_search_all_search_button: (this.propBase == null || parseInt(this.propBase.is_shop_search_all_search_button || 0) != 1) ? 0 : 1,
                     shop_navigation: this.propShopNavigation,
                 }
@@ -381,7 +387,10 @@
 
             // 返回事件
             top_nav_left_back_event() {
-                app.globalData.page_back_prev_event();
+                var arr = ['alipay', 'baidu'];
+                if(arr.indexOf(this.client_value) == -1) {
+                    app.globalData.page_back_prev_event();
+                }
             }
         },
     };
@@ -422,7 +431,7 @@
         left: auto;
         top: 0;
         width: 100%;
-        /* #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU */
+        /* #ifdef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-QQ || MP-KUAISHOU */
         padding-right: 200rpx;
         /* #endif */
     }
diff --git a/pages/plugins/shop/design/design.vue b/pages/plugins/shop/design/design.vue
index d0283494..231c89ac 100644
--- a/pages/plugins/shop/design/design.vue
+++ b/pages/plugins/shop/design/design.vue
@@ -125,11 +125,6 @@
                                         img: this.data.logo
                                     }
                                 });
-
-                                // 标题名称
-                                uni.setNavigationBarTitle({
-                                    title: this.data.name
-                                });
                             }
                         } else {
                             this.setData({
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index 86084b36..3746829f 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -244,10 +244,6 @@
                                         img: this.shop.share_images || this.shop.logo,
                                     },
                                 });
-                                // 标题名称
-                                uni.setNavigationBarTitle({
-                                    title: this.shop.name
-                                });
                             }
                         } else {
                             this.setData({
diff --git a/pages/plugins/shop/diy/diy.vue b/pages/plugins/shop/diy/diy.vue
index b82b8c40..6a0cc40c 100644
--- a/pages/plugins/shop/diy/diy.vue
+++ b/pages/plugins/shop/diy/diy.vue
@@ -147,11 +147,6 @@
                                     },
                                 });
 
-                                // 标题名称
-                                uni.setNavigationBarTitle({
-                                    title: this.data.name,
-                                });
-
                                 // 设置顶部导航的默认颜色
                                 this.set_navigation_bar_color();
 
diff --git a/pages/plugins/shop/index/index.vue b/pages/plugins/shop/index/index.vue
index c225826e..ae4b276a 100644
--- a/pages/plugins/shop/index/index.vue
+++ b/pages/plugins/shop/index/index.vue
@@ -184,12 +184,6 @@
                                         path: '/pages/plugins/shop/index/index',
                                     },
                                 });
-                                // 导航名称
-                                if ((this.data_base.application_name || null) != null) {
-                                    uni.setNavigationBarTitle({
-                                        title: this.data_base.application_name,
-                                    });
-                                }
                             }
                             // 获取列表数据
                             this.get_data_list(1);