From 871132b30521ddaeddc92e064b661b7c30481c87 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 23 十月 2025 18:36:18 +0800
Subject: [PATCH] fix: bug
---
apps/cMiniApp/src/subpackages/mine/setting/setting.vue | 2
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue | 7 ++
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 23 ++++++-
apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue | 12 ++--
apps/cMiniApp/src/components/Button/CustomerServiceButton.vue | 42 ++++++++++++++
apps/cMiniApp/src/pages/mine/index.vue | 2
apps/bMiniApp/project.private.config.json | 37 +----------
7 files changed, 80 insertions(+), 45 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 4316853..0e6bce7 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -17,45 +17,18 @@
"showES6CompileOption": false,
"checkInvalidKey": true,
"ignoreDevUnusedFiles": true,
- "useIsolateContext": true
+ "useIsolateContext": true,
+ "skylineRenderEnable": false
},
"condition": {
"miniprogram": {
"list": [
{
- "name": "鍙戣柂淇敼",
- "pathName": "subpackages/payrollManage/payrollChange/payrollChange",
- "query": "orderRosterId=5262960e-a190-4419-9943-08de11389ea2&settleId=225c2ed0-aefc-43aa-ff08-08de11385920&operatorToken=04e6c650-4240-4fc4-8ae6-7e96231780b2",
- "launchMode": "default",
- "scene": null
- },
- {
"name": "鍙戣柂璇︽儏",
"pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
- "query": "id=225c2ed0-aefc-43aa-ff08-08de11385920&operatorToken=5b571348-e388-4ce1-b718-baa0257184de",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "楠屾敹璇︽儏",
- "pathName": "subpackages/task/taskCheckDetail/taskCheckDetail",
- "query": "id=d1061ab6-9431-49cd-8840-08de0f9d7fb0&date=2025-10-22&checkReceiveStatus=20",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "鍙戝竷浠诲姟",
- "pathName": "subpackages/task/publishTask/publishTask",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "楠屾敹绠＄悊",
- "pathName": "subpackages/task/taskCheck/taskCheck",
- "query": "",
- "launchMode": "default",
- "scene": null
+ "query": "id=ed553142-801d-40b4-5582-08de0fa2a04b&operatorToken=627f56a2-d8a2-4606-b69f-36eadf770ecb",
+ "scene": null,
+ "launchMode": "default"
}
]
}
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
index f431f7a..f5dcca0 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollChange/InnerPage.vue
@@ -185,15 +185,15 @@
let params: API.EditTaskSettlementOrderRosterCommand = {
id: orderRosterId,
settlementAmount: settlementAmount.value,
- actualSettlementAmount: form.actualSettlementAmount,
+ actualSettlementAmount: Number(form.actualSettlementAmount),
receiveAccount: form.receiveAccount,
bank: form.bank,
// totalWorkHours: editForm.totalWorkHours,
// bankBranch: editForm.bankBranch,
- serviceFee: form.serviceFee,
- timeoutHours: form.timeoutHours,
- timeoutFee: form.timeoutFee,
- otherFee: form.otherFee,
+ serviceFee: Number(form.serviceFee),
+ timeoutHours: Number(form.timeoutHours),
+ timeoutFee: Number(form.timeoutFee),
+ otherFee: Number(form.otherFee),
remark: form.remark,
};
// try {
@@ -221,8 +221,8 @@
// eventChannel.emit('update');
// }
// } catch (error) {}
- goBack();
eventChannel.emit('update', params);
+ goBack();
}
</script>
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 8cf6247..95f4321 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
@@ -121,6 +121,10 @@
settlementTaskUsers: [] as API.GetSettlementTaskUsersQueryResultItem[],
});
+const state = reactive({
+ isLoaded: false,
+});
+
const {
isLoading,
isError,
@@ -150,7 +154,10 @@
},
placeholderData: () => ({} as API.GetSettlementTaskUsersQueryResult),
onSuccess(res) {
- form.settlementTaskUsers = res?.data ?? [];
+ if (!state.isLoaded) {
+ form.settlementTaskUsers = res?.data ?? [];
+ state.isLoaded = true;
+ }
},
});
@@ -212,10 +219,16 @@
// refetch();
form.settlementTaskUsers = form.settlementTaskUsers.map((item) => {
if (item.id == params.id) {
- return {
- ...item,
- ...params,
- };
+ item.settlementAmount = params.settlementAmount;
+ item.actualSettlementAmount = params.actualSettlementAmount;
+ item.receiveAccount = params.receiveAccount;
+ item.bank = params.bank;
+ item.serviceFee = params.serviceFee;
+ item.timeoutHours = params.timeoutHours;
+ item.timeoutFee = params.timeoutFee;
+ item.otherFee = params.otherFee;
+ item.remark = params.remark;
+ return item;
}
return item;
});
diff --git a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
index 2c69071..cb1513b 100644
--- a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
@@ -36,7 +36,11 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
import { useInfiniteLoading } from '@12333/hooks';
-import { EnumTaskUserArrangeStatus, EnumPagedListOrder } from '@12333/constants';
+import {
+ EnumTaskUserArrangeStatus,
+ EnumPagedListOrder,
+ EnumGetArrangeTaskUsersQueryApplyStatus,
+} from '@12333/constants';
import * as taskUserServices from '@12333/services/apiV2/taskUser';
import _ from 'lodash';
import { Message, trim } from '@12333/utils';
@@ -67,6 +71,7 @@
let params: API.GetArrangeTaskUsersQuery = {
keywords: queryState.keywords,
arrangeStatus: status,
+ applyStatus: EnumGetArrangeTaskUsersQueryApplyStatus.Completed,
id: id,
pageModel: {
rows: 20,
diff --git a/apps/cMiniApp/src/components/Button/CustomerServiceButton.vue b/apps/cMiniApp/src/components/Button/CustomerServiceButton.vue
new file mode 100644
index 0000000..7069bce
--- /dev/null
+++ b/apps/cMiniApp/src/components/Button/CustomerServiceButton.vue
@@ -0,0 +1,42 @@
+<template>
+ <button class="customer-service-btn-wrapper" :open-type="'contact'">
+ <!-- <img class="back-top-img" :src="IconBackTop" /> -->
+ <Service size="22" color="#333" />
+ <!-- <div class="customer-service-btn-text">瀹㈡湇</div> -->
+ </button>
+</template>
+
+<script setup lang="ts">
+import { Service } from '@nutui/icons-vue-taro';
+
+defineOptions({
+ name: 'CustomerServiceButton',
+});
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+
+.customer-service-btn-wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 92px;
+ height: 92px;
+ border-radius: 50%;
+ background-color: #fff;
+ box-shadow: 0px 0px 28px 0px rgba(0, 0, 0, 0.18);
+ font-size: 24px;
+ position: fixed;
+ right: boleGetCssVar('size', 'body-padding-h');
+ bottom: 390px;
+
+ .customer-service-btn-text {
+ font-weight: 400;
+ font-size: 16px;
+ color: boleGetCssVar('text-color', 'regular');
+ line-height: 22px;
+ text-align: center;
+ }
+}
+</style>
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index bfa6d83..7fc1b01 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -142,6 +142,7 @@
<!-- <ListItem :icon="IconRecruit" title="鎴戣鎷涗汉/鐢ㄤ汉" @click="goSetting"></ListItem> -->
</List>
</ContentScrollView>
+ <CustomerServiceButton />
</PageLayoutWithBg>
</template>
@@ -170,6 +171,7 @@
import { toThousand } from '@12333/utils';
import { useIntervalFn } from 'senin-mini/hooks';
import { useQuery } from '@tanstack/vue-query';
+import CustomerServiceButton from '@/components/Button/CustomerServiceButton.vue';
const { userDetail, isCertified, updateUserInfo } = useUser();
const isLogin = useIsLogin();
diff --git a/apps/cMiniApp/src/subpackages/mine/setting/setting.vue b/apps/cMiniApp/src/subpackages/mine/setting/setting.vue
index 4ac4eb4..0bf35f9 100644
--- a/apps/cMiniApp/src/subpackages/mine/setting/setting.vue
+++ b/apps/cMiniApp/src/subpackages/mine/setting/setting.vue
@@ -12,7 +12,7 @@
<ListItem title="闅愮鏀跨瓥" @click="goPrivacyPolicy"></ListItem>
<ListItem title="閫�鍑虹櫥褰�" @click="handleLoginout"></ListItem>
<!-- <ListItem title="浜哄伐瀹㈡湇" @click="goMineService"></ListItem> -->
- <nut-button :open-type="'contact'" class="setting-page-service">浜哄伐瀹㈡湇</nut-button>
+ <!-- <nut-button :open-type="'contact'" class="setting-page-service">浜哄伐瀹㈡湇</nut-button> -->
</List>
</PageLayout>
</template>
--
Gitblit v1.9.1