From 886aa998cc4835d22b4379a8f8cf4bea86397310 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 16 Jan 2025 11:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=AF=8F=E6=9C=881=E6=AF=8F?=
 =?UTF-8?q?=E6=9C=882?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/task/index.vue | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/pages/task/index.vue b/pages/task/index.vue
index 40c6a2d..844300b 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -21,7 +21,7 @@
 					<text class="" style="font-size: 28rpx;">
 						{{ item.status == 1 ? '已签到' : '待签到' }}
 					</text>
-					<view :style="item.status == 1 ? 'color:#999' : 'color:#EFA765'">
+					<view style="display: flex;" :style="item.status == 1 ? 'color:#999' : 'color:#EFA765'">
 						{{ item.signDay.substr(5, 8) }}
 					</view>
 					<image v-if="item.status == 0" src="@/static/task/xing (1).png" mode=""></image>
@@ -295,12 +295,12 @@
 				url: urls
 			})
 		} else {
+			console.log(item, '林区')
 			if (item.jumpType == 0) {
 				if (item.buttonTitle.indexOf("领取") != -1) {
 					let res = await taskReceive({
 						id: item.id
 					})
-					console.log(res,'调试')
 					if (res.code == 0) {
 						uni.showToast({
 							title: res.id == 15 ? '签到成功' : '领取成功',
@@ -355,21 +355,45 @@
 				}
 			} else if (item.jumpType == 1) {
 				let buttonUrl = item.buttonUrl
-				console.log(buttonUrl, 'debug')
 				if (item.title && item.title.indexOf('每周打卡奖励') != -1) {
 					buttonUrl = item.buttonUrl + '?source=2'
+					
+					uni.navigateTo({
+						url: buttonUrl
+					})
 				}
 				if (item.title && item.title.indexOf('每月打卡奖励1') != -1) {
 					buttonUrl = item.buttonUrl + '?source=3'
+					
+					uni.navigateTo({
+						url: buttonUrl
+					})
 				}
 				if (item.title && item.title.indexOf('每月打卡奖励2') != -1) {
-					buttonUrl =
-						`${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
+					
+					let res = await taskReceive({
+						id: item.id
+					})
+					if (res.code == 0) {
+						uni.showToast({
+							title: res.id == 15 ? '签到成功' : '领取成功',
+							icon: 'none'
+						})
+						setTimeout(() => {
+							getTaskdata()
+							getsignIn()
+						}, 1000)
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+					
+					// buttonUrl =
+					// 	`${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
 				}
 
-				uni.navigateTo({
-					url: buttonUrl
-				})
 
 			} else if (item.jumpType == 3) {
 				uni.switchTab({