From 998c36cd9c41f6fb1806cc87097187198702b9a1 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 10 Jun 2025 12:20:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(calendar):=20=E6=B7=BB=E5=8A=A0=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=97=A5=E6=9C=9F=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=9C=B0=E5=9D=80=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在日历组件中添加disabledDay属性支持禁用特定日期
- 新增calculateDistanceAddressList方法计算并排序地址距离
- 优化companionPetInfo页面地址列表的显示样式
- 在petList页面集成禁用日期功能并获取技师不接单日期
---
 mixins/position.js                                 | 23 +++++++++++++-
 pages/companionPetList/companionPetInfo.vue        |  5 +--
 pages/companionPetList/companionPetList.vue        |  3 ++
 pages/newOrder/petList.vue                         | 37 ++++++++++++++++++++--
 .../components/uni-calendar/uni-calendar-item.vue  |  6 ++++
 .../components/uni-calendar/uni-calendar.vue       | 10 +++++-
 .../uni-calendar/components/uni-calendar/util.js   | 16 ++++++++--
 7 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/mixins/position.js b/mixins/position.js
index c8a1a41..964cfb1 100644
--- a/mixins/position.js
+++ b/mixins/position.js
@@ -37,6 +37,27 @@ export default {
             })
 
             return minDistance
-        }
+        },
+		calculateDistanceAddressList(teacherAddress){
+			if (!teacherAddress ||
+			    teacherAddress.length == 0 ||
+			    !this.position || 
+			    !this.position.latitude || 
+			    !this.position.longitude) {
+			    return 0
+			}
+			
+			
+			teacherAddress.forEach((item, index) => {
+			    item.distance = calculateDistance(
+			        this.position.latitude,
+			        this.position.longitude,
+			        item.latitude,
+			        item.longitude,
+			    )
+			})
+			
+			return teacherAddress.sort((a, b) => a.distance - b.distance)
+		},
 	}
 }
\ No newline at end of file
diff --git a/pages/companionPetList/companionPetInfo.vue b/pages/companionPetList/companionPetInfo.vue
index 1948206..8c58e55 100644
--- a/pages/companionPetList/companionPetInfo.vue
+++ b/pages/companionPetList/companionPetInfo.vue
@@ -222,14 +222,15 @@
 						style="margin: 10rpx 0;"
                         :key="index"
 						v-for="(address, index) in addressList">
-							<view style="display: flex;align-items: center;flex-direction: column;">
+							<view style="display: flex;align-items: flex-start;flex-direction: column;">
                                 <view style="flex: 1; padding-right: 10rpx;">
                                     <text>可接单地址{{ index + 1 }}：</text>
                                     <text>{{ address.area }} {{ address.address }} {{ address.rangeNo ? address.rangeNo + '公里内' : '' }}</text>
                                 </view>
                                 
                                 <view v-if="address.appletOutDate && address.appletOutDate.length" 
-                                    style="display: flex; justify-content: flex-end;">
+                                    style="display: flex; justify-content: center;
+									width: 100%;">
                                     <view 
                                     style="font-size: 20rpx; color: #FFB13F; display: flex; align-items: center; padding: 2rpx 8rpx; background-color: #FFF9F0; border-radius: 20rpx;"
                                     @click="selectDate = address.appletOutDate.map(n => n.date);$refs.calendarPopup.open('bottom')">
diff --git a/pages/companionPetList/companionPetList.vue b/pages/companionPetList/companionPetList.vue
index 4dce9e5..5693a80 100644
--- a/pages/companionPetList/companionPetList.vue
+++ b/pages/companionPetList/companionPetList.vue
@@ -458,6 +458,9 @@
                         this.position.address = this.locationAddress
                         this.position.longitude = this.locationLongitude
                         this.position.latitude = this.locationLatitude
+						
+						
+						this.getCompanionList()
 
 					},
 					fail: (err) => {
diff --git a/pages/newOrder/petList.vue b/pages/newOrder/petList.vue
index 4f82afe..7b8a364 100644
--- a/pages/newOrder/petList.vue
+++ b/pages/newOrder/petList.vue
@@ -107,7 +107,9 @@
         <view v-if="showCalendar" class="calendar-popup">
             <view class="calendar-mask"></view>
             <view class="calendar-content">
-                <uni-calendar class="uni-calendar--hook" :selected="selectedDate" :startDate="startDate"
+                <uni-calendar class="uni-calendar--hook" 
+				:disabledDay="outDateList"
+				:selected="selectedDate" :startDate="startDate"
                     :endDate="endDate" @change="change" :showMonth="false" />
                 <u-button color="#FFBF60" type="primary" @click="confirmCanlendar">确定</u-button>
             </view>
@@ -120,7 +122,12 @@
 <script>
 import { getDictList } from "@/api/system/user.js"
 import { getPetList, delPet } from "@/api/system/pet"
+    import positionMixin from '../../mixins/position';
+	import {
+        getTeacherAddressList,
+	} from "@/api/order/order"
 export default {
+		mixins: [positionMixin],
     data() {
         return {
             defaultPhoto: 'https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/catdog.png',
@@ -135,11 +142,14 @@ export default {
             endDate: '',
             showCalendar: false,
             selectedDate: [],
-            currentPets: []
+            currentPets: [],
+			//当前技师不接单日期
+			outDateList : ['2025-6-20'],
         }
     },
     onShow() {
         this.getPetList();
+		this.getOutDateList()
     },
     onPullDownRefresh() {
         this.getPetList();
@@ -169,8 +179,29 @@ export default {
                     this.showDel = false;
                 }
             })
-
         },
+		//获取当前技师不接单日期
+		getOutDateList(){
+			
+			
+			if(!this.buyInfo.teacher || !this.buyInfo.teacher.userId){
+				return
+			}
+			
+			console.log('this.buyInfo', this.buyInfo);
+			
+			getTeacherAddressList({
+				userId : this.buyInfo.teacher.userId
+			}).then(response => {
+			    if (response.code == 200) {
+			        let addressList = this.calculateDistanceAddressList(response.data)
+					if(addressList && addressList[0] && addressList[0].appletOutDate){
+						this.outDateList = addressList[0].appletOutDate.map(n => n.date)
+					}
+					console.log(addressList, this.outDateList);
+			    }
+			})
+		},
         getPetTypeList() {
             getDictList('pet_type').then(res => {
                 if (res.code == 200) {
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
index 1b4ee7d..7da1ae0 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -55,6 +55,12 @@
 	export default {
 		emits:['change'],
 		props: {
+			disabledDay: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
 			weeks: {
 				type: Object,
 				default () {
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
index 713586d..b219d0c 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue
@@ -52,7 +52,8 @@
 				</view>
 				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
 					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
-						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"
+						:disabledDay="disabledDay"></calendar-item>
 					</view>
 				</view>
 			</view>
@@ -94,6 +95,12 @@
 		},
 		emits:['close','confirm','change','monthSwitch'],
 		props: {
+			disabledDay: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
 			date: {
 				type: String,
 				default: ''
@@ -204,6 +211,7 @@
 				startDate: this.startDate,
 				endDate: this.endDate,
 				range: this.range,
+				disabledDay : this.disabledDay,
 			})
 			this.init(this.date)
 		},
diff --git a/uni_modules/uni-calendar/components/uni-calendar/util.js b/uni_modules/uni-calendar/components/uni-calendar/util.js
index 5ec8a92..6aef4d7 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/util.js
+++ b/uni_modules/uni-calendar/components/uni-calendar/util.js
@@ -6,7 +6,8 @@ class Calendar {
 		selected,
 		startDate,
 		endDate,
-		range
+		range,
+		disabledDay,
 	} = {}) {
 		// 当前日期
 		this.date = this.getDate(new Date()) // 当前初入日期
@@ -22,6 +23,8 @@ class Calendar {
 		// 每周日期
 		this.weeks = {}
 		// this._getWeek(this.date.fullDate)
+		
+		this.disabledDay = disabledDay || []
 	}
 	/**
 	 * 设置日期
@@ -171,6 +174,15 @@ class Calendar {
 					checked = true
 				}
 			}
+			
+			//禁用日期
+			let dayDisable = true
+			for (let dj = 0; dj < this.disabledDay.length; dj++) {
+				if (this.disabledDay[dj] == nowDate) {
+					dayDisable = false
+				}
+			}
+			
 			let data = {
 				fullDate: nowDate,
 				year: full.year,
@@ -180,7 +192,7 @@ class Calendar {
 				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
 				month: full.month,
 				lunar: this.getlunar(full.year, full.month, i),
-				disable: !(disableBefore && disableAfter),
+				disable: !(disableBefore && disableAfter) || !dayDisable,
 				isDay
 			}
 			if (info) {