From b0577347661c661478c6446ab445b1a7ed97e124 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Sat, 1 Jun 2024 11:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json             | 41 ++++++++++------------
 pages/goods/detail.vue | 78 ++++++++++++++++++++++++++++++++++++++++--
 pages/goods/list.vue   |  2 +-
 pages/index/index.vue  | 65 ++++++++++++++++++++++-------------
 pages/search/index.vue |  4 +--
 5 files changed, 139 insertions(+), 51 deletions(-)

diff --git a/pages.json b/pages.json
index bf6bfa2..ca02aa9 100644
--- a/pages.json
+++ b/pages.json
@@ -15,10 +15,10 @@
 			"selectedIconPath": "static/tabbar/cate-active.png",
 			"text": "分类"
 		}, {
-			"pagePath": "pages/shopList/index",
-			"iconPath": "static/tabbar/shop.png",
-			"selectedIconPath": "static/tabbar/shop-active.png",
-			"text": "商户"
+			"pagePath": "pages/serve/index",
+			"iconPath": "static/tabbar/serve.png",
+			"selectedIconPath": "static/tabbar/serve-active.png",
+			"text": "服务"
 		}, {
 			"pagePath": "pages/cart/index",
 			"iconPath": "static/tabbar/cart.png",
@@ -40,6 +40,13 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/serve/index",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "服务"
+			}
+		},
 		{
 			"path": "pages/category/index",
 			"style": {
@@ -64,6 +71,13 @@
 				}
 			}
 		},
+		{
+			"path": "pages/serve/install",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "安装报修"
+			}
+		},
 		{
 			"path": "pages/member/index",
 			"style": {
@@ -812,25 +826,6 @@
 				}
 			]
 		},
-		{
-			"root": "pages/serve/",
-			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "服务"
-					}
-				},
-				{
-					"path": "install",
-					"style": {
-						"enablePullDownRefresh": false,
-						"navigationBarTitleText": "安装报修"
-					}
-				}
-			]
-		},
 		{
 			"root": "pages/wallet/",
 			"pages": [
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 9e67ee9..ef62ebb 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -136,6 +136,18 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="storeVersion == 1 && goods.merchant_id > 0" class="merchant-info" @click="toShop()">
+			<image src="" mode="aspectFill"></image>
+			<view class="info-box">
+				<view class="info-name">
+					<text>啊是巨大手机打开拉萨的领导可口可乐爱神的箭卡的黄金卡上的卡号的</text>
+					<image src="@/static/arrow-right.png" mode="aspectFill"></image>
+				</view>
+				<view class="label">
+					<text>自营</text>
+				</view>
+			</view>
+		</view>
 		<view class="orderInfo">
 			<view class="chosed" v-if="goods.spec_type == 20" @click="stockValue=='有货'?choseSku(3):''">
 				<view class="title">已选</view>
@@ -529,6 +541,13 @@
 				}
 			}
 		},
+		computed: {
+			storeVersion() {
+				const version = uni.getStorageSync('storeVersion') == 1 ? 1 : 0;
+				console.log(version);
+				return version;
+			}
+		},
 		onLoad(options) {
 			console.log(options)
 			const that = this;
@@ -1161,6 +1180,11 @@
 					this.showGoodsPosterPopup = true;
 				}
 			},
+			toShop() {
+				uni.navigateTo({
+					url: `/pages/shopList/shopPage?id=${this.goods.merchant_id}`,
+				})
+			},
 		},
 		/**
 		 * 分享当前页面
@@ -1189,7 +1213,7 @@
 				imageUrl: app.goods.goods_image,
 				path: `/pages/goods/detail?${params}`
 			}
-		}
+		},
 	}
 </script>
 <style lang="scss" scoped>
@@ -1613,7 +1637,57 @@
 			}
 		}
 	}
-
+	
+	.merchant-info {
+		margin: 20rpx 18rpx 0 18rpx;
+		padding: 30rpx;
+		background: #fff;
+		display: flex;
+		>image {
+			width: 90rpx;
+			height: 90rpx;
+			margin-right: 20rpx;
+			flex-shrink: 0;
+		}
+		.info-box {
+			width: calc(100% - 110rpx);
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			>.info-name {
+				font-size: 30rpx;
+				color: #333;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+				>text {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					width: calc(100% - 21rpx);
+				}
+				>image {
+					margin-left: 10rpx;
+					width: 13rpx;
+					height: 24rpx;
+				}
+			}
+			>.label {
+				text {
+					display: inline-block;
+					height: 40rpx;
+					line-height: 40rpx;
+					text-align: center;
+					padding: 0 12rpx;
+					background: #F34A40;
+					border-radius: 10rpx;
+					color: #FFFFFF;
+					font-size: 22rpx;
+				}
+			}
+		}
+	}
+	
 	.orderInfo {
 		// width: 720rpx;
 		background: #FFFFFF;
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index cb5acc2..f87fcf8 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -112,7 +112,7 @@
 					<!-- <u-waterfall v-model="list.data" ref="uWaterfall1"> -->
 						<!-- <template v-slot:left="{leftList}"> -->
 							<view class="goods-item goods-item1" v-for="(item, index) in list.data" :key="index"
-								@click="onTargetDetail(item.goods_id)">
+								@click="onTargetDetail(item)">
 								<!-- 多列显示 -->
 								<view class="">
 									<!-- 商品图片 -->
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f5d554..d3eeb01 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -606,18 +606,6 @@
 						path: '/pages/news/recycling/index',
 						type: 2
 					},
-					{
-						image: '/static/tabbar/serve-active.png',
-						text: "服务",
-						path: '/pages/serve/index',
-						type: 2
-					},
-					{
-						image: `${this.$picUrl}/static/index/g6.png?n=` + new Date().getTime(),
-						text: "广场动态",
-						path: '/pages/squareDynamic/index',
-						type: 2
-					},
 				],
 				catagoryList: [],
 				paihangList: [],
@@ -667,13 +655,34 @@
 				} = await GoodsApi.wxAppSetting({});
 				if (status == 200) {
 					this.wxAppSetting = data;
-					this.list = data.same_city ? [{
-						name: '首页'
-					}, {
-						name: '同城送'
-					}] : [{
-						name: '首页'
-					}]
+					const arr = [{ name: '首页' }];
+					if (data.same_city) {
+						arr.push({
+							name: '同城送'
+						});
+					}
+					if (data.square_dynamic) {
+						arr.push({
+							name: '广场'
+						})
+					}
+					this.list = [...arr];
+					if (data.select_mechant) {
+						this.gridList.splice(5, 1,
+							{
+								image: '/static/tabbar/shop-active.png',
+								text: "精选商户",
+								path: '/pages/shopList/index',
+								type: 2
+							});
+					}
+					// this.list = data.same_city ? [{
+					// 	name: '首页'
+					// }, {
+					// 	name: '同城送'
+					// }] : [{
+					// 	name: '首页'
+					// }]
 				}
 			},
 			async getWxAppStyle() {
@@ -1042,7 +1051,13 @@
 			},
 			changeHome(val) {
 				this.current = val;
-				this.getTypeList()
+				if (this.current < 2) {
+					this.getTypeList()
+				} else {
+					uni.navigateTo({
+						url: '/pages/squareDynamic/index'
+					});
+				}
 			},
 			getCityInfo() {
 				const that = this
@@ -1058,7 +1073,8 @@
 				newFunApi.storeData().then(res => {
 						if (res.status == 200) {
 							this.logoImage = res.data.storeInfo.logoImage ? res.data.storeInfo.logoImage
-								.preview_url : ""
+								.preview_url : "";
+							uni.setStorageSync('storeVersion', res.data.storeInfo.store_version || 0);
 						}
 					})
 					.finally(() => {})
@@ -1163,6 +1179,9 @@
 		onShow() {
 			this.getWxAppStyle();
 			this.isLogin = uni.getStorageSync("AccessToken") ? true : false
+			if (this.current == 2) {
+				this.current = 0;
+			}
 		},
 		onPageScroll(e) {
 			if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true
@@ -1230,11 +1249,11 @@
 					padding: 0 !important;
 
 					.u-item {
-						width: 130rpx;
+						width: 110rpx;
 					}
 
 					.u-item-bg {
-						width: 130rpx !important;
+						width: 110rpx !important;
 						bottom: 0 !important;
 						height: 100% !important;
 						border-radius: 17px !important;
diff --git a/pages/search/index.vue b/pages/search/index.vue
index c8f44de..43c0293 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -99,8 +99,8 @@
 
 		},
 		onLoad(op) {
-			this.category_id=op.category_id
-			this.merchantId = op.merchantId
+			this.category_id=op.category_id || ''
+			this.merchantId = op.merchantId || ''
 			this.getHot()
 			this.chartsGoodsJingHandle()
 		},