From b7ab3ba6c1ffb0ac67c00fd66fbedd2e3fb48cad Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 16 Dec 2022 14:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E6=90=AD=E9=85=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/binding/index/index.vue | 37 ++++++++++++++++++++++-----
 pages/plugins/shop/index/index.vue    |  2 +-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pages/plugins/binding/index/index.vue b/pages/plugins/binding/index/index.vue
index 378e44a1..36b77cdb 100644
--- a/pages/plugins/binding/index/index.vue
+++ b/pages/plugins/binding/index/index.vue
@@ -28,7 +28,17 @@
                 </view>
 
                 <!-- 结尾 -->
-                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+                
+                <!-- 回到店铺 -->
+                <view v-if="(shop || null) != null" class="bottom-fixed padding-main">
+                    <button class="bg-main br-main cr-white round dis-block" type="default" hover-class="none" size="mini" @tap="shop_event" :data-value="shop.url">
+                        <view class="dis-inline-block va-m">
+                            <uni-icons type="shop" size="16" color="#fff"></uni-icons>
+                        </view>
+                        <text class="va-m margin-left-sm">回到店铺</text>
+                    </button>
+                </view>
             </scroll-view>
         </view>
     </view>
@@ -50,7 +60,8 @@
                 data_page_total: 0,
                 data_page: 1,
                 params: null,
-                data_base: null,
+                data_base: null,
+                shop: null,
                 // 自定义分享信息
                 share_info: {}
             };
@@ -98,14 +109,15 @@
                 uni.request({
                     url: app.globalData.get_request_url("index", "index", "binding"),
                     method: 'POST',
-                    data: {},
+                    data: this.params,
                     dataType: 'json',
                     success: res => {
                         uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             this.setData({
-                                data_base: data.base || null
+                                data_base: data.base || null,
+                                shop: data.shop || null
                             });
                             
                             if ((this.data_base || null) != null) {
@@ -125,7 +137,7 @@
                                     });
                                 }
                             }
-                            
+
                             // 获取列表数据
                             this.get_data_list(1);
                         } else {
@@ -169,7 +181,8 @@
                     url: app.globalData.get_request_url("datalist", "index", "binding"),
                     method: 'POST',
                     data: {
-                        page: this.data_page
+                        page: this.data_page,
+                        shop_id: this.params.spid || 0
                     },
                     dataType: 'json',
                     success: res => {
@@ -231,7 +244,17 @@
 
             // 滚动加载
             scroll_lower(e) {
-                this.get_data_list(1);
+                this.get_data_list();
+            },
+
+            // 店铺事件
+            shop_event(e) {
+                var prev_url = app.globalData.prev_page();
+                if(prev_url != null && prev_url.indexOf('pages/plugins/shop/detail/detail') != -1) {
+                    uni.navigateBack();
+                } else {
+                    app.globalData.url_event(e);
+                }
             }
         }
     };
diff --git a/pages/plugins/shop/index/index.vue b/pages/plugins/shop/index/index.vue
index 4e3e7904..8984dfb0 100644
--- a/pages/plugins/shop/index/index.vue
+++ b/pages/plugins/shop/index/index.vue
@@ -251,7 +251,7 @@
 
             // 滚动加载
             scroll_lower(e) {
-                this.get_data_list(1);
+                this.get_data_list();
             },
 
             // 导航事件