From 84636066df765c1efddd9654df4b785d4acac3b0 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 24 Oct 2025 17:10:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E5=9B=BE=E7=89=87=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/bean/beanAudit.vue                    | 2 +-
 src/views/moneyManage/receiveDetail/receiveDetail.vue | 2 +-
 src/views/moneyManage/refundDetail/refundCharge.vue   | 4 +++-
 src/views/moneyManage/refundDetail/refundFinance.vue  | 4 +++-
 src/views/moneyManage/refundDetail/refundHeader.vue   | 3 ++-
 src/views/moneyManage/refundDetail/refundService.vue  | 4 +++-
 src/views/permissions/userPermission.vue              | 5 ++++-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index 3fd6aa8..50094b0 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="checkTab === 'pending' && (hasbeanWaitThough || hasbeanWaitReject)" fixed="right"
-        prop="operation" label="操作" width="400px">
+        prop="operation" label="操作" width="200px">
         <template #default="scope">
           <div class="operation">
 
diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue
index 155e035..563b62f 100644
--- a/src/views/moneyManage/receiveDetail/receiveDetail.vue
+++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue
@@ -1839,7 +1839,7 @@ onMounted(async function () {
         //撤回弹窗提示
         height: 392px;
         width: 700px;
-        background-image: url('/src/assets/收款明细撤回背景.png');
+        background-image: url('@/assets/收款明细撤回背景.png');
         position: fixed; // 固定定位，相对于浏览器窗口
         top: 50%; // 距离顶部50%
         left: 50%; // 距离左侧50%
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 56e3fcd..e916572 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -212,7 +212,7 @@
     </el-dialog>
 
     <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
+        backgroundImage: `url(${RefundChargeBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -303,6 +303,8 @@ const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 
+import RefundChargeBackground from '@/assets/images/背景图.png'
+
 const currentStep = ref(0)// 进度图
 const searchForm = ref({
     jwcode: '',
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 5fc6ab8..c31eb28 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -211,7 +211,7 @@
     </el-dialog>
 
     <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
+        backgroundImage: `url(${RefundFinanceBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -303,6 +303,8 @@ const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import { get } from 'lodash'
 
+import RefundFinanceBackground from '@/assets/images/背景图.png'
+
 const currentStep = ref(0)// 进度图
 const searchForm = ref({
     jwcode: '',
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 2c6fd66..7e48759 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -222,7 +222,7 @@
     </el-dialog>
 
     <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
+        backgroundImage: `url(${BackgroundSvg})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -302,6 +302,7 @@
     </el-dialog>
 </template>
 <script setup>
+import BackgroundSvg from '@/assets/images/背景图.png'
 import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 1cab798..9ccb169 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -194,7 +194,7 @@
         @close="showBack = false" />
 
     <el-dialog v-model="showError" overflow draggable class="back-dialog" :style="{
-        backgroundImage: 'url(/src/assets/images/撤回.png)',
+        backgroundImage: `url(${RefundRecallBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -219,6 +219,8 @@ import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menu
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
 import { pa } from 'element-plus/es/locales.mjs'
 
+import RefundRecallBackground from '@/assets/images/撤回.png'
+
 const dateRange = ref([])
 const searchForm = ref({
     jwcode: '',
diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 2512a83..552d3d5 100644
--- a/src/views/permissions/userPermission.vue
+++ b/src/views/permissions/userPermission.vue
@@ -9,6 +9,9 @@ import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
 
+import BackGroundSvg from '@/assets/SvgIcons/背景.svg'
+
+
 const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 
@@ -1148,7 +1151,7 @@ onMounted(async function () {
   </el-dialog>
 
   <el-dialog v-model="ackVisible" width="700px" :close-on-click-modal="false" :style="{
-    backgroundImage: 'url(/src/assets/SvgIcons/背景.svg',
+    backgroundImage: `url(${BackGroundSvg})`,
     backgroundSize: 'cover',
     backgroundPosition: 'center',
     height: '400px'

From 8769051a3623e4d14becccce39a3ef94c7c381c2 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 24 Oct 2025 17:21:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index edc44ae..b692dfe 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -412,7 +412,7 @@ function logout() {
 /* 主内容区域样式 */
 .el-main {
   height: 100%;
-  padding: 20px;
+  padding: 1px 8px 10px 8px;
   background: transparent;
   overflow-y: auto;
   /* 应用自定义滚动条 */

From 722b28d11243172f8ea479bef2ac35d64ac8305b Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Fri, 24 Oct 2025 17:36:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    | 4 ++--
 src/views/moneyManage/refundDetail/refundHeader.vue | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index 0f38e29..153d3e6 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
@@ -17,4 +17,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 
 # lijianlin
 # VITE_API_BASE='http://192.168.9.41:8081/'
-# VITE_API_BASE='http://localhost:8081/'
+VITE_API_BASE='http://localhost:8081/'
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 2c6fd66..6299919 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -520,7 +520,11 @@ const handlePass = async function () {
             status: 40,
             headFinance: adminData.value.adminName,
             auditId: auditRow.value.auditId,
-            goodsName: auditRow.value.goodsName
+            goodsName: auditRow.value.goodsName,
+            permanentGold: auditRow.value.permanentGold,
+            freeGold: auditRow.value.freeGold,
+            orderCode: auditRow.value.orderCode,
+            jwcode: auditRow.value.jwcode
         }
         const result = await API({
             url: '/Money/finalReview',