From 7ba63b41a932d5b850a213d27070d061ab1e3532 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Wed, 22 Oct 2025 10:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                   |  4 +-
 src/views/moneyManage/executor/executor.vue        | 51 +++++++++++----
 .../moneyManage/refundDetail/refundCharge.vue      |  5 +-
 .../moneyManage/refundDetail/refundFinance.vue     |  5 +-
 .../moneyManage/refundDetail/refundHeader.vue      |  5 +-
 .../moneyManage/refundDetail/refundService.vue     | 72 +++++++++++-----------
 6 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/.env.development b/.env.development
index 153d3e6..0f38e29 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/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 620d388..ac2c2c2 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -67,19 +67,42 @@
                     {{ scope.row.refundType === 1 ? '部分退款' : '全部退款' }}
                 </template>
             </el-table-column>
-            <el-table-column prop="refundCurrency" label="退款币种" width="120" />
-            <el-table-column prop="refundAmount" label="退款金额" width="120" />
-            <el-table-column prop="refundChannels" label="退款途径" width="120" />
-            <el-table-column prop="refundVoucher" label="退款截图" width="120" >
+            <el-table-column prop="refundCurrency" label="退款币种" width="120">
                 <template #default="scope">
-                    <el-image v-if="scope.row.refundVoucher" :src="scope.row.refundVoucher" 
-                        :preview-src-list="[scope.row.refundVoucher]" 
-                        style="width: 40px; height: 40px; cursor: pointer;z-index: 99999;" fit="cover"
-                        />
-                        <span v-else>无退款截图</span>
+                    <div v-if="!scope.row.refundCurrency">
+                        <text style="color: #FA5A1E;">待补充</text>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="refundAmount" label="退款金额" width="120">
+                <template #default="scope">
+                    <div v-if="!scope.row.refundAmount">
+                        <text style="color: #FA5A1E;">待补充</text>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="refundChannels" label="退款途径" width="120">
+                <template #default="scope">
+                    <div v-if="!scope.row.refundChannels">
+                        <text style="color: #FA5A1E;">待补充</text>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column prop="refundVoucher" label="退款截图" width="120">
+                <template #default="scope">
+                    <el-image v-if="scope.row.refundVoucher" :src="scope.row.refundVoucher"
+                        :preview-src-list="[scope.row.refundVoucher]"
+                        style="width: 40px; height: 40px; cursor: pointer;z-index: 99999;" fit="cover" />
+                    <span v-else style="color: #FA5A1E;">待补充</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="refundTime" label="退款时间" width="180">
+                <template #default="scope">
+                    <div v-if="!scope.row.refundTime">
+                        <text style="color: #FA5A1E;">待补充</text>
+                    </div>
                 </template>
             </el-table-column>
-            <el-table-column prop="refundTime" label="退款时间" width="180" />
             <el-table-column prop="status" label="订单状态" width="120">
                 <template #default="scope">
                     {{ scope.row.status === 41 ? '已完成' : '待处理' }}
@@ -152,7 +175,7 @@
                 <div class="dialog-item">
                     <el-text style="width:4vw;">转账凭证</el-text>
                     <img v-if="editRow.voucher" :src="editRow.voucher"
-                        style="width: 100%; height: 100%; object-fit: cover;">
+                        style="width: 80px; height: 80px; object-fit: cover;">
                     <div v-else>
                         无转账凭证
                     </div>
@@ -646,13 +669,15 @@ onMounted(() => {
 }
 
 :deep(.el-image-viewer) {
-  z-index: 3000 !important; /* 确保高于固定列和对话框的层级 */
+    z-index: 3000 !important;
+    /* 确保高于固定列和对话框的层级 */
 }
 
 /* 若固定列仍遮挡，强制提高固定列容器的层级（可选） */
 :deep(.el-table__fixed),
 :deep(.el-table__fixed-right) {
-  z-index: 10 !important; /* 低于预览层的 3000 即可 */
+    z-index: 10 !important;
+    /* 低于预览层的 3000 即可 */
 }
 
 .condition1 {
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index a56eb60..8dcef07 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -64,9 +64,9 @@
             <el-table-column prop="market" label="所属地区" width="120" />
             <el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
-            <el-table-column prop="refundType" label="退款方式" width="120">
+            <el-table-column prop="refundModel" label="退款方式" width="120">
                 <template #default="scope">
-                    {{ scope.row.refundType === 1 ? '部分退款' : '全部退款' }}
+                    {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }}
                 </template>
             </el-table-column>
             <el-table-column prop="areaServise" label="提交人" width="120" />
@@ -480,6 +480,7 @@ const getRefund = async function () {
         })
 
         tableData.value = result.data.list || []
+        pagination.value.total = result.data.total || 0
     } catch (error) {
         ElMessage.error(error.message || '查询失败')
     }
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 7639a3e..376e9f9 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -64,9 +64,9 @@
             <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
             <el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
-            <el-table-column prop="refundType" label="退款方式" width="120">
+            <el-table-column prop="refundModel" label="退款方式" width="120">
                 <template #default="scope">
-                    {{ scope.row.refundType === 1 ? '部分退款' : '全部退款' }}
+                    {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }}
                 </template>
             </el-table-column>
             <el-table-column prop="areaServise" label="提交人" width="120" />
@@ -459,6 +459,7 @@ const getRefund = async function () {
         })
 
         tableData.value = result.data.list || []
+        pagination.value.total = result.data.total || 0
     } catch (error) {
         ElMessage.error(error.message || '查询失败')
     }
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 2ed6add..f7d6edb 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -63,9 +63,9 @@
             <el-table-column prop="market" label="所属地区" width="120" />
             <el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
             <el-table-column prop="goodNum" label="产品数量" width="120" />
-            <el-table-column prop="refundType" label="退款方式" width="120">
+            <el-table-column prop="refundModel" label="退款方式" width="120">
                 <template #default="scope">
-                    {{ scope.row.refundType === 1 ? '部分退款' : '全部退款' }}
+                    {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }}
                 </template>
             </el-table-column>
             <el-table-column prop="areaServise" label="提交人" width="120" />
@@ -509,6 +509,7 @@ const getRefund = async function () {
         })
 
         tableData.value = result.data.list || []
+        pagination.value.total = result.data.total || 0
     } catch (error) {
         ElMessage.error(error.message || '查询失败')
     }
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 16ce039..4bf4f36 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -12,8 +12,8 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market" 
-                placeholder="请选择所属地区" clearable @change="handleMarketChange" />
+                <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market" placeholder="请选择所属地区"
+                    clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
@@ -36,7 +36,8 @@
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
                 <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
-                    <el-option v-for="item in channelOptions" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
+                        :value="item.value" />
                 </el-select>
             </div>
             <div class="item2" style="width: 28.5vw;">
@@ -77,8 +78,9 @@
                 <template #default="scope">
                     {{
                         [10, 20, 30, 40].includes(scope.row.status) ? '审核中' :
-                            [12, 22, 32].includes(scope.row.status) ? '审核驳回' :
-                                scope.row.status === 41 ? '退款完成' : scope.row.status
+                            [12, 22, 32].includes(scope.row.status) ? '已驳回' :
+                                [11].includes(scope.row.status) ? '已撤回' :
+                                    scope.row.status === 41 ? '退款完成' : scope.row.status
                     }}
                 </template>
             </el-table-column>
@@ -150,7 +152,7 @@
                 <div class="add-item">
                     <el-text style="width:4vw;">转账凭证</el-text>
                     <img v-if="editRow.voucher" :src="editRow.voucher"
-                        style="width: 100%; height: 100%; object-fit: cover;">
+                        style="width: 80px; height: 80px; object-fit: cover;">
                     <div v-else>
                         无转账凭证
                     </div>
@@ -163,7 +165,7 @@
             </div>
             <div class="right">
                 <div class="add-item">
-                    <el-text style="width:4vw;">退款模式</el-text>
+                    <el-text style="width:4vw;">退款类型</el-text>
                     <el-radio-group v-model="editForm.refundModel">
                         <el-radio value="0">全部退款</el-radio>
                         <el-radio value="1">部分退款</el-radio>
@@ -183,13 +185,8 @@
         </div>
     </el-dialog>
 
-    <ConfirmDialog 
-    v-model="showBack" 
-    message="撤回该信息!" 
-    @confirm="recall"
-    @cancel="showBack = false" 
-    @close="showBack = false" 
-    />
+    <ConfirmDialog v-model="showBack" message="撤回该信息!" @confirm="recall" @cancel="showBack = false"
+        @close="showBack = false" />
 
     <el-dialog v-model="showError" overflow draggable class="back-dialog" :style="{
         backgroundImage: 'url(/src/assets/images/撤回.png)',
@@ -215,6 +212,7 @@ const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
+import { pa } from 'element-plus/es/locales.mjs'
 
 const dateRange = ref([])
 const searchForm = ref({
@@ -298,6 +296,7 @@ const getRefund = async function () {
         })
 
         tableData.value = result.data.list || []
+        pagination.value.total = result.data.total || 0
     } catch (error) {
         ElMessage.error(error.message || '查询失败')
     }
@@ -363,33 +362,33 @@ const submitEdit = async function () {
     }
 }
 const getMarket = async function () {
-  try {
-    const result = await API({
+    try {
+        const result = await API({
 
-      url: '/market/selectMarket',
-    })
-    console.log('看看地区树', result)
+            url: '/market/selectMarket',
+        })
+        console.log('看看地区树', result)
 
-    const transformTree = (nodes) => {
-      const allChildren = nodes.flatMap(node => node.children || []);
+        const transformTree = (nodes) => {
+            const allChildren = nodes.flatMap(node => node.children || []);
 
-      return allChildren.map(child => {
-        const grandchildren = child.children && child.children.length
-          ? transformTree([child])
-          : null;
+            return allChildren.map(child => {
+                const grandchildren = child.children && child.children.length
+                    ? transformTree([child])
+                    : null;
 
-        return {
-          value: child.name,
-          label: child.name,
-          children: grandchildren
+                return {
+                    value: child.name,
+                    label: child.name,
+                    children: grandchildren
+                };
+            });
         };
-      });
-    };
-    market.value = transformTree(result.data)
-    console.log('转换后的地区树==============', market.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
+        market.value = transformTree(result.data)
+        console.log('转换后的地区树==============', market.value)
+    } catch (error) {
+        console.log('请求失败', error)
+    }
 }
 const currencies = ref([
     {
@@ -662,6 +661,7 @@ onMounted(() => {
 :deep(.el-table__header th) {
     background-color: #F3FAFE !important;
 }
+
 .condition {
     width: 82vw;
     display: flex;