From b0eef8c887cf9a194e591629d107d526fcf82291 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 31 May 2024 17:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=20-=20=E5=95=86=E6=88=B7logo=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87=E6=94=AF=E6=8C=81=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/store/shopStreet/index.vue | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pages/store/shopStreet/index.vue b/pages/store/shopStreet/index.vue
index 53397e0..1797acc 100644
--- a/pages/store/shopStreet/index.vue
+++ b/pages/store/shopStreet/index.vue
@@ -42,7 +42,7 @@
 				<view class="mer-box">
 					<block v-if="store_street_theme == 1">
 						<view class="mer-item" v-for="(item,index) in storeList" :key='index'>
-							<view class="mer-hd" @click="goStore(item.mer_id)">
+							<view class="mer-hd" @click="goStore(item)">
 								<image :src="item.mini_banner?item.mini_banner:item.mer_banner"></image>
 								<view class="mer-name">
 									<image :src="item.mer_avatar"></image>
@@ -83,7 +83,7 @@
 					</block>
 					<block v-if="store_street_theme == 2">
 						<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
-							<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
+							<view class="mer-hd mer-shop-count" @click="goStore(item)">
 								<image class="mer-avatar" :src="item.mer_avatar"></image>
 								<view class="mer-shop-right">
 									<view class="mer-count">
@@ -106,7 +106,7 @@
 										</view>
 									</view>
 									<view class="pro-box">
-										<view @click="goProduct(itemn)" class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="item.recommend.length<=3">
+										<view @click.stop="goProduct(itemn)" class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn' v-if="item.recommend.length<=3">
 											<view class="picture">
 												<easy-loadimage mode="widthFix" :image-src="itemn.image"></easy-loadimage>
 												<view v-if="itemn.border_pic" :style="{ backgroundImage: `url(${itemn.border_pic})` }" class="border-picture"></view>
@@ -122,7 +122,7 @@
 					</block>
 					<block v-if="store_street_theme == 3">
 						<view class="mer-item mer-item3" v-for="(item,index) in storeList" :key='index' :style="'background-image:url('+item.mini_banner+')'">
-							<view class="mer-hd" @click="goStore(item.mer_id)">
+							<view class="mer-hd" @click="goStore(item)">
 								<view class="mer-name">
 									<image :src="item.mer_avatar"></image>
 									<view class="">
@@ -488,12 +488,18 @@
 				})
 			},
 			// 进店
-			goStore(id) {
+			goStore(item) {
+        let _this = this;
+        let merId = item.mer_id || 0;
 				if (this.hide_mer_status != 1 && this.sotreParam.merchant_type != 2) {
 					uni.navigateTo({
-						url: `/pages/store/home/index?id=${id}`
+						url: `/pages/store/home/index?id=${merId}`
 					})
 				}
+        else if(this.sotreParam.merchant_type == 2){
+          let img = item.mer_avatar || '';
+          if(img.length > 0) this.$util.previewImage(img);
+        }
 			},
 			searchSubmit: function(e) {
 				let that = this;
@@ -565,8 +571,11 @@
             url: `/pages/goods_details/index?id=${product.product_id}`
           })
         }
-      }
-
+        else{
+          let img = product.image || '';
+          if(img.length > 0) this.$util.previewImage(img);
+        }
+      },
 
 
 		},