From bddfec7e062404ea563299b75c91d9b172339d0a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 08 八月 2025 16:31:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

---
 apps/cMiniApp/src/hooks/task.ts |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/cMiniApp/src/hooks/task.ts b/apps/cMiniApp/src/hooks/task.ts
index d8414e1..fe9dc25 100644
--- a/apps/cMiniApp/src/hooks/task.ts
+++ b/apps/cMiniApp/src/hooks/task.ts
@@ -18,11 +18,12 @@
 }
 
 type UseTaskListOptions = {
-  cityName?: MaybeRef<string>;
+  cityCode?: MaybeRef<string>;
+  enabled?: MaybeRef<boolean>;
 };
 
 export function useTaskList(options: UseTaskListOptions = {}) {
-  const { cityName = '' } = options;
+  const { cityCode = '', enabled = true } = options;
 
   const searchValue = ref('');
 
@@ -50,12 +51,12 @@
           page: pageParam,
           orderInput: [
             queryState.orderType === HomeOrderType.Recommend
-              ? { property: 'createdTime', order: EnumPagedListOrder.Desc }
-              : {},
+              ? { property: 'recommendStatus', order: EnumPagedListOrder.Desc }
+              : { property: 'createdTime', order: EnumPagedListOrder.Desc },
           ],
         },
         keywords: queryState.searchValueTrim,
-        // cityCode: 'string',
+        cityCode: unref(cityCode),
         settlementCycle: queryMenuState.settlementCycle,
         benefitCodes: [queryMenuState.benefitCodes].filter(Boolean),
         genderLimit: queryMenuState.genderLimit,
@@ -63,16 +64,13 @@
         releaseStatus: EnumTaskReleaseStatus.InProcess,
       };
 
-      if (queryState.orderType === HomeOrderType.Recommend) {
-        params.recommendStatus = EnumTaskRecommendStatus.Yes;
-      }
-
       return taskServices.getTaskInfos(params, {
         showLoading: false,
       });
     },
     {
-      queryKey: ['taskServices/getTaskInfos', queryState, queryMenuState, cityName],
+      queryKey: ['taskServices/getTaskInfos', queryState, queryMenuState, cityCode],
+      enabled: enabled,
     }
   );
 

--
Gitblit v1.9.1