From 1753c8ae2b65bcdc98ad6634549e80104a9fd9c3 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 22 Aug 2024 15:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8C=E4=B8=9A=E5=A4=A7?=
 =?UTF-8?q?=E6=8B=BF=E9=A1=B5=E9=9D=A2=20=E9=A6=96=E9=A1=B5=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/gird/shoucang - 副本.vue          | 452 ---------------
 my/gird/shoucang.vue                 |   9 -
 pages.json                           |  16 +-
 pages/index/index.vue                |  40 +-
 pages/my/fuwuxiangm.vue              |   1 +
 pages/my/hangyedana.vue              | 821 +++++++++++++++++++++++++++
 pages/therapist/therapistDingdan.vue |   2 +-
 7 files changed, 850 insertions(+), 491 deletions(-)
 delete mode 100644 my/gird/shoucang - 副本.vue
 create mode 100644 pages/my/hangyedana.vue

diff --git a/my/gird/shoucang - 副本.vue b/my/gird/shoucang - 副本.vue
deleted file mode 100644
index 062e5d5..0000000
--- a/my/gird/shoucang - 副本.vue	
+++ /dev/null
@@ -1,452 +0,0 @@
-<template>
-	<view class="content">
-		<view style="padding-top: 1rpx;" v-if="orderList.length">
-			<view class="flex align-center margin-bottom-sm bg padding-sm radius margin-sm"
-				v-for="(item,index) in orderList" :key='index' @click="goOrderDetail(item)"
-				style="box-shadow: 6rpx 10rpx 4px #F5F5F5;position: relative;">
-				<view style="position: absolute;z-index: 99;top: 0rpx;left: 0;" v-if="item.isGoods == 1">
-					<image
-						src="https://admin.sjajk.com/file/uploadPath/2023/02/16/c551f3f0721aec54208011e6948a57cd.png"
-						style="width: 42rpx;height: 36rpx;"></image>
-				</view>
-				<view style="width: 170upx;height: 170upx;border-radius: 10rpx;position: relative;">
-					<image :src="item.artificerImg?item.artificerImg: '../../static/logo.png'"
-						@click.stop="saveImgs(item.artificerImg)"
-						style="width: 170upx;height: 170upx;border-radius: 50%;" mode="aspectFill"></image>
-					<image v-if="item.isHot == 1"
-						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>
-					<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
-				</view>
-				<view class="margin-left flex flex-direction" style="width: 85%;">
-					<view class="flex align-center" style="justify-content: start;">
-						<view class="flex align-center" style="width: 120rpx;">
-							<view class="text-bold text-30 margin-right-xs" style="width: 100rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{item.artificerName}}</view>
-							<!-- <image
-								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/d45855dcf1e01210a4224a408225e8e0.png"
-								style="width: 40rpx;height:40rpx;">
-							</image> -->
-						</view>
-						<view class="" style="width: 150rpx;">
-							<view class="flex align-center" v-if="item.tripWay != 3" style="width: 150rpx;">
-								<image src="../../static/images/address.png" style="width: 24rpx;height: 24rpx;"></image>
-								<view style="color: #333333;margin-left: 8rpx;">{{item.distance}}</view>
-							</view>
-						</view>
-						
-						<view class="kyy_view" v-if="item.state == 1">可服务</view>
-						<view class="kfw_view" v-else-if="item.state == 2">可预约</view>
-						<view class="byy_view" v-else>休息中</view>
-					</view>
-					<view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;">
-						<view class="flex align-center" style="width: 120rpx;">
-							<view v-if="item.ordersScore" class="margin-right-sm">
-								<image src="../../static/images/start.png" style="width: 24upx;height: 22upx;">
-								</image>
-								<text class="margin-left-xs" style="color: #FF1200;">{{item.ordersScore}}.0</text>
-							</view>
-							<!-- <view style="color: #999999;">已服务:{{item.ordersCount}}单</view> -->
-						</view>
-						
-						<view class="flex align-center"  style="width: 150rpx;">
-							<image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image>
-							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">
-								{{item.commentCount ? item.commentCount : 0}}
-							</view>
-						</view>
-						<view class="flex align-center">
-							<image src="../../static/images/aixin2.png" style="width: 24rpx;height: 24rpx;margin-left: 40rpx;"></image>
-							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">
-								{{item.collectCount ? item.collectCount : 0}}
-							</view>
-						</view>
-					</view>
-					<view style="width: 100%;display: flex;justify-content: start;align-items: center;">
-						<view class="flex flex-wrap align-center" style="width: 120rpx;">
-							<image src="../../static/images/shangjia.png" style="width: 24rpx;height: 24rpx;"></image>
-							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">商家</view>
-						</view>
-						<view class="flex align-center" style="width: 260rpx;">
-							<image src="../../static/images/time.png" style="width: 26rpx;height: 26rpx;"></image>
-							<view class="zz_view" v-if="item.status == 1 && item.time">最早可约{{item.time}}</view>
-						</view>
-						<view class="flex" style="font-size: 24rpx;color: #f49650;font-weight: bold;" v-if="item.tripWay == 3">
-							免出行费
-						</view>
-					</view>
-					<view class="text-center text-sm" v-if="item.status == 1"
-						style="background: linear-gradient(to right, #223845, #00a85b);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;"
-						@click.stop="goOrderDetail(item)">
-						立即预约
-					</view>
-					<view class="text-center text-sm" v-else
-						style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;">
-						立即预约
-					</view>
-				</view>
-			</view>
-		</view>
-		<empty v-if="orderList.length == 0"></empty>
-
-		<!-- <u-skeleton :loading="loading" :animation="true" elColor='#FFFFFF' bgColor='#FFFFFF'></u-skeleton> -->
-	</view>
-</template>
-
-<script>
-	import empty from '@/components/empty.vue'
-	export default {
-		components: {
-			empty,
-		},
-		data() {
-			return {
-				loading: true, // 是否显示骨架屏组件
-				game: [],
-				orderList: [],
-				isVip: false,
-				myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '',
-				showModal: true,
-				arr: [],
-				tab: '',
-				massageTypeId: '',
-				page: 1,
-				limit: 10,
-				latitude: '',
-				XCXIsSelect:'否',
-				longitude: ''
-			}
-		},
-		onLoad(e) {
-			let that = this
-			that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
-			console.log("shouchang",that.XCXIsSelect)
-			uni.getLocation({
-				type: 'gcj02',
-				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
-				success: function(res) {
-					console.log(res, '地理位置')
-					that.latitude = res.latitude
-					that.longitude = res.longitude
-					// uni.setStorageSync('latitude', res.latitude)
-					// uni.setStorageSync('longitude', res.longitude)
-
-					that.getData(that.latitude, that.longitude)
-				},
-				fail: function() {
-					console.log('获取地址失败')
-				}
-			})
-
-			that.getData(139.2222,46.3333)
-		},
-		onShow() {
-			if(this.latitude && this.longitude){
-				this.getData(this.latitude, this.longitude)
-			}
-		},
-		methods: {
-			saveImgss(imgs, index) {
-				console.log(imgs, index)
-				// let that = this
-				let imgArr = imgs
-				// this.imgArr.push(imgs);
-				// console.log(this.imgArr)
-				// //预览图片
-				uni.previewImage({
-					urls: imgArr,
-					current: imgArr[index]
-				});
-			},
-			saveImgs(imgs) {
-				let imgArr = [];
-				imgArr.push(imgs);
-				// //预览图片
-				uni.previewImage({
-					urls: imgArr,
-					current: 0
-				});
-			},
-			getData(latitude, longitude) {
-				let data = {
-					page: this.page,
-					limit: this.limit,
-					latitude: latitude,
-					longitude: longitude,
-				}
-				this.$Request.get("/app/artificer/selectCollectList", 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].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 (res.data.list[i].lifePhoto) {
-								res.data.list[i].lifePhoto = res.data.list[i].lifePhoto.split(',')
-							}
-						}
-						if (this.page == 1) {
-							this.orderList = res.data.list
-						} else {
-							this.orderList = [...this.orderList, ...res.data.list]
-						}
-
-					}
-
-				}).catch(() => {
-					//联网失败, 结束加载
-					// this.mescroll.endErr();
-				});
-
-			},
-
-			// 跳转订单
-			goOrder(e) {
-				let token = this.$queue.getData('token');
-				if (token) {
-					uni.navigateTo({
-						url: "/pages/index/order/orderDet?artificerId=" + e.artificerId + '&massageTypeId=' + this
-							.massageTypeId
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/public/login'
-					});
-				}
-			},
-			goOrderDetail(e) {
-				uni.navigateTo({
-					url: "/pages/therapist/orderDetail?artificerId=" + e.artificerId + '&massageTypeId=' + this
-						.massageTypeId
-				})
-			}
-		},
-		onReachBottom: function() {
-			this.page = this.page + 1;
-			this.getData(this.latitude, this.longitude)
-		},
-		onPullDownRefresh: function() {
-			this.page = 1;
-			this.getData(this.latitude, this.longitude)
-			setTimeout(d => {
-				uni.stopPullDownRefresh();
-			}, 3000);
-		},
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		width: 100%;
-		height: 100vh;
-		background-color: #F7F7F7;
-	}
-
-	.zz_view {
-		color: #333333;
-		font-size: 24rpx;
-		padding: 6rpx 10rpx;
-		border-radius: 10rpx;
-	}
-
-	.zpmore_view {
-		position: absolute;
-		bottom: -20rpx;
-		left: 14rpx;
-		color: #f9f3d3;
-		background: linear-gradient(to right, #0a0c16, #4d4d53);
-		width: 130upx;
-		text-align: center;
-		border-radius: 30rpx;
-		height: 42rpx;
-		line-height: 42rpx;
-		font-size: 24rpx;
-		margin-left: 10rpx;
-	}
-	
-	.byy_view {
-		background: #ebebeb;
-		width: 100upx;
-		text-align: center;
-		border-radius: 50rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color: #000000;
-		// border: 3upx solid #999999;
-		margin-top: 6rpx;
-		margin-left: 40rpx;
-	}
-	
-	.kfw_view {
-		background: #ffaa00;
-		width: 100upx;
-		text-align: center;
-		border-radius: 50rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		margin-top: 6rpx;
-		margin-left: 40rpx;
-	}
-	
-	.kyy_view {
-		background: #096f4b;
-		width: 100upx;
-		text-align: center;
-		border-radius: 50rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		margin-top: 6rpx;
-		margin-left: 40rpx;
-	}
-
-	.bg {
-		background: #FFFFFF;
-	}
-
-	.ytp_view {
-		background: #e3e3e3;
-		width: 400rpx;
-		border-radius: 10rpx;
-		font-size: 28rpx;
-		text-align: center;
-		height: 80rpx;
-		line-height: 80rpx;
-		color: #848484;
-		margin-top: 40rpx;
-	}
-
-	.tp_view {
-		background: #ee6c54;
-		width: 400rpx;
-		border-radius: 10rpx;
-		font-size: 28rpx;
-		text-align: center;
-		height: 80rpx;
-		line-height: 80rpx;
-		color: #FFFFFF;
-		margin-top: 40rpx;
-	}
-
-	.sticky-tabs {
-		z-index: 990;
-		position: sticky;
-		top: var(--window-top);
-		// background-color: #fff;
-	}
-
-	/* // 使用mescroll-uni,则top为0 */
-	.mescroll-uni,
-	/deep/.mescroll-uni {
-		.sticky-tabs {
-			top: 0;
-		}
-	}
-
-	.demo-tip {
-		padding: 18upx;
-		font-size: 24upx;
-		text-align: center;
-	}
-
-	.line_s {
-		display: inline-flex;
-		width: 10rpx;
-		height: 10rpx;
-		background: #1AD566;
-		border-radius: 50%;
-		margin-right: 10rpx;
-	}
-
-	.line_x {
-		display: inline-flex;
-		width: 10rpx;
-		height: 10rpx;
-		background: #000000;
-		border-radius: 50%;
-		margin-right: 10rpx;
-	}
-
-	.box {
-		// border: 3rpx solid #005dff;
-		background: #E8FAE1;
-		color: #096f4b;
-		padding: 5rpx 15rpx;
-		font-size: 26rpx;
-		letter-spacing: 2rpx;
-		border-radius: 8rpx;
-		// margin-top: 10rpx;
-		margin-right: 8upx;
-	}
-
-	.actve {
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 800;
-		color: #20C675;
-	}
-
-	.tabview1 {
-		padding: 20rpx 20rpx;
-		// width: 686upx;
-		// height: 100upx;
-		background: #FFFFFF;
-		// margin-top: -50upx;
-		// z-index: 99;
-		// display: flex;
-		// line-height: 100upx;
-
-		.tabview {
-			// width: 686upx;
-			// // height: 100upx;
-			background: #F2FFF9;
-			border-radius: 24rpx 24rpx 0 0;
-			// margin-top: -50upx;
-			// z-index: 99;
-			display: flex;
-			line-height: 100upx;
-
-			.tabItem_sel {
-				font-size: 30upx;
-				font-family: PingFang SC;
-				font-weight: 800;
-				color: #20C675;
-				flex: 1;
-				text-align: center;
-			}
-
-			.tabItem {
-				font-size: 26upx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				flex: 1;
-				text-align: center;
-			}
-		}
-
-		.tabsx {
-			width: 686upx;
-			border-radius: 24rpx;
-			padding-bottom: 10rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 20rpx 30rpx;
-			font-size: 26rpx;
-
-			.active {
-				color: #20C675;
-				font-size: 30rpx;
-				font-weight: bold;
-			}
-		}
-	}
-</style>
diff --git a/my/gird/shoucang.vue b/my/gird/shoucang.vue
index 1633a16..1a0e07c 100644
--- a/my/gird/shoucang.vue
+++ b/my/gird/shoucang.vue
@@ -73,15 +73,6 @@
 							</image>
 							<view class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
 						</view>
-						<!-- <view class="text-center text-sm" v-if="item.status == 1"
-							style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 30%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
-							@click.stop="goOrderDetail(item)">
-							立即预约
-						</view>
-						<view class="text-center text-sm" v-else
-							style="background: #d9d9d9;color: #ffffff;width: 30%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;">
-							立即预约
-						</view> -->
 					</view>
 					
 				</view>
diff --git a/pages.json b/pages.json
index 48594de..c582fc0 100644
--- a/pages.json
+++ b/pages.json
@@ -577,7 +577,7 @@
 		{
 			"path": "pages/my/fuwuGengduo",
 			"style": {
-				"navigationBarTitleText": "更多优惠",
+				"navigationBarTitleText": "全部项目",
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
 				"navigationStyle": "custom",
@@ -587,7 +587,7 @@
 		{
 			"path": "pages/my/fuwuDateil",
 			"style": {
-				"navigationBarTitleText": "服务项目详情",
+				"navigationBarTitleText": "项目详情",
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
 				"navigationStyle": "custom",
@@ -597,7 +597,17 @@
 		{
 			"path": "pages/my/fuwuxiangm",
 			"style": {
-				"navigationBarTitleText": "服务项目",
+				"navigationBarTitleText": "女性专区",
+				"navigationBarBackgroundColor": "#096f4b",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/my/hangyedana",
+			"style": {
+				"navigationBarTitleText": "行业大拿",
 				"navigationBarBackgroundColor": "#096f4b",
 				"navigationBarTextStyle": "white",
 				"navigationStyle": "custom",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 938dc0b..ee83c77 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -346,16 +346,17 @@
 					},
 					{
 						id:2,
-						name: '行业大拿'
+						name: '全部项目',
 					},
 					{
 						id:3,
-						name: '女性专区',
+						name: '行业大拿'
 					},
 					{
 						id:4,
-						name: '全部项目',
+						name: '女性专区',
 					},
+					
 				],
 				scrollLeft:0,
 				tabs: [{
@@ -1138,34 +1139,21 @@
 				this.currentTabFl=item.id;
 				if(this.currentTabFl=='1'){//大家常买
 					this.remen()
-				}else if(this.currentTabFl=='2'){//行业大拿
-					this.tjtaocan()
-				}else if(this.currentTabFl=='3'){//女性专区
-					uni.navigateTo({
-						url:'/pages/my/fuwuxiangm'
-					})
-				}else{//全部项目
+				}else if(this.currentTabFl=='2'){// 全部项目
 					uni.navigateTo({
 						url:'/pages/my/fuwuGengduo'
 					})
+				}else if(this.currentTabFl=='3'){//行业大拿
+					uni.navigateTo({
+						url:'/pages/my/hangyedana'
+					})
+				}else{// 女性专区
+				uni.navigateTo({
+					url:'/pages/my/fuwuxiangm'
+				})
+					
 				}
 			},
-			tjtaocan(){//行业大拿
-				this.$Request.get("/app/artificer/selectArtificerList", {
-					isGoods:1,
-					page:'1',
-					limit:'4'
-				}).then(res => {
-					if (res.code == 0) {
-						if (res.data) {
-							this.tjData = res.data.list
-							for(var i=0;i<this.tjData.length;i++){
-								this.tjData[i].tagsData=this.tjData[i].labels.split(',');
-							}
-						}
-					}
-				});
-			},
 			remen(){//大家常买
 				this.$Request.get("/app/massage/package/findPackageAndMassagePage", {
 					page:'1',
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index e57624a..854250e 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -189,6 +189,7 @@
 					url: '/pages/my/fuwuDateil?id=' + item.massageTypeId + '&limit=' + this.limit + '&page=' + this
 						.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
 				})
+				
 			}
 		}
 	}
diff --git a/pages/my/hangyedana.vue b/pages/my/hangyedana.vue
new file mode 100644
index 0000000..bdca7ee
--- /dev/null
+++ b/pages/my/hangyedana.vue
@@ -0,0 +1,821 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<z-paging ref="paging" v-model="dataList" @query="queryList">
+			<template #top>
+				<view class="service-head-top">
+					<view class="service-head-top-left">
+						<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+						<span>行业大拿</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">
+							<image style="width:30rpx; height:30rpx; margin-right: 10rpx;"
+								src="../../static/search.png"></image>
+							搜索
+						</view>
+					</view>
+				</view>
+				
+			</template>
+			<template #loadingMoreNoMore>
+				<custom-nomore />
+			</template>
+			<!-- 右侧商品 -->
+				<!-- 主体部分 -->
+				<view class="body">
+					<!-- 左侧分类 -->
+					<view class="leftTab">
+						<scroll-view scroll-y="true" class="tabBox">
+							<block v-for="(item,index) in tabList" :key="index">
+								<view class="tabItem" :class="tabCurrent == index?'tabActive':''" @click="changeTab(index,item)">
+									{{item.value}}
+								</view>
+							</block>
+						</scroll-view>
+					</view>
+					<!-- 右侧商品 -->
+					<view class="rightGoods">
+						<view class="margin-bottom-sm radius touxiang-left">
+							<view class="flex align-center touxiang-left-view" v-for="(item, index) in dataList" :key='index'  @click="itemClick(item)">
+								<view class="touxiang-left-content">
+									<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img"  :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
+									<image  class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>
+									<image class="touxiang-frame" :src="item.technicianType=='3'?'../../static/vip/grade1-1.gif':item.technicianType=='4'?'../../static/vip/grade2-1.gif':'../../static/vip/grade3-1.gif'"></image>
+								</view>
+								<view class="list-right">
+									<view class="flex align-center" style="justify-content: start;">
+										<view class="flex align-center list-right-top">
+											<view class="list-right-top-view">
+												<view class="list-right-top-name">
+													{{ item.artificerName }}
+												</view>
+												<view class="keyuyue keyuyue-lan" v-if="item.status == 1">
+														<view class="flex">
+															<view class="timea-fu">可服务</view>
+															<view class="timea-time">{{item.time}}</view>
+														</view>
+												</view>
+												<view class="keyuyue keyuyue-hui" v-else>
+													<view class="flex">
+														<view class="timea-hui">休息中</view>
+													</view>
+												</view>
+												
+											</view>
+										</view>
+									</view>
+									<view class="item-view-jianjie">
+										{{item.content}}
+									</view>
+									<view class="therapist-mian-top">
+										<view class="therap-pin">
+											<span>评论</span>
+											<span class="therapist-mian-view-text">
+												{{ item.commentCount ? item.commentCount : 0 }}
+											</span>
+										</view>
+										<view class="therap-pin">
+											<span>收藏</span>
+											<span class="therapist-mian-view-text">
+												{{ item.collectCount ? item.collectCount : 0 }}
+											</span>
+										</view>
+									</view>
+									<view class="flex  thera-lin thera-bottom">
+										<view class="flex align-center" v-if="item.distance">
+											<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
+											<view class="therapist-bottom-dingwei-text">
+												{{ item.distance }}
+											</view>
+										</view>
+										<view class="flex" 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>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+		</z-paging>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				loadingType: 0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData: '105',
+				tabIndex: 0,
+				searchValue: '',
+				serviceTrue: true,
+				page: 1,
+				limit: 10,
+				titleNmae: '',
+				classifyId: '',
+				tagsData: [],
+				// 分类列表
+				tabCurrent: 0,
+				productTitle: '氧气罐',
+			}
+		},
+		onLoad() {
+			this.myId = uni.getStorageSync('userId')
+			this.tabNav()
+		},
+		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.productTitle = this.tabList[0].value
+						this.page = 1;
+						this.dataList = []
+						this.getData()
+					}
+				})
+			},
+			input(res) { //搜索 输入框
+				this.searchValue = res;
+			},
+			searchBtn() { //搜索按钮
+				if (this.searchValue != "") {
+					this.getData()
+				}
+			},
+			getData() {
+				this.$refs.paging.reload(true);
+			},
+			queryList(pageNo, pageSize) {
+				const params = {
+					page: pageNo,
+					limit: pageSize,
+					isGoods: '1',
+					classifyId: this.classifyId,
+					artificerName: this.searchValue
+				}
+				this.$Request.get('/app/artificer/selectArtificerList', params).then(res => {
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					this.$refs.paging.complete(false);
+				})
+			},
+			changeTab(index,item) {
+				this.tabCurrent = index
+				this.productTitle = this.tabList[index].value
+				this.classifyId = item.id
+				this.searchValue = ''
+				this.page = 1;
+				this.dataList = []
+				this.getData()
+			},
+			backImg() { //返回上一页
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				uni.navigateTo({
+					url: '/pages/therapist/orderDetail?artificerId=' + item.artificerId + "&classifyId=" + this
+						.tabIndex
+				});
+				
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.therapist-bottom-img{
+		width: 26rpx;
+		height: 26rpx;
+		margin-right:3px;
+		margin-top: 5rpx
+	}
+	.therapist-mian-bottom-text{
+		font-weight: bold;
+		font-size: 26rpx;
+		color: #222222;
+	}
+	.therapist-bottom-dingwei-text{
+		font-size: 24rpx;
+		color: #848485;
+	}
+	.therapist-bottom-dingwei{
+		width: 26rpx;
+		height: 30rpx;
+		margin-right:3px;
+	}
+	.thera-lin{
+		display: flex;
+		justify-content: space-between;
+	}
+	.thera-bottom{
+		display: flex;
+		align-items: flex-end;
+		justify-content: space-between;
+	}
+	.therapist-mian-view-text span{
+		font-weight: 500;
+		font-size: 26rpx;
+		color: #222222;
+	}
+	.therap-pin{
+		font-size: 26rpx;
+		display: flex;
+		align-items: flex-end;
+		margin-right: 10rpx;
+	}
+	.therap-pin span:nth-child(2){
+		color: #019c88;
+	}
+	.therap-pin span:nth-child(1){
+		color: #666;
+		margin-right: 10rpx;
+	}
+	.therapist-mian-top{
+		width: 100%;
+		display: flex;
+		flex-direction:row;
+		padding: 10rpx 0;
+	}
+	.timea-fu{
+		color: #2dbe93;
+		font-size: 24rpx;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.timea-hui{
+		color: #ffffff;
+		font-size: 24rpx;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.timea-img{
+		background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
+		background-size: 28rpx 28rpx;
+		background-repeat: no-repeat;
+		width: 30rpx;
+		height: 30rpx;
+		border-radius:8rpx;
+		margin-top: 8rpx;
+	}
+	.timea-time{
+		font-size: 25rpx;
+		color: #2dbe93;
+		line-height: 44rpx;
+		padding-right: 10rpx;
+	}
+	.keyuyue{
+		padding: 0rpx 10rpx;
+		height: 44rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		border-radius:  30rpx 20rpx 20rpx 30rpx ;
+		font-size: 24rpx;
+	}
+	.keyuyue-lan{
+		background: #eefdf8;
+	}
+	.keyuyue-hui{
+		background: #d9d9d9;
+	}
+	.list-right-top-bottom{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.list-right-top-name{
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		text-align: left;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #13141A;
+	}
+	.list-right-top-view image{
+		//width: 168.75rpx;
+		height: 40.97rpx;
+	}
+	.list-right-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.list-right-top{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.list-right{
+		width: 72%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		padding: 16rpx;
+	}
+	.touxiang-frame{
+		position: absolute;
+		width: 190rpx;
+		height: 190rpx;
+		top:-6rpx;
+		left:6rpx;
+	}
+	.touxiang-left-content{
+		width: 180rpx;
+		height: auto;
+		border-radius: 10rpx;
+		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;
+		border-radius:120rpx;
+		margin: 14rpx 22rpx;
+	}
+	.touxiang-left-view{
+		width: 100%;
+		height: 126px;
+		border-radius: 18rpx;
+		align-items: flex-start;
+		background: #fff;
+		margin-bottom: 12px;
+		padding-bottom: 10px;
+		justify-content: space-between;
+		padding: 10rpx;
+	}
+	.touxiang-left{
+		width: 100%;
+		/* padding: 10px; */
+		display: flex;
+		flex-direction: column;
+		align-items: baseline;
+	}
+	
+	
+	/deep/.zp-empty-view-center{
+		position: absolute;
+		margin-top: 106px;
+		margin-left: 42%;
+	}
+	.body {
+		height: 100vh;
+		display: flex;
+		justify-content: end;
+	
+		.leftTab {
+			width:19%;
+			height: 100%;
+			background: #fff;
+			// border-radius: 0px 15rpx 0px 0px;
+			// padding: 24rpx 11rpx;
+			box-sizing: border-box;
+			border-top: 1px solid #f7f7f7;
+			// margin-top: 10px;
+			position: fixed;
+			left: 0;
+			.tabBox {
+				height: 100%;
+	
+				.tabItem {
+					text-align: center;
+					padding: 14rpx 0;
+					// border-radius: 60rpx;
+					color: #333;
+					font-size: 26rpx;
+					font-weight: bold;
+					margin-bottom: 20rpx;
+				}
+	
+				.tabActive {
+					background: #f2fffb;
+					color: #019c88;
+				}
+			}
+		}
+	
+		.rightGoods {
+			width:80%;
+			height: 100%;
+			// padding: 0 16rpx 27rpx;
+			box-sizing: border-box;
+	
+			.whiteBox {
+				height: 100%;
+				background: #ffffff;
+				border-radius: 15rpx;
+				padding: 0 25rpx;
+				box-sizing: border-box;
+				.title {
+					height: 77rpx;
+					line-height: 77rpx;
+					color: #2D2D2D;
+					font-size: 26rpx;
+					font-weight: bold;
+				}
+	
+				
+			}
+		}
+	}
+	.tab-view {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		position: fixed;
+		z-index: 999;
+		background: #fff linear-gradient(60deg, rgba(115, 212, 183, 0.2), rgba(227, 251, 244, 0.1), rgba(193, 236, 223, 0.35));
+		border-bottom: 1rpx solid #c4ede1;
+		padding-top: 6rpx;
+	}
+
+	.shop_label {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 4rpx;
+	}
+
+	.shop_label span {
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
+		border-radius: 8rpx;
+		padding: 0 10rpx;
+		font-size: 22rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+		color: #f68607;
+	}
+
+	/deep/.z-tabs-item-title {
+		color: #222;
+	}
+
+	/deep/.refresh-body .content {}
+
+	/deep/.refresh-body {
+		height: 100% !important;
+		border-top: 2px solid #f7f7f7;
+		margin: 80px 0px;
+	}
+
+	.content-view {
+		width: 100%;
+		height: 100vh;
+		overflow: hidden;
+		background-color: #f7f7f7;
+	}
+
+	.item-view-bottom-btn {
+		text-align: center;
+		width: 131rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		background: linear-gradient(90deg, #019c88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+	}
+
+	.item-view-bottom-qian span:nth-child(5) {
+		font-size: 28rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+	}
+
+	.item-view-bottom-qian span:nth-child(4) {
+		font-size: 28rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+	}
+
+	.item-view-bottom-qian span:nth-child(3) {
+		font-size: 28rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+
+	.item-view-bottom-qian span:nth-child(2) {
+		font-weight: bold !important;
+		font-size: 36.81rpx !important;
+		color: #FF6000 !important;
+	}
+
+	.item-view-bottom-qian span:nth-child(1) {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FF6000;
+	}
+
+	.item-view-bottom-qian {
+		margin-top: 2px;
+	}
+
+	.item-view-bottom {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.item-view-jianjie {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		/* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.item-view-biao {
+		border-radius: 15rpx 3rpx 15rpx 3rpx;
+	}
+
+	.tuina {
+		background-color: #d1f2df;
+		color: #17984d;
+	}
+
+	.xiaoer {
+		width: 120rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		text-align: center;
+		background-color: #f1f8d7;
+		color: #58b314;
+		font-size: 20rpx;
+	}
+
+	.taishi {
+		background-color: #e5d5c6;
+		color: #805d39;
+	}
+
+	.kangfu {
+		background-color: #fcf3da;
+		color: #ff8600;
+	}
+
+	.item-view-xiangmu span:nth-child(2) {
+		font-weight: normal;
+		color: #333333;
+		font-size: 30rpx;
+	}
+
+	.item-view-xiangmu span:nth-child(1) {
+		font-weight: normal;
+		color: #666666;
+		margin-right: 5rpx;
+		font-size: 30rpx;
+	}
+
+	.item-view-xiangmu {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 25rpx;
+		align-items: flex-end;
+	}
+
+	.item-view-title {
+		width: 76%;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.item-view {
+		width:69%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		justify-content: space-between;
+		padding: 5rpx 0;
+	}
+
+	.item-img {
+		width:70px;
+		height:70px;
+		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%;
+		border-radius: 14rpx;
+	}
+
+	.item {
+		width: 100%;
+		margin: 0 auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		/*height: 140px;*/
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top: 10px;
+		// align-items: center;
+		padding: 20rpx;
+	}
+
+	.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;
+	}
+
+	/deep/.zp-paging-container {
+		background-color: #f7f7f7;
+		width: 100%;
+	}
+
+	/deep/.zp-paging-container-content {
+		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;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #019C88;
+	}
+
+	.index-fenl-title-bottom {
+		position: absolute;
+		bottom: 0;
+		margin-bottom: 0px;
+		width: 81rpx;
+		height: 14rpx;
+		border-radius: 7rpx;
+		background: linear-gradient(-48deg, rgba(1, 156, 136, 0.35), rgba(45, 196, 142, 0.35));
+	}
+
+	/deep/.uni-searchbar__cancel {
+		display: none;
+	}
+
+	.search-btn {
+		text-align: center;
+		color: #019c88;
+		font-weight: bold;
+		position: absolute;
+		right: 40rpx;
+		top: 20rpx;
+		font-size: 30rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	/deep/.uni-searchbar__box-icon-search,
+	.search-btn {
+		width: 110rpx;
+		height: 50rpx;
+	}
+
+	/deep/.uni-searchbar__box {
+		height: 34px;
+		border-radius: 30px !important;
+		background-color: #fff !important;
+		border: 1px solid #09a28a;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+
+	/deep/.uni-searchbar {
+		width: 250px;
+		border-radius: 31rpx;
+		padding-right: 24rpx;
+	}
+
+	.service-head-top-left image {
+		width: 20px;
+		height: 20rpx;
+		margin-right: 5px;
+		margin-left: 10rpx;
+	}
+
+	.service-head-top-left span {
+		width: 180rpx;
+		height: 60rpx;
+		background: url('../../static/images/headline.png') 0rpx 26rpx;
+		background-repeat: no-repeat;
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #171717;
+		margin-top: 14rpx;
+	}
+
+	.service-head-top-left {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.service-head-top {
+		height: 90rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background: #fff;
+	}
+
+	.view-cata {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 89819fd..feda81e 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -11,7 +11,7 @@
 		<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">
-					<view class="flex align-center touxiang-left-view" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)">
+					<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)">
 						<view class="touxiang-left-content">
 							<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img"  :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
 							<image  class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>