666666

components/renwu/TaskPop.vue

@@ -38,19 +38,11 @@
 			</view>
 		</view>
 		
-		<!-- 任务完成提示弹窗 -->
-		<TaskCompleteTips 
-			:visible="showTaskCompleteTips" 
-			:points="currentTaskPoints"
-			:taskTitle="currentTaskTitle"
-			@close="handleCloseTaskCompleteTips"
-		/>
 	</view>
 </template>
 
 <script setup>
 import { defineProps, defineEmits, ref, onMounted, watch } from 'vue';
-import TaskCompleteTips from './TaskCompleteTips.vue';
 import { useIntegralStore } from '../../stores/integral';
 
 // Props 定义
@@ -71,9 +63,9 @@ const emit = defineEmits(['close', 'taskClick']);
 const integralStore = useIntegralStore();
 
 // 任务完成提示弹窗状态
-const showTaskCompleteTips = ref(false);
-const currentTaskPoints = ref(0);
-const currentTaskTitle = ref('');
+// const showTaskCompleteTips = ref(false);
+// const currentTaskPoints = ref(0);
+// const currentTaskTitle = ref('');
 
 // 任务列表数据
 const taskList = ref([]);
@@ -94,11 +86,6 @@ const handleTaskClick = (task, index) => {
 	emit('taskClick', { task, index });
 };
 
-// 关闭任务完成提示弹窗
-const handleCloseTaskCompleteTips = () => {
-	showTaskCompleteTips.value = false;
-	emit('closeTaskCompleteTips');
-};
 </script>
 
 <style lang="less" scoped>

mock/queryTodoResult.json

 {
-  "code": "000000",
-  "message": "success",
-  "ok": true,
-  "success": true,
-  "data": {
-    "list": {
-      "credits": 10,
-      "type": "BROWSE_PAGE",
-      "name":"浏览任务"
-    }
-  }
-}
+    "code": "000000",
+    "data": [
+      {
+        "activityId": 1121,
+        "actualCredits": "10",
+        "appId": null,
+        "channel": null,
+        "checkInTask": false,
+        "completedDate": "2025-10-25",
+        "completedDateObject": 1761374139906,
+        "completedTime": 1761374139906,
+        "createTime": null,
+        "creditsValue": 10,
+        "enterpriseWeChatTask": false,
+        "expired": false,
+        "extra": null,
+        "limitType": "Forever",
+        "limitTypeDesc": "永久限制",
+        "limitTypeDescription": "永久限制",
+        "normalTask": false,
+        "periodEndDate": "2055-10-18",
+        "periodEndDateObject": 2707454139906,
+        "periodEndTime": 2707454139906,
+        "remainingDays": 10949,
+        "remainingTime": 946079986364,
+        "status": "COMPLETED",
+        "statusDescription": "已完成",
+        "taskDescription": "任务已完成",
+        "taskIcon": null,
+        "taskName": "添加企业微信添加企业微信添加",
+        "taskType": null,
+        "taskTypeDescription": "未知类型",
+        "updateTime": null,
+        "userId": null,
+        "valid": true,
+        "weChatFollowTask": false
+      }
+    ],
+    "message": "success",
+    "ok": true,
+    "success": true
+  }
\ No newline at end of file

pages/index/index.vue

@@ -19,13 +19,13 @@
 	/>
 	
 	<!-- 任务完成弹窗 -->
-	<TaskComplete 
+	<!-- <TaskComplete 
 		:visible="globalStore.isShowTaskComplete"
 		:points="globalStore.taskCompletePoints"
 		:taskTitle="globalStore.taskCompleteTitle"
 		@close="handleCloseTaskComplete"
 		@accept="handleAcceptTaskComplete"
-	/>
+	/> -->
 	
 	<!-- 任务弹窗 -->
 	<TaskPop 
@@ -33,8 +33,16 @@
 		:taskTodo="globalStore.taskTodo"
 		@close="handleCloseTaskPop"
 		@taskClick="handleTaskClick"
-		@closeTaskCompleteTips="handleCloseTaskCompleteTips"
 	/>
+
+
+		<!-- 任务完成提示弹窗 -->
+		<TaskCompleteTips 
+			:visible="globalStore.isShowTaskComplete" 
+			:points="globalStore.taskCompletePoints"
+			:taskTitle="globalStore.taskCompleteTitle"
+			@close="handleCloseTaskCompleteTips"
+		/>
 	
 	<!-- 任务信息弹窗 -->
 	<TaskPerson 
@@ -73,9 +81,10 @@ import Integral from "@/views/Integral.vue";
 import My from "@/views/My.vue";
 import WxFriendCircleSimplePage from "@/components/WxFriendCircleSimplePage.vue";
 import InvitePrizePanel from "@/components/integralArea/InvitePrizePanel.vue";
-import TaskComplete from "@/components/qiandao/TaskComplete.vue";
+// import TaskComplete from "@/components/qiandao/TaskComplete.vue";
 import TaskPop from "@/components/renwu/TaskPop.vue";
 import TaskPerson from "@/components/renwu/TaskPerson.vue";
+import TaskCompleteTips from '@/components/renwu/TaskCompleteTips.vue';
 import { useGlobalStore } from "@/stores/global.js";
 import { useUserStore } from "@/stores/user.js";
 import { jump, JumpType } from "../../utils";
@@ -144,10 +153,10 @@ const checkAndUpdateTaskResult = async () => {
   await integralStore.queryTodoResultServer();
   console.log('queryTodoResult:', integralStore.queryTodoResult);
 
-  if(integralStore.queryTodoResult?.length > 0) {
+  if(integralStore.queryTodoResult?.success && integralStore.queryTodoResult?.data?.length > 0) {
     globalStore.isShowTaskComplete = true;
-    globalStore.taskCompletePoints = integralStore.queryTodoResult[0]?.actualCredits;
-    globalStore.taskCompleteTitle = integralStore.queryTodoResult[0]?.taskName;
+    globalStore.taskCompletePoints = integralStore.queryTodoResult.data[0]?.actualCredits;
+    globalStore.taskCompleteTitle = integralStore.queryTodoResult.data[0]?.taskName;
   }
 };
 
@@ -155,11 +164,12 @@ onMounted(async () => {
   await checkAndUpdateTaskResult();
 });
 
-//关闭了任务奖励弹窗
+// 关闭了任务奖励弹窗
 const handleCloseTaskCompleteTips = async () => {
-  console.log('点击了任务奖励弹窗的关闭按钮/好的按钮');
+	showTaskCompleteTips.value = false;
   await checkAndUpdateTaskResult();
-}
+};
+