From fbd2721ea7b67fa89a1ee15ef4fd91b2b1111c03 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 10 Sep 2024 10:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97=E8=B7=9D?=
 =?UTF-8?q?=E7=A6=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/selectTechnicianCompoents.vue               | 14 ++++++++++++--
 service-uniapp-client/components/technicianList.vue        |  2 +-
 .../pages/technician/selectTechnician.vue                  |  6 ------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/service-uniapp-client/components/selectTechnicianCompoents.vue b/service-uniapp-client/components/selectTechnicianCompoents.vue
index 10f519b..d1fd137 100644
--- a/service-uniapp-client/components/selectTechnicianCompoents.vue
+++ b/service-uniapp-client/components/selectTechnicianCompoents.vue
@@ -1,7 +1,7 @@
 <template>
 	<van-list v-if="technicianList.length > 0" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
 		<view v-for="item in list" :key="item.id" class="technician-item"
-			@click="select(item)">
+			@click="clickItem(item)">
 			<view class="technician-img-and-status">
 				<view class="img-box">
 					<image :src="item.image" mode="widthFix"></image>
@@ -32,7 +32,7 @@
 							<image src="@/static/technician/position.png" mode="aspectFill"></image>
 						</view>
 						<view class="distance">
-							{{ item.setKmOpen ? item.setKm || 0 : item.km || 0 }}km
+							{{ item.setKmOpen == 'Y' ? item.setKm || 0 : item.km || 0 }}km
 						</view>
 					</view>
 				</view>
@@ -89,6 +89,16 @@
 				}
 			},
 			
+			clickItem(item){
+				if (item.bookable != 'Y') {
+					return uni.showToast({
+						title: '技师未开启接单',
+						icon: 'none'
+					})
+				}
+				this.select(item)
+			},
+			
 			//计算距离
 			calculatedDistance(result,index){
 				console.log(index);
diff --git a/service-uniapp-client/components/technicianList.vue b/service-uniapp-client/components/technicianList.vue
index 5ff63a4..e3b49a7 100644
--- a/service-uniapp-client/components/technicianList.vue
+++ b/service-uniapp-client/components/technicianList.vue
@@ -26,7 +26,7 @@
 							<view class="alert-collect">
 								<image src="@/static/technician/address.png" mode="aspectFit"></image>
 								<text class="alert-add-collect">
-									{{ item.setKmOpen ? item.setKm || 0 : item.km || 0 }}km
+									{{ item.setKmOpen == 'Y' ? item.setKm || 0 : item.km || 0 }}km
 								</text>
 							</view>
 						</view>
diff --git a/service-uniapp-client/pages/technician/selectTechnician.vue b/service-uniapp-client/pages/technician/selectTechnician.vue
index e8ee81a..9010c63 100644
--- a/service-uniapp-client/pages/technician/selectTechnician.vue
+++ b/service-uniapp-client/pages/technician/selectTechnician.vue
@@ -44,12 +44,6 @@
 				})
 			},
 			toPayOrder(item) {
-				if (item.bookable != 'Y') {
-					return uni.showToast({
-						title: '技师未开启接单',
-						icon: 'none'
-					})
-				}
 				this.$api('createVipOrder', {
 					projectId: this.$route.query.serviceId,
 					technicianId: item.id