From 98bcc6ad603cc7281f3410ed61ebdf29465591b8 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 16:29:07 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1
---
apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue | 2
apps/bMiniApp/src/hooks/router.ts | 5 ++
packages/constants/enterpriseWallet.ts | 11 +++++
packages/constants/index.ts | 1
packages/utils/LoggerRecord/index.ts | 8 +++-
apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue | 5 +-
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 20 ++++++++++
package.json | 1
packages/components/src/Input/ChooseInputWithPicker.vue | 5 ++
apps/bMiniApp/project.private.config.json | 14 +++---
10 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index ae82573..dfc4842 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -23,6 +23,13 @@
"miniprogram": {
"list": [
{
+ "name": "鍙戝竷浠诲姟",
+ "pathName": "subpackages/task/publishTask/publishTask",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
"name": "楠屾敹绠＄悊",
"pathName": "subpackages/task/taskCheck/taskCheck",
"query": "",
@@ -33,13 +40,6 @@
"name": "楠屾敹璇︽儏",
"pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
"query": "id=927b9898-1e9f-4aec-99aa-08ddf4e125c9&date=2025-10-19&checkReceiveStatus=10",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "",
- "pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
- "query": "id=22201b25-b058-4774-808c-08de0d1eb0de&operatorToken=47358a9a-02a0-41ef-8da1-0366266af084",
"launchMode": "default",
"scene": null
}
diff --git a/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue b/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue
index c88b01a..cc5a2dc 100644
--- a/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue
+++ b/apps/bMiniApp/src/components/JobDetailContent/components/curriculumView.vue
@@ -78,7 +78,7 @@
>
<nut-grid-item v-for="(item, index) in _videos" :key="item" class="pro-img-grid-item">
<div class="pro-img-grid-img-item">
- <Video class="pro-img-grid-img" :src="item" />
+ <video class="pro-img-grid-img" :src="item" />
</div>
</nut-grid-item>
</nut-grid>
diff --git a/apps/bMiniApp/src/hooks/router.ts b/apps/bMiniApp/src/hooks/router.ts
index 59447e7..a0ac30f 100644
--- a/apps/bMiniApp/src/hooks/router.ts
+++ b/apps/bMiniApp/src/hooks/router.ts
@@ -1,6 +1,7 @@
import Taro from '@tarojs/taro';
import { TabBarPageRouter } from '@/constants';
import { useSystemStore } from '@/stores/modules/system';
+import { httpLoggerRecord } from '@12333/utils';
export function useSwitchTab() {
const systemStore = useSystemStore();
@@ -10,6 +11,10 @@
console.log('index: ', index);
systemStore.setTabIndex(index);
Taro.switchTab(option);
+ httpLoggerRecord.info({
+ message: `[switchTab]`,
+ args: [option, { index, TabBarPageRouter }],
+ });
};
return switchTab;
}
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index 985ea7b..a29def6 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -242,6 +242,20 @@
>
</nut-radio-group>
</nut-form-item>
+ <nut-form-item
+ label="缁撶畻鏂瑰紡:"
+ class="bole-form-item"
+ prop="settlementAccess"
+ label-width="90px"
+ required
+ >
+ <ChooseInputWithPicker
+ v-model="form.settlementAccess"
+ placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+ :value-enum="EnumEnterpriseWalletAccessText"
+ :disabled="isEdit"
+ />
+ </nut-form-item>
</nut-form>
</ContentScrollView>
<PageFooter>
@@ -266,6 +280,8 @@
EnumSettlementCycleDateMonthArray,
EnumTaskCheckReceiveMethod,
EnumTaskCheckReceiveMethodText,
+ EnumEnterpriseWalletAccess,
+ EnumEnterpriseWalletAccessText,
} from '@12333/constants';
import {
ChooseInputWithPicker,
@@ -338,12 +354,14 @@
checkReceiveMethod: EnumTaskCheckReceiveMethod.CheckIn,
applyBeginTime: '',
applyEndTime: '',
+ settlementAccess: '' as any as EnumEnterpriseWalletAccess,
});
const rules = reactive<FormRules>({
name: [{ required: true, message: '璇疯緭鍏ヤ换鍔″悕绉�' }],
genderLimit: [{ required: true, message: '璇烽�夋嫨鎬у埆瑕佹眰' }],
settlementCycleDate: [{ required: true, message: '璇疯缃粨绠楁棩鏈�' }],
+ settlementAccess: [{ required: true, message: '璇烽�夋嫨缁撶畻鏂瑰紡' }],
// addressDetail: [{ required: true, message: '璇疯緭鍏ヨ缁嗗湴鍧�' }],
billingMethod: [
{
@@ -449,6 +467,7 @@
form.checkReceiveMethod = data.checkReceiveMethod;
form.applyBeginTime = dayjs(data.applyBeginTime).format('YYYY-MM-DD');
form.applyEndTime = dayjs(data.applyEndTime).format('YYYY-MM-DD');
+ form.settlementAccess = data.settlementAccess;
},
});
@@ -489,6 +508,7 @@
checkReceiveMethod: form.checkReceiveMethod,
applyBeginTime: dayjs(form.applyBeginTime).format('YYYY-MM-DD 00:00:00'),
applyEndTime: dayjs(form.applyEndTime).format('YYYY-MM-DD 23:59:59'),
+ settlementAccess: form.settlementAccess,
};
if (isEdit) {
params.id = taskId;
diff --git a/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue
index f6496d5..aa5d778 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue
@@ -32,7 +32,7 @@
:media-type="['video']"
>
<template #item="{ item }">
- <Video class="editor-video" :src="item.url" />
+ <video class="editor-video" :src="item.url" />
</template>
<template #upload-icon>
<UploaderIcon color="#808080" />
@@ -40,7 +40,7 @@
</Uploader>
<div class="video-demo">
<div class="video-demo-title">瑙嗛妯℃澘</div>
- <Video class="editor-video" :src="OssAssets.mine.UseResumeVideo" />
+ <video class="editor-video" :src="OssAssets.mine.UseResumeVideo" />
</div>
</nut-form-item>
</nut-form>
@@ -59,7 +59,6 @@
import { FileItem } from '@nutui/nutui-taro/dist/types/__VUE/uploader/type';
import { useQuery } from '@tanstack/vue-query';
import { Uploader as UploaderIcon } from '@nutui/icons-vue-taro';
-import { Video } from '@tarojs/components';
import { OssAssets } from '@/constants';
defineOptions({
diff --git a/package.json b/package.json
index ebea04e..6cdbe10 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
"postcss-html": "1.5.0",
"prettier": "^2.7.1",
"release-it": "^17.6.0",
+ "rimraf": "^6.0.1",
"stylelint": "^14.15.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-prettier": "^9.0.4",
diff --git a/packages/components/src/Input/ChooseInputWithPicker.vue b/packages/components/src/Input/ChooseInputWithPicker.vue
index 1d07b64..90c72c8 100644
--- a/packages/components/src/Input/ChooseInputWithPicker.vue
+++ b/packages/components/src/Input/ChooseInputWithPicker.vue
@@ -18,11 +18,13 @@
enumValueKey?: string;
valueEnum?: ValueEnum;
modelValue: string | number;
+ disabled?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
enumLabelKey: 'label',
enumValueKey: 'value',
+ disabled: false,
});
const emit = defineEmits<{
@@ -38,6 +40,9 @@
);
function handleOpen() {
+ if (props.disabled) {
+ return;
+ }
const _modelValue = [props.modelValue];
Portal.add((key) => {
return h(
diff --git a/packages/constants/enterpriseWallet.ts b/packages/constants/enterpriseWallet.ts
new file mode 100644
index 0000000..0bf7b97
--- /dev/null
+++ b/packages/constants/enterpriseWallet.ts
@@ -0,0 +1,11 @@
+import { EnumEnterpriseWalletAccess } from './apiEnum';
+
+export const EnumEnterpriseWalletAccessTextOnlyAlipay = {
+ [EnumEnterpriseWalletAccess.Alipay]: '鏀粯瀹�',
+};
+
+export const EnumEnterpriseWalletAccessText = {
+ [EnumEnterpriseWalletAccess.Alipay]: '鏀粯瀹�',
+ [EnumEnterpriseWalletAccess.PingAnPay]: '骞冲畨閾惰',
+ [EnumEnterpriseWalletAccess.WeChatPay]: '寰俊',
+};
diff --git a/packages/constants/index.ts b/packages/constants/index.ts
index 29e7321..5de30ac 100644
--- a/packages/constants/index.ts
+++ b/packages/constants/index.ts
@@ -14,3 +14,4 @@
export * from './task';
export * from './apiEnum';
export * from './enterpriseEmployee';
+export * from './enterpriseWallet';
diff --git a/packages/utils/LoggerRecord/index.ts b/packages/utils/LoggerRecord/index.ts
index b3552b9..ed5102c 100644
--- a/packages/utils/LoggerRecord/index.ts
+++ b/packages/utils/LoggerRecord/index.ts
@@ -55,7 +55,7 @@
}
}
-export const httpLoggerRecord = new HttpLoggerRecord({
+const Options: LoggerRecordOptions = {
moduleName: getUtilsConfig().appName,
enableStorage: true,
loggerStorageAdapter() {
@@ -71,4 +71,8 @@
getPageUrl() {
return Taro.getCurrentInstance()?.router?.path ?? '';
},
-});
+};
+
+export const defaultLoggerRecord = new LoggerRecord(Options);
+
+export const httpLoggerRecord = new HttpLoggerRecord(Options);
--
Gitblit v1.9.1