From d40d30b3f920b6a9176abdd09ab850f82edb6643 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 8 Aug 2024 16:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/payModifyTcMy.vue           |  7 ++++---
 my/vip/index.vue                     | 31 +---------------------------
 my/wallet/index.vue                  | 23 +++++++++++++++------
 my/wallet/mymoneydetail.vue          |  2 +-
 pages/my/cikarDrtail.vue             |  1 +
 pages/therapist/therapist.vue        | 10 +++++++--
 pages/therapist/therapistDingdan.vue | 25 ++++++++++++++--------
 7 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue
index 172fff0..08bb392 100644
--- a/my/order/payModifyTcMy.vue
+++ b/my/order/payModifyTcMy.vue
@@ -548,14 +548,15 @@
 				let massageTypeId = that.orderXm.massageTypeId;
 				let longitude = that.longitude;
 				let latitude = that.latitude;
-				let classifyId= this.orderXm.classifyId
-				let city=this.orderXm.city
+				let classifyId= that.orderXm.classifyId
+				let city=that.orderXm.city
+				let technicianType=that.orderXm.level
 				uni.setStorage({
 				  key: 'taocanDd',
 				  data: '我的套餐',
 				  success: function () {
 				  uni.navigateTo({
-				  	url: '/pages/therapist/therapistDingdan?massageTypeId='+massageTypeId+'&latitude='+latitude+'&longitude='+longitude+'&classifyId='+classifyId+'&city='+city
+				  	url: '/pages/therapist/therapistDingdan?massageTypeId='+massageTypeId+'&latitude='+latitude+'&longitude='+longitude+'&classifyId='+classifyId+'&city='+city+'&technicianType='+that.orderXm.level
 				  })
 				  }
 				});
diff --git a/my/vip/index.vue b/my/vip/index.vue
index e2f7118..cb8db73 100644
--- a/my/vip/index.vue
+++ b/my/vip/index.vue
@@ -1,19 +1,6 @@
 <template>
 	<view class="content">
-		<!-- <image class="bgimg" src="../static/workbg.png" mode="widthFix"></image> -->
-		<!-- <image class="bgimg" src="https://admin.sjajk.com/file/uploadPath/2023/01/16/0bd832e6cd894903f6ad2ece7f07824a.png" style="height: 100vh;"></image> -->
-		<view class="bgbox" style="" v-if="vipShow==true">
-			<!-- <view class="" style="padding: 80rpx 0;text-align: center;">
-				<image src="../../static/ktvip.png" style="width: 513rpx;height: 79rpx;"></image>
-			</view>
-			<view class="vip_kapian">
-				<view style="position: absolute;z-index: 9;padding: 16rpx 40rpx;">
-					<view class="kapian_name">VIP会员</view>
-					<view class="kapian_text">会员享受超值VIP特权</view>
-					<view class="kapian_ktname" v-if="endTime">有效期至：{{endTime}}</view>
-					<view class="kapian_ktmoney" v-if="!isVip">------</view>
-				</view>
-			</view> -->
+		<view class="bgbox" style="" v-if="vipData!='1'">
 			<view class="bgbox-top">
 				<image src="../../static/vip/banner9.jpg" mode=""></image>
 			</view>
@@ -43,16 +30,6 @@
 					</view>
 					<view class="quanyi-line"><image style="width:100%;height:180px;object-fit: contain;" src="../../static/vip/Equity4.png"></image></view>
 					<view class="quanyi_titname">~VIP超值权益~</view>
-					<!--<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
-						<view class="quanyi_listitem">
-							<image src="../../static/vip/zuanshi.png"></image>
-							<view class="listitem_name">专享{{rateStr}}折</view>
-						</view>
-						<view class="quanyi_listitem">
-							<image src="../../static/vip/wangguan.png"></image>
-							<view class="listitem_name">身份标识</view>
-						</view>
-					</view>-->
 					<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
 						<view class="quanyi_listitem">
 							<image src="../../static/vip/Equity2.png"></image>
@@ -221,12 +198,6 @@
 						this.vipNameType=res.data.vipNameType
 						this.vipData=res.data.isVip;
 						console.log("isVIP------------------->",this.vipData)
-						if(this.vipData=='1'){
-							this.vipShow=true;
-						}else{
-							this.vipData=[]
-							this.vipShow=false
-						}
 						this.timeVipEnd = data.slice(0,16);
 						this.getVipList(res.data.vipNameType)
 					}
diff --git a/my/wallet/index.vue b/my/wallet/index.vue
index e702e6d..5aefdef 100644
--- a/my/wallet/index.vue
+++ b/my/wallet/index.vue
@@ -14,8 +14,11 @@
 					</view>
 					<view class="bgimg-top-view">
 						<view class="bgimg-top-money">
-							<span>{{money}}</span>
-							<span>账户余额(元)</span>
+							<span class="bgimg-top-money-moeny">￥{{money}}</span>
+							<view class='bgimg-top-money-view'>
+								<!-- <span>账户余额(元)</span> -->
+								<span>盛安逗：{{sadNum}}</span>
+							</view>
 						</view>
 						<view class="mingxi" v-if="artificerIdMy==true" @click="goNav('/my/wallet/mymoneydetail')">钱包明细</view>
 					</view>
@@ -232,6 +235,7 @@
 	export default {
 		data() {
 			return {
+				sadNum:'',
 				checkbox:false,
 				type:'center',
 				jsczSel: '否',
@@ -542,8 +546,8 @@
 			getMoney() {
 				this.$Request.get("/app/userMoney/selectMyMoney").then(res => {
 					if (res.code == 0 && res.data) {
-						console.log(res.data.money)
-						this.money = res.data.money
+						this.money = res.data.money;
+						this.sadNum=res.data.sad;
 					}
 				});
 			},
@@ -1233,12 +1237,19 @@
 		font-size: 22rpx;
 		color: #333333;
 	}
-	.bgimg-top-money span:nth-child(1){
+	.bgimg-top-money-moeny{
 		font-weight: bold;
 		font-size: 43rpx;
 		color: #FFFFFF;
 	}
-	.bgimg-top-money span:nth-child(2){
+	.bgimg-top-money-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.bgimg-top-money-view span{
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #FFFFFF;
diff --git a/my/wallet/mymoneydetail.vue b/my/wallet/mymoneydetail.vue
index 0b46da0..54fcb2b 100644
--- a/my/wallet/mymoneydetail.vue
+++ b/my/wallet/mymoneydetail.vue
@@ -16,7 +16,7 @@
 				<view class="list-top">
 					<view class="list-top-view">
 						<span class="list-top-view-title">{{item.title}}</span>
-						<span class="img-span">{{item.blFlag=='1'?'钱包':'现金'}}</span>
+						<!-- <span class="img-span">{{item.blFlag=='1'?'钱包':'现金'}}</span> -->
 					</view>
 					<text v-if="item.type == 1" class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.money}}元</text>
 					<text v-if="item.type == 2" class="text-red" style="font-size: 32upx;font-weight: 600"><text class="text-red">-</text>{{item.money}}元</text>
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index 2126b24..58e1971 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -577,6 +577,7 @@
 				}
 			},
 			openpay(item) {//立即预约
+				item.serviceCount=this.detailData[0].serviceCount
 				this.$queue.setData('mainData',item)
 				this.$queue.setData('detailData',this.detailData)
 				this.$queue.setData('xiangmu',item)
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 72aacd5..6b5d18c 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -100,12 +100,12 @@
 					<view class="flex align-center list-view" style="padding: 0px;" @click="goOrder(getOrderByCurrentMarkerIndex())">
 						<view class="touxiang-left-view" style="margin-bottom: 0px;padding-bottom: 0px;width: auto;">
 							<image
-								class="touxiang-left-content-img"
+								class="touxiang-left-content-img-ditu"
 								:src="getOrderByCurrentMarkerIndex().artificerImg ? getOrderByCurrentMarkerIndex().artificerImg : '../../static/logo.png'"
 								@click.stop="saveImgs(getOrderByCurrentMarkerIndex().artificerImg)"
 								 mode="aspectFill"></image>
 							<image v-if="getOrderByCurrentMarkerIndex().isHot == 1"
-								class="touxiang-left-content-img"
+								class="touxiang-left-content-img-ditu"
 								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
 								style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
 							</image>
@@ -1509,6 +1509,12 @@ import permision from "@/components/permission.js";
 		position: relative;
 		
 	}
+	.touxiang-left-content-img-ditu{
+		width: 150rpx;
+		height: 150rpx;
+		border-radius:120rpx;
+		margin: 0px 10px 0px 12px;
+	}
 	.touxiang-left-content-img{
 		width: 150rpx;
 		height: 150rpx;
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 684bf46..5476b13 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -42,12 +42,7 @@
 								</view>
 							</view>
 
-							<view class="flex align-center">
-								<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
-								<view class="therapist-bottom-dingwei-text">
-									{{ item.distance }}
-								</view>
-							</view>
+							
 							<view class="therapist-mian">
 								<view class="therapist-mian-top">
 									<view class="therap-pin">
@@ -68,10 +63,16 @@
 									</view>
 								</view>
 								<view class="therapist-mian-bottom">
-									<view class="flex flex-wrap align-center" >
+									<view class="flex flex-wrap align-center" v-if="item.consortiaName">
 										<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
 										</image>
-										<view  v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
+										<view class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
+									</view>
+									<view class="flex align-center">
+										<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
+										<view class="therapist-bottom-dingwei-text">
+											{{ item.distance }}
+										</view>
 									</view>
 									<view>
 										<view class="terap-button" v-if="item.status == 1" @click.stop="goOrder(item)">
@@ -404,6 +405,12 @@
 		font-weight: bold;
 		font-size: 30rpx;
 		color: #222222;
+		white-space: pre-wrap;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+		width:60px;
 	}
 	.therapist-mian-bottom{
 		width: 100%;
@@ -544,7 +551,7 @@
 		height: 100%;
 		display: flex;
 		flex-direction: column;
-		justify-content: space-between;
+		justify-content: space-evenly;
 		padding: 16rpx;
 	}
 	.zpmore_view {