From dea5820ad3ba037b674a750753755588bc25b56c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 13 八月 2025 14:46:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/app.config.ts | 1
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/InnerPage.vue | 61 ++++++++++++++++++++++++++++++
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.vue | 18 +++++++++
packages/components/src/Input/ChooseInputWithDatePicker.vue | 4 ++
apps/bMiniApp/src/pages/mine/index.vue | 10 ++++
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue | 6 +-
apps/bMiniApp/src/constants/router.ts | 1
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 16 +++++--
apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.config.ts | 3 +
9 files changed, 111 insertions(+), 9 deletions(-)
diff --git a/apps/bMiniApp/src/app.config.ts b/apps/bMiniApp/src/app.config.ts
index 8192a0b..5215387 100644
--- a/apps/bMiniApp/src/app.config.ts
+++ b/apps/bMiniApp/src/app.config.ts
@@ -72,6 +72,7 @@
'setting/setting',
'mineFavorites/mineFavorites',
'mineContactRecord/mineContactRecord',
+ 'mineFinanceManage/mineFinanceManage',
],
},
{
diff --git a/apps/bMiniApp/src/constants/router.ts b/apps/bMiniApp/src/constants/router.ts
index b559ec5..6af2f0a 100644
--- a/apps/bMiniApp/src/constants/router.ts
+++ b/apps/bMiniApp/src/constants/router.ts
@@ -33,6 +33,7 @@
setting = '/subpackages/mine/setting/setting',
mineFavorites = '/subpackages/mine/mineFavorites/mineFavorites',
mineContactRecord = '/subpackages/mine/mineContactRecord/mineContactRecord',
+ mineFinanceManage = '/subpackages/mine/mineFinanceManage/mineFinanceManage',
businessCard = '/subpackages/businessCard/businessCard/businessCard',
businessCardEdit = '/subpackages/businessCard/businessCardEdit/businessCardEdit',
diff --git a/apps/bMiniApp/src/pages/mine/index.vue b/apps/bMiniApp/src/pages/mine/index.vue
index eeabb24..66b072b 100644
--- a/apps/bMiniApp/src/pages/mine/index.vue
+++ b/apps/bMiniApp/src/pages/mine/index.vue
@@ -69,7 +69,11 @@
</div>
<Cell :title="'鏇村鏈嶅姟'" class="mine-content-service">
<div class="mine-content-service-list">
- <TaskDetailWelfareItem :icon="IconFinance" text="璐㈠姟绠＄悊"></TaskDetailWelfareItem>
+ <TaskDetailWelfareItem
+ :icon="IconFinance"
+ text="璐㈠姟绠＄悊"
+ @click="goFinance"
+ ></TaskDetailWelfareItem>
<TaskDetailWelfareItem
:icon="IconRealName"
text="浼佷笟瀹炲悕"
@@ -160,6 +164,10 @@
goPage(RouterPath.businessCard);
}
+function goFinance() {
+ goPage(RouterPath.mineFinanceManage);
+}
+
async function handleLoginout() {
try {
await Message.confirm({
diff --git a/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/InnerPage.vue
new file mode 100644
index 0000000..a522143
--- /dev/null
+++ b/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/InnerPage.vue
@@ -0,0 +1,61 @@
+<template>
+ <List>
+ <IncomeDetailListItem :item="'鏀跺叆:锟�600.00'">
+ <template #title>
+ <div class="mineFinanceManage-detail-time-picker">
+ <ChooseInputWithDatePicker
+ v-model="form.month"
+ type="year-month"
+ :max-date="nowDate"
+ ></ChooseInputWithDatePicker>
+ </div>
+ </template>
+ </IncomeDetailListItem>
+ <IncomeDetailListItem
+ :title="'鏀跺叆-瀹佹尝浜哄姏鏃犲咖'"
+ :item="'2024.12.20 13:30:30'"
+ :value="'+300.00'"
+ >
+ </IncomeDetailListItem>
+ </List>
+</template>
+
+<script setup lang="ts">
+import { List, IncomeDetailListItem, ChooseInputWithDatePicker } from '@12333/components';
+import { useUserStore } from '@/stores/modules/user';
+import Taro from '@tarojs/taro';
+import dayjs from 'dayjs';
+
+defineOptions({
+ name: 'InnerPage',
+});
+
+const userStore = useUserStore();
+const nowDate = dayjs().toDate();
+const form = reactive({
+ month: '2024-12',
+});
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+
+.mineFinanceManage-page-wrapper {
+ .mineFinanceManage-detail-time-picker {
+ .nut-input {
+ border-bottom: none;
+ padding: 0;
+
+ .input-text {
+ font-size: 20px;
+ font-weight: 500;
+ height: 28px;
+ }
+
+ .nut-input-right-box {
+ display: none;
+ }
+ }
+ }
+}
+</style>
diff --git a/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.config.ts b/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.vue b/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.vue
new file mode 100644
index 0000000..f5a7a55
--- /dev/null
+++ b/apps/bMiniApp/src/subpackages/mine/mineFinanceManage/mineFinanceManage.vue
@@ -0,0 +1,18 @@
+<template>
+ <PageLayout class="mineFinanceManage-page-wrapper" :title="'璐㈠姟绠＄悊'" developing>
+ <InnerPage></InnerPage>
+ </PageLayout>
+</template>
+
+<script setup lang="ts">
+import { PageLayout } from '@/components';
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+ name: 'mineFinanceManage',
+});
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+</style>
diff --git a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
index a64e6a6..9793c3d 100644
--- a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
@@ -44,13 +44,13 @@
const searchValue = ref('');
const router = Taro.useRouter();
const id = router.params?.id ?? '';
-const status = router.params?.status ?? '';
+const status = Number(router.params?.status);
const queryState = reactive({
keywords: '',
});
const showQueryState = computed(() => {
- return status === 'arrange';
+ return status === EnumTaskUserArrangeStatus.Wait;
});
const handleSearch = _.debounce(function () {
@@ -61,7 +61,7 @@
({ pageParam }) => {
let params: API.GetArrangeTaskUsersQuery = {
keywords: queryState.keywords,
- arrangeStatus: EnumTaskUserArrangeStatus.Wait,
+ arrangeStatus: status,
id: id,
pageModel: {
rows: 20,
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index 3b108ca..3a2e09d 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -31,7 +31,9 @@
mode="taskManage"
>
<template #footer-actions>
- <nut-button type="primary" @click.stop="goBatchTaskList(item, 'arrange')"
+ <nut-button
+ type="primary"
+ @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Wait)"
>浜哄憳瀹夋帓</nut-button
>
<nut-button
@@ -39,7 +41,7 @@
type="primary"
:color="Colors.Info"
class="dark-btn"
- @click.stop="goBatchTaskList(item, 'detail')"
+ @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Complete)"
>璇︽儏</nut-button
>
</template>
@@ -51,7 +53,12 @@
<script setup lang="ts">
import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components';
import Taro from '@tarojs/taro';
-import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants';
+import {
+ EnumTaskStatus,
+ BillingMethodEnumUnit,
+ Colors,
+ EnumTaskUserArrangeStatus,
+} from '@12333/constants';
import { useTaskList } from '@12333/hooks';
defineOptions({
@@ -77,8 +84,7 @@
});
}
-function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: string) {
- console.log('status: ', status);
+function goBatchTaskList(item: API.GetTaskInfosQueryResultItem, status: EnumTaskUserArrangeStatus) {
Taro.navigateTo({
url: `${RouterPath.batchTaskList}?id=${item.id}&status=${status}`,
});
diff --git a/packages/components/src/Input/ChooseInputWithDatePicker.vue b/packages/components/src/Input/ChooseInputWithDatePicker.vue
index 2e2bb17..ca4897c 100644
--- a/packages/components/src/Input/ChooseInputWithDatePicker.vue
+++ b/packages/components/src/Input/ChooseInputWithDatePicker.vue
@@ -16,6 +16,8 @@
type Props = {
modelValue: string | number;
minDate?: Date;
+ maxDate?: Date;
+ type?: string;
};
const props = withDefaults(defineProps<Props>(), {});
@@ -44,6 +46,8 @@
h(DatePicker, {
modelValue: _modelValue,
onCancel: onClose,
+ type: props.type,
+ maxDate: props.maxDate,
onConfirm: ({ selectedValue }) => {
emit('update:modelValue', dayjs(selectedValue.join('-')).format('YYYY-MM-DD'));
onClose();
--
Gitblit v1.9.1