From fb531cbb7ceca6e4c28288b5a988a2700a065c59 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 11 八月 2025 15:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue | 6
apps/bMiniApp/src/subpackages/login/components/LoginPageLayout/LoginPageLayout.vue | 2
apps/bMiniApp/src/stores/modules/user.ts | 63 +++++++--------
packages/constants/enum.ts | 11 --
apps/bMiniApp/package.json | 2
apps/cMiniApp/src/stores/modules/user.ts | 52 ++++++------
apps/cMiniApp/package.json | 2
apps/cMiniApp/project.private.config.json | 7 +
apps/bMiniApp/project.config.json | 4
apps/bMiniApp/src/subpackages/login/authorization/authorization.vue | 55 ++++++-------
pnpm-lock.yaml | 12 +-
11 files changed, 103 insertions(+), 113 deletions(-)
diff --git a/apps/bMiniApp/package.json b/apps/bMiniApp/package.json
index 026a189..38ea55c 100644
--- a/apps/bMiniApp/package.json
+++ b/apps/bMiniApp/package.json
@@ -78,7 +78,7 @@
"lodash": "^4.17.21",
"pinia": "^2.1.6",
"qs": "^6.11.1",
- "senin-mini": "^1.0.10",
+ "senin-mini": "^1.0.12",
"senior-request": "^1.0.3",
"taro-plugin-pinia": "^1.0.0",
"vconsole": "^3.15.1",
diff --git a/apps/bMiniApp/project.config.json b/apps/bMiniApp/project.config.json
index e4afad4..7bc8fee 100644
--- a/apps/bMiniApp/project.config.json
+++ b/apps/bMiniApp/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/bMiniApp/src/stores/modules/user.ts b/apps/bMiniApp/src/stores/modules/user.ts
index 78f699f..43999ef 100644
--- a/apps/bMiniApp/src/stores/modules/user.ts
+++ b/apps/bMiniApp/src/stores/modules/user.ts
@@ -9,8 +9,6 @@
getUserDetail,
removeUserDetail,
} from '@/utils/storage/auth';
-import * as accountServices from '@12333/services/api/Account';
-// import * as userServices from '@12333/services/api/User';
import Taro, { useRouter } from '@tarojs/taro';
import { ButtonProps } from '@tarojs/components';
import { debounce } from 'lodash';
@@ -24,7 +22,6 @@
md5Encrypt,
} from '@12333/utils';
import DefaultAvatar from '@/assets/components/icon-default-avatar.png';
-import { WxMiniAppEnum } from '@12333/constants';
import { myClient } from '@/constants/query';
import { globalEventEmitter } from '@12333/hooks';
import * as authServices from '@12333/services/apiV2/auth';
@@ -96,21 +93,19 @@
// 鎵嬫満鍙锋巿鏉僀ode鐧诲綍
async getTokenByPhone(
detail: ButtonProps.onGetPhoneNumberEventDetail,
- wxMiniAppUserLoginRes: any
+ wxMiniAppUserLoginRes: API.LoginCommandCallback
) {
try {
- let res: API.IdentityModelTokenCacheItem;
- if (!wxMiniAppUserLoginRes.accessToken) {
- let params: API.WxMiniAppPhoneLoginInput = {
- openId: wxMiniAppUserLoginRes.openId,
- sessionKey: wxMiniAppUserLoginRes.sessionKey,
+ let res: API.LoginCommandCallback = wxMiniAppUserLoginRes;
+ if (!wxMiniAppUserLoginRes.isBindPhoneNumber) {
+ let bindRes = await authServices.bindWxmpUserInfo({
encryptedData: detail.encryptedData,
iv: detail.iv,
- wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
- };
- res = await accountServices.wxMiniAppPhoneAuthLogin(params);
- this.loginSuccess(res);
+ sessionKey: wxMiniAppUserLoginRes.sessionKey,
+ });
+ res.accessToken = bindRes.accessToken;
}
+ this.loginSuccess(res);
return res;
} catch (error) {
console.log('error3: ', error);
@@ -161,15 +156,15 @@
},
async wxMiniAppUserLoginFromScan(wxIndentityRes: API.WxMiniAppIndentityInfo, uuid: string) {
- try {
- let res = await accountServices.wxMiniAppUserLoginFromScan({
- uId: uuid,
- userName: wxIndentityRes.userName,
- openId: wxIndentityRes.openId,
- });
- this.loginSuccess(res);
- return res;
- } catch (error) {}
+ // try {
+ // let res = await accountServices.wxMiniAppUserLoginFromScan({
+ // uId: uuid,
+ // userName: wxIndentityRes.userName,
+ // openId: wxIndentityRes.openId,
+ // });
+ // this.loginSuccess(res);
+ // return res;
+ // } catch (error) {}
},
async wxMiniAppPhoneAuthLoginFromScan(
@@ -177,18 +172,18 @@
wxIndentityRes: API.WxMiniAppIndentityInfo,
uuid: string
) {
- try {
- let res = await accountServices.wxMiniAppPhoneAuthLoginFromScan({
- uId: uuid,
- openId: wxIndentityRes.openId,
- sessionKey: wxIndentityRes.sessionKey,
- encryptedData: detail.encryptedData,
- iv: detail.iv,
- wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
- });
- this.loginSuccess(res);
- return res;
- } catch (error) {}
+ // try {
+ // let res = await accountServices.wxMiniAppPhoneAuthLoginFromScan({
+ // uId: uuid,
+ // openId: wxIndentityRes.openId,
+ // sessionKey: wxIndentityRes.sessionKey,
+ // encryptedData: detail.encryptedData,
+ // iv: detail.iv,
+ // wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
+ // });
+ // this.loginSuccess(res);
+ // return res;
+ // } catch (error) {}
},
// async getCurrentUserInfo() {
diff --git a/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue
index 8968b1a..61b1869 100644
--- a/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/bMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -57,11 +57,10 @@
import { CommonEventFunction, ButtonProps } from '@tarojs/components';
import Taro from '@tarojs/taro';
import { useLoginedJump } from '@/hooks';
-import * as accountServices from '@12333/services/api/Account';
import IconCaptcha from '@/assets/login/icon-btn-captcha.png';
import IconPassword from '@/assets/login/icon-btn-password.png';
import { LoginFormTabs } from '../constants';
-import { WxMiniAppEnum } from '@12333/constants';
+import * as authServices from '@12333/services/apiV2/auth';
defineOptions({
name: 'authorization',
@@ -90,8 +89,8 @@
RouterPath.authorization.includes(launchOptions.path) && launchOptions.scene === 1047 && uuid
);
-const wxIndentityRes = ref<API.WxMiniAppIndentityInfo>();
-const wxMiniAppUserLoginRes = ref<API.IdentityModelTokenCacheItem>();
+const wxIndentityRes = ref<API.LoginCommandCallback>();
+const wxMiniAppUserLoginRes = ref<API.LoginCommandCallback>();
const isAccount = ref(false);
@@ -99,21 +98,21 @@
try {
let loginRes = await Taro.login();
if (isLoginByWeb.value) {
- const wxIndentity = await accountServices.getWxIndentity({
- code: loginRes.code,
- wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
- });
- wxIndentityRes.value = wxIndentity;
- if (wxIndentityRes.value.userName) {
- isAccount.value = true;
- }
+ // const wxIndentity = await authServices.wxmpLogin({
+ // code: loginRes.code,
+ // type: AppLocalConfig.userType,
+ // });
+ // wxIndentityRes.value = wxIndentity;
+ // if (wxIndentityRes.value.isBindPhoneNumber) {
+ // isAccount.value = true;
+ // }
} else {
- const params: API.APIwxMiniAppUserLoginParams = {
+ const params: API.WxmpLoginCommand = {
code: loginRes.code,
- wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
+ type: AppLocalConfig.userType,
};
- wxMiniAppUserLoginRes.value = await accountServices.wxMiniAppUserLogin(params);
- if (wxMiniAppUserLoginRes.value.accessToken) {
+ wxMiniAppUserLoginRes.value = await authServices.wxmpLogin(params);
+ if (wxMiniAppUserLoginRes.value.isBindPhoneNumber) {
isAccount.value = true;
}
}
@@ -126,14 +125,14 @@
console.log('errMsg: ', errMsg, isLoginByWeb.value);
if (errMsg === 'getPhoneNumber:ok') {
if (isLoginByWeb.value) {
- let res = await userStore.wxMiniAppPhoneAuthLoginFromScan(
- ev.detail,
- wxIndentityRes.value,
- uuid
- );
- if (res) {
- handleLoginSuccess();
- }
+ // let res = await userStore.wxMiniAppPhoneAuthLoginFromScan(
+ // ev.detail,
+ // wxIndentityRes.value,
+ // uuid
+ // );
+ // if (res) {
+ // handleLoginSuccess();
+ // }
} else {
let res = await userStore.getTokenByPhone(ev.detail, wxMiniAppUserLoginRes.value);
if (res) {
@@ -153,10 +152,10 @@
if (state.policyChecked) {
if (isLoginByWeb.value) {
console.log('uuid: ', uuid);
- let res = await userStore.wxMiniAppUserLoginFromScan(wxIndentityRes.value, uuid);
- if (res) {
- handleLoginSuccess();
- }
+ // let res = await userStore.wxMiniAppUserLoginFromScan(wxIndentityRes.value, uuid);
+ // if (res) {
+ // handleLoginSuccess();
+ // }
} else {
userStore.loginSuccess(wxMiniAppUserLoginRes.value);
handleLoginSuccess();
diff --git a/apps/bMiniApp/src/subpackages/login/components/LoginPageLayout/LoginPageLayout.vue b/apps/bMiniApp/src/subpackages/login/components/LoginPageLayout/LoginPageLayout.vue
index 47fcdd2..bc88221 100644
--- a/apps/bMiniApp/src/subpackages/login/components/LoginPageLayout/LoginPageLayout.vue
+++ b/apps/bMiniApp/src/subpackages/login/components/LoginPageLayout/LoginPageLayout.vue
@@ -7,7 +7,7 @@
<img :src="OssAssets.login.AuthBg" class="authorization-page-auth" />
</template>
- <div class="authorization-page-title">娆㈣繋浣跨敤818骞冲彴</div>
+ <div class="authorization-page-title">娆㈣繋浣跨敤宸ョ泭璧�</div>
<slot></slot>
</PageLayout>
diff --git a/apps/cMiniApp/package.json b/apps/cMiniApp/package.json
index bff1bb9..93b87a2 100644
--- a/apps/cMiniApp/package.json
+++ b/apps/cMiniApp/package.json
@@ -78,7 +78,7 @@
"lodash": "^4.17.21",
"pinia": "^2.1.6",
"qs": "^6.11.1",
- "senin-mini": "^1.0.10",
+ "senin-mini": "^1.0.12",
"senior-request": "^1.0.3",
"taro-plugin-pinia": "^1.0.0",
"vconsole": "^3.15.1",
diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index ca80844..02429d4 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -9,6 +9,13 @@
"miniprogram": {
"list": [
{
+ "name": "鎴戠殑绠�鍘�",
+ "pathName": "subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "鍏徃璇︽儏",
"pathName": "subpackages/task/companyDetail/companyDetail",
"query": "id=f775538f-985c-4d51-7985-08ddd5c71bbf",
diff --git a/apps/cMiniApp/src/stores/modules/user.ts b/apps/cMiniApp/src/stores/modules/user.ts
index 21cf5ab..39b8df7 100644
--- a/apps/cMiniApp/src/stores/modules/user.ts
+++ b/apps/cMiniApp/src/stores/modules/user.ts
@@ -9,8 +9,6 @@
getUserDetail,
removeUserDetail,
} from '@/utils/storage/auth';
-import * as accountServices from '@12333/services/api/Account';
-import * as userServices from '@12333/services/api/User';
import Taro, { useRouter } from '@tarojs/taro';
import { ButtonProps } from '@tarojs/components';
import { debounce } from 'lodash';
@@ -24,7 +22,6 @@
md5Encrypt,
} from '@12333/utils';
import DefaultAvatar from '@/assets/components/icon-default-avatar.png';
-import { WxMiniAppEnum } from '@12333/constants';
import { myClient } from '@/constants/query';
import { globalEventEmitter } from '@12333/hooks';
import * as authServices from '@12333/services/apiV2/auth';
@@ -161,15 +158,15 @@
},
async wxMiniAppUserLoginFromScan(wxIndentityRes: API.WxMiniAppIndentityInfo, uuid: string) {
- try {
- let res = await accountServices.wxMiniAppUserLoginFromScan({
- uId: uuid,
- userName: wxIndentityRes.userName,
- openId: wxIndentityRes.openId,
- });
- this.loginSuccess(res);
- return res;
- } catch (error) {}
+ // try {
+ // let res = await accountServices.wxMiniAppUserLoginFromScan({
+ // uId: uuid,
+ // userName: wxIndentityRes.userName,
+ // openId: wxIndentityRes.openId,
+ // });
+ // this.loginSuccess(res);
+ // return res;
+ // } catch (error) {}
},
async wxMiniAppPhoneAuthLoginFromScan(
@@ -177,18 +174,18 @@
wxIndentityRes: API.WxMiniAppIndentityInfo,
uuid: string
) {
- try {
- let res = await accountServices.wxMiniAppPhoneAuthLoginFromScan({
- uId: uuid,
- openId: wxIndentityRes.openId,
- sessionKey: wxIndentityRes.sessionKey,
- encryptedData: detail.encryptedData,
- iv: detail.iv,
- wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
- });
- this.loginSuccess(res);
- return res;
- } catch (error) {}
+ // try {
+ // let res = await accountServices.wxMiniAppPhoneAuthLoginFromScan({
+ // uId: uuid,
+ // openId: wxIndentityRes.openId,
+ // sessionKey: wxIndentityRes.sessionKey,
+ // encryptedData: detail.encryptedData,
+ // iv: detail.iv,
+ // wxMiniApp: WxMiniAppEnum.C绔皬绋嬪簭,
+ // });
+ // this.loginSuccess(res);
+ // return res;
+ // } catch (error) {}
},
async getCurrentUserInfo() {
@@ -213,8 +210,11 @@
},
setUserInfoAction(info: API.LoginCommandCallback) {
- this.userInfo = info;
- setUserInfo(info);
+ this.userInfo = {
+ ...this.userInfo,
+ ...info,
+ };
+ setUserInfo(this.userInfo);
},
setUserDetail(detail: API.UserInfoV2) {
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
index 1106bdf..76dae2c 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
@@ -1,7 +1,7 @@
<template>
<ContentView>
<nut-noticebar
- :text="`涓汉绠�鍘嗗凡瀹屽杽${userResumeInfo?.completeRate ?? 0}锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜嘸"
+ :text="`涓汉绠�鍘嗗凡瀹屽杽${userResumeInfo?.completeRate ?? 0}%锛屽畬鍠勭畝鍘嗗彲鎻愬崌褰曠敤鐜嘸"
:left-icon="false"
background="transparent"
close-mode
@@ -139,11 +139,11 @@
}
});
+const { userResumeInfo, refetch } = useUserResume();
+
const jobTag = computed(
() => userResumeInfo?.value?.userExpectJobs?.map((x) => x.expectJobContent) ?? []
);
-
-const { userResumeInfo, refetch } = useUserResume();
function goPage(routeName: string) {
Taro.navigateTo({
diff --git a/packages/constants/enum.ts b/packages/constants/enum.ts
index 5230345..511e684 100644
--- a/packages/constants/enum.ts
+++ b/packages/constants/enum.ts
@@ -79,17 +79,6 @@
UserCertificationBankCardCertification = 910,
}
-export enum WxMiniAppEnum {
- /**
- * C绔皬绋嬪簭
- */
- C绔皬绋嬪簭 = 10,
- /**
- * 浜哄崟鍚堜竴灏忕▼搴�
- */
- 浜哄崟鍚堜竴 = 20,
-}
-
/**
* @description AuthType鍗冲皢浣滃簾 鐜板湪鐢‥nterpriseType 鐩墠涓や釜鍊肩浉鍚�
*/
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 016c735..de548bf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -240,8 +240,8 @@
specifier: ^6.11.1
version: 6.11.1
senin-mini:
- specifier: ^1.0.10
- version: 1.0.10(@nutui/icons-vue-taro@0.0.9)(@nutui/nutui-taro@4.3.13)(@tanstack/vue-query@4.35.3)(@tarojs/components@3.6.20)(@tarojs/taro@3.6.20)(axios@1.4.0)(dayjs@1.11.6)(lodash@4.17.21)(vue@3.5.12)
+ specifier: ^1.0.12
+ version: 1.0.12(@nutui/icons-vue-taro@0.0.9)(@nutui/nutui-taro@4.3.13)(@tanstack/vue-query@4.35.3)(@tarojs/components@3.6.20)(@tarojs/taro@3.6.20)(axios@1.4.0)(dayjs@1.11.6)(lodash@4.17.21)(vue@3.5.12)
senior-request:
specifier: ^1.0.3
version: 1.0.3(axios@1.4.0)
@@ -502,8 +502,8 @@
specifier: ^6.11.1
version: 6.11.1
senin-mini:
- specifier: ^1.0.10
- version: 1.0.10(@nutui/icons-vue-taro@0.0.9)(@nutui/nutui-taro@4.3.13)(@tanstack/vue-query@4.35.3)(@tarojs/components@3.6.20)(@tarojs/taro@3.6.20)(axios@1.4.0)(dayjs@1.11.6)(lodash@4.17.21)(vue@3.5.12)
+ specifier: ^1.0.12
+ version: 1.0.12(@nutui/icons-vue-taro@0.0.9)(@nutui/nutui-taro@4.3.13)(@tanstack/vue-query@4.35.3)(@tarojs/components@3.6.20)(@tarojs/taro@3.6.20)(axios@1.4.0)(dayjs@1.11.6)(lodash@4.17.21)(vue@3.5.12)
senior-request:
specifier: ^1.0.3
version: 1.0.3(axios@1.4.0)
@@ -18506,8 +18506,8 @@
- supports-color
dev: true
- /senin-mini@1.0.10(@nutui/icons-vue-taro@0.0.9)(@nutui/nutui-taro@4.3.13)(@tanstack/vue-query@4.35.3)(@tarojs/components@3.6.20)(@tarojs/taro@3.6.20)(axios@1.4.0)(dayjs@1.11.6)(lodash@4.17.21)(vue@3.5.12):
- resolution: {integrity: sha512-iGA/p2p1EWU/4R9nmPBkj09wFoBupVaxJReFNRdHovydU4qt0OR3x5pLqI2TGsg+Bn2rvgp4aMCy9Ksb8rhzfw==}
+ /senin-mini@1.0.12(@nutui/icons-vue-taro@0.0.9)(@nutui/nutui-taro@4.3.13)(@tanstack/vue-query@4.35.3)(@tarojs/components@3.6.20)(@tarojs/taro@3.6.20)(axios@1.4.0)(dayjs@1.11.6)(lodash@4.17.21)(vue@3.5.12):
+ resolution: {integrity: sha512-rTRaoP+SCF75NRLuGZkBGIIQOrA38ONbMygvulgJJI+YhhW8zaNqucGO9gPHWcRkCVrhYoug4XzQlFZ7hSQdjw==}
peerDependencies:
'@nutui/icons-vue-taro': '*'
'@nutui/nutui-taro': '*'
--
Gitblit v1.9.1