From b20908c84d0a9470914da8ed04a77ebf47f03d63 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Tue, 16 Jul 2024 11:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E5=AE=9A=E4=BD=8D=20tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                         |  81 ++++---
 pages/my/cikarDrtail.vue                      |  47 ++--
 pages/my/fuwuliaochengDetail.vue              |  47 ++--
 pages/my/index.vue                            | 210 +++++++++++++++++-
 pages/my/indextaociliaoList.vue               |  86 ++++---
 pages/therapist/therapist.vue                 | 170 ++++++++------
 pages/therapist/therapistList.vue             |  21 +-
 .../z-tabs/components/z-tabs/z-tabs.vue       |   3 +
 8 files changed, 468 insertions(+), 197 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 06bc885..c97ceaa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,15 +1,20 @@
 <template>
 	<view class="content content_bj">
 		<view class="index-head">
-			<view class="index-top">
-				<view class="index-top-left font-size-34">盛安到家</view>
+			<!-- <view class="index-top">
 				<view v-if="XCXIsSelect != '否'" class="flex locate-line"
 				 @tap="goCity">
 					<view class="localName">{{ city }}</view>
 					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
 				</view>
-			</view>
+			</view> -->
 			<view class="index-line" >
+				<view v-if="XCXIsSelect != '否'" class="flex locate-line dingwei-view"
+				 @tap="goCity">
+					<view class="localName">{{ city }}</view>
+					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
+				</view>
+				<!-- <view class="index-top-left font-size-34">盛安到家</view> -->
 				<view class="index-top-mian">
 					<view class="index-top-mian-text">
 						<image style="margin-top: 1px;" src="../../static/index-nav-1.png" mode=""></image>
@@ -424,29 +429,6 @@
 			})
 			// 116.481488,39.990464
 			// 125.424295,43.878294
-			// that.getAddress();
-			var dizhi={
-				key:'4f23770b6e53b96e7d0661a7ccfb9c21',
-				location:'125.424295,43.878294',
-				radius:'1000',
-				extensions:'all',
-				output:'JSON'
-				
-			}
-			uni.request({
-				url: 'https://restapi.amap.com/v3/geocode/regeo',
-				data:dizhi,
-				method:'GET',
-				success(rea) {
-					console.log("获取城市名称成功", rea)
-					if (rea.statusCode ==200) {
-						that.city = rea.data.regeocode.addressComponent.township;
-						uni.setStorageSync('citySou',rea.data.regeocode.addressComponent.city)
-					} else {
-						console.log("获取信息失败，请重试！")
-					}
-				}
-			});
 			uni.getLocation({
 				type: 'wgs84',
 				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
@@ -465,7 +447,27 @@
 					// that.getorderlist('')
 					that.getKTCityList();
 					// #endif
-			
+						var dizhi={
+							key:'4f23770b6e53b96e7d0661a7ccfb9c21',
+							location:that.longitude+','+res.latitude,
+							radius:'1000',
+							extensions:'all',
+							output:'JSON'
+						}
+						uni.request({
+							url: 'https://restapi.amap.com/v3/geocode/regeo',
+							data:dizhi,
+							method:'GET',
+							success(rea) {
+								console.log("获取城市名称成功", rea)
+								if (rea.statusCode ==200) {
+									that.city = rea.data.regeocode.addressComponent.township;
+									// uni.setStorageSync('citySou',rea.data.regeocode.addressComponent.city)
+								} else {
+									console.log("获取信息失败，请重试！")
+								}
+							}
+						});
 					// #ifdef H5
 					
 						// that.city = that.latitude+','+that.longitude
@@ -515,7 +517,7 @@
 					this.openMsg()
 				}
 				// #endif
-				this.city = uni.getStorageSync('city')
+				// this.city = uni.getStorageSync('city')//测试用的 测试结束关闭
 				this.getIsVip()
 				this.getKTCityList();
 				this.getHomeArtificerList();
@@ -933,7 +935,7 @@
 				var data={
 						  isStart: 1,
 						  status: 1,
-						  city: this.city,
+						  // city: this.city,
 						  longitude:this.longitude,
 						  latitude:this.latitude,
 						  page: 1,
@@ -968,7 +970,7 @@
 				var data={
 						  isStart: 1,
 						  status: 1,
-						  city: this.city,
+						  // city: this.city,
 						  longitude:this.longitude,
 						  latitude:this.latitude,
 						  page: 1,
@@ -1085,6 +1087,17 @@
 </script>
 
 <style scoped>
+	.localName{
+		width: 85px;
+		margin-left: 4rpx;
+		font-weight: bold;		
+		color: #333333;
+		font-size: 26rpx;
+		margin-top: 3rpx;
+		overflow: hidden; /* 确保超出容器的内容被裁剪 */
+		white-space: nowrap; /* 确保文本在一行内显示 */
+		text-overflow: ellipsis; /* 超出部分显示省略号 */
+	}
 	/deep/.uni-icons{
 	    font-family: uniicons;
 	    text-decoration: none;
@@ -1315,13 +1328,7 @@
 		width:33.33rpx;
 		height:39.5rpx;		
 	}
-	.localName{
-		margin-left: 4rpx;
-		font-weight: bold;		
-		color: #333333;
-		font-size: 26rpx;
-		margin-top: 3rpx;
-	}
+	
 	.menu-topic-act .menu-topic-bottom-color {
 		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
 	}
diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue
index b3668f1..9628968 100644
--- a/pages/my/cikarDrtail.vue
+++ b/pages/my/cikarDrtail.vue
@@ -56,38 +56,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="detail-foot">
-			<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 detail-pad">
-				<view class="detail-foot-mian-top">
-					<span class="detail-foot-mian-top-title">性别限制: </span>
-					<span class="detail-foot-mian-top-text">不限性别</span>
-				</view>	
-				<view class="detail-foot-mian-top-bottom">
-					<span class="detail-foot-mian-top-title">适应人群: </span>
-					<span class="detail-foot-mian-top-text">
-						{{mainData.applyPeople}}
-					</span>
-				</view>
-			</view>
-		</view> -->
-		<view class="detail-foot">
-			<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 detail-pad">
-				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
-				<!-- <view class="lab-view">
-					<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
-						<span class="detail-foot-mian-txetList">{{item}}</span>
-					</view>
-				</view> -->
-			</view>
-		</view>
 		<view class="detail-foot" v-if="dataList.name=='my'">
 			<view class="detail-foot-nav">
 				<span class="detail-foot-nav-text">次卡详情</span>
@@ -122,6 +90,21 @@
 				</view>
 			</view>
 		</view>
+		<view class="detail-foot">
+			<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 detail-pad">
+				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
+				<!-- <view class="lab-view">
+					<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
+						<span class="detail-foot-mian-txetList">{{item}}</span>
+					</view>
+				</view> -->
+			</view>
+		</view>
+		
 		
 		<view class="detail-btn btn"  v-if="dataList.name=='index'" @click="openpay(mainData)">
 			立即购买
diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue
index 049c5b8..bd86764 100644
--- a/pages/my/fuwuliaochengDetail.vue
+++ b/pages/my/fuwuliaochengDetail.vue
@@ -61,38 +61,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="detail-foot">
-			<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">
-				<view class="detail-foot-mian-top">
-					<span class="detail-foot-mian-top-title">性别限制: </span>
-					<span class="detail-foot-mian-top-text">不限性别</span>
-				</view>	
-				<view class="detail-foot-mian-top-bottom">
-					<span class="detail-foot-mian-top-title">适应人群: </span>
-					<span class="detail-foot-mian-top-text">
-						{{mainData.applyPeople}}
-					</span>
-				</view>
-			</view>
-		</view> -->
-		<view class="detail-foot">
-			<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">
-				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
-				<!-- <view class="lab-view">
-					<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
-						<span class="detail-foot-mian-txetList">{{item}}</span>
-					</view>
-				</view> -->
-			</view>
-		</view>
 		<view class="detail-foot" v-if="dataList.name!='index'">
 			<view class="detail-foot-nav">
 				<span class="detail-foot-nav-text">疗程详情</span>
@@ -127,6 +95,21 @@
 				</view>
 			</view>
 		</view>
+		<view class="detail-foot">
+			<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">
+				<image class="detail-foot-mian-img" v-for="(item,index) in contentImg" :key="index" :src="item" mode="widthFix"></image>	
+				<!-- <view class="lab-view">
+					<view class="detail-foot-mian-txet" v-for="item in labels" :key="item">
+						<span class="detail-foot-mian-txetList">{{item}}</span>
+					</view>
+				</view> -->
+			</view>
+		</view>
+		
 		
 		<view class="detail-btn btn"  v-if="dataList.name=='index'" @click="openpay(mainData)">
 			立即购买
diff --git a/pages/my/index.vue b/pages/my/index.vue
index a0748e9..7758020 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -119,6 +119,44 @@
 				</view>
 			</view>
 		</view>
+		<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+			<image :src="item.packageImg" mode="" class="item-img"></image>
+			<view class="item-view">
+				<view class="item-view-title">
+					{{item.title}}
+				</view>
+				<!-- <view class="item-view-xiangmu">
+					<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+					<span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span>
+				</view> -->
+				
+				<view class="item-view-bottom">
+					<view class="item-view-bottom-qian">
+						<span>￥</span>
+						<span>{{item.price}}</span>
+						<span v-if="item.type!='104'">
+							/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
+						</span>
+						<span v-if="item.type=='104'">/套
+						</span>
+						<span v-if="item.type!='104'">￥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}</span>
+						<span v-if="item.type=='104'">￥{{item.oldPrice}}/套</span>
+					</view>
+					
+				</view>
+				<view class="shop_label" v-if="tagsData">
+					<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+				</view>
+				<view class="item-view-bottom">
+					<view class="item-view-xiangmu">
+						<span>已售</span><span>{{item.sales}}</span><!-- | 好评{{item.esteemRate}}% -->
+					</view>
+					<view class="item-view-bottom-btn">
+						查看
+					</view>
+				</view>
+			</view>	
+		</view>
 		<view class="prompt-text">-当你累了 想起盛安到家-</view>
 	</view>
 	
@@ -161,7 +199,9 @@
 				],
 				token:'',
 				vipData:[],
-				vipNameType:''
+				vipNameType:'',
+				dataList:[],
+				tagsData:[]
 			}
 		},
 		onLoad(e) {
@@ -171,6 +211,7 @@
 				this.money = e.money;
 				this.couponnum = e.couponnum;
 			}
+			this.getDataX()
 		},
 		onShow() {
 			this.hyCheck = this.$queue.getData('hyCheck');
@@ -199,6 +240,22 @@
 		
 		},
 		methods:{
+			getDataX(){
+				this.$Request.get("/app/massage/package/findPackageAndMassagePage",{
+					city:'',
+					page:1,
+					limit:6,
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.dataList = res.data.list||{}; //追加新数据
+							for(var i=0;i<this.dataList.length;i++){
+								this.tagsData=this.dataList[i].labels.split(',');
+							}
+						}
+					}
+				});
+			},
 			qidai(){
 				uni.showToast({
 					title:'敬请期待！'
@@ -590,7 +647,156 @@
 </script>
 
 <style scoped>
-	
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
+	.item-view-xiangmu span:nth-child(2){
+			font-weight: normal;
+			color: #666666;
+		}
+		.item-view-xiangmu span:nth-child(1){
+			font-weight: normal;
+			color: #999;
+			margin-right: 5rpx;
+		}
+		.item-view-xiangmu{
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			font-weight: 400;
+			font-size: 25rpx;
+			align-items: flex-end;
+		}
+		.item-view-title{
+			font-weight: bold;
+			font-size: 33rpx;
+			color: #333333;
+		}
+		.item-view{
+			width: 55%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+		}
+		.item-img{
+			width: 285rpx;
+			height: 120px;
+			border-radius: 14rpx;
+			position: relative;
+		}
+		.img-span{
+			padding: 2px 5px;
+			font-weight: 400;
+			font-size: 8px;
+			color: #FFFFFF;
+			background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+			border-radius: 7px 0px 7px 0px;
+			position: absolute;
+			bottom: 0px;
+			right: 0;
+			margin-bottom: 5px;
+			margin-right: 5px;
+		}
+		.item-img image{
+			width: 100%;
+			height: 100%;
+		}
+		.item {
+			width: 96%;
+			margin: 0 2% ;
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			height: 140px;
+			background: #FFFFFF;
+			border-radius: 21rpx;
+			margin-top:12px;
+			align-items: center;
+			padding: 0px 10px;
+		}
+		
+		.item-detail {
+			padding: 5rpx 15rpx;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			color: white;
+			background-color: #007AFF;
+		}
+		
+		.item-line {
+			position: absolute;
+			bottom: 0rpx;
+			left: 0rpx;
+			height: 1px;
+			width: 100%;
+			background-color: #eeeeee;
+		}
+	.item-view-bottom-btn{
+		text-align: center;
+		width: 131rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 26rpx;
+		color: #FFFFFF;
+		margin-top: 8rpx;
+	}
+	.item-view-bottom-qian span:nth-child(4){
+		 font-size: 28rpx;
+		 color: #848484;
+		 text-decoration-line: line-through;
+		 margin-left: 5px;
+	}
+	.item-view-bottom-qian span:nth-child(1){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.item-view-bottom-qian span:nth-child(2){
+		 font-weight: bold;
+		 font-size: 36.81rpx;
+		  color: #F95900;
+	}
+	.item-view-bottom-qian span:nth-child(3){
+		 font-weight: 400;
+		 font-size: 25rpx;
+		 color: #F95900;
+	}
+	.item-view-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 12rpx;
+	}
+	.item-view-jianjie{
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #848484;
+		margin:5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.item-view-biao{
+		padding: 1px 2px;
+		border-radius: 6rpx;
+	}
 	
 	.prompt-text{
 		font-size: 21rpx;
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index ffe01dc..8395cf1 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -1,18 +1,24 @@
 <!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content-view">
-		<view class="service-head-top">
-			<view class="service-head-top-left">
-				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-				<span>{{typeData=='104'?'服务套餐':typeData=='105'?'次卡':'服务疗程'}}</span>
-			</view>
-			<view>
-				<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
-				 @clear="clear">
-				</uni-search-bar>
-				<view class="search-btn" @click="searchBtn">
-					搜索
+		<view class="tab-view">
+			<view class="service-head-top">
+				<view class="service-head-top-left">
+					<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+					<span>{{typeData=='104'?'服务套餐':typeData=='105'?'次卡':'服务疗程'}}</span>
 				</view>
+				<view>
+					<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
+					 @clear="clear">
+					</uni-search-bar>
+					<view class="search-btn" @click="searchBtn">
+						搜索
+					</view>
+				</view>
+				
+			</view>
+			<view class="fenlei">
+				<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
 			</view>
 		</view>
 		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
@@ -45,10 +51,9 @@
 						</view>
 					</view>	
 				</view>
-				<empty v-if="dataList.length==0"></empty>
 			</template> 
 		</t-refresh>
-			
+		<empty v-if="dataList.length==0"></empty>
 	</view>
 </template>
 
@@ -72,7 +77,8 @@
 				titleNmae:'',
 				classifyId:'',
 				getName:'',
-				tagsData:[]
+				tagsData:[],
+				tabList: [],
 			}
 		},
 		onLoad(e){
@@ -83,12 +89,34 @@
 			uni.setNavigationBarTitle({
 			   title: this.typeData=='104'?'服务套餐':this.typeData=='105'?'项目次卡':'服务疗程',
 			 })
+			this.tabNav()
 		},
 		onPullDownRefresh: function() {
 			this.page = 1;
 			this.getData()
 		},
 		methods: {
+			tabNav(){
+				let data = {
+						  type: "服务类型",
+						}
+				this.$Request.get('/app/dict/list', data).then(res => {
+					if (res.code == 0) {
+						this.tabList=res.data;
+						this.classifyId=res.data[0].id;
+						this.page = 1;
+						this.dataList = []
+						this.getData()
+					}
+				})
+			},
+			changeClick(index,item){
+				this.classifyId=item.id
+				this.searchValue=''
+				this.page = 1;
+				this.dataList = []
+				this.getData()
+			},
 			// 加载更多
 			loadMore: async function() {
 				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
@@ -118,7 +146,8 @@
 						type:that.typeData,
 						page:that.page,
 						limit:that.limit,
-						title:that.searchValue
+						title:that.searchValue,
+						classifyId:that.classifyId
 					}).then(res => {
 						if (res.code == 0) {
 							if (res.data) {
@@ -162,6 +191,19 @@
 </script>
 
 <style scoped>
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.tab-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		position: fixed;
+		z-index: 999;
+	}
 	.shop_label{
 		display: flex;
 		flex-wrap: wrap;
@@ -183,12 +225,12 @@
 	/deep/.refresh-body{
 		height: 100% !important;
 		border-top: 2px solid #f7f7f7;
-		margin: 50px 0px;
+		margin: 80px 0px;
 	}
 	.content-view{
 		width: 100%;
 		height: 100vh;
-		overflow: auto;
+		overflow: hidden;
 		background-color: #f7f7f7;
 		position: relative;
 	}
@@ -363,12 +405,7 @@
 		width: 95%;
 		margin: 0 auto;
 	}
-	.fenlei{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
+	
 	.index-fenl-title{
 		width: 81rpx;
 		text-align: center;
@@ -448,8 +485,7 @@
 		align-items: center;
 		justify-content: space-between;
 		background-color: #fff;
-		position: fixed;
-		z-index: 999;
+		
 	}
 	.view-cata{
 		display: flex;
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 66089f6..234ffed 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -14,7 +14,11 @@
 					<selectSwitchDitu @change="switch1Change" :switchList="switchList"/>
 				</view>
 			</view>
+			<view class="fenlei">
+				<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
+			</view>
 		</view>
+		
 		<view class="liebiao" v-show="current === 0">
 			<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
 				<view class="margin-bottom-sm radius touxiang-left">
@@ -76,7 +80,7 @@
 									<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
 									<view  v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
 								</view>
-								<view class="flex align-center" style="margin-top: 26rpx;" v-if="item.tripWay != 3" >
+								<view class="flex align-center" style="margin-top: 26rpx;">
 									<image style="width: 27rpx; height: 30rpx; margin-right: 5rpx;" src="../../static/dituzhaoren6.png"></image>
 									<view class="therapist-bottom-dingwei-text">
 										{{ item.distance }}
@@ -240,6 +244,24 @@ import permision from "@/components/permission.js";
 		},
 		data() {
 			return {
+				tabList:[
+					{
+						id: 3,
+						name: "",
+						value: "新手",
+					},
+					{
+						id: 4,
+						name: "",
+						value: "资深",
+					},
+					{
+						id: 5,
+						name: "",
+						value: "专家",
+					},
+				],
+				technicianType:3,
 				switchList:['列表','地图'],
 				artificerName: '',
 				tpSel: 0,
@@ -341,7 +363,6 @@ import permision from "@/components/permission.js";
 		onLoad(e) {
 			let that = this
 			that.massageTypeId = e.massageTypeId;
-			console.log("1231312")
 			// that.getLocation();//低精度，快就完事了
 			//    that.getLocation(true);//高精度，慢慢查询
 			if(e){
@@ -456,6 +477,78 @@ import permision from "@/components/permission.js";
 			//this.closeSocket();
 		},
 		methods: {
+			changeClick(index,item){
+				// this.classifyId=item.id
+				this.artificerName='';
+				this.technicianType=item.id
+				console.log('this.technicianType===========>',this.technicianType)
+				this.getlist()
+			},
+			getlist() {
+				// if (this.city === '请选择城市') {
+				// 	return;
+				// }
+				// if (this.tabIndex == 0) {
+				// 	return;
+				// }
+				// let index = this.list[this.listIndex].id
+				let index = 2
+				let data = {
+					// id: curTab,
+					artificerName: this.artificerName,
+					classifyId: this.tabIndex,
+					page: this.page,
+					limit: this.limit,
+					technicianType:this.technicianType,
+					// massageTypeId: this.massageTypeId,
+					// condition: this.value1, //智能优选
+					// authentication: this.value2, //不限男女
+					by: index, //价格
+					latitude: this.latitude,
+					longitude: this.longitude,
+					city: this.city
+				}
+				// console.log(data)
+				this.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
+					this.loading = false;
+					if (res.code == 0) {
+						for (var i = 0; i < res.data.list.length; i++) {
+							if (res.data.list[i].lifePhoto) {
+								res.data.list[i].lifePhoto = res.data.list[i].lifePhoto.split(',')
+							}
+							if (res.data.list[i].distance > 1000) {
+								res.data.list[i].distance = (res.data.list[i].distance / 1000).toFixed(1) +
+									'km'
+							} else {
+								res.data.list[i].distance = (res.data.list[i].distance).toFixed(1) + 'm'
+							}
+			
+						}
+						if (this.page == 1) {
+							this.orderList = res.data.list
+						} else {
+							this.orderList = [...this.orderList, ...res.data.list]
+						}
+						//加载到地图里
+						if (this.amap) {
+							// debugger;
+							console.log(this.orderList)
+							if (this.orderList.length > 0) {
+								let rmap = {};
+								let onLineArtificerList = this.orderList.filter((item) => item.status == 1);
+								onLineArtificerList.forEach(x => {
+									rmap[x.userId] = x.latitude + ',' + x.longitude; //没有给个签到坐标
+								});
+								console.log('在orderList初始化：', JSON.parse(JSON.stringify(rmap)));
+								this.pointMap = rmap;
+								this.creatMarker(rmap);
+							}
+						}
+			
+					}
+					uni.stopPullDownRefresh();
+				})
+			},
 			// 跳转订单
 			goOrder(e) {
 					console.log('授权', uni.getStorageSync('sendMsg'))
@@ -759,70 +852,7 @@ import permision from "@/components/permission.js";
 				this.page = 1;
 				this.getlist()
 			},
-			getlist() {
-				// if (this.city === '请选择城市') {
-				// 	return;
-				// }
-				// if (this.tabIndex == 0) {
-				// 	return;
-				// }
-				// let index = this.list[this.listIndex].id
-				let index = 2
-				let data = {
-					// id: curTab,
-					artificerName: this.artificerName,
-					classifyId: this.tabIndex,
-					page: this.page,
-					limit: this.limit,
-					// massageTypeId: this.massageTypeId,
-					// condition: this.value1, //智能优选
-					// authentication: this.value2, //不限男女
-					by: index, //价格
-					latitude: this.latitude,
-					longitude: this.longitude,
-					city: this.city
-				}
-				// console.log(data)
-				this.$Request.get("/app/artificer/selectArtificerList", data).then(res => {
-					this.loading = false;
-					if (res.code == 0) {
-						for (var i = 0; i < res.data.list.length; i++) {
-							if (res.data.list[i].lifePhoto) {
-								res.data.list[i].lifePhoto = res.data.list[i].lifePhoto.split(',')
-							}
-							if (res.data.list[i].distance > 1000) {
-								res.data.list[i].distance = (res.data.list[i].distance / 1000).toFixed(1) +
-									'km'
-							} else {
-								res.data.list[i].distance = (res.data.list[i].distance).toFixed(1) + 'm'
-							}
-
-						}
-						if (this.page == 1) {
-							this.orderList = res.data.list
-						} else {
-							this.orderList = [...this.orderList, ...res.data.list]
-						}
-						//加载到地图里
-						if (this.amap) {
-							// debugger;
-							console.log(this.orderList)
-							if (this.orderList.length > 0) {
-								let rmap = {};
-								let onLineArtificerList = this.orderList.filter((item) => item.status == 1);
-								onLineArtificerList.forEach(x => {
-									rmap[x.userId] = x.latitude + ',' + x.longitude; //没有给个签到坐标
-								});
-								console.log('在orderList初始化：', JSON.parse(JSON.stringify(rmap)));
-								this.pointMap = rmap;
-								this.creatMarker(rmap);
-							}
-						}
-
-					}
-					uni.stopPullDownRefresh();
-				})
-			},
+			
 			// 切换菜单
 			tabChange() {
 				if (uni.getStorageSync('sendMsg')) {
@@ -1223,6 +1253,12 @@ import permision from "@/components/permission.js";
 </script>
 
 <style lang="scss" scoped>
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	/deep/.margin-bottom-sm{
 		margin-bottom: 70px;
 	}
@@ -1260,7 +1296,7 @@ import permision from "@/components/permission.js";
 	}
 	.liebiao{
 		//height: 100vh;
-		margin-top: 70px;
+		margin-top: 110px;
 		display: flex;
 		flex-direction: column;
 	}
diff --git a/pages/therapist/therapistList.vue b/pages/therapist/therapistList.vue
index dbbebb4..7d55714 100644
--- a/pages/therapist/therapistList.vue
+++ b/pages/therapist/therapistList.vue
@@ -21,7 +21,9 @@
 				</u-search>
 			</view>
 		</view>
-
+		<view class="fenlei">
+			<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
+		</view>
 		<view class="content" style="margin-top: 30rpx;">
 			<view v-show="current === 0">
 				<view style="margin-top: 180rpx;padding: 0 20rpx;" class="flex text-center flex-wrap">
@@ -353,6 +355,11 @@
 		},
 		data() {
 			return {
+				tabList:[
+					{value:'新手'},
+					{value:'资深'},
+					{value:'专家'}
+				],
 				Cityshow: false,
 				cityList: [],
 				items: ['选项1', '选项2'],
@@ -663,7 +670,11 @@
 			//this.closeSocket();
 		},
 		methods: {
-
+			changeClick(index,item){
+				// this.classifyId=item.id
+				this.artificerName=''
+				this.getlist()
+			},
 			onClickItem(e) {
 				if (this.current != e) {
 					this.current = e;
@@ -1576,6 +1587,12 @@
 </script>
 
 <style lang="scss">
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	page {
 		background-color: #F7F7F7;
 	}
diff --git a/uni_modules/z-tabs/components/z-tabs/z-tabs.vue b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
index cb0005e..487d142 100644
--- a/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
+++ b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
@@ -247,8 +247,11 @@
 			}
 		},
 		mounted() {
+			console.log("list",this.list)
 			this.updateSubviewLayout();
 		},
+		onLoad() {
+		},
 		watch: {
 			current: {
 				handler(newVal) {