自定义表头bug修完

gold-system/src/views/audit/rechargeAudit.vue

@@ -8,7 +8,29 @@ import request from '@/util/http'
 import moment from 'moment'
 import API from '../../api/index.js'
 // 变量
+// 这是动态表头，
+const columnOptions = ref([
+  { prop: 'username', label: '姓名', width: 125 },
+  { prop: 'jwcode', label: '精网号', width: 125 },
+  { prop: 'area', label: '所属地区', width: 125 },
+  { prop: 'activityName', label: '活动名称', width: 150 },
+  { prop: 'rechargeGold', label: '充值金额', width: 125, sortable: true },
+  { prop: 'rechargeWay', label: '充值方式', width: 125 },
+  { prop: 'paidGold', label: '永久金币', width: 125, sortable: true },
+  { prop: 'freeGold', label: '免费金币', width: 125, sortable: true },
+  { prop: 'remark', label: '备注', width: 200, showOverflowTooltip: true },
+  { prop: 'payWay', label: '支付方式', width: 125 },
+  { prop: 'rechargeVoucher', label: '支付凭证', width: 125 },
+  { prop: 'name', label: '提交人', width: 125 },
+  { prop: 'status', label: '审核状态', width: 125 },
+  { prop: 'reson', label: '驳回理由', width: 200 },
+  { prop: 'rechargeTime', label: '交款时间', width: 200, sortable: true },
+  { prop: 'createTime', label: '提交时间', width: 200, sortable: true }
+])
 
+// 默认显示
+const defaultColumns = ['username', 'jwcode', 'area', 'status', 'operation']
+const selectedColumns = ref([...defaultColumns])
 //这是获取用户信息的接口
 const adminData = ref({})
 const getAdminData = async function () {
@@ -566,76 +588,40 @@ const trimJwCode = () => {
           <el-col :span="6">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">精网号：</el-text>
-              <el-input
-                v-model="rechargeVo.jwcode"
-                placeholder="请输入精网号"
-                size="large"
-                style="width: 240px"
-                clearable
-              />
+              <el-input v-model="rechargeVo.jwcode" placeholder="请输入精网号" style="width: 240px" 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="请选择活动名称"
-                size="large"
-                style="width: 240px"
-                clearable
-              >
-                <el-option
-                  v-for="item in activity"
-                  :key="item.activityId"
-                  :label="item.activityName"
-                  :value="item.activityId"
-                />
+              <el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称"  style="width: 240px" 
+                clearable>
+                <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
+                  :value="item.activityId" />
               </el-select>
             </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.payWay"
-                placeholder="请选择支付方式"
-                size="large"
-                style="width: 240px"
-                clearable
-              >
-                <el-option
-                  v-for="item in payWay"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model="rechargeVo.payWay" placeholder="请选择支付方式" style="width: 240px" clearable>
+                <el-option v-for="item in payWay" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
           </el-col>
           <el-col :span="6">
             <div class="head-card-element" v-if="adminData.area == '总部'">
               <el-text class="mx-1" size="large">所属地区：</el-text>
-              <el-select
-                v-model="rechargeVo.area"
-                placeholder="请选择所属地区"
-                size="large"
-                style="width: 240px"
-                clearable
-              >
-                <el-option
-                  v-for="item in area"
-                  :key="item"
-                  :label="item"
-                  :value="item"
-                />
+              <el-select v-model="rechargeVo.area" placeholder="请选择所属地区" style="width: 240px" clearable>
+                <el-option v-for="item in area" :key="item" :label="item" :value="item" />
               </el-select>
             </div>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="21">
-            <div class="head-card-element">
+        <el-col :span="16">
+          <div class="time-controls">
+            <div class="time-group">
               <el-text class="mx-1" size="large">充值时间：</el-text>
               <el-date-picker
                 v-model="getTime"
@@ -643,18 +629,27 @@ const trimJwCode = () => {
                 range-separator="至"
                 start-placeholder="起始时间"
                 end-placeholder="结束时间"
+                style="width: 400px"
               />
-              <el-button style="margin-left: 10px" @click="getToday()"
-                >今</el-button
-              >
-              <el-button @click="getYesterday()">昨</el-button>
-              <el-button @click="get7Days()">近7天</el-button>
+                  <el-button @click="getToday()" style="margin-left: 10px"> 今 </el-button>
+                  <el-button @click="getYesterday()" style="margin-left: 10px"> 昨 </el-button>
+                  <el-button @click="get7Days()" style="margin-left: 10px"> 近7天 </el-button>
             </div>
-          </el-col>
-          <el-col :span="3">
-            <div class="head-card-btn">
-              <el-button @click="reset()" type="success">重置</el-button>
-              <el-button type="primary" @click="search()">查询</el-button>
+          </div>
+        </el-col>
+
+        <el-col :span="8">
+            <el-button @click="reset()" type="success" style="margin-right: 10px">重置</el-button>
+            <el-button type="primary" @click="search()">查询</el-button>
+        </el-col>
+      </el-row>
+        <el-row>
+          <el-col :span="21">
+            <div>
+              <el-text class="mx-1" size="large">显示列：</el-text>
+              <el-select v-model="selectedColumns" multiple placeholder="请选择显示列" size="large" style="width: 800px">
+                <el-option v-for="item in columnOptions" :key="item.prop" :label="item.label" :value="item.prop" />
+              </el-select>
             </div>
           </el-col>
         </el-row>
@@ -664,12 +659,7 @@ const trimJwCode = () => {
   <el-row>
     <el-col>
       <el-card>
-        <el-tabs
-          v-model="activeName"
-          type="card"
-          class="demo-tabs"
-          @tab-click="handleClick"
-        >
+        <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
           <el-tab-pane label="全部" name="all"></el-tab-pane>
           <el-tab-pane label="待审核" name="wait"></el-tab-pane>
           <el-tab-pane label="已通过" name="pass"></el-tab-pane>
@@ -678,161 +668,65 @@ const trimJwCode = () => {
           <div>
             总条数：{{ trueCount }}条，总金币数：{{
               formattedTrueGold
-            }}金币，永久金币：{{ formattedTrueRGold  }}金币，免费金币：{{ formattedTrueFGold  }}金币
+            }}金币，永久金币：{{ formattedTrueRGold }}金币，免费金币：{{ formattedTrueFGold }}金币
           </div>
         </el-tabs>
         <div style="height: 540px; overflow-y: auto">
-          <el-table
-            :data="tableData"
-            style="width: 100%"
-            height="540px"
-            @sort-change="handleSortChange"
-          >
-            <el-table-column
-              type="index"
-              label="序号"
-              width="100px"
-              fixed="left"
-            >
+          <el-table :data="tableData" style="width: 100%" height="540px" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
+            <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="username" label="姓名" width="100px" />
-            <el-table-column prop="jwcode" label="精网号" width="110px" />
-            <el-table-column prop="area" label="所属地区" width="100px" />
-            <el-table-column
-              prop="activityName"
-              label="活动名称"
-              width="150px"
-            />
-            <el-table-column
-              prop="rechargeGold"
-              label="充值金额"
-              sortable="“custom”"
-              width="110px"
-            >
-              <template #default="scope">
-                {{ scope.row.rechargeGold }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="rechargeWay"
-              label="充值方式"
-              width="110px"
-            />
-            <el-table-column
-              prop="paidGold"
-              label="永久金币"
-              sortable="“custom”"
-              width="110px"
-            >
-              <template #default="scope">
-                {{ scope.row.paidGold / 100 }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="freeGold"
-              label="免费金币"
-              sortable="“custom”"
-              width="110px"
-            >
-              <template #default="scope">
-                {{ scope.row.freeGold / 100 }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="remark"
-              label="备注"
-              width="200px"
-              show-overflow-tooltip
-            />
-            <el-table-column prop="payWay" label="支付方式" width="100px" />
-            <el-table-column
-              prop="rechargeVoucher"
-              label="支付凭证"
-              width="150px"
-            >
-              <template #default="scope">
-                <el-image
-                  :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="rechargeTime"
-              label="交款时间"
-              sortable="“custom”"
-              width="200px"
-            >
-              <template #default="scope">
-                {{
-                  moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
-                }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="createTime"
-              label="提交时间"
-              sortable="“custom”"
-              width="200px"
-            />
-            <el-table-column
-              fixed="right"
-              prop="operation"
-              label="操作"
-              width="150px"
-            >
+            <!-- 动态列 -->
+            <template v-for="col in columnOptions" :key="col.prop">
+              <el-table-column v-if="selectedColumns.includes(col.prop)" :prop="col.prop" :label="col.label"
+                :width="col.width" :sortable="col.sortable ? 'custom' : false"
+                :show-overflow-tooltip="true" >
+                <template #default="scope">
+                  <!-- 特殊列模板 -->
+                  <template v-if="col.prop === 'rechargeTime'">
+                    {{ moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss') }}
+                  </template>
+                  <template v-else-if="col.prop === 'remark'">
+                    <span>{{ scope.row[col.prop] }}</span>
+                  </template>
+                  <template v-else-if="col.prop === 'rechargeVoucher'">
+                    <el-image :src="scope.row.rechargeVoucher" style="width: 50px; height: 50px" />
+                  </template>
+                  <template v-else-if="col.prop === 'status'">
+                    <div class="status">
+                      <span :class="{
+                        'green-dot': scope.row.status === 1,
+                        'grey-dot': scope.row.status === 0,
+                        'red-dot': scope.row.status === 2
+                      }"></span>
+                      <span>{{
+                        scope.row.status === 1 ? '已通过' :
+                          scope.row.status === 0 ? '待审核' : '已驳回'
+                      }}</span>
+                    </div>
+                  </template>
+                  <template v-else-if="['paidGold', 'freeGold'].includes(col.prop)">
+                    {{ scope.row[col.prop] / 100 }}
+                  </template>
+                  <span v-else>
+                    {{ scope.row[col.prop] }}
+                  </span>
+                </template>
+              </el-table-column>
+            </template>
+            <el-table-column fixed="right" prop="operation" label="操作" width="150px">
               <template #default="scope">
                 <div class="operation">
-                  <el-popconfirm
-                    title="确定要通过此条记录吗？"
-                    @confirm="passConfirm"
-                  >
+                  <el-popconfirm title="确定要通过此条记录吗？" @confirm="passConfirm">
                     <template #reference>
-                      <el-button
-                        :disabled="
-                          scope.row.status === 1 || scope.row.status === 2
-                            ? true
-                            : false
-                        "
-                        type="primary"
-                        text
-                        @click="pass(scope.row)"
-                      >
+                      <el-button :disabled="scope.row.status === 1 || scope.row.status === 2
+                        ? true
+                        : false
+                        " type="primary" text @click="pass(scope.row)">
                         通过
                       </el-button>
                     </template>
@@ -843,16 +737,10 @@ const trimJwCode = () => {
                       </el-button>
                     </template>
                   </el-popconfirm>
-                  <el-button
-                    :disabled="
-                      scope.row.status === 1 || scope.row.status === 2
-                        ? true
-                        : false
-                    "
-                    type="primary"
-                    text
-                    @click="reject(scope.row)"
-                  >
+                  <el-button :disabled="scope.row.status === 1 || scope.row.status === 2
+                    ? true
+                    : false
+                    " type="primary" text @click="reject(scope.row)">
                     驳回
                   </el-button>
                 </div>
@@ -863,44 +751,21 @@ const trimJwCode = () => {
 
         <!-- 分页 -->
         <div class="pagination">
-          <el-pagination
-            background
-            :page-size="getObj.pageSize"
-            :page-sizes="[5, 10, 20, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-            @size-change="handlePageSizeChange"
-            @current-change="handleCurrentChange"
-          ></el-pagination>
+          <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+            @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
     </el-col>
   </el-row>
 
   <!-- 驳回弹出框 -->
-  <el-dialog
-    v-model="rejectVisible"
-    title="驳回理由"
-    width="500"
-    :before-close="closeRejectVisible"
-  >
+  <el-dialog v-model="rejectVisible" title="驳回理由" width="500" :before-close="closeRejectVisible">
     <template #footer>
-      <el-form
-        :model="rejectObj"
-        ref="Ref"
-        :rules="rules"
-        label-width="auto"
-        style="max-width: 600px"
-      >
+      <el-form :model="rejectObj" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px">
         <el-form-item prop="reson" label="驳回理由:">
-          <el-input
-            v-model="rejectObj.reson"
-            maxlength="150"
-            show-word-limit
-            style="width: 350px"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+          <el-input v-model="rejectObj.reson" maxlength="150" show-word-limit style="width: 350px" type="textarea"
+            placeholder="请输入内容" />
         </el-form-item>
       </el-form>
 
@@ -917,23 +782,65 @@ const trimJwCode = () => {
   display: flex;
 }
 
-.status {
+.operation {
   display: flex;
 }
 
-.operation {
+.green-dot {
+  background-color: #67C23A;
+}
+
+.grey-dot {
+  background-color: #909399;
+}
+
+.red-dot {
+  background-color: #F56C6C;
+}
+
+.time-controls {
+  display: flex;
+  align-items: center;
+}
+
+.time-group {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.quick-buttons {
   display: flex;
+  align-items: center;
 }
 
-.head-card {
+.status {
   display: flex;
+  align-items: center; /* 确保子元素垂直居中对齐 */
+  gap: 6px; /* 设置圆点和文字之间的间距 */
 }
 
-.head-card-element {
-  margin-right: 20px;
+.green-dot, .grey-dot, .red-dot {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  flex-shrink: 0; /* 防止圆点在空间不足时缩小 */
+  margin: 0; /* 移除原有的 margin-right */
 }
 
-.head-card-btn {
-  margin-left: auto;
+/* 备注列样式 */
+.remark-cell {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+/* 设置单元格内容溢出隐藏 */
+.el-table .el-table__cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 </style>

gold-system/src/views/audit/refundAudit.vue

@@ -582,7 +582,7 @@ const trimJwCode = () => {
         <el-row>
           <el-col :span="21">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值时间：</el-text>
+              <el-text class="mx-1" size="large">退款时间：</el-text>
               <el-date-picker
                 v-model="getTime"
                 type="datetimerange"

gold-system/src/views/consume/addConsume.vue

@@ -324,6 +324,21 @@ onMounted(async function () {
   await getGoods();
   await getIndexs(1);
 });
+
+const handleSelectBlur = (value) => {
+  // 这里可以根据需求添加额外逻辑，比如验证输入值是否有效
+  // 目前直接将输入值同步到 v-model 绑定的值上
+  if (value) {
+    // 若选择的是商品名称
+    if (addConsume.value.productName === value) {
+      addConsume.value.productName = value;
+    } 
+    // 若选择的是指标名称
+    else if (indexs.value.name === value) {
+      indexs.value.name = value;
+    }
+  }
+};
 </script>
 
 <template>
@@ -360,6 +375,10 @@ onMounted(async function () {
         placeholder="请选择"
         style="width: 300px"
         @change="handleProductSelect(addConsume.productName)"
+        @blur="handleSelectBlur(addConsume.productName)"
+        filterable
+        allow-create
+        default-first-option
       >
         <el-option
           v-for="item in goods"
@@ -507,11 +526,11 @@ onMounted(async function () {
             <p style="color: #2fa1ff">{{ user.rechargeTimes }}</p>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
+        <!-- <el-col :span="10">
           <el-form-item label="负责客服">
             <p>{{ adminData.name }}</p>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="14">
           <el-form-item label="消费次数">
             <p style="color: #2fa1ff">{{ user.spendTimes }}</p>

gold-system/src/views/goldBeen/goldenBeenConsum.vue

@@ -298,7 +298,6 @@ const get7Days = function () {
   detailY.value.endTime = endDate
   search()
 }
-
 //初始化
 const getInit = async function () {
   try {
@@ -339,6 +338,7 @@ const trimJwCode = () => {
     detailY.value.sourceName = detailY.value.sourceName.replace(/\s/g, ''); 
   }
 }
+
 // 搜索
 const search = function () {
   trimJwCode();

gold-system/src/views/goldBeen/goldenBeenDetail.vue

@@ -342,7 +342,7 @@ const doExportExcel = async () => {
       return
     }
 
-    const pageSize = 100 // 每批次获取 100 条数据
+    const pageSize = 5000 // 每批次获取 100 条数据
     const totalPages = Math.ceil(totalExport.value / pageSize)
 
     for (let page = 1; page <= totalPages; page++) {
@@ -374,9 +374,10 @@ const doExportExcel = async () => {
     }
 
     if (isExporting.value) {
-      // 导出的数据将字段映射
-      const exportData = allExportData.map((item) => {
+      // 导出的数据将字段映射，添加序号列
+      const exportData = allExportData.map((item, index) => {
         return {
+          序号: index + 1, // 添加序号列
           姓名: item.nickname,
           精网号: item.jwcode,
           地区: item.ipAddress,
@@ -466,6 +467,7 @@ const get7Days = function () {
   detailY.value.endTime = endDate
   search()
 }
+//获取地区接口
 const getArea = async () => {
   try {
     const result = await API({
@@ -504,6 +506,11 @@ const platformList = ref<string[]>([
   // '金币系统'
 ])
 const typeList = ref<string[]>([
+  '金币换金豆',
+  '金币换免费金豆',
+  '赠送金豆',
+  '购买金豆',
+  '客服操作'
 ])
 //搜索表单数据
 const detailY = ref({
@@ -512,8 +519,8 @@ const detailY = ref({
   orderNo: '',
   payStyle: '',
   type: '',
-  startTime: '',
-  endTime: ''
+  startTime:'',
+  endTime:''
 })
 const getObj = ref({
   pageNum: 1,
@@ -605,6 +612,9 @@ const getInit = async function (
 ) {
   try {
     console.log('搜索参数', getObj.value)
+    const startTime = detailY.value.startTime
+    const endTime = detailY.value.endTime
+    console.log(startTime, endTime)
     // 发送POST请求
     const result = await API({
       url: '/dou/getPay',

gold-system/src/views/goldBeen/onLineDetail.vue

@@ -81,6 +81,9 @@
         <el-form-item>
           <el-button type="primary" @click="search">查询</el-button>
           <el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
+          <!-- 这是重置参数：formEl: FormInstance -->
+           <!-- 为啥要这个参数？ -->
+
           <el-button type="primary" @click="showExportInfoPanel = true">导出excel</el-button>
         </el-form-item>
       </el-col>
@@ -264,7 +267,7 @@ const getObj = ref({
   pageNum: 1,
   pageSize: 50
 })
-
+// 这是重置的参数，虽然不知道为什么要这个参数
 const ruleFormRef = ref<FormInstance>()
 
 // 初始化
@@ -372,6 +375,11 @@ const getPayType = async () => {
 // 获取金豆数接口
 const getCount = async () => {
   try {
+    // let startTime = ''
+    // let endTime = ''
+    // if (Array.isArray(detailY.value.createTime) && detailY.value.createTime.length === 2) {
+    //   [startTime, endTime] = detailY.value.createTime
+    // }
     const result = await API({
       url: '/dou/getRechargeTotal',
       data: {
@@ -424,6 +432,14 @@ const doExportExcel = async () => {
     exportProgress.value = 0
     allExportData = []
 
+    // let startTime = ''
+    // let endTime = ''
+    // if (Array.isArray(detailY.value.createTime) && detailY.value.createTime.length === 2) {
+    //   [startTime, endTime] = detailY.value.createTime
+    // }
+    // startTime = detailY.value.startTime
+    // endTime = detailY.value.endTime
+
     // 获取总数据量
     const totalResult = await API({
       url: '/dou/SearchPay',
@@ -449,7 +465,7 @@ const doExportExcel = async () => {
       return
     }
 
-    const pageSize = 100 // 每批次获取 100 条数据
+    const pageSize = 1000 // 每批次获取 100 条数据
     const totalPages = Math.ceil(totalExport.value / pageSize)
 
     for (let page = 1; page <= totalPages; page++) {
@@ -478,9 +494,10 @@ const doExportExcel = async () => {
     }
 
     if (isExporting.value) {
-      // 导出的数据将字段映射
-      const exportData = allExportData.map((item) => {
+      // 导出的数据将字段映射，添加序号列
+      const exportData = allExportData.map((item, index) => {
         return {
+          序号: index + 1, // 添加序号列
           姓名: item.name,
           精网号: item.jwcode,
           地区: item.deptName,
@@ -507,7 +524,7 @@ const doExportExcel = async () => {
       ElMessage.success('导出成功')
     }
   } catch (error) {
-    if (error.message === '导出已取消') {
+    if (error instanceof Error && error.message === '导出已取消') {
       return
     }
     console.log('导出失败', error)
@@ -559,4 +576,7 @@ onMounted(() => {
 }
 </style>
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 703486fc8c3f87173c028d61161e502a2e07fdfc

gold-system/src/views/index.vue

@@ -157,7 +157,7 @@ const changeDataByArea = (item) => {
               </el-icon>
               <span>充值管理</span>
             </template>
-            <el-menu-item index="/activity">活动管理</el-menu-item>
+            <!-- <el-menu-item index="/activity">活动管理</el-menu-item> -->
             <el-menu-item index="/rate">汇率管理</el-menu-item>
           </el-sub-menu>
 
@@ -225,7 +225,7 @@ const changeDataByArea = (item) => {
               <el-menu-item index="/allRefund">退款明细</el-menu-item>
             </el-sub-menu>
           </el-sub-menu>
-          <el-sub-menu index="10">
+          <!-- <el-sub-menu index="10">
             <template #title
               ><el-icon> <Folder /> </el-icon>金豆模块</template
             >
@@ -234,7 +234,7 @@ const changeDataByArea = (item) => {
             <el-menu-item index="/onLineDetail">线上充值明细</el-menu-item>
             <el-menu-item index="/goldenBeenConsum">金豆消费明细</el-menu-item>
             <el-menu-item index="/goldenBeenBalance">客户金豆余额</el-menu-item>
-          </el-sub-menu>
+          </el-sub-menu> -->
           <el-menu-item
             index="/usergold"
             v-if="

gold-system/src/views/managerecharge/rate.vue

@@ -43,28 +43,25 @@ const total = ref(0)
 //分页总条目
 
 // 时间选择器
-const value1 = ref({
-  startTime: '',
-  endTime: ''
-}) // 时间数组
-function handleDateChange(value) {
-  if (value && value.length === 2) {
-    value1.value.startTime = value[0] // 开始日期
-    value1.value.endTime = value[1] // 结束日期
-  }
-  console.log(value1)
-}
+// const value1 = ref([]) // 时间数组
+// function handleDateChange(value) {
+//   if (value && value.length === 2) {
+//     value1.value.startTime = value[0] // 开始日期
+//     value1.value.endTime = value[1] // 结束日期
+//   }
+//   console.log(value1)
+// }
 
 const time = ref({})
 const get = async function (val) {
   // 搜索参数时间赋值
-  if (value1.value && value1.value.length === 2) {
-    time.value.startTime = value1.value[0];
-    time.value.endTime = value1.value[1];
-  } else {
-    time.value.startTime = '';
-    time.value.endTime = '';
-  }
+  // if (value1.value && value1.value.length === 2) {
+  //   time.value.startTime = value1.value[0];
+  //   time.value.endTime = value1.value[1];
+  // } else {
+  //   time.value.startTime = '';
+  //   time.value.endTime = '';
+  // }
   try {
     // 搜索参数页码赋值
     if (typeof val === 'number') {
@@ -100,60 +97,40 @@ const get = async function (val) {
 }
 
 // 今天
-const getToday = function () {
-  const today = new Date();
-  const startDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate()
-  );
-  const endDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
-  );
-  // value1!!value1!!lhl狗屎脑子
-  value1.value = [startDate, endDate]; 
-  console.log('value1', value1.value);
-  get();
+const getToday = () => {
+  const today = new Date()
+  // 格式化开始时间
+  const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  time.value.startTime = startDate
+  time.value.endTime = endDate
+  search()
 }
+
 // 昨天
-const getYesterday = function () {
-  const yesterday = new Date();
-  yesterday.setDate(yesterday.getDate() - 1);
-  const startDate = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate()
-  );
-  const endDate = new Date(
-    yesterday.getFullYear(),
-    yesterday.getMonth(),
-    yesterday.getDate() + 1
-  );
-  // 这个也是value1！！
-  value1.value = [startDate, endDate]; 
-  console.log('value1', value1.value);
-  get();
+const getYesterday = () => {
+  const yesterday = moment().subtract(1, 'days')
+  // 格式化开始时间
+  const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  time.value.startTime = startDate
+  time.value.endTime = endDate
+  search()
 }
+
 // 近7天
-const get7Days = function () {
-  const today = new Date();
-  const startDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() - 6
-  );
-  const endDate = new Date(
-    today.getFullYear(),
-    today.getMonth(),
-    today.getDate() + 1
-  );
-  // value1！！
-  value1.value = [startDate, endDate]; 
-  console.log('value1', value1.value);
-  get();
+const get7Days = () => {
+  // 格式化开始时间
+  const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  // 格式化结束时间
+  const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  time.value.startTime = startDate
+  time.value.endTime = endDate
+  search()
 }
+
 // 搜索
 const search = function () {
   getObj.value.pageNum = 1
@@ -516,32 +493,50 @@ function handleInput(value) {
       <el-card>
         <!-- 这是时间 -->
         <div class="demo-range">
-          时间：
-          <el-date-picker
-            v-model="value1"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            :size="size"
-            value-format="YYYY-MM-DD"
-          />
-          <el-button style="margin-left: 10px" @click="getToday">今</el-button>
-          <el-button @click="getYesterday">昨</el-button>
-          <el-button @click="get7Days">近7天</el-button>
-          <!-- 按钮 -->
-          <el-button
-            class="button-item"
-            type="primary"
-            style="float: right"
-            @click="search"
-          >查询</el-button>
-          <el-button
-            class="button-item"
-            type="success"
-            style="float: right"
-            @click="handledelete"
-          >重置</el-button>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item prop="startTime">
+                <el-text class="mx-1" size="large">开始时间：</el-text>
+                <el-date-picker
+                  v-model="time.startTime"
+                  type="date"
+                  placeholder="开始日期"
+                  style="width: 210px"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item prop="endTime">
+                <el-text class="mx-1" size="large">结束时间：</el-text>
+                <el-date-picker
+                  v-model="time.endTime"
+                  type="date"
+                  placeholder="结束日期"
+                  style="width: 210px"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-button @click="getToday">今</el-button>
+              <el-button @click="getYesterday">昨</el-button>
+              <el-button @click="get7Days">近7天</el-button>
+            </el-col>
+            <el-col :span="4">
+              <el-button
+                type="primary"
+                @click="search"
+              >查询</el-button>
+              <el-button
+                class="button-item"
+                type="success"
+                @click="handledelete"
+              >重置</el-button>
+            </el-col>
+          </el-row>
         </div>
       </el-card>
     </el-col>

gold-system/src/views/permissions/index.vue

@@ -531,7 +531,7 @@ const handleCurrentChange = function (val) {
                   修改权限
                 </el-button>
                 <el-popconfirm
-                  title="确定将此条活动删除吗？"
+                  title="确定将此用户删除吗？"
                   @confirm="delConfirm"
                 >
                   <template #reference>
@@ -869,6 +869,7 @@ const handleCurrentChange = function (val) {
 </template>
 
 <style scoped>
+
 .permissionVisible {
   font-size: 16px;
   font-weight: bold;

gold-system/src/views/recharge/addRecharge.vue

@@ -132,24 +132,51 @@ const rules = reactive({
   jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
   activityId: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
   paidGold: [
-    { required: true, message: '请输入充值金额', trigger: 'blur' },
+    { required: true, message: '请输入永久金币数', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
-        if (value > 0) {
+        if (value >= 0) {
           callback()
         } else {
-          callback(new Error('请输入大于0的金额'))
+          callback(new Error('输入金额至少为0'))
         }
       }
     }
   ],
-  // 必须进行选择
-
-  rechargeGold: [
+  freeGold: [
     {
       required: true,
-      message: '请选择充值方式',
+      message: '请输入免费金币数',
       trigger: 'blur'
+    },
+    {
+      validator: (rule, value, callback) => {
+        // 将值转换为数字(可行吗？？)
+        // 好的不可行
+        const numValue = Number(value);
+        if (isNaN(numValue)) {
+          callback(new Error('请输入有效的数字'));
+        } else if (numValue >= 0) {
+          callback();
+        } else {
+          callback(new Error('输入金额至少为 0'));
+        }
+      },
+      trigger: 'blur'
+    }
+  ],
+  // 必须进行选择
+  rechargeGold: [
+    {
+      required: true,message: '请选择充值方式',trigger: 'blur'
+    },{
+      validator: (rule, value, callback) => {
+        if (value >= 0) {
+          callback()
+        } else {
+          callback(new Error('输入金额至少为0'))
+        }
+      }
     }
   ],
   payWay: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
@@ -245,28 +272,20 @@ const handleAvatarSuccess = (response, uploadFile) => {
 //充值方式条目
 const options = [
   {
-    value: '微信',
-    label: '微信'
-  },
-  {
-    value: '支付宝',
-    label: '支付宝'
-  },
-  {
-    value: '银联',
-    label: '银联'
+    value: '现金',
+    label: '现金'
   },
   {
-    value: '信用卡',
-    label: '信用卡'
+    value: '支票',
+    label: '支票'
   },
   {
-    value: '借记卡',
-    label: '借记卡'
+    value: '刷卡',
+    label: '刷卡'
   },
   {
-    value: '现金充值',
-    label: '现金充值'
+    value: '其他(各地区电子支付)',
+    label: '其他(各地区电子支付)'
   }
 ]
 
@@ -293,23 +312,23 @@ function handleActivityChange(value) {
   console.log('看看', addRecharge.value)
 }
 // 监听 paidGold 的变化
-const calculatedFree = computed(() => {
-  const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio
-  if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
-    return 0
-  } else {
-    return Math.trunc(result)
-  }
-})
-watch(calculatedFree, (newVal) => {
-  addRecharge.value.freeGold = newVal
-})
-const calculatedRecharge = computed(() => {
-  return addRecharge.value.paidGold * Rate.value
-})
-watch(calculatedRecharge, (newVal) => {
-  addRecharge.value.rechargeGold = newVal
-})
+// const calculatedFree = computed(() => {
+//   const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio
+//   if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
+//     return 0
+//   } else {
+//     return Math.trunc(result)
+//   }
+// })
+// watch(calculatedFree, (newVal) => {
+//   addRecharge.value.freeGold = newVal
+// })
+// const calculatedRecharge = computed(() => {
+//   return addRecharge.value.paidGold * Rate.value
+// })
+// watch(calculatedRecharge, (newVal) => {
+//   addRecharge.value.rechargeGold = newVal
+// })
 //这是重置重置表单的方法
 const deleteRecharge = function () {
   addRecharge.value = {
@@ -548,55 +567,6 @@ const batchDel = function () {
       })
     })
 }
-//单行删除初始化
-const del = function (row) {
-  console.log('row===', row)
-  delObj.value.line = row.line
-}
-// 单行删除
-const delConfirm = function () {
-  batchData.value = batchData.value.filter(
-    (item) => item.line != delObj.value.line
-  )
-  console.log('batchData===', batchData.value)
-}
-//单行重置初始化
-const reset = function (row) {
-  resetObj.value.line = row.line
-}
-// 单行重置
-const resetConfirm = function () {
-  for (let i = 0; i < batchData.value.length; i++) {
-    if (batchData.value[i].line == resetObj.value.line) {
-      batchData.value[i] = {}
-      batchData.value[i].line = resetObj.value.line
-      batchData.value[i].showInput = true
-      break
-    }
-  }
-}
-//取消批量充值
-const cancelBatch = function () {
-  ElMessageBox.confirm('确认取消吗？此操作将不会保存任何数据。', '确认取消', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
-    .then(() => {
-      batchData.value = [{ line: 1, showInput: true }]
-      closeBatchRechargeVisible()
-      ElMessage({
-        type: 'success',
-        message: '操作成功'
-      })
-    })
-    .catch(() => {
-      ElMessage({
-        type: 'info',
-        message: '操作撤销'
-      })
-    })
-}
 //监听改变活动时的操作
 const changeActivity = function (row) {
   console.log('row===', row)
@@ -618,36 +588,36 @@ const changeActivity = function (row) {
     }
   }
 }
-//监听改变永久金币时的操作
-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 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)
@@ -1114,12 +1084,12 @@ onMounted(async function () {
             <p style="color: #2fa1ff">{{ user.rechargeTimes }}</p>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
+        <!-- <el-col :span="10">
           <el-form-item label="负责客服">
             <p>{{ adminData.name }}</p>
           </el-form-item>
-        </el-col>
-        <el-col :span="14">
+        </el-col> -->
+        <el-col :span="10">
           <el-form-item label="消费次数">
             <p style="color: #2fa1ff">{{ user.spendTimes }}</p>
           </el-form-item>

gold-system/src/views/recharge/allRecharge.vue

@@ -1,11 +1,16 @@
 <script setup>
-import { ref, onMounted, reactive, computed } from 'vue'
+import { ref, onMounted, reactive, computed, nextTick } from 'vue'
 import ElementPlus from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AiFillRead } from 'vue-icons-plus/ai'
 import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http'
+import * as XLSX from 'xlsx' // 引入 xlsx 库
+
+// 提取 XLSX 工具函数
+const { utils, writeFile } = XLSX
+
 // 变量
 //这是获取用户信息的接口
 const adminData = ref({})
@@ -23,7 +28,14 @@ const getAdminData = async function () {
 const tableData = ref([])
 // 搜索======================================
 // 搜索rechargeVo
-const rechargeVo = ref({})
+const rechargeVo = ref({
+  activityId: '',
+  rechargeWay: '',
+  area: '',
+  startDate: '',
+  endDate: '',
+  status: ''
+})
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
@@ -57,14 +69,8 @@ const getPayWay = async function () {
   }
 }
 
-// //表格高度
-// const tableHeight = computed(function () {
-//   return (getObj.value.pageSize + 2) * 60 + "px";
-// });
-
 // 方法
 // 合计数存储
-// 合计数存储
 const trueGold = ref(0)
 const trueRGold = ref(0)
 const trueFGold = ref(0)
@@ -100,7 +106,7 @@ const get = async function (val) {
     }
     // 搜索参数时间赋值
     if (getTime.value != null) {
-      if (getTime.value.startDate != '' && getTime.value.endDate != '') {
+      if (getTime.value[0] && getTime.value[1]) {
         rechargeVo.value.startDate = getTime.value[0]
         rechargeVo.value.endDate = getTime.value[1]
       }
@@ -194,7 +200,7 @@ const reset = function () {
   rechargeVo.value.endDate = ''
   sortField.value = ''
   sortOrder.value = ''
-  getTime.value = {}
+  getTime.value = []
 }
 // 今天
 const getToday = function () {
@@ -331,7 +337,6 @@ const getActivity = async function () {
   }
 }
 // 获取地区
-// 获取地区
 const getArea = async function () {
   console.log('888888888880000000')
   try {
@@ -381,10 +386,10 @@ onMounted(async function () {
   getAdminData()
   get()
   getActivity()
-
   getPayWay()
+  getArea()
 })
-getArea()
+
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val
   get()
@@ -414,6 +419,207 @@ const handleSortChange = (column) => {
   sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
   get()
 }
+
+// 导出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 platformMap = {
+//   0: '初始化金币',
+//   1: 'ERP系统',
+//   2: 'Homily Chart',
+//   3: 'Homily Link',
+//   4: '金币系统'
+// };
+// const updateTypeMap = {
+//   0: '充值',
+//   1: '消费',
+//   2: '退款',
+//   3: '其他'
+// };
+
+// 优化后的导出方法
+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: '/recharge/recharge',
+      method: 'post',
+      data: { 
+        pageNum: 1,
+        pageSize,
+        rechargeVo: { ...rechargeVo.value }
+      }
+    })
+    totalRecords = firstResult.data.total
+
+    // 创建取消令牌
+    const CancelToken = axios.CancelToken
+    exportCancelToken.value = CancelToken.source()
+
+    // 处理首次请求的数据
+    const firstData = firstResult.data.list
+    if (firstData.length) {
+      const rows = firstData.map((row, index) => [
+        totalExported + index + 1,
+        row.username || '',
+        row.jwcode || '',
+        row.area || '',
+        row.activityName || '',
+        // 假设货币名称字段在数据中为 currencyName，若不存在请替换为实际字段
+        row.currencyName || '', 
+        (row.paidGold / 100).toFixed(2) || '0.00',
+        row.rechargeWay || '',
+        (row.paidGold / 100).toFixed(2) || '0.00',
+        (row.freeGold / 100).toFixed(2) || '0.00',
+        row.remark || '',
+        row.payWay || '',
+        row.name || '',
+        // 根据状态值显示对应文本
+        row.status === 1 ? '已通过' : row.status === 0 ? '待审核' : row.status === 2 ? '已驳回' : '', 
+        row.reson || '',
+        moment(row.rechargeTime).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: '/recharge/recharge',
+        method: 'post',
+        data: { 
+          pageNum: page,
+          pageSize,
+          rechargeVo: { ...rechargeVo.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 || '',
+        row.activityName || '',
+        // 假设货币名称字段在数据中为 currencyName，若不存在请替换为实际字段
+        row.currencyName || '', 
+        (row.paidGold / 100).toFixed(2) || '0.00',
+        row.rechargeWay || '',
+        (row.paidGold / 100).toFixed(2) || '0.00',
+        (row.freeGold / 100).toFixed(2) || '0.00',
+        row.remark || '',
+        row.payWay || '',
+        row.name || '',
+        // 根据状态值显示对应文本
+        row.status === 1 ? '已通过' : row.status === 0 ? '待审核' : row.status === 2 ? '已驳回' : '', 
+        row.reson || '',
+        moment(row.rechargeTime).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 cancelExport = () => {
+  if (exportCancelToken.value) {
+    exportCancelToken.value.cancel('用户取消导出')
+    ElMessage.warning('导出已取消')
+    isExporting.value = false
+  }
+}
+
+const putExcel = ref({
+  startDate: new Date(),
+  endDate: new Date(new Date().setDate(new Date().getDate() + 1))
+})
 </script>
 
 <template>
@@ -480,7 +686,7 @@ const handleSortChange = (column) => {
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="21">
+          <el-col :span="16">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">充值时间：</el-text>
               <el-date-picker
@@ -497,10 +703,12 @@ const handleSortChange = (column) => {
               <el-button @click="get7Days()">近7天</el-button>
             </div>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="6">
             <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>
           </el-col>
         </el-row>
@@ -687,6 +895,53 @@ const handleSortChange = (column) => {
       </el-card>
     </el-col>
   </el-row>
+
+  <!-- 导出excel提前展示的信息面板 -->
+  <el-dialog
+    v-model="showExportInfoPanel"
+    title="导出信息确认"
+    width="400px"
+    :close-on-click-modal="false"
+  >
+    <div class="info-panel-header">导出信息</div>
+    <div v-if="!rechargeVo.activityId && !rechargeVo.area && !rechargeVo.startDate && !rechargeVo.endDate">
+      你正在导出所有数据
+    </div>
+    <div v-else>
+      你正在导出以下数据
+    </div>
+    <div v-if="rechargeVo.activityId">活动名称：{{ rechargeVo.activityId || '' }}</div>
+    <div v-if="rechargeVo.area">所属地区：{{ rechargeVo.area || '' }}</div>
+    <div v-if="rechargeVo.startDate || rechargeVo.endDate">
+      <span>充值时间：</span>
+      <span>{{ rechargeVo.startDate ? moment(rechargeVo.startDate).format('YYYY-MM-DD HH:mm:ss') : '无起始时间' }} 至 {{ rechargeVo.endDate ? moment(rechargeVo.endDate).format('YYYY-MM-DD HH:mm:ss') : '无结束时间' }}</span>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showExportInfoPanel = false">取消</el-button>
+        <el-button type="primary" @click="doExportExcel">导出</el-button>
+      </span>
+    </template>
+  </el-dialog>
+
+  <!-- 导出进度弹窗 -->
+  <el-dialog
+    v-model="isExporting"
+    title="正在导出"
+    width="400px"
+    :close-on-click-modal="false"
+    :show-close="false"
+  >
+    <el-progress 
+      :percentage="exportProgress"
+      :format="(percentage) => `${percentage}%`"
+    />
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="danger" @click="cancelExport">取消导出</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style scoped>

gold-system/src/views/usergold/index.vue

@@ -482,6 +482,11 @@ const handleCurrentChange = function (val) {
     :close-on-click-modal="false"
   >
     <div class="info-panel-header">导出信息</div>
+    <!-- 直接使用 detailY 显示信息，添加可选链操作符 -->
+    <!-- detailY是一个ref，所以在模板中应该直接使用detailY.consumePlatform，
+     而不是detailY.value.consumePlatform。
+     因为在模板中，ref变量会自动解包，不需要.value。
+     例如，在代码中，我们可能错误地在模板中使用了detailY.value，但实际上应该直接使用detailY。 -->
     <div v-if="!detailY.jwcode && !detailY.consumePlatform && !detailY.num && !detailY.area && (getTime.length < 2)">
       你正在导出所有数据
     </div>
@@ -610,7 +615,7 @@ const handleCurrentChange = function (val) {
             range-separator="至"
             start-placeholder="起始时间"
             end-placeholder="结束时间"
-            style="margin-right: 10px"
+            style="margin-right: 50px"
           />
           <el-button @click="getToday()">今</el-button>
           <el-button @click="getYesterday()">昨</el-button>

gold-system/src/views/workspace/index.vue

@@ -1019,6 +1019,7 @@ onMounted(async function () {
     tooltip: {
       trigger: 'item',
       position: ['15%', '-3%'],
+      show:true, //控制上方小卡片是否展示
       formatter: function (params) {
         return params.seriesName + '<br/>' + params.name
       }
@@ -1026,7 +1027,9 @@ onMounted(async function () {
     legend: {
       bottom: '-1%',
       left: 'center',
-      orient: 'vertical'
+      orient: 'vertical',
+      // 控制点击事件
+      selectedMode: true,
     },
     series: [
       {