From 9f1c464d0f0f097314818ad617d0f48f03a70591 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 20 八月 2025 11:28:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/hooks/access.ts | 20 ------
apps/cMiniApp/src/hooks/access.ts | 36 ++++++------
apps/cMiniApp/auto-imports.d.ts | 1
apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue | 2
apps/bMiniApp/src/hooks/user.ts | 17 -----
apps/cMiniApp/src/subpackages/authentication/hooks/index.ts | 81 +++++++++++++-------------
apps/cMiniApp/src/hooks/user.ts | 17 -----
apps/bMiniApp/src/subpackages/authentication/authenticationResult/InnerPage.vue | 5 +
8 files changed, 63 insertions(+), 116 deletions(-)
diff --git a/apps/bMiniApp/src/hooks/access.ts b/apps/bMiniApp/src/hooks/access.ts
index 0392d1b..3e8924b 100644
--- a/apps/bMiniApp/src/hooks/access.ts
+++ b/apps/bMiniApp/src/hooks/access.ts
@@ -23,23 +23,3 @@
};
return _fn as T;
}
-
-/**
- * 鏄惁瀹屽杽涓汉淇℃伅锛堜紒涓氬悕绉帮紝鎵嬫満鍙凤級
- */
-// export function useAccessPersonalInfo<T extends (...args: any[]) => any>(fn: T) {
-// const { isCompletePersonalInfo } = useUser();
-
-// const _fn = useAccessLogin((...args2) => {
-// if (!isCompletePersonalInfo.value) {
-// Message.confirm({ message: '璇峰畬鍠勬偍鐨勪釜浜轰俊鎭�', title: '瀹屽杽淇℃伅' }).then(() => {
-// // Taro.navigateTo({
-// // url: `${RouterPath.userInfo}`,
-// // });
-// });
-// return;
-// }
-// fn?.(...args2);
-// });
-// return _fn as T;
-// }
diff --git a/apps/bMiniApp/src/hooks/user.ts b/apps/bMiniApp/src/hooks/user.ts
index 8e97ad1..c035c72 100644
--- a/apps/bMiniApp/src/hooks/user.ts
+++ b/apps/bMiniApp/src/hooks/user.ts
@@ -15,21 +15,6 @@
return userStore.getCurrentUserInfo();
}
- // const isCompanyAudited = computed(() => {
- // return userDetail.value?.openHRSiteStatus === ParkOrHRStatus.Running;
- // });
-
- /**
- * 鏄惁瀹屽杽涓汉淇℃伅锛堜紒涓氬悕绉帮紝鎵嬫満鍙凤級
- */
- // const isCompletePersonalInfo = computed(() => {
- // return (
- // !!userDetail.value?.customerName &&
- // !!userDetail.value?.contacter &&
- // !!userDetail.value?.cityName
- // );
- // });
-
const isCertified = computed(() => {
return userDetail.value?.isReal;
});
@@ -38,8 +23,6 @@
user: userInfo,
userDetail: userDetail,
updateUserInfo,
- // isCompletePersonalInfo,
- // isCompanyAudited,
isCertified,
locationCity,
};
diff --git a/apps/bMiniApp/src/subpackages/authentication/authenticationResult/InnerPage.vue b/apps/bMiniApp/src/subpackages/authentication/authenticationResult/InnerPage.vue
index df5b96a..1903b1d 100644
--- a/apps/bMiniApp/src/subpackages/authentication/authenticationResult/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/authentication/authenticationResult/InnerPage.vue
@@ -33,7 +33,7 @@
</template>
<script setup lang="ts">
-import { useMyCertificationAuditInfo, useSwitchTab } from '@/hooks';
+import { useSwitchTab } from '@/hooks';
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
import IconSuccess from '@/assets/authentication/icon-result-success.png';
@@ -44,7 +44,8 @@
name: 'InnerPage',
});
-const { myCertificationAuditInfo, isLoading } = useMyCertificationAuditInfo();
+const isLoading = ref(false);
+const myCertificationAuditInfo = ref({});
const switchTab = useSwitchTab();
diff --git a/apps/cMiniApp/auto-imports.d.ts b/apps/cMiniApp/auto-imports.d.ts
index f8c3f8a..2dff87e 100644
--- a/apps/cMiniApp/auto-imports.d.ts
+++ b/apps/cMiniApp/auto-imports.d.ts
@@ -186,7 +186,6 @@
readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
readonly unref: UnwrapRef<typeof import('vue')['unref']>
readonly useAccessLogin: UnwrapRef<typeof import('./src/hooks/access')['useAccessLogin']>
- readonly useAccessPersonalInfo: UnwrapRef<typeof import('./src/hooks/access')['useAccessPersonalInfo']>
readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>
readonly useAuth: UnwrapRef<typeof import('./src/hooks/user')['useAuth']>
readonly useCssModule: UnwrapRef<typeof import('vue')['useCssModule']>
diff --git a/apps/cMiniApp/src/hooks/access.ts b/apps/cMiniApp/src/hooks/access.ts
index 7602481..12730b2 100644
--- a/apps/cMiniApp/src/hooks/access.ts
+++ b/apps/cMiniApp/src/hooks/access.ts
@@ -24,22 +24,22 @@
return _fn as T;
}
-/**
- * 鏄惁瀹屽杽涓汉淇℃伅锛堜紒涓氬悕绉帮紝鎵嬫満鍙凤級
- */
-export function useAccessPersonalInfo<T extends (...args: any[]) => any>(fn: T) {
- const { isCompletePersonalInfo } = useUser();
+// /**
+// * 鏄惁瀹屽杽涓汉淇℃伅锛堜紒涓氬悕绉帮紝鎵嬫満鍙凤級
+// */
+// export function useAccessPersonalInfo<T extends (...args: any[]) => any>(fn: T) {
+// const { isCompletePersonalInfo } = useUser();
- const _fn = useAccessLogin((...args2) => {
- if (!isCompletePersonalInfo.value) {
- Message.confirm({ message: '璇峰畬鍠勬偍鐨勪釜浜轰俊鎭�', title: '瀹屽杽淇℃伅' }).then(() => {
- Taro.navigateTo({
- url: `${RouterPath.userInfo}`,
- });
- });
- return;
- }
- fn?.(...args2);
- });
- return _fn as T;
-}
+// const _fn = useAccessLogin((...args2) => {
+// if (!isCompletePersonalInfo.value) {
+// Message.confirm({ message: '璇峰畬鍠勬偍鐨勪釜浜轰俊鎭�', title: '瀹屽杽淇℃伅' }).then(() => {
+// Taro.navigateTo({
+// url: `${RouterPath.userInfo}`,
+// });
+// });
+// return;
+// }
+// fn?.(...args2);
+// });
+// return _fn as T;
+// }
diff --git a/apps/cMiniApp/src/hooks/user.ts b/apps/cMiniApp/src/hooks/user.ts
index e78bd97..980d82f 100644
--- a/apps/cMiniApp/src/hooks/user.ts
+++ b/apps/cMiniApp/src/hooks/user.ts
@@ -17,21 +17,6 @@
return userStore.getCurrentUserInfo();
}
- const isCompanyAudited = computed(() => {
- return userDetail.value?.openHRSiteStatus === ParkOrHRStatus.Running;
- });
-
- /**
- * 鏄惁瀹屽杽涓汉淇℃伅锛堜紒涓氬悕绉帮紝鎵嬫満鍙凤級
- */
- const isCompletePersonalInfo = computed(() => {
- return (
- !!userDetail.value?.customerName &&
- !!userDetail.value?.contacter &&
- !!userDetail.value?.cityName
- );
- });
-
const isCertified = computed(() => {
return userDetail.value?.isReal;
});
@@ -40,8 +25,6 @@
user: userInfo,
userDetail: userDetail,
updateUserInfo,
- isCompletePersonalInfo,
- isCompanyAudited,
isCertified,
locationCity,
userId,
diff --git a/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue b/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue
index 3436e64..28412d9 100644
--- a/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue
@@ -187,6 +187,8 @@
verifyCode: form.verifyCode,
};
let res = await electronSignServices.personalUserIdentity3Real(params);
+ if (res) {
+ }
} catch (error) {}
}
diff --git a/apps/cMiniApp/src/subpackages/authentication/hooks/index.ts b/apps/cMiniApp/src/subpackages/authentication/hooks/index.ts
index ff0217d..809bbad 100644
--- a/apps/cMiniApp/src/subpackages/authentication/hooks/index.ts
+++ b/apps/cMiniApp/src/subpackages/authentication/hooks/index.ts
@@ -9,7 +9,6 @@
UserCertificationChannelEnum,
UserCertificationPayType,
} from '@12333/constants';
-import * as userServices from '@12333/services/api/User';
import { FormValidator, Message } from '@12333/utils';
import { useUserCertificationSetting } from '@12333/hooks';
import Taro from '@tarojs/taro';
@@ -96,7 +95,7 @@
if (!formRef.value) return;
formRef.value.validate().then(({ valid, errors }: any) => {
if (valid) {
- addUserCertificationAudit();
+ // addUserCertificationAudit();
}
});
}
@@ -105,45 +104,45 @@
async function addUserCertificationAudit() {
try {
- let params: API.AddUserCertificationAuditInput = {
- enterpriseType: form.enterpriseType,
- licenseUrl: form.licenseUrl[0].path,
- enterpriseName: form.enterpriseName,
- societyCreditCode: form.societyCreditCode,
- certificationMode: form.certificationMode,
- legalPersonName: form.legalPersonName,
- legalPersonIdNumber: form.legalPersonIdNumber,
- legalPersonIdImgUrl: form.legalPersonIdFrontImgUrl?.[0]?.path ?? '',
- legalPersonIdBackImgUrl: form.legalPersonIdBackImgUrl?.[0]?.path ?? '',
- legalPersonBankCardImgUrl: form.legalPersonBankCardImgUrl?.[0]?.path ?? '',
- certificationContact:
- form.certificationElement === UserCertificationElementEnum.Identity4
- ? form.legalPersonName
- : form.proxyPersonName,
- certificationContactPhone:
- form.certificationElement === UserCertificationElementEnum.Identity4
- ? form.legalPersonContactPhone
- : form.proxyPersonContactPhone,
- proxyPersonName: form.proxyPersonName,
- proxyPersonIdNumber: form.proxyPersonIdNumber,
- proxyPersonIdImgUrl: form.proxyPersonIdFrontImgUrl?.[0]?.path ?? '',
- proxyPersonIdBackImgUrl: form.proxyPersonIdBackImgUrl?.[0]?.path ?? '',
- proxyPersonBankCardImgUrl: form.proxyPersonBankCardImgUrl?.[0]?.path ?? '',
- proxyPowerAttorneyUrl: form.proxyPowerAttorneyUrl?.[0]?.path ?? '',
- certificationChannel: UserCertificationChannelEnum.ThirdParty,
- certificationElement: form.certificationElement,
- vCode: form.verificationCode,
- bankCardNumber: form.bankCardNumber,
- payType: UserCertificationPayType.NotNeedPay,
- };
- loading.value = true;
- let res = await userServices.addUserCertificationAudit(params, { showLoading: false });
- if (res) {
- updateUserInfo();
- Taro.redirectTo({
- url: RouterPath.authenticationResult,
- });
- }
+ // let params: API.AddUserCertificationAuditInput = {
+ // enterpriseType: form.enterpriseType,
+ // licenseUrl: form.licenseUrl[0].path,
+ // enterpriseName: form.enterpriseName,
+ // societyCreditCode: form.societyCreditCode,
+ // certificationMode: form.certificationMode,
+ // legalPersonName: form.legalPersonName,
+ // legalPersonIdNumber: form.legalPersonIdNumber,
+ // legalPersonIdImgUrl: form.legalPersonIdFrontImgUrl?.[0]?.path ?? '',
+ // legalPersonIdBackImgUrl: form.legalPersonIdBackImgUrl?.[0]?.path ?? '',
+ // legalPersonBankCardImgUrl: form.legalPersonBankCardImgUrl?.[0]?.path ?? '',
+ // certificationContact:
+ // form.certificationElement === UserCertificationElementEnum.Identity4
+ // ? form.legalPersonName
+ // : form.proxyPersonName,
+ // certificationContactPhone:
+ // form.certificationElement === UserCertificationElementEnum.Identity4
+ // ? form.legalPersonContactPhone
+ // : form.proxyPersonContactPhone,
+ // proxyPersonName: form.proxyPersonName,
+ // proxyPersonIdNumber: form.proxyPersonIdNumber,
+ // proxyPersonIdImgUrl: form.proxyPersonIdFrontImgUrl?.[0]?.path ?? '',
+ // proxyPersonIdBackImgUrl: form.proxyPersonIdBackImgUrl?.[0]?.path ?? '',
+ // proxyPersonBankCardImgUrl: form.proxyPersonBankCardImgUrl?.[0]?.path ?? '',
+ // proxyPowerAttorneyUrl: form.proxyPowerAttorneyUrl?.[0]?.path ?? '',
+ // certificationChannel: UserCertificationChannelEnum.ThirdParty,
+ // certificationElement: form.certificationElement,
+ // vCode: form.verificationCode,
+ // bankCardNumber: form.bankCardNumber,
+ // payType: UserCertificationPayType.NotNeedPay,
+ // };
+ // loading.value = true;
+ // let res = await userServices.addUserCertificationAudit(params, { showLoading: false });
+ // if (res) {
+ // updateUserInfo();
+ // Taro.redirectTo({
+ // url: RouterPath.authenticationResult,
+ // });
+ // }
} catch (error) {
} finally {
loading.value = false;
--
Gitblit v1.9.1