From d2c191181bc69a5f39ee8a40c530a30cc097e1ac Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 29 十二月 2025 15:32:28 +0800
Subject: [PATCH] fix: 甲方小程序
---
apps/housekeepingMiniApp/src/subpackages/mine/setting/setting.vue | 2 +-
apps/housekeepingMiniApp/src/hooks/user.ts | 2 +-
apps/housekeepingMiniApp/src/pages/mine/index.vue | 2 +-
apps/housekeepingMiniApp/src/utils/request/index.ts | 4 ++--
packages/services/types.d.ts | 18 ++++++++++++++++++
apps/housekeepingMiniApp/src/stores/modules/user.ts | 3 ++-
apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue | 12 +++++++++++-
apps/housekeepingMiniApp/src/subpackages/sercice/supplierDetail/InnerPage.vue | 8 ++++----
apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue | 2 +-
9 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/hooks/user.ts b/apps/housekeepingMiniApp/src/hooks/user.ts
index 8498fdb..ca88e1b 100644
--- a/apps/housekeepingMiniApp/src/hooks/user.ts
+++ b/apps/housekeepingMiniApp/src/hooks/user.ts
@@ -20,7 +20,7 @@
});
const displayName = computed(() =>
- userDetail.value.enterpriseIsReal ? userDetail.value.enterpriseName : userDetail.value.name
+ userDetail.value?.enterpriseIsReal ? userDetail.value?.enterpriseName : userDetail.value?.name
);
return {
diff --git a/apps/housekeepingMiniApp/src/pages/mine/index.vue b/apps/housekeepingMiniApp/src/pages/mine/index.vue
index 98173c5..3f9743d 100644
--- a/apps/housekeepingMiniApp/src/pages/mine/index.vue
+++ b/apps/housekeepingMiniApp/src/pages/mine/index.vue
@@ -76,7 +76,7 @@
<ListItem :icon="IconCollect" title="鏀惰棌澶�" @click="goMineCollectTask"></ListItem>
<ListItem
:icon="IconRecruit"
- v-if="!userDetail.enterpriseIsReal"
+ v-if="!userDetail?.enterpriseIsReal"
title="鍗囩骇浼佷笟鐗�"
@click="goCompanyInfo"
></ListItem>
diff --git a/apps/housekeepingMiniApp/src/stores/modules/user.ts b/apps/housekeepingMiniApp/src/stores/modules/user.ts
index c320813..dafe7d2 100644
--- a/apps/housekeepingMiniApp/src/stores/modules/user.ts
+++ b/apps/housekeepingMiniApp/src/stores/modules/user.ts
@@ -107,8 +107,8 @@
accessToken: wxMiniAppUserLoginRes.accessToken,
});
res.accessToken = bindRes.accessToken;
- this.loginSuccess(res);
}
+ this.loginSuccess(res);
return res;
} catch (error) {
console.log('error3: ', error);
@@ -213,6 +213,7 @@
},
setUserInfoAction(info: API.LoginCommandCallback) {
+ console.log('info: ', info);
this.userInfo = {
...this.userInfo,
...info,
diff --git a/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue
index 063085a..3fce0dc 100644
--- a/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -64,6 +64,7 @@
import * as authServices from '@12333/services/apiV2/auth';
import { NODE_ENV } from '@/constants';
import { subscribeMessageTemplateIdsForC } from '@12333/constants';
+import { ResponseStructure } from '@/utils/request';
console.log('NODE_ENV: ', NODE_ENV);
defineOptions({
@@ -95,6 +96,7 @@
const wxIndentityRes = ref<API.LoginCommandCallback>();
const wxMiniAppUserLoginRes = ref<API.LoginCommandCallback>();
+const wxmpLoginRes = ref<ResponseStructure<API.LoginCommandCallback>>();
const isAccount = ref(false);
@@ -116,7 +118,11 @@
type: AppLocalConfig.userType,
enterpriseType: AppLocalConfig.enterpriseType,
};
- wxMiniAppUserLoginRes.value = await authServices.wxmpLogin(params);
+ wxmpLoginRes.value = (await authServices.wxmpLogin(params, {
+ getResponse: true,
+ })) as ResponseStructure<API.LoginCommandCallback>;
+ console.log('wxmpLoginRes.value: ', wxmpLoginRes.value);
+ wxMiniAppUserLoginRes.value = wxmpLoginRes.value.data;
if (wxMiniAppUserLoginRes.value?.isBindPhoneNumber) {
isAccount.value = true;
}
@@ -128,6 +134,10 @@
try {
const { errMsg, code } = ev.detail;
console.log('errMsg: ', errMsg, isLoginByWeb.value);
+ if (!wxmpLoginRes.value.success) {
+ Message.error(wxmpLoginRes.value.msg);
+ return;
+ }
if (errMsg === 'getPhoneNumber:ok') {
if (isLoginByWeb.value) {
// let res = await userStore.wxMiniAppPhoneAuthLoginFromScan(
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue
index c000fb8..979e0dc 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveService/InnerPage.vue
@@ -75,7 +75,7 @@
// onMounted(() => {
// standardOrderServices.checkPayStandardOrder({
-// id: 'ca8c17a1-6c44-446e-2e88-08de443f2678',
+// id: 'ac33ec5d-5972-45e0-63a5-08de46a118d9',
// });
// });
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/setting/setting.vue b/apps/housekeepingMiniApp/src/subpackages/mine/setting/setting.vue
index cb75d8e..861999f 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/setting/setting.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/setting/setting.vue
@@ -3,7 +3,7 @@
<List>
<ListItem
title="鍏徃淇℃伅"
- v-if="userDetail.enterpriseIsReal"
+ v-if="userDetail?.enterpriseIsReal"
@click="goCompanyInfo"
></ListItem>
<ListItem title="涓汉淇℃伅" v-else @click="goPersonalInfo"></ListItem>
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/supplierDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/supplierDetail/InnerPage.vue
index 6877bde..02a2b4a 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/supplierDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/supplierDetail/InnerPage.vue
@@ -4,11 +4,11 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
-import CompanyDesc from '../components/CompanyDesc.vue';
-import CompanyTaskList from '../components/CompanyTaskList.vue';
-import CompanyInfo from '../components/CompanyInfo.vue';
+// import CompanyDesc from '../components/CompanyDesc.vue';
+// import CompanyTaskList from '../components/CompanyTaskList.vue';
+// import CompanyInfo from '../components/CompanyInfo.vue';
import { ProTabs, ProTabPane } from '@12333/components';
-import { useEnterpriseDetail } from '@12333/hooks';
+// import { useEnterpriseDetail } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
diff --git a/apps/housekeepingMiniApp/src/utils/request/index.ts b/apps/housekeepingMiniApp/src/utils/request/index.ts
index 2ebbed6..ac4f2bc 100644
--- a/apps/housekeepingMiniApp/src/utils/request/index.ts
+++ b/apps/housekeepingMiniApp/src/utils/request/index.ts
@@ -47,9 +47,9 @@
REDIRECT = 9,
}
// 涓庡悗绔害瀹氱殑鍝嶅簲鏁版嵁鏍煎紡
-interface ResponseStructure {
+export interface ResponseStructure<TData = any> {
success: boolean;
- data: any;
+ data: TData;
/**
* http鐘舵�佸悧
*/
diff --git a/packages/services/types.d.ts b/packages/services/types.d.ts
index 930c5be..6fcdd5a 100644
--- a/packages/services/types.d.ts
+++ b/packages/services/types.d.ts
@@ -1,4 +1,22 @@
declare module '@/utils/request' {
export const request: IRequest;
+ export interface ResponseStructure<TData = any> {
+ success: boolean;
+ data: TData;
+ /**
+ * http鐘舵�佸悧
+ */
+ code?: number;
+ /**
+ * 閿欒鐮�
+ */
+ errorCode?: string;
+ /**
+ * 閿欒淇℃伅
+ */
+ msg?: string;
+ showType?: ErrorShowType;
+ traceId?: string;
+ }
}
\ No newline at end of file
--
Gitblit v1.10.0