From 3fe52d6b9fdd2eb2176474a8db5857372b8b5045 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 14 九月 2023 10:55:39 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 6 +++++-
vue.config.js | 3 +--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c503c02..7ae279c 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -810,7 +810,11 @@
rowfeeItemTypes: [],
//璐圭敤璇存槑
+<<<<<<< Updated upstream
feeBlocks: [],
+=======
+ feeBlockList: [],
+>>>>>>> Stashed changes
fundflowList: [],
// 闅忔満鏁�
@@ -1875,7 +1879,7 @@
//鍚堣璐圭敤
selectamount(row) {
- this.rowfeeblocks.forEach((item, i) => {
+ this.feeBlockList.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
}
diff --git a/vue.config.js b/vue.config.js
index 56e234a..6c60fdb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,7 @@
[process.env.VUE_APP_BASE_API]: {
target:`http://localhost:8080`,
// target:`http://116.62.18.175:8080`,
- // target:`http://192.168.2.8:8086`,
- // target: `https://slb.hospitalstar.com:9093`,
+ // target:`https://slb.hospitalstar.com:9093`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3