提交

common/config.js

@@ -6,6 +6,7 @@
 // const ROOTPATH3 = "ws://smam.qd-xiaomage.com:9210/wss/websocket/";
 
 const ROOTPATH = "https://master.dstapp.cn/sqx_fast";
+// const ROOTPATH = "http://192.168.1.166:8188/sqx_fast";
 const ROOTPATH1 = "https://master.dstapp.cn/sqx_fast";
 const ROOTPATH3 = "ws://smam.qd-xiaomage.com:9210/wss/websocket/";
 

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "帝侍天上门",
-    "appid" : "__UNI__D38ED97",
+    "appid" : "__UNI__7C251DB",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 101,

pages/index/index.vue

@@ -1,31 +1,55 @@
 <template>
 	<view>
 		<view class="content">
-			<swiper class="screen-swiper" style="height: 320rpx;width: 686rpx;margin-top: 24rpx;border-radius: 32rpx;" :circular="true" :autoplay="true"
-				interval="2500" duration="800">
+			<swiper class="screen-swiper" style="height: 320rpx;width: 686rpx;margin-top: 24rpx;border-radius: 32rpx;"
+				:circular="true" :autoplay="true" interval="2500" duration="800">
 				<swiper-item v-for="(item,index) in swiperList" :key="index" @tap="goNav(item.url)">
 					<image :src="item.imageUrl" webp class="bannerImg"></image>
 				</swiper-item>
 			</swiper>
 			<view class="tabview1" v-if="XCXIsSelect != '否'">
-				<view class="tabview" v-if="typeList && typeList.length > 1">
-					<view v-for="(item,index) in typeList" @tap="selTab(index,item.id)"
-						:class="tabIndex == index ? 'tabItem_sel' : 'tabItem'">
-						<view>{{item.value}}</view>
+				<view class="type_box" v-if="typeList && typeList.length > 1">
+					<view class="icon-box"  @tap="selTab(-1,0)">
+						<view style="font-weight: 700;"
+							:style="{color:tabIndex == -1?'#FF6E98':'',fontSize:tabIndex==-1?'36rpx':'32rpx'}">
+							全部</view>
+						<view style="height: 32rpx;">
+							<svg t="1761021751826" v-show="tabIndex == -1" class="icon" viewBox="0 0 2970 1024"
+								version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4553" width="24" height="24">
+								<path
+									d="M1483.968134 1024A1945.340076 1945.340076 0 0 1 65.537898 403.558292a245.597905 245.597905 0 0 1 0-334.217817 214.898167 214.898167 0 0 1 316.002639 0 1501.114864 1501.114864 0 0 0 2204.752863 0 214.898167 214.898167 0 0 1 316.002638 0 245.597905 245.597905 0 0 1 0 334.217817A1945.237743 1945.237743 0 0 1 1483.968134 1024z"
+									fill="#FF6E98" p-id="4554"></path>
+							</svg>
+						</view>
+					</view>
+					<view class="icon-box" v-for="(item,index) in typeList" @tap="selTab(index,item.id)">
+						<view style="font-weight: 700;"
+							:style="{color:tabIndex == index?'#FF6E98':'',fontSize:tabIndex==index?'36rpx':'32rpx'}">
+							{{item.value}}</view>
+						<view style="height: 32rpx;">
+							<svg t="1761021751826" v-show="tabIndex == index" class="icon" viewBox="0 0 2970 1024"
+								version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4553" width="24" height="24">
+								<path
+									d="M1483.968134 1024A1945.340076 1945.340076 0 0 1 65.537898 403.558292a245.597905 245.597905 0 0 1 0-334.217817 214.898167 214.898167 0 0 1 316.002639 0 1501.114864 1501.114864 0 0 0 2204.752863 0 214.898167 214.898167 0 0 1 316.002638 0 245.597905 245.597905 0 0 1 0 334.217817A1945.237743 1945.237743 0 0 1 1483.968134 1024z"
+									fill="#FF6E98" p-id="4554"></path>
+							</svg>
+						</view>
 					</view>
 				</view>
 				<view class="tabsx">
-					<view v-for="(item,index) in list" :key="index" :class="listIndex==index?'active':''"
+					<view style="margin-right: 20rpx;" v-for="(item,index) in list" :key="index" :class="listIndex==index?'active':'normal'"
 						@click="change(index)">{{item.name}}</view>
 				</view>
 			</view>
+
 			<view class="list_item" v-for="(item,index) in orderList" :key="index" @tap="goOrder(item)">
 				<view style="position: relative;">
-					<image :src="item.massageImg" mode="aspectFill" style="border-radius: 24rpx;width: 160rpx;height: 160rpx;"></image>
+					<image :src="item.massageImg" mode="aspectFill"
+						style="border-radius: 24rpx;width: 160rpx;height: 160rpx;"></image>
 					<view class="flex justify-center align-center "
 						style="color: #54CC84;font-size: 24rpx;width: 148rpx;height: 40rpx;background: #DCFFEA;border-radius: 36rpx;position: absolute;left: 6rpx;bottom: -20rpx;">
-						<image src="../../static/time.png"
-							style="width: 26rpx;height: 26rpx;margin-right: 8rpx;"></image>
+						<image src="../../static/time.png" style="width: 26rpx;height: 26rpx;margin-right: 8rpx;">
+						</image>
 						<view>{{item.duration}}分钟</view>
 					</view>
 				</view>
@@ -53,7 +77,8 @@
 
 						<view class="item_btn" v-if="item.classifyName === '足浴按摩'" @click.stop="goOrder(item)">
 							选择技师
-							<image style="position: absolute;width: 39rpx;height: 39rpx;top: -4rpx;right: -8rpx;" src="../../static/image/btn-icon.png" mode=""></image>
+							<image style="position: absolute;width: 39rpx;height: 39rpx;top: -4rpx;right: -8rpx;"
+								src="../../static/image/btn-icon.png" mode=""></image>
 						</view>
 						<view class="item_btn" v-if="item.classifyName === '健身私教'" @click.stop="goOrder(item)">
 							选择教练
@@ -69,8 +94,7 @@
 		</view>
 		<empty v-if="orderList.length==0" style="position: relative;top: -120rpx;z-index: 9;"></empty>
 		<view style="position: fixed;z-index: 999;bottom: 160rpx;" v-if="showTP">
-			<image src="/static/image/city_open.png"
-				style="width: 690rpx;margin: 30rpx;height: 600rpx;"></image>
+			<image src="/static/image/city_open.png" style="width: 690rpx;margin: 30rpx;height: 600rpx;"></image>
 			<view
 				style="position: absolute;bottom: 100rpx;width: 100%;text-align: center;display: flex;justify-content: center;">
 				<view>
@@ -84,9 +108,7 @@
 		<!-- 新人红包 -->
 		<uni-popup ref="popushongbao" type="center">
 			<view>
-				<image @tap="GetQuan"
-					src="../../static/images/hb_bg.png"
-					style="width: 564upx;height:618upx "></image>
+				<image @tap="GetQuan" src="../../static/images/hb_bg.png" style="width: 564upx;height:618upx "></image>
 			</view>
 		</uni-popup>
 	</view>
@@ -132,7 +154,7 @@
 				page: 1,
 				limit: 10,
 				orderList: [],
-				tabIndex: 0,
+				tabIndex: -1,
 				swiperList: [],
 				typeList: [],
 				value1: 0,
@@ -564,10 +586,11 @@
 								this.$refs.popushongbao.open();
 							}, 2000);
 						}
-						if(!res.data.wxOpenId){//授权微信
+						if (!res.data.wxOpenId) { //授权微信
 							let url = window.location.origin + '/pages/index/order/test'
-							console.log('url==========',url);
-							return window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbcba29ef4f698074&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo&state=STATE&connect_redirect=1#wechat_redirect`
+							console.log('url==========', url);
+							return window.location.href =
+								`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbcba29ef4f698074&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo&state=STATE&connect_redirect=1#wechat_redirect`
 						}
 					}
 				});
@@ -589,6 +612,7 @@
 					if (res.code == 0) {
 						if (res.data) {
 							this.typeList = res.data
+							console.log(res.data, 'dsaaaa');
 							this.classifyId = res.data[0].id;
 							this.page = 1
 							this.getorderlist('')
@@ -678,7 +702,7 @@
 				this.getorderlist('')
 			},
 			getorderlist(type) {
-				console.log('city',this.city);
+				console.log('city', this.city);
 				let city = this.city;
 				if (this.city === '请选择城市') {
 					// city = '';
@@ -689,7 +713,7 @@
 				}
 				let index = this.list[this.listIndex].id
 				let data = {
-					classifyId: this.classifyId,
+					classifyId:this.tabIndex==-1?0: this.classifyId,
 					page: this.page,
 					limit: this.limit,
 					status: 1,
@@ -748,8 +772,21 @@
 </script>
 
 <style lang="scss">
+	.icon-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-right: 50rpx;
+	}
+
+	.type_box {
+		display: flex;
+		align-items: center;
+		margin-top: 20rpx;
+	}
+
 	page {
-		background: linear-gradient( 179deg, #FFC2D5 0%, #F6F6F6 800rpx);
+		background: linear-gradient(179deg, #FFC2D5 0%, #F6F6F6 800rpx);
 	}
 
 	.bg {
@@ -883,7 +920,7 @@
 			.item_btn {
 				width: 160upx;
 				height: 64rpx;
-				background: linear-gradient( 313deg, #FFE6EE 0%, #FFBACA 100%);
+				background: linear-gradient(313deg, #FFE6EE 0%, #FFBACA 100%);
 				border-radius: 36rpx;
 				text-align: center;
 				line-height: 64rpx;
@@ -923,6 +960,7 @@
 	.tabview1 {
 		border-radius: 24rpx;
 		z-index: 99;
+
 		.tabview {
 			// width: 686upx;
 			// // height: 100upx;
@@ -958,14 +996,23 @@
 			padding-bottom: 10rpx;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
 			padding: 20rpx 30rpx;
 			font-size: 26rpx;
 
 			.active {
 				color: #FF6E98;
-				font-size: 30rpx;
+				font-size: 28rpx;
 				font-weight: bold;
+				padding: 4rpx 15rpx;
+				box-sizing: border-box;
+				background: linear-gradient(313deg, #FFE6EE 0%, #FFBACA 100%);
+				border-radius: 36rpx 36rpx 36rpx 36rpx;
+			}
+
+			.normal {
+				border-radius: 36rpx 36rpx 36rpx 36rpx;
+				background-color: #fff;
+				padding: 4rpx 15rpx;
 			}
 		}
 	}

pages/my/index.vue

@@ -1,8 +1,9 @@
 <template>
-	<view >
+	<view>
 		<view>
 			<view class=" u-flex padding " style="position: relative;">
-				<image style="position: absolute;top: 42rpx;right: 32rpx;width: 48rpx;height: 48rpx;" src="../../static/images/index/setting.png" mode="" @click="goNav('/my/setting/index')"></image>
+				<image style="position: absolute;top: 42rpx;right: 32rpx;width: 48rpx;height: 48rpx;"
+					src="../../static/images/index/setting.png" mode="" @click="goNav('/my/setting/index')"></image>
 				<view class="u-m-r-10">
 					<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 100rpx;"
 						@click="goNav('/pages/my/userinfo')"></image>
@@ -14,23 +15,42 @@
 				</view>
 				<view class="u-flex-1 u-m-l-10" v-if="!isLogin">
 					<view>
-						<view class="u-font-18 margin-left-sm margin-top-xs text-bold" style="font-weight: 800;font-size: 32rpx;color: #222222">{{userName}}</view>
-						<view class="u-font-15 margin-left-sm margin-top-xs" style="font-size: 28rpx;color: #AAAAAA;">ID:{{invitationCode}}</view>
+						<view
+							style="display: flex;padding-right: 120rpx; align-items: center; justify-content: space-between;">
+							<view class="u-font-18 margin-left-sm margin-top-xs text-bold"
+								style="font-weight: 800;font-size: 32rpx;color: #222222">{{userName}}</view>
+							<view style="display: flex;align-items: center;" class="box-jishi" @click="handleTop">
+								技师端入口
+								<image src="/static/images/qiehuan.png" style="width:18rpx ;height: 18rpx;"></image>
+							</view>
+						</view>
+						<view class="u-font-15 margin-left-sm margin-top-xs" style="font-size: 28rpx;color: #AAAAAA;">
+							ID:{{invitationCode}}</view>
 					</view>
 				</view>
-				<view v-else class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
-					登录
+				<view  v-else style="display: flex;">
+					<view class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')">
+						登录
+					</view>
+					<view style="display: flex;align-items: center;margin-left: 120rpx;" class="box-jishi" @click="handleTop">
+						技师端入口
+						<image src="/static/images/qiehuan.png" style="width:18rpx ;height: 18rpx;"></image>
+					</view>
 				</view>
 			</view>
 			<view class="padding-lr margin-lr"
 				style="background: linear-gradient( 118deg, #525264 0%, #1D233C 100%);;border-radius: 32rpx 32rpx 0px 0px;;height: 178rpx;position: relative;"
 				v-if="XCXIsSelect != '否' && hyCheck != '否'">
 				<!-- <image src="../../static/images/my/bg.png" style="width: 100%;height: 110rpx;" mode=""></image> -->
-				<image src="@/static/images/my/huiyuan.png" style="width: 80rpx;height: 80rpx;position: absolute;top: -40rpx;right: 0;"></image>
+				<image src="@/static/images/my/huiyuan.png"
+					style="width: 80rpx;height: 80rpx;position: absolute;top: -40rpx;right: 0;"></image>
 				<view class="flex justify-between align-center" style="padding-top: 48rpx;">
-					
-					
-					<view v-if="!isVip" class="vipttl flex align-center"><image src="@/static/images/my/vip-icon.png" style="width: 30rpx;height: 30rpx;margin-right: 16rpx;"></image>开通会员立享会员折扣价</view>
+
+
+					<view v-if="!isVip" class="vipttl flex align-center">
+						<image src="@/static/images/my/vip-icon.png"
+							style="width: 30rpx;height: 30rpx;margin-right: 16rpx;"></image>开通会员立享会员折扣价
+					</view>
 					<view v-if="isVip" class="vipttl">会员中心</view>
 					<!-- <view class="flex-sub text-26 margin-left-xs" style="color: #8A6931;">会员可享贵族福利</view> -->
 					<view v-if="!isVip" class="btn-bg" @click="goNav('/my/vip/index')">立即开通
@@ -40,7 +60,8 @@
 				</view>
 			</view>
 		</view>
-		<view style="margin: -30rpx 32rpx 30rpx;background: #fff;border-radius: 32rpx;padding: 28rpx;position: relative;z-index: 9;">
+		<view
+			style="margin: -30rpx 32rpx 30rpx;background: #fff;border-radius: 32rpx;padding: 28rpx;position: relative;z-index: 9;">
 			<view class="title">我的订单</view>
 			<view class="flex justify-around text-center">
 				<view class=" padding-tb" @click="goNavOrder(1)">
@@ -71,8 +92,7 @@
 			</view>
 		</view>
 
-		<image src="/static/image/icon_kefu.png"
-			class="kefu_view" @click="goChat"></image>
+		<image src="/static/image/icon_kefu.png" class="kefu_view" @click="goChat"></image>
 
 
 		<view class="box">
@@ -246,6 +266,12 @@
 
 		},
 		methods: {
+			handleTop() {
+				// window.location.href()
+				//#ifdef H5
+				window.open('https://user.dstapp.cn/', '_target')
+				//#endif
+			},
 			goChat() {
 				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
 				let kefuPhone = this.$queue.getData('kefuPhone');
@@ -514,14 +540,25 @@
 </script>
 
 <style lang="scss" scoped>
+	.box-jishi {
+		background: linear-gradient(180deg, #FFFFFF 0%, #FFBACA 100%);
+		border-radius: 36rpx 36rpx 36rpx 36rpx;
+		border: 1rpx solid #FF6E98;
+		color: #FF6E98;
+		padding: 8rpx 20rpx;
+
+	}
+
 	page {
-		background: linear-gradient( 180deg, #FFE5ED 0%, #F6F6F6 400rpx);
+		background: linear-gradient(180deg, #FFE5ED 0%, #F6F6F6 400rpx);
 	}
-	.text-df{
+
+	.text-df {
 		font-size: 24rpx;
 		color: #222222;
 		margin-top: 14rpx;
 	}
+
 	.kefu_view {
 		width: 100rpx;
 		height: 100rpx;
@@ -533,10 +570,11 @@
 	.bg {
 		background: #05C25C;
 	}
-	.title{
-		 font-size: 32rpx;
-		 font-weight: bold;
-		 color: #222222;
+
+	.title {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #222222;
 	}
 
 	.box {
@@ -561,9 +599,9 @@
 		height: 64rpx;
 		line-height: 64rpx;
 		text-align: center;
-		background: linear-gradient( 145deg, #FFEACE 0%, #FEC186 100%);
+		background: linear-gradient(145deg, #FFEACE 0%, #FEC186 100%);
 		border-radius: 36rpx 36rpx 36rpx 36rpx;
-		border: 2rpx solid rgba(0,0,0,0);
+		border: 2rpx solid rgba(0, 0, 0, 0);
 		font-weight: bold;
 		font-size: 28rpx;
 		color: #BB5D1E;
@@ -580,4 +618,4 @@
 		color: #F0D4C1;
 		font-family: PingFang SC, PingFang SC;
 	}
-</style>
+</style>

pages/therapist/therapist.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="therapist">
-		<view class="padding-lr padding-top-sm " style="position: fixed;top: 0rpx;z-index: 999;width: 100%;padding-bottom: 10rpx;">
+		<view class="padding-lr padding-top-sm " style="width: 100%;padding-bottom: 10rpx;">
 			<view v-if="XCXIsSelect !='否'" class="flex margin-right-sm" @tap="showCityList" style="line-height: 68rpx;">
-				<image src="../../static/images/address.png" style="width: 40rpx;height: 40rpx;"
-					class="margin-top-xs"></image>
+				<image src="../../static/images/address.png" style="width: 40rpx;height: 40rpx;" class="margin-top-xs">
+				</image>
 				<view class="localName  margin-left-sm">{{city}}</view>
 			</view>
 			<u-search class="flex-sub search" clearabled placeholder="请输入技师名字" :focus="false" v-model="artificerName"
@@ -26,34 +26,61 @@
 				{{item.name}}
 			</view>
 		</view> -->
-		
+
 		<view class="tabview1" v-if="XCXIsSelect != '否'">
-			<view class="tabview" v-if="tablist && tablist.length > 1">
+			<!-- <view class="tabview" v-if="tablist && tablist.length > 1">
 				<view v-for="(item,index) in tablist" :key="index" @tap="tanChange(index,item)"
 					:class="tabIndex == item.id ? 'tabItem_sel' : 'tabItem'">
 					<view>{{item.value}}</view>
 				</view>
-			</view>
+				
+			</view> -->
 			<!-- <view class="tabsx">
 				<view v-for="(item,index) in list" :key="index" :class="listIndex==index?'active':''"
 					@click="change(index)">{{item.name}}</view>
 			</view> -->
+			<view class="icon-box" style="margin-right: 50rpx;" @tap="tanChange(-1,0)">
+				<view style="font-weight: 700;"
+					:style="{color:tabIndex == -1?'#FF6E98':'',fontSize:tabIndex==-1?'36rpx':'32rpx'}">
+					全部</view>
+				<view style="height: 32rpx;display: flex;justify-content: center;">
+					<svg t="1761021751826" v-show="tabIndex== -1" class="icon" viewBox="0 0 2970 1024" version="1.1"
+						xmlns="http://www.w3.org/2000/svg" p-id="4553" width="24" height="24">
+						<path
+							d="M1483.968134 1024A1945.340076 1945.340076 0 0 1 65.537898 403.558292a245.597905 245.597905 0 0 1 0-334.217817 214.898167 214.898167 0 0 1 316.002639 0 1501.114864 1501.114864 0 0 0 2204.752863 0 214.898167 214.898167 0 0 1 316.002638 0 245.597905 245.597905 0 0 1 0 334.217817A1945.237743 1945.237743 0 0 1 1483.968134 1024z"
+							fill="#FF6E98" p-id="4554"></path>
+					</svg>
+				</view>
+			</view>
+			<view class="icon-box" style="margin-right: 50rpx;" v-for="(item,index) in tablist"
+				@tap="tanChange(index,item)">
+				<view style="font-weight: 700;"
+					:style="{color:tabIndex == item.id?'#FF6E98':'',fontSize:tabIndex==item.id?'36rpx':'32rpx'}">
+					{{item.value}}
+				</view>
+				<view style="height: 32rpx;display: flex;justify-content: center;">
+					<svg t="1761021751826" v-show="tabIndex == item.id" class="icon" viewBox="0 0 2970 1024" version="1.1"
+						xmlns="http://www.w3.org/2000/svg" p-id="4553" width="24" height="24">
+						<path
+							d="M1483.968134 1024A1945.340076 1945.340076 0 0 1 65.537898 403.558292a245.597905 245.597905 0 0 1 0-334.217817 214.898167 214.898167 0 0 1 316.002639 0 1501.114864 1501.114864 0 0 0 2204.752863 0 214.898167 214.898167 0 0 1 316.002638 0 245.597905 245.597905 0 0 1 0 334.217817A1945.237743 1945.237743 0 0 1 1483.968134 1024z"
+							fill="#FF6E98" p-id="4554"></path>
+					</svg>
+				</view>
+			</view>
 		</view>
 		<view v-if="orderList.length" class="list" :style="XCXIsSelect != '否' ? '' : 'margin-top: 114rpx;'">
 			<view class="flex align-center margin-bottom-sm bg padding-sm radius margin-sm"
 				v-for="(item,index) in orderList" :key='index' @click="goOrder(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="/static/image/text_you.png"
-						style="width: 42rpx;height: 36rpx;"></image>
+					<image src="/static/image/text_you.png" style="width: 42rpx;height: 36rpx;"></image>
 				</view>
-				<view style="width:160rpx;height:190upx;border-radius: 10rpx;display: flex;flex-direction: column;align-items: center;">
+				<view
+					style="width:160rpx;height:190upx;border-radius: 10rpx;display: flex;flex-direction: column;align-items: center;">
 					<image :src="item.artificerImg?item.artificerImg: '../../static/logo.png'"
 						@click.stop="saveImgs(item.artificerImg)"
 						style="width: 160rpx;height: 160rpx;border-radius: 50%;" mode="aspectFill"></image>
-					<image v-if="item.isHot == 1"
-						src="/static/image/icon_fire.png"
+					<image v-if="item.isHot == 1" src="/static/image/icon_fire.png"
 						style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
 					</image>
 					<view class="kyy_view" v-if="item.state == 1">可服务</view>
@@ -64,11 +91,12 @@
 					<view class="flex align-center justify-between">
 						<view class="flex align-center">
 							<view class="text-bold text-30 margin-right-xs jishi_name">{{item.artificerName}}</view>
-					<!-- 		<image
+							<!-- 		<image
 								src="/static/image/icon_pao.png"
 								style="width: 40rpx;height:40rpx;">
 							</image> -->
-							<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
+							<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">
+								更多照片</view>
 						</view>
 						<view class="zz_view" v-if="item.status == 1 && item.time">
 							<view class="zz_label">
@@ -83,17 +111,19 @@
 						<view class="flex align-center">
 							<view v-if="item.ordersScore" class="flex margin-right-sm">
 								<text style="color: #FCAD3D;">{{item.ordersScore}}</text>
-									<u-rate activeColor="#FCAD3D" size="20rpx" :count="5" v-model="item.ordersScore"></u-rate>
+								<u-rate activeColor="#FCAD3D" size="20rpx" :count="5"
+									v-model="item.ordersScore"></u-rate>
 							</view>
-				
+
 						</view>
 
-						<view class="flex align-center" style="font-size: 26rpx;color: #f49650;font-weight: bold;" v-if="item.tripWay == 3">
+						<view class="flex align-center" style="font-size: 26rpx;color: #f49650;font-weight: bold;"
+							v-if="item.tripWay == 3">
 							免出行费
 						</view>
 					</view>
 					<view class="flex align-center" style="color: #AAAAAA;font-size: 24rpx;">
-						<view class="flex align-center" >已服务: 
+						<view class="flex align-center">已服务:
 							<view style="color: #FF6E98;margin-left: 8rpx;">
 								{{item.ordersCount}}单
 							</view>
@@ -103,23 +133,17 @@
 							<view style="color: #FF6E98;margin-left: 8rpx;">{{item.distance}}</view>
 						</view>
 					</view>
-					
+
 					<view style="width: 100%;display: flex;justify-content: space-between;align-items: center;"
 						v-if="XCXIsSelect !='否'">
 						<view class="flex flex-wrap align-center" style="margin-top: 10rpx;">
-							<image
-								src="/static/image/icon_shang.png"
-								style="width: 24rpx;height: 24rpx;"></image>
+							<image src="/static/image/icon_shang.png" style="width: 24rpx;height: 24rpx;"></image>
 							<view style="margin-left: 10rpx;color: #999;font-size: 24rpx;margin-right: 24rpx;">商家</view>
-							<image
-								src="/static/image/icon_ping.png"
-								style="width: 24rpx;height: 24rpx;"></image>
+							<image src="/static/image/icon_ping.png" style="width: 24rpx;height: 24rpx;"></image>
 							<view style="margin-left: 10rpx;color: #999;font-size: 24rpx;margin-right: 24rpx;">
 								{{item.commentCount ? item.commentCount : 0}}
 							</view>
-							<image
-								src="/static/image/icon_cang.png"
-								style="width: 24rpx;height: 24rpx;"></image>
+							<image src="/static/image/icon_cang.png" style="width: 24rpx;height: 24rpx;"></image>
 							<view style="margin-left: 10rpx;color: #999;font-size: 24rpx;">
 								{{item.collectCount ? item.collectCount : 0}}
 							</view>
@@ -128,12 +152,14 @@
 							style="background: linear-gradient( 313deg, #FFE6EE 0%, #FFBACA 100%);color: #222222;width: 160rpx;border-radius: 36rpx;line-height: 64rpx;font-weight: bold;position: relative;"
 							@click.stop="goOrder(item)">
 							立即预约
-							<image style="position: absolute;width: 39rpx;height: 39rpx;top: -4rpx;right: -8rpx;" src="../../static/image/btn-icon.png" mode=""></image>
+							<image style="position: absolute;width: 39rpx;height: 39rpx;top: -4rpx;right: -8rpx;"
+								src="../../static/image/btn-icon.png" mode=""></image>
 						</view>
 						<view class="text-center text-sm" v-else
 							style="background: #d9d9d9;color: #222222;width: 160rpx;border-radius: 36rpx;line-height: 64rpx;font-weight: bold;position: relative;">
 							立即预约
-							<image style="position: absolute;width: 39rpx;height: 39rpx;top: -4rpx;right: -8rpx;" src="../../static/image/btn-icon.png" mode=""></image>
+							<image style="position: absolute;width: 39rpx;height: 39rpx;top: -4rpx;right: -8rpx;"
+								src="../../static/image/btn-icon.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -141,9 +167,7 @@
 		</view>
 		<empty v-if="orderList.length == 0"></empty>
 		<view style="position: fixed;z-index: 999;bottom: 160rpx;" v-if="showTP">
-			<image 
-				src="/static/image/city_open.png"
-				style="width: 690rpx;margin: 30rpx;height: 600rpx;"></image>
+			<image src="/static/image/city_open.png" style="width: 690rpx;margin: 30rpx;height: 600rpx;"></image>
 			<view
 				style="position: absolute;bottom: 100rpx;width: 100%;text-align: center;display: flex;justify-content: center;">
 				<view>
@@ -251,7 +275,7 @@
 				massageTypeId: '',
 				cityList: [],
 				tablist: [],
-				tabIndex: 0,
+				tabIndex: -1,
 
 				orderIndex: 0
 			}
@@ -260,7 +284,6 @@
 			console.log(e.massageTypeId)
 			let that = this
 			that.massageTypeId = e.massageTypeId
-
 			uni.getLocation({
 				type: 'gcj02',
 				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
@@ -275,7 +298,7 @@
 				},
 				fail: function() {
 					console.log('获取地址失败')
-					
+
 					// #ifdef APP-PLUS
 					that.checkPermission();
 					// #endif
@@ -346,9 +369,9 @@
 			// #endif
 		},
 		methods: {
-			showCityList(){
+			showCityList() {
 				// #ifdef APP-PLUS
-				if(this.latitude === '' || this.longitude === ''){
+				if (this.latitude === '' || this.longitude === '') {
 					this.checkPermission();
 					return;
 				}
@@ -505,7 +528,8 @@
 					if (res.code == 0) {
 						if (res.data) {
 							this.tablist = res.data
-							this.tabIndex = res.data[0].id;
+							console.log(res.data, '数据');
+							// this.tabIndex = res.data[0].id;
 							this.page = 1;
 							this.getlist()
 						}
@@ -527,7 +551,11 @@
 			// },
 			tanChange(index, item) {
 				this.orderIndex = index
-				this.tabIndex = item.id
+				console.log(index, 'xxxxxxxxxx',item.id);
+				
+				this.tabIndex = index == -1 ? -1 : item.id
+				console.log(this.tabIndex,'sasadasdasdasdasd');
+				
 				this.page = 1
 				this.getlist()
 			},
@@ -591,16 +619,16 @@
 				});
 			},
 			onSearch(e) {
- 				// this.artificerName = e;
- 				this.page = 1;
- 				this.getlist()
- 			},
+				// this.artificerName = e;
+				this.page = 1;
+				this.getlist()
+			},
 			getlist() {
-				let that=this
+				let that = this
 				if (that.city === '请选择城市') {
 					return;
 				}
-				if(that.tabIndex == 0){
+				if (that.tabIndex == 0) {
 					return;
 				}
 				// let index = this.list[this.listIndex].id
@@ -608,7 +636,7 @@
 				let data = {
 					// id: curTab,
 					artificerName: that.artificerName,
-					classifyId: that.tabIndex,
+					classifyId: that.tabIndex == -1 ? 0 : that.tabIndex,
 					page: that.page,
 					limit: that.limit,
 					// condition: this.value1, //智能优选
@@ -815,44 +843,64 @@
 </script>
 
 <style lang="scss">
+	.active {
+		color: #FF6E98;
+		font-size: 28rpx;
+		font-weight: bold;
+		padding: 4rpx 15rpx;
+		box-sizing: border-box;
+		background: linear-gradient(313deg, #FFE6EE 0%, #FFBACA 100%);
+		border-radius: 36rpx 36rpx 36rpx 36rpx;
+	}
+
+	.normal {
+		border-radius: 36rpx 36rpx 36rpx 36rpx;
+		background-color: #fff;
+		padding: 4rpx 15rpx;
+	}
+
 	// page {
 	// 	background: linear-gradient( 180deg, #FFE5ED 0%, #F6F6F6 500rpx);
 	// 	overflow: hidden;
 	// }
-	.therapist{
-		background: linear-gradient( 180deg, #FFE5ED 0%, #F6F6F6 500rpx);
+	.therapist {
+		background: linear-gradient(180deg, #FFE5ED 0%, #F6F6F6 500rpx);
 		overflow: hidden;
 		height: 100VH;
 	}
-	
-	.list{
+
+	.list {
 		max-height: 86vh;
 		overflow: auto;
-		margin-top: 30px;
 		padding-bottom: 200rpx;
 	}
-	.search ::v-deep .u-content,.search ::v-deep input{
-		background: #FFFFFF!important;
+
+	.search ::v-deep .u-content,
+	.search ::v-deep input {
+		background: #FFFFFF !important;
 	}
-	.jishi_name{
+
+	.jishi_name {
 		max-width: 120rpx;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		overflow: hidden;
 	}
-	
+
 	.zz_view {
 		display: flex;
 		line-height: 40rpx;
 		text-align: center;
 		font-size: 24rpx;
-		.zz_label{
+
+		.zz_label {
 			width: 120rpx;
 			background: #4B2F20;
 			border-radius: 32rpx 0 0 32rpx;
 			color: #FFFFFF;
 		}
-		.zz_value{
+
+		.zz_value {
 			width: 88rpx;
 			border-radius: 0 32rpx 32rpx 0;
 			background: #EECEAC;
@@ -871,7 +919,7 @@
 		color: #FFFFFF;
 		margin-left: 10rpx;
 	}
-	
+
 	.byy_view {
 		background: #ebebeb;
 		width: 120upx;
@@ -884,7 +932,7 @@
 		// border: 3upx solid #999999;
 		margin-top: 6rpx;
 	}
-	
+
 	.kfw_view {
 		background: #ffaa00;
 		width: 120upx;
@@ -896,7 +944,7 @@
 		color: #FFFFFF;
 		margin-top: 6rpx;
 	}
-	
+
 	.kyy_view {
 		background: #DCFFEA;
 		width: 120upx;
@@ -907,7 +955,10 @@
 		font-size: 24rpx;
 		color: #54CC84;
 	}
-	.kyy_view,.kfw_view,.byy_view{
+
+	.kyy_view,
+	.kfw_view,
+	.byy_view {
 		margin-top: -10rpx;
 		z-index: 9;
 	}
@@ -1002,10 +1053,12 @@
 		padding: 20rpx 20rpx;
 		// width: 686upx;
 		// height: 100upx;
-		margin-top: 60upx;
 		// z-index: 99;
 		// display: flex;
 		// line-height: 100upx;
+		display: flex;
+
+		align-items: center;
 
 		.tabview {
 			// width: 686upx;
@@ -1053,4 +1106,4 @@
 			}
 		}
 	}
-</style>
+</style>