From 5792155eaa018dd5e61ab283211151e88195f310 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Mon, 30 Jun 2025 17:51:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=E5=85=85=E5=80=BC=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=EF=BC=88=E7=BC=BA=E6=80=BB=E8=AE=A1=E6=8E=A5=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E7=BC=BA=E6=8E=92=E5=BA=8F=EF=BC=892.=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=99=E5=90=8E=E7=AB=AF*100=20=E6=8B=BF=E5=88=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE/100=203.=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=BA=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=20fix:=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/rechargeAudit.vue       | 357 ++++++++++++++------------------
 src/views/audit/refundAudit.vue         |  32 +--
 src/views/consume/addCoinConsume.vue    |  32 ++-
 src/views/consume/coinConsumeDetail.vue |  97 ++++-----
 src/views/managerecharge/rate.vue       | 128 +-----------
 5 files changed, 241 insertions(+), 405 deletions(-)

diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index 03f853f..19b507c 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -1,6 +1,6 @@
 <script setup>
-import {computed, onMounted, reactive, ref, watch} from 'vue'
-import {ElMessage} from 'element-plus'
+import {computed, onMounted, reactive, ref} from 'vue'
+import {dayjs, ElMessage} from 'element-plus'
 import request from '@/util/http'
 import moment from 'moment'
 
@@ -11,93 +11,35 @@ import moment from 'moment'
 
 // 精网号去空格
 const trimJwCode = () => {
-  if (rechargeVo.value.jwcode) {
-    rechargeVo.value.jwcode = rechargeVo.value.jwcode.replace(/\s/g, '');
+  if (rechargeAudit.value.jwcode) {
+    rechargeAudit.value.jwcode = rechargeAudit.value.jwcode.replace(/\s/g, '');
   }
 }
 
+const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+
+
 /*
 ===================数据============================
 */
 //这是获取用户信息的接口
-const adminData = ref({})
+const adminData = ref({
+
+})
 // 充值明细表格
-const tableData1 = ref([])
+const tableData = ref([])
 
-// 模拟充值明细表格 // todo 之后换掉，不用模拟数据
-const tableData = ref([
-  {
-    name: '测试',
-    jwcode: 1001,
-    market: "地区1",
-    activity: "活动1",
-    money: 100,  // 充值金额
-    permanentGold: 100, // 永久金币
-
-    freeGold: 50, // 免费金币
-    taskGold: 10, // 任务金币
-    remark: "备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注",//备注
-    reason: "驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由",//驳回理由
-    payMode: "微信",// 支付方式
-    voucher: "https://www.keaitupian.cn/cjpic/frombd/2/253/1659552792/3869332496.jpg",//支付凭证
-    adminName: "提交人姓名", // 提交人姓名
-    auditName: "审核人姓名",// 审核人姓名  // 当前登录人
-    payTime: "2025-6-28 14:31:20",//付款时间
-    createTime: "2025-6-29 14:31:20",//提交时间
-    auditStatus: 0, // 审核状态 （0待审核、1通过、2驳回、3外部传入【默认通过】）
-  },
-  {
-    name: '测试2',
-    jwcode: 1002,
-    market: "地区2",
-    activity: "活动2",
-    money: 200,  // 充值金额
-    permanentGold: 200, // 永久金币
-
-    freeGold: 50, // 免费金币
-    taskGold: 10, // 任务金币
-    remark: "2备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注",//备注
-    reason: "2驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由",//驳回理由
-    payMode: "2微信",// 支付方式
-    voucher: "https://www.keaitupian.cn/cjpic/frombd/2/253/1659552792/3869332496.jpg",//支付凭证
-    adminName: "提交人姓名", // 提交人姓名
-    auditName: "审核人姓名",// 审核人姓名  // 当前登录人
-    payTime: "3025-6-28 14:31:20",//付款时间
-    createTime: "3025-6-29 14:31:20",//提交时间
-    auditStatus: 1, // 审核状态 （0待审核、1通过、2驳回、3外部传入【默认通过】）
-  },
-])
-/*
-    name: '',
-    jwcode: null,
-    market: "",
-    activity: "",
-    money: null,  // 充值金额
-    permanentGold: null, // 永久金币
-    freeGold: null, // 免费金币
-    taskGold: null, // 任务金币
-    remark: "",//备注
-    reason: "",//拒绝理由
-    payMode: "",// 支付方式
-    voucher: "",//支付凭证
-    /!*  adminId: null, // 提交人id
-      auditId:null,// 审核人id*!/
-    adminName: "", // 提交人姓名
-    auditName: "",// 审核人姓名  // 当前登录人
-    payTime: "",//付款时间
-    createTime: "",//提交时间
-    auditStatus: null, // 审核状态 （0待审核、1通过、2驳回、3外部传入【默认通过】）
-
-    */
 
 // 搜索表单数据
-const rechargeVo = ref({
+const rechargeAudit = ref({
   jwcode: null,//精网号
   activity: "", //活动名称
-  payMode: "",// 支付方式
+  payModel: "",// 支付方式
   startTime: "", // 充值时间开始
   endTime: "", // 充值时间结束
   market: "",//地区
+  auditStatus: "0"
 })
 
 
@@ -117,13 +59,26 @@ const market = ref([])
 // 驳回弹出框
 const rejectVisible = ref(false)
 // 驳回对象
-const rejectObj = ref({})
+const rejectObj = ref({
+  token: "",
+  orderCode: "",
+  rejectReason: "",
+  auditId: null,
+  action: 2
+
+})
 // 通过对象
-const passObj = ref({})
+const passObj = ref({
+  token: "",
+  orderCode: "",
+  rejectReason: "",
+  auditId: null,
+  action: 1
+})
 //标签页默认是待审批
 const activeName = ref('wait')
 // 支付方式选项
-const payMode = [
+const payModel = [
   {
     value: '微信',
     label: '微信'
@@ -179,7 +134,7 @@ const sortOrder = ref('')
 
 // 表单验证
 const rules = reactive({
-  reason: [{required: true, message: '请输入驳回理由', trigger: 'blur'}]
+  rejectReason: [{required: true, message: '请输入驳回理由', trigger: 'blur'}]
 })
 
 
@@ -189,7 +144,7 @@ const rules = reactive({
 const getAdminData = async function () {
   try {
     const result = await request({
-      url: '/admin/userinfo',
+      url: 'http://18.143.76.3:10704/admin/userinfo',
       data: {}
     })
     adminData.value = result
@@ -200,7 +155,7 @@ const getAdminData = async function () {
 }
 
 // 搜索方法
-const get = async function (val) {
+const getRecharge = async function (val) {
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
@@ -209,70 +164,75 @@ const get = async function (val) {
     // 搜索参数时间赋值
     if (getTime.value != null) {
       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
-        rechargeVo.value.startTime = getTime.value[0]
-        rechargeVo.value.endTime = getTime.value[1]
+        rechargeAudit.value.startTime = formatTime(getTime.value[0])
+        rechargeAudit.value.endTime = formatTime(getTime.value[1])
       }
     } else {
-      rechargeVo.value.startTime = ''
-      rechargeVo.value.endTime = ''
+      rechargeAudit.value.startTime = ''
+      rechargeAudit.value.endTime = ''
     }
-    rechargeVo.value.sortField = sortField.value
-    rechargeVo.value.sortOrder = sortOrder.value
+
 
     console.log('搜索参数', getObj.value)
 
     //
     const result = await request({
-      url: '/recharge/recharge', // todo 换接口
+      url: 'http://192.168.8.94:8081/audit/selectRecharge', // todo 换接口
       data: {
         pageNum: getObj.value.pageNum,
         pageSize: getObj.value.pageSize,
-        rechargeVo: { // 这个根据后端换一下
-          ...rechargeVo.value,
-          sortField: sortField.value,
-          sortOrder: sortOrder.value
+        rechargeAudit: { // 这个根据后端换一下
+          ...rechargeAudit.value,
+          // sortField: sortField.value,
+          // sortOrder: sortOrder.value
         }
       }
     })
+    // 存储表格数据
+    tableData.value = result.list
+    // 存储总条数
+    total.value = result.total
+    console.log('搜索结果', result.list)
 
-
+    // 合计数接口 还没改
     // 合计数的接口
     // 复制一份rechargeVo.value，去掉排序和状态
-    const rechargeVo1 = {...rechargeVo.value}
+    const rechargeVo1 = {...rechargeAudit.value}
     delete rechargeVo1.sortField
     delete rechargeVo1.sortOrder
     delete rechargeVo1.auditStatus
     const result2 = await request({
-      url: '/recharge/recharge/RechargeA', // todo 换接口
+      // url: 'http://192.168.8.94:8081/audit/selectRecharge', // todo 换接口 这是统计总数接口
       data: rechargeVo1
     })
-    // 统计合计数
-    if (result2.data) {
-      result2.data.forEach((item) => {
-        switch (item.auditStatus) {
-          case '待审核':
-            // 若 item.raudit 为空则赋值为 0
-            pendingCount.value = item.raudit || 0
-            // 若 item.sumRaudit 为空则赋值为 0
-            pendingGold.value = item.sumRaudit || 0
-            pendingRGold.value = item.sumRaudit1 || 0
-            pendingFGold.value = item.sumRaudit2 || 0
-            break
-          case '已通过':
-            approvedCount.value = item.raudit || 0
-            approvedGold.value = item.sumRaudit || 0
-            approvedRGold.value = item.sumRaudit1 || 0
-            approvedFGold.value = item.sumRaudit2 || 0
-            break
-          case '已驳回':
-            rejectedCount.value = item.raudit || 0
-            rejectedGold.value = item.sumRaudit || 0
-            rejectedRGold.value = item.sumRaudit1 || 0
-            rejectedFGold.value = item.sumRaudit2 || 0
-            break
-        }
-      })
-    }
+    // todo 没接口
+    /*    // 统计合计数
+        if (result2.data) {
+          result2.data.forEach((item) => {
+            switch (item.auditStatus) {
+              case '待审核':
+                // 若 item.raudit 为空则赋值为 0
+                pendingCount.value = item.raudit || 0
+                // 若 item.sumRaudit 为空则赋值为 0
+                pendingGold.value = item.sumRaudit || 0
+                pendingRGold.value = item.sumRaudit1 || 0
+                pendingFGold.value = item.sumRaudit2 || 0
+                break
+              case '已通过':
+                approvedCount.value = item.raudit || 0
+                approvedGold.value = item.sumRaudit || 0
+                approvedRGold.value = item.sumRaudit1 || 0
+                approvedFGold.value = item.sumRaudit2 || 0
+                break
+              case '已驳回':
+                rejectedCount.value = item.raudit || 0
+                rejectedGold.value = item.sumRaudit || 0
+                rejectedRGold.value = item.sumRaudit1 || 0
+                rejectedFGold.value = item.sumRaudit2 || 0
+                break
+            }
+          })
+        }*/
 
     trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
     trueCount.value = pendingCount.value + approvedCount.value + rejectedCount.value
@@ -295,17 +255,19 @@ const get = async function (val) {
 const search = function () {
   trimJwCode();
   getObj.value.pageNum = 1
-  get()
+  getObj.value.pageSize = 50
+  getRecharge()
 }
 // 重置
 const reset = function () {
-  delete rechargeVo.value.activity
-  delete rechargeVo.value.jwcode
-  delete rechargeVo.value.payMode
-  delete rechargeVo.value.market
-  delete rechargeVo.value.startTime
-  delete rechargeVo.value.endTime
+  delete rechargeAudit.value.activity
+  delete rechargeAudit.value.jwcode
+  delete rechargeAudit.value.payModel
+  delete rechargeAudit.value.market
+  delete rechargeAudit.value.startTime
+  delete rechargeAudit.value.endTime
   getTime.value = {}
+  getRecharge()
 }
 // 今天
 const getToday = function () {
@@ -322,48 +284,48 @@ const getToday = function () {
   )
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
-  get()
+  getRecharge()
 }
 // 昨天
 const getYesterday = function () {
   const yesterday = new Date()
   yesterday.setDate(yesterday.getDate() - 1)
-  const startDate = new Date(
+  const startTime = new Date(
       yesterday.getFullYear(),
       yesterday.getMonth(),
       yesterday.getDate()
   )
-  const endDate = new Date(
+  const endTime = new Date(
       yesterday.getFullYear(),
       yesterday.getMonth(),
       yesterday.getDate() + 1
   )
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
-  get()
+  getRecharge()
 }
 // 近7天
 const get7Days = function () {
   const today = new Date()
-  const startDate = new Date(
+  const startTime = new Date(
       today.getFullYear(),
       today.getMonth(),
       today.getDate() - 6
   )
-  const endDate = new Date(
+  const endTime = new Date(
       today.getFullYear(),
       today.getMonth(),
       today.getDate() + 1
   )
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
-  get()
+  getRecharge()
 }
 //待审核充值明细
 const adminWait = async function () {
-  rechargeVo.value.auditStatus = 0
+  rechargeAudit.value.auditStatus = "0"
   getObj.value.pageNum = 1
-  await get()
+  await getRecharge()
   console.log('adminWait')
 
   trueCount.value = pendingCount.value
@@ -373,9 +335,9 @@ const adminWait = async function () {
 }
 //已通过充值明细
 const adminPass = async function () {
-  rechargeVo.value.auditStatus = 1
+  rechargeAudit.value.auditStatus = "1"
   getObj.value.pageNum = 1
-  await get()
+  await getRecharge()
   console.log('adminPass')
   trueCount.value = approvedCount.value
   trueGold.value = approvedGold.value
@@ -384,9 +346,9 @@ const adminPass = async function () {
 }
 //已驳回充值明细
 const adminReject = async function () {
-  rechargeVo.value.auditStatus = 2
+  rechargeAudit.value.auditStatus = "2"
   getObj.value.pageNum = 1
-  await get()
+  await getRecharge()
   console.log('adminReject')
   trueCount.value = rejectedCount.value
   trueGold.value = rejectedGold.value
@@ -405,21 +367,11 @@ const handleClick = function (tab, event) {
   }
 }
 
-// watch(activeName, (val) => {
-//   if (val === 'wait') {
-//     adminWait()
-//   } else if (val === 'pass') {
-//     adminPass()
-//   } else if (val === 'reject') {
-//     adminReject()
-//   }
-// })
-
 
 const getActivity = async function () {
   try {
     const result = await request({
-      url: '/recharge/activity/select',
+      url: 'http://18.143.76.3:10704/general/activity',
       data: {}
     })
     activity.value = result.data
@@ -432,7 +384,7 @@ const getActivity = async function () {
 const getMarket = async function () {
   try {
     const result = await request({
-      url: 'http://192.168.8.247:8081/general/market',
+      url: 'http://18.143.76.3:10704/general/market',
       data: {}
     })
     market.value = result.data
@@ -443,27 +395,30 @@ const getMarket = async function () {
 }
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val
-  get()
+  getRecharge()
 }
 const handleCurrentChange = function (val) {
   getObj.value.pageNum = val
-  get()
+  getRecharge()
 }
 
 // 编辑====================================
 // 通过按钮
 const pass = function (row) {
   // 通过初始化
-  passObj.value = row
-  passObj.value.adminId = adminData.value.adminId
-  passObj.value.auditId = row.auditId
+  // 审核id 就是当前登录人 即 adminId
+  // passObj.value.auditId = adminData.value.adminId
+  // todo 一定要删除 换成上面的
+  passObj.value.auditId = 1
+  passObj.value.orderCode = row.orderCode
+
   // passObj.value.auditStatus = 1
-  passObj.value.rechargeId = row.rechargeId
-  passObj.value.detailId = row.detailId
-  passObj.value.jwcode = row.jwcode
-  passObj.value.paidGold = row.paidGold
-  passObj.value.freeGold = row.freeGold
-  passObj.value.adminName = adminData.value.adminName
+  // passObj.value.rechargeId = row.rechargeId
+  // passObj.value.detailId = row.detailId
+  // passObj.value.jwcode = row.jwcode
+  // passObj.value.paidGold = row.paidGold
+  // passObj.value.freeGold = row.freeGold
+  // passObj.value.adminName = adminData.value.adminName
 
   console.log('通过对象', passObj.value)
 }
@@ -471,16 +426,16 @@ const pass = function (row) {
 const passConfirm = async function () {
   try {
     // 也许大概应该在点击确认时改变状态
-    passObj.value.auditStatus = 1
+    passObj.value.action = 1
     console.log('通过对象', passObj.value)
     // 发送POST请求
     // passObj.value.flag = 0;
     const result = await request({
-      url: '/audit/audit/goldedit',
+      url: 'http://192.168.8.94:8081/audit/audit',
       data: passObj.value
     })
     console.log('请求成功', result)
-    get()
+    await getRecharge()
     //提示
     ElMessage({
       type: 'success',
@@ -505,14 +460,19 @@ const closeRejectVisible = function () {
 }
 // 驳回按钮
 const reject = function (row) {
+  console.log('row', row)
   // 驳回初始化
-  rejectObj.value.adminId = adminData.value.adminId
-  rejectObj.value.auditId = row.auditId
-  rejectObj.value.auditStatus = 2
-  rejectObj.value.reason = ''
-  rejectObj.value.rechargeId = row.rechargeId
-  rejectObj.value.detailId = row.detailId
+  // 审核id 就是当前登录人 即 adminId
+  // rejectObj.value.auditId = adminData.value.adminId
+  // todo 一定要删除 换成上面的
+  passObj.value.auditId = 1
+
+  rejectObj.value.orderCode = row.orderCode
   console.log('驳回对象', rejectObj.value)
+  // 驳回理由
+  rejectObj.value.rejectReason = ''
+
+  console.log('驳回对象！！！！！！！！', rejectObj.value)
   openRejectVisible()
 }
 // 驳回确认
@@ -523,11 +483,11 @@ const rejectConfirm = async function () {
         console.log('驳回对象', rejectObj.value)
         // 发送POST请求
         const result = await request({
-          url: '/audit/audit/goldedit',
+          url: 'http://192.168.8.94:8081/audit/audit',
           data: rejectObj.value
         })
         console.log('请求成功', result)
-        get()
+        await getRecharge()
         closeRejectVisible()// 关闭弹出框
         ElMessage({
           type: 'success',
@@ -563,7 +523,7 @@ const handleSortChange = (column) => {
     sortField.value = 'audit_time'
   }
   sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
-  get()
+  getRecharge()
 }
 
 // 预览图片函数
@@ -615,8 +575,9 @@ const formattedTrueFGold = computed(() => trueFGold.value.toFixed(2))
 onMounted(async function () {
   await getAdminData()
   await getActivity()
-  await get()
+  await getRecharge()
   await getMarket()
+  // await search()
 })
 
 </script>
@@ -628,25 +589,25 @@ onMounted(async function () {
         <el-row style="margin-bottom: 5px">
           <el-col :span="6">
             <el-text size="large">精网号：</el-text>
-            <el-input v-model="rechargeVo.jwcode" placeholder="请输入精网号" style="width: 240px" clearable/>
+            <el-input v-model="rechargeAudit.jwcode" placeholder="请输入精网号" style="width: 240px" clearable/>
           </el-col>
           <el-col :span="6">
             <el-text size="large">活动名称：</el-text>
-            <el-select v-model="rechargeVo.activity" placeholder="请选择活动名称" style="width: 240px" clearable>
-              <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
-                         :value="item.activityId"/>
+            <el-select v-model="rechargeAudit.activity" placeholder="请选择活动名称" style="width: 240px" clearable>
+              <el-option v-for="item in activity" :key="item" :label="item"
+                         :value="item"/>
             </el-select>
           </el-col>
           <el-col :span="6">
-            <el-text size="large">支付方式：</el-text>
-            <el-select v-model="rechargeVo.payMode" placeholder="请选择支付方式" style="width: 240px" clearable>
-              <el-option v-for="item in payMode" :key="item.value" :label="item.label" :value="item.value"/>
+            <el-text size="large">充值方式：</el-text>
+            <el-select v-model="rechargeAudit.payModel" placeholder="请选择充值方式" style="width: 240px" clearable>
+              <el-option v-for="item in payModel" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-col>
           <el-col :span="6">
-            <div class="head-card-element" v-if="adminData.market == '总部'">
+            <div class="head-card-element">
               <el-text size="large">所属地区：</el-text>
-              <el-select v-model="rechargeVo.market" placeholder="请选择所属地区" style="width: 240px" clearable>
+              <el-select v-model="rechargeAudit.market" placeholder="请选择所属地区" style="width: 240px" clearable>
                 <el-option v-for="item in market" :key="item" :label="item" :value="item"/>
               </el-select>
             </div>
@@ -684,9 +645,9 @@ onMounted(async function () {
 
           <div> <!--todo 改这里 总数的-->
             总条数：{{ trueCount }}条&nbsp;&nbsp;&nbsp;&nbsp;
-            总金币数：{{ formattedTrueGold }}金币&nbsp;&nbsp;&nbsp;&nbsp;
-            永久金币：{{ formattedTrueRGold }}金币&nbsp;&nbsp;&nbsp;&nbsp;
-            免费金币：{{ formattedTrueFGold }}金币
+            总金币数：{{ formattedTrueGold / 100 }}金币&nbsp;&nbsp;&nbsp;&nbsp;
+            永久金币：{{ formattedTrueRGold / 100 }}金币&nbsp;&nbsp;&nbsp;&nbsp;
+            免费金币：{{ formattedTrueFGold / 100 }}金币
           </div>
         </el-tabs>
 
@@ -703,16 +664,18 @@ onMounted(async function () {
             <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px"/>
             <el-table-column prop="market" label="所属地区" width="100px"/>
             <el-table-column prop="activity" label="活动名称" width="100px"/>
-            <el-table-column prop="money" label="充值金额" sortable="custom" width="110px"/>
+            <el-table-column prop="permanentGold" label="充值金额" sortable="custom" width="110px">
+              <template #default="scope">{{ scope.row.permanentGold / 100 }}</template>
+            </el-table-column>
             <el-table-column prop="permanentGold" label="永久金币" width="110px" sortable="custom">
-              <template #default="scope">{{ scope.row.permanentGold }}</template>
+              <template #default="scope">{{ scope.row.permanentGold / 100 }}</template>
             </el-table-column>
             <el-table-column prop="freeGold" label="免费金币" sortable="custom" width="110px">
-              <template #default="scope">{{ scope.row.freeGold }}</template>
+              <template #default="scope">{{ scope.row.freeGold / 100 }}</template>
             </el-table-column>
             <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip/>
 
-            <el-table-column prop="payMode" label="支付方式" width="110px"/>
+            <el-table-column prop="payModel" label="支付方式" width="110px"/>
             <el-table-column prop="voucher" label="支付凭证" width="110px">
               <!-- 支付凭证列，支持点击放大预览 -->
               <template #default="scope">
@@ -728,12 +691,13 @@ onMounted(async function () {
             <!--
                         字太多就悬停显示
             -->
-            <el-table-column prop="reason" label="驳回理由" width="200px" show-overflow-tooltip/>
+            <el-table-column prop="rejectReason" v-if="activeName === 'reject'" label="驳回理由" width="200px"
+                             show-overflow-tooltip/>
 
             <el-table-column v-if="activeName!== 'wait'" prop="auditName" label="审核人" width="100px"/>
             <el-table-column prop="payTime" sortable="custom" label="付款时间" width="200px">
               <template #default="scope">
-                {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+                {{ moment(scope.row.payTime).format('YYYY-MM-DD HH:mm:ss') }}
               </template>
             </el-table-column>
             <el-table-column prop="createTime" sortable="custom" label="提交时间" width="200px">
@@ -784,8 +748,9 @@ onMounted(async function () {
   <el-dialog v-model="rejectVisible" title="驳回理由" width="500" :before-close="closeRejectVisible">
     <template #footer>
       <el-form :model="rejectObj" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px">
-        <el-form-item prop="reason" label="驳回理由:">
-          <el-input v-model="rejectObj.reason" maxlength="150" show-word-limit style="width: 350px" type="textarea"
+        <el-form-item prop="rejectReason" label="驳回理由:">
+          <el-input v-model="rejectObj.rejectReason" maxlength="150" show-word-limit style="width: 350px"
+                    type="textarea"
                     placeholder="请输入内容"/>
         </el-form-item>
       </el-form>
diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue
index ea0b9ed..3ba6d57 100644
--- a/src/views/audit/refundAudit.vue
+++ b/src/views/audit/refundAudit.vue
@@ -186,21 +186,12 @@ const STATUS = {
 
 // 搜索表单数据
 const searchForm = ref({
-<<<<<<< HEAD
   jwcode: null, // 精网号
   activity: "", // 活动名称
   refundGoods: "", // 退款商品  这个字段是啥 需要修改
   market: "", // 所属地区
   startTime: "", // 充值时间开始
   endTime: "" // 充值时间结束
-=======
-  jwcode: '',
-  refundType: '',
-  refundGoods: '',
-  area: '',
-  startTime: '',
-  endTime: ''
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
 })
 
 // 搜索对象
@@ -386,13 +377,9 @@ const getProducts = async () => {
 // 查地区
 const getMarket = async () => {
   try {
-<<<<<<< HEAD
     const result = await request({
-      url: 'http://192.168.8.247:8081/general/market' // todo 换接口
+      url: 'http://18.143.76.3:10704/general/market' // todo 换接口
     })
-=======
-    const result = await request({ url: 'http://18.143.76.3:10704/general/market' })
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
     areaOptions.value = result.data || []
   } catch (error) {
     console.error('获取地区列表失败', error)
@@ -429,14 +416,6 @@ const get = async function (val) {
         status: getCurrentStatus()
       }
     }
-<<<<<<< HEAD
-=======
-    // 时间格式化
-    if (dateRange.value?.length === 2) {
-      params.detail.startTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
-      params.detail.endTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
-    }
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
 
     const result = await request({
       url: '/audit/audit/refund', // todo 换接口
@@ -503,21 +482,12 @@ const handleSearch = function () {
 // 重置
 const resetSearch = function () {
   searchForm.value = {
-<<<<<<< HEAD
     jwcode: null,
     activity: "",
     refundGoods: "",
     market: "",
     startTime: "",
     endTime: ""
-=======
-    jwcode: '',
-    refundType: '',
-    refundGoods: '',
-    area: adminInfo.value.area === '总部' ? '' : adminInfo.value.area,
-    startTime: '',
-    endTime: ''
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
   }
   dateRange.value = []
   handleSearch()
diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue
index dfeff37..f28ec08 100644
--- a/src/views/consume/addCoinConsume.vue
+++ b/src/views/consume/addCoinConsume.vue
@@ -129,6 +129,7 @@ function calculateCoins(sumGold) {
   return {free: 0, permanent: 0, task: 0};
 
 }
+
 // 输入验证函数
 function validateInput() {
   const sumGold = addConsume.value.sumGold;
@@ -162,6 +163,7 @@ function validateInput() {
 
   return true;
 }
+
 // 这是添加消费信息的接口
 const add = async function () {
   try {
@@ -171,12 +173,27 @@ const add = async function () {
     }
     // 计算金币使用情况
     calculateCoins(addConsume.value.sumGold);
+
     console.log("addConsume.value", addConsume.value)
     // 发送POST请求
     const result = await request({
       // url: "/consume/add",
       url: "http://18.143.76.3:10704/consume/add",
-      data: addConsume.value,
+      data: {
+        ...addConsume.value,
+        jwcode: addConsume.value.jwcode,
+        // adminId: addConsume.value.adminId,
+        // todo 一定要删除 换成上面的
+        adminId: 1,
+
+
+        sumGold: addConsume.value.sumGold * 100,
+        freeGold: addConsume.value.freeGold * 100,
+        taskGold: addConsume.value.taskGold * 100,
+        permanentGold: addConsume.value.permanentGold * 100,
+        goodsName: addConsume.value.goodsName,
+        remark: addConsume.value.remark
+      }
 
     });
 
@@ -191,6 +208,7 @@ const add = async function () {
     ElMessage.error("添加失败，请检查网络连接或联系管理员");
   }
 };
+
 // 响应处理函数
 function handleResponse(result) {
   console.log("响应结果", result)
@@ -201,6 +219,7 @@ function handleResponse(result) {
     ElMessage.error(result.msg || "添加失败，未知错误");
   }
 }
+
 // 重置表单函数
 function resetForm() {
   // 清空表单数据
@@ -239,6 +258,7 @@ function resetForm() {
   // user.value.jwcode = null;
   // user.value = null;
 }
+
 // 添加前验证
 const addBefore = () => {
   Ref.value.validate(async (valid) => {
@@ -491,7 +511,7 @@ onMounted(async function () {
           </el-col>
           <el-col :span="14">
             <el-form-item label="历史金币总数">
-              <p>{{ user.historySumGold }}</p>
+              <p>{{ user.historySumGold / 100 }}</p>
 
             </el-form-item>
           </el-col>
@@ -506,14 +526,14 @@ onMounted(async function () {
                 style="color: #2fa1ff; margin-right: 5px"
                 v-if="user.nowSumGold !== undefined"
             >
-              {{ user.nowSumGold }}</span
+              {{ user.nowSumGold / 100 }}</span
             >
               <span
                   style="display: inline; white-space: nowrap; color: #b1b1b1"
                   v-if="user.nowSumGold !== null "
-              >(永久金币:{{ user.nowPermanentGold }};免费金币:{{
-                  (user.nowFreeGold)
-                }};任务金币:{{ user.nowTaskGold }})</span>
+              >(永久金币:{{ user.nowPermanentGold / 100 }};免费金币:{{
+                  (user.nowFreeGold) / 100
+                }};任务金币:{{ user.nowTaskGold / 100 }})</span>
 
             </el-form-item>
           </el-col>
diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue
index 160fab6..1efe06b 100644
--- a/src/views/consume/coinConsumeDetail.vue
+++ b/src/views/consume/coinConsumeDetail.vue
@@ -109,7 +109,7 @@ const totalGoldSearch = ref({
 const getAdminData = async function () {
   try {
     const result = await request({
-      url: '/admin/userinfo',
+      url: 'http://18.143.76.3:10704/admin/userinfo',
       data: {}
     })
     adminData.value = result
@@ -150,8 +150,7 @@ const ConsumeSelectBy = async function (val) {
 
     // 发送POST请求
     const result = await request({
-<<<<<<< HEAD
-      url: 'http://192.168.8.247:8081/consume/selectBy',
+      url: 'http://18.143.76.3:10704/consume/selectBy',
       data: {
         pageNum: getObj.value.pageNum,
         pageSize: getObj.value.pageSize,
@@ -161,19 +160,6 @@ const ConsumeSelectBy = async function (val) {
           sortOrder: sortOrder.value
         }
       }
-=======
-      // url: 'consumeUser/selectBy',
-      url: 'http://18.143.76.3:10704/consume/selectBy',
-      data: {
-              pageNum: getObj.value.pageNum,
-              pageSize: getObj.value.pageSize,
-              consumeUser: {
-                ...consumeUser.value,
-                sortField: sortField.value,
-                sortOrder: sortOrder.value
-              }
-            }
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
     })
 
     console.log('请求成功2', sortField)
@@ -193,19 +179,9 @@ const ConsumeSelectBy = async function (val) {
     totalGoldSearch.value.goodsName = consumeUser.value.goodsName
 //
     const resultTotalGold = await request({
-<<<<<<< HEAD
-      // url: 'http://192.168.8.247:8081/consume/statsGold',
-      url: 'http://192.168.8.247:8081/consume/statsGold',
-      data: totalGoldSearch.value
-=======
       // url: 'http://18.143.76.3:10704/consume/statsGold',
       url: 'http://18.143.76.3:10704/consume/statsGold',
-      // data: {
-      //   pageNum: getObj.value.pageNum,
-      //   pageSize: getObj.value.pageSize,
-      //   consumeUser: consumeUser.value
-      // }
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
+      data: totalGoldSearch.value
 
     })
 
@@ -388,18 +364,13 @@ const handleSortChange = (column) => {
   if (column.prop === 'permanentGold') {
     sortField.value = 'permanentGold'
   } else if (column.prop === 'taskGold') {
-<<<<<<< HEAD
     sortField.value = 'taskGold'
-=======
-    sortField.value = 'taskGold' // 确保任务金币排序字段正确
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
   } else if (column.prop === 'freeGold') {
     sortField.value = 'freeGold'
   } else if (column.prop === 'createTime') {
     sortField.value = 'createTime'
   }
-  // 修正排序顺序逻辑
-  sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' 
+  sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
   ConsumeSelectBy()
 }
 
@@ -431,7 +402,11 @@ const checkNumber = function () {
       })
     }
   } else {
-    console.log('输入的数字不合法')
+    //提示
+    ElMessage({
+      type: 'error',
+      message: '请检查输入内容'
+    })
   }
 }
 
@@ -525,7 +500,25 @@ onMounted(async function () {
               </el-select>
             </div>
           </el-col>
-          
+          <!-- <el-col :span="8">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">消费类型：</el-text>
+              <el-select
+                v-model="consumeUser.consumeType"
+                placeholder="请选择消费类型"
+                size="large"
+                style="width: 240px"
+                clearable
+              >
+                <el-option
+                  v-for="item in consumeType"
+                  :key="item"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="21">
@@ -544,7 +537,10 @@ onMounted(async function () {
               >
               <el-button @click="getYesterday()">昨</el-button>
               <el-button @click="get7Days()">近7天</el-button>
-             
+              <!-- </div>
+            </el-col>
+            <el-col :span="3">
+              <div class="head-card-btn"> -->
               <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
 
@@ -559,9 +555,9 @@ onMounted(async function () {
     <el-col>
       <el-card>
         <div>
-          消耗金额：{{ Math.abs(sumGold) }}新币，永久金币：{{ Math.abs(permanentGolds) }}，免费金币：{{
-            Math.abs(freeGolds)
-          }}，任务金币：{{ Math.abs(taskGolds) }}
+          消耗金额：{{ Math.abs(sumGold)  / 100 }}新币，永久金币：{{ Math.abs(permanentGolds) / 100 }}，免费金币：{{
+            Math.abs(freeGolds) / 100
+          }}，任务金币：{{ Math.abs(taskGolds) / 100 }}
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
@@ -607,10 +603,15 @@ onMounted(async function () {
               <template #default="scope">
                 <!-- 使用非严格相等比较 -->
                 {{ scope.row.payPlatform }}
-                
+                <!--                <span scope.row.consumePlatform == 1">Homily Chart</span>-->
+
               </template>
             </el-table-column>
-            
+            <!-- <el-table-column
+              prop="consumeType"
+              label="消费类型"
+              width="120px"
+            /> -->
             <el-table-column
                 prop="sumGold"
                 label="消费金币总数"
@@ -620,7 +621,7 @@ onMounted(async function () {
                 {{
                   (scope.row.taskGold +
                       scope.row.freeGold +
-                      scope.row.permanentGold)
+                      scope.row.permanentGold) / 100
                 }}
               </template>
             </el-table-column>
@@ -628,11 +629,11 @@ onMounted(async function () {
             <el-table-column
                 prop="permanentGold"
                 label="永久金币"
-                sortable="custom"
+                sortable="“custom”"
                 width="110px"
             >
               <template #default="scope">
-                {{ scope.row.permanentGold }}
+                {{ scope.row.permanentGold / 100 }}
               </template>
             </el-table-column>
             <el-table-column
@@ -642,17 +643,17 @@ onMounted(async function () {
                 width="110px"
             >
               <template #default="scope">
-                {{ scope.row.freeGold }}
+                {{ scope.row.freeGold  / 100 }}
               </template>
             </el-table-column>
             <el-table-column
                 prop="taskGold"
                 label="任务金币"
-                sortable="custom"
+                sortable="“custom”"
                 width="110px"
             >
               <template #default="scope">
-                {{ scope.row.taskGold }}
+                {{ scope.row.taskGold / 100 }}
               </template>
             </el-table-column>
 
@@ -666,7 +667,7 @@ onMounted(async function () {
             <el-table-column
                 prop="createTime"
                 label="消费时间"
-                sortable="custom"
+                sortable="“custom”"
                 width="180px"
             />
           </el-table>
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 5d5a4a5..6938fb2 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -35,48 +35,6 @@ const getObj = ref({
 
 const total = ref(0)
 
-
-const getAllRate = async function (val) {
-  try {
-    // 搜索参数页码赋值
-    if (typeof val === 'number') {
-      getObj.value.pageNum = val;
-    }
-
-    // 发送POST请求
-    const result = await request({
-      url: 'http://18.143.76.3:10704/rate/selectAll',
-      method: 'POST',
-      data: {
-        pageNum: getObj.value.pageNum,
-        pageSize: getObj.value.pageSize,
-      }
-    });
-
-    // 将响应结果存储到响应式数据中
-    console.log('这是汇率列表 请求成功', result);
-
-    // 存储表格数据
-    tableData.value = result.data.list;
-    // 存储分页总条目
-    total.value = result.data.total;
-
-  } catch (error) {
-    console.log('请求失败', error);
-    ElMessage.error('请求失败');
-  }
-}
-
-const handlePageSizeChange = function (val) {
-  getObj.value.pageSize = val
-  getAllRate()
-}
-
-const handleCurrentChange = function (val) {
-  getObj.value.pageNum = val
-  getAllRate()
-}
-
 // 编辑方法 表单
 const rateEdit = ref({
   id: null,
@@ -85,82 +43,8 @@ const rateEdit = ref({
   adminId: null,
   updateTime: Date.now(),
 })
-
-//查询已有的数据
-const getEditData = async function (row) {
-  try {
-    console.log('搜索参数', getObj.value)
-    // 发送POST请求
-    const result = await request({
-      url: 'http://18.143.76.3:10704/rate/selectById',
-      data: {id: row.id}
-    })
-
-    // 将响应结果存储到响应式数据中
-    console.log('根据id查 请求成功', result)
-    // 存储表格数据
-    // 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 () {
-  try {
-    console.log('搜索参数', rateEdit.value)
-    // 发送POST请求
-    const result = await request({
-      url: 'http://18.143.76.3:10704/rate/update',
-      data: rateEdit.value
-    })
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    await getAllRate()
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
-const edit = () => {
-  ElMessageBox.confirm('确认修改？')
-      .then(() => {
-        editRate()
-        regeEdit.value = false
-      })
-      .catch(() => {
-        regeEdit.value = false
-      })
-}
-
-// 关闭编辑弹窗时重置表单
-const cancelEdit = () => {
-  regeEdit.value = false
-
-}
-
-
-const handleEditDialogClose = () => {
-  if (editFormRef.value) {
-    getAllRate()
-  }
-}
-
-
-// 挂载
-onMounted(async function () {
-  await getAllRate()
-  await getAdminData()
-})
-
-
 //货币条目
-const rateName = [
+const rateNames = [
   {
     value: 'USD',
     label: 'USD'
@@ -246,7 +130,7 @@ const getAllRate = async function (val) {
 
     // 发送POST请求
     const result = await request({
-      url: 'http://192.168.9.21:8081/rate/selectAll',
+      url: 'http://18.143.76.3:10704/rate/selectAll',
       method: 'POST',
       data: {
         pageNum: getObj.value.pageNum,
@@ -286,7 +170,7 @@ const getEditData = async function (row) {
     console.log('搜索参数', getObj.value)
     // 发送POST请求
     const result = await request({
-      url: 'http://192.168.9.21:8081/rate/selectById',
+      url: 'http://18.143.76.3:10704/rate/selectById',
       data: {id: row.id}
     })
 
@@ -311,7 +195,7 @@ const editRate = async function () {
     console.log('搜索参数', rateEdit.value)
     // 发送POST请求
     const result = await request({
-      url: 'http://192.168.9.21:8081/rate/update',
+      url: 'http://18.143.76.3:10704/rate/update',
       data: rateEdit.value
     })
     // 将响应结果存储到响应式数据中
@@ -510,11 +394,7 @@ onMounted(async function () {
               style="width: 240px"
           >
             <el-option
-<<<<<<< HEAD
                 v-for="item in rateNames"
-=======
-                v-for="item in rateName"
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"