From 38b2438ff784ea367f8df5d14dd142ddb30155c7 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 27 Jun 2022 10:25:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=BA=97=E9=93=BA=E5=8F=8A=E5=BA=97=E9=93=BA=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=93=BE=E6=8E=A5=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js             |  8 ++++++++
 pages/product/product-detail.vue | 19 ++++++++++++-------
 pages/product/shop-detail.vue    | 13 ++++++++-----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index eced635..dfdcf54 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -419,5 +419,13 @@ export default {
 			data: params
 		})
 		return res[1].data;
+	},
+	async getWorkerAllDetailById(params = {}) {
+		let res = await uni.request({
+			url: '/worker/getDetailById',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
 	},
 }
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index b261ccb..db45c3c 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -131,18 +131,19 @@
 		<view id="pageAnchor1" class="margin-lr-sm margin-top-sm bg-white">
 			<view class="flex justify-between align-end padding">
 				<view class="text-black text-lg">商品评价</view>
-				<view class="text-red text-sm">好评率95%<text class="text-bold text-gray cuIcon-right"></text></view>
-			</view>
-			<comments-card :reviewers="reviewers"></comments-card>
+				<!-- <view class="text-red text-sm">好评率95%<text class="text-bold text-gray cuIcon-right"></text></view> -->
+			</view>
+			<view class="text-center padding-bottom">开发中，敬请期待</view>
+			<!-- <comments-card :reviewers="reviewers"></comments-card> -->
 		</view>
 		<!-- 店家链接 -->
 		<view class="margin-lr-sm margin-top-sm padding bg-white">
 			<view class="flex justify-between align-center">
 				<view class="flex justify-start align-center">
-					<view class="cu-avatar round" :style="'background-image:url(' + shopInfo.avatarUrl + ');'"></view>
+					<view class="cu-avatar round" :style="'background-image:url(' + shopInfo.workerLogoUrl + ');'"></view>
 					<view class="content flex-sub margin-lr-sm">
-						<view class="text-black">{{shopInfo.shopName}}</view>
-						<uni-rate :size="15" :readonly="true" allow-half :value="shopInfo.totalScore" />
+						<view class="text-black">{{shopInfo.name}}</view>
+						<uni-rate :size="15" :readonly="true" allow-half :value="5" />
 					</view>
 				</view>
 				<view class="text-sm" @click="showShopDetail(shopInfo)">店铺查看<text class="text-bold text-gray cuIcon-right"></text></view>
@@ -246,11 +247,15 @@
 				this.detailPicList.forEach((picItem) => {
 					this.picUrls.push(picItem.imgUrl);
 				})
+				let res = await this.$request.getWorkerAllDetailById({
+					workerId: this.productDetail.workerId
+				})
+				this.shopInfo = res.data;
 				
 				this.guaranteeList = productDetailMock.guaranteeList;
 				this.productInfo = productDetailMock.productInfo;
 				this.reviewers = productDetailMock.reviewers;
-				this.shopInfo = productDetailMock.shopInfo;
+				// this.shopInfo = productDetailMock.shopInfo;
 			},
 			bindEvent() {
 				uni.$on('product-detail_add2Cart', this.add2Cart);
diff --git a/pages/product/shop-detail.vue b/pages/product/shop-detail.vue
index 89caf6a..5204ecd 100644
--- a/pages/product/shop-detail.vue
+++ b/pages/product/shop-detail.vue
@@ -55,8 +55,7 @@
 				<text>附加服务：</text>
 				<radio-group @change="changeAdditionalServId">
 					<label class="radio margin-right-sm" v-for="(item, index) in additionalServ">
-						<radio style="transform:scale(0.7)" class="main-color" :value="item.id"
-							checked disabled/>
+						<radio style="transform:scale(0.7)" class="main-color" :value="item.id" disabled/>
 						<text class="margin-left-xs">{{item.name}}</text>
 					</label>
 				</radio-group>
@@ -133,12 +132,16 @@
 			}
 		},
 		onLoad(option) {
-			this.shopInfo = JSON.parse(decodeURIComponent(option.shopInfo));
-			this.loadData();
+			const params = JSON.parse(decodeURIComponent(option.shopInfo));
+			this.loadData(params);
 		},
 		methods: {
-			async loadData() {
+			async loadData(params) {
 				// this.shopInfo = await this.$api.data('shopInfo');
+				let res = await this.$request.getWorkerAllDetailById({
+					workerId: params.workerId
+				})
+				this.shopInfo = res.data;
 				this.loadCategoryList();
 				await this.loadRegionList();
 				this.searchInfo.area = [this.areaList[0][0], this.areaList[1][0], this.areaList[2][0]]