From cb3fdff276fca1fcc95cb3c777f70a71a3507de5 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 22 Jul 2024 11:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/xuan-switch/xuan-switch-ditu.vue   | 17 +++---
 my/gird/shoucang.vue                          | 57 ++++++++++++++-----
 pages/therapist/therapist.vue                 | 46 +++++++--------
 .../z-tabs/components/z-tabs/z-tabs.vue       | 11 ++--
 4 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/components/xuan-switch/xuan-switch-ditu.vue b/components/xuan-switch/xuan-switch-ditu.vue
index 132cb2b..cccc3f8 100644
--- a/components/xuan-switch/xuan-switch-ditu.vue
+++ b/components/xuan-switch/xuan-switch-ditu.vue
@@ -28,7 +28,7 @@
 	<view
 	  class="position_view" :animation="animationData1"
 	  style="background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-border-radius: 27rpx;width: 81.25rpx;"
+border-radius: 8rpx;width: 81.25rpx;"
 	></view>
   </view>
 </template>
@@ -56,11 +56,11 @@ export default {
     },
     bj_color:{
       type:String,
-      default:'#F2F2F2'
+      default:'#fff'
     },
     checked_bj_color:{
       type:String,
-      default:'#1989fa'
+      default:'#8dddd0'
     },
     checked_color:{
       type:String,
@@ -146,10 +146,11 @@ export default {
   .switch-container {
     display: flex;
     flex-direction: row;
-    width: 144rpx;
-    height: 53rpx;
-    background: #f7f7f7;
-    border-radius: 27rpx;
+    width: 126rpx;
+    height: 48rpx;
+    background: #fff;
+	border: 1rpx #41b9a6 solid;
+    border-radius: 10rpx;
     position: relative;
     .switch_view{
       position: absolute;
@@ -161,7 +162,7 @@ export default {
       display: flex;
       border-radius: 100upx;
       .switch-item {
-        color: #666;
+        color: #41b9a6;
         font-size: 24upx;
         height: 100%;
         width: 40%;
diff --git a/my/gird/shoucang.vue b/my/gird/shoucang.vue
index 259087c..0189e92 100644
--- a/my/gird/shoucang.vue
+++ b/my/gird/shoucang.vue
@@ -16,7 +16,7 @@
 						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>
-					<image class="touxiang-frame"  src="../../static/vip/grade6.png"></image>
+					<!--<image class="touxiang-frame"  src="../../static/vip/grade6.png"></image>-->
 					<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
 					
 				</view>
@@ -26,7 +26,15 @@
 							<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
 								{{item.artificerName}}
 							</view>
+							
 						</view>
+						<view class="keyuyue">
+								<view class="flex">
+									<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
+									<view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
+								</view>
+						</view>
+						<!--
 						<view class="keyuyue">
 							<view class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']">
 								{{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}}
@@ -34,7 +42,7 @@
 							<view v-if="item.status == 1 && item.time">
 								{{item.time}}
 							</view>
-						</view>
+						</view>-->
 					</view>
 					<view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;">
 						<view class="flex align-center">
@@ -260,19 +268,38 @@
 </script>
 
 <style lang="scss">
-	.keyuyue{
-		// width: 160rpx;
-		height: 20px;
+.keyuyue{
+		padding: 0rpx 10rpx;
+		height: 44rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		background: linear-gradient(90deg, #fee9ca, #fde4c6);
-		border: 1px #decbae solid;
-		border-radius: 30rpx 30rpx 30rpx 2rpx;
-		padding: 3rpx 18rpx;
+		background: #eefdf8;
+		border-radius:  30rpx 20rpx 20rpx 30rpx ;
 		color:#8d500f;
-		font-size: 22rpx;
-		margin-left: 15rpx;
+		font-size: 24rpx;
+	}
+	.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-fu{
+		font-size: 24rpx;
+		color: #2dbe93;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.timea-time{
+		font-size: 25rpx;
+		color: #2dbe93;
+		line-height: 44rpx;
+		padding-right: 10rpx;
 	}
 	.icon-text{
 		margin-left: 2px;
@@ -421,10 +448,10 @@
 	}
 	.touxiang-frame{
 		position: absolute;
-		width: 98%;
-		height: 292rpx;
-		left:2rpx;
-		top:-5rpx;
+		width: 100rpx;
+		height: 38rpx;
+		left: 46rpx;
+		bottom:5rpx;
 	}
 	
 
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 0d1ea30..0859e63 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -11,7 +11,7 @@
 					:show-action="true" :animation="true" bg-color="#fff" color="#019c88" @search="onSearch()"
 					action-text="搜索" @custom="onSearch()">
 				</u-search>
-				<view class="flex align-center justify-between">
+				<view class="flex align-center justify-between" style="margin-left: 8rpx;">
 					<selectSwitchDitu @change="switch1Change" :switchList="switchList"/>
 				</view>
 				<!--<view class="map-list">
@@ -20,6 +20,7 @@
 				</view>-->
 			</view>
 			<view class="fenlei">
+				<image class="fenlei-img" src="../../static/excel1.png"></image>
 				<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
 			</view>
 		</view>
@@ -49,7 +50,6 @@
 										</view>
 										<view class="keyuyue">
 												<view class="flex">
-													<image class="timea-img"></image>
 													<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
 													<view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
 												</view>
@@ -1263,7 +1263,11 @@ import permision from "@/components/permission.js";
 </script>
 
 <style lang="scss" scoped>
-	
+	.fenlei-img{
+		width: 170rpx;
+		height: 34rpx;
+		margin: 0 20rpx;
+	}
 	.fenlei{
 		display: flex;
 		flex-direction: row;
@@ -1408,39 +1412,37 @@ import permision from "@/components/permission.js";
 		color: #13141A;
 	}
 	.keyuyue{
-		padding: 0rpx;
+		padding: 0rpx 10rpx;
 		height: 44rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		border: 1px #2dbe93 solid;
-		border-radius: 20rpx 30rpx 30rpx 20rpx;
+		background: #eefdf8;
+		border-radius:  30rpx 20rpx 20rpx 30rpx ;
 		color:#8d500f;
-		font-size: 22rpx;
-		margin-left: 6rpx;
+		font-size: 24rpx;
 	}
 	.timea-img{
-		background:#2dbe93 url('../../static/timea.png') 4rpx 3rpx;
-		background-size: 35rpx 35rpx;
+		background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
+		background-size: 28rpx 28rpx;
 		background-repeat: no-repeat;
-		width: 40rpx;
-		height: 40rpx;
-		border-radius: 8rpx  0 0 8rpx;
-		margin-top: 1rpx;
+		width: 30rpx;
+		height: 30rpx;
+		border-radius:8rpx;
+		margin-top: 8rpx;
 	}
 	.timea-fu{
-		font-size: 22rpx;
+		font-size: 24rpx;
 		color: #2dbe93;
 		line-height: 44rpx;
 		margin-left: 8rpx;
 		margin-right: 5rpx;
 	}
 	.timea-time{
-		font-size: 24rpx;
+		font-size: 25rpx;
 		color: #2dbe93;
 		line-height: 44rpx;
 		padding-right: 10rpx;
-		
 	}
 	.list-right-top-view image{
 		//width: 168.75rpx;
@@ -1523,7 +1525,6 @@ import permision from "@/components/permission.js";
 		height: 150rpx;
 		border-radius:120rpx;
 		margin: 14rpx 22rpx;
-		
 	}
 	.touxiang-left-view{
 		width: 100%;
@@ -1555,7 +1556,6 @@ import permision from "@/components/permission.js";
 		// height: 32px;
 		line-height: 32px;
 		border-radius: 4px;
-		margin-left: 10px;
 	}
 	.padding-top-sm{
 		width: 95%;
@@ -1580,13 +1580,13 @@ import permision from "@/components/permission.js";
 		// overflow: auto;
 	}
 	/deep/.u-content{
-		height: 55rpx!important;
-		border-radius: 30px !important;
+		height: 48rpx!important;
+		border-radius: 5px !important;
 	}
 	.flex-sub{
 		width: 260rpx !important;
-		height:60rpx !important;
-		border: 1px solid #41b9a6;
+		height:52rpx !important;
+		border: 1px solid #e5e5e5;
 		border-radius: 10rpx;
 		color: #fff!important;
 	}
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 540f163..fdf891e 100644
--- a/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
+++ b/uni_modules/z-tabs/components/z-tabs/z-tabs.vue
@@ -629,7 +629,7 @@
 		width: 750rpx;
 		/* #endif */
 		flex-direction: row;
-		height: 66rpx;
+		height: 70rpx;
 	}
 	
 	.z-tabs-scroll-view-conatiner{
@@ -688,7 +688,7 @@
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
-		padding: 0px 20rpx;
+		padding: 2px 20rpx;
 	}
 	
 	.z-tabs-item-title-container{
@@ -700,7 +700,7 @@
 	}
 	
 	.z-tabs-item-title{
-		/* font-weight: bold; */
+		font-weight: bold;
 		font-size: 28rpx;
 		color: #019c88;
 	}
@@ -723,14 +723,17 @@
 	.z-tabs-bottom{
 		position: absolute;
 		bottom: 0;
-		left: 0;
+		left: 40rpx;
 		right: 0;
 		margin-bottom: -4px;
 	}
 	
 	.z-tabs-bottom-dot{
 		border-radius: 100px;
+		text-align: center;
+		width: 60rpx!important;
 		background: linear-gradient(90deg,rgba(44, 189, 147,0.1),rgba(1, 156, 136,0.7)) !important;
+		
 	}
 	
 	.z-tabs-left,.z-tabs-right{