优化

pages/goods/detail.vue

@@ -139,14 +139,14 @@
 			</view>
 		</view>
 		<view v-if="storeVersion == 1 && goods.merchant_id > 0" class="merchant-info" @click="toShop()">
-			<image src="" mode="aspectFill"></image>
+			<image :src="goods.merchant.logoImage[0].external_url" mode="aspectFill"></image>
 			<view class="info-box">
 				<view class="info-name">
-					<text>啊是巨大手机打开拉萨的领导可口可乐爱神的箭卡的黄金卡上的卡号的</text>
+					<text>{{ goods.merchant.shop_name }}</text>
 					<image src="@/static/arrow-right.png" mode="aspectFill"></image>
 				</view>
 				<view class="label">
-					<text>自营</text>
+					<text>{{ goods.merchant.shop_label }}</text>
 				</view>
 			</view>
 		</view>
@@ -1705,7 +1705,7 @@
 					text-align: center;
 					padding: 0 12rpx;
 					background: #F34A40;
-					border-radius: 10rpx;
+					border-radius: 20rpx;
 					color: #FFFFFF;
 					font-size: 22rpx;
 				}

pages/goods/seckillDetail.vue

@@ -119,6 +119,18 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="storeVersion == 1 && goods.merchant_id > 0" class="merchant-info" @click="toShop()">
+			<image :src="goods.merchant.logoImage[0].external_url" mode="aspectFill"></image>
+			<view class="info-box">
+				<view class="info-name">
+					<text>{{ goods.merchant.shop_name }}</text>
+					<image src="@/static/arrow-right.png" mode="aspectFill"></image>
+				</view>
+				<view class="label">
+					<text>{{ goods.merchant.shop_label }}</text>
+				</view>
+			</view>
+		</view>
 		<view class="orderInfo">
 			<view class="chosed" v-if="goods.spec_type == 20" @click="stockValue=='有货'?choseSku(3):''">
 				<view class="title">已选</view>
@@ -467,6 +479,13 @@
 				}
 			}
 		},
+		computed: {
+			storeVersion() {
+				const version = uni.getStorageSync('storeVersion') == 1 ? 1 : 0;
+				console.log(version);
+				return version;
+			}
+		},
 		onLoad(options) {
 			const that = this;
 			that.options = options;
@@ -1087,6 +1106,11 @@
 					this.showGoodsPosterPopup = true;
 				}
 			},
+			toShop() {
+				uni.navigateTo({
+					url: `/pages/shopList/shopPage?id=${this.goods.merchant_id}`,
+				})
+			},
 		},
 		/**
 		 * 分享当前页面
@@ -1539,7 +1563,56 @@
 			}
 		}
 	}
-
+	
+	.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: 20rpx;
+					color: #FFFFFF;
+					font-size: 22rpx;
+				}
+			}
+		}
+	}
 	.orderInfo {
 		// width: 720rpx;
 		background: #FFFFFF;

pages/shopList/index.vue

@@ -24,7 +24,7 @@
 							<text class="label">{{ item.shop_label }}</text>
 						</view>
 						<view class="info-bottom">
-							<view class="score"><uni-rate :readonly="true" :value="item.score" />{{ item.score }}</view>
+							<view class="score"><uni-rate :readonly="true" :value="item.score" activeColor="#F34A40" />{{ item.score }}</view>
 							<!-- <view class="distance">{{ item.distance }}km</view> -->
 						</view>
 					</view>

pages/shopList/shopPage.vue

@@ -85,7 +85,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="toCart" @click="toCart">
+			<view class="toCart" @click.stop="toCart">
 				<image src="@/static/shop/cart.png"></image>
 			</view>
 			<view class="toTop" v-if="isTop" @click="openScrollTo()">