diff --git a/CHANGELOG.md b/CHANGELOG.md
index 267e769..5c6952b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
--|--|--
- | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
- | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d)
+ - | 插件样式调整 | [7411d3a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7411d3a)
- | 细节调整 | [ebf678f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf678f)
- | 细节调整 | [759ef52](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/759ef52)
- | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
diff --git a/apis/finance.js b/apis/finance.js
index 690124a..e0b0817 100644
--- a/apis/finance.js
+++ b/apis/finance.js
@@ -6,5 +6,5 @@ console.log('fullPath: ', fullPath);
export function setupFinance(app) {
uni.$u.api = { ...uni.$u.api } || {};
// 根据任务id获取财务条信息
- // uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${fullPath}/getByTask`, { taskDetailId });
+ uni.$u.api.getFinanceByTask = taskDetailId => uni.$u.post(`${fullPath}/getByTask`, { taskDetailId });
}
diff --git a/apis/mock.js b/apis/mock.js
index 5ac56fe..58e322c 100644
--- a/apis/mock.js
+++ b/apis/mock.js
@@ -7,21 +7,22 @@ export function setupMock(app) {
uni.$u.api = { ...uni.$u.api } || {};
// 删除交付物
- uni.$u.api.deleteDeliver = param => new Promise((resolve, reject) => {
- setTimeout(() => {
- resolve();
- }, 100);
- });
+ uni.$u.api.deleteDeliver = param =>
+ new Promise((resolve, reject) => {
+ setTimeout(() => {
+ resolve();
+ }, 100);
+ });
- uni.$u.api.getFinanceByTask = taskDetailId => new Promise((resolve, reject) => {
- setTimeout(() => {
- resolve({
- financeId: '123',
- budget: 1000 * 1000,
- bonus: 200 * 1000,
- projectExpend: 500 * 1000,
- dailyExpend: 500 * 1000,
- });
- }, 100);
- });
+ // uni.$u.api.getFinanceByTask = taskDetailId => new Promise((resolve, reject) => {
+ // setTimeout(() => {
+ // resolve({
+ // financeId: '123',
+ // budget: 1000 * 1000,
+ // bonus: 200 * 1000,
+ // projectExpend: 500 * 1000,
+ // dailyExpend: 500 * 1000,
+ // });
+ // }, 100);
+ // });
}
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index 5ef822d..37a58e5 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -1,6 +1,5 @@
-
@@ -19,10 +18,11 @@
-->
-
-
-
-
+
+
+
+
+
diff --git a/components/TimeLine/component/TimeBox.vue b/components/TimeLine/component/TimeBox.vue
index 6b7fdc6..a85c19a 100644
--- a/components/TimeLine/component/TimeBox.vue
+++ b/components/TimeLine/component/TimeBox.vue
@@ -29,16 +29,7 @@
-
+
@@ -57,8 +48,6 @@
-
diff --git a/plugins/p-finance/p-finance.vue b/plugins/p-finance/p-finance.vue
index b633bef..950fc76 100644
--- a/plugins/p-finance/p-finance.vue
+++ b/plugins/p-finance/p-finance.vue
@@ -37,8 +37,9 @@ const data = ref(null);
// 查询任务上的财务条数据
async function getFinanceByTaskData() {
try {
- const taskDetailId = task.taskDetailId;
- data.value = await uni.$u.api.getFinanceByTask(taskDetailId);
+ console.log('task: ', task);
+ const detailId = task.detailId;
+ data.value = await uni.$u.api.getFinanceByTask(detailId);
} catch (error) {
console.log('getFinanceByTaskData error: ', error);
}