0430改完bug

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

@@ -66,6 +66,7 @@
           />
         </el-select>
       </el-form-item> -->
+      <el-row :span="24">
       <el-form-item prop="startTime">
         <el-text class="mx-1" size="large">开始时间：</el-text>
         <el-date-picker
@@ -91,6 +92,7 @@
       <el-button style="margin-left: 10px" @click="getToday()">今</el-button>
       <el-button @click="getYesterday()">昨</el-button>
       <el-button @click="get7Days()">近7天</el-button>
+    </el-row>
       <el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
         <el-button type="success" @click="reset(ruleFormRef)">重置</el-button>

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

@@ -231,7 +231,7 @@ const delConfirm = async (row) => {
     delObj.value = row
     // 发送删除请求
     const result = await request({
-      url: '/recharge/activity/delete', // 假设这是删除活动的接口
+      url: '/recharge/activity/edit', // 假设这是删除活动的接口
       method: 'post',
       data: delObj.value
     })

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

@@ -204,15 +204,21 @@ const getToday = function () {
     today.getMonth(),
     today.getDate()
   )
+  // 设置结束时间为当天的 23:59:59
   const endDate = new Date(
     today.getFullYear(),
     today.getMonth(),
-    today.getDate() + 1
+    today.getDate(),
+    23, 59, 59
   )
   getTime.value = [startDate, endDate]
+  // 格式化时间
+  rechargeVo.value.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+  rechargeVo.value.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss')
   console.log('getTime', getTime.value)
   get()
 }
+
 // 昨天
 const getYesterday = function () {
   const yesterday = new Date()
@@ -222,15 +228,21 @@ const getYesterday = function () {
     yesterday.getMonth(),
     yesterday.getDate()
   )
+  // 设置结束时间为昨天的 23:59:59
   const endDate = new Date(
     yesterday.getFullYear(),
     yesterday.getMonth(),
-    yesterday.getDate() + 1
+    yesterday.getDate(),
+    23, 59, 59
   )
   getTime.value = [startDate, endDate]
+  // 格式化时间
+  rechargeVo.value.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+  rechargeVo.value.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss')
   console.log('getTime', getTime.value)
   get()
 }
+
 // 近7天
 const get7Days = function () {
   const today = new Date()
@@ -239,12 +251,17 @@ const get7Days = function () {
     today.getMonth(),
     today.getDate() - 6
   )
+  // 设置结束时间为当天的 23:59:59
   const endDate = new Date(
     today.getFullYear(),
     today.getMonth(),
-    today.getDate() + 1
+    today.getDate(),
+    23, 59, 59
   )
   getTime.value = [startDate, endDate]
+  // 格式化时间
+  rechargeVo.value.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+  rechargeVo.value.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss')
   console.log('getTime', getTime.value)
   get()
 }

gold-system/src/views/refund/allRefund.vue

@@ -1,4 +1,5 @@
 <script setup>
+// 这是退款明细页面
 import { ref, onMounted, reactive, computed } from 'vue'
 import ElementPlus from 'element-plus'
 import { AiFillRead } from 'vue-icons-plus/ai'

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

@@ -303,20 +303,24 @@ const doExportExcel = async () => {
     // 处理首次请求的数据
     const firstData = firstResult.data.list
     if (firstData.length) {
-      const rows = firstData.map((row, index) => [
-        totalExported + index + 1,
-        row.username || '',
-        row.jwcode || '',
-        row.area || '',
-        platformMap[row.consumePlatform] || '',
-        (row.gold).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') || ''
-      ])
+      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)
@@ -478,11 +482,6 @@ 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>
@@ -495,9 +494,9 @@ const handleCurrentChange = function (val) {
     <div v-if="detailY.area">所属地区：{{ detailY.area || '' }}</div>
     <div v-if="Array.isArray(getTime) && getTime.length >= 2">
       <span>更新时间：</span>
-      <!-- 直接使用 getTime 而非 getTime.value -->
+      <!-- 修改时间格式为精确到秒 -->
       <span v-if="Array.isArray(getTime) && getTime.length >= 2">
-        {{ moment(getTime[0]).format('YYYY-MM-DD') }} 至 {{ moment(getTime[1]).format('YYYY-MM-DD') }}
+        {{ 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>
     </div>