From fb46973c55458a64146894209ddf01986b2e5e3d Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Sun, 28 Sep 2025 16:55:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E6=97=A5=E6=9C=9F=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=92=8C=E6=8F=90=E7=8E=B0=E6=B5=81=E7=A8=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

恢复服务日期未到的打卡验证逻辑
简化提现流程，移除确认弹窗并优化错误提示
---
 otherPages/myOrdersManage/transaction/index.vue    | 33 ++--------------------
 .../myOrdersManage/components/timelineService.vue  | 18 ++++++------
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/otherPages/myOrdersManage/transaction/index.vue b/otherPages/myOrdersManage/transaction/index.vue
index af847c6..cd5040f 100644
--- a/otherPages/myOrdersManage/transaction/index.vue
+++ b/otherPages/myOrdersManage/transaction/index.vue
@@ -139,41 +139,14 @@
 		try {
 			console.log('开始领取提现，item:', item)
 			
-			// 先确认是否要领取
-			const confirmResult = await new Promise((resolve) => {
-				uni.showModal({
-					title: '确认领取',
-					content: `确定要领取￥${item.amount}吗？`,
-					success: (res) => {
-						resolve(res.confirm)
-					}
-				})
-			})
-			
-			if (!confirmResult) {
-				return
-			}
-			
-			uni.showLoading({
-				title: '处理中...'
-			})
-			
 			// 检查是否支持微信转账
 			if (typeof wx === 'undefined' || !wx.canIUse('requestMerchantTransfer')) {
-				console.log('微信API不可用，尝试直接调用后端接口')
-				// 如果微信API不可用，直接调用后端接口标记为已领取
-				const result = await withdrawalSuccessful({ 
-					id: item.id,
-					userId: store.state.user.userInfo.userId 
-				})
-				console.log('withdrawalSuccessful result:', result)
-				
+				console.log('微信API不可用')
 				uni.hideLoading()
-				
 				if (result.code === 200) {
 					uni.showToast({
-						title: '领取成功',
-						icon: 'success',
+						title: '领取失败，请将微信升级到最新版本',
+						icon: 'icon',
 						duration: 1500,
 						success() {
 							// 刷新列表
diff --git a/pages/myOrdersManage/components/timelineService.vue b/pages/myOrdersManage/components/timelineService.vue
index dcf4607..49a867f 100644
--- a/pages/myOrdersManage/components/timelineService.vue
+++ b/pages/myOrdersManage/components/timelineService.vue
@@ -193,15 +193,15 @@
 		today.setHours(0, 0, 0, 0);
 		serviceDate.setHours(0, 0, 0, 0);
 		
-		// if (serviceDate > today) {
-		// 	// 服务日期未到，显示提示
-		// 	uni.showToast({
-		// 		title: '服务日期未到，无法打卡',
-		// 		icon: 'none',
-		// 		duration: 2000
-		// 	});
-		// 	return;
-		// }
+		if (serviceDate > today) {
+			// 服务日期未到，显示提示
+			uni.showToast({
+				title: '服务日期未到，无法打卡',
+				icon: 'none',
+				duration: 2000
+			});
+			return;
+		}
 		
 		// 根据订单状态确定跳转路径
 		const paths = [