From eaba6dc5c1da783b62f8db068e08e3a358d8224f Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 11 Jul 2024 16:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=20=E5=8A=A0=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/fuwuDateil.vue         | 85 +++++++++++++++++++++++++++++++++
 pages/shop/index.vue            |  2 +-
 pages/shop/yueDaoDianDrtail.vue |  6 +++
 pages/therapist/orderDetail.vue | 63 ++++++++++++++----------
 4 files changed, 130 insertions(+), 26 deletions(-)

diff --git a/pages/my/fuwuDateil.vue b/pages/my/fuwuDateil.vue
index 0564d8b..86979a6 100644
--- a/pages/my/fuwuDateil.vue
+++ b/pages/my/fuwuDateil.vue
@@ -91,6 +91,43 @@
 				</view> -->
 			</view>
 		</view>
+		<view class="detail-foot" style="margin-bottom: 100px;" v-if="getList.childrenMassageList.length>0">
+			<view class="detail-foot-nav">
+				<span class="detail-foot-nav-text">加钟项目</span>
+				<span class="detail-foot-nav-bor"></span>
+			</view>
+			<view class="detail-foot-mian" v-for="(item,index) in getList.childrenMassageList" :key="index">
+				<view class="detail-foot-list">
+					<view class="detail-view" style="position: relative;">
+						<image class="detail-view-img" :src="item.massageImg" mode=""></image>
+						<view class="detail-view-mina">
+							<view class="header-bottom-money" style="margin: 7px 0px;display: flex;justify-content: space-between; ">
+								<view style="display: flex; align-items: flex-end;">
+									<view class="detail-foot-list-top">
+										<span style="margin-right: 5px;">{{item.title}}</span>
+									</view>
+								</view>
+							</view>
+							<view class="header-bottom-money-zhen">
+								<span>￥</span>
+								<span>{{item.price}}</span>
+							</view>
+							<view class="xiangmu-cont-top-time">
+								<view class="xiangmu-cont-top-left">服务时长：{{item.duration}}分钟</view>
+								<view class="xiangmu-cont-top-left">已售：{{item.sales}}</view>
+							</view>
+							<view class="tese">
+								<span>项目特色: </span>
+								<span>{{item.jianjie}}</span>
+							</view>
+						</view>
+					</view>
+					<view class="detail-foot-title">
+						服务项目{{index+1}}
+					</view>
+				</view>
+			</view>
+		</view>
 		<view class="detail-btn" v-if="getList.status=='1'" @click="goumai(getList)">
 			立即预约
 		</view>
@@ -164,6 +201,54 @@
 	}
 </script>
 <style scoped>
+	.detail-foot-title{
+		width: 115px;
+		height: 32px;
+		background-image: url(../../static/servicePackage/horn.png);
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		font-weight: 400;
+		font-size: 13px;
+		color: #FFFFFF;
+		text-align: right;
+		line-height: 32px;
+		padding-right: 15px;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+	.xiangmu-cont-top-left{
+		font-weight: normal;
+		font-size: 21rpx;
+		color: #049E89;
+		margin-top: 1px;
+	}
+	.xiangmu-cont-top-time{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 5px;
+	}
+	.detail-view-mina{
+		width: 70%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.detail-view-img{
+		width: 76px;
+		height: 76px;
+		border-radius: 9px;
+	}
+	.detail-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.lab-view{
 		width:100%;
 		display: flex;
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index f8198eb..e83a8ae 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -175,7 +175,7 @@
 					that.$Request.get("/app/consortia/selectConsortiaList", {
 						page:that.page,
 						limit:that.limit,
-						title:that.searchValue
+						consortiaName:that.searchValue
 					}).then(res => {
 						if (res.code == 0) {
 							if (res.data) {
diff --git a/pages/shop/yueDaoDianDrtail.vue b/pages/shop/yueDaoDianDrtail.vue
index 63fae3f..025fd84 100644
--- a/pages/shop/yueDaoDianDrtail.vue
+++ b/pages/shop/yueDaoDianDrtail.vue
@@ -11,6 +11,12 @@
 							<span>{{mainData.consortiaName}}</span>
 						</view>
 					</view>
+					<view class="header-bottom-title">
+						<view class="header-bottom-title-text" style="font-size: 12px;">
+							<span>商家电话：</span>
+							<span style="margin-left: 10px;font-size: 12px;">{{mainData.phone}}</span>
+						</view>
+					</view>
 					<view class="shop_label" v-if="labels">
 						<span v-for="(item,index) in labels" :key="index">{{item}}</span>
 					</view>
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 944b71a..42f3721 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -376,35 +376,48 @@
 				this.money=e.detail.value;
 			},
 			zhifu(){//打赏支付
-				var data={
-					  userId: this.myId,
-					  artificerId: this.artificerId,
-					  money:this.money
-				}
-				if(this.money!=''){
-					this.$Request.post("/app/userMoney/payUserMoneyArtificer", data).then(res => {
-						if (res.code == 0) {
-							uni.showToast({
-								title: '打赏成功！'
-							})
-							this.closePopup('center')
-						}else{
-							uni.showToast({
-								icon:'error',
-								title: res.msg
-							})
+				var that=this;
+				uni.showModal({
+					title: '提示',
+					content: '确定为'+that.order.artificerName+'打赏吗？',
+					success: function(res) {
+						if (res.confirm) {
+							var data={
+								  userId: that.myId,
+								  artificerId: that.artificerId,
+								  money:that.money
+							}
+							if(that.money!=''){
+								that.$Request.post("/app/userMoney/payUserMoneyArtificer", data).then(res => {
+									if (res.code == 0) {
+										uni.showToast({
+											title: '打赏成功！'
+										})
+										that.closePopup('center')
+									}else{
+										uni.showToast({
+											icon:'error',
+											title: res.msg
+										})
+									}
+								});
+							}else{
+								uni.showToast({
+									icon:'error',
+									title: '请输入打赏金额'
+								})
+							}
+						} else if (res.cancel) {
+							console.log('用户点击取消');
 						}
-					});
-				}else{
-					uni.showToast({
-						icon:'error',
-						title: '请输入打赏金额'
-					})
-				}
+					}
+				})
+				
 			},
 			guanzhu(item) {// 关注
 				let oldIsFollow = this.isFollow;
-				let that = this
+				let that = this;
+				
 				let data = {
 					artificerId: that.artificerId,
 					userId: that.myId,