From 49807ae9e3e36eccb5b2ebcdd282c0e4ae29bd4e Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Sat, 28 Jun 2025 14:37:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=EF=BC=88=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=89=20?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E6=98=8E=E7=BB=86=EF=BC=88=E7=BC=BA=E6=80=BB?=
 =?UTF-8?q?=E8=AE=A1=E9=87=91=E5=B8=81=E6=95=B0=EF=BC=89=20=E6=B1=87?=
 =?UTF-8?q?=E7=8E=87=E9=A1=B5=E9=9D=A2=EF=BC=88=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/addCoinConsume.vue    | 157 ++++-----
 src/views/consume/coinConsumeDetail.vue | 141 ++++-----
 src/views/managerecharge/rate.vue       | 311 +++++-------------
 src/views/refund/coinRefundDetail.vue   | 545 ++++++++++++--------------------
 4 files changed, 401 insertions(+), 753 deletions(-)

diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue
index d004932..063615e 100644
--- a/src/views/consume/addCoinConsume.vue
+++ b/src/views/consume/addCoinConsume.vue
@@ -1,9 +1,12 @@
 <script setup>
 import {onMounted, reactive, ref, watch} from "vue";
 import {ElMessage, ElMessageBox} from "element-plus";
-
 import moment from "moment";
 import request from "@/util/http";
+
+
+
+/*====================工具方法==============================*/
 // 精网号去空格
 const trimJwCode = () => {
   if (addConsume.value.jwcode) {
@@ -20,9 +23,19 @@ const trimJwCode = () => {
   }
 }
 
+// ====================数据=================================
+
+/*====================方法=================================*/
+
+/*====================监听=================================*/
+
+/*====================挂载=================================*/
+
+
 
 //这是获取当前登录的用户信息的接口
 const adminData = ref({});
+
 const getAdminData = async function () {
   try {//await 暂停函数执行，直到请求完成
     const result = await request({
@@ -124,37 +137,11 @@ watch(
     }
 );
 
-// 这是添加消费信息的接口
-const add = async function () {
-  try {
-    // 验证输入数据 再验证一次
-    if (!validateInput()) {
-      return;
-    }
-    // 数据转换
-
-    formatConsumeData();
-    // 发送POST请求
-    const result = await request({
-      // url: "/consume/add",
-      url: "http://192.168.8.247:8081/consume/add",
-      data: addConsume.value,
-    });
-    // 处理响应
-    handleResponse(result);
-    // 重置表单
-    resetForm();
-
-  } catch (error) {
-    console.error("请求失败", error);
-    ElMessage.error("添加失败，请检查网络连接或联系管理员");
-  }
-};
-
 // 输入验证函数
 function validateInput() {
   const sumGold = addConsume.value.sumGold;
-
+  trimJwCode();
+  trimJwCode();
   if (user.value.jwcode == null) {
     ElMessage.error("请先查询用户信息");
     addConsume.value.sumGold = null;
@@ -184,32 +171,41 @@ function validateInput() {
   return true;
 }
 
-// 数据格式化函数
-function formatConsumeData() {
-  // 转换数值类型
-  addConsume.value.sumGold = Number(addConsume.value.sumGold);
-  addConsume.value.freeGold = Number(addConsume.value.freeGold);
-  addConsume.value.permanentGold = Number(addConsume.value.permanentGold);
-  addConsume.value.taskGold = Number(addConsume.value.taskGold);
-
-  // 计算金币使用情况
-  const {usedFreeGold, usedPermanentGold, usedTaskGold} =
-      calculateCoins(
-          addConsume.value.sumGold,
-          addConsume.value.freeGold,
-          addConsume.value.permanentGold,
-          addConsume.value.taskGold
-      );
-
-  // 更新使用的金币数量
-  addConsume.value.usedFreeGold = usedFreeGold;
-  addConsume.value.usedPermanentGold = usedPermanentGold;
-  addConsume.value.usedTaskGold = usedTaskGold;
-}
+
+// 这是添加消费信息的接口
+const add = async function () {
+  try {
+    // 验证输入数据 再验证一次
+    if (!validateInput()) {
+      return;
+    }
+    // 计算金币使用情况
+    calculateCoins(addConsume.value.sumGold);
+    console.log("addConsume.value", addConsume.value)
+    // 发送POST请求
+    const result = await request({
+      // url: "/consume/add",
+      url: "http://192.168.8.247:8081/consume/add",
+      data: addConsume.value,
+
+    });
+
+    console.log("add请求", result);
+    // 处理响应
+    handleResponse(result);
+    // 重置表单
+    resetForm();
+
+  } catch (error) {
+    console.error("请求失败", error);
+    ElMessage.error("添加失败，请检查网络连接或联系管理员");
+  }
+};
 
 // 响应处理函数
 function handleResponse(result) {
-  if (result.code !== 0) {
+  console.log("响应结果", result)
+  if (result.code === 200) {
     ElMessage.success("添加成功");
     console.log("请求成功", result);
   } else {
@@ -217,9 +213,9 @@ function handleResponse(result) {
   }
 }
 
-
 // 重置表单函数
 function resetForm() {
+  // 清空表单数据
   addConsume.value = {
     jwcode: null,
     goodsName: "",
@@ -231,7 +227,9 @@ function resetForm() {
     adminId: adminData.value.adminId,
     adminName: adminData.value.adminName,
   };
+
   console.log("重置表单")
+
   user.value = {
     jwcode: null,
     name: "",
@@ -259,14 +257,9 @@ const addBefore = () => {
     if (valid) {
       ElMessageBox.confirm("确认添加？")
           .then(() => {
-            addConsume.value.freeGold = Number(addConsume.value.freeGold);
-            addConsume.value.permanentGold = Number(addConsume.value.permanentGold);
-            addConsume.value.taskGold = Number(-addConsume.value.taskGold);
-            // trimJwCode();
             console.log("这里是jwcode", addConsume.value.jwcode)
             add();
-            console.log("添加成功");
-            imageUrl.value = "";
+            console.log("添加成功",);
             addConsume.value = {};
           })
           .catch(() => {
@@ -289,29 +282,12 @@ const Ref = ref(null);
 const rules = reactive({
   jwcode: [{required: true, message: "请输入精网号", trigger: "blur"}],
   goodsName: [{required: true, message: "请选择消费商品", trigger: "change"}], // 修改为 change
-  // taskCoin: [{required: true, message: "请输入任务金币", trigger: "blur"}],
-  // freeCoin: [{required: true, message: "请输入免费金币", trigger: "blur"}],
-  // rechargeCoin: [
-  //   {required: true, message: "请输入免费金币", trigger: "blur"},
-  // ],
   sumGold: [
     {required: true, message: "消费金币总数不能为空", trigger: "blur"},
 
   ],
 
-  /*  indexName: [
-      {
-        required: true,
-        validator: (rule, value, callback) => {
-          if (isHC.value === 1 && !value) {
-            callback(new Error("请选择指标"));
-          } else {
-            callback();
-          }
-        },
-        trigger: ["change", "blur"],
-      },
-    ]*/
+
 });
 
 // 查询客户信息（通过精网号）
@@ -372,14 +348,6 @@ const getGoods = async function () {
   }
 };
 
-// const getGoodsList = async () => {
-//   const result = await request({ url: '/goods/list' });
-//   goodsList.value = result.map(item => ({
-//     label: item.name,
-//     value: item.name
-//   }));
-// };
-
 
 // 挂载
 onMounted(async function () {
@@ -429,22 +397,6 @@ onMounted(async function () {
       <div style="display: flex; align-items: center; gap: 20px;">
         <el-form-item prop="productName" label="商品名称" style="flex: 1; margin-right: 0px">
 
-          <!--          <el-autocomplete
-                        v-model="addConsume.goodsName"
-                        :fetch-suggestions="queryProductSearch"
-                        placeholder="请选择商品"
-                        style="width: 300px"
-                        @select="handleProductSelect"
-                        value-key="name"
-                        clearable
-                        :trigger-on-focus="true"
-                    >
-
-                      <template #default="{ item }">
-                        <div>{{ item.name }}</div>
-                      </template>
-                    </el-autocomplete>-->
-
           <el-select
               v-model="addConsume.goodsName"
               placeholder="请选择商品"
@@ -530,10 +482,9 @@ onMounted(async function () {
       <el-button type="primary" @click="addBefore"> 提交</el-button>
     </el-form>
 
-    <!--  todo 这里少客户信息栏的卸载 -->
 
     <!-- 客户信息栏 -->
-    <el-card  style="width: 850px; float: right" class="customer-info">
+    <el-card v-if="user.jwcode" style="width: 850px; float: right" class="customer-info">
       <el-form
           :model="user"
           label-width="auto"
diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue
index b9c3d0a..b7105bc 100644
--- a/src/views/consume/coinConsumeDetail.vue
+++ b/src/views/consume/coinConsumeDetail.vue
@@ -1,14 +1,16 @@
 <script setup>
-import {onMounted, ref, watch} from 'vue'
+import {onMounted, ref} from 'vue'
 import {dayjs, ElMessage} from 'element-plus'
 import request from '@/util/http'
 
-
+// 时间格式化
 const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
 
 // 变量
+
 //这是获取用户信息的接口
 const adminData = ref({})
+
 const getAdminData = async function () {
   try {
     const result = await request({
@@ -22,10 +24,12 @@ const getAdminData = async function () {
     console.log('请求失败', error)
   }
 }
+
 // 充值明细表格
 const tableData = ref([])
 // 搜索======================================
-// 搜索detailVo 表单
+
+// 搜索consumeUser 表单
 const consumeUser = ref({
   jwcode: null,
   payPlatform: "",
@@ -41,8 +45,10 @@ const getObj = ref({
   pageNum: 1,
   pageSize: 50
 })
+
 //分页总条目
 const total = ref(100)
+
 // 搜索对象时间
 const getTime = ref({
   startTime: '',
@@ -50,17 +56,15 @@ const getTime = ref({
 })
 // 搜索活动列表
 const activity = ref([])
-// 所有信息
-const allData = ref([])
-// 搜索地区列表
-const area = ref([])
 
+// 搜索地区列表
+const market = ref([])
 
-//标签页默认高亮选项
-const activeName = ref('all')
+// 新增排序字段和排序方式
+const sortField = ref('')
+const sortOrder = ref('')
 
 // 消费平台选项
-// todo 死数据吗？
 const consumePlatform = [
   {
     value: '金币系统',
@@ -81,11 +85,6 @@ const consumePlatform = [
   }
 ]
 
-// //表格高度
-// const tableHeight = computed(function () {
-//   return (getObj.value.pageSize + 1) * 41 + "px";
-// });
-// 方法
 // 合计数的显示数据
 const tableDataTotal = ref({})
 
@@ -93,23 +92,20 @@ const permanentGold = ref(0)
 const freeGold = ref(0)
 const taskGold = ref(0)
 const totalGold = ref(0)
+
+// 方法
+
 // 搜索=========================================================================================================================================================
 // 搜索方法
 
 const ConsumeSelectBy = async function (val) {
   try {
-    /*    // 地区赋值
-        if (adminData.value.area != '总部') {
-          consumeUser.value.area = adminData.value.area
-        }*/
 
     // 搜索参数页码赋值
     if (typeof val === 'number') {
       getObj.value.pageNum = val
     }
     // 搜索参数时间赋值
-    console.log('时间时间111', getTime.value[0])
-    console.log('时间时间22', formatTime(getTime.value[0]))
 
     if (getTime.value != null) {
       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
@@ -128,6 +124,7 @@ const ConsumeSelectBy = async function (val) {
     console.log('搜索参数1', getObj.value)
 
     console.log('搜索参数2', consumeUser.value)
+
     // 发送POST请求
     const result = await request({
       // url: 'consumeUser/selectBy',
@@ -144,13 +141,14 @@ const ConsumeSelectBy = async function (val) {
     const detailWithoutSort = {...consumeUser.value}
     delete detailWithoutSort.sortField
     delete detailWithoutSort.sortOrder
-
+// 这个接口不知道传什么
     const result2 = await request({
       // url: 'http://192.168.8.247:8081/consume/statsGold',
       url: 'http://192.168.8.247:8081/consume/statsGold',
       data: {
         ...detailWithoutSort
       }
+
     })
 
     // 将响应结果存储到响应式数据中
@@ -186,6 +184,7 @@ const ConsumeSelectBy = async function (val) {
         (tableDataTotal.value.sumcion / 100).toFixed(2)
     )
     console.log('tableData', tableData.value)
+
     // 存储分页总数
     total.value = result.data.total
     console.log('total', total.value)
@@ -274,53 +273,7 @@ const get7Days = function () {
   console.log('getTime', getTime.value)
   ConsumeSelectBy()
 }
-//点击标签页
-const handleClick = function (tab, event) {
-  if (tab.props.name === 'all') {
-    adminAll()
-  } else if (tab.props.name === 'wait') {
-    adminWait()
-  } else if (tab.props.name === 'pass') {
-    adminPass()
-  } else if (tab.props.name === 'reject') {
-    adminReject()
-  }
-}
 
-// 挂载
-onMounted(async function () {
-  await getAdminData()
-  await ConsumeSelectBy()
-  // getActivity();
-  await getArea();
-})
-
-// 验证跳转输入框的数字是否合法
-const checkNumber = function () {
-  if (typeof parseInt(getObj.value.pageNum) === 'number') {
-    console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
-    if (
-        getObj.value.pageNum > 0 &&
-        getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
-    ) {
-      getObj.value.pageNum = parseInt(getObj.value.pageNum)
-      console.log('输入的数字合法')
-      ConsumeSelectBy()
-    } else {
-      //提示
-      ElMessage({
-        type: 'error',
-        message: '请检查输入内容'
-      })
-    }
-  } else {
-    //提示
-    ElMessage({
-      type: 'error',
-      message: '请检查输入内容'
-    })
-  }
-}
 // 查询商品的接口
 const goods = ref([])
 const getGoods = async function () {
@@ -340,10 +293,9 @@ const getGoods = async function () {
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
-getGoods()
 
-// 获取地区列表的方法，虚拟接口，替换为实际的地区列表接口地址
-const getArea = async function () {
+// 获取地区列表的方法
+const getMarket = async function () {
   try {
     // 发送请求获取地区列表
     const result = await request({
@@ -354,8 +306,8 @@ const getArea = async function () {
     })
     console.log('请求地区列表成功', result)
     // 存储地区数据
-    area.value = result.data
-    console.log('地区数据', area.value)
+    market.value = result.data
+    console.log('地区数据', market.value)
   } catch (error) {
     console.log('请求地区列表失败', error)
     ElMessage({
@@ -366,9 +318,6 @@ const getArea = async function () {
 }
 
 
-// 新增排序字段和排序方式
-const sortField = ref('')
-const sortOrder = ref('')
 // 处理排序事件
 const handleSortChange = (column) => {
   console.log('排序字段：', column.prop)
@@ -385,14 +334,52 @@ const handleSortChange = (column) => {
   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
   ConsumeSelectBy()
 }
+
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val
   ConsumeSelectBy()
 }
+
 const handleCurrentChange = function (val) {
   getObj.value.pageNum = val
   ConsumeSelectBy()
 }
+// 验证跳转输入框的数字是否合法
+const checkNumber = function () {
+  if (typeof parseInt(getObj.value.pageNum) === 'number') {
+    console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
+    if (
+        getObj.value.pageNum > 0 &&
+        getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
+    ) {
+      getObj.value.pageNum = parseInt(getObj.value.pageNum)
+      console.log('输入的数字合法')
+      ConsumeSelectBy()
+    } else {
+      //提示
+      ElMessage({
+        type: 'error',
+        message: '请检查输入内容'
+      })
+    }
+  } else {
+    //提示
+    ElMessage({
+      type: 'error',
+      message: '请检查输入内容'
+    })
+  }
+}
+// 挂载
+onMounted(async function () {
+  await getAdminData()
+  await ConsumeSelectBy()
+  // getActivity();
+  await getMarket()
+  await getGoods()
+})
+
+
 </script>
 
 <template>
@@ -431,7 +418,7 @@ const handleCurrentChange = function (val) {
                   clearable
               >
                 <el-option
-                    v-for="(item, index) in area"
+                    v-for="(item, index) in market"
                     :key="index"
                     :label="item"
                     :value="item"
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 1d6c538..ae27282 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -1,15 +1,14 @@
 <script setup>
 import {onMounted, reactive, ref} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
-import moment from 'moment'
-
-import _ from 'lodash'
 import request from '@/util/http'
 
-// 查询用户接口
+// 查询当前登录的信息
 const adminData = ref({
+  adminId: '',
   name: ''
 })
+
 const getAdminData = async function () {
   try {
     const result = await request({
@@ -17,21 +16,22 @@ const getAdminData = async function () {
       data: {}
     })
     adminData.value = result
-    rateAdd.value.adminId = adminData.value.adminId
     rateEdit.value.adminId = adminData.value.adminId
     console.log('请求成功', result)
   } catch (error) {
     console.log('请求失败', error)
   }
 }
-getAdminData()
 
-const regeAdd = ref(false)
+// 默认 编辑板块是关的
 const regeEdit = ref(false)
-// 表单引用
+
+// 表单引用(根据id获取信息后 将内容存到编辑表单)
 const editFormRef = ref(null)
+
 //汇率表格数据
 const tableData = ref([])
+
 //搜索对象
 const getObj = ref({
   pageNum: 1,
@@ -39,196 +39,95 @@ const getObj = ref({
 })
 
 const total = ref(0)
-//分页总条目
 
 
-// 替换原来的time，用数组
-const timeRange = ref([])
-
-// 格式化日期为YYYY-MM-DD HH:mm:ss，否则格式不对无法填充日期时间选择器
-const formatDateTime = (date) => {
-  return moment(date).format('YYYY-MM-DD HH:mm:ss')
-}
-
-// const startTime = ref('2023-01-01 00:00:00')
-// const endTime = ref('2025-12-31 23:59:59')
-
-const get = async function (val) {
+const getAllRate = async function (val) {
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
       getObj.value.pageNum = val;
     }
 
-    // 时间赋值
-    const time = {}
-    if (timeRange.value.length === 2) {
-      time.startTime = moment(timeRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
-      time.endTime = moment(timeRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
-    } else { // 这是对时间的模拟，根据需求不需要传时间
-      time.startTime = '2023-01-01 00:00:00'
-      time.endTime = '2025-12-31 23:59:59'
-    }
-
-    console.log('搜索参数', {
-      ...getObj.value,
-      rate: {...time}
-    });
     // 发送POST请求
     const result = await request({
-      url: '/rates/search',
+      url: 'http://192.168.9.21:8081/rate/selectAll',
       method: 'POST',
       data: {
-        ...getObj.value,
-        rate: {...time}
+        pageNum: getObj.value.pageNum,
+        pageSize: getObj.value.pageSize,
       }
     });
 
     // 将响应结果存储到响应式数据中
-    console.log('请求成功', result);
+    console.log('这是汇率列表 请求成功', result);
+
     // 存储表格数据
     tableData.value = result.data.list;
     // 存储分页总条目
     total.value = result.data.total;
+
   } catch (error) {
     console.log('请求失败', error);
     ElMessage.error('请求失败');
   }
 }
 
-// 搜索
-const search = function () {
-  getObj.value.pageNum = 1
-  get()
-}
-// 添加方法
-const rateAdd = ref({})
-const addRate = async function () {
-  rateAdd.value.adminId = adminData.value.adminId
-  if (rateAdd.value.startTime) {
-    const date = new Date(rateAdd.value.startTime)
-    date.setHours(0, 0, 0, 0)
-    rateAdd.value.startTime = `${date.getFullYear()}-${String(
-        date.getMonth() + 1
-    ).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} 00:00:00`
-  }
-  if (rateAdd.value.endTime) {
-    const date = new Date(rateAdd.value.endTime)
-    date.setHours(23, 59, 59, 999)
-    rateAdd.value.endTime = `${date.getFullYear()}-${String(
-        date.getMonth() + 1
-    ).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} 23:59:59`
-  }
-  try {
-    console.log('搜索参数', getObj.value)
-    // 发送POST请求
-    const result = await request({
-      url: '/rates/add',
-      data: rateAdd.value
-    })
-    if (result.code == 0) {
-      ElMessage.error(result.msg)
-    } else {
-      ElMessage({
-        type: 'success',
-        message: '新增汇率成功'
-      })
-    }
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    get()
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
-
-const add = () => {
-  Ref.value.validate(async (valid) => {
-    if (valid) {
-      ElMessageBox.confirm('确认添加？')
-          .then(() => {
-            addRate()
-            rateAdd.value = {}
-            timeRange.value = {
-              startTime: '',
-              endTime: ''
-            }
-            regeAdd.value = false
-          })
-          .catch(() => {
-            regeAdd.value = false
-          })
-    } else {
-      //提示
-      ElMessage({
-        type: 'error',
-        message: '请检查输入内容'
-      })
-    }
-  })
-}
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val
-  get()
+  getAllRate()
 }
+
 const handleCurrentChange = function (val) {
   getObj.value.pageNum = val
-  get()
+  getAllRate()
 }
-// 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次
-const throttledAdd = _.throttle(add, 5000, {trailing: false})
-// 编辑方法
-const rateEdit = ref({})
+
+// 编辑方法 表单
+const rateEdit = ref({
+  id: null,
+  rateName: '',
+  num: null,
+  adminId: null,
+  updateTime: Date.now(),
+})
+
 //查询已有的数据
 const getEditData = async function (row) {
-  // 重置表单
-  if (editFormRef.value) {
-    editFormRef.value.resetFields()
-  }
-
   try {
     console.log('搜索参数', getObj.value)
     // 发送POST请求
     const result = await request({
-      url: '/rates/searchById?rateId=' + row.rateId,
-      data: {}
+      url: 'http://192.168.9.21:8081/rate/selectById',
+      data: {id: row.id}
     })
 
     // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
+    console.log('根据id查 请求成功', result)
     // 存储表格数据
-
-    rateEdit.value = result.data
+    // rateEdit.value = result.data
+    // 只赋部分的
+    rateEdit.value.id = row.id
+    rateEdit.value.rateName = row.rateName
+    rateEdit.value.num = row.num
+    console.log('根据id获取的数据', rateEdit.value)
     rateEdit.value.adminId = adminData.value.adminId
+
   } catch (error) {
     console.log('请求失败', error)
   }
 }
+
 const editRate = async function () {
-  if (rateEdit.value.startTime) {
-    const date = new Date(rateEdit.value.startTime)
-    date.setHours(0, 0, 0, 0)
-    rateEdit.value.startTime = `${date.getFullYear()}-${String(
-        date.getMonth() + 1
-    ).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} 00:00:00`
-  }
-  if (rateEdit.value.endTime) {
-    const date = new Date(rateEdit.value.endTime)
-    date.setHours(23, 59, 59, 999)
-    rateEdit.value.endTime = `${date.getFullYear()}-${String(
-        date.getMonth() + 1
-    ).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} 23:59:59`
-  }
   try {
     console.log('搜索参数', rateEdit.value)
     // 发送POST请求
     const result = await request({
-      url: '/rates/update',
+      url: 'http://192.168.9.21:8081/rate/update',
       data: rateEdit.value
     })
     // 将响应结果存储到响应式数据中
     console.log('请求成功', result)
-    get()
+    await getAllRate()
   } catch (error) {
     console.log('请求失败', error)
   }
@@ -247,26 +146,23 @@ const edit = () => {
 // 关闭编辑弹窗时重置表单
 const cancelEdit = () => {
   regeEdit.value = false
-  if (editFormRef.value) {
-    editFormRef.value.resetFields()
-  }
+
 }
 
+
 const handleEditDialogClose = () => {
   if (editFormRef.value) {
-    editFormRef.value.resetFields()
+    getAllRate()
   }
 }
 
+
 // 挂载
 onMounted(async function () {
-  get()
+  await getAllRate()
+  await getAdminData()
 })
 
-//分页
-function handlePageChange(currentPage, pageSize) {
-  get()
-}
 
 //货币条目
 const options = [
@@ -320,37 +216,7 @@ function formatDate(value) {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 }
 
-function formatDateTwe(value) {
-  if (!value) return ''
-  const date = new Date(value)
-  const year = date.getFullYear()
-  const month = (date.getMonth() + 1).toString().padStart(2, '0')
-  const day = date.getDate().toString().padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
 
-// 新增数据规则
-// 表单验证ref
-const Ref = ref(null)
-const handleStartTimeChange = () => {
-  Ref.value.validateField('endTime')
-}
-const checkStartTime = function (rule, value, callback) {
-  if (value <= new Date()) {
-    callback(new Error('开始时间不能小于当前时间'))
-  } else {
-    callback()
-  }
-}
-const checkEndTime = function (rule, value, callback) {
-  if (value <= new Date()) {
-    callback(new Error('结束时间不能小于当前时间'))
-  } else if (value <= rateAdd.value.startTime) {
-    callback(new Error('结束时间不能小于开始时间'))
-  } else {
-    callback()
-  }
-}
 const checkFreeGoldRadio = function (rule, value, callback) {
   if (value == '0' || value == null || value == '') {
     callback(new Error('请输入汇率比'))
@@ -361,57 +227,37 @@ const checkFreeGoldRadio = function (rule, value, callback) {
   }
 }
 const rules = reactive({
-  currency: [{required: true, message: '请选择货币名称', trigger: 'blur'}],
-  exchangeRate: [{validator: checkFreeGoldRadio, trigger: 'blur'}],
-  // startTime: [
-  //   {required: true, message: '请选择开始时间', trigger: 'blur'},
-  //   {validator: checkStartTime, trigger: 'blur'}
-  // ],
-  // endTime: [
-  //   {required: true, message: '请选择结束时间', trigger: 'blur'},
-  //   {validator: checkEndTime, trigger: 'blur'}
-  // ]
+  rateName: [{required: true, message: '请选择货币名称', trigger: 'blur'}],
+  num: [{validator: checkFreeGoldRadio, trigger: 'blur'}],
 })
 
-// 这是限制输入小数不超过七位并验证格式的方法
 function handleInput(value) {
-  // 检测是否包含非法符号
-  const invalidChars = /[^0-9.]/.test(value);
-  if (invalidChars) {
-    ElMessage.warning('只能输入数字和小数点');
-  }
-
-  // 过滤非法字符，只保留数字、小数点
+  // 初始过滤非数字和小数点字符
   let validValue = value.replace(/[^\d.]/g, '');
 
-  // 确保只有一个小数点
-  validValue = validValue.replace(/\.{2,}/g, '.');
-
-  // 限制只能有一个小数点
-  if (validValue.split('.').length > 2) {
-    validValue = validValue.replace(/\.$/, '');
-    ElMessage.warning('注意！只能使用一个小数点');
+  // 处理多个小数点的情况，保留第一个，移除后续的
+  const parts = validValue.split('.');
+  if (parts.length > 2) {
+    validValue = parts[0] + '.' + parts.slice(1).join('');
+    ElMessage.warning('请输入正确格式');
   }
 
-  // 限制小数点后7位
-  const originalDecimalPart = validValue.split('.')[1] || '';
-  validValue = validValue.replace(/(\.\d{7})\d+/, '$1');
-
-  // 如果截断了小数部分，提示用户
-  const newDecimalPart = validValue.split('.')[1] || '';
-  if (originalDecimalPart.length > 7 && originalDecimalPart !== newDecimalPart) {
+  // 限制小数点后最多7位
+  const [integerPart, decimalPart = ''] = validValue.split('.');
+  if (decimalPart.length > 7) {
+    validValue = `${integerPart}.${decimalPart.slice(0, 7)}`;
     ElMessage.warning('最多只能输入7位小数');
   }
 
-  // 根据需求这里先不用，这里是用防御性编程，直接不允许输入，先留一下，之后可能用
-  // 应用最终处理后的值
-  // rateAdd.value.exchangeRate = validValue;
-  // rateEdit.value.exchangeRate = validValue;
-
-  // 验证最终格式
-  if (validValue && !/^\d+(\.\d{0,7})?$/.test(validValue)) {
+  // 最终格式验证
+  const isValidFormat = /^\d+(\.\d{0,7})?$/.test(validValue);
+  if (value && !isValidFormat) {
     ElMessage.warning('请输入正确的数字格式');
   }
+
+  // 更新表单值
+  rateEdit.value.num = validValue;
+  return validValue;
 }
 
 // 表单大小
@@ -424,10 +270,8 @@ const formSize = ref('default')
   <el-row>
     <el-col>
       <el-card class="box-card" style="max-width: 100%">
-        <!-- 添加 -->
         <!-- 表格 -->
         <div>
-          <!--          这里有个小bug，应该是>0-->
           <el-table
               :data="tableData"
               v-if="(tableData.flag = 1)"
@@ -444,18 +288,18 @@ const formSize = ref('default')
                   }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="currency" label="货币名称" :span="2"/>
-            <el-table-column prop="exchangeRate" label="汇率" :span="2">
+            <el-table-column prop="rateName" label="货币名称" :span="2"/>
+            <el-table-column prop="num" label="汇率" :span="2">
               <template #default="scope">
                 <p>
-                  {{ scope.row.exchangeRate }} ：1
+                  {{ scope.row.num }} ：1
                 </p>
               </template>
             </el-table-column>
 
-            <el-table-column prop="createTime" label="添加时间" :span="3">
+            <el-table-column prop="updateTime" label="添加时间" :span="3">
               <template #default="scope">
-                <span>{{ formatDate(scope.row.createTime) }}</span>
+                <span>{{ formatDate(scope.row.updateTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" :span="3">
@@ -475,6 +319,7 @@ const formSize = ref('default')
             </el-table-column>
           </el-table>
         </div>
+
         <!-- 分页 -->
         <div class="pagination">
           <el-pagination
@@ -510,9 +355,9 @@ const formSize = ref('default')
           :size="formSize"
           status-icon
       >
-        <el-form-item prop="currency" label="货币名称:">
+        <el-form-item prop="rateName" label="货币名称:">
           <el-select
-              v-model="rateEdit.currency"
+              v-model="rateEdit.rateName"
               placeholder="请选择"
               style="width: 240px"
           >
@@ -524,17 +369,17 @@ const formSize = ref('default')
             />
           </el-select>
         </el-form-item>
-        <el-form-item prop="exchangeRate" label="汇率:">
+        <el-form-item prop="num" label="汇率:">
           <el-input
-              v-model="rateEdit.exchangeRate"
+              v-model="rateEdit.num"
               @update:modelValue="handleInput"
               style="width: 120px"
           />
           <p class="unit">:1</p>
           <p class="rate-tip">
             (提示：当前规则每
-            <span>{{ rateEdit.exchangeRate }}</span>
-            <span>{{ rateEdit.currency }}</span>
+            <span>{{ rateEdit.num }}</span>
+            <span>{{ rateEdit.rateName }}</span>
             可兑换 1 新币)
           </p>
         </el-form-item>
diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue
index c9eea7c..0eecb19 100644
--- a/src/views/refund/coinRefundDetail.vue
+++ b/src/views/refund/coinRefundDetail.vue
@@ -1,18 +1,36 @@
 <script setup>
 // 这是退款明细页面
-import { ref, onMounted, reactive, computed } from 'vue'
+import {ref, onMounted, reactive, computed} from 'vue'
 import ElementPlus from 'element-plus'
-import { AiFillRead } from 'vue-icons-plus/ai'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import {AiFillRead} from 'vue-icons-plus/ai'
+import {ElMessage, ElMessageBox} from 'element-plus'
 import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http'
+import request from '@/util/http'
+
+// 精网号去空格
+const trimJwCode = () => {
+  if (refundUser.value.jwcode) {
+    // 去除所有空格，并尝试转换为整数
+    const trimmed = refundUser.value.jwcode.toString().replace(/\s/g, '');
+    const numeric = Number(trimmed);
+
+    // 如果转换为数字成功，保存为数字，否则提示错误
+    if (!isNaN(numeric)) {
+      refundUser.value.jwcode = numeric;
+    } else {
+      ElMessage.error("精网号格式不正确，请输入数字");
+    }
+  }
+}
+
 // 变量
 //这是获取用户信息的接口
 const adminData = ref({})
 const getAdminData = async function () {
   try {
-    const result = await API({ url: '/admin/userinfo', data: {} })
+    const result = await API({url: '/admin/userinfo', data: {}})
 
     adminData.value = result
     console.log('请求成功', result)
@@ -24,8 +42,15 @@ const getAdminData = async function () {
 // 充值明细表格
 const tableData = ref([])
 // 搜索======================================
-// 搜索detail
-const detail = ref({})
+// 搜索（筛选）明细 表单
+const refundUser = ref({
+  jwcode: null,
+  refundModel: "",
+  market: "",
+  startTime: "",
+  endTime: "",
+  goodsName: ""
+})
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
@@ -35,13 +60,8 @@ const getObj = ref({
 const total = ref(100)
 // 搜索对象时间
 const getTime = ref([])
-// 所有信息
-const allData = ref([])
 // 搜索地区列表
-const area = ref([])
-
-//标签页默认高亮选项
-const activeName = ref('all')
+const market = ref([])
 
 // 退款类型
 const consumeType = [
@@ -51,119 +71,74 @@ const consumeType = [
   }
 ]
 
-// //表格高度
-// const tableHeight = computed(function () {
-//   return (getObj.value.pageSize + 2) * 45 + "px";
-// });
 
 // 方法
 // 统计合计数
-const trueGold = ref(0)
-const trueRgold = ref(0)
-const trueFgold = ref(0)
-const trueTgold = ref(0)
+
 // 待审核各种类金币数
-const pendingRgold = ref(0)
-const pendingFgold = ref(0)
-const pendingTgold = ref(0)
+
 // 待审核金币数
-const pendingGold = ref(0)
 // 已通过各种类金币数
-const approvedRgold = ref(0)
-const approvedFgold = ref(0)
-const approvedTgold = ref(0)
+
 // 已通过金币数
-const approvedGold = ref(0)
+
 // 已驳回各种类金币数
-const rejectedRgold = ref(0)
-const rejectedFgold = ref(0)
-const rejectedTgold = ref(0)
+
 // 已驳回金币数
-const rejectedGold = ref(0)
+
 // 搜索==============================================================
 // 搜索方法
 const get = async function (val) {
+
   try {
-    // 地区赋值
-    if (adminData.value.area === '泰国') {
-      detail.value.areas = ['泰国', '越南']
-    } else if (adminData.value.area !== '总部') {
-      detail.value.area = adminData.value.area
-    }
     // 搜索参数页码赋值
     if (typeof val === 'number') {
       getObj.value.pageNum = val
     }
+
+    // todo 时间格式化
     // 搜索参数时间赋值
     if (getTime.value != null) {
       if (getTime.value.startDate != '' && getTime.value.endDate != '') {
-        detail.value.startDate = getTime.value[0]
-        detail.value.endDate = getTime.value[1]
+        refundUser.value.startDate = getTime.value[0]
+        refundUser.value.endDate = getTime.value[1]
       }
     } else {
-      detail.value.startDate = ''
-      detail.value.endDate = ''
+      refundUser.value.startDate = ''
+      refundUser.value.endDate = ''
     }
+
+    // todo 排序后端还没有弄
     // 添加排序字段和排序方式到请求参数
-    detail.value.sortField = sortField.value
-    detail.value.sortOrder = sortOrder.value
+    refundUser.value.sortField = sortField.value
+    refundUser.value.sortOrder = sortOrder.value
+
     console.log('搜索参数', getObj.value)
     // 发送POST请求
     const result = await API({
-      url: '/refund/search',
+      url: 'http://192.168.8.247:8081/refund/selectBy',
       data: {
-        ...getObj.value,
-        detail: { ...detail.value }
+        pageNum: getObj.value.pageNum,
+        pageSize: getObj.value.pageSize,
+        refundUser: refundUser.value
       }
     })
-    // 复制一份 detail.value 并移除排序字段和排序方式
-    const detailWithoutSort = { ...detail.value }
+    // 复制一份 refundUser.value 并移除排序字段和排序方式
+    const detailWithoutSort = {...refundUser.value}
     delete detailWithoutSort.sortField
     delete detailWithoutSort.sortOrder
 
     const result2 = await API({
-      url: '/refund/RefundA',
+      url: 'http://192.168.8.247:8081/refund/statsGold',
       data: {
         ...detailWithoutSort
       }
     })
-    // 统计合计数
-    if (result2.data) {
-      result2.data.forEach((item) => {
-        switch (item.status) {
-          case '待审核':
-            // 若 item.raudit 为空则赋值为 0
-            pendingRgold.value = item.sumRaudit1 || 0
-            pendingFgold.value = item.sumRaudit2 || 0
-            pendingTgold.value = item.sumRaudit3 || 0
-            // 若 item.sumRaudit 为空则赋值为 0
-            pendingGold.value = item.sumRaudit || 0
-            break
-          case '已通过':
-            approvedRgold.value = item.sumRaudit1 || 0
-            approvedFgold.value = item.sumRaudit2 || 0
-            approvedTgold.value = item.sumRaudit3 || 0
-            approvedGold.value = item.sumRaudit || 0
-            break
-          case '已驳回':
-            rejectedRgold.value = item.sumRaudit1 || 0
-            rejectedFgold.value = item.sumRaudit2 || 0
-            rejectedTgold.value = item.sumRaudit3 || 0
-            rejectedGold.value = item.sumRaudit || 0
-            break
-        }
-      })
-    }
 
-    trueFgold.value =
-      pendingFgold.value + approvedFgold.value + rejectedFgold.value
-    trueRgold.value =
-      pendingRgold.value + approvedRgold.value + rejectedRgold.value
-    trueTgold.value =
-      pendingTgold.value + approvedTgold.value + rejectedTgold.value
-    trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
     // 将响应结果存储到响应式数据中
     console.log('请求成功', result)
+
+    console.log("")
     // 存储表格数据
     tableData.value = result.data.list
     console.log('tableData', tableData.value)
@@ -184,11 +159,7 @@ const search = function () {
 }
 // 重置
 const reset = function () {
-  detail.value.refundGoods = ''
-  detail.value.refundType = ''
-  detail.value.area = ''
-  detail.value.startDate = ''
-  detail.value.endDate = ''
+  refundUser.value = {}
   sortField.value = ''
   sortOrder.value = ''
   getTime.value = {}
@@ -197,14 +168,14 @@ const reset = function () {
 const getToday = function () {
   const today = new Date()
   const startDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate()
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate()
   )
   const endDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate() + 1
   )
   getTime.value = [startDate, endDate]
   console.log('getTime', getTime.value)
@@ -215,14 +186,14 @@ const getYesterday = function () {
   const yesterday = new Date()
   yesterday.setDate(yesterday.getDate() - 1)
   const startDate = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate()
+      yesterday.getFullYear(),
+      yesterday.getMonth(),
+      yesterday.getDate()
   )
   const endDate = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate() + 1
+      yesterday.getFullYear(),
+      yesterday.getMonth(),
+      yesterday.getDate() + 1
   )
   getTime.value = [startDate, endDate]
   console.log('getTime', getTime.value)
@@ -232,67 +203,22 @@ const getYesterday = function () {
 const get7Days = function () {
   const today = new Date()
   const startDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() - 6
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate() - 6
   )
   const endDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate() + 1
   )
   getTime.value = [startDate, endDate]
   console.log('getTime', getTime.value)
   get()
 }
-//全部充值明细
-const adminAll = function () {
-  console.log('adminAll')
-  detail.value.status = ''
-  getObj.value.pageNum = 1
 
-  get()
-  trueFgold.value =
-    pendingFgold.value + approvedFgold.value + rejectedFgold.value
-  trueRgold.value =
-    pendingRgold.value + approvedRgold.value + rejectedRgold.value
-  trueTgold.value =
-    pendingTgold.value + approvedTgold.value + rejectedTgold.value
-  trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
-}
-//待审核充值明细
-const adminWait = async function () {
-  detail.value.status = 0
-  getObj.value.pageNum = 1
-  await get()
-  console.log('adminWait')
-  trueFgold.value = pendingFgold.value
-  trueRgold.value = pendingRgold.value
-  trueTgold.value = pendingTgold.value
-  trueGold.value = pendingGold.value
-}
-//已通过充值明细
-const adminPass = async function () {
-  detail.value.status = 1
-  getObj.value.pageNum = 1
-  await get()
-  console.log('adminPass')
-  trueFgold.value = approvedFgold.value
-  trueRgold.value = approvedRgold.value
-  trueTgold.value = approvedTgold.value
-  trueGold.value = approvedGold.value
-}
-//已驳回充值明细
-const adminReject = async function () {
-  detail.value.status = 2
-  getObj.value.pageNum = 1
-  await get()
-  console.log('adminReject')
-  trueFgold.value = rejectedFgold.value
-  trueRgold.value = rejectedRgold.value
-  trueTgold.value = rejectedTgold.value
-  trueGold.value = rejectedGold.value
-}
+
+
 //点击标签页
 // 设置tab.props.name默认为all
 const tabName = ref('all')
@@ -308,73 +234,58 @@ const handleClick = function (tab, event) {
   }
 }
 
-// 获取地区
-const getArea = async function () {
+// 获取地区列表的方法
+const getMarket = async function () {
   try {
-    // 发送POST请求
-    const result = await API({ url: '/recharge/user/search', data: {} })
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    // 存储地区信息
-    area.value = result.data
-    console.log('地区', area.value)
-  } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-}
-
-//删除气泡
-const delObj = ref({})
-const del = function (row) {
-  delObj.value.detailId = row.detailId
-  console.log('delObj', delObj.value)
-}
-// 删除按钮的气泡弹出框确认按钮
-const delConfirm = async function () {
-  try {
-    console.log('delObj', delObj.value)
-    // 发送POST请求
-    const result = await API({
-      url: '/refund/softDelete?detailId=' + delObj.value.detailId,
+    // 发送请求获取地区列表
+    const result = await request({
+      // todo 接口不对
+      // url: '/general/market',
+      url: 'http://192.168.8.247:8081/general/market', // todo 换成实际接口地址
       data: {}
     })
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    // 刷新表格数据
-    get()
+    console.log('请求地区列表成功', result)
+    // 存储地区数据
+    market.value = result.data
+    console.log('地区数据', market.value)
   } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
+    console.log('请求地区列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取地区列表失败，请稍后重试'
+    })
   }
 }
 
+
 // 查询商品的接口
 const goods = ref([])
 const getGoods = async function () {
   try {
     // 发送POST请求
-    const result = await API({ url: '/product', data: {} })
+    const result = await request({
+      url: 'http://192.168.8.247:8081/general/goods',
+      data: {}
+    })
     // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
+    console.log('请求成功product', result)
     // 存储全部数据
     goods.value = result.data
-    console.log('allData', allData.value)
-    console.log('地区', area.value)
+    console.log('goods 数据', goods.value) // 修改日志输出
   } catch (error) {
     console.log('请求失败', error)
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
-getGoods()
+
 
 // 验证跳转输入框的数字是否合法
 const checkNumber = function () {
   if (typeof parseInt(getObj.value.pageNum) === 'number') {
     console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
     if (
-      getObj.value.pageNum > 0 &&
-      getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
+        getObj.value.pageNum > 0 &&
+        getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
     ) {
       getObj.value.pageNum = parseInt(getObj.value.pageNum)
       console.log('输入的数字合法')
@@ -398,7 +309,8 @@ const checkNumber = function () {
 onMounted(async function () {
   await getAdminData()
   await get()
-  await getArea()
+  await getMarket()
+  await getGoods()
 })
 // 新增排序字段和排序方式
 const sortField = ref('')
@@ -439,13 +351,13 @@ const handleCurrentChange = function (val) {
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">精网号：</el-text>
-              
+
               <el-input
-                v-model="detail.jwcode"
-                placeholder="请输入精网号"
-                size="large"
-                style="width: 150px"
-                clearable
+                  v-model="refundUser.jwcode"
+                  placeholder="请输入精网号"
+                  size="large"
+                  style="width: 150px"
+                  clearable
               />
             </div>
           </el-col>
@@ -453,17 +365,18 @@ const handleCurrentChange = function (val) {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">退款类型：</el-text>
               <el-select
-                v-model="detail.refundType"
-                placeholder="请选择退款类型"
-                size="large"
-                style="width: 180px"
-                clearable
+                  v-model="refundUser.refundType"
+                  placeholder="请选择退款类型"
+                  size="large"
+                  style="width: 180px"
+                  clearable
               >
+<!--                todo 这需要改-->
                 <el-option
-                  v-for="item in consumeType"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                    v-for="item in consumeType"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                 />
               </el-select>
             </div>
@@ -472,18 +385,18 @@ const handleCurrentChange = function (val) {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">退款商品：</el-text>
               <el-select
-                v-model="detail.refundGoods"
-                placeholder="请选择退款商品"
-                size="large"
-                style="width: 180px"
-                clearable
-                
+                  v-model="refundUser.refundGoods"
+                  placeholder="请选择退款商品"
+                  size="large"
+                  style="width: 180px"
+                  clearable
+
               >
                 <el-option
-                  v-for="item in goods"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.name"
+                    v-for="item in goods"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
                 />
               </el-select>
             </div>
@@ -492,17 +405,17 @@ const handleCurrentChange = function (val) {
             <div class="head-card-element" v-if="adminData.area == '总部'">
               <el-text class="mx-1" size="large">所属地区：</el-text>
               <el-select
-                v-model="detail.area"
-                placeholder="请选择所属地区"
-                size="large"
-                style="width: 180px"
-                clearable
+                  v-model="refundUser.market"
+                  placeholder="请选择所属地区"
+                  size="large"
+                  style="width: 180px"
+                  clearable
               >
                 <el-option
-                  v-for="item in area"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                    v-for="item in market"
+                    :key="item"
+                    :label="item"
+                    :value="item"
                 />
               </el-select>
             </div>
@@ -513,18 +426,19 @@ const handleCurrentChange = function (val) {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">退款时间：</el-text>
               <el-date-picker
-                v-model="getTime"
-                type="datetimerange"
-                range-separator="至"
-                start-placeholder="起始时间"
-                end-placeholder="结束时间"
+                  v-model="getTime"
+                  type="datetimerange"
+                  range-separator="至"
+                  start-placeholder="起始时间"
+                  end-placeholder="结束时间"
               />
               <el-button style="margin-left: 10px" @click="getToday()"
-                >今</el-button
+              >今
+              </el-button
               >
               <el-button @click="getYesterday()">昨</el-button>
               <el-button @click="get7Days()">近7天</el-button>
-            
+
               <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
               <el-button type="primary" @click="exportExcel">导出Excel</el-button>
@@ -559,38 +473,39 @@ const handleCurrentChange = function (val) {
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto;margin-top:10px">
           <el-table
-            :data="tableData"
-            style="width: 100%"
-            @sort-change="handleSortChange"
-            height="520px"
+              :data="tableData"
+              style="width: 100%"
+              @sort-change="handleSortChange"
+              height="520px"
           >
             <el-table-column
-              type="index"
-              label="序号"
-              width="100px"
-              fixed="left"
+                type="index"
+                label="序号"
+                width="100px"
+                fixed="left"
             >
               <template #default="scope">
                 <span>{{
-                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-                }}</span>
+                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                  }}</span>
+
               </template>
             </el-table-column>
             <el-table-column
-              prop="username"
-              label="姓名"
-              fixed="left"
-              width="100px"
+                prop="name"
+                label="姓名"
+                fixed="left"
+                width="100px"
             />
             <el-table-column
-              prop="jwcode"
-              label="精网号"
-              fixed="left"
-              width="110px"
+                prop="jwcode"
+                label="精网号"
+                fixed="left"
+                width="110px"
             />
-            <el-table-column prop="area" label="所属地区" width="110px" />
-            <el-table-column prop="refundGoods" label="商品名称" width="100px" />
-            <el-table-column prop="refundType" label="退款类型" width="100px" />
+            <el-table-column prop="market" label="所属地区" width="110px"/>
+            <el-table-column prop="refundGoods" label="商品名称" width="100px"/>
+            <el-table-column prop="refundType" label="退款类型" width="100px"/>
 
             <el-table-column label="退款金币总数" width="110px">
               <template #default="scope">
@@ -603,108 +518,57 @@ const handleCurrentChange = function (val) {
             </el-table-column>
             <el-table-column prop="typeR" label="退款方式" width="110px"/>
             <el-table-column
-              prop="rechargeCoin"
-              label="永久金币"
-              width="110px"
-              sortable="“custom”"
+                prop="rechargeCoin"
+                label="永久金币"
+                width="110px"
+                sortable="“custom”"
             />
             <el-table-column
-              prop="freeCoin"
-              sortable="“custom”"
-              label="免费金币"
-              width="110px"
+                prop="freeCoin"
+                sortable="“custom”"
+                label="免费金币"
+                width="110px"
             />
             <el-table-column
-              prop="taskCoin"
-              sortable="“custom”"
-              label="任务金币"
-              width="110px"
+                prop="taskCoin"
+                sortable="“custom”"
+                label="任务金币"
+                width="110px"
             />
             <!-- 修改prop为taskGold -->
             <el-table-column
-              prop="remark"
-              label="退款原因"
-              width="160px"
-              show-overflow-tooltip
+                prop="remark"
+                label="退款原因"
+                width="160px"
+                show-overflow-tooltip
             />
-            <el-table-column prop="adminName" label="提交人" width="100px" />
-             <!-- <el-table-column prop="status" label="审核状态" width="120px">
-              <template #default="scope">
-                <span v-if="scope.row.status == 1">
-                  <div class="status">
-                    <span class="green-dot"></span>
-                    <span>已通过</span>
-                  </div>
-                </span>
-                <span v-if="scope.row.status == 0">
-                  <div class="status">
-                    <span class="grey-dot"></span>
-                    <span>待审核</span>
-                  </div>
-                </span>
-                <span v-if="scope.row.status == 2">
-                  <div class="status">
-                    <span class="red-dot"></span>
-                    <span>已驳回</span>
-                  </div>
-                </span>
-              </template>
-            </el-table-column> 
-            <el-table-column
-              prop="reson"
-              label="驳回理由"
-              width="200px"
-              show-overflow-tooltip
-            /> -->
+            <el-table-column prop="adminName" label="提交人" width="100px"/>
+
             <el-table-column
-              prop="createTime"
-              sortable="“custom”"
-              label="提交时间"
-              width="180px"
+                prop="createTime"
+                sortable="“custom”"
+                label="提交时间"
+                width="180px"
             >
               <template #default="scope">
                 {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
               </template>
             </el-table-column>
-            <!-- <el-table-column
-              prop="operation"
-              label="操作"
-              fixed="right"
-              width="120px"
-            >
-              <template #default="scope">
-                <el-popconfirm
-                  title="确定将此条活动删除吗？"
-                  @confirm="delConfirm"
-                >
-                  <template #reference>
-                    <el-button type="primary" text @click="del(scope.row)">
-                      删除
-                    </el-button>
-                  </template>
-                  <template #actions="{ delConfirm, cancel }">
-                    <el-button size="small" @click="cancel">取消</el-button>
-                    <el-button type="primary" size="small" @click="delConfirm">
-                      确定
-                    </el-button>
-                  </template>
-                </el-popconfirm>
-              </template>
-            </el-table-column> -->
+
           </el-table>
         </div>
 
         <!-- 分页 -->
         <div class="pagination" style="margin-top: 20px">
           <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"
-            @jump="checkPageNumber"
+              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"
+              @jump="checkPageNumber"
           ></el-pagination>
         </div>
       </el-card>
@@ -728,6 +592,7 @@ const handleCurrentChange = function (val) {
 .head-card-btn {
   margin-left: auto;
 }
+
 .pagination {
   display: flex;
   margin-top: 20px;