From 066e41fb05c1a8aab2460f00f480bd4f74cac2c5 Mon Sep 17 00:00:00 2001
From: zry <18990852002@163.com>
Date: Thu, 26 Jun 2025 17:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E6=88=B7=E9=87=91?=
 =?UTF-8?q?=E5=B8=81=E7=AE=A1=E7=90=86=E5=AE=8C=E6=88=90=EF=BC=8C=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E5=AF=BC=E5=87=BA=E5=90=8E=E7=BB=AD=E5=9C=A8=E5=81=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          |   3 +-
 src/router/index.js                       |   2 +
 src/util/request.js                       |   4 +-
 src/views/usergold/clientCountBalance.vue | 551 ++++++++++++++++++-
 src/views/usergold/clientCountDetail.vue  | 873 ++++++++++++++++--------------
 5 files changed, 1033 insertions(+), 400 deletions(-)

diff --git a/.env.development b/.env.development
index b87c5db..b17f756 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,5 @@
 # VITE_API_BASE='http://192.168.8.94:8080/'
 # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
 # 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.225:8080/'
+VITE_API_BASE='http://192.168.8.94:8080/'
diff --git a/src/router/index.js b/src/router/index.js
index 8716011..222fbd7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,6 +19,7 @@ const router = createRouter({
                 { path: '/refundAudit', name: "refundAudit", component: () => import("../views/audit/refundAudit.vue") },
                 // 金币消耗
                 { path: '/coinConsume', name: "coinConsume", component: () => import("../views/consume/coinConsume.vue"),
+                    redirect: '/coinConsume/add',// 重定向到新增页面
                     children: [
                         // 金币新增消耗
                         { path: 'add', name: "addCoinConsume", component: () => import("../views/consume/addCoinConsume.vue") },
@@ -40,6 +41,7 @@ const router = createRouter({
                 { path: '/beanRefund', name: "beanRefund", component: () => import("../views/refund/beanRefund.vue") },
                 // 客户账户明细
                 { path: '/usergold', name: "usergold", component: () => import("../views/usergold/clientCount.vue"),
+                    redirect: '/usergold/detail',// 重定向到客户账户明细页面
                     children: [
                         // 金币明细
                         { path: 'detail', name: "clientCountDetail", component: () => import("../views/usergold/clientCountDetail.vue") },
diff --git a/src/util/request.js b/src/util/request.js
index 15579ed..541b9f3 100644
--- a/src/util/request.js
+++ b/src/util/request.js
@@ -1,13 +1,13 @@
 import axios from 'axios'
 // 创建axios实例
 const service = axios.create({
-  baseURL: import.meta.env.VITE_API_BASE,
+  baseURL: import.meta.env.VITE_API_BASE,//.env.development
   timeout: 10000,
   headers: {
     'Content-Type': 'application/json'
   },
   // 设置请求头，指定请求体的格式为 JSON
-    // 设置默认请求方法为 POST  这行对应的代码搁哪呢？
+    // 设置默认请求方法为 POST  这行对应的代码搁哪呢？ util/http.js自己看
 })
 
 // 请求拦截器
diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue
index d6c0e69..ea656c5 100644
--- a/src/views/usergold/clientCountBalance.vue
+++ b/src/views/usergold/clientCountBalance.vue
@@ -1,3 +1,550 @@
+<script setup>
+// 这是客户金币余额页面
+import { ref, onMounted, reactive, computed } from 'vue'
+import ElementPlus from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import axios from 'axios'
+import moment from 'moment'
+import { ta } from 'element-plus/es/locales.mjs'
+import API from '@/util/http'
+
+// 变量
+//这是获取用户信息的接口
+const adminData = ref({})
+const dialogVisible = ref(false)
+const getAdminData = async function () {
+  try {
+    const result = await API({ url: '/admin/userinfo', data: {} })
+    adminData.value = result
+    // console.log('请求成功', result)
+    console.log('管理员用户信息', adminData.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
+
+// 定义加载状态，获取地区数据
+const isLoadingmarket = ref(false);
+const market = ref([])
+const getmarket = async () => {
+  isLoadingmarket.value = true;
+  try {
+    const result = await API({
+      url: 'http://192.168.8.220:8081/general/market'
+    });
+    console.log('获取地区数据成功',result)
+    // 假设后端返回的是字符串数组，转换为 { value, label } 格式
+    if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
+      market.value = result.data.map(item => ({ value: item, label: item }));
+    } else {
+      market.value = result.data;
+    }
+  } catch (error) {
+    console.error('获取地区数据失败:', error);
+    ElMessage.error('获取地区数据失败，请稍后重试');
+    // 可以提供默认数据
+    market.value = []; 
+  } finally {
+    isLoadingmarket.value = false;
+  }
+};
+
+
+// 充值明细表格
+const tableData = ref([])
+
+// 新增金币总数变量
+const goldtotal = ref(0)
+
+// 计算用户各金币总数的不分页对象
+const tableAllData = ref([])
+// 各金币字段
+const permanentGold = ref(0) // 修改为 currentPermanentGold 对应字段
+const freeJuneGold = ref(0) // 修改为 currentFreeJune 对应字段
+const freeDecemberGold = ref(0) // 修改为 currentFreeDecember 对应字段
+const taskGold = ref(0) // 修改为 currentTaskGold 对应字段
+const freeGold = ref(0) // 计算免费金币总数
+
+
+
+//客户消费记录
+const tableCountData = ref([])
+const userInfo = ref({})
+
+
+
+// 搜索===========================================
+//分页总条目
+const total = ref(100)
+// 搜索对象时间
+const getTime = ref([])
+// 搜索User
+const user = ref({})
+// 不分页的搜索对象
+const getAllObj = ref({})
+// 搜索对象
+const getObj = ref({
+  pageNum: 1,
+  pageSize: 50
+})
+// 新增排序字段和排序方式
+const sortField = ref('')
+const sortOrder = ref('')
+
+
+
+// //表格高度
+// const tableHeight = computed(function () {
+//   return (getObj.value.pageSize + 2) * 38 + "px";
+// });
+
+// 方法
+// 搜索===========================================================================
+// 搜索方法
+const get = async function (val) {
+  try {
+    // 地区赋值
+    // if (adminData.value.market === '泰国') {
+    //   user.value.markets = ['泰国', '越南']
+    // } else if (adminData.value.market !== '总部') {
+    //   user.value.market = adminData.value.market
+    // }
+    // 搜索参数页码赋值
+    if (typeof val === 'number') {
+      getObj.value.pageNum = val
+    }
+    // // 搜索参数时间赋值
+    // if (getTime.value != null) {
+    //   if (getTime.value[0] != '' && getTime.value[1] != '') {
+    //     user.value.startDate = getTime.value[0]
+    //     user.value.endDate = getTime.value[1]
+    //   }
+    // } else {
+    //   user.value.startDate = ''
+    //   user.value.endDate = ''
+    // }
+    // 添加排序字段和排序方式到请求参数
+    user.value.sortField = sortField.value
+    user.value.sortOrder = sortOrder.value
+    console.log('搜索参数', getObj.value)
+    
+    // 发送POST请求
+
+    const requestData = { ...getObj.value, user: { ...user.value } };//控制台打印请求的参数
+    console.log('最终请求参数', JSON.stringify(requestData, null, 2)); // 打印格式化后的请求参数
+
+    //console.log('请求参数', requestData);
+
+    const result = await API({
+      url: 'http://192.168.8.220:8081/goldDetail/getGold',
+      method: 'post',
+      data: { ...getObj.value, user: { ...user.value } }
+    })
+    console.log('响应数据', result)
+    tableData.value = result.data.list
+    total.value = result.data.total
+
+    
+    // 获取合计数
+    const resultGoldTotal = await API({
+      url: 'http://192.168.8.220:8081/goldDetail/goldTotal',
+      data: {
+        ...getAllObj.value,
+        user: { ...user.value }
+      }
+    })
+    // 判断精网号是否存在，假设精网号不存在时 result.data.list 为空数组
+    if (result.data.list.length === 0) {
+      // 将表格数据设置为空数组
+      tableData.value = []
+      // 将合计数设置为 0
+      permanentGold.value = 0
+      freeJuneGold.value = 0
+      freeDecemberGold.value = 0
+      taskGold.value = 0
+      goldtotal.value = 0
+
+      // // 新增金币总数变量
+      // const goldtotal = ref(0)
+
+      // 分页总数设置为 0
+      total.value = 0
+      // ElMessage.warning('精网号不存在，请检查输入')
+    } else {
+      // 将响应结果存储到响应式数据中
+      console.log('总数据请求成功', result)
+      // 存储表格数据
+      tableData.value = result.data.list
+      console.log('tableData', tableData.value)
+      
+      // 从接口返回数据中获取各金币数值
+      if (resultGoldTotal.data) {
+        permanentGold.value = parseFloat(resultGoldTotal.data.permanentGold.toFixed(2))
+        freeGold.value = parseFloat(resultGoldTotal.data.freeGold.toFixed(2))
+        taskGold.value = parseFloat(resultGoldTotal.data.taskGold.toFixed(2))
+        goldtotal.value = parseFloat(resultGoldTotal.data.goldtotal.toFixed(2))
+      } else {
+        console.error('合计数数据格式错误', resultGoldTotal)
+        ElMessage.error('获取合计数失败，请稍后重试')
+      }
+      // 存储分页总数
+      total.value = result.data.total
+      console.log('total', total.value)
+    }
+  } catch (error) {
+    console.log('请求失败', error)
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+}
+// 精网号去空格，同时处理 user 和 putExcel 中的 jwcode
+const trimJwCode = () => {
+  if (user.value.jwcode) {
+    user.value.jwcode = user.value.jwcode.replace(/\s/g, ''); 
+  }
+
+}
+// 搜索
+const search = function () {
+  trimJwCode();
+  getObj.value.pageNum = 1
+  get()
+}
+// 重置
+const reset = function () {
+  user.value = {}
+  sortField.value = ''
+  sortOrder.value = ''
+  get()
+}
+const cellClick = function (row, column) {
+  console.log('cellClick', column.label)
+  if (column.label === '姓名') {
+    dialogVisible.value = true
+    
+    userInfo.value = row
+  }
+}
+// 验证跳转输入框的数字是否合法
+const checkNumber = function () {
+  if (typeof parseInt(getObj.value.pageNum) === 'number') {
+    console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
+    if (
+      getObj.value.pageNum > 0 &&
+      getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
+    ) {
+      getObj.value.pageNum = parseInt(getObj.value.pageNum)
+      console.log('输入的数字合法')
+      get()
+    } else {
+      //提示
+      ElMessage({
+        type: 'error',
+        message: '请检查输入内容'
+      })
+    }
+  } else {
+    //提示
+    ElMessage({
+      type: 'error',
+      message: '请检查输入内容'
+    })
+  }
+}
+
+
+// 处理排序事件
+const handleSortChange = (column) => {
+  console.log('排序字段：', column.prop)
+  console.log('排序方式：', column.order)
+  if (column.prop === 'currentPermanentGold') {
+    sortField.value = 'current_permanent_gold'
+  } else if (column.prop === 'currentTaskGold') {
+    sortField.value = 'current_task_gold'
+  } else if (column.prop === 'currentFreeJune') {
+    sortField.value = 'current_free_june'
+  } else if (column.prop === 'currentFreeDecember') {
+    sortField.value = 'current_free_december'
+  }
+  sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
+  get()
+}
+
+// //选地区
+// const market = [
+//   {
+//     value: '马来西亚',
+//     label: '马来西亚'
+//   },
+//   {
+//     value: '新加坡',
+//     label: '新加坡'
+//   },
+//   {
+//     value: '香港',
+//     label: '香港'
+//   },
+//   {
+//     value: '泰国',
+//     label: '泰国'
+//   },
+//   {
+//     value: '加拿大',
+//     label: '加拿大'
+//   },
+//   {
+//     value: '越南HCM',
+//     label: '越南HCM'
+//   }
+// ]
+
+// 挂载
+onMounted(async function () {
+  await getAdminData()
+  await get()
+  await getmarket()
+})
+const handlePageSizeChange = function (val) {
+  getObj.value.pageSize = val
+  get()
+}
+const handleCurrentChange = function (val) {
+  getObj.value.pageNum = val
+  get()
+}
+</script>
+
 <template>
-    <p>1111</p>
-</template>
\ No newline at end of file
+  <el-row>
+    <el-col>
+      <el-card style="margin-bottom: 20px;margin-top: 10px">
+        <div class="head-card">
+          <div class="head-card-element">
+            <el-text class="mx-1" size="large">精网号：</el-text>
+            <el-input
+              v-model="user.jwcode"
+              style="width: 160px"
+              placeholder="请输入精网号"
+              clearable
+            />
+          </div>
+          <div
+            class="head-card-element"
+          >
+            <el-text class="mx-1" size="large">所属地区：</el-text>
+            <el-select
+              v-model="user.market"
+              placeholder="请选择所属地区"
+              style="width: 180px"
+              clearable
+            >
+              <el-option
+                v-for="item in market"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </div>
+
+          <!-- <div class="head-card-btn"> -->
+            <!-- <el-button type="success" @click="reset()">重置</el-button> -->
+            <el-button type="primary" @click="search()">查询</el-button>
+            <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
+          </div>
+        <!-- </div> -->
+      </el-card>
+    </el-col>
+  </el-row>
+  <el-row>
+    <el-col>
+      <el-card>
+        <div>
+          金币总数：{{ Math.abs(goldtotal) }}  
+          永久金币：{{ Math.abs(permanentGold) }}  
+          免费金币：{{ Math.abs(freeGold) }}  
+          任务金币：{{ Math.abs(taskGold) }}
+        </div>
+        <!-- 设置表格容器的高度和滚动样式 -->
+        <div style="height: 626px; overflow-y: auto">
+          <el-table
+            :data="tableData"
+            @cellClick="cellClick"
+            style="width: 100%"
+            height="626px"
+            @sort-change="handleSortChange"
+          >
+            <el-table-column
+              type="index"
+              label="序号"
+              width="100px"
+              fixed="left"
+            >
+              <template #default="scope">
+                <span>{{
+                  scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="姓名" width="120" />
+            <el-table-column prop="jwcode" label="精网号" width="120" />
+            <el-table-column prop="market" label="所属地区" width="120" />
+            <el-table-column
+              prop="allJb"
+              label="金币总数"
+              width="120"
+              aligh="center"
+            >
+              <template #default="scope">
+                <span>{{
+                  (scope.row.currentPermanentGold +
+                    scope.row.currentFreeJune +
+                    scope.row.currentFreeDecember +
+                    scope.row.currentTaskGold)  
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="currentPermanentGold"
+              label="永久金币"
+              sortable="custom"
+              width="110"
+            >
+              <template #default="scope">
+                <span>{{ Math.abs(scope.row.currentPermanentGold)   }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="currentFreeJune"
+              label="6月份到期免费金币"
+              sortable="custom"
+              width="110"
+            >
+              <template #default="scope">
+                <span>{{ scope.row.currentFreeJune   }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="currentFreeDecember"
+              label="12月份到期免费金币"
+              sortable="custom"
+              width="110"
+            >
+              <template #default="scope">
+                <span>{{ scope.row.currentFreeDecember   }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="currentTaskGold"
+              label="任务金币"
+              sortable="custom"
+              width="130"
+            >
+              <template #default="scope">
+                <span>{{ Math.abs(scope.row.currentTaskGold)   }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="rcoin" label="历史金币" width="150">
+              <template #default="scope">
+                <!-- 计算四个字段的和并显示 -->
+                <span>{{ 
+                  (scope.row.sumPermanentGold || 0) + 
+                  (scope.row.sumFreeJune || 0) + 
+                  (scope.row.sumFreeDecember || 0) + 
+                  (scope.row.sumTaskGold || 0) 
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="sumConsume" label="历史消费" width="150">
+              <template #default="scope">
+                <span>{{ Math.abs(scope.row.sumConsume)   }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+
+        <!-- 分页 -->
+        <!-- 分页 -->
+        <div class="pagination" style="margin-top: 20px">
+          <el-pagination
+            background
+            :page-size="getObj.pageSize"
+            :page-sizes="[5, 10, 20, 50, 100]"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+            @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"
+          ></el-pagination>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+  <!-- 客户信息弹框 -->
+  <!-- <el-dialog
+    title="客户信息"
+    v-model="dialogVisible"
+    width="50%"
+    @before-close="dialogVisible = false"
+  >
+    <el-card>
+      <div class="custom-box">
+        <div>姓名：{{ userInfo.name }}</div>
+        <br />
+        <div>精网号：{{ userInfo.jwcode }}</div>
+        <div>地区：{{ userInfo.market }}</div>
+        <div>历史充值：{{ userInfo.rcoin }}</div>
+        <div>历史消费：{{ userInfo.scoin }}</div>
+      </div>
+    </el-card>
+    
+    <div style="height: 450px; overflow-y: auto">
+      <el-table :data="tableCountData" style="width: 100%" height="715px">
+        <el-table-column type="index" label="序号" width="100px" fixed="left">
+          <template #default="scope">
+            <span>{{
+              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" label="商品" width="120" />
+        <el-table-column sortable prop="" label="消费金币总数" width="180" />
+        <el-table-column sortable prop="" label="永久金币" width="120" />
+        <el-table-column sortable prop="" label="免费金币" width="120" />
+        <el-table-column sortable prop="" label="任务金币" width="120" />
+        <el-table-column sortable prop="" label="时间" width="120" />
+      </el-table>
+    </div>
+  </el-dialog> -->
+</template>
+
+<style scoped lang="scss">
+.pagination {
+  display: flex;
+}
+
+.status {
+  display: flex;
+}
+
+.head-card {
+  display: flex;
+}
+
+.head-card-element {
+  margin-right: 20px;
+}
+
+.head-card-btn {
+  margin-left: auto;
+}
+.custom-box {
+  display: flex;
+  flex-wrap: wrap;
+  row-gap: 5px;
+  div:nth-child(1) {
+    flex: 1 0 100%;
+  }
+  div {
+    margin-right: 20px;
+  }
+}
+</style>
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue
index 7256755..8897266 100644
--- a/src/views/usergold/clientCountDetail.vue
+++ b/src/views/usergold/clientCountDetail.vue
@@ -1,4 +1,4 @@
-<!-- 这是客户金币明细页面 -->
+
 <script setup>
 import { ref, onMounted, computed ,nextTick} from 'vue'
 
@@ -8,7 +8,7 @@ import moment from 'moment'
 import API from '@/util/http'
 import { writeFile, utils } from 'xlsx'
 
-// 变量aaaaaaaaaaaaaaaaaaaaa
+// 变量
 const adminData = ref({})
 const getAdminData = async function () {
   try {
@@ -18,33 +18,86 @@ const getAdminData = async function () {
       data: {}
     })
     adminData.value = result
-    console.log('请求成功', result)
-    console.log('用户信息', adminData.value)
+    // console.log('请求成功', result)
+    console.log('管理员用户信息', adminData.value)
   } catch (error) {
-    console.log('请求失败', error)
+    console.log('管理员用户信息请求失败', error)
+  }
+}
+
+// 精网号去空格，处理 goldDetail 中的 jwcode
+const trimJwCode = () => {
+  if (goldDetail.value.jwcode) {
+    goldDetail.value.jwcode = goldDetail.value.jwcode.replace(/\s/g, ''); 
+  }
+}
+
+
+//定义平台信息的加载状态
+const isLoadingPlatform = ref(false)
+// 平台信息
+const platform = ref([])
+//获取平台信息的函数
+const getPlatform = async () => {
+  isLoadingPlatform.value = true;
+  try {
+    const result = await API({
+      url: 'http://192.168.8.220:8081/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 type = [
+  {
+    value: '0',
+    label: '充值'
+  },
+  {
+    value: '1',
+    label: '消耗'
+  },
+  {
+    value: '2',
+    label: '退款'
+  }
+]
+
+
+// 定义加载状态，获取地区数据
 const isLoadingArea = ref(false);
-const area = ref([])
+const market = ref([])
 const getArea = async () => {
   isLoadingArea.value = true;
   try {
     const result = await API({
-      url: '/detailY/getarea'
+      url: 'http://192.168.8.220:8081/general/market'
     });
     // 假设后端返回的是字符串数组，转换为 { value, label } 格式
     if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
-      area.value = result.data.map(item => ({ value: item, label: item }));
+      market.value = result.data.map(item => ({ value: item, label: item }));
     } else {
-      area.value = result.data;
+      market.value = result.data;
     }
   } catch (error) {
     console.error('获取地区数据失败:', error);
     ElMessage.error('获取地区数据失败，请稍后重试');
     // 可以提供默认数据
-    area.value = []; 
+    market.value = []; 
   } finally {
     isLoadingArea.value = false;
   }
@@ -52,36 +105,26 @@ const getArea = async () => {
 
 // 充值明细表格
 const tableData = ref([])
-// 各金币总数
-const rechargeCoin = ref(0)
-const freeCoin = ref(0)
-const taskCoin = ref(0)
+// 各金币字段变量
+// const sumGoldTotal = ref(0)
+const  permanentGold = ref(0)
+//const freeGold = ref(0)
+const taskGold = ref(0)
 // 搜索===========================================
 //分页总条目
 const total = ref(100)
 // 搜索对象时间
 const getTime = ref([])
-// 搜索detailY
-const detailY = ref({})
+// 搜索goldDetail
+const goldDetail = ref({})
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
   pageSize: 50
 })
-// 开启条件筛选导出excel
-const getPutEX = ref(false)
 
-// 支付方式选项
-const num = [
-  {
-    value: '1',
-    label: '增加'
-  },
-  {
-    value: '2',
-    label: '减少'
-  }
-]
+// 开启条件筛选导出excel
+// const getPutEX = ref(false)
 
 
 // 方法
@@ -89,71 +132,91 @@ const num = [
 // 搜索方法
 const get = async function (val) {
   try {
-    // 地区赋值
-    if (adminData.value.area === '泰国') {
-      detailY.value.areas = ['泰国', '越南']
-    } else if (adminData.value.area !== '总部') {
-      detailY.value.area = adminData.value.area
-    }
+    // 地区赋值，这一期需求用不上
+    // if (adminData.value.market === '泰国') {
+    //   goldDetail.value.markets = ['泰国', '越南']
+    // } else if (adminData.value.market !== '总部') {
+    //   goldDetail.value.market = adminData.value.market
+    // }
     // 搜索参数页码赋值
     if (typeof val === 'number') {
       getObj.value.pageNum = val
     }
-    if (getTime.value.length === 2) {
-      detailY.value.startDate = getTime.value[0]
-      detailY.value.endDate = getTime.value[1]
+    if (getTime.value.length === 2) {//检查是否同时选择了开始时间和结束时间，如果不是则置空
+      // 使用 YYYY-MM-DD HH:mm:ss 格式
+      goldDetail.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
+      goldDetail.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
     } else {
-      detailY.value.startDate = ''
-      detailY.value.endDate = ''
+      goldDetail.value.startTime = ''
+      goldDetail.value.endTime = ''
     }
+    // console.log('moment 库是否正确加载:', moment);能正常加载
     // 添加排序字段和排序方式到请求参数
-    detailY.value.sortField = sortField.value
-    detailY.value.sortOrder = sortOrder.value
+    goldDetail.value.sortField = sortField.value
+    goldDetail.value.sortOrder = sortOrder.value
     console.log('搜索参数', getObj.value)
     // 发送POST请求
+
+    const requestData = { ...getObj.value, goldDetail: { ...goldDetail.value } };
+    console.log('最终请求参数', JSON.stringify(requestData, null, 2)); // 打印格式化后的请求参数
+
+    //console.log('请求参数', requestData);
+
     const result = await API({
-      url: '/detailY',
+      url: 'http://192.168.8.220:8081/goldDetail/getGoldDetail',
       method: 'post',
-      data: { ...getObj.value, detailY: { ...detailY.value } }
+      data: { ...getObj.value, goldDetail: { ...goldDetail.value } }
     })
+    console.log('响应数据', result)
     tableData.value = result.data.list
     total.value = result.data.total
+
+
+    
+    // 更新永久金币、任务金币
+     permanentGold.value = tableData.value.reduce((total, row) => {
+      return total + (Number(row. permanentGold) || 0);
+    }, 0);
+
+    taskGold.value = tableData.value.reduce((total, row) => {
+      return total + (Number(row.taskGold) || 0);
+    }, 0);
+    //由于免费金币的计算方式是6月免费+12月免费，所以需要单独处理，以及计算总的免费金币和总的金币数放在一块
+    
+
   } catch (error) {
     console.log('请求失败', error)
   }
 }
-// 精网号去空格，处理 detailY 中的 jwcode
-const trimJwCode = () => {
-  if (detailY.value.jwcode) {
-    detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); 
-  }
-}
 
-// 搜索
-const search = function () {
-  trimJwCode();
-  getObj.value.pageNum = 1
-  get()
-}
 
 // 重置
 const reset = function () {
-  delete detailY.value.jwcode
-  delete detailY.value.num
-  delete detailY.value.startDate
-  delete detailY.value.endDate
-  delete detailY.value.area
+  delete goldDetail.value.jwcode
+  delete goldDetail.value.type
+  delete goldDetail.value.startTime
+  delete goldDetail.value.endTime
+  delete goldDetail.value.market
   delete sortField.value
   delete sortOrder.value
   getTime.value = []
-  delete detailY.value.consumePlatform
+  delete goldDetail.value.payPlatform
+}
+
+// 搜索，点击查询按钮后触发
+const search = function () {
+  trimJwCode();
+  getObj.value.pageNum = 1
+  get()
 }
+
+
 // 今天
 const getToday = function () {
   const today = moment()
-  const startDate = today.startOf('day').toDate()
-  const endDate = today.add(1, 'days').startOf('day').toDate()
-  getTime.value = [startDate, endDate]
+  const startTime = today.startOf('day').toDate()
+  const endTime = today.add(1, 'days').startOf('day').toDate()
+  getTime.value = [startTime, endTime]
   search()
 }
 
@@ -161,21 +224,43 @@ const getToday = function () {
 const getYesterday = function () {
   const today = moment()
   const yesterday = moment().subtract(1, 'day')
-  const startDate = yesterday.startOf('day').toDate()
-  const endDate = today.startOf('day').toDate()
-  getTime.value = [startDate, endDate]
+  const startTime = yesterday.startOf('day').toDate()
+  const endTime = today.startOf('day').toDate()
+  getTime.value = [startTime, endTime]
   search()
 }
 
 // 近7天
 const get7Days = function () {
-  const startDate = moment().subtract(6, 'day').startOf('day').toDate()
-  const endDate = moment().add(1,'days').startOf('day').toDate()
-  getTime.value = [startDate, endDate]
+  const startTime = moment().subtract(6, 'day').startOf('day').toDate()
+  const endTime = moment().add(1,'days').startOf('day').toDate()
+  getTime.value = [startTime, endTime]
   search()
 }
 
-// 验证跳转输入框的数字是否合法
+// 计算所有记录的金币总数
+const sumGoldTotal = computed(() => {
+  return tableData.value.reduce((total, row) => {
+    return total + (Number(row.sumGold) || 0);
+  }, 0);
+});
+
+
+// 计算每行免费金币6月+12月的方法
+const calculateFreeGold = (row) => {
+  const freeJune = row.freeJune || 0;
+  const freeDecember = row.freeDecember || 0;
+  return (freeJune + freeDecember);
+};
+
+// 计算总免费金币的计算属性
+const totalFreeGold = computed(() => {
+  return tableData.value.reduce((total, row) => {
+    return total + calculateFreeGold(row);
+  }, 0);
+});
+
+// 验证页码跳转输入框的数字是否合法
 const checkNumber = function () {
   if (typeof parseInt(getObj.value.pageNum) === 'number') {
     console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
@@ -202,262 +287,266 @@ const checkNumber = function () {
   }
 }
 
-// 计算金币数量的方法
-const calculateGoldAmount = (row) => {
-  const totalGold = (row.rechargeCoin + row.freeCoin + row.taskCoin) / 100;
-  if (row.updateType === 1) { // 消费
-    return -totalGold;
-  } 
-  return totalGold;
-}
-
-// 导出Excel的方法
-const headers = [
-  '序号',
-  '姓名',
-  '精网号',
-  '所属地区',
-  '平台信息',
-  //'更新数量',
-  '更新类型',
-  '金币数量',
-  '永久金币',
-  '免费金币',
-  '任务金币',
-  '提交人',
-  '更新时间'
-]
-
-const showExportInfoPanel = ref(false)
-
-// 点击导出按钮直接显示信息面板
-const exportExcel = async () => {
-  try {
-    console.log('点击导出按钮，尝试显示信息面板');
-    showExportInfoPanel.value = true;
-    await nextTick();//组件更新显示信息面板
-  } catch (error) {
-    console.error('显示信息面板失败:', error);
-    ElMessage.error('显示信息面板失败，请稍后重试');
-  }
-};
-
-// 新增导出状态相关变量
-const exportProgress = ref(0)
-const isExporting = ref(false)
-const exportCancelToken = ref(null)
-
-// 优化后的导出方法
-const doExportExcel = async () => {
-  try {
-    isExporting.value = true
-    exportProgress.value = 0
-    showExportInfoPanel.value = false
-
-    // 初始化Excel
-    const wb = utils.book_new()
-    const ws = utils.aoa_to_sheet([headers])
-    utils.book_append_sheet(wb, ws, 'Sheet1')
-
-    // 流式写入配置
-    const writer = {
-      write: (d, o) => {
-        if (!d) return
-        utils.sheet_add_aoa(ws, d, { origin: -1 })
-      }
-    }
-
-    let page = 1
-    let totalExported = 0
-    const pageSize = 5000 // 每次请求5000条
-    let totalRecords = 0
-
-    // 首次请求获取总记录数
-    const firstResult = await API({
-      url: '/detailY',
-      method: 'post',
-      data: { 
-        pageNum: 1,
-        pageSize,
-        detailY: { ...detailY.value }
-      }
-    })
-    totalRecords = firstResult.data.total
-
-    // 创建取消令牌
-    const CancelToken = axios.CancelToken
-    exportCancelToken.value = CancelToken.source()
-
-    // 平台信息映射
-    const platformMap = {
-      0: '初始化金币',
-      1: 'ERP系统',
-      2: 'Homily Chart',
-      3: 'Homily Link',
-      4: '金币系统'
-    };
-    // 更新类型映射
-    const updateTypeMap = {
-      0: '充值',
-      1: '消费',
-      2: '退款',
-      3: '其他'
-    };
-
-    // 处理首次请求的数据
-    const firstData = firstResult.data.list
-    if (firstData.length) {
-      const rows = firstData.map((row, index) => {
-        const consumePlatform = parseInt(row.consumePlatform, 10); // 转换为数字类型
-        const platformInfo = platformMap[consumePlatform] || '';
-        return [
-          totalExported + index + 1,
-          row.username || '',
-          row.jwcode || '',
-          row.area || '',
-          platformInfo,
-          (row.gold / 100).toFixed(2) || '0.00',
-          updateTypeMap[row.updateType] || '',
-          (row.rechargeCoin / 100).toFixed(2) || '0.00',
-          (row.freeCoin / 100).toFixed(2) || '0.00',
-          (row.taskCoin / 100).toFixed(2) || '0.00',
-          row.name || '',
-          moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') || ''
-        ]
-      })
-      writer.write(rows)
-      totalExported += firstData.length
-      exportProgress.value = Math.round((totalExported / totalRecords) * 100)
-      page++
-    }
-
-    while (totalExported < totalRecords) {
-      const result = await API({
-        url: '/detailY',
-        method: 'post',
-        data: { 
-          pageNum: page,
-          pageSize,
-          detailY: { ...detailY.value }
-        },
-        cancelToken: exportCancelToken.value.token
-      })
 
-      const data = result.data.list
-      if (!data.length) break
-
-      // 转换数据
-      const rows = data.map((row, index) => [
-        totalExported + index + 1,
-        row.username || '',
-        row.jwcode || '',
-        row.area || '',
-        platformMap[row.consumePlatform] || '',
-        (row.gold / 100).toFixed(2) || '0.00',
-        updateTypeMap[row.updateType] || '',
-        (row.rechargeCoin / 100).toFixed(2) || '0.00',
-        (row.freeCoin / 100).toFixed(2) || '0.00',
-        (row.taskCoin / 100).toFixed(2) || '0.00',
-        row.name || '',
-        moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') || ''
-      ])
-
-      // 流式写入
-      writer.write(rows)
-      totalExported += data.length
-      exportProgress.value = Math.round((totalExported / totalRecords) * 100)
-
-      // 内存控制：每500页释放内存
-      if (page % 500 === 0) {
-        await new Promise(resolve => setTimeout(resolve, 0))
-      }
-
-      page++
-    }
 
-    // 生成最终文件
-    writeFile(wb, '客户金币明细.xlsx')
-    ElMessage.success(`导出成功，共${totalExported}条数据`)
-  } catch (error) {
-    if (!axios.isCancel(error)) {
-      ElMessage.error(`导出失败: ${error.message}`)
-    }
-  } finally {
-    isExporting.value = false
-    exportCancelToken.value = null
-  }
-}
+// // 计算金币数量的方法
+// const calculateGoldAmount = (row) => {
+//   const totalGold = (row. permanentGold + row.freeCoin + row.taskCoin) / 100;
+//   if (row.type === 1) { // 消费
+//     return -totalGold;
+//   } 
+//   return totalGold;
+// }
 
-// 新增取消导出方法
-const cancelExport = () => {
-  if (exportCancelToken.value) {
-    exportCancelToken.value.cancel('用户取消导出')
-    ElMessage.warning('导出已取消')
-    isExporting.value = false
-  }
-}
+// // 导出Excel的方法
+// const headers = [
+//   '序号',
+//   '姓名',
+//   '精网号',
+//   '所属地区',
+//   '平台信息',
+//   //'更新数量',
+//   '更新类型',
+//   '金币数量',
+//   '永久金币',
+//   '免费金币',
+//   '任务金币',
+//   '提交人',
+//   '更新时间'
+// ]
+
+// const showExportInfoPanel = ref(false)
+
+// // 点击导出按钮直接显示信息面板
+// const exportExcel = async () => {
+//   try {
+//     console.log('点击导出按钮，尝试显示信息面板');
+//     showExportInfoPanel.value = true;
+//     await nextTick();//组件更新显示信息面板
+//   } catch (error) {
+//     console.error('显示信息面板失败:', error);
+//     ElMessage.error('显示信息面板失败，请稍后重试');
+//   }
+// };
+
+// // 新增导出状态相关变量
+// const exportProgress = ref(0)
+// const isExporting = ref(false)
+// const exportCancelToken = ref(null)
+
+// // 优化后的导出方法
+// const doExportExcel = async () => {
+//   try {
+//     isExporting.value = true
+//     exportProgress.value = 0
+//     showExportInfoPanel.value = false
+
+//     // 初始化Excel
+//     const wb = utils.book_new()
+//     const ws = utils.aoa_to_sheet([headers])
+//     utils.book_append_sheet(wb, ws, 'Sheet1')
+
+//     // 流式写入配置
+//     const writer = {
+//       write: (d, o) => {
+//         if (!d) return
+//         utils.sheet_add_aoa(ws, d, { origin: -1 })
+//       }
+//     }
+
+//     let page = 1
+//     let totalExported = 0
+//     const pageSize = 5000 // 每次请求5000条
+//     let totalRecords = 0
+
+//     // 首次请求获取总记录数
+//     const firstResult = await API({
+//       url: 'http://192.168.8.220:8081/goldDetail/getGoldDetail',
+//       method: 'post',
+//       data: { 
+//         pageNum: 1,
+//         pageSize,
+//         goldDetail: { ...goldDetail.value }
+//       }
+//     })
+//     totalRecords = firstResult.data.total
+
+//     // 创建取消令牌
+//     const CancelToken = axios.CancelToken
+//     exportCancelToken.value = CancelToken.source()
+
+//     // 平台信息映射
+//     const platformMap = {
+//       0: '初始化金币',
+//       1: 'ERP系统',
+//       2: 'Homily Chart',
+//       3: 'Homily Link',
+//       4: '金币系统'
+//     };
+//     // 更新类型映射
+//     const updateTypeMap = {
+//       0: '充值',
+//       1: '消费',
+//       2: '退款',
+//       3: '其他'
+//     };
+
+//     // 处理首次请求的数据
+//     const firstData = firstResult.data.list
+//     if (firstData.length) {
+//       const rows = firstData.map((row, index) => {
+//         const payPlatform = parseInt(row.payPlatform, 10); // 转换为数字类型
+//         const platformInfo = platformMap[payPlatform] || '';
+//         return [
+//           totalExported + index + 1,
+//           row.name || '',
+//           row.jwcode || '',
+//           row.market || '',
+//           platformInfo,
+//           (row.gold / 100).toFixed(2) || '0.00',
+//           updateTypeMap[row.type] || '',
+//           (row. permanentGold / 100).toFixed(2) || '0.00',
+//           (row.freeCoin / 100).toFixed(2) || '0.00',
+//           (row.taskCoin / 100).toFixed(2) || '0.00',
+//           row.name || '',
+//           moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') || ''
+//         ]
+//       })
+//       writer.write(rows)
+//       totalExported += firstData.length
+//       exportProgress.value = Math.round((totalExported / totalRecords) * 100)
+//       page++
+//     }
+
+//     while (totalExported < totalRecords) {
+//       const result = await API({
+//         url: 'http://192.168.8.220:8081/goldDetail/getGoldDetail',
+//         method: 'post',
+//         data: { 
+//           pageNum: page,
+//           pageSize,
+//           goldDetail: { ...goldDetail.value }
+//         },
+//         cancelToken: exportCancelToken.value.token
+//       })
+
+//       const data = result.data.list
+//       if (!data.length) break
+
+//       // 转换数据
+//       const rows = data.map((row, index) => [
+//         totalExported + index + 1,
+//         row.name || '',
+//         row.jwcode || '',
+//         row.market || '',
+//         platformMap[row.payPlatform] || '',
+//         (row.gold / 100).toFixed(2) || '0.00',
+//         updateTypeMap[row.type] || '',
+//         (row. permanentGold / 100).toFixed(2) || '0.00',
+//         (row.freeCoin / 100).toFixed(2) || '0.00',
+//         (row.taskCoin / 100).toFixed(2) || '0.00',
+//         row.name || '',
+//         moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') || ''
+//       ])
+
+//       // 流式写入
+//       writer.write(rows)
+//       totalExported += data.length
+//       exportProgress.value = Math.round((totalExported / totalRecords) * 100)
+
+//       // 内存控制：每500页释放内存
+//       if (page % 500 === 0) {
+//         await new Promise(resolve => setTimeout(resolve, 0))
+//       }
+
+//       page++
+//     }
+
+//     // 生成最终文件
+//     writeFile(wb, '客户金币明细.xlsx')
+//     ElMessage.success(`导出成功，共${totalExported}条数据`)
+//   } catch (error) {
+//     if (!axios.isCancel(error)) {
+//       ElMessage.error(`导出失败: ${error.message}`)
+//     }
+//   } finally {
+//     isExporting.value = false
+//     exportCancelToken.value = null
+//   }
+// }
 
-const putExcel = ref({
-  startDate: new Date(),
-  endDate: new Date(new Date().setDate(new Date().getDate() + 1))
-})
+// // 新增取消导出方法
+// const cancelExport = () => {
+//   if (exportCancelToken.value) {
+//     exportCancelToken.value.cancel('用户取消导出')
+//     ElMessage.warning('导出已取消')
+//     isExporting.value = false
+//   }
+// }
 
-// 新增校验精网号的方法
-const checkJwCode = async (jwcode) => {
-  try {
-    const result = await API({
-      url: '/recharge/user',
-      method: 'post',
-      data: {
-        jwcode,
-        area: adminData.value.area
-      }
-    })
-    // 根据后端返回的 code 判断精网号是否存在
-    return result.code !== 0 
-  } catch (error) {
-    console.log('校验精网号失败', error)
-    return false
-  }
-}
+// const putExcel = ref({
+//   startTime: new Date(),
+//   endTime: new Date(new Date().setDate(new Date().getDate() + 1))
+// })
+
+// // 新增校验精网号的方法
+// const checkJwCode = async (jwcode) => {
+//   try {
+//     const result = await API({
+//       url: '/recharge/user',
+//       method: 'post',
+//       data: {
+//         jwcode,
+//         market: adminData.value.market
+//       }
+//     })
+//     // 根据后端返回的 code 判断精网号是否存在
+//     return result.code !== 0 
+//   } catch (error) {
+//     console.log('校验精网号失败', error)
+//     return false
+//   }
+// }
 
 // 选消费平台
-const platform = [
-  {
-    value: '4',
-    label: '金币系统'
-  },
-  {
-    value: '1',
-    label: 'ERP系统'
-  },
-  {
-    value: '2',
-    label: 'Homily Chart'
-  },
-  {
-    value: '3',
-    label: 'Homily Link'
-  },
-  {
-    value: '0',
-    label: '初始化金币'
-  }
-]
+// const platform = [
+//   {
+//     value: '4',
+//     label: '金币系统'
+//   },
+//   {
+//     value: '1',
+//     label: 'ERP系统'
+//   },
+//   {
+//     value: '2',
+//     label: 'Homily Chart'
+//   },
+//   {
+//     value: '3',
+//     label: 'Homily Link'
+//   },
+//   {
+//     value: '0',
+//     label: '初始化金币'
+//   }
+// ]
 
 // 新增排序字段和排序方式
 const sortField = ref('')
 const sortOrder = ref('')
 // 处理排序事件
 const handleSortChange = (column) => {
-  if (column.prop === 'rechargeCoin') {
-    sortField.value = 'recharge_coin'
-  } else if (column.prop === 'taskCoin') {
-    sortField.value = 'task_coin'
-  } else if (column.prop === 'freeCoin') {
-    sortField.value = 'free_coin'
-  } else if (column.prop === 'createTime') {
-    sortField.value = 'create_time'
+  if (column.prop === 'sumGold') {//新增金币总数字段排序
+    sortField.value = 'sum_gold'
+  } else if(column.prop === ' permanentGold') {
+    sortField.value = 'permanent_gold'
+  } else if (column.prop === 'taskGold') {
+    sortField.value = 'task_gold'
+  } else if (column.prop === 'freeGold') {
+    sortField.value = 'free_gold'
+  } else if (column.prop === 'auditTime') {//删除了更新时间的creatTime
+    sortField.value = 'audit_time'
   } else if (column.prop === 'gold') {
     sortField.value = 'gold'
   }
@@ -479,19 +568,14 @@ const handleCurrentChange = function (val) {
 }
 
 
-// // 用于控制显示内容的变量
-// const activeTab = ref('detailY')
-
-// // 切换标签页的方法
-// const changeTab = (tabName) => {
-//   activeTab.value = tabName
-// }
 
 // 挂载
 onMounted(async function () {
+  await get()
   await getArea()
   await getAdminData()
-  await get()
+  await getPlatform() // 调用获取平台信息的函数
+  
 })
 
 </script>
@@ -501,51 +585,34 @@ onMounted(async function () {
 
 
 <div>
-  <!-- <el-button-group>
-      <el-button 
-        :type="activeTab === 'detailY' ? 'primary' : 'default'" 
-        @click="changeTab('detailY')"
-      >
-        金币明细
-      </el-button>
-      <el-button 
-        :type="activeTab === 'goldInfo' ? 'primary' : 'default'" 
-        @click="changeTab('goldInfo')"
-      >
-        金币余额
-      </el-button>
-    </el-button-group> -->
-
-  <!-- 根据activeTab切换显示内容 -->
-   <!-- 客户金币明细的布局---------------------------------------------------------- -->
-<!-- <div v-if="activeTab === 'detailY'"> -->
+  
   <!-- 导出excel提前展示的信息面板 -->
-  <el-dialog
+  <!-- <el-dialog
     v-model="showExportInfoPanel"
     title="导出信息确认"
     width="400px"
     :close-on-click-modal="false"
   >
-    <div class="info-panel-header">导出信息</div>
-    <!-- 直接使用 detailY 显示信息，添加可选链操作符 -->
-    <!-- detailY是一个ref，所以在模板中应该直接使用detailY.consumePlatform，
-     而不是detailY.value.consumePlatform。
+    <div class="info-panel-header">导出信息</div> -->
+    <!-- 直接使用 goldDetail 显示信息，添加可选链操作符 -->
+    <!-- goldDetail是一个ref，所以在模板中应该直接使用goldDetail.consumePlatform，
+     而不是goldDetail.value.consumePlatform。
      因为在模板中，ref变量会自动解包，不需要.value。
-     例如，在代码中，我们可能错误地在模板中使用了detailY.value，但实际上应该直接使用detailY。 -->
-    <div v-if="!detailY.jwcode && !detailY.consumePlatform && !detailY.num && !detailY.area && (getTime.length < 2)">
+     例如，在代码中，我们可能错误地在模板中使用了goldDetail.value，但实际上应该直接使用goldDetail。 -->
+    <!-- <div v-if="!goldDetail.jwcode && !goldDetail.payPlatform && !goldDetail.type && !goldDetail.market && (getTime.length < 2)">
       你正在导出所有数据
     </div>
     <div v-else>
       你正在导出以下数据
     </div>
-    <div v-if="detailY.jwcode">精网号：{{ detailY.jwcode || '' }}</div>
-    <div v-if="detailY.consumePlatform">平台信息：{{ detailY.consumePlatform ? (platform.find(item => item.value === detailY.consumePlatform)?.label) : '' }}</div>
-    <div v-if="detailY.num">数量更新类型：{{ detailY.num ? (num.find(item => item.value === detailY.num)?.label || '') : '' }}</div>
-    <div v-if="detailY.area">所属地区：{{ detailY.area || '' }}</div>
+    <div v-if="goldDetail.jwcode">精网号：{{ goldDetail.jwcode || '' }}</div>
+    <div v-if="goldDetail.payPlatform">平台信息：{{ goldDetail.payPlatform ? (platform.find(item => item.value === goldDetail.payPlatform)?.label) : '' }}</div>
+    <div v-if="goldDetail.type">数量更新类型：{{ goldDetail.type ? (type.find(item => item.value === goldDetail.type)?.label || '') : '' }}</div>
+    <div v-if="goldDetail.market">所属地区：{{ goldDetail.market || '' }}</div>
     <div v-if="Array.isArray(getTime) && getTime.length >= 2">
-      <span>更新时间：</span>
+      <span>更新时间：</span> -->
       <!-- 修改时间格式为精确到秒 -->
-      <span v-if="Array.isArray(getTime) && getTime.length >= 2">
+      <!-- <span v-if="Array.isArray(getTime) && getTime.length >= 2">
         {{ moment(getTime[0]).format('YYYY-MM-DD HH:mm:ss') }} 至 {{ moment(getTime[1]).format('YYYY-MM-DD HH:mm:ss') }}
       </span>
       <span v-else></span>
@@ -556,10 +623,10 @@ onMounted(async function () {
         <el-button type="primary" @click="doExportExcel">导出</el-button>
       </span>
     </template>
-  </el-dialog>
+  </el-dialog> -->
 
   <!-- 导出进度弹窗 -->
-  <el-dialog
+  <!-- <el-dialog
     v-model="isExporting"
     title="正在导出"
     width="400px"
@@ -578,7 +645,7 @@ onMounted(async function () {
     <template #footer>
       <el-button type="danger" @click="cancelExport">取消导出</el-button>
     </template>
-  </el-dialog>
+  </el-dialog> -->
 
   <el-row>
     <el-col>
@@ -588,7 +655,7 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">精网号：</el-text>
               <el-input
-                v-model="detailY.jwcode"
+                v-model="goldDetail.jwcode"
                 style="width: 150px"
                 placeholder="请输入精网号"
                 clearable
@@ -599,10 +666,11 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">平台信息：</el-text>
               <el-select
-                v-model="detailY.consumePlatform"
+                v-model="goldDetail.payPlatform"
                 placeholder="请选择平台信息"
-                style="width: 180px"
+                style="width: 160px"
                 clearable
+                :loading="isLoadingPlatform"
               >
                 <el-option
                   v-for="item in platform"
@@ -613,17 +681,17 @@ onMounted(async function () {
               </el-select>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="7">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">数量更新类型：</el-text>
               <el-select
-                v-model="detailY.num"
+                v-model="goldDetail.type"
                 placeholder="请选择更新类型"
-                style="width: 180px"
+                style="width: 160px"
                 clearable
               >
                 <el-option
-                  v-for="item in num"
+                  v-for="item in type"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -635,14 +703,14 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">所属地区：</el-text>
               <el-select
-                v-model="detailY.area"
+                v-model="goldDetail.market"
                 placeholder="请选择所属地区"
                 style="width: 180px"
                 clearable
                 :loading="isLoadingArea"
               >
                 <el-option
-                  v-for="item in area"
+                  v-for="item in market"
                   :key="item.value || item"
                   :label="item.label || item"
                   :value="item.value || item"
@@ -676,6 +744,12 @@ onMounted(async function () {
   <el-row>
     <el-col>
       <el-card>
+        <div>
+          金币总数：{{ Math.abs(sumGoldTotal) }}  
+          永久金币：{{ Math.abs( permanentGold) }}  
+          免费金币：{{ Math.abs(totalFreeGold) }}
+          任务金币：{{ Math.abs(taskGold) }}
+        </div>
         <div style="height: 584px; overflow-y: auto">
           <el-table
             :data="tableData"
@@ -697,7 +771,7 @@ onMounted(async function () {
             </el-table-column>
             <el-table-column
               fixed="left"
-              prop="username"
+              prop="name"
               label="姓名"
               width="150"
             />
@@ -707,20 +781,20 @@ onMounted(async function () {
               label="精网号"
               width="120"
             />
-            <el-table-column prop="area" label="所属地区" width="120" />
+            <el-table-column prop="market" label="所属地区" width="120" />
             <el-table-column
-              prop="consumePlatform"
+              prop="payPlatform"
               label="平台信息"
               width="140"
             >
-              <template #default="scope">
-                <!-- 使用非严格相等比较 -->
-                <span v-if="scope.row.consumePlatform == 0">初始化金币</span>
-                <span v-if="scope.row.consumePlatform == 1">ERP系统</span>
-                <span v-if="scope.row.consumePlatform == 3">Homily Link</span>
-                <span v-if="scope.row.consumePlatform == 2">Homily Chart</span>
-                <span v-if="scope.row.consumePlatform == 4">金币系统</span>
-              </template>
+              <!-- <template #default="scope">
+                使用非严格相等比较
+                <span v-if="scope.row.payPlatform == 0">初始化金币</span>
+                <span v-if="scope.row.payPlatform == 1">ERP系统</span>
+                <span v-if="scope.row.payPlatform == 3">Homily Link</span>
+                <span v-if="scope.row.payPlatform == 2">Homily Chart</span>
+                <span v-if="scope.row.payPlatform == 4">金币系统</span>
+              </template> -->
             </el-table-column>
             <!-- <el-table-column
               prop="gold"
@@ -732,55 +806,64 @@ onMounted(async function () {
                 <span>{{ scope.row.gold / 100 }}</span>
               </template>
             </el-table-column> -->
-            <el-table-column prop="updateType" label="更新类型" width="110">
-              <!-- 模板内容 -->
+            <el-table-column prop="type" label="更新类型" width="110">
               <template #default="scope">
-                <span v-if="scope.row.updateType == 1">消费</span>
-                <span v-if="scope.row.updateType == 0">充值</span>
-                <span v-if="scope.row.updateType == 2">退款</span>
-                <span v-if="scope.row.updateType == 3">其他</span>
+                <span v-if="scope.row.type === 0">充值</span>
+                <span v-if="scope.row.type === 1">消耗</span>
+                <span v-if="scope.row.type === 2">退款</span>
               </template>
             </el-table-column>
 
-            <el-table-column label="金币数量" width="120">
+            <el-table-column
+              prop="sumGold"
+              sortable="custom"
+              label="金币数量"
+              width="110"
+            >
               <template #default="scope">
-                <span>{{ calculateGoldAmount(scope.row) }}</span>
+                <!-- <span>{{ scope.row.sumGold }}</span> -->
+                <span>
+                {{ 
+                  scope.row.type === 1 // 消费类型
+                    ? -  scope.row.sumGold 
+                    : scope.row.sumGold 
+                }}
+              </span>
               </template>
             </el-table-column>
 
             <el-table-column
-              prop="rechargeCoin"
+              prop=" permanentGold"
               sortable="custom"
               label="永久金币"
               width="110"
             >
               <template #default="scope">
-                <span>{{ scope.row.rechargeCoin / 100 }}</span>
+                <span>{{ scope.row. permanentGold }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              prop="freeCoin"
               sortable="custom"
               label="免费金币"
               width="110"
             >
               <template #default="scope">
-                <span>{{ scope.row.freeCoin / 100 }}</span>
+                <span>{{ calculateFreeGold(scope.row) }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              prop="taskCoin"
+              prop="taskGold"
               sortable="custom"
               label="任务金币"
               width="110"
             >
               <template #default="scope">
-                <span>{{ scope.row.taskCoin / 100 }}</span>
+                <span>{{ scope.row.taskGold }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="提交人" width="110" />
+            <el-table-column prop="adminName" label="提交人" width="110" />
             <el-table-column
-              prop="createTime"
+              prop="auditTime"
               sortable="custom"
               label="更新时间"
               width="210"
@@ -788,7 +871,7 @@ onMounted(async function () {
             >
               <template #default="scope">
                 <span>{{
-                  moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss')
+                  moment(scope.row.auditTime).format('YYYY-MM-DD HH:mm:ss')
                 }}</span>
               </template>
             </el-table-column>