From 9e975eee3ebe9cc133435ca3fb2dbf8458efc748 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 11 八月 2025 18:10:11 +0800
Subject: [PATCH] fix: 修改登录
---
packages/components/src/AreaTreeSelect/AreaTreeSelect.vue | 6 +-
apps/bMiniApp/src/constants/router.ts | 3 +
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 6 --
apps/bMiniApp/src/subpackages/login/loginByForm/loginByForm.vue | 6 +-
apps/bMiniApp/src/subpackages/city/citySelect/citySelect.vue | 2
packages/hooks/task.ts | 2
apps/bMiniApp/src/subpackages/businessCard/businessCardEdit/InnerPage.vue | 11 +++--
apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue | 3 -
apps/cMiniApp/src/subpackages/login/authorization/authorization.vue | 4 +-
packages/hooks/area.ts | 51 ++++++++++++-------------
apps/cMiniApp/project.config.json | 4 +-
apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue | 6 ++
apps/bMiniApp/src/pages/home/index.vue | 6 +++
apps/cMiniApp/src/pages/mine/index.vue | 1
apps/cMiniApp/src/subpackages/login/loginByForm/loginByForm.vue | 4 +-
15 files changed, 61 insertions(+), 54 deletions(-)
diff --git a/apps/bMiniApp/src/constants/router.ts b/apps/bMiniApp/src/constants/router.ts
index 5130d44..b559ec5 100644
--- a/apps/bMiniApp/src/constants/router.ts
+++ b/apps/bMiniApp/src/constants/router.ts
@@ -1,5 +1,6 @@
export enum RouterPath {
- authorization = '/subpackages/login/authorization/authorization',
+ //B绔粺涓�璺宠浆瀵嗙爜鐧诲綍
+ authorization = '/subpackages/login/loginByForm/loginByForm',
userPolicy = '/subpackages/login/userPolicy/userPolicy',
loginByForm = '/subpackages/login/loginByForm/loginByForm',
mineUserPolicy = '/subpackages/login/mineUserPolicy/mineUserPolicy',
diff --git a/apps/bMiniApp/src/pages/home/index.vue b/apps/bMiniApp/src/pages/home/index.vue
index 4a9ae6e..98be786 100644
--- a/apps/bMiniApp/src/pages/home/index.vue
+++ b/apps/bMiniApp/src/pages/home/index.vue
@@ -89,6 +89,12 @@
const { locationCity } = useUser();
+onMounted(async () => {
+ try {
+ await setLocationCity();
+ } catch (error) {}
+});
+
const userStore = useUserStore();
const queryMenuState = reactive({
diff --git a/apps/bMiniApp/src/subpackages/businessCard/businessCardEdit/InnerPage.vue b/apps/bMiniApp/src/subpackages/businessCard/businessCardEdit/InnerPage.vue
index d120841..7857aa5 100644
--- a/apps/bMiniApp/src/subpackages/businessCard/businessCardEdit/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/businessCard/businessCardEdit/InnerPage.vue
@@ -21,7 +21,7 @@
</nut-form-item>
<nut-form-item label="鍏徃鎵�鍦ㄥ湴" class="bole-form-item" prop="areaList" required>
<ChooseInputWithAreaPicker
- :columns="areaTreeList"
+ :columns="areaTree"
v-model="form.areaList"
placeholder="璇烽�夋嫨鎮ㄥ叕鍙哥殑鎵�鍦ㄥ湴"
></ChooseInputWithAreaPicker>
@@ -54,22 +54,25 @@
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
-import { useAllAreaList } from '@12333/hooks';
+import { useAreaTree } from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
+import { AreaType } from '@12333/constants';
defineOptions({
name: 'InnerPage',
});
const { userDetail } = useUser();
-const { areaTreeList } = useAllAreaList();
+const { areaTree } = useAreaTree({
+ maxLayer: AreaType.City,
+});
const router = Taro.useRouter();
const taskId = router.params?.taskId ?? '';
const form = reactive({
avatarUrl: [],
name: '',
- areaList: [] as number[],
+ areaList: [] as string[],
});
const rules = reactive<FormRules>({
diff --git a/apps/bMiniApp/src/subpackages/city/citySelect/citySelect.vue b/apps/bMiniApp/src/subpackages/city/citySelect/citySelect.vue
index 98d5e2e..f2036d8 100644
--- a/apps/bMiniApp/src/subpackages/city/citySelect/citySelect.vue
+++ b/apps/bMiniApp/src/subpackages/city/citySelect/citySelect.vue
@@ -43,7 +43,7 @@
list: cityGroups[key].map((x) => ({
name: x.areaName,
id: x.areaCode,
- parentId: x.parentId,
+ parentId: x.parentCode,
})),
});
}
diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
index 11a4540..62b3ab2 100644
--- a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue
@@ -58,7 +58,11 @@
name: 'InnerPage',
});
-const { queryMenuState, infiniteLoadingProps, invalidateQueries } = useTaskList();
+const { queryMenuState, infiniteLoadingProps, invalidateQueries } = useTaskList({
+ defaultQueryMenuState: {
+ releaseStatus: EnumTaskReleaseStatus.InProcess,
+ },
+});
const releaseing = computed(() => {
return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.inProcessReleaseCount ?? 0;
diff --git a/apps/bMiniApp/src/subpackages/login/loginByForm/loginByForm.vue b/apps/bMiniApp/src/subpackages/login/loginByForm/loginByForm.vue
index 35d2bd7..69384d2 100644
--- a/apps/bMiniApp/src/subpackages/login/loginByForm/loginByForm.vue
+++ b/apps/bMiniApp/src/subpackages/login/loginByForm/loginByForm.vue
@@ -2,7 +2,7 @@
<LoginPageLayout class="loginByForm-page-wrapper">
<div class="loginB-form-wrapper">
<div class="loginB-form-tab">
- <div
+ <!-- <div
:class="[
'loginB-form-tab-item',
{ active: tabType === LoginFormTabs.VerificationCodeLogin },
@@ -14,7 +14,7 @@
<div class="loginB-form-tab-item-text">楠岃瘉鐮佺櫥褰�</div>
<div class="loginB-form-tab-item-line"></div>
</div>
- </div>
+ </div> -->
<div
:class="['loginB-form-tab-item', { active: tabType === LoginFormTabs.AccountLogin }]"
@click="handleTabChange(LoginFormTabs.AccountLogin)"
@@ -66,7 +66,7 @@
const router = Taro.useRouter();
-const tabType = ref(Number(router.params?.tab ?? LoginFormTabs.VerificationCodeLogin));
+const tabType = ref(Number(router.params?.tab ?? LoginFormTabs.AccountLogin));
function handleTabChange(tab: LoginFormTabs) {
tabType.value = tab;
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index b877a4a..c4d5852 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -59,11 +59,7 @@
name: 'InnerPage',
});
-const { queryMenuState, infiniteLoadingProps } = useTaskList({
- defaultQueryMenuState: {
- status: EnumTaskStatus.Wait,
- },
-});
+const { queryMenuState, infiniteLoadingProps } = useTaskList();
const completedAssignCount = computed(() => {
return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.completedAssignCount ?? 0;
diff --git a/apps/cMiniApp/project.config.json b/apps/cMiniApp/project.config.json
index cc53dd5..1d057ff 100644
--- a/apps/cMiniApp/project.config.json
+++ b/apps/cMiniApp/project.config.json
@@ -3,8 +3,8 @@
"description": "",
"setting": {
"urlCheck": false,
- "es6": false,
- "enhance": false,
+ "es6": true,
+ "enhance": true,
"postcss": false,
"preloadBackgroundData": false,
"minified": false,
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index cb55be5..4c9ab7a 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -147,6 +147,7 @@
);
},
placeholderData: () => ({} as API.GetPersonalLoginInfoQueryResult),
+ enabled: isLogin,
});
function goLogin() {
diff --git a/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue b/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
index f9eb94f..b6718bc 100644
--- a/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
+++ b/apps/cMiniApp/src/subpackages/city/citySelect/citySelect.vue
@@ -62,8 +62,7 @@
});
const clickItem = (key: string, item: any) => {
- console.log('item: ', item, 1111);
- // userStore.setLocationCity(item.name, getAreaByAreaCode(item.parentId).areaName);
+ userStore.setLocationCity(item.name, getAreaByAreaCode(item.parentId).areaName);
};
async function resetLocation() {
diff --git a/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
index 748c81e..691b1f8 100644
--- a/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -34,7 +34,7 @@
</div>
<div class="other-login-channel-list-item-text">楠岃瘉鐮佺櫥褰�</div>
</div>
- <div
+ <!-- <div
class="other-login-channel-list-item"
@click="goLoginByForm(LoginFormTabs.AccountLogin)"
>
@@ -42,7 +42,7 @@
<img :src="IconPassword" />
</div>
<div class="other-login-channel-list-item-text">璐︽埛鐧诲綍</div>
- </div>
+ </div> -->
</div>
</div>
</LoginPageLayout>
diff --git a/apps/cMiniApp/src/subpackages/login/loginByForm/loginByForm.vue b/apps/cMiniApp/src/subpackages/login/loginByForm/loginByForm.vue
index 35d2bd7..54e02e0 100644
--- a/apps/cMiniApp/src/subpackages/login/loginByForm/loginByForm.vue
+++ b/apps/cMiniApp/src/subpackages/login/loginByForm/loginByForm.vue
@@ -15,7 +15,7 @@
<div class="loginB-form-tab-item-line"></div>
</div>
</div>
- <div
+ <!-- <div
:class="['loginB-form-tab-item', { active: tabType === LoginFormTabs.AccountLogin }]"
@click="handleTabChange(LoginFormTabs.AccountLogin)"
>
@@ -24,7 +24,7 @@
<div class="loginB-form-tab-item-text">璐︽埛鐧诲綍</div>
<div class="loginB-form-tab-item-line"></div>
</div>
- </div>
+ </div> -->
</div>
<VerificationCodeLoginForm
v-show="tabType === LoginFormTabs.VerificationCodeLogin"
diff --git a/packages/components/src/AreaTreeSelect/AreaTreeSelect.vue b/packages/components/src/AreaTreeSelect/AreaTreeSelect.vue
index 812e7aa..57bcec7 100644
--- a/packages/components/src/AreaTreeSelect/AreaTreeSelect.vue
+++ b/packages/components/src/AreaTreeSelect/AreaTreeSelect.vue
@@ -25,7 +25,7 @@
</template>
<script setup lang="ts">
-import { useAllAreaList } from '@12333/hooks';
+import { useAllAreaList, useAreaTree } from '@12333/hooks';
import Category from './Category.vue';
import CategoryPane from './CategoryPane.vue';
import { reactive, computed, watch } from 'vue';
@@ -58,14 +58,14 @@
// },
// });
-const { areaTreeList } = useAllAreaList();
+const { areaTree } = useAreaTree();
const state = reactive({
provinceIndex: 0,
preModelValue: props.modelValue,
});
-const provinceList = computed(() => areaTreeList.value.map((x) => ({ ...x, name: x.areaName })));
+const provinceList = computed(() => areaTree.value.map((x) => ({ ...x, name: x.areaName })));
const categoryChild = computed(() => {
if (!provinceList.value.length) {
return [];
diff --git a/packages/hooks/area.ts b/packages/hooks/area.ts
index 684ce2c..7cca58c 100644
--- a/packages/hooks/area.ts
+++ b/packages/hooks/area.ts
@@ -1,6 +1,6 @@
import { flattenAreaTree, formatAreaListToTree } from '@12333/utils';
import { useQuery, useQueryClient } from '@tanstack/vue-query';
-import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { computed, MaybeRef, onMounted, onUnmounted, ref, unref } from 'vue';
import { AreaType, CategoryCode } from '@12333/constants';
import Taro, { EventChannel } from '@tarojs/taro';
import { useDictionaryDataSelect } from './dic';
@@ -9,16 +9,9 @@
export function useArea() {
const queryClient = useQueryClient();
- const { dictionaryDataList } = useDictionaryDataSelect({
- categoryCode: CategoryCode.Area,
- staleTime: Infinity,
- all: true,
- maxDeep: AreaType.Area,
- });
+ const { areaList } = useAllAreaList();
- const areaList = computed(() => dictionaryDataList.value.map(convertDictionaryToAreaTreeNode));
-
- // const areaTree = computed(() => formatAreaListToTree(areaList.value));
+ // const areaList = computed(() => dictionaryDataList.value.map(convertDictionaryToAreaTreeNode));
function getAreaFromCompleteAreaList(areaCode: string) {
return areaList.value.find((x) => x.areaCode === areaCode);
@@ -38,24 +31,16 @@
};
}
-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);
- },
+type UseAreaTreeOptions = {
+ maxLayer?: MaybeRef<AreaType>;
+};
- placeholderData: () => [] as API.AreaTreeNode[],
- });
+export function useAreaTree(options = {} as UseAreaTreeOptions) {
+ const { maxLayer = AreaType.Area } = options;
- const areaTree = computed(() => formatAreaListToTree(data.value));
+ const { areaList } = useAllAreaList();
+
+ const areaTree = computed(() => formatAreaListToTree(areaList.value, null, unref(maxLayer)));
return { areaTree: areaTree };
}
@@ -75,7 +60,19 @@
}
export function useAllAreaList() {
- const { areaList } = useArea();
+ const { data: areaList } = 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[],
+ staleTime: Infinity,
+ });
const findAreaCodeFromName = (areaName: string) => {
const areaItem = areaList.value.find((x) => x.areaName === areaName);
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index 77af26c..c7fde27 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -45,7 +45,7 @@
settlementCycle: '' as any as EnumSettlementCycle,
benefitCodes: '',
status: '' as any as EnumTaskStatus,
- releaseStatus: EnumTaskReleaseStatus.InProcess,
+ releaseStatus: '' as any as EnumTaskReleaseStatus,
checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus,
enterpriseId: '',
time: '' as any as Date,
--
Gitblit v1.9.1