From b617603a5e9a4f86e47bb3df67e1cd0c9beb2ba1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 17:03:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/hooks/area.ts | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/packages/hooks/area.ts b/packages/hooks/area.ts
index f8bd597..684ce2c 100644
--- a/packages/hooks/area.ts
+++ b/packages/hooks/area.ts
@@ -4,6 +4,7 @@
import { AreaType, CategoryCode } from '@12333/constants';
import Taro, { EventChannel } from '@tarojs/taro';
import { useDictionaryDataSelect } from './dic';
+import axios from 'axios';
export function useArea() {
const queryClient = useQueryClient();
@@ -12,13 +13,12 @@
categoryCode: CategoryCode.Area,
staleTime: Infinity,
all: true,
- maxDeep: AreaType.City,
+ maxDeep: AreaType.Area,
});
const areaList = computed(() => dictionaryDataList.value.map(convertDictionaryToAreaTreeNode));
- console.log('areaList: ', areaList);
- const areaTree = computed(() => formatAreaListToTree(areaList.value));
+ // const areaTree = computed(() => formatAreaListToTree(areaList.value));
function getAreaFromCompleteAreaList(areaCode: string) {
return areaList.value.find((x) => x.areaCode === areaCode);
@@ -31,20 +31,41 @@
return {
completeAreaList: areaList,
areaList,
- completeAreaTree: areaTree,
- provinceList: computed(() => areaList.value.filter((x) => x.layer === AreaType.Province)),
+ // completeAreaTree: areaTree,
+ // provinceList: computed(() => areaList.value.filter((x) => x.layer === AreaType.Province)),
getAreaFromCompleteAreaList,
getAreaByAreaCode,
};
+}
+
+export function useAreaTree() {
+ axios.get('https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/12333/area.txt').then((res) => {
+ console.log(res);
+ });
+ const { data } = useQuery({
+ queryKey: ['area.txt'],
+ queryFn() {
+ return axios
+ .get<API.AreaTreeNode[]>(
+ 'https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/12333/area.txt'
+ )
+ .then((res) => res.data);
+ },
+
+ placeholderData: () => [] as API.AreaTreeNode[],
+ });
+
+ const areaTree = computed(() => formatAreaListToTree(data.value));
+
+ return { areaTree: areaTree };
}
function convertDictionaryToAreaTreeNode(
item: API.SelectOptionStringGetDictionaryDataSelectQueryResultOption
) {
return {
- children: [],
areaCode: item.data?.code,
- parentCode: item.data?.field1,
+ parentCode: item.data?.parentCode,
areaName: item.label,
layer: Number(item.data?.field4),
quickQuery: item.data?.field2,
@@ -79,13 +100,13 @@
};
}
-export function useProvinceList() {
- const { provinceList } = useArea();
+// export function useProvinceList() {
+// const { provinceList } = useArea();
- return {
- provinceList,
- };
-}
+// return {
+// provinceList,
+// };
+// }
export const globalEventEmitter = new Taro.Events();
--
Gitblit v1.9.1