diff --git a/.env.development b/.env.development
index c8abb9f..667ca36 100644
--- a/.env.development
+++ b/.env.development
@@ -4,5 +4,5 @@
 # VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.225:8080/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='http://192.168.8.247:8081/'
+VITE_API_BASE='http://18.143.76.3:10704/'
 
diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index 703bd85..03f853f 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -338,7 +338,7 @@ const getYesterday = function () {
       yesterday.getMonth(),
       yesterday.getDate() + 1
   )
-  getTime.value = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
@@ -355,7 +355,7 @@ const get7Days = function () {
       today.getMonth(),
       today.getDate() + 1
   )
-  getTime.value = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue
index 5e9d5c7..ea0b9ed 100644
--- a/src/views/audit/refundAudit.vue
+++ b/src/views/audit/refundAudit.vue
@@ -186,12 +186,21 @@ const STATUS = {
 
 // 搜索表单数据
 const searchForm = ref({
+<<<<<<< HEAD
   jwcode: null, // 精网号
   activity: "", // 活动名称
   refundGoods: "", // 退款商品  这个字段是啥 需要修改
   market: "", // 所属地区
   startTime: "", // 充值时间开始
   endTime: "" // 充值时间结束
+=======
+  jwcode: '',
+  refundType: '',
+  refundGoods: '',
+  area: '',
+  startTime: '',
+  endTime: ''
+>>>>>>> zhangrenyuan/feature-20250623164058-金币前端
 })
 
 // 搜索对象
@@ -377,9 +386,13 @@ const getProducts = async () => {
 // 查地区
 const getMarket = async () => {
   try {
+<<<<<<< HEAD
     const result = await request({
       url: 'http://192.168.8.247:8081/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)
@@ -416,6 +429,14 @@ 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 换接口
@@ -482,12 +503,21 @@ 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 da0679c..dfeff37 100644
--- a/src/views/consume/addCoinConsume.vue
+++ b/src/views/consume/addCoinConsume.vue
@@ -175,7 +175,7 @@ const add = async function () {
     // 发送POST请求
     const result = await request({
       // url: "/consume/add",
-      url: "http://192.168.8.247:8081/consume/add",
+      url: "http://18.143.76.3:10704/consume/add",
       data: addConsume.value,
 
     });
@@ -269,7 +269,7 @@ const getUser = async function (jwcode) {
     // 发送POST请求
     const result = await request({
       // url: "user/selectUser",
-      url: "http://192.168.8.247:8081/user/selectUser", // todo 服务器改回无ip的
+      url: "http://18.143.76.3:10704/user/selectUser", // todo 服务器改回无ip的
       data: {
         // 只需要传精网号
         jwcode: addConsume.value.jwcode,
diff --git a/src/views/consume/beanConsume.vue b/src/views/consume/beanConsume.vue
index 05bb370..257b63d 100644
--- a/src/views/consume/beanConsume.vue
+++ b/src/views/consume/beanConsume.vue
@@ -91,13 +91,13 @@ const get = async function (val) {
     }
     // 搜索参数时间赋值
     if (getTime.value != null) {
-      if (getTime.value.startDate != '' && getTime.value.endDate != '') {
-        detailVo.value.startDate = getTime.value[0]
-        detailVo.value.endDate = getTime.value[1]
+      if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+        detailVo.value.startTime = getTime.value[0]
+        detailVo.value.endTime = getTime.value[1]
       }
     } else {
-      detailVo.value.startDate = ''
-      detailVo.value.endDate = ''
+      detailVo.value.startTime = ''
+      detailVo.value.endTime = ''
     }
     detailVo.value.sortField = sortField.value
     detailVo.value.sortOrder = sortOrder.value
@@ -172,8 +172,8 @@ const reset = function () {
   detailVo.value.productName = ''
   detailVo.value.consumePlatform = ''
   detailVo.value.consumeType = ''
-  detailVo.value.startDate = ''
-  detailVo.value.endDate = ''
+  detailVo.value.startTime = ''
+  detailVo.value.endTime = ''
   sortField.value = ''
   sortOrder.value = ''
   getTime.value = {}
@@ -181,17 +181,17 @@ const reset = function () {
 // 今天
 const getToday = function () {
   const today = new Date()
-  const startDate = new Date(
+  const startTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate()
   )
-  const endDate = new Date(
+  const endTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate() + 1
   )
-  getTime.value = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
@@ -199,34 +199,34 @@ const getToday = function () {
 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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
 // 近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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue
index e2af28e..160fab6 100644
--- a/src/views/consume/coinConsumeDetail.vue
+++ b/src/views/consume/coinConsumeDetail.vue
@@ -150,6 +150,7 @@ const ConsumeSelectBy = async function (val) {
 
     // 发送POST请求
     const result = await request({
+<<<<<<< HEAD
       url: 'http://192.168.8.247:8081/consume/selectBy',
       data: {
         pageNum: getObj.value.pageNum,
@@ -160,6 +161,19 @@ 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)
@@ -179,9 +193,19 @@ 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-金币前端
 
     })
 
@@ -321,7 +345,7 @@ const getGoods = async function () {
   try {
     // 发送POST请求
     const result = await request({
-      url: 'http://192.168.8.247:8081/general/goods',
+      url: 'http://18.143.76.3:10704/general/goods',
       data: {}
     })
     // 将响应结果存储到响应式数据中
@@ -341,7 +365,7 @@ const getMarket = async function () {
     // 发送请求获取地区列表
     const result = await request({
       // url: '/general/market',
-      url: 'http://192.168.8.247:8081/general/market', // todo 换成实际接口地址
+      url: 'http://18.143.76.3:10704/general/market', // todo 换成实际接口地址
       data: {}
     })
     console.log('请求地区列表成功', result)
@@ -364,13 +388,18 @@ 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' ? 'DESC' : 'ASC'
+  // 修正排序顺序逻辑
+  sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' 
   ConsumeSelectBy()
 }
 
@@ -402,11 +431,7 @@ const checkNumber = function () {
       })
     }
   } else {
-    //提示
-    ElMessage({
-      type: 'error',
-      message: '请检查输入内容'
-    })
+    console.log('输入的数字不合法')
   }
 }
 
@@ -500,25 +525,7 @@ 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">
@@ -537,10 +544,7 @@ 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>
 
@@ -603,15 +607,10 @@ 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="消费金币总数"
@@ -629,7 +628,7 @@ onMounted(async function () {
             <el-table-column
                 prop="permanentGold"
                 label="永久金币"
-                sortable="“custom”"
+                sortable="custom"
                 width="110px"
             >
               <template #default="scope">
@@ -649,7 +648,7 @@ onMounted(async function () {
             <el-table-column
                 prop="taskGold"
                 label="任务金币"
-                sortable="“custom”"
+                sortable="custom"
                 width="110px"
             >
               <template #default="scope">
@@ -667,7 +666,7 @@ onMounted(async function () {
             <el-table-column
                 prop="createTime"
                 label="消费时间"
-                sortable="“custom”"
+                sortable="custom"
                 width="180px"
             />
           </el-table>
diff --git a/src/views/home.vue b/src/views/home.vue
index d4afd98..9976b0d 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -36,7 +36,7 @@ const currentArea = ref('全部')
 
 const getAreas = async function () {
   try {
-    const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
+    const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
     areas.value = result.data
     console.log('请求成功', result)
   } catch (error) {
diff --git a/src/views/index.vue b/src/views/index.vue
index 85121ba..bc9f857 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -36,7 +36,7 @@ const currentArea = ref('全部')
 
 const getAreas = async function () {
   try {
-    const result = await API({ url: '/recharge/user/search', data: {} })
+    const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
     areas.value = result.data
     console.log('请求成功', result)
   } catch (error) {
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index ca9d00f..5d5a4a5 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -35,6 +35,48 @@ 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,
@@ -43,8 +85,82 @@ 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 rateNames = [
+const rateName = [
   {
     value: 'USD',
     label: 'USD'
@@ -394,7 +510,11 @@ 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"
diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue
index 0fcd04b..e64163b 100644
--- a/src/views/recharge/addCoinRecharge.vue
+++ b/src/views/recharge/addCoinRecharge.vue
@@ -11,8 +11,8 @@ import { utils, read } from 'xlsx'
 import throttle from 'lodash/throttle'
 // 精网号去空格
 const trimJwCode = () => {
-  if (addRecharge.value.jwcode) {
-    addRecharge.value.jwcode = addRecharge.value.jwcode.replace(/\s/g, ''); 
+  if (recharge.value.jwcode) {
+    recharge.value.jwcode = recharge.value.jwcode.replace(/\s/g, ''); 
   }
 }
 // 上传图片前的验证函数
@@ -31,7 +31,7 @@ const beforeAvatarUpload = (file) => {
 }
 // 这是添加上传图片的接口
 const imageUrl = ref('')
-const rechargeVoucher = ref('')
+const voucher = ref('')
 const Rate = ref()
 const adminData = ref({})
 const getAdminData = async function () {
@@ -41,8 +41,8 @@ const getAdminData = async function () {
       data: {}
     })
     adminData.value = result
-    addRecharge.value.adminId = adminData.value.adminId
-    addRecharge.value.area = adminData.value.area
+    recharge.value.adminId = adminData.value.adminId
+    recharge.value.market = adminData.value.market
     console.log('请求成功', result)
     console.log('用户信息', user.value)
   } catch (error) {
@@ -51,23 +51,34 @@ const getAdminData = async function () {
 }
 
 // 这是添加充值信息的表单
-const addRecharge = ref({
-  rechargeVoucher: '',
+const recharge = ref({
+  voucher: '',
   rechargeWay: '客服充值',
   freeGold: '',
-  rechargeGold: null,
-  paidGold: '',
+  money: null,
+  permanentGold: '',
   Rate: null,
-  rechargeRatio: ''
+  rechargeRatio: '',
+  rateId: null
 })
 // 这是添加充值信息的接口
 const add = async function () {
   try {
-    console.log('开始添加充值信息', addRecharge.value)
+
+    const formattedRecharge = { ...recharge.value,
+      // 添加固定的 adminId
+      adminId: fixedAdminId 
+     }
+    if (formattedRecharge.payTime) {
+      // 使用 moment.js 格式化 payTime
+      formattedRecharge.payTime = moment(formattedRecharge.payTime).format('YYYY-MM-DD HH:mm:ss')
+    }
+
+    console.log('开始添加充值信息', recharge.value)
     // 发送POST请求
     const result = await API({
-      url: '/recharge/recharge/add',
-      data: addRecharge.value
+      url: 'http://192.168.8.247:8081/recharge/add',
+      data: formattedRecharge
     })
     if (result.code === 0) {
       ElMessage.error(result.msg)
@@ -78,14 +89,15 @@ const add = async function () {
     // 显示成功消息
     ElMessage.success('添加成功')
     // 重置表单
-    addRecharge.value = {}
-    addRecharge.value.adminId = adminData.value.adminId
-    addRecharge.value.area = adminData.value.area
-    addRecharge.value.rechargeVoucher = ''
-    addRecharge.value.rechargeWay = '客服充值'
-    addRecharge.value.freeGold = ''
-    addRecharge.value.rechargeGold = null
-    addRecharge.value.paidGold = ''
+    recharge.value = {}
+    recharge.value.adminId = adminData.value.adminId
+    recharge.value.market = adminData.value.market
+    recharge.value.voucher = ''
+    recharge.value.rechargeWay = '客服充值'
+    recharge.value.freeGold = ''
+    recharge.value.money = null
+    recharge.value.permanentGold = ''
+    recharge.value.rateId = null
     imageUrl.value = ''
     Rate.value = null
     user.value = {}
@@ -94,6 +106,8 @@ const add = async function () {
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
+
+//添加充值信息前的按钮点击事件，进行表单验证和用户确认操作
 const addBefore = () => {
   Ref.value.validate(async (valid) => {
     if (valid) {
@@ -104,13 +118,18 @@ const addBefore = () => {
         })
         return
       }
-      if(addRecharge.value.rechargeGold == null || addRecharge.value.rechargeGold == '' || addRecharge.value.rechargeGold == undefined){
+      if(recharge.value.money == null || recharge.value.money == '' || recharge.value.money == undefined){
         ElMessage({
           type: 'error',
           message: '请输入充值金额'
         })
         return
       }
+      // 根据选择的货币名称找到对应的 rateId
+      const selectedRate = rateName.find(item => item.value === Rate.value)
+      if (selectedRate) {
+        recharge.value.rateId = selectedRate.rateId
+      }
       ElMessageBox.confirm('确认添加？')
         .then(() => {
           add()
@@ -133,36 +152,18 @@ const addBefore = () => {
 // 开始时间改变时，重新验证结束时间
 const Ref = ref(null)
 
-// const checkFreeGoldRadio = function (rule, value, callback) {
-//   if (value == "0" || value == null || value == "") {
-//     callback(new Error("请输入永久金币"));
-//   } else if (value < 0 || isNaN(value)) {
-//     callback(new Error("请输入正确的格式"));
-//   } else {
-//     callback();
-//   }
-// };
+
 const rules = reactive({
   jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
-  activityId: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
-  paidGold: [
-    { required: true, message: '请输入永久金币数', trigger: 'blur' },
-    {
-      validator: (rule, value, callback) => {
+  activity: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
+  permanentGold: [{ required: true, message: '请输入永久金币数', trigger: 'blur' },
+    {validator: (rule, value, callback) => {
         if (value >= 0) {
           callback()
         } else {
           callback(new Error('输入金额至少为0'))
-        }
-      }
-    }
-  ],
-  freeGold: [
-    {
-      required: true,
-      message: '请输入免费金币数',
-      trigger: 'blur'
-    },
+        }}}],
+  freeGold: [{required: true, message: '请输入免费金币数', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
         // 将值转换为数字(可行吗？？)
@@ -179,43 +180,23 @@ const rules = reactive({
       trigger: 'blur'
     }
   ],
-  rechargeGold: [
+  money: [
     {
       required: true,
       message: '请选择货币名称',
       trigger: 'blur'
     }
-    // {
-    //   validator: (rule, value, callback) => {
-    //     if (value != null && value!= '') {
-    //       callback()
-    //     } else {
-    //       callback(new Error('请选择货币名称'))
-    //     }
-    //   },
-    //   trigger: 'blur'
-    // }
   ],
-  'addRecharge.rechargeGold': [
+  'recharge.money': [
     {
       required: true,
       message: '请输入充值金额',
       trigger: 'blur'
     }
-    // {
-    //   validator: (rule, value, callback) => {
-    //     if (typeof value === 'number' && value >= 0) {
-    //       callback()
-    //     } else {
-    //       callback(new Error('输入金额至少为 0'))
-    //     }
-    //   },
-    //   trigger: 'blur'
-    // }
-    // 以上两个字段的校验在提交时触发
+    
   ],
-  payWay: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
-  rechargeTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }]
+  payModel: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
+  payTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }]
 })
 
 // 查找客户信息的方法
@@ -226,27 +207,25 @@ const getUser = async function (jwcode) {
 
     // 发送POST请求
     const result = await API({
-      url: '/recharge/user',
+      url: 'http://192.168.8.247:8081/user/selectUser',
       data: {
-        jwcode: addRecharge.value.jwcode,
-        area: adminData.value.area
+        jwcode: recharge.value.jwcode
       }
     })
     console.log('请求成功', result)
 
     if (result.code === 0) {
-      ElMessage.error(result.msg)
+      ElMessage.error(result.msg);
+    } else if (result.data === null) {
+      ElMessage.error("用户不存在");
     } else {
-      user.value = result.data
-      user.value.A =
-        Number(user.value.pendingRechargeTimes) +
-        Number(user.value.pendingSpendTimes)
-      console.log('用户信息', user.value)
-      ElMessage.success(result.msg)
+      user.value = result.data;
+      console.log("用户信息", user.value);
+      ElMessage.success(result.msg);
     }
   } catch (error) {
-    console.log('请求失败', error)
-    ElMessage.error('查询失败，请检查精网号是否正确')
+    console.log("请求失败", error);
+    ElMessage.error("查询失败，请检查精网号是否正确");
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
@@ -257,9 +236,9 @@ const getActivity = async function () {
   try {
     // 发送POST请求
     const result = await API({
-      url: '/recharge/activity/select',
+      url: 'http://192.168.8.247:8081/general/activity',
       data: {
-        activity: { status: 1 }
+        
       }
     })
 
@@ -269,43 +248,73 @@ const getActivity = async function () {
     activity.value = result.data
     console.log('活动信息', activity.value)
   } catch (error) {
-    console.log('请求失败', error)
+    console.log('activity请求失败', error)
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
 
-// 这是查询货币的接口
-const currency = ref([])
-const getCurrency = async function () {
-  try {
-    // 发送POST请求
-    const result = await API({
-      url: '/rates/status',
-      data: {}
-    })
 
-    // 将响应结果存储到响应式数据中
-    console.log('货币请求成功', result)
-    // 存储表格数据
-    currency.value = result.data
-    console.log('tableData', currency.value)
-    // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
-  } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
+
+//货币条目
+const rateName = [
+  {
+    value: 'USD',
+    label: 'USD',
+    rateId: 1 
+  },
+  {
+    value: 'HKD',
+    label: 'HKD',
+    rateId: 2
+  },
+  {
+    value: 'THB',
+    label: 'THB',
+    rateId: 3
+  },
+  {
+    value: 'VND',
+    label: 'VND',
+    rateId: 4
+  },
+  {
+    value: 'CAD',
+    label: 'CAD',
+    rateId: 5
+  },
+  {
+    value: 'MYR',
+    label: 'MYR',
+    rateId: 6
+  },
+  {
+    value: 'KRW',
+    label: 'KRW',
+    rateId: 7
+  },
+  {
+    value: 'JPY',
+    label: 'JPY',
+    rateId: 8
+  },
+  {
+    value: 'CNY',
+    label: 'CNY',
+    rateId: 9
   }
-}
+]
+
 
 // 上传图片成功的回调函数
 const handleAvatarSuccess = (response, uploadFile) => {
   imageUrl.value = URL.createObjectURL(uploadFile.raw)
   console.log('图片上传成功', response, uploadFile)
-  addRecharge.value.rechargeVoucher = `http://54.251.137.151:10702/upload/${response.data}`
-  console.log('图片名称', addRecharge.value.rechargeVoucher)
+  recharge.value.voucher = `http://39.101.133.168:8828/hljw/api/aws/upload`
+  console.log('图片名称', recharge.value.voucher)
 }
 
 //充值方式条目
-const options = [
+const payModel = [
   {
     value: '现金',
     label: '现金'
@@ -324,595 +333,69 @@ const options = [
   }
 ]
 
-//根据活动id获取汇率
-const getActivityById = async function (row) {
-  try {
-    // 发送POST请求
-    const result = await API({
-      url: '/recharge/activity/select',
-      data: {
-        activity: { activityId: row }
-      }
-    })
-    addRecharge.value.rechargeRatio = result.data[0].rechargeRatio
-    console.log('看看有了吗', addRecharge.value.rechargeRatio)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
+// //根据活动id获取汇率
+// const getActivityById = async function (row) {
+//   try {
+//     // 发送POST请求
+//     const result = await API({
+//       url: '/recharge/activity/select',
+//       data: {
+//         activity: { activity: row }
+//       }
+//     })
+//     recharge.value.rechargeRatio = result.data[0].rechargeRatio
+//     console.log('看看有了吗', recharge.value.rechargeRatio)
+//   } catch (error) {
+//     console.log('请求失败', error)
+//   }
+// }
 function handleActivityChange(value) {
   // 在这里执行你的逻辑，例如获取选中的值
   console.log('选中的值：', value)
   getActivityById(value)
-  console.log('看看', addRecharge.value)
+  console.log('看看', recharge.value)
 }
-// 监听 paidGold 的变化
+// 监听 permanentGold 的变化
 // const calculatedFree = computed(() => {
-//   const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio
-//   if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
+//   const result = recharge.value.permanentGold / recharge.value.rechargeRatio
+//   if (isNaN(result) || result < 1 || recharge.value.rechargeRatio == 0) {
 //     return 0
 //   } else {
 //     return Math.trunc(result)
 //   }
 // })
 // watch(calculatedFree, (newVal) => {
-//   addRecharge.value.freeGold = newVal
+//   recharge.value.freeGold = newVal
 // })
 // const calculatedRecharge = computed(() => {
-//   return addRecharge.value.paidGold * Rate.value
+//   return recharge.value.permanentGold * Rate.value
 // })
 // watch(calculatedRecharge, (newVal) => {
-//   addRecharge.value.rechargeGold = newVal
+//   recharge.value.money = newVal
 // })
 //这是重置重置表单的方法
 const deleteRecharge = function () {
-  addRecharge.value = {
-    adminId: adminData.value.adminId,
-    area: adminData.value.area,
-    rechargeVoucher: '',
+  recharge.value = {
+    // adminId: adminData.value.adminId,
+    adminId: fixedAdminId,
+    market: adminData.value.market,
+    voucher: '',
     rechargeWay: '客服充值',
     freeGold: Number(),
-    rechargeGold: null,
-    paidGold: Number()
+    money: null,
+    permanentGold: Number(),
+    rateId: null
   }
   imageUrl.value = ''
   Rate.value = ''
 }
 
-// 批量充值
-// jwcode列表
-const jwcodeList = ref([])
-let jwcodeSet
-// 获取jwcode列表
-const getJwcodeList = async function () {
-  try {
-    // 发送POST请求
-    const result = await API({
-      url: '/recharge/user/jwcode',
-      data: {
-        jwcode: jwcode,
-        area: adminData.value.area
-      }
-    })
-
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    // 存储表格数据
-    jwcodeList.value = result.data
-    console.log('精网号', jwcodeList.value)
-    // 将数组转换为set
-    jwcodeSet = new Set(jwcodeList.value)
-    console.log('精网号set', jwcodeSet)
-  } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-}
-
-// 校验精网号
-// 精网号错误对象
-const errorCount = ref(0)
-// 校验规则
-const validateInput = function (row, index) {
-  console.log(jwcodeSet.has(row.jwcode), 'has')
-  if (!jwcodeSet.has(row.jwcode) && row.jwcode != '' && row.jwcode != null) {
-    row.isInputInvalid = true
-    row.inputErrorMessage = '精网号不存在'
-    errorCount.value++
-    return
-  } else {
-    row.isInputInvalid = false
-    row.inputErrorMessage = ''
-    errorCount.value--
-  }
-}
-
-// 批量充值弹窗
-const batchRechargeVisible = ref(false)
-const i = ref(1)
-const delObj = ref({})
-const batchDelObj = ref([])
-const resetObj = ref({})
-// 批量充值表格数据
-const batchData = ref([
-  {
-    line: 1,
-    showInput: true,
-    isInputInvalid: false,
-    inputErrorMessage: '',
-    freeGold: '0',
-    rechargeGold: '0',
-    paidGold: '0'
-  }
-])
-
-// 打开批量充值弹窗
-const openBatchRechargeVisible = function () {
-  batchRechargeVisible.value = true
-}
-// 关闭批量充值弹窗
-const closeBatchRechargeVisible = function () {
-  batchRechargeVisible.value = false
-}
-// 批量充值初始化
-const batchInit = function () {
-  openBatchRechargeVisible()
-}
-
-// 添加行数对象
-const addLineObj = ref(0)
-//添加一行
-const addLine = function () {
-  batchData.value.unshift({
-    line: ++i.value,
-    showInput: true,
-    isInputInvalid: false,
-    inputErrorMessage: '',
-    freeGold: '0',
-    rechargeGold: '0',
-    paidGold: '0'
-  })
-}
-const loading = ref(false)
-// 添加多行
-const addLines = async function () {
-  try {
-    loading.value = true // 操作开始前，将loading设为true，显示加载动画
-    console.log(loading.value, 'loading.value')
-
-    await new Promise((resolve) => setTimeout(resolve, 100)) // 人为创建一个小延迟
-
-    for (let j = 0; j < addLineObj.value; j++) {
-      batchData.value.unshift({
-        line: ++i.value,
-        showInput: true,
-        isInputInvalid: false,
-        inputErrorMessage: '',
-        freeGold: '0',
-        rechargeGold: '0',
-        paidGold: '0'
-      })
-    }
-
-    ElMessage.success('添加成功')
-    console.log(batchData.value, 'batchData.value')
-  } catch (error) {
-    console.log('添加失败', error)
-    ElMessage.error('添加失败')
-  } finally {
-    loading.value = false
-    console.log(loading.value, 'loading.value')
-  }
-}
-// 添加多行点击按钮
-// const addLines = async function () {
-//   try {
-
-//     loading.value = true; // 操作开始前，将loading设为true，显示加载动画
-//     console.log(loading.value, "loading.value")
-
-//     await new Promise(resolve => setTimeout(resolve, 100)); // 人为创建一个小延迟
-
-//     const newItems = Array.from({ length: addLineObj.value }, (_, index) => reactive({
-//       line: ++i.value,
-//       showInput: true,
-//       isInputInvalid: false,
-//       inputErrorMessage: '',
-//       freeGold: "0",
-//       rechargeGold: "0",
-//       paidGold: "0",
-//     }));
-//     batchData.value = [...newItems, ...batchData.value];
-//     ElMessage.success("添加成功");
-
-//     console.log(batchData.value, "batchData.value");
-
-//     loading.value = false;
-//     console.log(loading.value, "loading.value")
-//   } catch (error) {
-//     console.log("添加失败", error);
-//     ElMessage.error("添加失败");
-//     // 如果出现异常，也要确保关闭加载动画
-//     loading.value = false;
-//   }
-// };
-// 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次
-const throttledAddLines = throttle(addLines, 500, { trailing: false })
-// 导入excel按钮的ref
-const uploadRefMap = ref({})
-// 获取excel数据
-const excelList = ref([])
-// 动态设置upload Ref
-const handleSetUploadRefMap = (el) => {
-  if (el) {
-    uploadRefMap.value[`Upload_Ref`] = el
-  }
-}
-// 文件上传自定义
-const httpExcelRequest = async (op) => {
-  // 获取除文件之外的参数，具体根据实际业务需求来
-  console.log(op.data)
-  // 获取上传的excel  并解析数据
-  let file = op.file
-  let dataBinary = await readFile(file)
-  let workBook = read(dataBinary, { type: 'binary', cellDates: true })
-  let workSheet = workBook.Sheets[workBook.SheetNames[0]]
-  const excelData = utils.sheet_to_json(workSheet, { header: 1 })
-  excelList.value = excelData
-  console.log(excelData)
-}
-
-const readFile = (file) => {
-  return new Promise((resolve) => {
-    let reader = new FileReader()
-    reader.readAsBinaryString(file)
-    reader.onload = (ev) => {
-      resolve(ev.target?.result)
-    }
-  })
-}
-
-//获取批量删除的数组
-const handleSelectionChangebatch = function (val) {
-  console.log('val===', val)
-  batchDelObj.value = val
-}
-//批量删除
-const batchDel = function () {
-  ElMessageBox.confirm('确认批量删除吗？', '批量删除', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
-    .then(() => {
-      console.log('batchDel===', batchDelObj.value)
-      batchData.value = batchData.value.filter((itemA) => {
-        return !batchDelObj.value.some((itemB) => itemB.line == itemA.line)
-      })
-      console.log('batchData===', batchData.value)
-      ElMessage({
-        type: 'success',
-        message: '操作成功'
-      })
-    })
-    .catch(() => {
-      ElMessage({
-        type: 'info',
-        message: '操作撤销'
-      })
-    })
-}
-//监听改变活动时的操作
-const changeActivity = function (row) {
-  console.log('row===', row)
-  let ratio = 0
-  for (let i = 0; i < activity.value.length; i++) {
-    if (activity.value[i].activityId == row.activityId) {
-      ratio = activity.value[i].rechargeRatio
-      break
-    }
-  }
-  console.log('ratio===', ratio)
-  if (row.paidGold == null || row.paidGold == '') {
-    row.freeGold = 0
-  } else {
-    if (ratio == 0) {
-      row.freeGold = 0
-    } else {
-      row.freeGold = Math.ceil(row.paidGold / ratio)
-    }
-  }
-}
-// //监听改变永久金币时的操作
-// const changePaidGold = function (row) {
-//   console.log('row===', row)
-//   let ratio = 0
-//   if (row.activityId == null || row.activityId == '') {
-//     row.freeGold = 0
-//   } else {
-//     for (let i = 0; i < activity.value.length; i++) {
-//       if (activity.value[i].activityId == row.activityId) {
-//         ratio = activity.value[i].rechargeRatio
-//         break
-//       }
-//     }
-//     if (ratio == 0) {
-//       row.freeGold = 0
-//     } else {
-//       row.freeGold = Math.ceil(Number(row.paidGold) / ratio)
-//     }
-//   }
-//   let rate = row.rate
-//   if (rate == null || rate == '') {
-//     row.rechargeGold = 0
-//   } else {
-//     if (row.paidGold == null || row.paidGold == '') {
-//       row.rechargeGold = 0
-//     } else {
-//       row.rechargeGold = Math.ceil(Number(row.paidGold) * rate)
-//     }
-//   }
-// }
-// 监听改变币种时的操作
-const changeRate = function (row) {
-  console.log('row===', row)
-  let rate = row.rate
-  if (rate == null || rate == '') {
-    row.rechargeGold = 0
-  } else {
-    if (row.paidGold == null || row.paidGold == '') {
-      row.rechargeGold = 0
-    } else {
-      row.rechargeGold = Math.ceil(Number(row.paidGold) * rate)
-    }
-  }
-}
-//监听改变凭证时的操作
-const changeVoucher = function (row) {
-  if (
-    (imageUrl.value != '' && rechargeVoucher.value != '') ||
-    (imageUrl.value != null && rechargeVoucher.value != null)
-  ) {
-    console.log('row===', row)
-    row.imageUrl = imageUrl.value
-    row.rechargeVoucher = rechargeVoucher.value
-    console.log('row===', row)
-    imageUrl.value = ''
-    rechargeVoucher.value = ''
-  }
-}
-// 上传图片成功的回调函数
-const handleBatchAvatarSuccess = (response, uploadFile) => {
-  imageUrl.value = URL.createObjectURL(uploadFile.raw)
-  console.log('图片上传成功', response, uploadFile)
-  rechargeVoucher.value = `http://54.251.137.151:10702/upload/${response.data}`
-  console.log('图片名称', rechargeVoucher.value)
-}
-//批量充值确认按钮
-const batchAdd = async function () {
-  try {
-    console.log('batchData===', batchData.value)
-    let msg = ''
-    if (batchData.value.length == 0) {
-      ElMessage({
-        type: 'error',
-        message: '至少需要输入一条数据！'
-      })
-      return
-    }
-    if (errorCount.value > 0) {
-      console.log('errorCount.value', errorCount.value)
-      ElMessage({
-        type: 'error',
-        message: '请检查输入的精网号是否正确！'
-      })
-      return
-    }
-    for (let i = 0; i < batchData.value.length; i++) {
-      batchData.value[i].adminId = adminData.value.adminId
-      batchData.value[i].area = adminData.value.area
-      batchData.value[i].rechargeWay = '客服充值'
-      if (
-        batchData.value[i].jwcode == '' ||
-        batchData.value[i].jwcode == null
-      ) {
-        msg += `精网号不能为空！ <br/>`
-      }
-      if (
-        batchData.value[i].activityId == '' ||
-        batchData.value[i].activityId == null
-      ) {
-        msg += `活动不能为空！ <br/>`
-      }
-      if (
-        batchData.value[i].paidGold == '' ||
-        batchData.value[i].paidGold == null
-      ) {
-        msg += `永久金币不能为空！ <br/>`
-      }
-      if (
-        batchData.value[i].freeGold == '' ||
-        batchData.value[i].freeGold == null
-      ) {
-        msg += `免费金币不能为空！ <br/>`
-      }
-      if (
-        batchData.value[i].rechargeGold == '' ||
-        batchData.value[i].rechargeGold == null
-      ) {
-        msg += `充值金额不能为空！ <br/>`
-      }
-      if (
-        batchData.value[i].payWay == '' ||
-        batchData.value[i].payWay == null
-      ) {
-        msg += `收款方式不能为空！ <br/>`
-      }
-      if (
-        batchData.value[i].rechargeTime == '' ||
-        batchData.value[i].rechargeTime == null
-      ) {
-        msg += `交款时间不能为空！ <br/>`
-      }
-      if (msg != '' && msg != null) {
-        console.log(batchData.value[i])
-        ElMessage({
-          dangerouslyUseHTMLString: true,
-          type: 'error',
-          message: msg
-        })
-        return
-      }
-    }
-
-    console.log('batchData===', batchData.value)
 
-    const result = await API({
-      url: '/recharge/recharge/addmore',
-      data: {
-        ...batchData.value
-      }
-    })
-
-    if (result.code === 0) {
-      ElMessage.error('添加失败')
-      return
-    }
-
-    ElMessage({
-      type: 'success',
-      message: '添加成功！'
-    })
-
-    closeBatchRechargeVisible()
-  } catch (error) {
-    console.log('error===', error)
-    ElMessage.error('添加失败')
-    return
-  }
-}
-// 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次
-const throttledBatchAdd = throttle(batchAdd, 2000, { trailing: false })
-// 批量设置的对象
-const batchSettingObj = ref({
-  rechargeGold: '0',
-  paidGold: '0',
-  freeGold: '0'
-})
-// 批量充值弹窗
-const batchSettingVisible = ref(false)
-// 打开批量充值弹窗
-const openBatchSettingVisible = function () {
-  batchSettingVisible.value = true
-}
-// 关闭批量充值弹窗
-const closeBatchSettingVisible = function () {
-  batchSettingVisible.value = false
-}
-// 批量设置初始化
-const batchSettingInit = function () {
-  openBatchSettingVisible()
-}
-// 上传图片成功的回调函数
-const batchSettingHandleAvatarSuccess = (response, uploadFile) => {
-  batchSettingObj.value.imageUrl = URL.createObjectURL(uploadFile.raw)
-  console.log('图片上传成功', response, uploadFile)
-  batchSettingObj.value.rechargeVoucher = `http://54.251.137.151:10702/upload/${response.data}`
-  console.log('图片名称', batchSettingObj.value.rechargeVoucher)
-}
-// 批量设置取消按钮
-const cancelBatchSetting = function () {
-  batchSettingObj.value = {
-    rechargeGold: '0',
-    paidGold: '0',
-    freeGold: '0'
-  }
-  closeBatchSettingVisible()
-}
-// 批量设置确认按钮
-const batchSettingConfirm = function () {
-  for (let i = 0; i < batchData.value.length; i++) {
-    if (
-      batchSettingObj.value.jwcode != '' &&
-      batchSettingObj.value.jwcode != null
-    ) {
-      batchData.value[i].jwcode = batchSettingObj.value.jwcode
-    }
-    if (
-      batchSettingObj.value.activityId != '' &&
-      batchSettingObj.value.activityId != null
-    ) {
-      batchData.value[i].activityId = batchSettingObj.value.activityId
-    }
-    if (
-      batchSettingObj.value.paidGold != '' &&
-      batchSettingObj.value.paidGold != null
-    ) {
-      batchData.value[i].paidGold = batchSettingObj.value.paidGold
-    }
-    if (
-      batchSettingObj.value.freeGold != '' &&
-      batchSettingObj.value.freeGold != null
-    ) {
-      batchData.value[i].freeGold = batchSettingObj.value.freeGold
-    }
-    if (
-      batchSettingObj.value.rate != '' &&
-      batchSettingObj.value.rate != null
-    ) {
-      batchData.value[i].rate = batchSettingObj.value.rate
-    }
-    if (
-      batchSettingObj.value.rechargeGold != '' &&
-      batchSettingObj.value.rechargeGold != null
-    ) {
-      batchData.value[i].rechargeGold = batchSettingObj.value.rechargeGold
-    }
-    if (
-      batchSettingObj.value.payWay != '' &&
-      batchSettingObj.value.payWay != null
-    ) {
-      batchData.value[i].payWay = batchSettingObj.value.payWay
-    }
-    if (
-      batchSettingObj.value.rechargeTime != '' &&
-      batchSettingObj.value.rechargeTime != null
-    ) {
-      batchData.value[i].rechargeTime = batchSettingObj.value.rechargeTime
-    }
-    if (
-      batchSettingObj.value.imageUrl != '' &&
-      batchSettingObj.value.imageUrl != null
-    ) {
-      batchData.value[i].imageUrl = batchSettingObj.value.imageUrl
-    }
-    if (
-      batchSettingObj.value.rechargeVoucher != '' &&
-      batchSettingObj.value.rechargeVoucher != null
-    ) {
-      batchData.value[i].rechargeVoucher = batchSettingObj.value.rechargeVoucher
-    }
-    if (
-      batchSettingObj.value.remark != '' &&
-      batchSettingObj.value.remark != null
-    ) {
-      batchData.value[i].remark = batchSettingObj.value.remark
-    }
-  }
-  batchSettingObj.value = {
-    rechargeGold: '0',
-    paidGold: '0',
-    freeGold: '0'
-  }
-  closeBatchSettingVisible()
-}
-
-// 挂载
 onMounted(async function () {
   await getAdminData()
-  await getCurrency()
+  // await getCurrency()
   await getActivity()
-  await getJwcodeList()
+  
 })
 </script>
 
@@ -920,7 +403,7 @@ onMounted(async function () {
   <div>
 
   <el-form
-    :model="addRecharge"
+    :model="recharge"
     ref="Ref"
     :rules="rules"
     label-width="auto"
@@ -928,83 +411,83 @@ onMounted(async function () {
     class="add-form"
   >
     <el-form-item prop="jwcode" label="精网号">
-      <el-input v-model="addRecharge.jwcode" style="width: 220px" />
+      <el-input v-model="recharge.jwcode" style="width: 220px" />
       <el-button
         type="primary"
-        @click="getUser(addRecharge.jwcode)"
+        @click="getUser(recharge.jwcode)"
         style="margin-left: 20px"
         
         >查询</el-button
       >
     </el-form-item>
-    <el-form-item prop="activityId" label="活动名称">
+    <el-form-item prop="activity" label="活动名称">
       <el-select
-        v-model="addRecharge.activityId"
+        v-model="recharge.activity"
         placeholder="请选择"
         style="width: 300px"
         @change="handleActivityChange"
       >
         <el-option
-          v-for="item in activity"
-          :key="item.value"
-          :label="item.activityName"
-          :value="item.activityId"
+          v-for="(item, index) in activity"
+          :key="index"
+          :label="item"
+          :value="item"
         />
       </el-select>
     </el-form-item>
-    <el-form-item prop="paidGold" label="永久金币">
-      <el-input v-model="addRecharge.paidGold" style="width: 100px" />
+    <el-form-item prop="permanentGold" label="永久金币">
+      <el-input v-model="recharge.permanentGold" style="width: 100px" />
       <p style="margin-right: 20px">个</p>
       <p>免费金币</p>
-      <el-input v-model="addRecharge.freeGold" style="width: 100px" />
+      <el-input v-model="recharge.freeGold" style="width: 100px" />
       <p>个</p>
     </el-form-item>
     <el-form-item label="充值金额">
       <el-select
-        prop="rechargeGold"
+        prop="money"
         v-model="Rate"
         placeholder="货币名称"
         style="width: 95px; margin-right: 5px"
         aria-required="true"
       >
         <el-option
-          v-for="item in currency"
+          v-for="item in rateName"
           :key="item.value"
-          :label="item.currency"
-          :value="item.exchangeRate"
+          :label="item.label"
+          :value="item.value"
         />
       </el-select>
-      <el-input prop="addRecharge.rechargeGold" v-model="addRecharge.rechargeGold" style="width: 200px" aria-required="true"/>
+      <el-input prop="recharge.money" v-model="recharge.money" style="width: 200px" aria-required="true"/>
     </el-form-item>
-    <el-form-item prop="payWay" label="收款方式">
+    <el-form-item prop="payModel" label="收款方式">
       <el-select
-        v-model="addRecharge.payWay"
+        v-model="recharge.payModel"
         placeholder="请选择"
         style="width: 300px"
       >
         <el-option
-          v-for="item in options"
+          v-for="item in payModel"
           :key="item.value"
           :label="item.label"
           :value="item.value"
         />
       </el-select>
     </el-form-item>
-    <el-form-item prop="rechargeTime" label="交款时间">
+    <el-form-item prop="payTime" label="交款时间">
       <!-- 修改 type 属性为 datetime 以支持时分秒选择 -->
       <el-date-picker
-        v-model="addRecharge.rechargeTime"
+        v-model="recharge.payTime"
         type="datetime"
         style="width: 300px"
       />
     </el-form-item>
     <el-form-item
-      prop="rechargeVoucher"
+      prop="voucher"
       label="交款凭证"
       style="margin-bottom: 5px"
     >
       <el-upload
-        action="http://54.251.137.151:10702/upload"
+        action="http://39.101.133.168:8828/hljw/api/aws/upload"
         class="avatar-uploader"
         :show-file-list="false"
         :on-success="handleAvatarSuccess"
@@ -1031,7 +514,7 @@ onMounted(async function () {
     </el-form-item>
     <el-form-item prop="remark" label="备注">
       <el-input
-        v-model="addRecharge.remark"
+        v-model="recharge.remark"
         style="width: 300px"
         :rows="2"
         maxlength="100"
@@ -1039,10 +522,10 @@ onMounted(async function () {
         type="textarea"
       />
     </el-form-item>
-    <el-form-item prop="submitter" label="提交人">
+    <el-form-item prop="adminId" label="提交人">
       <el-input
         style="width: 300px"
-        :value="adminData.name"
+        :value="adminData.adminId"
         disabled
         placeholder="提交人姓名"
       />
@@ -1054,7 +537,7 @@ onMounted(async function () {
   </el-form>
 
   <!-- 客户信息栏 -->
-  <el-card
+  <el-card v-if="user.jwcode"
     style="width: 1200px; float: right"
     class="customer-info"
     width="3000px"
@@ -1074,10 +557,16 @@ onMounted(async function () {
         </el-col>
         <el-col :span="14">
           <el-form-item label="历史金币总数">
-            <!-- 检查 user.totalRechargeGold 是否为有效的数字 -->
-            <p v-if="!isNaN(Number(user.totalRechargeGold))">
-              {{ Number(user.totalRechargeGold / 100) }}
+            <!-- 检查 user.historySumGold 是否为有效的数字 -->
+            <p style="color: #2fa1ff; margin-right: 5px" v-if="!isNaN(Number(user.historySumGold))">
+              {{ Number(user.historySumGold ) }}
             </p>
+            <span
+              style="display: inline; white-space: nowrap; color: #b1b1b1"
+              v-if="user.historyPermanentGold !== undefined"
+              >(永久金币:{{ user.historyPermanentGold }};免费金币:{{
+                (user.historyFreeGold)
+              }};任务金币:{{ user.historyTaskGold }})</span>
             <!-- 如果不是有效的数字，显示默认值 -->
             <p v-else></p>
           </el-form-item>
@@ -1091,30 +580,30 @@ onMounted(async function () {
           <el-form-item label="当前金币总数" style="width: 500px">
             <span
               style="color: #2fa1ff; margin-right: 5px"
-              v-if="user.buyJb !== undefined"
+              v-if="user.nowPermanentGold !== undefined"
               >{{
-                (user.buyJb + user.free6 + user.free12 + user.coreJb) / 100
+                (user.nowSumGold)
               }}</span
             >
             <span
               style="display: inline; white-space: nowrap; color: #b1b1b1"
-              v-if="user.buyJb !== undefined"
-              >(永久金币:{{ user.buyJb / 100 }};免费金币:{{
-                (user.free6 + user.free12) / 100
-              }};任务金币:{{ user.coreJb / 100 }})</span
+              v-if="user.nowPermanentGold !== undefined"
+              >(永久金币:{{ user.nowPermanentGold}};免费金币:{{
+                (user.nowFreeGold)
+              }};任务金币:{{ user.nowTaskGold }})</span
             >
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="首次充值日期">
-            <p v-if="user.firstRechargeDate">
-              {{ moment(user.firstRechargeDate).format('YYYY-MM-DD HH:mm:ss') }}
+            <p v-if="user.firstRecharge">
+              {{ moment(user.firstRecharge).format('YYYY-MM-DD HH:mm:ss') }}
             </p>
           </el-form-item>
         </el-col>
         <el-col :span="14">
           <el-form-item label="充值次数">
-            <p style="color: #2fa1ff">{{ user.rechargeTimes }}</p>
+            <p style="color: #2fa1ff">{{ user.rechargeNum }}</p>
           </el-form-item>
         </el-col>
         <!-- <el-col :span="10">
@@ -1124,12 +613,12 @@ onMounted(async function () {
         </el-col> -->
         <el-col :span="10">
           <el-form-item label="消费次数">
-            <p style="color: #2fa1ff">{{ user.spendTimes }}</p>
+            <p style="color: #2fa1ff">{{ user.consumeNum }}</p>
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="所属门店">
-            <p>{{ adminData.area }}</p>
+            <p>{{ user.market }}</p>
           </el-form-item>
         </el-col>
         <el-col :span="14">
@@ -1143,399 +632,7 @@ onMounted(async function () {
     </el-form>
   </el-card>
 
-  <el-dialog
-    v-model="batchRechargeVisible"
-    title="批量充值"
-    width="1800px"
-    style="height: 700px"
-    :close-on-click-modal="false"
-  >
-    <el-row style="margin-bottom: 10px">
-      <!-- <el-button type="primary" @click="addLine()" style="margin-right: 10px">新增一行</el-button> -->
-      <div style="font-weight: bold; font-size: 20px">
-        <span>添加</span>
-        <el-input-number
-          min="1"
-          style="width: 100px"
-          controls-position="right"
-          v-model="addLineObj"
-        ></el-input-number>
-        <span>行</span>
-        <el-button
-          type="primary"
-          @click="throttledAddLines"
-          style="margin-right: 10px"
-          >添加</el-button
-        >
-      </div>
-      <el-button
-        type="warning"
-        @click="batchSettingInit()"
-        style="margin-right: 10px"
-        >批量设置</el-button
-      >
-      <!-- <el-upload :ref="(el) => handleSetUploadRefMap(el)" action="" :http-request="httpExcelRequest" :limit="1" :show-file-list="false"
-        class="uploadExcelContent" :data={} style="margin-right: auto">
-        <el-button type="success" >导入jwcode</el-button>
-      </el-upload> -->
-      <el-button
-        type="danger"
-        plain
-        @click="batchDel()"
-        style="margin-right: 10px; width: 130px"
-        >批量删除</el-button
-      >
-    </el-row>
-    <el-row>
-      <el-table
-        v-loading="loading"
-        :data="batchData"
-        border
-        max-height="540px"
-        style="height: 540px"
-        @selection-change="handleSelectionChangebatch"
-      >
-        <el-table-column type="selection" width="50px" />
-        <el-table-column property="index" label="序号" width="55px">
-          <template #default="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="jwcode" label="精网号" width="150px">
-          <template #default="scope">
-            <el-input
-              v-if="scope.row.showInput"
-              :class="{ 'is-invalid': scope.row.isInputInvalid }"
-              @blur="validateInput(scope.row)"
-              v-model="scope.row.jwcode"
-              style="width: 110px"
-            />
-            <p v-if="scope.row.isInputInvalid" class="error-message">
-              {{ scope.row.inputErrorMessage }}
-            </p>
-          </template>
-          <!-- <template #default="scope">
-            <el-select-v2 v-if="scope.row.showInput" filterable clearable v-model="scope.row.jwcode"
-              placeholder="请选择精网号" style="widows: 110px;" :options="jwcodeList">
-            <el-select-v2
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.jwcode"
-              placeholder="请选择精网号"
-              style="widows: 110px"
-              :options="jwcodeList"
-            >
-            </el-select-v2>
-            <span v-else>{{ scope.row.jwcode }}</span>
-          </template> -->
-        </el-table-column>
-        <el-table-column property="activityName" label="活动名称" width="150px">
-          <template #default="scope">
-            <el-select
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.activityId"
-              placeholder="请选择活动名称"
-              @change="changeActivity(scope.row)"
-            >
-              <el-option
-                v-for="item in activity"
-                :key="item.activityId"
-                :label="item.activityName"
-                :value="item.activityId"
-              >
-              </el-option>
-            </el-select>
-            <span v-else>{{ scope.row.activityName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="paidGold" label="永久金币" width="110px">
-          <template #default="scope">
-            <el-input
-              v-if="scope.row.showInput"
-              v-model="scope.row.paidGold"
-              style="width: 70px"
-              @change="changePaidGold(scope.row)"
-            />
-            <span v-else>{{ scope.row.paidGold }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="freeGold" label="免费金币" width="110px">
-          <template #default="scope">
-            <el-input
-              v-if="scope.row.showInput"
-              v-model="scope.row.freeGold"
-              style="width: 70px"
-            />
-            <span v-else>{{ scope.row.freeGold }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="rate" label="货币名称">
-          <template #default="scope">
-            <el-select
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.rate"
-              placeholder="请选择币种"
-              @change="changeRate(scope.row)"
-            >
-              <el-option
-                v-for="item in currency"
-                :key="item.exchangeRate"
-                :label="item.currency"
-                :value="item.exchangeRate"
-              >
-              </el-option>
-            </el-select>
-            <span v-else>{{ scope.row.rate }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column  label="充值金额" width="110px">
-          <template #default="scope">
-            <el-input property="rechargeGold" v-model="scope.row.rechargeGold"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column property="payWay" label="收款方式" width="130px">
-          <template #default="scope">
-            <el-select
-              v-if="scope.row.showInput"
-              filterable
-              clearable
-              v-model="scope.row.payWay"
-              placeholder="请选择收款方式"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <span v-else>{{ scope.row.payWay }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="rechargeTime" label="交款时间" width="150px">
-          <template #default="scope">
-            <el-date-picker
-              v-if="scope.row.showInput"
-              type="date"
-              v-model="scope.row.rechargeTime"
-              style="width: 120px"
-              placeholder="请选择交款时间"
-            >
-            </el-date-picker>
-            <span v-else>{{
-              moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="rechargeVoucher" label="充值凭证">
-          <template #default="scope">
-            <el-upload
-              action="http://54.251.137.151:10702/upload"
-              class="avatar-uploader"
-              :show-file-list="false"
-              :on-success="handleBatchAvatarSuccess"
-              v-if="scope.row.showInput"
-              @change="changeVoucher(scope.row)"
-            >
-              <img
-                v-if="scope.row.imageUrl"
-                :src="scope.row.imageUrl"
-                class="avatar"
-              />
-              <el-icon v-else class="avatar-uploader-icon">
-                <Plus />
-              </el-icon>
-            </el-upload>
-            <span v-else>{{ scope.row.rechargeVoucher }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="remark" label="备注" width="130px">
-          <template #default="scope">
-            <el-input
-              type="textarea"
-              v-if="scope.row.showInput"
-              v-model="scope.row.remark"
-              style="max-width: 90px"
-              :rows="1"
-              cols="12"
-            ></el-input>
-            <span v-else>{{ scope.row.remark }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column property="submitter" label="提交人">
-          <el-input :value="adminData.name" disabled />
-        </el-table-column>
-        <el-table-column
-          fixed="right"
-          prop="operation"
-          label="操作"
-          width="150px"
-        >
-          <template #default="scope">
-            <div style="display: flex">
-              <el-popconfirm
-                title="确定将此条信息删除吗？"
-                @confirm="delConfirm"
-              >
-                <template #reference>
-                  <el-button type="danger" text @click="del(scope.row)">
-                    删除
-                  </el-button>
-                </template>
-                <template #actions="{ confirm, cancel }">
-                  <el-button size="small" @click="cancel">取消</el-button>
-                  <el-button type="primary" size="small" @click="confirm">
-                    确定
-                  </el-button>
-                </template>
-              </el-popconfirm>
-              <el-popconfirm
-                title="确定将此条信息重置吗？"
-                @confirm="resetConfirm"
-              >
-                <template #reference>
-                  <el-button type="success" text @click="reset(scope.row)">
-                    重置
-                  </el-button>
-                </template>
-                <template #actions="{ confirm, cancel }">
-                  <el-button size="small" @click="cancel">取消</el-button>
-                  <el-button type="primary" size="small" @click="confirm">
-                    确定
-                  </el-button>
-                </template>
-              </el-popconfirm>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-row>
-    <el-row>
-      <div class="batch-btn">
-        <el-button @click="cancelBatch()"> 取消 </el-button>
-        <el-button type="primary" @click="throttledBatchAdd()">
-          提交
-        </el-button>
-      </div>
-    </el-row>
-  </el-dialog>
-
-  <el-dialog
-    v-model="batchSettingVisible"
-    title="批量设置"
-    :close-on-click-modal="false"
-    style="width: 550px"
-  >
-    <el-form label-position="left" label-width="auto">
-      <el-form-item label="活动名称">
-        <el-select
-          v-model="batchSettingObj.activityId"
-          placeholder="请选择活动名称"
-          clearable
-        >
-          <el-option
-            v-for="item in activity"
-            :key="item.activityId"
-            :label="item.activityName"
-            :value="item.activityId"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="永久金币">
-        <el-input
-          v-model="batchSettingObj.paidGold"
-          placeholder="请输入永久金币"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="免费金币">
-        <el-input v-model="batchSettingObj.freeGold"></el-input>
-      </el-form-item>
-      <el-form-item label="充值金额">
-        <div style="display: flex">
-          <el-select
-            v-model="batchSettingObj.rate"
-            placeholder="请选择币种"
-            style="width: 120px; margin-right: 10px"
-            clearable
-          >
-            <el-option
-              v-for="item in currency"
-              :key="item.exchangeRate"
-              :label="item.currency"
-              :value="item.exchangeRate"
-            ></el-option>
-          </el-select>
-          <el-input
-            v-model="batchSettingObj.rechargeGold"
-            placeholder="请输入充值金额"
-          ></el-input>
-        </div>
-      </el-form-item>
-      <el-form-item prop="payWay" label="收款方式">
-        <el-select
-          v-model="batchSettingObj.payWay"
-          placeholder="请选择收款方式"
-          clearable
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="rechargeTime" label="交款时间">
-        <el-date-picker
-          v-model="batchSettingObj.rechargeTime"
-          type="date"
-          placeholder="请选择交款时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item prop="rechargeVoucher" label="交款凭证">
-        <el-upload
-          action="http://54.251.137.151:10702/upload"
-          class="avatar-uploader"
-          :show-file-list="false"
-          :on-success="batchSettingHandleAvatarSuccess"
-          :before-upload="beforeAvatarUpload"
-          style="width: 100px; height: 115px"
-        >
-          <img
-            v-if="batchSettingObj.imageUrl"
-            :src="batchSettingObj.imageUrl"
-            class="avatar"
-            style="width: 100px; height: 115px"
-          />
-          <el-icon
-            v-else
-            class="avatar-uploader-icon"
-            style="width: 100px; height: 100px"
-          >
-            <Plus />
-          </el-icon>
-        </el-upload>
-      </el-form-item>
-      <el-form-item prop="remark" label="备注">
-        <el-input
-          type="textarea"
-          v-model="batchSettingObj.remark"
-          placeholder="请输入备注"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button @click="cancelBatchSetting()" style="margin-left: 370px"
-      >取消</el-button
-    >
-    <el-button type="primary" @click="batchSettingConfirm()"> 确认 </el-button>
-  </el-dialog>
+  
 </div>
 </template>
 
diff --git a/src/views/recharge/beanRecharge.vue b/src/views/recharge/beanRecharge.vue
index 5a5db9a..44a2c63 100644
--- a/src/views/recharge/beanRecharge.vue
+++ b/src/views/recharge/beanRecharge.vue
@@ -118,13 +118,13 @@ const get = async function (val) {
     }
     // 搜索参数时间赋值
     if (getTime.value != null) {
-      if (getTime.value.startDate != '' && getTime.value.endDate != '') {
-        rechargeVo.value.startDate = getTime.value[0]
-        rechargeVo.value.endDate = getTime.value[1]
+      if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+        rechargeVo.value.startTime = getTime.value[0]
+        rechargeVo.value.endTime = getTime.value[1]
       }
     } else {
-      rechargeVo.value.startDate = ''
-      rechargeVo.value.endDate = ''
+      rechargeVo.value.startTime = ''
+      rechargeVo.value.endTime = ''
     }
     // 搜索参数赋值
     rechargeVo.value.sortField = sortField.value
@@ -139,8 +139,8 @@ const get = async function (val) {
     const detailWithoutSort = ref({
       area: rechargeVo.value.area,
       adminId: rechargeVo.value.adminId,
-      startDate: rechargeVo.value.startDate,
-      endDate: rechargeVo.value.endDate
+      startTime: rechargeVo.value.startTime,
+      endTime: rechargeVo.value.endTime
     })
     const result2 = await API({
       url: '/recharge/recharge/RechargeA',
@@ -206,8 +206,8 @@ const reset = function () {
   delete rechargeVo.value.activityId
   delete rechargeVo.value.payWay
   delete rechargeVo.value.area
-  delete rechargeVo.value.startDate
-  delete rechargeVo.value.endDate
+  delete rechargeVo.value.startTime
+  delete rechargeVo.value.endTime
   delete sortField.value
   delete sortOrder.value
   getTime.value = {}
@@ -215,17 +215,17 @@ const reset = function () {
 // 今天
 const getToday = function () {
   const today = new Date()
-  const startDate = new Date(
+  const startTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate()
   )
-  const endDate = new Date(
+  const endTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate() + 1
   )
-  getTime.value = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
@@ -241,34 +241,34 @@ const handleCurrentChange = function (val) {
 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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
 // 近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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
@@ -343,7 +343,7 @@ const getActivity = async function () {
 const getArea = async function () {
   try {
     // 发送POST请求
-    const result = await API({ url: 'recharge/user/search', data: {} })
+    const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
     // 将响应结果存储到响应式数据中
     console.log('请求成功', result)
     // 存储地区信息
diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue
index 7a0e5b3..68ee186 100644
--- a/src/views/recharge/coinRechargeDetail.vue
+++ b/src/views/recharge/coinRechargeDetail.vue
@@ -12,7 +12,7 @@ const getAdminData = async function () {
   try {
     const result = await API({ url: '/admin/userinfo', data: {} })
     adminData.value = result
-    rechargeVo.value.adminId = adminData.value.adminId
+    rechargeUser.value.adminId = adminData.value.adminId
     console.log('请求成功', result)
     console.log('用户信息', adminData.value)
   } catch (error) {
@@ -24,7 +24,7 @@ const getAdminData = async function () {
 const tableData = ref([])
 // 搜索===========================================
 // 搜索recharge
-const rechargeVo = ref({
+const rechargeUser = ref({
   adminId: adminData.value.adminId
 })
 // 搜索对象
@@ -41,11 +41,24 @@ const activity = ref([])
 // 所有信息
 const allData = ref([])
 // 搜索地区列表
-const area = ref([])
-//标签页默认高亮选项
-const activeName = ref('all')
+const market = ref([])
+
+//时间格式化
+const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+// 初始化 money 和 permanentGold 和 freeGold
+const money = ref(0)
+const permanentGold = ref(0)
+const freeGold = ref(0)
+
+
+// 定义响应式变量存储金币合计数
+const permanentGolds = ref(0)
+const freeGolds = ref(0)
+
+
 // 支付方式选项
-const payWay = [
+const payModel = [
   {
     value: '微信',
     label: '微信'
@@ -75,114 +88,123 @@ const payWay = [
 // 删除对象
 const delObj = ref({})
 
-// //表格高度
-// const tableHeight = computed(function () {
-//   return (getObj.value.pageSize + 2) * 60 + "px";
-// });
+// 获取活动名称
+const getActivity = async function () {
+  try {
+    // 发送POST请求
+    const result = await API({ url: '/recharge/activity/select', data: {} })
+
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result)
+    // 存储表格数据
+    activity.value = result.data
+    console.log('activity', activity.value)
+  } catch (error) {
+    console.log('请求失败', error)
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+}
+// 获取地区
+// 获取地区
+const getArea = async function () {
+  try {
+    // 发送POST请求
+    const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result)
+    // 存储地区信息
+    market.value = result.data
+    console.log('地区', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+}
+
+//定义充值类型的加载状态
+const isLoadingPlatform = ref(false)
+// 充值类型
+const platform = ref([])
+//获取充值类型的函数
+const getPlatform = async () => {
+  isLoadingPlatform.value = true;
+  try {
+    const result = await API({
+      url: 'http://18.143.76.3:10704/general/platform',
+      method: 'post',
+      data: {}// 这里添加参数
+    })
+    // 假设后端返回的是字符串数组，转换为 { value, label } 格式
+    if(Array.isArray(result.data)) {
+      platform.value = result.data.map(item => ({ value: item, label: item }));
+    } else {
+      console.error('充值类型格式错误',result)
+      ElMessage.error('充值类型格式错误，请联系管理员')
+    } 
+  } catch (error) {
+    console.error('获取充值类型失败:', error);
+    ElMessage.error('获取充值类型失败，请稍后重试');
+    } finally {
+    isLoadingPlatform.value = false
+  }
+}
 
-// 方法
-// 合计数存储
-const trueGold = ref(0)
-const trueRGold = ref(0)
-const trueFGold = ref(0)
-//全部
-const totalmoney = ref(0)
-const totalRcoin = ref(0)
-const totalFcoin = ref(0)
-//待审核
-const pendingGold = ref(0)
-const pendingRGold = ref(0)
-const pendingFGold = ref(0)
-// 已通过金币数
-const approvedGold = ref(0)
-const approvedRGold = ref(0)
-const approvedFGold = ref(0)
-// 已驳回金币数
-const rejectedGold = ref(0)
-const rejectedRGold = ref(0)
-const rejectedFGold = ref(0)
 // 搜索===========================================================================
 // 搜索方法
 const get = async function (val) {
   try {
-    // 地区赋值
-    if (adminData.value.area === '泰国') {
-      rechargeVo.value.areas = ['泰国', '越南']
-    } else if (adminData.value.area !== '总部') {
-      rechargeVo.value.area = adminData.value.area
-    }
-
     // 搜索参数页码赋值
     if (typeof val === 'number') {
       getObj.value.pageNum = val
     }
     // 搜索参数时间赋值
     if (getTime.value != null) {
-      if (getTime.value.startDate != '' && getTime.value.endDate != '') {
-        rechargeVo.value.startDate = getTime.value[0]
-        rechargeVo.value.endDate = getTime.value[1]
+      if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+        rechargeUser.value.startTime = formatTime(getTime.value[0])
+        rechargeUser.value.endTime = formatTime(getTime.value[1])
       }
     } else {
-      rechargeVo.value.startDate = ''
-      rechargeVo.value.endDate = ''
+      rechargeUser.value.startTime = ''
+      rechargeUser.value.endTime = ''
     }
     // 搜索参数赋值
-    rechargeVo.value.sortField = sortField.value
-    rechargeVo.value.sortOrder = sortOrder.value
+    rechargeUser.value.sortField = sortField.value
+    rechargeUser.value.sortOrder = sortOrder.value
     console.log('搜索参数', getObj.value)
     // 发送POST请求
     const result = await API({
-      url: '/recharge/recharge',
-      data: { ...getObj.value, rechargeVo: { ...rechargeVo.value } }
+      url: 'http://18.143.76.3:10704/recharge/selectBy',
+      data: { 
+        ...getObj.value, 
+        rechargeUser: { ...rechargeUser.value } 
+      }
     })
-    // 复制一份 rechargeVo.value 并移除排序字段和排序方式
+    // 复制一份 rechargeUser.value 并移除排序字段和排序方式
     const detailWithoutSort = ref({
-      area: rechargeVo.value.area,
-      adminId: rechargeVo.value.adminId,
-      startDate: rechargeVo.value.startDate,
-      endDate: rechargeVo.value.endDate
+      market: rechargeUser.value.market,
+      adminId: rechargeUser.value.adminId,
+      startTime: rechargeUser.value.startTime,
+      endTime: rechargeUser.value.endTime,
+       jwcode: rechargeUser.value.jwcode,
+       goodsName: rechargeUser.value.goodsName,
+      payPlatform: rechargeUser.value.payPlatform
     })
-    const result2 = await API({
-      url: '/recharge/recharge/RechargeA',
+    const resultTotalGold = await API({
+      url: 'http://18.143.76.3:10704/recharge/statsGold',
       data: {
         ...detailWithoutSort.value
       }
     })
-    // 检查 result2 是否为空
-    if (!result2 || !result2.data || result2.data.length === 0) {
-      totalmoney.value = 0
-      totalRcoin.value = 0
-      totalFcoin.value = 0
-    }
-    if (result2.data) {
-      result2.data.forEach((item) => {
-        switch (item.auditStatus) {
-          case '待审核':
-            // 若 item.raudit 为空则赋值为 0
-            // 若 item.sumRaudit 为空则赋值为 0
-            pendingGold.value = item.sumRaudit || 0
-            pendingRGold.value = item.sumRaudit1 || 0
-            pendingFGold.value = item.sumRaudit2 || 0
-            break
-          case '已通过':
-            approvedGold.value = item.sumRaudit || 0
-            approvedRGold.value = item.sumRaudit1 || 0
-            approvedFGold.value = item.sumRaudit2 || 0
-            break
-          case '已驳回':
-            rejectedGold.value = item.sumRaudit || 0
-            rejectedRGold.value = item.sumRaudit1 || 0
-            rejectedFGold.value = item.sumRaudit2 || 0
-            break
-        }
-      })
-    }
-    trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
-    trueRGold.value =
-      pendingRGold.value + approvedRGold.value + rejectedRGold.value
-    trueFGold.value =
-      pendingFGold.value + approvedFGold.value + rejectedFGold.value
 
+    if (resultTotalGold.code === 200 && resultTotalGold.data) {
+      const data = resultTotalGold.data
+      console.log('获取到的金币数据:', data)
+
+      permanentGolds.value = Number(data.permanentGolds) || 0
+      freeGolds.value = Number(data.freeGolds) || 0
+      
+    }
+    
     // 将响应结果存储到响应式数据中
     console.log('请求成功', result)
     // 存储表格数据
@@ -203,29 +225,31 @@ const search = function () {
 }
 // 重置
 const reset = function () {
-  delete rechargeVo.value.activityId
-  delete rechargeVo.value.payWay
-  delete rechargeVo.value.area
-  delete rechargeVo.value.startDate
-  delete rechargeVo.value.endDate
+  delete rechargeUser.value.jwcode
+  delete rechargeUser.value.activity
+  delete rechargeUser.value.payPlatform
+  delete rechargeUser.value.market
+  delete rechargeUser.value.startTime
+  delete rechargeUser.value.endTime
   delete sortField.value
   delete sortOrder.value
   getTime.value = {}
+  get()
 }
 // 今天
 const getToday = function () {
   const today = new Date()
-  const startDate = new Date(
+  const startTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate()
   )
-  const endDate = new Date(
+  const endTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate() + 1
   )
-  getTime.value = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
@@ -241,119 +265,38 @@ const handleCurrentChange = function (val) {
 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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
 // 近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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
-//全部充值明细
-const adminAll = function () {
-  console.log('adminAll')
-  rechargeVo.value.status = ''
-  getObj.value.pageNum = 1
-  get()
-}
-//待审核充值明细
-const adminWait = async function () {
-  rechargeVo.value.status = 0
-  getObj.value.pageNum = 1
-  await get()
-  console.log('adminWait')
-
-  trueGold.value = pendingGold.value
-  trueRGold.value = pendingRGold.value
-  trueFGold.value = pendingFGold.value
-}
-//已通过充值明细
-const adminPass = async function () {
-  rechargeVo.value.status = 1
-  getObj.value.pageNum = 1
-  await get()
-  trueGold.value = approvedGold.value
-  trueRGold.value = approvedRGold.value
-  trueFGold.value = approvedFGold.value
-  console.log('adminPass')
-}
-//已驳回充值明细
-const adminReject = async function () {
-  rechargeVo.value.status = 2
-  getObj.value.pageNum = 1
-  await get()
-  console.log('adminReject')
-  trueGold.value = rejectedGold.value
-  trueRGold.value = rejectedRGold.value
-  trueFGold.value = rejectedFGold.value
-}
-//点击标签页
-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()
-  }
-}
-// 获取活动名称
-const getActivity = async function () {
-  try {
-    // 发送POST请求
-    const result = await API({ url: '/recharge/activity/select', data: {} })
 
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    // 存储表格数据
-    activity.value = result.data
-    console.log('activity', activity.value)
-  } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-}
-// 获取地区
-// 获取地区
-const getArea = async function () {
-  try {
-    // 发送POST请求
-    const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    // 存储地区信息
-    area.value = result.data
-    console.log('地区', area.value)
-  } catch (error) {
-    console.log('请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-}
 // 删除=================================
 // 点击删除按钮
 const del = function (row) {
@@ -399,7 +342,7 @@ const checkNumber = function () {
     //提示
     ElMessage({
       type: 'error',
-      message: '请检查输入内容'
+      message: '数字输入有误'
     })
   }
 }
@@ -410,6 +353,7 @@ onMounted(async function () {
   await get()
   await getActivity()
   await getArea()
+  await getPlatform()
 })
 // 新增排序字段和排序方式
 const sortField = ref('')
@@ -419,7 +363,7 @@ const handleSortChange = (column) => {
 
   console.log('排序字段：', column.prop)
   console.log('排序方式：', column.order)
-  if (column.prop === 'paidGold') {
+  if (column.prop === 'money') {
     sortField.value = 'paid_gold'
   } else if (column.prop === 'freeGold') {
     sortField.value = 'free_gold'
@@ -432,6 +376,7 @@ const handleSortChange = (column) => {
   }
   sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
   console.log('传递给后端的排序字段：', sortField.value)
+
   console.log('传递给后端的排序方式：', sortOrder.value)
   get()
 }
@@ -445,25 +390,25 @@ const handleSortChange = (column) => {
           <el-col :span="5">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">精网号：</el-text>
-              <el-input v-model="rechargeVo.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
+              <el-input v-model="rechargeUser.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
             </div>
           </el-col>
           <el-col :span="6">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">活动名称：</el-text>
-              <el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称"  style="width: 180px" 
+              <el-select v-model="rechargeUser.activity" placeholder="请选择活动名称"  style="width: 180px" 
                 clearable>
-                <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
-                  :value="item.activityId" />
+                <el-option v-for="item in activity" :key="item.activity" :label="item.activity"
+                  :value="item.activity" />
               </el-select>
             </div>
           </el-col>
 
           <el-col :span="6">
-            <div class="head-card-element" v-if="adminData.area == '总部'">
+            <div class="head-card-element" >
               <el-text class="mx-1" size="large">所属地区：</el-text>
-              <el-select v-model="rechargeVo.area" placeholder="请选择所属地区" style="width: 180px" clearable>
-                <el-option v-for="item in area" :key="item" :label="item" :value="item" />
+              <el-select v-model="rechargeUser.market" placeholder="请选择所属地区" style="width: 180px" clearable>
+                <el-option v-for="item in market" :key="item" :label="item" :value="item" />
               </el-select>
             </div>
           </el-col>
@@ -471,8 +416,8 @@ const handleSortChange = (column) => {
           <el-col :span="6">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">充值类型：</el-text>
-              <el-select v-model="rechargeVo.rechargeWay" placeholder="请选择支付方式" style="width: 180px" clearable>
-                <el-option v-for="item in rechargeWay" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="rechargeUser.payPlatform" placeholder="请选择充值方式" style="width: 180px" clearable>
+                <el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
           </el-col>
@@ -511,9 +456,9 @@ const handleSortChange = (column) => {
     <el-col>
       <el-card>
         <div>
-          充值金额：{{ trueRGold.toFixed(2) }}新币，永久金币：{{
-            trueRGold.toFixed(2)
-          }}金币，免费金币：{{ trueFGold }}金币
+          充值金额：{{ permanentGolds.toFixed(2) }}新币，永久金币：{{
+            permanentGolds.toFixed(2)
+          }}金币，免费金币：{{ freeGolds }}金币
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
@@ -537,7 +482,7 @@ const handleSortChange = (column) => {
             </el-table-column>
             <el-table-column
               fixed="left"
-              prop="username"
+              prop="name"
               label="姓名"
               width="80px"
             />
@@ -547,21 +492,21 @@ const handleSortChange = (column) => {
               label="精网号"
               width="80px"
             />
-            <el-table-column prop="area" label="所属地区" width="100px" />
+            <el-table-column prop="market" label="所属地区" width="100px" />
             <el-table-column
-              prop="activityName"
+              prop="activity"
               label="活动名称"
               width="100px"
             />
-            <el-table-column prop="" label="货币名称" width="110px" />
+            <el-table-column prop="rateName" label="货币名称" width="110px" />
             <el-table-column
-              prop="paidGold"
+              prop="money"
               sortable="custom"
               label="充值金额"
               width="110px"
             />
             <el-table-column
-              prop="paidGold"
+              prop="permanentGold"
               label="永久金币"
               sortable="custom"
               width="110px"
@@ -573,11 +518,11 @@ const handleSortChange = (column) => {
               width="110px"
             />
             <el-table-column
-              prop="rechargeWay"
+              prop="payPlatform"
               label="充值方式"
               width="100px"
             />
-            <el-table-column prop="payWay" label="支付方式" width="100px" />
+            <el-table-column prop="payModel" label="支付方式" width="100px" />
             <el-table-column
               prop="remark"
               label="备注"
@@ -585,50 +530,9 @@ const handleSortChange = (column) => {
               show-overflow-tooltip
             />
             
-            <!-- <el-table-column
-              prop="rechargeVoucher"
-              label="支付凭证"
-              width="150px"
-            >
-              <template #default="scope">
-                <el-image
-                  :preview-src-list="[scope.row.rechargeVoucher]"
-                  preview-teleported="true"
-                  :src="scope.row.rechargeVoucher"
-                  alt="凭证"
-                  style="width: 50px; height: 50px"
-                />
-              </template>
-            </el-table-column> -->
-            <el-table-column prop="name" label="提交人" width="100px" />
-            <!-- <el-table-column prop="status" label="状态" width="100px">
-              <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="rechargeTime"
               sortable
@@ -641,37 +545,7 @@ const handleSortChange = (column) => {
                 }}
               </template>
             </el-table-column>
-            <!-- <el-table-column
-              prop="createTime"
-              sortable="custom"
-              label="提交时间"
-              width="200px"
-            />
-            <el-table-column
-              fixed="right"
-              prop="operation"
-              label="操作"
-              width="150px"
-            >
-              <template #default="scope">
-                <el-popconfirm
-                  title="确定将此条活动删除吗？"
-                  @confirm="delConfirm"
-                >
-                  <template #reference>
-                    <el-button type="primary" text @click="del(scope.row)">
-                      删除
-                    </el-button>
-                  </template>
-                  <template #actions="{ confirm, cancel }">
-                    <el-button size="small" @click="cancel">取消</el-button>
-                    <el-button type="primary" size="small" @click="confirm">
-                      确定
-                    </el-button>
-                  </template>
-                </el-popconfirm>
-              </template>
-            </el-table-column> -->
+            
           </el-table>
         </div>
 
@@ -691,60 +565,8 @@ const handleSortChange = (column) => {
     </el-col>
   </el-row>
 
-  <!-- 编辑弹窗 -->
-  <el-dialog
-    v-model="editRechargeVisible"
-    title="新增活动"
-    width="500"
-    :before-close="closeEditRechargeVisible"
-  >
-    <template #footer>
-      <el-form :model="editObj" label-width="auto" style="max-width: 600px">
-        <el-form-item label="活动名称:">
-          <el-input
-            v-model="addObj.activityName"
-            placeholder="请输入活动名称"
-            style="width: 220px"
-          />
-        </el-form-item>
-
-        <el-form-item label="免费金币:">
-          <el-radio-group v-model="addObj.freeGold">
-            <el-radio value="0">无赠送</el-radio>
-            <el-radio value="1">有赠送</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item label="免费金币兑换比:">
-          <el-input
-            v-model="addObj.rechargeRatio"
-            placeholder="请输入"
-            style="width: 80px"
-          />：1
-          <div style="color: grey">(提示：当前规则每10新币可兑换1免费金币)</div>
-        </el-form-item>
-
-        <el-form-item label="开始时间:">
-          <el-time-picker v-model="addObj.startTime" />
-        </el-form-item>
-
-        <el-form-item label="结束时间:">
-          <el-time-picker v-model="addObj.endTime" />
-        </el-form-item>
-
-        <el-form-item label="添加人:">
-          <el-input v-model="addObj.adminName" disabled style="width: 220px" />
-        </el-form-item>
-      </el-form>
 
-      <div class="dialog-footer">
-        <el-button @click="closeAddActivityVisible">取消</el-button>
-        <el-button type="primary" @click="closeAddActivityVisible">
-          提交
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+  
 </template>
 
 <style scoped>
diff --git a/src/views/refund/addCoinRefund.vue b/src/views/refund/addCoinRefund.vue
index 1c947ab..af6f707 100644
--- a/src/views/refund/addCoinRefund.vue
+++ b/src/views/refund/addCoinRefund.vue
@@ -143,7 +143,7 @@ const getUser = async function (jwcode) {
   try {
     // 发送POST请求
     const result = await API({
-      url: 'http://192.168.8.247:8081/user/selectUser',
+      url: 'http://18.143.76.3:10704/user/selectUser',
       data: {
         jwcode: addRefund.value.jwcode
       }
@@ -166,23 +166,23 @@ const getUser = async function (jwcode) {
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
-const calculatedAllGold = computed(() => {
-  const sum =
-    Number(addRefund.value.freeCoin) +
-    Number(addRefund.value.rechargeCoin) +
-    Number(addRefund.value.taskCoin)
-  return !isNaN(sum) ? sum : 0
-})
+// const calculatedAllGold = computed(() => {
+//   const sum =
+//     Number(addRefund.value.freeCoin) +
+//     Number(addRefund.value.rechargeCoin) +
+//     Number(addRefund.value.taskCoin)
+//   return !isNaN(sum) ? sum : 0
+// })
 
-watch(calculatedAllGold, (newVal) => {
-  addRefund.value.allCoin = newVal
-})
+// watch(calculatedAllGold, (newVal) => {
+//   addRefund.value.allCoin = newVal
+// })
 
-const AAA = computed(() => {
-  return addRefund.value.jwcode
-})
+// const AAA = computed(() => {
+//   return addRefund.value.jwcode
+// })
 
-watch(AAA, (newVal) => {})
+// watch(AAA, (newVal) => {})
 
 // 退款类型选项
 // const refundType = [
@@ -200,7 +200,7 @@ const getRefundTypes = async function () {
   try {
     // 发送请求获取退款类型
     const result = await API({ 
-      // url: 'http://192.168.8.247:8081/', //这里应该写上一个退款类型的接口
+      // url: 'http://18.143.76.3:10704/', //这里应该写上一个退款类型的接口
       data: {} })
     console.log('退款类型请求成功', result)
     // 将响应结果存储到 refundType 中
@@ -221,7 +221,7 @@ const getGoods = async function (jwcode) {
   try {
     // 发送POST请求
     const result = await API({
-      url: 'http://39.101.133.168:8828/live_mall/api/product/all',
+      // url: 'http://39.101.133.168:8828/live_mall/api/product/all', //需要接口
       data: {
         jwcode: addRefund.value.jwcode,
         market: adminData.value.market
@@ -239,7 +239,7 @@ const getGoods = async function (jwcode) {
     }
   } catch (error) {
     console.log('请求失败', error)
-    ElMessage.error('查询失败，请检查精网号是否正确')
+    ElMessage.error('查询商品失败，请检查精网号是否正确')
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
@@ -287,7 +287,7 @@ const getProductByOrderCode = async function (item) {
     }
   } catch (error) {
     console.log('请求失败', error)
-    ElMessage.error('查询失败，请检查精网号是否正确')
+    ElMessage.error('查询订单失败，请检查精网号是否正确')
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
diff --git a/src/views/refund/beanRefund.vue b/src/views/refund/beanRefund.vue
index 36ab960..5abe0db 100644
--- a/src/views/refund/beanRefund.vue
+++ b/src/views/refund/beanRefund.vue
@@ -96,13 +96,13 @@ const get = async function (val) {
     }
     // 搜索参数时间赋值
     if (getTime.value != null) {
-      if (getTime.value.startDate != '' && getTime.value.endDate != '') {
-        detail.value.startDate = getTime.value[0]
-        detail.value.endDate = getTime.value[1]
+      if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+        detail.value.startTime = getTime.value[0]
+        detail.value.endTime = getTime.value[1]
       }
     } else {
-      detail.value.startDate = ''
-      detail.value.endDate = ''
+      detail.value.startTime = ''
+      detail.value.endTime = ''
     }
     // 添加排序字段和排序方式到请求参数
     detail.value.sortField = sortField.value
@@ -187,8 +187,8 @@ const reset = function () {
   detail.value.refundGoods = ''
   detail.value.refundType = ''
   detail.value.area = ''
-  detail.value.startDate = ''
-  detail.value.endDate = ''
+  detail.value.startTime = ''
+  detail.value.endTime = ''
   sortField.value = ''
   sortOrder.value = ''
   getTime.value = {}
@@ -196,17 +196,17 @@ const reset = function () {
 // 今天
 const getToday = function () {
   const today = new Date()
-  const startDate = new Date(
+  const startTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate()
   )
-  const endDate = new Date(
+  const endTime = new Date(
     today.getFullYear(),
     today.getMonth(),
     today.getDate() + 1
   )
-  getTime.value = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
@@ -214,34 +214,34 @@ const getToday = function () {
 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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
 // 近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 = [startDate, endDate]
+  getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   get()
 }
diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue
index d327af4..88baafd 100644
--- a/src/views/refund/coinRefundDetail.vue
+++ b/src/views/refund/coinRefundDetail.vue
@@ -76,7 +76,7 @@ const getRefundTypes = async function () {
   try {
     // 发送请求获取退款类型
     const result = await API({ 
-      // url: 'http://192.168.8.247:8081/', //这里应该写上一个退款类型的接口
+      // url: 'http://18.143.76.3:10704/', //这里应该写上一个退款类型的接口
       data: {} })
     console.log('退款类型请求成功', result)
     // 将响应结果存储到 refundType 中
@@ -118,7 +118,7 @@ const getSelectBy = async function (val) {
     console.log('搜索参数', getObj.value)
     // 发送POST请求
     const result = await API({
-      url: 'http://192.168.8.247:8081/refund/selectBy',
+      url: 'http://18.143.76.3:10704/refund/selectBy',
       data: {
         ...getObj.value,
         refundUser: { ...refundUser.value }
@@ -130,7 +130,7 @@ const getSelectBy = async function (val) {
     delete detailWithoutSort.sortOrder
 
     const resultTotalGold = await API({
-      url: 'http://192.168.8.247:8081/refund/statsGold',
+      url: 'http://18.143.76.3:10704/refund/statsGold',
       data: {
          ...detailWithoutSort
       }
@@ -244,7 +244,7 @@ const handleClick = function (tab, event) {
 const getMarket = async function () {
   try {
     // 发送POST请求
-    const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
+    const result = await API({ url: 'http://18.143.76.3:10704/general/market', data: {} })
     // 将响应结果存储到响应式数据中
     console.log('请求成功', result)
     // 存储地区信息
@@ -286,7 +286,7 @@ const getGoods = async function () {
   try {
     // 发送POST请求
     const result = await request({
-      url: 'http://192.168.8.247:8081/general/goods',
+      url: 'http://18.143.76.3:10704/general/goods',
       data: {}
     })
     // 将响应结果存储到响应式数据中
@@ -332,7 +332,7 @@ const checkNumber = function () {
 onMounted(async function () {
   await getAdminData()
   await getSelectBy()
-  await getArea()
+  await getMarket()
   await getRefundTypes()
 })
 // 新增排序字段和排序方式
@@ -534,17 +534,17 @@ const handleCurrentChange = function (val) {
               prop="permanentGold"
               label="永久金币"
               width="110px"
-              sortable="“custom”"
+              sortable="custom"
             />
             <el-table-column
               prop="freeGold"
-              sortable="“custom”"
+              sortable="custom"
               label="免费金币"
               width="110px"
             />
             <el-table-column
               prop="taskGold"
-              sortable="“custom”"
+              sortable="custom"
               label="任务金币"
               width="110px"
             />
@@ -559,7 +559,7 @@ const handleCurrentChange = function (val) {
              
             <el-table-column
               prop="createTime"
-              sortable="“custom”"
+              sortable="custom"
               label="提交时间"
               width="180px"
             >
diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue
index 2c48295..9f27725 100644
--- a/src/views/usergold/clientCountBalance.vue
+++ b/src/views/usergold/clientCountBalance.vue
@@ -30,7 +30,7 @@ const getmarket = async () => {
   isLoadingmarket.value = true;
   try {
     const result = await API({
-      url: 'http://192.168.8.220:8081/general/market'
+      url: 'http://18.143.76.3:10704/general/market'
     });
     console.log('获取地区数据成功',result)
     // 假设后端返回的是字符串数组，转换为 { value, label } 格式
@@ -118,7 +118,7 @@ const get = async function (val) {
     //console.log('请求参数', requestData);
 
     const result = await API({
-      url: 'http://192.168.8.220:8081/goldDetail/getGold',
+      url: 'http://18.143.76.3:10704/goldDetail/getGold',
       method: 'post',
       data: { ...getObj.value, user: { ...user.value } }
     })
@@ -129,7 +129,7 @@ const get = async function (val) {
     
     // 获取合计数
     const resultGoldTotal = await API({
-      url: 'http://192.168.8.220:8081/goldDetail/goldTotal',
+      url: 'http://18.143.76.3:10704/goldDetail/goldTotal',
       data: {
         ...getAllObj.value,
         user: { ...user.value }
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue
index 98263d4..c606efc 100644
--- a/src/views/usergold/clientCountDetail.vue
+++ b/src/views/usergold/clientCountDetail.vue
@@ -42,7 +42,7 @@ const getPlatform = async () => {
   isLoadingPlatform.value = true;
   try {
     const result = await API({
-      url: 'http://192.168.8.220:8081/general/platform',
+      url: 'http://18.143.76.3:10704/general/platform',
       method: 'post',
       data: {}// 这里添加参数
     })
@@ -85,7 +85,7 @@ const getArea = async () => {
   isLoadingArea.value = true;
   try {
     const result = await API({
-      url: 'http://192.168.8.220:8081/general/market'
+      url: 'http://18.143.76.3:10704/general/market'
     });
     // 假设后端返回的是字符串数组，转换为 { value, label } 格式
     if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
@@ -168,7 +168,7 @@ const get = async function (val) {
     //console.log('请求参数', requestData);
 
     const result = await API({
-      url: 'http://192.168.8.220:8081/goldDetail/getGoldDetail',
+      url: 'http://18.143.76.3:10704/goldDetail/getGoldDetail',
       method: 'post',
       data: { ...getObj.value, goldDetail: { ...goldDetail.value } }
     })
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index aa3c588..2b9be3a 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -223,7 +223,7 @@ const handleDateRangeChange = () => {
 const getAreas = async () => {
   try {
     const result = await API({
-      url: 'http://192.168.8.247:8081/general/market',
+      url: 'http://18.143.76.3:10704/general/market',
       data: {}
     })
     middleCategory.value = result.data.map(item => item.name)