From a3e1da45f265bb7593fb585b114a268a104c5d8a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 15 十月 2025 19:12:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-login'
---
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 1
packages/components/src/Card/TaskCard.vue | 1
apps/cMiniApp/auto-imports.d.ts | 2
apps/cMiniApp/src/subpackages/login/authorization/authorization.vue | 9 ++-
packages/utils/LoggerRecord/index.ts | 2
apps/cMiniApp/project.config.json | 11 ++-
apps/cMiniApp/src/constants/app.ts | 1
apps/cMiniApp/.eslintrc-auto-import.json | 3
apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue | 1
apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue | 6 -
apps/cMiniApp/project.private.config.json | 114 +++++++------------------------------
apps/cMiniApp/src/components/Uploader/Uploader.vue | 6 ++
12 files changed, 53 insertions(+), 104 deletions(-)
diff --git a/apps/cMiniApp/.eslintrc-auto-import.json b/apps/cMiniApp/.eslintrc-auto-import.json
index 7d2e0af..3901e8e 100644
--- a/apps/cMiniApp/.eslintrc-auto-import.json
+++ b/apps/cMiniApp/.eslintrc-auto-import.json
@@ -109,6 +109,7 @@
"APP_ENV": true,
"DirectiveBinding": true,
"MaybeRef": true,
- "MaybeRefOrGetter": true
+ "MaybeRefOrGetter": true,
+ "NODE_ENV": true
}
}
diff --git a/apps/cMiniApp/auto-imports.d.ts b/apps/cMiniApp/auto-imports.d.ts
index 6ba5ad4..51dd167 100644
--- a/apps/cMiniApp/auto-imports.d.ts
+++ b/apps/cMiniApp/auto-imports.d.ts
@@ -9,6 +9,7 @@
const AppLocalConfig: typeof import('./src/constants/app')['AppLocalConfig']
const BackType: typeof import('./src/constants/enum')['BackType']
const EffectScope: typeof import('vue')['EffectScope']
+ const NODE_ENV: typeof import('./src/constants/app')['NODE_ENV']
const OssAssets: typeof import('./src/constants/img')['OssAssets']
const RouterPath: typeof import('./src/constants/router')['RouterPath']
const TabBarPageRouter: typeof import('./src/constants/tabBar')['TabBarPageRouter']
@@ -124,6 +125,7 @@
readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']>
readonly BackType: UnwrapRef<typeof import('./src/constants/enum')['BackType']>
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+ readonly NODE_ENV: UnwrapRef<typeof import('./src/constants/app')['NODE_ENV']>
readonly OssAssets: UnwrapRef<typeof import('./src/constants/img')['OssAssets']>
readonly RouterPath: UnwrapRef<typeof import('./src/constants/router')['RouterPath']>
readonly TabBarPageRouter: UnwrapRef<typeof import('./src/constants/tabBar')['TabBarPageRouter']>
diff --git a/apps/cMiniApp/project.config.json b/apps/cMiniApp/project.config.json
index cc53dd5..a7a541b 100644
--- a/apps/cMiniApp/project.config.json
+++ b/apps/cMiniApp/project.config.json
@@ -37,7 +37,11 @@
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true,
- "condition": false
+ "condition": false,
+ "compileWorklet": false,
+ "localPlugins": false,
+ "swc": false,
+ "disableSWC": true
},
"compileType": "miniprogram",
"editorSetting": {
@@ -46,10 +50,11 @@
},
"srcMiniprogramRoot": "dist/",
"condition": {},
- "libVersion": "3.1.0",
+ "libVersion": "3.10.0",
"packOptions": {
"ignore": [],
"include": []
},
- "appid": "wxb9e0baf4f87aa0de"
+ "appid": "wxb9e0baf4f87aa0de",
+ "simulatorPluginLibVersion": {}
}
\ No newline at end of file
diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index 61a4ebe..cafa2cd 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -1,93 +1,25 @@
{
- "description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "projectname": "cMiniApp",
- "setting": {
- "compileHotReLoad": true,
- "bigPackageSizeSupport": true,
- "urlCheck": false
- },
- "condition": {
- "miniprogram": {
- "list": [
- {
- "name": "瀹炲悕璁よ瘉",
- "pathName": "subpackages/authentication/authenticationRealName/authenticationRealName",
- "query": "type=realName",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鎴戠殑绠�鍘�",
- "pathName": "subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鍏徃璇︽儏",
- "pathName": "subpackages/task/companyDetail/companyDetail",
- "query": "id=f775538f-985c-4d51-7985-08ddd5c71bbf",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "浠诲姟璇︽儏",
- "pathName": "subpackages/task/taskDetail/taskDetail",
- "query": "id=04c75425-e783-4dbf-0f16-08ddd626b756",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鍩庡競閫夋嫨",
- "pathName": "subpackages/city/citySelect/citySelect",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鏈熸湜宀椾綅",
- "pathName": "subpackages/curriculum/expectPosition/expectPosition",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鎴戠殑绠�鍘�",
- "pathName": "subpackages/curriculum/mineCurriculumVitae/mineCurriculumVitae",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "姹傝亴鎰忓悜",
- "pathName": "subpackages/curriculum/mineJobIntention/mineJobIntention",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "楠屾敹璇︽儏",
- "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
- "query": "id=57a8f533-2a46-7a88-e008-3a1775810dd2",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鎻愪氦楠屾敹",
- "pathName": "subpackages/task/taskSubmitCheck/taskSubmitCheck",
- "query": "id=57a8f533-2a46-7a88-e008-3a1775810dd2",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "浠诲姟",
- "pathName": "pages/task/task",
- "query": "",
- "launchMode": "default",
- "scene": null
- }
- ]
- }
- },
- "libVersion": "3.10.0"
+ "description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+ "projectname": "cMiniApp",
+ "setting": {
+ "compileHotReLoad": true,
+ "bigPackageSizeSupport": true,
+ "urlCheck": false,
+ "coverView": true,
+ "lazyloadPlaceholderEnable": false,
+ "skylineRenderEnable": false,
+ "preloadBackgroundData": false,
+ "autoAudits": false,
+ "useApiHook": true,
+ "useApiHostProcess": true,
+ "showShadowRootInWxmlPanel": true,
+ "useStaticServer": false,
+ "useLanDebug": false,
+ "showES6CompileOption": false,
+ "checkInvalidKey": true,
+ "ignoreDevUnusedFiles": true,
+ "useIsolateContext": true
+ },
+ "condition": {},
+ "libVersion": "3.10.0"
}
\ No newline at end of file
diff --git a/apps/cMiniApp/src/components/Uploader/Uploader.vue b/apps/cMiniApp/src/components/Uploader/Uploader.vue
index b916f87..037f540 100644
--- a/apps/cMiniApp/src/components/Uploader/Uploader.vue
+++ b/apps/cMiniApp/src/components/Uploader/Uploader.vue
@@ -4,6 +4,7 @@
v-model:file-list="innerFileList"
multiple
:media-type="['image']"
+ :sourceType="sourceType"
:before-xhr-upload="beforeXhrUpload"
@failure="handleFailure"
:maximize="maximize"
@@ -23,6 +24,7 @@
v-model:file-list="innerFileList"
multiple
:media-type="['image']"
+ :sourceType="sourceType"
:before-xhr-upload="beforeXhrUpload"
@failure="handleFailure"
:maximize="maximize"
@@ -47,14 +49,18 @@
name: 'Uploader',
});
+type SourceType = 'album' | 'camera';
+
type Props = {
fileList: FileItem[];
onMySuccess?: (file: FileItem) => any;
limitFileSize?: number;
+ sourceType?: SourceType[];
};
const props = withDefaults(defineProps<Props>(), {
limitFileSize: 2,
+ sourceType: () => ['album', 'camera'],
});
const emit = defineEmits<{
diff --git a/apps/cMiniApp/src/constants/app.ts b/apps/cMiniApp/src/constants/app.ts
index fb95289..6e317b5 100644
--- a/apps/cMiniApp/src/constants/app.ts
+++ b/apps/cMiniApp/src/constants/app.ts
@@ -6,3 +6,4 @@
};
export const APP_ENV = process.env.APP_ENV;
+export const NODE_ENV = process.env.NODE_ENV;
diff --git a/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue b/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
index 691b1f8..e83d1d0 100644
--- a/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
+++ b/apps/cMiniApp/src/subpackages/login/authorization/authorization.vue
@@ -25,7 +25,8 @@
v-model="state.policyChecked"
policyBtnText="鑻ユ墜鏈哄彿鏈敞鍐岋紝灏嗕负鎮ㄧ洿鎺ユ敞鍐岃处鍙凤紝娉ㄥ唽鍗充负鍚屾剰"
/>
- <div class="other-login-channel-wrapper" v-if="!isLoginByWeb">
+ <!-- <div class="other-login-channel-wrapper" v-if="!isLoginByWeb"> -->
+ <div class="other-login-channel-wrapper" v-if="NODE_ENV === 'development'">
<nut-divider>鍏朵粬鐧诲綍鏂瑰紡</nut-divider>
<div class="other-login-channel-list">
<div class="other-login-channel-list-item" @click="goLoginByForm()">
@@ -34,7 +35,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 +43,7 @@
<img :src="IconPassword" />
</div>
<div class="other-login-channel-list-item-text">璐︽埛鐧诲綍</div>
- </div> -->
+ </div>
</div>
</div>
</LoginPageLayout>
@@ -61,6 +62,8 @@
import IconPassword from '@/assets/login/icon-btn-password.png';
import { LoginFormTabs } from '../constants';
import * as authServices from '@12333/services/apiV2/auth';
+import { NODE_ENV } from '@/constants';
+console.log('NODE_ENV: ', NODE_ENV);
defineOptions({
name: 'authorization',
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index 76a83fc..20a4423 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -37,6 +37,7 @@
</div> -->
</div>
<TaskPrice
+ v-if="detail.releaseStatus !== EnumTaskReleaseStatus.Stopped"
:value="toThousand(detail.serviceFee ?? 0)"
:unit="BillingMethodEnumUnit[detail.billingMethod]"
/>
diff --git a/apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
index f4853a2..06f4438 100644
--- a/apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskSubmitCheck/InnerPage.vue
@@ -7,6 +7,7 @@
:maximum="9"
:limitFileSize="10"
class="bole-uploader nopaddingtop"
+ :sourceType="['camera']"
>
</Uploader>
</nut-form-item>
diff --git a/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
index 2e85da4..13983cb 100644
--- a/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
@@ -24,11 +24,7 @@
name: 'InnerPage',
});
-const { userDetail } = useUser();
-
-const isBindBank = computed(() =>
- userDetail.value?.bankCardAAccesses?.find(() => EnumUserBankCardAccess.Bank)
-);
+const { userDetail, isBindBank } = useUser();
function goIncomeDetail() {
Taro.navigateTo({
diff --git a/packages/components/src/Card/TaskCard.vue b/packages/components/src/Card/TaskCard.vue
index b983916..4f071a2 100644
--- a/packages/components/src/Card/TaskCard.vue
+++ b/packages/components/src/Card/TaskCard.vue
@@ -4,6 +4,7 @@
<div class="task-card-title">{{ name }}</div>
<slot name="title-right">
<TaskPrice
+ v-if="releaseStatus !== EnumTaskReleaseStatus.Stopped"
:value="toThousand(serviceFee ?? 0)"
:unit="BillingMethodEnumUnit[billingMethod]"
/>
diff --git a/packages/utils/LoggerRecord/index.ts b/packages/utils/LoggerRecord/index.ts
index 365fba0..b3552b9 100644
--- a/packages/utils/LoggerRecord/index.ts
+++ b/packages/utils/LoggerRecord/index.ts
@@ -69,6 +69,6 @@
};
},
getPageUrl() {
- return Taro.getCurrentInstance().router.path;
+ return Taro.getCurrentInstance()?.router?.path ?? '';
},
});
--
Gitblit v1.9.1