From 8fd2d3fb36261e0fc07c6ccb10cd4d50f5c03eb4 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Tue, 11 Nov 2025 15:04:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moneyManage/receiveDetail/receiveFinance.vue   | 47 +++++++++-------------
 .../moneyManage/receiveDetail/receiveService.vue   | 34 +++++++++-------
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index db67651..8a34f55 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -162,8 +162,8 @@
                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
                         <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
                             show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'" width="150px"
-                            show-overflow-tooltip>
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                            width="150px" show-overflow-tooltip>
                             <template #default="scope">
                                 <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
                                 <span style="color: rgb(127,204,133);" v-else>正常</span>
@@ -543,12 +543,12 @@
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.permanentGold" dsabled />
+                                v-model="refundFormData.partRefundGold" dsabled />
                         </div>
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.freeGold"  />
+                                v-model="refundFormData.partRefundFree" />
                         </div>
                     </div>
                     <div class="add-item">
@@ -650,16 +650,8 @@ const openRefundDialog = () => {
 const closeRefundForm = () => {
     refundDialog.value = false
     refundFormData.value = {}
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 
-const refundCoinData = ref({
-    permanentGold: 0,
-    freeGold: 0
-})
 const isRefundGold = ref(false)
 const ifRefundGold = () => {
     if (refundFormData.value.goodsName === '金币充值') {
@@ -763,10 +755,6 @@ const getlist = async () => {
 const resetRefund = () => {
     refundFormData.value.refundModel = ''
     refundFormData.value.refundReason = ''
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 //提交退款
 const submitRefund = async () => {
@@ -781,24 +769,27 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
-        if(refundFormData.value.refundReason){
-            
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
         }
         const result = await request({
             url: '/Money/addOnline',
             data: {
-                jwcode: refundFormData.value.jwcode, // 精网号（必填）
-                name: refundFormData.value.name,  // 姓名（必填）
-                market: refundFormData.value.marketName,  // 所属地区（必填）
-                submitterMarket:adminData.value.markets,
+                jwcode: refundFormData.value.jwcode,
+                name: refundFormData.value.name,
+                market: refundFormData.value.marketName,
                 submitterId: adminData.value.id,
-                remark: refundFormData.value.remark,  // 备注信息（可选）
-                refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
-                refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）
-                id: refundFormData.value.id,                      //订单id
+                submitterMarket: adminData.value.markets,
+                remark: refundFormData.value.remark,
+                refundReason: refundFormData.value.refundReason,
+                refundModel: refundFormData.value.refundModel,
+                id: refundFormData.value.id,
                 orderCode: refundFormData.value.orderCode,
-                permanentGold: (refundCoinData.value.permanentGold) * 100 || 0,
-                freeGold: (refundCoinData.value.freeGold) * 100 || 0
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0,
+                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
             }
         })
         if (result.code == 200) {
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index 068338b..e5721c1 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -139,9 +139,9 @@
                 </div>
 
                 <div class="pagination">
-                    <el-pagination background  :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                        layout="total, sizes, prev, pager, next, jumper" :total="total"
-                        @size-change="handlePagination('size', $event)"
+                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
+                        :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                        :total="total" @size-change="handlePagination('size', $event)"
                         @current-change="handlePagination('page', $event)"></el-pagination>
                 </div>
             </el-card>
@@ -189,7 +189,7 @@
                 <el-form-item label="客户姓名" required prop="name">
                     <el-input disabled v-model="addFormData.name" placeholder="请输入客户姓名" />
                 </el-form-item>
-                <el-form-item label="所属地区"  prop="market">
+                <el-form-item label="所属地区" prop="market">
                     <el-input disabled v-model="addFormData.marketName" placeholder="请输入所属地区" />
                 </el-form-item>
                 <el-form-item label="活动名称" required prop="activity">
@@ -244,7 +244,7 @@
                     <el-date-picker type="datetime" placement="right" v-model="addFormData.payTime"
                         placeholder="请选择付款时间" />
                 </el-form-item>
-                <el-form-item label="转账凭证"  prop="voucher">
+                <el-form-item label="转账凭证" prop="voucher">
                     <div class="pic">
                         <el-upload ref="uploadRef" class="uploader" :show-file-list="false" list-type="picture-card"
                             :auto-upload="false" :before-upload="beforeUpload" :on-error="handelImgErr"
@@ -257,7 +257,7 @@
                         </el-upload>
                     </div>
                 </el-form-item>
-                <el-form-item label="备注"  prop="remark">
+                <el-form-item label="备注" prop="remark">
                     <el-input v-model="addFormData.remark" type="textarea" :rows="4" placeholder="请输入备注" maxlength="100"
                         show-word-limit />
                 </el-form-item>
@@ -302,8 +302,8 @@
                         <el-text style="width:4vw;">产品数量</el-text>
                         <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
                             placeholder="请输入产品数量" disabled />
-                        <CurrencySelect disabled v-model="refundFormData.numUnit" :items="numUnitList" style="width: 3.5vw;"
-                            placeholder="单位" @change="handleCurrencyChange" />
+                        <CurrencySelect disabled v-model="refundFormData.numUnit" :items="numUnitList"
+                            style="width: 3.5vw;" placeholder="单位" @change="handleCurrencyChange" />
                     </div>
                     <div v-show="isRefundGold" style="margin-bottom: 15px; ">
                         <div style=" display: flex; ">
@@ -364,11 +364,13 @@
                             <el-radio value="1">部分退款</el-radio>
                         </el-radio-group>
                     </div>
-                    <div class="add-item" v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
+                    <div class="add-item"
+                        v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
                         <el-text style="width:4vw;">永久金币</el-text>
                         <el-input v-model="refundFormData.partRefundGold" style="width:5vw;" />&nbsp;&nbsp;个
                     </div>
-                    <div class="add-item" v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
+                    <div class="add-item"
+                        v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
                         <el-text style="width:4vw;">免费金币</el-text>
                         <el-input v-model="refundFormData.partRefundFree" style="width:5vw;" />&nbsp;&nbsp;个
                     </div>
@@ -434,8 +436,8 @@ const search = () => {
 const reset = () => {
     searchData.value = {}
     getTime.value = []
-  // 重置页码
-  pageInfo.value.pageNum = 1
+    // 重置页码
+    pageInfo.value.pageNum = 1
     getlist()
 }
 
@@ -532,7 +534,7 @@ const ifGold = () => {
             addFormData.value.numUnit = ''
         } else if (addFormData.value.goodsName == '静态信息费') {
             addFormData.value.numUnit = '年'
-        }else{
+        } else {
             addFormData.value.numUnit = '个'
         }
     }
@@ -819,6 +821,10 @@ const closeRefundForm = () => {
 // 提交退款
 const submitRefund = async () => {
     try {
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
+        }
         const result = await request({
             url: '/Money/add',
             data: {
@@ -826,7 +832,7 @@ const submitRefund = async () => {
                 name: refundFormData.value.name,
                 market: refundFormData.value.marketName,
                 submitterId: adminData.value.id,
-                submitterMarket:adminData.value.markets,
+                submitterMarket: adminData.value.markets,
                 remark: refundFormData.value.remark,
                 refundReason: refundFormData.value.refundReason,
                 refundModel: refundFormData.value.refundModel,

From d97e925c6c3fdaa784b9214f9db234d4a951d9b9 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Tue, 11 Nov 2025 15:11:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MoneyManage/ProductSelect.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyManage/ProductSelect.vue b/src/components/MoneyManage/ProductSelect.vue
index e9dfc8d..b6b7491 100644
--- a/src/components/MoneyManage/ProductSelect.vue
+++ b/src/components/MoneyManage/ProductSelect.vue
@@ -135,8 +135,8 @@ watch(selectedValue, (newVal) => {
 });
 
 
-const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机活跃度']
-const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘']
+const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机活跃度','AI机构探测神器']
+const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘','超级机构探测神器']
 const InfoFee = ['静态信息费', '博股会员']
 const menuData = [
   {

From c412297b12659e3eb37a6d36b846f74fab29ca8c Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Tue, 11 Nov 2025 15:47:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=80=BB=E9=83=A8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moneyManage/receiveDetail/receiveFinance.vue   |    4 +-
 .../moneyManage/receiveDetail/receiveHead.vue      | 1939 ++++++++++++--------
 .../moneyManage/receiveDetail/receiveManage.vue    |   64 +-
 3 files changed, 1244 insertions(+), 763 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 8a34f55..98a790f 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -1093,9 +1093,9 @@ onMounted(async () => {
     await getlist();
 
     // 菜单权限校验（确保地区财务权限）
-    if (!hasMenuPermission(menuTree.value, 78)) {
+    if (!hasMenuPermission(menuTree.value, 67)) {
         ElMessageBox.alert(
-            '您暂无地区财务操作权限，请联系管理员',
+            '您暂无该页面操作权限，请联系管理员',
             '权限提示',
             { type: 'error' }
         ).then(() => {
diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue
index b411c83..63ca0a5 100644
--- a/src/views/moneyManage/receiveDetail/receiveHead.vue
+++ b/src/views/moneyManage/receiveDetail/receiveHead.vue
@@ -1,820 +1,1321 @@
 <template>
-  <div class="content">
-    <!-- 搜索区域：删除客服专属的“订单状态”筛选，保留总部财务所需筛选项 -->
-    <div class="div-card1">
-      <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
-        <div class="row">
-          <div class="rowItem">
-            <el-text style="width: 4vw;">精网号</el-text>
-            <el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;" clearable></el-input>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">客户姓名</el-text>
-            <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;" clearable></el-input>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">所属地区</el-text>
-            <el-select v-model="searchData.market" placeholder="请选择所属地区" style="width:10vw;" clearable>
-              <el-option v-for="item in marketList" :key="item" :label="item" :value="item"/>
-            </el-select>
-          </div>
-          <!-- 总部财务不显示“订单状态”，显示“付款币种” -->
-          <div class="rowItem">
-            <el-text style="width: 4vw;">付款币种</el-text>
-            <el-select v-model="searchData.paymentCurrency" placeholder="请选择付款币种" style="width: 10vw;" clearable>
-              <el-option v-for="item in customOptions" :key="item" :label="item" :value="item"/>
-            </el-select>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">支付方式</el-text>
-            <el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable>
-              <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item"/>
-            </el-select>
-          </div>
-        </div>
-        <div class="row" style="margin-top: 10px;">
-          <div class="rowItem">
-            <el-text style="width: 4vw;">活动名称</el-text>
-            <el-select v-model="searchData.activity" placeholder="请选择活动方式" style="width: 10vw;" clearable>
-              <el-option v-for="item in activityList" :key="item.id" :label="item.activityName" :value="item.id"/>
-            </el-select>
-          </div>
-          <div class="rowItem">
-            <el-text style="width: 4vw;">产品名称</el-text>
-            <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;" clearable/>
-          </div>
-          <div class="rowItem" style="width: 30vw">
-            <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
-            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+    <div class="content">
+        <div class="div-card1">
+            <el-card class="card1" style="margin-bottom: 0.5vh; min-height: 110px;">
+                <div class="row">
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">精网号</el-text>
+                        <el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;"
+                            clearable></el-input>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">客户姓名</el-text>
+                        <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;"
+                            clearable></el-input>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">所属地区</el-text>
+                        <el-select v-model="searchData.market" placeholder="请选择所属地区" style="width:10vw;" clearable>
+                            <el-option v-for="item in marketList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </div>
+                    <!-- 总部财务固定显示付款币种，删除客服的订单状态 -->
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">付款币种</el-text>
+                        <el-select v-model="searchData.paymentCurrency" placeholder="请选择付款币种" style="width: 10vw;"
+                            clearable>
+                            <el-option v-for="item in customOptions" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">支付方式</el-text>
+                        <el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable>
+                            <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item" />
+                        </el-select>
+                    </div>
+                </div>
+                <div class="row" style="margin-top: 10px;">
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">活动名称</el-text>
+                        <el-select v-model="searchData.activity" placeholder="请选择活动方式" style="width: 10vw;" clearable>
+                            <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
+                                :value="item.id" />
+                        </el-select>
+                    </div>
+                    <div class="rowItem">
+                        <el-text style="width: 4vw;">产品名称</el-text>
+                        <el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;"
+                            clearable />
+                    </div>
+                    <div class="rowItem" style="width: 30vw">
+                        <el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
+                        <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
                             start-placeholder="起始时间" end-placeholder="结束时间" style="width: 22vw; "
                             @change="handleDatePickerChange" :default-time="defaultTime"
-                            :disabled-date="disabledDate"/>
-          </div>
-          <!-- 总部财务查询/重置按钮 -->
-          <div class="buttons">
-            <el-button type="primary" @click="search">查询</el-button>
-            <el-button type="success" @click="reset">重置</el-button>
-          </div>
+                            :disabled-date="disabledDate" />
+                    </div>
+                    <!-- 总部财务查询/重置按钮，删除客服相关按钮 -->
+                    <div class="buttons">
+                        <el-button type="primary" @click="search">查询</el-button>
+                        <el-button type="success" @click="reset">重置</el-button>
+                    </div>
+                </div>
+            </el-card>
         </div>
-      </el-card>
-    </div>
 
 
-    <!-- 数据展示区域：仅保留总部财务的“已通过/已完成”标签 -->
-    <div class="div-card2">
-      <el-card class="card2">
-        <div class="btns">
-          <!-- 总部财务仅显示“已通过/已完成”标签 -->
-          <div class="tabs">
-            <el-button-group>
-              <el-button class="btnItem"
-                         :style="{ backgroundColor: activeTab === 'pass' ? '#2741DE' : '#E5EBFE', color: activeTab === 'pass' ? 'white' : '#666' }"
-                         @click="navigateTo('pass')">
-                已通过
-              </el-button>
-              <el-button class="btnItem"
-                         :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
-                         @click="navigateTo('done')">
-                已完成
-              </el-button>
-            </el-button-group>
-          </div>
-        </div>
-
-        <!-- 表格：删除客服/地区财务专属列 -->
-        <div class="table">
-          <el-table :data="tableData" style="width: 80vw;height:54vh;" @sort-change="handleSortChange"
-                    :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
-                    :cell-style="{ textAlign: 'center' }">
-            <el-table-column type="index" label="序号" width="100px" fixed="left">
-              <template #default="scope">
-                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px"/>
-            <el-table-column fixed="left" prop="name" label="姓名" width="110px"/>
-            <el-table-column prop="marketName" label="所属地区" width="80px"/>
-            <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip/>
-            <el-table-column prop="goodsName" label="产品名称" width="120px"/>
-            <el-table-column prop="goodNum" label="产品数量" width="130px">
-              <template #default="scope">
-                <span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
-                <span v-else>{{ scope.row.goodNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="paymentCurrency" label="付款币种" width="100px"/>
-            <el-table-column prop="paymentAmount" label="付款金额" width="120px"/>
-            <!-- 总部财务显示“到账币种/金额/手续费”列 -->
-            <el-table-column prop="receivedCurrency" label="到账币种"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
-            <el-table-column prop="receivedAmount" label="到账金额"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
-              <template #default="scope">
-                <div v-if="!scope.row.receivedAmount">
-                  <text style="color: #FA5A1E;">待补充</text>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="handlingCharge" label="手续费"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
-              <template #default="scope">
-                <div v-if="!scope.row.handlingCharge == null">
-                  <text style="color: #FA5A1E;">待补充</text>
+        <div class="div-card2">
+            <el-card class="card2">
+                <div class="btns">
+                    <div class="tabs">
+                        <el-button-group>
+                            <el-button class="btnItem"
+                                :style="{ backgroundColor: activeTab === 'pass' ? '#2741DE' : '#E5EBFE', color: activeTab === 'pass' ? 'white' : '#666' }"
+                                @click="navigateTo('pass')">
+                                已通过
+                            </el-button>
+                            <el-button class="btnItem"
+                                :style="{ backgroundColor: activeTab === 'done' ? '#2741DE' : '#E5EBFE', color: activeTab === 'done' ? 'white' : '#666' }"
+                                @click="navigateTo('done')">
+                                已完成
+                            </el-button>
+                        </el-button-group>
+                    </div>
+                    <!-- 删除客服的“添加收款”按钮 -->
+                    <div class="btnAdd"></div>
                 </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="payType" label="支付方式" width="130px"/>
-            <el-table-column prop="payTime" label="付款时间" width="180px"/>
-            <el-table-column prop="voucher" label="转账凭证" width="110px">
-              <template #default="scope">
-                <div v-if="scope.row.voucher"
-                     style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
-                     @click="previewImage(scope.row.voucher)">
-                  <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
+
+                <div class="table">
+                    <el-table :data="tableData" style="width: 80vw;height:54vh;" @sort-change="handleSortChange"
+                        :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
+                        :cell-style="{ textAlign: 'center' }">
+                        <el-table-column type="index" label="序号" width="100px" fixed="left">
+                            <template #default="scope">
+                                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
+                        <el-table-column fixed="left" prop="name" label="姓名" width="110px" />
+                        <el-table-column prop="marketName" label="所属地区" width="80px" />
+                        <el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
+                        <el-table-column prop="goodsName" label="产品名称" width="120px" />
+                        <el-table-column prop="goodNum" label="产品数量" width="130px">
+                            <template #default="scope">
+                                <span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
+                                <span v-else>{{ scope.row.goodNum }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="paymentCurrency" label="付款币种" width="100px" />
+                        <el-table-column prop="paymentAmount" label="付款金额" width="120px" />
+                        <!-- 总部财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
+                        <el-table-column prop="receivedCurrency" label="到账币种"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
+                        <el-table-column prop="receivedAmount" label="到账金额"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
+                            <template #default="scope">
+                                <div v-if="!scope.row.receivedAmount">
+                                    <text style="color: #FA5A1E;">待补充</text>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="handlingCharge" label="手续费"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="150px">
+                            <template #default="scope">
+                                <div v-if="scope.row.handlingCharge == null">
+                                    <text style="color: #FA5A1E;">待补充</text>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="payType" label="支付方式" width="130px" />
+                        <el-table-column prop="payTime" label="付款时间" width="180px" />
+                        <el-table-column prop="voucher" label="转账凭证" width="110px">
+                            <template #default="scope">
+                                <div v-if="scope.row.voucher"
+                                    style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
+                                    @click="previewImage(scope.row.voucher)">
+                                    <img :src="scope.row.voucher" alt="支付凭证" style="width: auto; height: 40px;">
+                                </div>
+                                <div v-else
+                                    style="display: flex; justify-content: center; align-items: center; height: 40px;">
+                                    ——
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="submitterName" label="提交人" width="150px"
+                            show-overflow-tooltip></el-table-column>
+                        <!-- 总部财务显示审核人（已通过/已驳回/已完成标签页） -->
+                        <el-table-column prop="auditName" label="审核人"
+                            v-if="activeTab == 'pass' || activeTab == 'reject' || activeTab == 'done'" width="150px"
+                            show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="receivedTime" label="到账时间"
+                            v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
+                        <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
+                            show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                            width="150px" show-overflow-tooltip>
+                            <template #default="scope">
+                                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
+                                <span style="color: rgb(127,204,133);" v-else>正常</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject'" width="180px"
+                            show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="rejectReason" label="驳回理由" v-if="activeTab == 'reject'" width="150px">
+                            <template #default="scope">
+                                <div class="ellipsis-container"
+                                    @mouseenter="handleMouseEnter($event, scope.row.rejectReason)"
+                                    @mouseleave="handleMouseLeave" @mousemove="handleMouseMove($event)">
+                                    <span class="ellipsis-text">
+                                        {{ scope.row.rejectReason || '—' }}
+                                    </span>
+                                    <!-- 自定义提示框 -->
+                                    <div v-if="showTooltip && tooltipContent" class="custom-tooltip" :style="{
+                                        left: `${tooltipLeft}px`,
+                                        top: `${tooltipTop}px`
+                                    }">
+                                        {{ tooltipContent }}
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <!-- 总部财务表格操作（待审核→审核，已通过→编辑） -->
+                        <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
+                            <template #default=scope>
+                                <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
+                                    @click="openAuditForm(scope.row)">审核
+                                </el-link>
+                                <el-link
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
+                                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
+                                </el-link>
+                                <el-link
+                                    v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
+                                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">退款
+                                </el-link>
+                            </template>
+                        </el-table-column>
+                    </el-table>
                 </div>
-                <div v-else
-                     style="display: flex; justify-content: center; align-items: center; height: 40px;">
-                  ——
+                <div class="pagination">
+                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
+                        :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                        :total="total" @size-change="handlePagination('size', $event)"
+                        @current-change="handlePagination('page', $event)"></el-pagination>
                 </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="submitterName" label="提交人" width="150px" show-overflow-tooltip></el-table-column>
-            <!-- 总部财务显示“审核人/到账时间”列 -->
-            <el-table-column prop="auditName" label="审核人"
-                             v-if="activeTab == 'pass' || activeTab == 'done'"
-                             width="150px" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="receivedTime" label="到账时间"
-                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px"/>
-            <el-table-column prop="remark" label="备注" width="150px" show-overflow-tooltip></el-table-column>
-            <!-- 已完成状态显示订单状态（正常/退款） -->
-            <el-table-column prop="status" label="订单状态" v-if="activeTab == 'done'" width="150px"
-                             show-overflow-tooltip>
-              <template #default="scope">
-                <span v-if="scope.row.status == 6">退款</span>
-                <span v-else>正常</span>
-              </template>
-            </el-table-column>
-            <!-- 操作列：仅保留总部财务的“编辑”功能 -->
-            <el-table-column fixed="right" label="操作" width="120px"
-                             v-if="activeTab != 'reject'">
-              <template #default=scope>
-                <el-link
-                    v-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
-                    style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
-                </el-link>
-              </template>
-            </el-table-column>
-          </el-table>
+            </el-card>
         </div>
-        <!-- 分页组件 -->
-        <div class="pagination">
-          <el-pagination background  :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                         layout="total, sizes, prev, pager, next, jumper" :total="total"
-                         @size-change="handlePagination('size', $event)"
-                         @current-change="handlePagination('page', $event)"></el-pagination>
+        <!-- 退款确认弹窗 -->
+        <div class="recallDialog" v-show="refundConfirmDialog">
+            <div class="close">
+                <button @click="closeConfirmRefund" class="Btn">关闭</button>
+            </div>
+            <div class="text">
+                <text class="txt">{{ textContent }}</text>
+            </div>
+            <div class="cancle">
+                <button @click="closeConfirmRefund" class="Btn">取消</button>
+            </div>
+            <div class="confirm">
+                <button @click="openRefundDialog" class="Btn">确定</button>
+            </div>
         </div>
-      </el-card>
-    </div>
 
-    <!-- 编辑填手续费弹窗 -->
-    <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
-      <div class="content">
-        <div class="left">
-          <el-form class="editForm" label-width="4.5vw" label-position="left">
-            <el-form-item label="精网号">
-              <el-input disabled="true" v-model="editFormData.jwcode" placeholder="请输入驳回理由"/>
-            </el-form-item>
-            <el-form-item label="客户姓名">
-              <el-input disabled="true" v-model="editFormData.name" placeholder="请输入客户姓名"/>
-            </el-form-item>
-            <el-form-item label="所属地区">
-              <el-input disabled="true" v-model="editFormData.marketName" placeholder="请输入所属地区"/>
-            </el-form-item>
-            <el-form-item label="活动名称">
-              <el-input disabled="true" v-model="editFormData.activity" placeholder="请输入活动名称"/>
-            </el-form-item>
-            <el-form-item label="产品名称">
-              <el-select disabled="true" v-model="editFormData.goodsName" placeholder="请选择产品名称"
-                         clearable></el-select>
-            </el-form-item>
-            <el-form-item v-show="!isEditGold" label="产品数量">
-              <div style="padding-right: 50px; display: flex;">
-                <el-input disabled="true" style="padding-right: 10px;" v-model="editFormData.goodNum"
-                          placeholder="请输入产品数量"/>
-                <span style="color: #999999;">个</span>
-              </div>
-            </el-form-item>
-            <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
-              <div style=" display: flex; ">
-                <span style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
-                <el-input disabled="true"
-                          style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                          v-model="editFormData.permanentGold"/>
-              </div>
-              <div style="padding-right: 5px; display: flex;">
-                <span style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
-                <el-input disabled="true"
-                          style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
-                          v-model="editFormData.freeGold"/>
-              </div>
+        <!-- 编辑填手续费弹窗（总部财务核心编辑功能） -->
+        <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
+            <div class="content">
+                <div class="left">
+                    <el-form class="editForm" label-width="4.5vw" label-position="left">
+                        <el-form-item label="精网号">
+                            <el-input disabled="true" v-model="editFormData.jwcode" placeholder="精网号" />
+                        </el-form-item>
+                        <el-form-item label="客户姓名">
+                            <el-input disabled="true" v-model="editFormData.name" placeholder="客户姓名" />
+                        </el-form-item>
+                        <el-form-item label="所属地区">
+                            <el-input disabled="true" v-model="editFormData.marketName" placeholder="所属地区" />
+                        </el-form-item>
+                        <el-form-item label="活动名称">
+                            <el-input disabled="true" v-model="editFormData.activity" placeholder="活动名称" />
+                        </el-form-item>
+                        <el-form-item label="产品名称">
+                            <el-select disabled="true" v-model="editFormData.goodsName" placeholder="产品名称"
+                                clearable></el-select>
+                        </el-form-item>
+                        <!-- 金币产品特殊显示 -->
+                        <el-form-item v-show="!isEditGold" label="产品数量">
+                            <div style="display: flex;">
+                                <el-input disabled="true" style="padding-right: 30px; flex: 3;"
+                                    v-model="editFormData.goodNum" placeholder="请输入产品数量" />
+                                <CurrencySelect disabled="true" v-model="editFormData.numUnit" :items="numUnitList"
+                                    style="flex: 1.5;" placeholder="单位" />
+                            </div>
+                        </el-form-item>
+                        <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
+                            <div style=" display: flex; margin-right: 10px;">
+                                <span
+                                    style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
+                                <el-input disabled="true"
+                                    style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                                    v-model="editFormData.permanentGold" />
+                            </div>
+                            <div style="padding-right: 5px; display: flex;">
+                                <span
+                                    style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
+                                <el-input disabled="true"
+                                    style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
+                                    v-model="editFormData.freeGold" />
+                            </div>
+                        </div>
+                        <el-form-item label="付款币种">
+                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                                :items="customOptions" placeholder="付款币种" />
+                        </el-form-item>
+                        <el-form-item label="付款金额">
+                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount" placeholder="付款金额" />
+                        </el-form-item>
+                        <el-form-item label="支付方式">
+                            <el-select disabled="true" v-model="editFormData.payType" placeholder="支付方式"
+                                clearable></el-select>
+                        </el-form-item>
+                        <el-form-item label="到账地区">
+                            <el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="到账地区"
+                                clearable></el-select>
+                        </el-form-item>
+                        <el-form-item label="付款时间">
+                            <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
+                                placeholder="付款时间" />
+                        </el-form-item>
+                        <el-form-item label="转账凭证">
+                            <div class="pic">
+                                <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
+                                    list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
+                                    :on-error="handelImgErr" :on-change="handleImageChange"
+                                    :http-request="customUpload">
+                                    <img v-if="editFormData.voucher" :src="editFormData.voucher" class="avatar"
+                                        style="height: 100%; width: 100%;  object-fit: cover;" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                                <el-text class="picText">仅支持.jpg .png格式文件≤ 1 MB</el-text>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="备注">
+                            <el-input disabled="true" v-model="editFormData.remark" type="textarea" :rows="4"
+                                placeholder="备注" maxlength="100" show-word-limit />
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div class="right">
+                    <!-- 总部财务可编辑项：仅到账相关信息 -->
+                    <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
+                        label-width="4.5vw" label-position="left">
+                        <el-form-item label="到账货币" required>
+                            <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
+                                placeholder="请选择到账货币" />
+                        </el-form-item>
+                        <el-form-item label="到账金额" prop="receivedAmount">
+                            <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额" type="number" />
+                        </el-form-item>
+                        <el-form-item label="手续费" prop="handlingCharge">
+                            <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
+                        </el-form-item>
+                        <el-form-item label="到账时间" required>
+                            <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
+                        </el-form-item>
+                    </el-form>
+                    <span class="editBtns">
+                        <button class="editBtn1" @click="closeEditForm">
+                            <text class="txt">取消</text>
+                        </button>
+                        <button class="editBtn2" @click="throttledsubmitEditForm">
+                            <text class="txt">提交</text>
+                        </button>
+                    </span>
+                </div>
             </div>
-            <el-form-item label="付款币种">
-              <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
-                              :items="customOptions" placeholder="请选择付款币种"/>
-            </el-form-item>
-            <el-form-item label="付款金额">
-              <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
-                        placeholder="请输入付款金额"/>
-            </el-form-item>
-            <el-form-item label="支付方式">
-              <el-select disabled="true" v-model="editFormData.payType" placeholder="请选择支付方式"
-                         clearable></el-select>
-            </el-form-item>
-            <el-form-item label="到账地区">
-              <el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="请选择到账地区"
-                         clearable></el-select>
-            </el-form-item>
-            <el-form-item label="付款时间">
-              <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
-                              placeholder="请选择付款时间"/>
-            </el-form-item>
-            <el-form-item label="转账凭证">
-              <div class="pic">
-                <el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
-                           list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
-                           :on-error="handelImgErr" :on-change="handleImageChange"
-                           :http-request="customUpload">
-                  <img v-if="editFormData.voucher" :src="editFormData.voucher" class="avatar"
-                       style="height: 100%; width: 100%;  object-fit: cover;"/>
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus/>
-                  </el-icon>
-                </el-upload>
-                <el-text class="picText">
-                  仅支持.jpg .png格式文件≤ 1 MB
-                </el-text>
-              </div>
-            </el-form-item>
-            <el-form-item label="备注">
-              <el-input disabled="true" v-model="editFormData.remark" type="textarea" :rows="4"
-                        placeholder="请输入驳回理由" maxlength="100" show-word-limit/>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="right">
-          <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRight"
-                   label-width="4.5vw" label-position="left">
-            <el-form-item label="到账货币">
-              <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
-                              placeholder="请选择到账货币"/>
-            </el-form-item>
-            <el-form-item label="到账金额" prop="receivedAmount">
-              <el-input v-model="editFormData.receivedAmount" placeholder="请输入到账金额"/>
-            </el-form-item>
-            <el-form-item label="手续费" prop="handlingCharge">
-              <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费"/>
-            </el-form-item>
-            <el-form-item label="到账时间">
-              <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请输入到账时间"/>
-            </el-form-item>
-          </el-form>
-          <span class="editBtns">
-            <button class="editBtn1" @click="closeEditForm">
-              <text class="txt">取消</text>
-            </button>
-            <button class="editBtn2" @click="throttledsubmitEditForm">
-              <text class="txt">提交</text>
-            </button>
-          </span>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 查看驳回理由弹窗 -->
-    <el-dialog v-model="showRejectReasonDialog" title="驳回理由" width="30vw" :before-close="closeRejectReasonDialog">
-      <el-form label-width="80px">
-        <el-form-item label="驳回原因">
-          <el-input type="textarea" v-model="rejectReasonContent" disabled :rows="5" placeholder="无驳回理由"/>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="closeRejectReasonDialog">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </el-dialog>
+
+        <!-- 新增退款 -->
+        <el-dialog v-model="refundDialog" title="退款" class="refundDialog" overflow draggable style="width: 40vw;"
+            :before-close="closeRefundForm">
+            <div style="display: flex;">
+                <div class="left">
+                    <div class="add-item">
+                        <el-text style="width:4vw;">精网号</el-text>
+                        <el-input v-model="refundFormData.jwcode" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">客户姓名</el-text>
+                        <el-input v-model="refundFormData.name" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">所属地区</el-text>
+                        <el-input v-model="refundFormData.marketName" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">活动名称</el-text>
+                        <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">产品名称</el-text>
+                        <el-input v-model="refundFormData.goodsName" style="width:10vw;" disabled />
+                    </div>
+                    <div v-show="!isRefundGold" class="add-item">
+                        <el-text style="width:4vw;">产品数量</el-text>
+                        <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
+                            placeholder="请输入产品数量" disabled />
+                        <CurrencySelect disabled="true" v-model="refundFormData.numUnit" :items="numUnitList"
+                            style=" width: 3.5vw;" placeholder="单位" />
+                    </div>
+                    <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.permanentGold" disabled />
+                        </div>
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.freeGold" disabled />
+                        </div>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款币种</el-text>
+                        <el-input v-model="refundFormData.paymentCurrency" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款金额</el-text>
+                        <el-input v-model="refundFormData.paymentAmount" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">支付方式</el-text>
+                        <el-input v-model="refundFormData.payType" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款时间</el-text>
+                        <el-date-picker v-model="refundFormData.payTime" type="datetime" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;" size="small">转账凭证</el-text>
+                        <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
+                            <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
+                                :show-file-list="false">
+                                <template #default>
+                                    <img v-if="refundFormData.voucher" :src="refundFormData.voucher"
+                                        style="width: 100%; height: 100%; object-fit: cover;">
+                                    <el-icon v-else>
+                                        <Plus />
+                                    </el-icon>
+                                </template>
+                            </el-upload>
+                        </el-form-item>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">备注</el-text>
+                        <el-input v-model="refundFormData.remark" style="width:10vw;" :rows="2" type="textarea"
+                            maxLength="100" disabled show-word-limit />
+                    </div>
+                </div>
+                <div class="right">
+                    <div class="add-item">
+                        <el-text style="width:4vw;">退款模式</el-text>
+                        <el-radio-group v-model="refundFormData.refundModel">
+                            <el-radio value="0">全部退款</el-radio>
+                            <el-radio value="1">部分退款</el-radio>
+                        </el-radio-group>
+                    </div>
+                    <div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.partRefundGold" dsabled />
+                        </div>
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.partRefundFree" />
+                        </div>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">退款理由</el-text>
+                        <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"
+                            show-word-limit type="textarea" />
+                    </div>
+                    <div>ps:请在退款理由表明用户的退款需求。</div>
+                    <div style="display:flex;justify-content: center;margin-top: 5vh;">
+                        <el-button type="default" @click="resetRefund">重置</el-button>
+                        <el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
+                    </div>
+                </div>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script setup>
-import {ref, onMounted} from 'vue';
-import {storeToRefs} from 'pinia';
-import {ElMessage, ElMessageBox} from 'element-plus'
-import API from '@/util/http.js'
-import request from '@/util/http.js'
-import moment from 'moment'
-import {useAdminStore} from '@/store/index.js'
-import {hasMenuPermission} from '@/utils/menuTreePermission.js'
-import _ from 'lodash'
-import {editFormRule} from './utils/recriveFormRules.js'
-import {productList, MarketNameForId, CurrencyForId, marketList} from './utils/staticData.js'
-import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'
-import {Plus} from '@element-plus/icons-vue';
-
-// 状态管理
+// 仅导入总部财务所需依赖
+import { ref, watch, onMounted } from 'vue';
+import { storeToRefs } from 'pinia';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import API from '@/util/http.js';
+import request from '@/util/http.js';
+import moment from 'moment';
+import _ from 'lodash';
+import { Plus } from '@element-plus/icons-vue';
+import { startsWith } from './utils/util.js'
+
+// 总部财务专属组件
+import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue';
+
+// 静态数据与规则（仅保留必要项）
+import { editFormRule } from './utils/recriveFormRules.js';
+import { productList, MarketNameForId, CurrencyForId, marketList } from './utils/staticData.js';
+import { useAdminStore } from '@/store/index.js';
+import { hasMenuPermission } from '@/utils/menuTreePermission.js';
+
+// ===================== 1. 核心状态管理（仅总部财务） =====================
 const adminStore = useAdminStore();
-const {menuTree} = storeToRefs(adminStore);
-const tableData = ref([])
-const searchData = ref({})
-const defaultTime = [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]
-const getTime = ref([])
-const activeTab = ref('pass')
-const HQcaiwu = ref(true)
-const superAdmin = ref(false)
-const editFormData = ref({})
-const ifOnline = ref(false)
-const editFormisible = ref(false)
-const editFormRef = ref(null)
-const isEditGold = ref(false)
-const showRejectReasonDialog = ref(false)
-const rejectReasonContent = ref('')
-const pageInfo = ref({pageSize: 10, pageNum: 1})
-const total = ref(0)
-const uploadRef = ref()
-const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)'])
-const paytypeList = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"])
-const activityList = ref([])
-const adminData = ref({})
-
-// 核心方法
-const search = () => {
-  getlist()
-  ElMessage.success('查询成功')
+const { menuTree } = storeToRefs(adminStore);
+
+
+
+// 表格与分页数据
+const tableData = ref([]);
+const total = ref(0);
+const pageInfo = ref({ pageSize: 10, pageNum: 1 });
+
+// 搜索条件
+const searchData = ref({});
+const defaultTime = [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)];
+const getTime = ref([]);
+
+// 标签页
+const activeTab = ref('pass');
+
+
+
+// 编辑弹窗状态
+const editFormisible = ref(false);
+const editFormData = ref({});
+const editFormRef = ref(null);
+const isEditGold = ref(false); // 金币产品标记
+const ifOnline = ref(false); // 在线支付标记
+
+// 辅助状态：图片上传、悬浮提示
+const uploadRef = ref(null);
+const showTooltip = ref(false);
+const tooltipContent = ref('');
+const tooltipLeft = ref(0);
+const tooltipTop = ref(0);
+
+// 退款确认弹窗
+const refundConfirmDialog = ref(false)
+const textContent = ref('')
+
+
+//退款弹窗
+const refundDialog = ref(false)
+const refundFormData = ref({})
+
+const openRefundDialog = () => {
+    refundDialog.value = true
+    closeConfirmRefund()
+
 }
-const reset = () => {
-  searchData.value = {}
-  getTime.value = []
-  pageInfo.value.pageNum = 1
-  getlist()
+const closeRefundForm = () => {
+    refundDialog.value = false
+    refundFormData.value = {}
 }
-const getlist = async () => {
-  try {
-    let payCurrencySelect = ''
-    let goodsName = ''
-    if (getTime.value && getTime.value.length === 2) {
-      searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss')
-      searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss')
+
+const isRefundGold = ref(false)
+const ifRefundGold = () => {
+    if (refundFormData.value.goodsName === '金币充值') {
+        isRefundGold.value = true
+        refundFormData.value.goodNum = 0
     } else {
-      searchData.value.startTime = ''
-      searchData.value.endTime = ''
+        isRefundGold.value = false
     }
-    if (searchData.value.goodsName) {
-      goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1]
-    }
-    if (searchData.value.paymentCurrency) {
-      payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency)
-    }
-    const cashRoleId = '2'
-    if (activeTab.value === 'pass') {
-      searchData.value.status = 13
-    } else if (activeTab.value === 'done') {
-      searchData.value.status = 46
+}
+
+
+
+// 基础数据
+const adminData = ref({});
+const activityList = ref([]);
+const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)']);
+const paytypeList = ["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"];
+const paytypeOptions = ref([...paytypeList]);
+
+// ===================== 2. 核心功能函数（仅总部财务） =====================
+
+//确认退款弹窗
+const openRefundConfirm = (row) => {
+    textContent.value = '将要对该订单退款!'
+    refundConfirmDialog.value = true
+    refundFormData.value = { ...row }
+    ifRefundGold()
+    console.log(row);
+
+}
+
+const closeConfirmRefund = () => {
+    refundConfirmDialog.value = false
+    textContent.value = ''
+}
+
+
+// 2.1 数据加载：获取总部财务订单列表
+const getlist = async () => {
+    try {
+        let payCurrencySelect = '';
+        let goodsName = '';
+
+        // 处理时间范围
+        if (getTime.value && getTime.value.length === 2) {
+            searchData.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
+            searchData.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
+        } else {
+            searchData.value.startTime = '';
+            searchData.value.endTime = '';
+        }
+
+        // 处理产品名称（级联选择取最后一级）
+        if (searchData.value.goodsName) {
+            goodsName = searchData.value.goodsName[searchData.value.goodsName.length - 1];
+        }
+
+        // 处理付款币种（转ID）
+        if (searchData.value.paymentCurrency) {
+            payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
+        }
+
+        // 总部财务固定参数：角色ID=1，按标签页筛选状态
+        const cashRoleId = '2';
+        const receivedMarket = adminData.value.markets;
+         if (activeTab.value === 'pass') searchData.value.status = 13;
+        else if (activeTab.value === 'done') searchData.value.status = 46;
+
+        const result = await request({
+            url: '/cashCollection/selectCollection',
+            data: {
+                ...pageInfo.value,
+                cashCollection: {
+                    ...searchData.value,
+                    submitterId: adminData.value.id,
+                    receivedMarket: MarketNameForId(receivedMarket),
+                    cashRoleId: cashRoleId,
+                    paymentCurrency: payCurrencySelect,
+                    submitterMarket: receivedMarket,
+                    goodsName: goodsName,
+                    market: MarketNameForId(searchData.value.market)
+                }
+            }
+        });
+
+        if (result.code === 200) {
+            tableData.value = result.data.list;
+            total.value = result.data.total;
+        } else {
+            ElMessage.error('订单数据加载失败');
+        }
+    } catch (error) {
+        console.error('总部财务订单列表请求异常：', error);
+        ElMessage.error('网络异常，请重试');
     }
-    const result = await request({
-      url: '/cashCollection/selectCollection',
-      data: {
-        ...pageInfo.value,
-        cashCollection: {
-          ...searchData.value,
-          submitterId: adminData.value.id,
-          receivedMarket: MarketNameForId(adminData.value.markets),
-          cashRoleId: cashRoleId,
-          paymentCurrency: payCurrencySelect,
-          submitterMarket: adminData.value.markets,
-          goodsName: goodsName,
-          market: MarketNameForId(searchData.value.market)
+};
+
+//重置退款
+const resetRefund = () => {
+    refundFormData.value.refundModel = ''
+    refundFormData.value.refundReason = ''
+}
+//提交退款
+const submitRefund = async () => {
+    try {
+        if (refundFormData.value.goodsName != '金币充值') {
+
+            return ElMessage.error('线上数据仅支持金币充值退款');
         }
-      }
-    })
-    if (result.code === 200) {
-      tableData.value = result.data.list
-      total.value = result.data.total
-    } else {
-      ElMessage.error('数据异常')
+        if (!refundFormData.value.refundModel) {
+            return ElMessage.error('请选择退款方式');
+        }
+        if (!refundFormData.value.refundReason) {
+            return ElMessage.error('请输入退款原因');
+        }
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
+        }
+        const result = await request({
+            url: '/Money/addOnline',
+            data: {
+                jwcode: refundFormData.value.jwcode,
+                name: refundFormData.value.name,
+                market: refundFormData.value.marketName,
+                submitterId: adminData.value.id,
+                submitterMarket: adminData.value.markets,
+                remark: refundFormData.value.remark,
+                refundReason: refundFormData.value.refundReason,
+                refundModel: refundFormData.value.refundModel,
+                id: refundFormData.value.id,
+                orderCode: refundFormData.value.orderCode,
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0,
+                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
+            }
+        })
+        if (result.code == 200) {
+            ElMessage.success('新增退款成功')
+            getlist()
+            closeRefundForm()
+        } else {
+            ElMessage.error(result.msg)
+            getlist()
+        }
+        console.log('返回参数：', result);
+    } catch (error) {
+        console.log(error);
     }
-  } catch (error) {
-    console.log(error);
-  }
 }
 
+// 2.2 搜索与重置
+const search = () => {
+    getlist();
+    ElMessage.success('查询成功');
+};
+
+const reset = () => {
+    searchData.value = {};
+    // 重置页码
+    pageInfo.value.pageNum = 1;
+    getlist();
+};
+
+// 2.3 标签页切换
 const navigateTo = async (tab) => {
-  if (tab === 'pass') {
-    activeTab.value = 'pass'
-    await getlist()
-  } else if (tab === 'done') {
-    activeTab.value = 'done'
-    await getlist()
-  }
-}
+    activeTab.value = tab;
+    await getlist();
+};
+
+// 2.4 审核功能
+// 打开审核弹窗
+const openAuditForm = (row) => {
+    auditFormData.value = { ...row, market: row.marketName };
+    ifGold(auditFormData.value)
+    console.log('isGold', isGold.value);
+
+    auditFormisible.value = true;
+};
+
+// 关闭审核弹窗
+const closeAuditForm = () => {
+    ifReject.value = false;
+    auditFormisible.value = false;
+    auditFormData.value = {};
+};
+
+// 审核通过
+const handelAudit = async () => {
+    try {
+        const result = await request({
+            url: '/cashAudit/collectionAudit',
+            data: {
+                orderCode: auditFormData.value.orderCode,
+                action: 1,
+                auditId: adminData.value.id
+            }
+        });
 
-const EditifGold = () => {
-  isEditGold.value = editFormData.value.goodsName === '金币充值'
+        if (result.code === 200) {
+            ElMessage.success('审核通过');
+            getlist();
+            closeAuditForm();
+        } else {
+            ElMessage.error(result.msg || '审核失败');
+        }
+    } catch (error) {
+        console.error('审核通过请求异常：', error);
+        ElMessage.error('网络异常，请重试');
+    }
+};
+
+//判断产品类型
+const isGold = ref(false)
+const ifGold = (data) => {
+    console.log('data', data);
+    if (data.goodsName === '金币充值') {
+        isGold.value = true
+    } else {
+        isGold.value = false
+    }
 }
+
+// 2.5 编辑手续费功能
+// 打开编辑弹窗
 const openEditForm = (row) => {
-  editFormData.value = {...row}
-  EditifGold()
-  ifOnline.value = row.status === 3
-  editFormisible.value = true
-}
+    editFormData.value = { ...row };
+    // 区分金币产品与普通产品
+    if (row.goodsName === '金币充值') isEditGold.value = true;
+    else isEditGold.value = false;
+    // 在线支付订单允许修改付款信息
+    if (row.status === 3) ifOnline.value = true;
+    else ifOnline.value = false;
+
+    editFormisible.value = true;
+};
+
+// 关闭编辑弹窗
 const closeEditForm = () => {
-  editFormisible.value = false
-  editFormData.value = {}
-  getlist()
-}
+    editFormisible.value = false;
+    editFormData.value = {};
+    editFormRef.value.resetFields();
+};
+
+// 提交编辑（补充手续费）
 const submitEditForm = async () => {
-  try {
-    await editFormRef.value.validate();
-    if (editFormData.value.receivedTime) {
-      editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss')
-    }
-    const result = await request({
-      url: '/cashCollection/complete',
-      data: {
-        orderCode: editFormData.value.orderCode,
-        handlingCharge: editFormData.value.handlingCharge * 100,
-        paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
-        paymentAmount: editFormData.value.paymentAmount * 100,
-        receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
-        receivedAmount: editFormData.value.receivedAmount * 100,
-        receivedTime: editFormData.value.receivedTime,
-        receivedRemark: editFormData.value.receivedRemark,
-      }
-    })
-    if (result.code === 200) {
-      ElMessage.success('提交成功')
-      getlist()
-      closeEditForm()
-    }
-  } catch (error) {
-    ElMessage.error('请检查表单数据格式');
-  }
-}
+    try {
+        await editFormRef.value.validate();
 
-const openRejectReason = (reason) => {
-  rejectReasonContent.value = reason || '无驳回理由'
-  showRejectReasonDialog.value = true
-}
-const closeRejectReasonDialog = () => {
-  showRejectReasonDialog.value = false
-  rejectReasonContent.value = ''
-}
+        // 处理时间格式
+        if (editFormData.value.receivedTime) {
+            editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
+        }
+
+        const result = await request({
+            url: '/cashCollection/complete',
+            data: {
+                orderCode: editFormData.value.orderCode,
+                handlingCharge: editFormData.value.handlingCharge * 100, // 转为分单位
+                paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
+                paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
+                receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
+                receivedAmount: editFormData.value.receivedAmount * 100, // 转为分单位
+                receivedTime: editFormData.value.receivedTime,
+                receivedRemark: editFormData.value.receivedRemark || ''
+            }
+        });
 
+        if (result.code === 200) {
+            ElMessage.success('编辑提交成功');
+            getlist();
+            closeEditForm();
+        } else {
+            ElMessage.error(result.msg || '提交失败');
+        }
+    } catch (error) {
+        console.error('编辑提交请求异常：', error);
+        ElMessage.error('表单验证失败，请检查数据格式');
+    }
+};
+
+// 2.6 辅助功能
+// 图片预览
 const previewImage = (imageUrl) => {
-  const imageElement = document.createElement('img');
-  imageElement.src = imageUrl;
-  imageElement.style.maxWidth = '80vw';
-  imageElement.style.maxHeight = '80vh';
-  const viewer = document.createElement('div');
-  viewer.style.position = 'fixed';
-  viewer.style.top = '0';
-  viewer.style.left = '0';
-  viewer.style.width = '100vw';
-  viewer.style.height = '100vh';
-  viewer.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-  viewer.style.display = 'flex';
-  viewer.style.justifyContent = 'center';
-  viewer.style.alignItems = 'center';
-  viewer.style.zIndex = '9999';
-  viewer.style.overflow = 'auto';
-  viewer.appendChild(imageElement);
-  document.body.appendChild(viewer);
-  viewer.addEventListener('click', () => {
-    document.body.removeChild(viewer);
-  });
-}
+    if (!imageUrl) return;
 
-const handlePagination = (type, val) => {
-  if (type === 'size') {
-    pageInfo.value.pageSize = val
-  } else {
-    pageInfo.value.pageNum = val
-  }
-  getlist()
-}
+    const imageElement = document.createElement('img');
+    imageElement.src = imageUrl;
+    imageElement.style.maxWidth = '80vw';
+    imageElement.style.maxHeight = '80vh';
+    imageElement.style.objectFit = 'contain';
 
-const beforeUpload = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png') {
-    ElMessage.error('图片必须是jpg或png类型!')
-    return false
-  } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片大小不能超过 2MB!')
-    return false
-  }
-  return true
-}
-const handelImgErr = (err) => {
-  ElMessage.error("图片加载失败")
-}
-const handleImageChange = (file) => {
-  uploadRef.value.submit()
-}
-const customUpload = async (options) => {
-  try {
-    const formData = new FormData()
-    formData.append('file', options.file)
-    const response = await API({
-      url: 'https://api.homilychart.com/hljw/api/aws/upload',
-      method: 'POST',
-      data: formData,
-      headers: {
-        'Content-Type': 'multipart/form-data'
-      }
-    })
-    if (response.code === 200 && response.data) {
-      ElMessage.success('上传成功')
-    } else {
-      options.onError(response)
-      ElMessage.error(response.msg || '上传失败')
+    const viewer = document.createElement('div');
+    viewer.style.position = 'fixed';
+    viewer.style.top = '0';
+    viewer.style.left = '0';
+    viewer.style.width = '100vw';
+    viewer.style.height = '100vh';
+    viewer.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
+    viewer.style.display = 'flex';
+    viewer.style.justifyContent = 'center';
+    viewer.style.alignItems = 'center';
+    viewer.style.zIndex = '9999';
+    viewer.appendChild(imageElement);
+
+    // 点击关闭预览
+    viewer.addEventListener('click', () => {
+        document.body.removeChild(viewer);
+    });
+
+    document.body.appendChild(viewer);
+};
+// 2.7 基础数据加载（初始化）
+// 获取管理员信息
+const getAdminData = async () => {
+    try {
+        const result = await API({ url: '/admin/userinfo', data: {} });
+        adminData.value = result;
+
+        // 超级管理员判断（仅用于角色切换权限）
+        if (adminData.value.roleId === 2) {
+            // 管理员所属地区提示
+            if (adminData.value.markets === '总部' || adminData.value.markets === '研发部') {
+                ElMessageBox.alert(
+                    '管理员账号仅显示所属地区的财务数据，请确认地区设置',
+                    '温馨提示',
+                    { type: 'warning' }
+                );
+            }
+        }
+    } catch (error) {
+        console.error('管理员信息获取失败：', error);
+        ElMessage.error('管理员信息加载异常');
     }
-  } catch (error) {
-    ElMessage.error(`上传失败: ${error.msg || error.message || '网络异常'}`)
-  }
-}
+};
 
-const getAdminData = async function () {
-  try {
-    const result = await API({
-      url: '/admin/userinfo',
-      data: {}
-    })
-    adminData.value = result
-  } catch (error) {
-    console.log('管理员信息获取失败', error)
-  }
-}
-const getActivitys = async function () {
-  try {
-    const result = await API({
-      url: '/cashCollection/getActivityList',
-      data: {}
-    })
-    if (result.code === 200) {
-      activityList.value = result.data
-    } else {
-      ElMessage.error('活动列表获取失败')
+// 获取活动列表
+const getActivitys = async () => {
+    try {
+        const result = await API({ url: '/cashCollection/getActivityList', data: {} });
+        if (result.code === 200) {
+            activityList.value = result.data;
+        } else {
+            ElMessage.error('活动列表加载失败');
+        }
+    } catch (error) {
+        console.error('活动列表获取失败：', error);
+        ElMessage.error('活动数据加载异常');
     }
-  } catch (error) {
-    console.log('活动列表请求失败', error)
-  }
-}
+};
 
-const throttledsubmitEditForm = _.throttle(submitEditForm, 5000, {
-  trailing: false
+// 2.8 节流函数（防止重复提交）
+const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, { trailing: false });
+const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
+    trailing: false
 })
+// 2.9 页面初始化
+onMounted(async () => {
+    await getAdminData();
+    await getActivitys();
+    // 初始化加载总部财务订单数据
+    await getlist();
 
-onMounted(async function () {
-  await getAdminData()
-  await getActivitys()
-  if (adminData.value.roleId === 2) {
-    superAdmin.value = true
-  }
-  await getlist()
-})
+    // 菜单权限校验（确保总部财务权限）
+    if (!hasMenuPermission(menuTree.value, 91)) {
+        ElMessageBox.alert(
+            '您暂无该页面操作权限，请联系管理员',
+            '权限提示',
+            { type: 'error' }
+        ).then(() => {
+            window.history.back();
+        });
+    }
+    //背景预加载
+    const bgImg = new Image();
+    bgImg.src = '/src/assets/receive-recall.png';
+});
 
-// 未使用方法占位
-const handleSortChange = () => {}
-const handleDatePickerChange = () => {}
-const disabledDate = () => {}
+// 2.10 未使用函数占位（避免报错）
+const beforeUpload = () => true;
+const handelImgErr = () => { };
+const handleImageChange = () => { };
+const customUpload = () => { };
+const handleDatePickerChange = () => { };
+const disabledDate = () => false;
+const handleSortChange = () => { };
+const handlePagination = (type, val) => {
+    if (type === 'size') pageInfo.value.pageSize = val;
+    else pageInfo.value.pageNum = val;
+    getlist();
+};
 </script>
 
 <style scoped lang="scss">
 .content {
-  height: 100%;
-  width: 80vw;
-
-  .card1 {
-    background: #F3FAFE;
-    width: 100%;
-
-    .row {
-      height: 4vh;
-      width: 80vw;
-      display: flex;
-      min-height: 40px;
-
-      .rowItem {
-        display: flex;
-        width: 15vw;
-        align-items: center;
-        justify-content: center;
-        margin-right: 0.5vw;
-      }
-
-      .buttons {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-left: 10px;
-      }
-    }
-  }
-
-  .div-card2 {
-    width: 100%;
-    margin-top: 2vh;
+    height: 100%;
+    width: 80vw;
 
-    .card2 {
-      background: #E7F4FD;
-    }
+    .card1 {
+        width: 100%;
+        background: #F3FAFE;
 
-    .btns {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-bottom: 10px;
+        .row {
+            height: 4vh;
+            width: 80vw;
+            display: flex;
+            min-height: 40px;
 
-      .tabs {
-        min-width: 300px;
+            .rowItem {
+                display: flex;
+                width: 15vw;
+                align-items: center;
+                justify-content: center;
+                margin-right: 0.5vw;
+            }
 
-        .btnItem {
-          margin-left: 10px;
-          border-radius: 5px;
+            .buttons {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                margin-left: 10px;
+            }
         }
-      }
     }
 
-    .table {
-      margin: 10px;
-      border-radius: 20px;
 
-      .ellipsis-container {
-        position: relative;
+    .div-card2 {
         width: 100%;
+        margin-top: 2vh;
 
-        .ellipsis-text {
-          display: inline-block;
-          width: 100%;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          cursor: pointer;
+        .card2 {
+            background: #E7F4FD;
         }
 
-        .custom-tooltip {
-          position: fixed;
-          z-index: 9999;
-          padding: 8px 12px;
-          width: 200px;
-          background-color: #E4F0FC;
-          color: #333333;
-          border: 1px solid #e5e7eb;
-          border-radius: 4px;
-          box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
-          min-height: 30px;
-          max-height: 300px;
-          overflow-y: auto;
-          font-size: 14px;
-          line-height: 1.5;
+        .btns {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding-bottom: 10px;
+
+            .tabs {
+                min-width: 300px;
+
+                .btnItem {
+                    margin-left: 10px;
+                    border-radius: 5px;
+                }
+            }
         }
-      }
-    }
 
-    .pagination {
-      margin-top: 10px;
-      padding: 10px 10px;
-    }
-  }
 
-  :deep(.editdialog) {
-    min-width: 990px;
-    background-color: #F3FAFE !important;
-    margin-top: 8vh;
-    border-radius: 8px;
+        .table {
+            margin: 10px;
+            border-radius: 20px;
 
-    .content {
-      display: flex;
-      height: 100%;
-      width: 100%;
+            .ellipsis-container {
+                position: relative;
+                width: 100%;
+
+                .ellipsis-text {
+                    display: inline-block;
+                    width: 100%;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    cursor: pointer;
+                }
+
+                .custom-tooltip {
+                    position: fixed;
+                    z-index: 9999;
+                    padding: 8px 12px;
+                    width: 200px;
+                    background-color: #E4F0FC;
+                    color: #333333;
+                    border: 1px solid #e5e7eb;
+                    border-radius: 4px;
+                    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+                    min-height: 30px;
+                    max-height: 300px;
+                    overflow-y: auto;
+                    font-size: 14px;
+                    line-height: 1.5;
+                }
+            }
+        }
+
+        .pagination {
+            margin-top: 10px;
+            padding: 10px 10px;
+        }
+    }
 
-      .left {
+    :deep(.adddialog) {
         min-width: 500px;
-      }
+        background-color: #F3FAFE !important;
+        margin-top: 8vh;
+        border-radius: 8px;
 
-      .right {
-        flex: 1;
+        .addForm {
+            padding: 0 60px 1vh 60px;
 
-        .editFormRight {
-          padding: 0 60px 0 40px;
+            .el-date-editor {
+                display: flex;
+                flex: 1;
 
-          .el-date-editor {
-            display: flex;
-            flex: 1;
-          }
-        }
+            }
 
-        .editBtns {
-          display: flex;
-          justify-content: center;
-          margin-top: 60px;
+            .pic {
+                display: flex;
+                align-items: center;
 
-          .txt {
-            color: #f3fafe;
-            text-align: center;
-            font-family: "PingFang SC";
-            font-size: 14px;
-            font-style: normal;
-            font-weight: 700;
-            line-height: 22px;
-          }
+                .uploader {
+                    height: 80px;
+                    width: 80px;
 
-          .editBtn1 {
-            min-width: 80px;
-            padding: 5px 12px;
-            justify-content: center;
-            align-items: center;
-            gap: 4px;
-            border-radius: 4px;
-            background: #7E91FF;
-            border: none;
-            box-shadow: 0 0 4px 0 #00000040;
-          }
-
-          .editBtn2 {
+                    .el-upload {
+                        height: 100%;
+                        width: 100%;
+                    }
+                }
+
+                .picText {
+                    color: #999999;
+                    font-family: "PingFang SC";
+                    font-size: 10px;
+                    font-style: normal;
+                    font-weight: 400;
+                    line-height: 20px;
+                    margin-left: 10px;
+                }
+            }
+        }
+
+        .dialog-footer {
             display: flex;
-            width: 80px;
-            min-width: 80px;
-            padding: 5px 12px;
             justify-content: center;
-            align-items: center;
-            gap: 4px;
-            border-radius: 4px;
-            background: #2741DE;
-            border: none;
-            box-shadow: 0 0 4px 0 #00000040;
-            margin-left: 60px;
-          }
+            padding-bottom: 1.5vh;
         }
-      }
     }
 
-    .editForm {
-      padding: 0 60px 1vh 60px;
+    :deep(.editdialog) {
+        min-width: 990px;
+        background-color: #F3FAFE !important;
+        margin-top: 8vh;
+        border-radius: 8px;
 
-      .el-date-editor {
-        display: flex;
-        flex: 1;
-      }
+        .editForm {
+            padding: 0 60px 1vh 60px;
 
-      .pic {
-        display: flex;
-        align-items: center;
+            .el-date-editor {
+                display: flex;
+                flex: 1;
+            }
 
-        .uploader {
-          height: 80px;
-          width: 80px;
+            .pic {
+                display: flex;
+                align-items: center;
 
-          .el-upload {
+                .uploader {
+                    height: 80px;
+                    width: 80px;
+
+                    .el-upload {
+                        height: 100%;
+                        width: 100%;
+                    }
+                }
+
+                .picText {
+                    color: #999999;
+                    font-family: "PingFang SC";
+                    font-size: 10px;
+                    font-style: normal;
+                    font-weight: 400;
+                    line-height: 20px;
+                    margin-left: 10px;
+                }
+            }
+        }
+
+        .content {
+            display: flex;
             height: 100%;
             width: 100%;
-          }
+
+            .left {
+                min-width: 500px;
+            }
+
+            .right {
+                flex: 1;
+
+                .editFormRighrt {
+                    padding: 0 60px 0 40px;
+
+                    .el-date-editor {
+                        display: flex;
+                        flex: 1;
+                    }
+                }
+
+                .editBtns {
+                    display: flex;
+                    justify-content: center;
+                    margin-top: 60px;
+
+                    .txt {
+                        color: #f3fafe;
+                        text-align: center;
+                        font-family: "PingFang SC";
+                        font-size: 14px;
+                        font-style: normal;
+                        font-weight: 700;
+                        line-height: 22px;
+                    }
+
+                    .editBtn1 {
+                        min-width: 80px;
+                        padding: 5px 12px;
+                        justify-content: center;
+                        align-items: center;
+                        gap: 4px;
+                        border-radius: 4px;
+                        background: #7E91FF;
+                        border: none;
+                        box-shadow: 0 0 4px 0 #00000040;
+                    }
+
+                    .editBtn2 {
+                        display: flex;
+                        width: 80px;
+                        min-width: 80px;
+                        padding: 5px 12px;
+                        justify-content: center;
+                        align-items: center;
+                        gap: 4px;
+                        border-radius: 4px;
+                        background: #2741DE;
+                        border: none;
+                        box-shadow: 0 0 4px 0 #00000040;
+                        margin-left: 60px;
+                    }
+                }
+            }
+        }
+    }
+
+    :deep(.adddialog .el-form-item__label) {
+        min-width: 80px;
+        width: auto;
+        font-weight: 800;
+        padding-bottom: 15px;
+    }
+
+    .refundDialog {
+        .left {
+            width: 50%;
+            height: 70vh;
+            min-height: 700px;
+            padding: 0 2vw;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
+
+            .image {
+                width: 4vw !important;
+                height: 4vw !important;
+            }
         }
 
-        .picText {
-          color: #999999;
-          font-family: "PingFang SC";
-          font-size: 10px;
-          font-style: normal;
-          font-weight: 400;
-          line-height: 20px;
-          margin-left: 10px;
+        .right {
+            width: 50%;
+            height: 50vh;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
         }
-      }
     }
-  }
+}
 
-  :deep(.el-table__header-wrapper),
-  :deep(.el-table__body-wrapper),
-  :deep(.el-table__cell),
-  :deep(.el-table__body td) {
+// 表格样式统一
+:deep(.el-table__header-wrapper),
+:deep(.el-table__body-wrapper),
+:deep(.el-table__cell),
+:deep(.el-table__body td) {
     background-color: #F3FAFE !important;
-  }
+}
 
-  :deep(.el-table__header th) {
+:deep(.el-table__header th) {
     background-color: #F3FAFE !important;
-  }
+}
 
-  :deep(.el-table__row:hover > .el-table__cell) {
+:deep(.el-table__row:hover > .el-table__cell) {
     background-color: #E5EBFE !important;
-  }
+}
 
-  .reject-reason-box {
+// 驳回理由弹窗样式
+.reject-reason-box {
     --el-message-box-height: 500px;
-  }
+}
 
-  .reject-reason-box .el-message-box__content {
+.reject-reason-box .el-message-box__content {
     max-height: 350px;
     overflow-y: auto;
     white-space: pre-wrap;
-  }
+}
+
+.recallDialog {
+    //撤回弹窗提示
+    height: 392px;
+    width: 700px;
+    background-image: url('/src/assets/receive-recall.png');
+    position: fixed; // 固定定位，相对于浏览器窗口
+    top: 50%; // 距离顶部50%
+    left: 50%; // 距离左侧50%
+    transform: translate(-50%, -50%); // 向左、向上平移自身宽高的50%，实现居中
+    z-index: 1000; // 确保在其他元素上层显示
+
+    .close {
+        position: absolute;
+        left: 625px;
+        top: 20px;
+        height: 38px;
+        width: 38px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 10px;
+        }
+    }
+
+    .text {
+        position: absolute;
+        left: 185px;
+        top: 190px;
+        height: 67px;
+        width: 500px;
+
+        .txt {
+            height: 100%;
+            width: 100%;
+            color: #001a42;
+            font-family: "PingFang SC";
+            font-size: 48px;
+            font-style: normal;
+            font-weight: 900;
+            line-height: normal;
+        }
+    }
+
+    .cancle {
+        position: absolute;
+        left: 185px;
+        top: 304px;
+        height: 55px;
+        width: 150px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 20px;
+        }
+    }
+
+    .confirm {
+        position: absolute;
+        left: 375px;
+        top: 304px;
+        height: 55px;
+        width: 150px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 20px;
+        }
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 91370da..cb76943 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -162,8 +162,8 @@
                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
                         <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
                             show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'" width="150px"
-                            show-overflow-tooltip>
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                            width="150px" show-overflow-tooltip>
                             <template #default="scope">
                                 <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
                                 <span style="color: rgb(127,204,133);" v-else>正常</span>
@@ -543,12 +543,12 @@
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.permanentGold" dsabled />
+                                v-model="refundFormData.partRefundGold" dsabled />
                         </div>
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.freeGold"  />
+                                v-model="refundFormData.partRefundFree" />
                         </div>
                     </div>
                     <div class="add-item">
@@ -650,16 +650,8 @@ const openRefundDialog = () => {
 const closeRefundForm = () => {
     refundDialog.value = false
     refundFormData.value = {}
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 
-const refundCoinData = ref({
-    permanentGold: 0,
-    freeGold: 0
-})
 const isRefundGold = ref(false)
 const ifRefundGold = () => {
     if (refundFormData.value.goodsName === '金币充值') {
@@ -763,10 +755,6 @@ const getlist = async () => {
 const resetRefund = () => {
     refundFormData.value.refundModel = ''
     refundFormData.value.refundReason = ''
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 //提交退款
 const submitRefund = async () => {
@@ -781,35 +769,27 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
+        }
         const result = await request({
             url: '/Money/addOnline',
             data: {
-                jwcode: refundFormData.value.jwcode, // 精网号（必填）
-                name: refundFormData.value.name,  // 姓名（必填）
-                market: refundFormData.value.marketName,  // 所属地区（必填）
-                activity: refundFormData.value.activity, // 活动名称（可选）
-                bankCode: refundFormData.value.bankCode,  // 银行流水订单号（必填）
-                goodsName: refundFormData.value.goodsName, // 商品名称（必填）
-                goodNum: refundFormData.value.goodNum,  // 商品数量（必填，默认0）
-                paymentCurrency: refundFormData.value.paymentCurrency,  // 付款币种（必填）
-                paymentAmount: (refundFormData.value.paymentAmount) * 100,  // 付款金额（必填）
-                receivedCurrency: refundFormData.value.receivedCurrency,  // 到账币种（必填）
-                receivedAmount: (refundFormData.value.receivedAmount) * 100,  // 到账金额（必填）
-                handlingCharge: (refundFormData.value.handlingCharge) * 100,  // 手续费（可选）
-                receivedMarket: refundFormData.value.receivedMarket, // 到账地区（可选）
-                payType: refundFormData.value.payType,  // 支付方式（必填）
-                payTime: refundFormData.value.payTime,  // 付款时间，格式：yyyy-MM-dd HH:mm:ss（可选）
-                receivedTime: refundFormData.value.receivedTime,  // 到账时间，格式：yyyy-MM-dd HH:mm:ss（可选）
-                areaServise: adminData.value.adminName,  // 提交人（可选）
+                jwcode: refundFormData.value.jwcode,
+                name: refundFormData.value.name,
+                market: refundFormData.value.marketName,
                 submitterId: adminData.value.id,
-                voucher: refundFormData.value.voucher,  // 转账凭证URL（可选）
-                remark: refundFormData.value.remark,  // 备注信息（可选）
-                refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
-                refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）
-                id: refundFormData.value.id,                      //订单id
+                submitterMarket: adminData.value.markets,
+                remark: refundFormData.value.remark,
+                refundReason: refundFormData.value.refundReason,
+                refundModel: refundFormData.value.refundModel,
+                id: refundFormData.value.id,
                 orderCode: refundFormData.value.orderCode,
-                permanentGold: (refundCoinData.value.permanentGold) * 100 || 0,
-                freeGold: (refundCoinData.value.freeGold) * 100 || 0
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0,
+                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
             }
         })
         if (result.code == 200) {
@@ -1113,9 +1093,9 @@ onMounted(async () => {
     await getlist();
 
     // 菜单权限校验（确保地区财务权限）
-    if (!hasMenuPermission(menuTree.value, 78)) {
+    if (!hasMenuPermission(menuTree.value, 79)) {
         ElMessageBox.alert(
-            '您暂无地区财务操作权限，请联系管理员',
+            '您暂无该页面操作权限，请联系管理员',
             '权限提示',
             { type: 'error' }
         ).then(() => {

From 0ddb4264d50ba79febe8207244c450e5f177f908 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 14 Nov 2025 10:47:38 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E5=B0=8F=E9=BB=84?=
 =?UTF-8?q?=E8=BD=A6=E6=97=A0=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=97=A0=E6=9D=83=E9=99=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                   |   2 +-
 src/views/channelManage/cart/cart.vue | 450 ++++++++++++++--------------------
 2 files changed, 181 insertions(+), 271 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 28dc0b8..00130fb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -407,7 +407,7 @@ const routes = [
                     {
                         path: 'cart',
                         name: "cart",
-                        component: () => import("../views/channelManage/cart/cart.vue"),
+                        component: () => import("../views/noPermissionPage.vue"),
                         meta: { permissionId: 127 }
                     }   
                 ]
diff --git a/src/views/channelManage/cart/cart.vue b/src/views/channelManage/cart/cart.vue
index 95d90cb..67c097e 100644
--- a/src/views/channelManage/cart/cart.vue
+++ b/src/views/channelManage/cart/cart.vue
@@ -25,44 +25,17 @@ const adminData = ref({})
 // 充值明细表格
 const tableData = ref([])
 
-// 搜索articleVideo 表单
-const beanConsumeArticle = ref({
+// 搜索表单
+const beanCart = ref({
   jwcode: null,
   dept: "",
-  type: "",
-  payMode: "",
-  articleId: "",
-  articleName: "",
-  author: "",
+  goodsName: "",
+  channelName: "",
+  liveName: "",
   startTime: '',
   endTime: '',
-
 })
-// 频道列表
-const channels = ref([])
 
-// 抽离类型选项到响应式数组
-const consumeTypes = ref([
-  { label: '打赏', value: 9 },
-  { label: '打赏', value: 10 },
-  { label: '付费购买', value: 11 },
-])
-
-// 处理 payMode 选择变化
-const handlePayModeChange = (value) => {
-  beanConsumeArticle.value.payMode = value;
-  // 触发搜索
-  ConsumeSelectBy();
-}
-
-//------------------------
-
-// 标记当前激活的时间范围按钮
-const activeTimeRange = ref('')
-// 日期选择器变化时清除按钮激活状态
-const handleDatePickerChange = () => {
-  activeTimeRange.value = ''
-}
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
@@ -73,21 +46,32 @@ const getObj = ref({
 const total = ref(100)
 
 // 搜索对象时间
-const getTime = ref({
-  startTime: '',
-  endTime: ''
-})
+const getTime = ref({})
 
 // 搜索地区列表
 const dept = ref([])
+
+
+// 新增排序字段和排序方式
+const sortField = ref('')
+const sortOrder = ref('')
+
+// 合计数
+const permanentBean = ref(0)
+const freeBean = ref(0)
+const totalNum = ref(0)
+
+
+/*
+====================方法=================================
+*/
+
 // 获取地区列表的方法
 const getDept = async function () {
   try {
     // 发送请求获取地区列表
     const result = await request({
-      // url: '/general/dept',
-
-      url: '/beanConsume/getDept', // todo 换成实际接口地址
+      url: '/beanConsume/getDept', // 地区实际接口地址
       data: { account: adminData.value.account }
     })
     console.log('请求地区列表成功', result)
@@ -103,27 +87,28 @@ const getDept = async function () {
   }
 }
 
-// // 频道模糊查询方法
-// const filterChannel = (query) => {
-//   if (query) {
-//     return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
-//   }
-//   return channels.value;
-// };
-
-// 新增排序字段和排序方式
-const sortField = ref('')
-const sortOrder = ref('')
-
-// 合计数
-const permanentBean = ref(0)
-const freeBean = ref(0)
-const totalNum = ref(0)
-
+// 频道列表
+const channels = ref([])
+// 获取频道列表的方法
+const getChannel = async function () {
+  try {
+    const result = await request({
+      url: '/beanConsume/getLiveChannel', // todo 换成实际接口地址
+      data: { account: adminData.value.account }
+    })
+    console.log('请求频道列表成功', result)
+    // 存储频道数据
+    channels.value = result.data
+    console.log('频道数据', channels.value)
+  } catch (error) {
+    console.log('请求频道列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取频道列表失败，请稍后重试'
+    })
+  }
+}
 
-/*
-====================方法=================================
-*/
 // 获取登录用户信息
 const getAdminData = async function () {
   try {
@@ -139,10 +124,9 @@ const getAdminData = async function () {
   }
 }
 
-
-const ConsumeSelectBy = async function (val) {
+// 搜索方法
+const searchCart = async function () {
   try {
-
     // 搜索参数页码赋值
     if (typeof val === 'number') {
       getObj.value.pageNum = val
@@ -151,19 +135,16 @@ const ConsumeSelectBy = async function (val) {
 
     if (getTime.value != null) {
       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
-        beanConsumeArticle.value.startTime = formatTime(getTime.value[0])
-        beanConsumeArticle.value.endTime = formatTime(getTime.value[1])
+        beanCart.value.startTime = formatTime(getTime.value[0])
+        beanCart.value.endTime = formatTime(getTime.value[1])
       }
     } else {
-      beanConsumeArticle.value.startTime = ''
-      beanConsumeArticle.value.endTime = ''
+      beanCart.value.startTime = ''
+      beanCart.value.endTime = ''
     }
-    beanConsumeArticle.value.sortField = sortField.value
-    beanConsumeArticle.value.sortOrder = sortOrder.value
+    beanCart.value.sortField = sortField.value
+    beanCart.value.sortOrder = sortOrder.value
 
-    console.log('搜索参数_时间', beanConsumeArticle.value.startTime)
-    console.log('搜索参数1', getObj.value)
-    console.log('搜索参数2', beanConsumeArticle.value)
 
     // 发送POST请求
     const result = await request({
@@ -171,210 +152,134 @@ const ConsumeSelectBy = async function (val) {
       data: {
         pageNum: getObj.value.pageNum,
         pageSize: getObj.value.pageSize,
-        beanConsumeArticle: {
-          ...beanConsumeArticle.value,
-          jwcode: beanConsumeArticle.value.jwcode,
-          dept: beanConsumeArticle.value.dept,
-          payMode: beanConsumeArticle.value.payMode,
-          articleId: beanConsumeArticle.value.articleId,
-          articleName: beanConsumeArticle.value.articleName,
-          author: beanConsumeArticle.value.author,
-          startTime: beanConsumeArticle.value.startTime,
-          endTime: beanConsumeArticle.value.endTime,
-          sortField: beanConsumeArticle.value.sortField,
-          sortOrder: beanConsumeArticle.value.sortOrder,
+        beanCart: {
+          ...beanCart.value,
+          sortField: sortField.value,
+          sortOrder: sortOrder.value,
         }
       }
     })
 
-    console.log('请求成功4', sortField)
-    console.log('接口响应结果', result); // 打印接口响应结果
-    if (result.code === 200 && result.data && result.data.list) {
-      // 过滤返回的数据，确保 type 值符合 payMode 规则
-      const filteredList = result.data.list.filter(item => {
-        if (beanConsumeArticle.value.payMode === '0') {
-          return [9, 10].includes(Number(item.type));
-        } else if (beanConsumeArticle.value.payMode === '1') {
-          return Number(item.type) === 11;
-        }
-        return true;
-      });
-      tableData.value = filteredList;
-
-    }
-
     // 合计数的接口
-    // 复制一份 beanConsumeArticle.value 并设置固定的 payType 值 8是文章的
     const sumConsumeParams = {
-      payType: 8, // 固定传入 payType 值 8
-      beanConsumeArticle: {
-        ...beanConsumeArticle.value,
-
+      beanCart: {
+        ...beanCart.value,
       }
-    };
+    }
 
     // 发送 POST 请求获取合计数
     const resultTotalGold = await request({
       url: '/beanConsume/sumConsumeGold',
       data: sumConsumeParams
-    });
+    })
 
-    console.log("总计", resultTotalGold);
+    console.log("总计", resultTotalGold)
 
-    const data = resultTotalGold.data || resultTotalGold;
-    console.log('请求成功3', resultTotalGold.data)
-    console.log('permanentBean3', data.permanentBean)
+    const data = resultTotalGold.data || resultTotalGold
     // 返回字段为 permanentBean、freeBean、totalNum
-    permanentBean.value = Number(data.permanentBean) || 0;
-    freeBean.value = Number(data.freeBean) || 0;
-    totalNum.value = Number(data.totalNum) || 0;
+    permanentBean.value = Number(data.permanentBean) || 0
+    freeBean.value = Number(data.freeBean) || 0
+    totalNum.value = Number(data.totalNum) || 0
 
     // 存储分页总数
     total.value = result.data.total
     console.log('total', total.value)
   } catch (error) {
     console.log('请求失败', error)
+    ElMessage({
+      type: 'error',
+      message: '搜索失败，请稍后重试'
+    })
   }
 }
-// 搜索
+
 const search = function () {
   getObj.value.pageNum = 1
-  if (beanConsumeArticle.value.jwcode) {
+  if (beanConsumeLive.value.jwcode) {
     const numRef = /^\d{1,9}$/;
-    if (!numRef.test(beanConsumeArticle.value.jwcode)) {
+    if (!numRef.test(beanConsumeLive.value.jwcode)) {
       ElMessage.error('请检查精网号格式')
       return
     }
   }
-  if (beanConsumeArticle.value.articleId) {
-    const numRef = /^\d{1,9}$/;
-    if (!numRef.test(beanConsumeArticle.value.articleId)) {
-      ElMessage.error('请检查文章ID格式')
-      return
-    }
-  }
-  ConsumeSelectBy()
+  searchCart()
 }
-// 重置
-const reset = function () {
-  console.log('文章/视频的重置')
-
-  beanConsumeArticle.value.jwcode = null
-  beanConsumeArticle.value.dept = ''
-  beanConsumeArticle.value.type = ''
-  beanConsumeArticle.value.payMode = ''
-  beanConsumeArticle.value.articleId = ''
-  beanConsumeArticle.value.articleName = ''
-  beanConsumeArticle.value.author = ''
 
-  beanConsumeArticle.value.startTime = ''
-  beanConsumeArticle.value.endTime = ''
 
+// 重置
+const reset = function () {
+  console.log('重置搜索条件')
+
+  beanCart.value = {
+    jwcode: null,
+    dept: "",
+    goodsName: "",
+    channelName: "",
+    liveName: "",
+    startTime: '',
+    endTime: '',
+  }
 
   sortField.value = ''
   sortOrder.value = ''
   getTime.value = {}
-  activeTimeRange.value = '' // 清除激活状态
-
-
-  // 点完重置后，重新请求数据
-  ConsumeSelectBy()
-  console.log(' beanConsumeArticle', beanConsumeArticle.value)
-}
-// 今天
-const getToday = function () {
-  const today = dayjs()
-  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-  getTime.value = [startTime, endTime]
-  console.log('getTime', getTime.value)
-  activeTimeRange.value = 'today' // 标记当前激活状态
-
-  ConsumeSelectBy()
-}
-// 昨天
-const getYesterday = function () {
-  const today = dayjs()
-  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
-  getTime.value = [startTime, endTime]
-  console.log('getTime', getTime.value)
-  activeTimeRange.value = 'yesterday' // 标记当前激活状态
-
-  ConsumeSelectBy()
-}
-// 近7天
-const get7Days = function () {
-  const today = dayjs()
-  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-  getTime.value = [startTime, endTime]
-  console.log('getTime', getTime.value)
-  activeTimeRange.value = '7days' // 标记当前激活状态
-
-  ConsumeSelectBy()
+  
+  // 重置后重新请求数据
+  searchCart()
 }
 
+// 处理日期选择
+const handleDatePickerChange = (value) => {
+  if (value && value.length === 2) {
+    beanCart.value.startTime = formatTime(value[0])
+    beanCart.value.endTime = formatTime(value[1])
+  } else {
+    beanCart.value.startTime = ''
+    beanCart.value.endTime = ''
+  }
+}
 
 // 处理排序事件
 const handleSortChange = (column) => {
   console.log('排序字段：', column.prop)
   console.log('排序方式：', column.order)
-  if (column.prop === 'beanNum') {
-    sortField.value = 'beanNum'
-  } else if (column.prop === 'consumeTime') {
-    sortField.value = 'consumeTime'
-  } else if (column.prop === 'buyBean') {
-    sortField.value = 'buyBean'
-  } else if (column.prop === 'freeBean') {
-    sortField.value = 'freeBean'
+  
+  // 只允许指定字段排序
+  const allowedSortFields = ['beanNum', 'consumeTime']
+  if (allowedSortFields.includes(column.prop)) {
+    sortField.value = column.prop
+    sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
+    searchCart()
   }
-  sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
-  ConsumeSelectBy()
 }
 
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val
-  ConsumeSelectBy()
+  searchCart()
 }
 
 const handleCurrentChange = function (val) {
   getObj.value.pageNum = val
-  ConsumeSelectBy()
+  searchCart()
 }
-/*
-====================计算属性=================================
-*/
-
-// 计算总金币数
-// const totalBean = computed(() => permanentBean.value + freeBean.value)
-
-/*
-====================监听=================================
-*/
-
-/*
-====================挂载=================================
-*/
 
 const format3 = (num) => {
   // 每三位添加逗号
   return num.toLocaleString('en-US')
 }
+
 onMounted(async function () {
   await getAdminData()
-  await ConsumeSelectBy()
-
   await getDept()
-
+  await getChannel()
+  await searchCart()
 })
 
-
 const exportExcel = async function () {
-  const params = { //需要修改
+  const params = {
     ...getObj.value,
-    "beanConsumeArticle": {
-      ...beanConsumeArticle.value,
+    "beanCart": {
+      ...beanCart.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
     },
@@ -384,7 +289,10 @@ const exportExcel = async function () {
     ElMessage.success('导出成功')
   }
 }
+
 const exportListVisible = ref(false)
+const exportList = ref([])
+const exportListLoading = ref(false)
 
 // 打开导出列表弹窗
 const openExportList = () => {
@@ -392,22 +300,15 @@ const openExportList = () => {
   exportListVisible.value = true
 }
 
-// 导出列表数据
-const exportList = ref([])
-// 导出列表加载状态
-const exportListLoading = ref(false)
 // 获取导出列表
 const getExportList = async () => {
   exportListLoading.value = true
   try {
-    const result = await API({ url: '/export/export' })
+    const result = await API({ url: '/export/export' }) 
     if (result.code === 200) {
-      const filteredData = result.data.filter(item => {
-        return item.type === 8; //8表示文章/视频
-      });
-      exportList.value = filteredData
+      ElMessage.success('导出成功') 
     } else {
-      ElMessage.error(result.msg || '获取导出列表失败')
+      ElMessage.error(result.msg || '获取导出列表失败') 
     }
   } catch (error) {
     console.error('获取导出列表出错:', error)
@@ -416,6 +317,7 @@ const getExportList = async () => {
     exportListLoading.value = false
   }
 }
+
 // 下载导出文件
 const downloadExportFile = (item) => {
   if (item.state === 2) {
@@ -427,34 +329,36 @@ const downloadExportFile = (item) => {
     ElMessage.warning('文件还在导出中，请稍后再试')
   }
 }
+
 //根据状态返回对应的标签类型
 const getTagType = (state) => {
   switch (state) {
     case 0:
-      return 'info';
+      return 'info'
     case 1:
-      return 'primary';
+      return 'primary'
     case 2:
-      return 'success';
+      return 'success'
     case 3:
-      return 'danger';
+      return 'danger'
     default:
-      return 'info';
+      return 'info'
   }
 }
+
 //根据状态返回对应的标签文案
 const getTagText = (state) => {
   switch (state) {
     case 0:
-      return '待执行';
+      return '待执行'
     case 1:
-      return '执行中';
+      return '执行中'
     case 2:
-      return '执行完成';
+      return '执行完成'
     case 3:
-      return '执行出错';
+      return '执行出错'
     default:
-      return '未知状态';
+      return '未知状态'
   }
 }
 </script>
@@ -465,31 +369,28 @@ const getTagText = (state) => {
       <div class="select">
         <div class="selectRow">
           <el-text class="text" size="large">精网号：</el-text>
-          <el-input class="selectContent" v-model="beanConsumeArticle.jwcode" placeholder="请输入精网号" clearable />
+          <el-input class="selectContent" v-model="beanCart.jwcode" placeholder="请输入精网号" clearable />
         </div>
         <div class="selectRow">
           <el-text class="text" size="large">所属地区：</el-text>
-          <el-select class="selectContent" v-model="beanConsumeArticle.dept" placeholder="请选择地区" clearable>
+          <el-select class="selectContent" v-model="beanCart.dept" placeholder="请选择地区" clearable>
             <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
           </el-select>
         </div>
         <div class="selectRow">
           <el-text class="text" size="large">商品名称：</el-text>
-          <el-select class="selectContent" style="width: 20px" v-model="beanConsumeArticle.payMode" placeholder="请选择类型"
-            clearable @change="handlePayModeChange">
-            <el-option label="打赏" value="0" />
-            <el-option label="付费购买" value="1" />
-            <el-option label="其他" value="2" />
-          </el-select>
+          <el-input class="selectContent" v-model="beanCart.goodsName" placeholder="请输入商品名称" clearable />
         </div>
-        <div class="selectRow">
-          <el-text class="text">频道名称：</el-text>
-          <el-select class="selectContent"  placeholder="请选择频道" clearable filterable>
-            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+        <div class="selectRow" style="width: 12vw;">
+          <el-text class="textB" size="large">频道：</el-text>
+          <el-select class="selectContent" v-model="beanCart.channelName" placeholder="请选择频道" clearable
+            filterable allow-create default-first-option>
+            <el-option v-for="(item, index) in channels" 
+            :key="index" 
+            :label="item" 
+            :value="item" />
           </el-select>
         </div>
-        
-
       </div>
     </el-col>
 
@@ -497,31 +398,34 @@ const getTagText = (state) => {
       <div class="select">
         <div class="selectRow" style="width: 33vw;">
           <el-text class="text" size="large">下单时间：</el-text>
-          <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" range-separator="至"
-            start-placeholder="起始时间" end-placeholder="结束时间" style="width:25vw" @change="handleDatePickerChange"
-            value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime" />
-          <div v-if="false">
-            <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
-            <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
-            <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
-          </div>
+          <el-date-picker 
+            class="selectContent" 
+            v-model="getTime" 
+            type="datetimerange" 
+            range-separator="至"
+            start-placeholder="起始时间" 
+            end-placeholder="结束时间" 
+            style="width:25vw" 
+            @change="handleDatePickerChange"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
         </div>
         <div class="selectRow">
           <el-text class="text" size="large">直播间名称：</el-text>
-          <el-input class="selectContent"  placeholder="请输入直播间" clearable />
+          <el-input class="selectContent" v-model="beanCart.liveName" placeholder="请输入直播间名称" clearable />
         </div>
-
       </div>
     </el-col>
     <el-col>
       <div class="selectButton">
-        <el-button type="primary" @click="search()">查询</el-button>
-        <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+        <el-button type="primary" @click="exportExcel">导出Excel</el-button>
         <el-button type="primary" @click="openExportList">查看导出列表</el-button>
-        <el-button type="success" @click="reset()">重置</el-button>
+        <el-button type="success" @click="reset">重置</el-button>
       </div>
     </el-col>
   </el-card>
+  
   <el-card class="card2">
     <div class="goldStatistics">
       金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -529,8 +433,13 @@ const getTagText = (state) => {
       免费金豆数：{{ format3(Math.abs(freeBean)) }}
     </div>
     <div style="overflow-y: auto">
-      <el-table :data="tableData" style="width: 82vw" height="64vh" @sort-change="handleSortChange"
-      :row-style="{ height: '50px' }">
+      <el-table 
+        :data="tableData" 
+        style="width: 82vw" 
+        height="64vh" 
+        @sort-change="handleSortChange"
+        :row-style="{ height: '50px' }"
+      >
         <el-table-column type="index" label="序号" width="110px" fixed="left">
           <template #default="scope">
             <span>{{
@@ -543,10 +452,10 @@ const getTagText = (state) => {
         <!-- 固定精网号列 -->
         <el-table-column prop="jwcode" label="精网号" width="140px" fixed="left" />
         <el-table-column prop="dept" label="地区" width="140px" />
-        <el-table-column prop="type" label="商品名称" width="160px"/>
+        <el-table-column prop="goodsName" label="商品名称" width="160px"/>
         <el-table-column prop="beanNum" label="金币数量" sortable="custom" width="140px" />
-        <el-table-column prop="buyBean" label="频道名称" width="160px" show-overflow-tooltip />
-        <el-table-column prop="freeBean" label="直播间名称" width="160px" show-overflow-tooltip />
+        <el-table-column prop="channelName" label="频道名称" width="160px" show-overflow-tooltip />
+        <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
         <el-table-column prop="consumeTime" label="下单时间" sortable="custom" width="180px">
           <template #default="scope">
             {{ formatTime(scope.row.consumeTime) }}
@@ -557,9 +466,15 @@ const getTagText = (state) => {
 
     <!-- 分页 -->
     <div class="pagination">
-      <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
-        @current-change="handleCurrentChange"></el-pagination>
+      <el-pagination 
+        background 
+        :page-size="getObj.pageSize" 
+        :page-sizes="[5, 10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper" 
+        :total="total" 
+        @size-change="handlePageSizeChange"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
     </div>
   </el-card>
 
@@ -581,8 +496,7 @@ const getTagText = (state) => {
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-            :disabled="scope.row.state !== 2">
+          <el-button type="primary" size="small" @click="downloadExportFile(scope.row)" :disabled="scope.row.state !== 2">
             下载
           </el-button>
         </template>
@@ -663,10 +577,6 @@ const getTagText = (state) => {
       width: 5vw;
       font-size: 15px;
     }
-    .textB {
-      width: 7vw;
-      font-size: 15px;
-    }
 
     .selectContent {
       flex: 1;