diff --git a/gold-system/.env.production b/gold-system/.env.production
index 2928d04..70912af 100644
--- a/gold-system/.env.production
+++ b/gold-system/.env.production
@@ -1,3 +1,5 @@
 # VITE_API_BASE='http://54.251.137.151:10702/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
+# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
 # VITE_API_BASE='http://192.168.8.220:8080/'
+
diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue
index 7f0db16..89a89ad 100644
--- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue
@@ -240,7 +240,6 @@ const get7Days = function () {
   detailY.value.endTime = endDate
   search()
 }
-
 //初始化
 const getInit = async function () {
   try {
@@ -281,6 +280,7 @@ const trimJwCode = () => {
     detailY.value.sourceName = detailY.value.sourceName.replace(/\s/g, ''); 
   }
 }
+
 // 搜索
 const search = function () {
   trimJwCode();
diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
index a283774..2bae3ba 100644
--- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue
+++ b/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',
diff --git a/gold-system/src/views/goldBeen/onLineDetail.vue b/gold-system/src/views/goldBeen/onLineDetail.vue
index 09c699a..5e5d6f0 100644
--- a/gold-system/src/views/goldBeen/onLineDetail.vue
+++ b/gold-system/src/views/goldBeen/onLineDetail.vue
@@ -372,6 +372,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 +429,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 +462,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 +491,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 +521,7 @@ const doExportExcel = async () => {
       ElMessage.success('导出成功')
     }
   } catch (error) {
-    if (error.message === '导出已取消') {
+    if (error instanceof Error && error.message === '导出已取消') {
       return
     }
     console.log('导出失败', error)
@@ -559,4 +573,7 @@ onMounted(() => {
 }
 </style>
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 703486fc8c3f87173c028d61161e502a2e07fdfc
diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue
index 161d41d..1ba331e 100644
--- a/gold-system/src/views/recharge/allRecharge.vue
+++ b/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>
diff --git a/gold-system/src/views/usergold/index.vue b/gold-system/src/views/usergold/index.vue
index 97d941f..48fe283 100644
--- a/gold-system/src/views/usergold/index.vue
+++ b/gold-system/src/views/usergold/index.vue
@@ -128,7 +128,31 @@ const trimJwCode = () => {
     detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); 
   }
 }
+// 今天
+const getToday = function () {
+  const today = moment()
+  const startDate = today.startOf('day').toDate()
+  const endDate = today.endOf('day').toDate()
+  getTime.value = [startDate, endDate]
+  search()
+}
+
+// 昨天
+const getYesterday = function () {
+  const yesterday = moment().subtract(1, 'day')
+  const startDate = yesterday.startOf('day').toDate()
+  const endDate = yesterday.endOf('day').toDate()
+  getTime.value = [startDate, endDate]
+  search()
+}
 
+// 近7天
+const get7Days = function () {
+  const startDate = moment().subtract(6, 'day').startOf('day').toDate()
+  const endDate = moment().endOf('day').toDate()
+  getTime.value = [startDate, endDate]
+  search()
+}
 // 搜索
 const search = function () {
   trimJwCode();
@@ -482,6 +506,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 +639,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>