feat: 添加用户信息参数并优化日期选择功能

- 在多个API中添加`params`参数以支持用户信息传递
- 优化日期选择功能，支持多选和编辑模式
- 更新表单字段和验证逻辑，提升用户体验

api/address/address.js

@@ -47,4 +47,15 @@ export const udpateAddress = (data) => {
 	  method: "post",
 	  data
 	})
+}
+
+// 地址-地址修改
+export const addressDetail = (data) => {
+	return request({
+	  url: '/applet/address/addressDetail/' + data,
+	  headers: {
+	    isToken: true
+	  },
+	  method: "get",
+	})
 }

api/date/index.js

@@ -20,10 +20,11 @@ export function insertOutDate(data) {
 }
 
 // 接单地址-不接单日期列表数据查询
-export function outDateList() {
+export function outDateList(params) {
   return request({
     'url': '/applet/outDate/outDateList',
     'method': 'get',
+	params
   })
 }
 

api/pet/index.js

@@ -1,13 +1,14 @@
 import request from '@/utils/request'
 
 // 查询我的宠物列表
-export function getpetList() {
+export function getpetList(params) {
 	return request({
 		headers: {
 			"isToken": true
 		},
 		url: "/applet/pet/list",
-		method: 'get'
+		method: 'get',
+		params
 	})
 }
 

otherPages/authentication/connectAddress/detail.vue

@@ -30,21 +30,37 @@
 							<text>{{ !!form.status ? '开启' : '关闭' }}</text>
 						</view>
 					</up-form-item>
-					<up-form-item label="接单范围" prop="searchValue">
-						<up-input v-model="form.searchValue" placeholder="请输入内容" inputAlign="right" border="none">
+					<up-form-item label="接单范围" prop="rangeNo">
+						<up-input v-model="form.rangeNo" placeholder="请输入内容" inputAlign="right" border="none">
 							<template #suffix>
 								<text>Km</text>
 							</template>
 						</up-input>
 					</up-form-item>
-					<up-form-item @click="toNoOrderDate" label="不接单日期(选填)" prop="disabledDate" labelWidth="300rpx">
+					<up-form-item @click="toNoOrderDate" 
+					v-if="eidtItem"
+					
+					label="不接单日期(选填)" prop="disabledDate" labelWidth="300rpx">
+						<view class="" style="display: flex;width: 380rpx;">
+							<view class="text-ellipsis"
+							style="margin-left: auto;"
+							v-if="eidtItem.appletOutDate && eidtItem.appletOutDate.length">
+								{{ getDisabledDateDesc(eidtItem.appletOutDate) }}
+							</view>
+							
+							<view class="text-ellipsis"
+							style="margin-left: auto;" v-else>
+								暂无不可接单日期
+							</view>
+							>
+						</view>
 					</up-form-item>
 				</view>
 			</view>
 
 		</up-form>
 
-		<view>
+		<view style="margin-top: 40rpx;">
 			<up-parse class="size-28" :content="configList.adress_statement.paramValueArea" containerStyle="{
           color: '#707070',
           fontSize: '22rpx',
@@ -63,17 +79,21 @@
 <script setup>
 	import {
 		ref,
-		getCurrentInstance
+		getCurrentInstance,
+		computed,
 	} from 'vue'
+	import dayjs from 'dayjs'
 	import {
 		store
 	} from '@/store'
 	import {
 		insertAddress,
-		udpateAddress
+		udpateAddress,
+		addressDetail,
 	} from "@/api/address/address.js"
 	import {
-		onLoad
+		onLoad,
+		onShow
 	} from '@dcloudio/uni-app'
 
 	const instance = getCurrentInstance();
@@ -89,20 +109,31 @@
 		distance: null,
 		disabledDate: [],
 	})
+	
+	const userInfo = computed(() => {
+		return store.getters.userInfo;
+	})
+	
 	const rules = ref({})
 	const eidtItem = ref(null);
+	const addressId = ref(0)
 
 	onLoad((options) => {
-		eidtItem.value = options?.item ? JSON.parse(options.item) : null;
-		form.value = {
-			id: eidtItem?.value?.id || null,
-			area: eidtItem?.value?.area || null,
-			address: eidtItem?.value?.address || null,
-			status: eidtItem?.value?.status == 'true' || null,
-			latitude: eidtItem?.value?.latitude || null,
-			longitude: eidtItem?.value?.longitude || null
-		}
+		addressId.value = options.addressId
+		
+		// eidtItem.value = options?.item ? JSON.parse(options.item) : null;
+		// form.value = {
+		// 	id: eidtItem?.value?.id || null,
+		// 	area: eidtItem?.value?.area || null,
+		// 	address: eidtItem?.value?.address || null,
+		// 	status: eidtItem?.value?.status == 'true' || null,
+		// 	latitude: eidtItem?.value?.latitude || null,
+		// 	longitude: eidtItem?.value?.longitude || null
+		// }
 	});
+	onShow(() => {
+		getDetail()
+	})
 
 	const setAddress = (res) => {
 		form.value.latitude = res.latitude
@@ -136,13 +167,15 @@
 		let code = null;
 		if (eidtItem?.value?.id) {
 			let result = await udpateAddress({
-				...form.value
+				...form.value,
+				userId : userInfo.value.userId,
 			})
 			code = result.code
 		} else {
 			// 新增地址
 			let result = await insertAddress({
-				...form.value
+				...form.value,
+				userId : userInfo.value.userId,
 			})
 			code = result.code
 		}
@@ -150,6 +183,30 @@
 			uni.navigateBack()
 		}
 	}
+	
+	function getDetail(){
+		addressDetail(addressId.value).
+		then(res => {
+			console.log(res.data);
+			eidtItem.value = res.data
+			form.value = {
+				id: eidtItem?.value?.id || null,
+				area: eidtItem?.value?.area || null,
+				address: eidtItem?.value?.address || null,
+				status: eidtItem?.value?.status == 'true' || null,
+				latitude: eidtItem?.value?.latitude || null,
+				longitude: eidtItem?.value?.longitude || null
+			}
+		})
+	}
+	
+	const getDisabledDateDesc = (dateArr) => {
+		if (!dateArr?.length) {
+			return '暂无不可接单日期'
+		}
+	
+		return dateArr.map(date => dayjs(date.date).format('MM-DD')).join('、')
+	}
 
 	const toNoOrderDate = () => {
 		if (eidtItem?.value?.id) {
@@ -191,4 +248,11 @@
 			color: #707070;
 		}
 	}
+	.text-ellipsis {
+		text-align: right;
+		overflow: hidden; //超出的文本隐藏
+		text-overflow: ellipsis; //溢出用省略号显示
+		white-space: nowrap; //溢出不换行
+		width: 330rpx;
+	}
 </style>

otherPages/authentication/connectAddress/index.vue

@@ -16,8 +16,8 @@
 				<view class="size-30">
 					{{ item.area }}
 				</view>
-				<view class="size-22 color-777 mt16" v-if="item.searchValue">
-					{{ `接单范围：${item.searchValue}km` }}
+				<view class="size-22 color-777 mt16" v-if="item.rangeNo">
+					{{ `接单范围：${item.rangeNo}km` }}
 				</view>
 				<view class="size-22 color-777 mt16" v-else>
 					接单范围：未设置
@@ -31,11 +31,11 @@
 						</view>
 					</view>
 					<view class="color-999 size-22 mt16 flex-rowl">
-						<text v-if="item.disabledDate">
-							{{ `共${item.disabledDate?.length}天：` }}
+						<text v-if="item.appletOutDate">
+							{{ `共${item.appletOutDate?.length}天：` }}
 						</text>
 						<text class="text-ellipsis" style="flex: 1;">
-							{{ getDisabledDateDesc(item.disabledDate) }}
+							{{ getDisabledDateDesc(item.appletOutDate) }}
 						</text>
 					</view>
 				</view>
@@ -112,6 +112,9 @@
 	const configList = computed(() => {
 		return store.getters.configList
 	})
+	const userInfo = computed(() => {
+		return store.getters.userInfo;
+	})
 
 	const list = ref([])
 	const modal = ref(null)
@@ -119,7 +122,9 @@
 
 	const fetchAddressList = async () => {
 		try {
-			let response = await getAddressList();
+			let response = await getAddressList({
+				userId : userInfo.value.userId
+			});
 			list.value = response.data || []
 		} catch (err) {
 
@@ -144,13 +149,13 @@
 			return '暂无不可接单日期'
 		}
 
-		return dateArr.map(date => dayjs(date).format('MM-DD')).join('、')
+		return dateArr.map(date => dayjs(date.date).format('MM-DD')).join('、')
 	}
 
 	const toAdd = (item) => {
 		if (item) {
 			uni.navigateTo({
-				url: `/otherPages/authentication/connectAddress/detail?item=${JSON.stringify(item)}`
+				url: `/otherPages/authentication/connectAddress/detail?addressId=${item.id}`
 			})
 		} else {
 			uni.navigateTo({

otherPages/authentication/serve/index.vue

@@ -24,7 +24,27 @@
 				</button>
 			</view>
 			<view class="form">
-				
+				<view class="form-item flex-rowb">
+					<view class="size-28">昵称</view>
+					<view class="flex-rowr">
+						<input type="text" placeholder="请输入" v-model="form.nickname" class="input-right" />
+					</view>
+				</view>
+
+				<view class="form-item flex-rowb">
+					<view class="size-28">手机号</view>
+					<view class="flex-rowr">
+						<text>{{baseInfo.info.userTelephone || ''}}</text>
+					</view>
+				</view>
+
+				<view class="form-item flex-rowb">
+					<view class="size-28">性别</view>
+					<view class="flex-rowr" @click="openGenderSelect">
+						<text>{{form.gender || '请选择'}}</text>
+						<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -34,6 +54,28 @@
 				<text class="size-22 color-ffb fw700">(重要)</text>
 			</view>
 			<view class="form">
+				<view class="form-item flex-rowb">
+					<view class="size-28">个人简介</view>
+					<view class="flex-rowr">
+						<textarea v-model="form.introduction" placeholder="请输入" class="textarea-full" maxlength="200"></textarea>
+					</view>
+				</view>
+
+				<view class="form-item flex-rowb">
+					<view class="size-28">养宠经验</view>
+					<view class="flex-rowr">
+						<input type="number" v-model="form.petExperience" placeholder="请输入您的养宠年限" class="input-right" />
+						<text class="ml10">年</text>
+					</view>
+				</view>
+
+				<view class="form-item flex-rowb">
+					<view class="size-28">服务记录</view>
+					<view class="flex-rowr" @click="jumpToServeRecord">
+						<text>{{ `${serviceCount}条` }}</text>
+						<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -42,6 +84,28 @@
 				服务资料
 			</view>
 			<view class="form">
+				<view class="form-item flex-rowb">
+					<view class="size-28">服务宠物类型</view>
+					<view class="flex-rowr" @click="openTypeSelectPopup">
+						<text>{{ typeDesc }}</text>
+						<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+					</view>
+				</view>
+
+				<view class="form-item flex-rowb">
+					<view class="size-28">基础服务</view>
+					<view class="flex-rowr">
+						<text>宠物喂养 上门遛狗</text>
+					</view>
+				</view>
+
+				<view class="form-item flex-rowb">
+					<view class="size-28">增值服务</view>
+					<view class="flex-rowr" @click="openServeSelectPopup">
+						<text>{{ serveDesc }}</text>
+						<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -88,6 +152,10 @@
 
 	const form = reactive({
 		headImage: null,
+		nickname: '',
+		gender: '',
+		introduction: '',
+		petExperience: '',
 		type: [],
 		serve: [],
 	})
@@ -105,84 +173,6 @@
 	const displayInfoRef = ref(null)
 	const serveInfoRef = ref(null)
 
-	const state = reactive({
-		baseInfoList: [{
-				type: "input",
-				label: "昵称",
-				key: "userName",
-				placeholder: "请输入",
-			},
-			{
-				type: "input",
-				label: "手机号",
-				key: "userTelephone",
-				placeholder: "请输入",
-			},
-			{
-				type: "select",
-				label: "性别",
-				key: "sex",
-				placeholder: "请选择",
-				options: [
-					{
-						name: "男",
-						value : '男',
-					},
-					{
-						name: "女",
-						value : '男',
-					}
-				]
-			}
-		],
-		displayInfoList: [{
-				type: "input",
-				label: "个人简介",
-				key: "jianjie",
-				placeholder: "请输入",
-			},
-			{
-				type: "input",
-				label: "养宠经验",
-				unit: "年",
-				key: "jingyan",
-				placeholder: "请输入",
-			},
-			{
-				type: "custom",
-				label: "服务记录",
-				key: "jilu",
-				placeholder: "请选择",
-				options: [{
-						name: "男"
-					},
-					{
-						name: "女"
-					}
-				]
-			}
-		],
-		serveInfoList: [{
-				type: "custom",
-				label: "服务宠物类型",
-				key: "type",
-				placeholder: "请选择",
-			},
-			{
-				type: "input",
-				label: "基础服务",
-				key: "base",
-				placeholder: "宠物喂养上门遛狗",
-			},
-			{
-				type: "custom",
-				label: "增值服务",
-				key: "zenz",
-				placeholder: "请选择",
-			}
-		],
-	})
-
 	const jumpToServeRecord = () => {
 		uni.navigateTo({
 			url: "/otherPages/authentication/serve/record"
@@ -246,7 +236,42 @@
 		})
 	}
 	
+	const genderOptions = [
+		{ text: '男', value: '男' },
+		{ text: '女', value: '女' }
+	]
+
+	const openGenderSelect = () => {
+		uni.showActionSheet({
+			itemList: genderOptions.map(item => item.text),
+			success: function (res) {
+				form.gender = genderOptions[res.tapIndex].value
+				fetchUpdate()
+			}
+		})
+	}
+
+	const fetchUpdate = () => {
+		// 这里可以添加更新数据的逻辑
+		console.log('更新数据', form)
+	}
+
 	function submit(){
+		// 表单验证
+		if (!form.nickname) {
+			uni.showToast({
+				title: '请输入昵称',
+				icon: 'none'
+			})
+			return
+		}
+		
+		// 提交表单数据
+		console.log('提交表单数据', form)
+		uni.showToast({
+			title: '保存成功',
+			icon: 'success'
+		})
 	}
 
 	onShow(() => {
@@ -258,8 +283,11 @@
 
 	onMounted(()=> {
 		// todo: fetch data and init data
-		
-		serveInfoRef.value.setDataByKey('base', configList.value.pet_basic_services.paramValueText)
+		// 初始化表单数据
+		if (baseInfo.value && baseInfo.value.info) {
+			form.nickname = baseInfo.value.info.userName || ''
+			form.gender = baseInfo.value.info.gender || ''
+		}
 	})
 
 </script>
@@ -280,9 +308,26 @@
 			align-items: center;
 		}
 
+		.flex-rowb {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx 0;
+		}
+
 		.ml10 {
 			margin-left: 10rpx;
 		}
+
+		.input-right {
+			text-align: right;
+		}
+
+		.textarea-full {
+			width: 100%;
+			min-height: 120rpx;
+			text-align: right;
+		}
 	}
 
 	.page {

otherPages/myOrdersManage/date/detail.vue

@@ -21,7 +21,7 @@
 				共不接单时间
 			</view>
 			<view class="level center_item">
-				<view >
+				<view @click="calendarShowEdit = true">
 					<!-- <up-icon name="edit-pen" color="#2979ff" size="22"></up-icon> -->
 					修改
 				</view>
@@ -46,8 +46,19 @@
 	</view>
 
 	<up-action-sheet :actions="list" @select="selectClick" :show="show" :round="10"></up-action-sheet>
-	<up-calendar :show="calendarShow" color="#FFBF60" :round="10" :showTitle="false" :mode="mode" @confirm="confirm"
-		@close="closeCandler" :minDate="minDate" :maxDate="maxDate"></up-calendar>
+	
+	<up-calendar 
+	:show="calendarShow" color="#FFBF60" :round="10" :showTitle="false" :mode="mode" @confirm="confirm"
+	@close="closeCandler" 
+	:maxDate="maxDate"></up-calendar>
+	
+	<up-calendar 
+	:show="calendarShowEdit" color="#FFBF60" 
+	:defaultDate="selectDateList"
+	@close="calendarShowEdit = false" 
+	:round="10" :showTitle="false" mode="multiple" @confirm="calendarShowEditConfirm"
+	:maxDate="maxDate"></up-calendar>
+	
 </template>
 
 <script setup>
@@ -63,6 +74,7 @@
 		insertOutDate,
 		outDateList
 	} from "@/api/date/index.js"
+import dayjs from "dayjs";
 
 	onLoad((options) => {
 		addressId.value = options.addressId
@@ -89,21 +101,21 @@
 
 	const show = ref(false);
 	const calendarShow = ref(false);
+	const calendarShowEdit = ref(false);
 	const mode = ref('range');
 	const selectDateList = ref([]);
 	const groupedDates = ref({}); //按月分组
 	const d = new Date();
-	const currentYear = d.getFullYear();
-	const minDate = `${currentYear}-01-01`;
+	const currentYear = d.getFullYear() + 10;
 	const maxDate = `${currentYear}-12-31`;
 
 	// 方法  
 	const selectClick = (selectItem) => {
 		if (selectItem.index == 0) {
-			mode.value = 'range';
+			mode.value = 'range';//multiple range
 			calendarShow.value = true;
 		} else if (selectItem.index == 1) {
-			mode.value = 'single';
+			mode.value = 'multiple';
 			calendarShow.value = true;
 		}
 		show.value = false;
@@ -112,9 +124,20 @@
 	const confirm = (e) => {
 		const list = [...selectDateList.value, ...e];
 		selectDateList.value = [...new Set(list)];
+		
+		selectDateList.value.sort((a, b) => {
+			return dayjs(a).valueOf() - dayjs(b).valueOf();
+		});
+		
 		gruopDate(selectDateList.value);
 		calendarShow.value = false;
 	};
+	
+	function calendarShowEditConfirm(data){
+		selectDateList.value = data
+		calendarShowEdit.value = false
+		gruopDate(selectDateList.value);
+	}
 
 	const closeCandler = () => {
 		calendarShow.value = false;
@@ -168,7 +191,7 @@
 		}
 		let response = await insertOutDate({
 			addressId: addressId.value,
-			date: selectDateList.value.toString()
+			dataJson : selectDateList.value.toString()
 		})
 		if (response.code == 200) {
 			uni.showToast({
@@ -180,13 +203,14 @@
 	}
 
 	const getOutDateList = async () => {
-		let response = await outDateList();
+		let response = await outDateList({
+			addressId: addressId.value,
+		});
 		if (response.code == 200 && response.data) {
 			let list = response.data.filter(item => item.date !== null && item.date !== undefined);
 			list = list.map(item => item.date);
 			// 去除重复日期
 			selectDateList.value = [...new Set(list)];
-			console.log(selectDateList)
 			gruopDate(selectDateList.value);
 		}
 	}

otherPages/userManage/pet/index.vue

@@ -78,7 +78,8 @@
 <script setup>
 	import {
 		ref,
-		onMounted
+		onMounted,
+		computed
 	} from 'vue';
 	// import {
 	// 	getDictList
@@ -94,7 +95,14 @@
 		onShow,
 		onPullDownRefresh
 	} from '@dcloudio/uni-app'
+	import {
+		useStore
+	} from "vuex"
 
+	const store = useStore();
+	const userInfo = computed(() => {
+		return store.getters.userInfo
+	})
 
 	const router = useRouter();
 	const defaultPhoto = ref('https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/personal/pet/catdog.png');
@@ -113,7 +121,9 @@
 	const getPetList = async () => {
 		petList.value = [];
 		try {
-			const res = await getpetList();
+			const res = await getpetList({
+				userId: userInfo.value.userId
+			});
 			if (res && res.data) {
 				petList.value = res.data;
 				showDel.value = false;
@@ -195,10 +205,10 @@
 		deleteId.value = '';
 	};
 
-	onMounted(() => {
-		// getPetTypeList();
-		getPetList();
-	});
+	// onMounted(() => {
+	// 	// getPetTypeList();
+	// 	getPetList();
+	// });
 
 	onShow(() => {
 		getPetList();