From 3b2ea1c52685bdc80f32ed293e346bfe2febfd30 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 21 Apr 2022 10:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E8=BF=94=E5=9B=9E=E6=93=8D=E4=BD=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-detail/goods-detail.vue | 42 ++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index f165a398..b22b1566 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -338,11 +338,9 @@
                     <!-- 是否指定返回操作、返回操作情况下仅展示返回和收藏操作 -->
                     <block v-if="(params.is_opt_back || 0) != 0">
                         <!-- 返回操作 -->
-                        <view class="item fl cp">
-                            <navigator open-type="navigateBack" hover-class="none">
-                                <image :src="common_static_url+'back-icon.png'" mode="scaleToFill"></image>
-                                <text class="dis-block text-size-xs cr-gray">返回</text>
-                            </navigator>
+                        <view class="item fl cp" @tap="bottom_nav_back_event">
+                            <image :src="common_static_url+'back-icon.png'" mode="scaleToFill"></image>
+                            <text class="dis-block text-size-xs cr-gray">返回</text>
                         </view>
                     </block>
                     <block v-else>
@@ -1707,7 +1705,7 @@
                     }
                 }
             },
-            
+
             // 购买记录提示处理
             plugins_salerecords_tips_handle() {
                 // 销毁之前的任务
@@ -1743,14 +1741,14 @@
                     });
                 }
             },
-            
+
             // 门店弹层关闭
             popup_realstore_close_event(e) {
                 this.setData({
                     popup_realstore_status: false
                 });
             },
-            
+
             // 评价图片预览
             comment_images_show_event(e) {
                 var index = e.currentTarget.dataset.index;
@@ -1760,30 +1758,50 @@
                     urls: this.goods.comments_data[index]['images']
                 });
             },
-            
+
             // 更多导航事件
             nav_more_event(e) {
                 app.globalData.operation_event(e);
                 this.setData({nav_more_status: false});
             },
-            
+
             // 批发开启弹层
             popup_wholesale_event(e) {
                 this.setData({
                     popup_wholesale_status: true
                 });
             },
-            
+
             // 批发弹层关闭
             popup_wholesale_close_event(e) {
                 this.setData({
                     popup_wholesale_status: false
                 });
             },
-            
+
             // url事件
             url_event(e) {
                 app.globalData.url_event(e);
+            },
+
+            // 底部导航操作返回事件
+            bottom_nav_back_event(e) {
+                var pages = getCurrentPages();
+                if(pages.length > 1) {
+                    uni.navigateBack();
+                } else {
+                    // 默认首页
+                    var url = app.globalData.data.tabbar_pages[0];
+
+                    // 是否有参数定义
+                    if((this.params.is_opt_back || 0) == 1) {
+                        // 门店详情来源
+                        if((this.params.realstore_id || null) != null) {
+                            url = '/pages/plugins/realstore/detail/detail?id='+this.params.realstore_id;
+                        }
+                    }
+                    app.globalData.url_open(url);
+                }
             }
         }
     };