From d2220b016809145d7008b3b5a98ff95704a2dfef Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 20 Apr 2025 19:37:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E8=AE=A4=E8=AF=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=A4=9A=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了打卡链接中缺少`isRead`参数的问题，更新了按钮文本为“打卡记录”，移除了冗余的`btnTexts`变量。在订单详情页面，添加了`showSecondButton`状态来控制第二个按钮的显示。在认证页面，修复了个人简介字段的绑定问题，并调整了宠物类型的数据处理逻辑。在认证结束页面，添加了姓名和电话的输入字段，并优化了地址输入提示。
---
 otherPages/authentication/examination/end.vue      | 71 +++++++++++++++-------
 otherPages/authentication/serve/index.vue          | 19 +++---
 otherPages/orderTakingManage/detail/index.vue      |  9 ++-
 .../myOrdersManage/components/petServicePopup.vue  |  2 +-
 pages/myOrdersManage/components/systemOrder.vue    |  3 +-
 5 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/otherPages/authentication/examination/end.vue b/otherPages/authentication/examination/end.vue
index 38d24a9..bc88d67 100644
--- a/otherPages/authentication/examination/end.vue
+++ b/otherPages/authentication/examination/end.vue
@@ -3,7 +3,7 @@
 		<view class="containers po-r">
 			<image src="" mode="" class="mainBg"></image>
 			<view class="w-100 po-a content">
-				
+
 				<stepProgress :step="3"></stepProgress>
 
 				<view class="step mt24">
@@ -77,7 +77,8 @@
 							</view>
 							<view class="info color-777 size-22 flex-rowl">
 								<text class="size-22 color-777">微信二维码</text>
-								<image :src="configList.wx_image.paramValueImage" mode="widthFix" style="width: 150rpx;height: 150rpx;"></image>
+								<image :src="configList.wx_image.paramValueImage" mode="widthFix"
+									style="width: 150rpx;height: 150rpx;"></image>
 							</view>
 						</view>
 					</view>
@@ -96,22 +97,36 @@
 								</view>
 								<view class="size-22 flex-rowr" @click="openToolsInfoModal">
 									<text>查看工具包</text>
-									<up-icon name="arrow-down" color="#7F7F7F" size="17rpx" style="margin-left: 5rpx;"></up-icon>
+									<up-icon name="arrow-down" color="#7F7F7F" size="17rpx"
+										style="margin-left: 5rpx;"></up-icon>
 								</view>
 							</view>
-							<view class="info color-777 size-22">
+							<!-- <view class="info color-777 size-22">
 								<view class="flex-between">
 									<text class="size-22">所在地区:</text>
-                  <view plain class="flex-rowr" @click="selectAddr">
+									<view plain class="flex-rowr" @click="selectAddr">
 										<text>{{ form.area ? form.area : '请选择' }}</text>
-										<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F" size="21rpx"></up-icon>
-                  </view>
+										<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F"
+											size="21rpx"></up-icon>
+									</view>
+								</view>
+							</view> -->
+							<view class="info color-777 size-22 mt20">
+								<view class="flex-between">
+									<text class="size-22">姓名:</text>
+									<input v-model="form.name" type="text" placeholder="请输入姓名" />
+								</view>
+							</view>
+							<view class="info color-777 size-22 mt20">
+								<view class="flex-between">
+									<text class="size-22">电话:</text>
+									<input v-model="form.phone" type="text" placeholder="请输入道路、小区、门牌号等" />
 								</view>
 							</view>
 							<view class="info color-777 size-22 mt20">
 								<view class="flex-between">
-									<text class="size-22">详细地址:</text>
-									<input v-model="form.address" type="text" placeholder="请输入道路、小区、门牌号等" />
+									<text class="size-22">地址:</text>
+									<input v-model="form.address" type="text" placeholder="请输入收货地址" />
 								</view>
 							</view>
 						</view>
@@ -127,13 +142,8 @@
 				</view>
 			</view>
 
-			<up-modal 
-				:show="showToolsInfoModal"  
-				:showConfirmButton="false"
-				:showCancelButton="false"
-				:closeOnClickOverlay="true"
-				@close="closeToolsInfoModal"
-			>
+			<up-modal :show="showToolsInfoModal" :showConfirmButton="false" :showCancelButton="false"
+				:closeOnClickOverlay="true" @close="closeToolsInfoModal">
 				<up-parse class="size-28" :content="configList.pet_tools.paramValueArea"></up-parse>
 			</up-modal>
 
@@ -145,10 +155,21 @@
 </template>
 
 <script setup>
-	import { ref, reactive, computed } from "vue";
-	import { onShow } from '@dcloudio/uni-app'
-	import { useStore } from 'vuex'
-	import { udpateUser, getUserOne } from '@/api/userTeacher'
+	import {
+		ref,
+		reactive,
+		computed
+	} from "vue";
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
+	import {
+		useStore
+	} from 'vuex'
+	import {
+		udpateUser,
+		getUserOne
+	} from '@/api/userTeacher'
 
 	import stepProgress from '../components/stepProgress.vue';
 
@@ -173,7 +194,7 @@
 		address: null,
 	})
 
-	
+
 	const initData = async () => {
 		console.log('--initData')
 		try {
@@ -244,6 +265,8 @@
 				latitude,
 				longitude,
 				address,
+				name,
+				phone,
 			} = form
 
 			const data = {
@@ -252,10 +275,12 @@
 				latitude,
 				longitude,
 				address,
+				name,
+				phone,
 			}
 
 			await udpateUser(data)
-			
+
 			uni.showToast({
 				title: '提交成功!',
 				icon: "none"
@@ -268,7 +293,7 @@
 			}, 1000)
 
 		} catch (err) {
-			
+
 		}
 
 	}
diff --git a/otherPages/authentication/serve/index.vue b/otherPages/authentication/serve/index.vue
index 9c377fa..f113e97 100644
--- a/otherPages/authentication/serve/index.vue
+++ b/otherPages/authentication/serve/index.vue
@@ -48,8 +48,8 @@
 			</view>
 			<view class="form">
                 <up-form label-position="left" :model="formData" :rules="rules" ref="dFormRef" labelWidth="200rpx">
-                    <up-form-item label="个人简介" prop="introduction">
-                        <up-input v-model="formData.introduction" 
+                    <up-form-item label="个人简介" prop="userBrief">
+                        <up-input v-model="formData.userBrief" 
                         placeholder="请输入个人简介" border="none" 
                         inputAlign="right"
                         fontSize="28rpx">
@@ -171,7 +171,8 @@
 	const formData = reactive({
 		introduction: '',
 		experience: '',
-		serviceRecord: ''
+		serviceRecord: '',
+		userBrief : '',
 	})
 
 	const rules = {
@@ -211,10 +212,10 @@
 				// 设置基本资料
 				baseFormData.userName = userInfo.value.userName || ''
 				baseFormData.userTelephone = data.phone || userInfo.value.userTelephone || ''
-				baseFormData.sex = data.sex === 0 ? '男' : '女'
+				baseFormData.sex = data.sex == 0 ? '男' : '女'
 				
 				// 设置展示信息
-				formData.introduction = data.introduction || ''
+				formData.userBrief = data.userBrief || ''
 				formData.experience = data.experience || ''
                 
 				form.headImage = userInfo.value.userImage || ''
@@ -222,7 +223,7 @@
 				
 				// 设置服务资料
 				if (data.petType) {
-					form.type = [data.petType]
+					form.type = data.petType.split ? data.petType.split(',').map(n => parseInt(n)) : [parseInt(data.petType)]
 				}
 				
 				// 设置增值服务
@@ -323,10 +324,10 @@
 			const submitData = {
                 id : form.id,
 				phone: baseFormData.userTelephone,
-				sex: baseFormData.sex === '男' ? 0 : 1,
-				introduction: formData.introduction,
+				sex: baseFormData.sex == '男' ? 0 : 1,
+				userBrief: formData.userBrief,
 				experience: formData.experience,
-				petType: form.type.length > 0 ? form.type[0] : null,
+				petType: form.type.length > 0 ? form.type.join(',') : null,
 				license: serveFormData.serve.join(';'),
 			}
 			
diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue
index 9754db8..8d8c64d 100644
--- a/otherPages/orderTakingManage/detail/index.vue
+++ b/otherPages/orderTakingManage/detail/index.vue
@@ -241,7 +241,7 @@
 			</view>
 			<view class="button-group">
 				<up-button @click="noneOrder" color="#FFBF60" text="复制订单编号" shape="circle"></up-button>
-				<up-button @click="toMyOrder" color="#FFBF60" text="到我的订单查看" shape="circle" style="margin-top: 20rpx;"></up-button>
+				<up-button v-if="showSecondButton" @click="toMyOrder" color="#FFBF60" text="到我的订单查看" shape="circle" style="margin-top: 20rpx;"></up-button>
 			</view>
 		</view>
 	</up-popup>
@@ -290,6 +290,7 @@
 	const value = ref("45619491656")
 	const petList = ref([])
 	const confirmStatus = ref([false, false, false]); // 添加确认状态数组，分别对应三个确认项
+	const showSecondButton = ref(false); // 控制第二个按钮的显示
 	const userInfo = computed(() => {
 		return store.getters.userInfo
 	})
@@ -337,6 +338,8 @@
 
 	const orderSuccessOpen = () => {
 		showOrderSuccess.value = true;
+		// 重置按钮显示状态，初始只显示复制订单编号按钮
+		showSecondButton.value = false;
 	};
 
 	// 处理确认按钮点击事件
@@ -447,6 +450,8 @@
 					title: '复制成功',
 					icon: 'none'
 				});
+				// 点击复制按钮后显示第二个按钮
+				showSecondButton.value = true;
 			}
 		});
 	}
@@ -455,7 +460,7 @@
 	const toMyOrder = () => {
 		orderSuccessClose();
 		uni.navigateTo({
-			url: '/pages/myOrdersManage/list/index'
+			url: '/pages/myOrdersManage/index'
 		});
 	}
 </script>
diff --git a/pages/myOrdersManage/components/petServicePopup.vue b/pages/myOrdersManage/components/petServicePopup.vue
index cbdd376..cd9f1fd 100644
--- a/pages/myOrdersManage/components/petServicePopup.vue
+++ b/pages/myOrdersManage/components/petServicePopup.vue
@@ -80,7 +80,7 @@ const getServiceTimeText = (timeCode) => {
 const handleClock = (service) => {
 	if (!props.orderData || !service) return;
 
-    let url = `/otherPages/myOrdersManage/clock/index?id=${props.orderData.orderId}&itemID=${props.orderData.id}&serviceId=${service.id}`
+    let url = `/otherPages/myOrdersManage/clock/index?id=${props.orderData.orderId}&itemID=${props.orderData.id}&serviceId=${service.id}&isRead=true`
 
     if(service){
 
diff --git a/pages/myOrdersManage/components/systemOrder.vue b/pages/myOrdersManage/components/systemOrder.vue
index 9146173..4c1784b 100644
--- a/pages/myOrdersManage/components/systemOrder.vue
+++ b/pages/myOrdersManage/components/systemOrder.vue
@@ -23,7 +23,7 @@
 						<view class="mb28 address">{{ item.address }}</view>
 						<view class="mb28" v-if="item.type == 0">订单为系统派发，请确认订单信息后再抢单</view>
 						<view class="flex flex-between">
-							<up-button type="primary" :text="btnTexts[item.orderStatus]" @click="showServicePopup(item)" shape="circle"
+							<up-button type="primary" text="打卡记录" @click="showServicePopup(item)" shape="circle"
 								class="mr20" color="#FFAA48"></up-button>
 							<up-button type="primary" text="宠物档案" @click="toPet(item)" shape="circle" class="mr20"
 								color="#FFAA48"></up-button>
@@ -64,7 +64,6 @@ import PetServicePopup from './petServicePopup.vue';
 			required: true
 		}
 	});
-	const btnTexts = ['打卡', '打卡', '打开记录']
 	const orderStatus = ['待接单','进行中','已完成']
 	
 	// 弹窗相关状态