From ffe7138a27ee93a9f9eda0260338285e1bb701a6 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 6 Aug 2025 13:53:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BE=B9=E7=95=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/beanAudit.vue | 634 +++++++++++++++++++++---------------------
 1 file changed, 319 insertions(+), 315 deletions(-)

diff --git a/src/views/audit/beanAudit.vue b/src/views/audit/beanAudit.vue
index a2a8a4e..18436d0 100644
--- a/src/views/audit/beanAudit.vue
+++ b/src/views/audit/beanAudit.vue
@@ -1,128 +1,137 @@
 <template>
-    <el-card style="margin-bottom: 5px">
-        <el-row style="margin-bottom: 10px">
-            <el-col :span="6">
-                <el-text size="large">精网号：</el-text>
-                <el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 240px" clearable />
-            </el-col>
-            <el-col :span="6">
-                <el-text size="large">所属地区：</el-text>
-                <el-select v-model="searchForm.market" placeholder="请选择" style="width: 240px" clearable>
-                    <el-option v-for="item in marketOptions" :key="item" :label="item" :value="item" />
-                </el-select>
-            </el-col>
-        </el-row>
-        <el-row>
-            <el-col :span="15">
-                <div class="time-controls">
-                    <div class="time-group">
-                        <el-text size="large" style="width: 80px">充值时间：</el-text>
-                        <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至"
+  <el-card style="margin-bottom: 5px">
+    <el-row style="margin-bottom: 10px">
+      <el-col :span="6">
+        <el-text size="large">精网号：</el-text>
+        <el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 240px" clearable/>
+      </el-col>
+      <el-col :span="6">
+        <el-text size="large">所属地区：</el-text>
+        <el-select v-model="searchForm.market" placeholder="请选择" style="width: 240px" clearable>
+          <el-option v-for="item in marketOptions" :key="item" :label="item" :value="item"/>
+        </el-select>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="15">
+        <div class="time-controls">
+          <div class="time-group">
+            <el-text size="large" style="width: 80px">充值时间：</el-text>
+            <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至"
                             start-placeholder="开始时间" end-placeholder="结束时间" style="width: 400px"
-                            @change="handleDatePickerChange" />
-                        <el-button @click="getToday()" style="margin-left: 10px"
-                            :type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
-                        <el-button @click="getYesterday()" style="margin-left: 10px"
-                            :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨</el-button>
-                        <el-button @click="get7Days()" style="margin-left: 10px"
-                            :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
-                        <el-button type="success" @click="resetSearch">重置</el-button>
-                        <el-button type="primary" @click="handleSearch">查询</el-button>
-                    </div>
-                </div>
-            </el-col>
-        </el-row>
-    </el-card>
+                            @change="handleDatePickerChange" :default-time="defaultTime"/>
+            <el-button @click="getToday()" style="margin-left: 10px"
+                       :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
+            </el-button>
+            <el-button @click="getYesterday()" style="margin-left: 10px"
+                       :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨
+            </el-button>
+            <el-button @click="get7Days()" style="margin-left: 10px"
+                       :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天
+            </el-button>
+            <el-button type="success" @click="resetSearch">重置</el-button>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </el-card>
 
-    <el-card>
-        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-            <el-tab-pane label="待审核" name="wait"></el-tab-pane>
-            <el-tab-pane label="已通过" name="pass"></el-tab-pane>
-            <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
-        </el-tabs>
+  <el-card>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="待审核" name="wait"></el-tab-pane>
+      <el-tab-pane label="已通过" name="pass"></el-tab-pane>
+      <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+    </el-tabs>
 
-        <div>
-            总条数：{{ stats.num }}条&nbsp;&nbsp;&nbsp;&nbsp;
-            总金豆数：{{ stats.beanNum }}金豆&nbsp;&nbsp;&nbsp;&nbsp;
-            永久金豆：{{ stats.permanentBean }}金豆&nbsp;&nbsp;&nbsp;&nbsp;
-            免费金豆：{{ stats.freeBean }}金豆
-        </div>
+    <div>
+      总条数：{{ stats.num }}条&nbsp;&nbsp;&nbsp;&nbsp;
+      总金豆数：{{ stats.beanNum }}金豆&nbsp;&nbsp;&nbsp;&nbsp;
+      永久金豆：{{ stats.permanentBean }}金豆&nbsp;&nbsp;&nbsp;&nbsp;
+      免费金豆：{{ stats.freeBean }}金豆
+    </div>
 
-        <el-table :data="tableData" height="540px" @sort-change="handleSortChange">
-            <el-table-column prop="id" label="序号" width="80" />
-            <el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />
-            <el-table-column prop="jwcode" label="精网号" width="120" />
-            <el-table-column prop="market" label="所属地区" width="120" />
-            <el-table-column prop="permanentBean" label="付费金豆" width="120" sortable="custom" />
-            <el-table-column prop="freeBean" label="免费金豆" width="120" sortable="custom" />
-            <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip />
-            <el-table-column prop="submitName" label="提交人" width="120" />
-            <el-table-column v-if="checkTab === 'reject'" prop="reason" label="驳回理由" width="120"
-                show-overflow-tooltip />
-            <el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120" />
-            <el-table-column prop="createTime" label="提交时间" width="180" sortable="custom">
-                <template #default="{ row }">
-                    {{ moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-                </template>
-            </el-table-column>
-            <el-table-column v-if="checkTab !== 'pending'" prop="auditTime" label="审核时间" width="240" sortable="custom">
-                <template #default="{ row }">
-                    {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }}
-                </template>
-            </el-table-column>
-            <el-table-column v-if="checkTab === 'pending'" fixed="right" prop="operation" label="操作" width="400px">
-                <template #default="scope">
-                    <div class="operation">
-                        <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
-                            <template #reference>
-                                <el-button :disabled="scope.row.status === 1 || scope.row.status === 2" type="primary"
-                                    text>
-                                    通过
-                                </el-button>
-                            </template>
-                        </el-popconfirm>
-                        <el-button :disabled="scope.row.status === 1 || scope.row.status === 2" type="primary" text
-                            @click="showRejectDialog(scope.row)">
-                            驳回
-                        </el-button>
-                    </div>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination style="margin-top:20px" v-model:current-page="pagination.pageNum"
-            v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="stats.num"
-            @size-change="handlePageSizeChange" @current-change="handleCurrentChange"></el-pagination>
-    </el-card>
+    <el-table :data="tableData" height="540px" @sort-change="handleSortChange">
+      <el-table-column prop="id" label="序号" width="80"/>
+      <el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip/>
+      <el-table-column prop="jwcode" label="精网号" width="120"/>
+      <el-table-column prop="market" label="所属地区" width="120"/>
+      <el-table-column prop="permanentBean" label="付费金豆" width="120" sortable="custom"/>
+      <el-table-column prop="freeBean" label="免费金豆" width="120" sortable="custom"/>
+      <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip/>
+      <el-table-column prop="submitName" label="提交人" width="120"/>
+      <el-table-column v-if="checkTab === 'reject'" prop="reason" label="驳回理由" width="120"
+                       show-overflow-tooltip/>
+      <el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120"/>
+      <el-table-column prop="createTime" label="提交时间" width="180" sortable="custom">
+        <template #default="{ row }">
+          {{ moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkTab !== 'pending'" prop="auditTime" label="审核时间" width="240" sortable="custom">
+        <template #default="{ row }">
+          {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkTab === 'pending'" fixed="right" prop="operation" label="操作" width="400px">
+        <template #default="scope">
+          <div class="operation">
+            <el-popconfirm title="确定要通过此条记录吗？" @confirm="handleApprove(scope.row)">
+              <template #reference>
+                <el-button :disabled="scope.row.status === 1 || scope.row.status === 2" type="primary"
+                           text>
+                  通过
+                </el-button>
+              </template>
+            </el-popconfirm>
+            <el-button :disabled="scope.row.status === 1 || scope.row.status === 2" type="primary" text
+                       @click="showRejectDialog(scope.row)">
+              驳回
+            </el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination style="margin-top:20px" v-model:current-page="pagination.pageNum"
+                   v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper"
+                   :total="stats.num"
+                   @size-change="handlePageSizeChange" @current-change="handleCurrentChange"></el-pagination>
+  </el-card>
 
-    <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px">
-        <el-form>
-            <el-form-item label="驳回理由" required>
-                <el-input v-model="reason" type="textarea" :rows="4" placeholder="请输入驳回理由" maxlength="200"
-                    show-word-limit />
-            </el-form-item>
-        </el-form>
-        <template #footer>
+  <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px">
+    <el-form>
+      <el-form-item label="驳回理由" required>
+        <el-input v-model="reason" type="textarea" :rows="4" placeholder="请输入驳回理由" maxlength="200"
+                  show-word-limit/>
+      </el-form-item>
+    </el-form>
+    <template #footer>
             <span class="dialog-footer">
                 <el-button @click="rejectDialogVisible = false">取消</el-button>
                 <el-button type="primary" @click="handleReject()">确定</el-button>
             </span>
-        </template>
-    </el-dialog>
+    </template>
+  </el-dialog>
 </template>
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import { ElMessage } from 'element-plus'
+<script setup>
+import {onMounted, ref} from 'vue'
+import {ElMessage} from 'element-plus'
 import API from '@/util/http'
 import moment from 'moment'
-import { useAdminStore } from "@/store/index.js";
-import { storeToRefs } from "pinia";
+import {useAdminStore} from "@/store/index.js";
+import {storeToRefs} from "pinia";
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1,23 , 59, 59),
+]
 const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
-import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
+const {adminData, menuTree} = storeToRefs(adminStore);
+import {permissionMapping, findMenuById} from "@/utils/menuTreePermission.js"
+import dayjs from "dayjs";
 
 const tableData = ref([])
 const marketOptions = ref([])
-const dateRange = ref<Date[]>([])
+const dateRange = ref([])
 const activeTimeRange = ref('')
 const activeName = ref('wait')
 const sortField = ref('')
@@ -131,282 +140,277 @@ const checkTab = ref('pending')
 const rejectDialogVisible = ref(false)
 const reason = ref('')
 const rejectRow = ref({
-    id: null
+  id: null
 })// 驳回行数据
 // 状态常量
 const STATUS = {
-    PENDING: 0, // 待审核
-    APPROVED: 1, // 通过
-    REJECTED: 2 // 驳回
+  PENDING: 0, // 待审核
+  APPROVED: 1, // 通过
+  REJECTED: 2 // 驳回
 }
 const searchForm = ref({
-    jwcode: '',
-    market: '',
-    createStartTime: '',
-    createEndTime: '',
-    status: STATUS.PENDING,
-    auditStartTime: '',
-    auditEndTime: ''
+  jwcode: '',
+  market: '',
+  createStartTime: '',
+  createEndTime: '',
+  status: STATUS.PENDING,
+  auditStartTime: '',
+  auditEndTime: ''
 })
 const pagination = ref({
-    pageNum: 1,
-    pageSize: 50
+  pageNum: 1,
+  pageSize: 50
 })
 // 合计数
 const stats = ref({
-    num: 0,
-    beanNum: 0,
-    permanentBean: 0,
-    freeBean: 0
+  num: 0,
+  beanNum: 0,
+  permanentBean: 0,
+  freeBean: 0
 })
 const showRejectDialog = (row) => {
-    rejectRow.value.id = row.id
-    reason.value = ''
-    rejectDialogVisible.value = true
+  rejectRow.value.id = row.id
+  reason.value = ''
+  rejectDialogVisible.value = true
 }
 const getmarkets = async () => {
-    try {
-        const result = await API({ url: '/beanConsume/getDept', data: {} })
-        marketOptions.value = result.data || []
-    } catch (error) {
-        console.error('获取地区列表失败', error)
-    }
+  try {
+    const result = await API({url: '/beanConsume/getDept', data: {}})
+    marketOptions.value = result.data || []
+  } catch (error) {
+    console.error('获取地区列表失败', error)
+  }
 }
 const handleSortChange = (column) => {
-    if (column.prop === 'sumGold') {
-        sortField.value = 'sum_gold'
-    } else if (column.prop === 'permanentGold') {
-        sortField.value = 'permanent_gold'
-    } else if (column.prop === 'freeGold') {
-        sortField.value = 'freeGold'
-    } else if (column.prop === 'taskGold') {
-        sortField.value = 'task_gold'
-    } else if (column.prop === 'createTime') {
-        sortField.value = 'create_time'
-    } else if (column.prop === 'auditTime') {
-        sortField.value = 'audit_time'
-    } else {
-        sortField.value = ''
-    }
-    sortOrder.value = column.order === 'ascending' ? 'asc' : 'desc'
-    console.log('排序字段：', sortField.value)
-    console.log('排序方式：', sortOrder.value)
-    get()
+  if (column.prop === 'permanentBean') {
+    sortField.value = 'permanentBean'
+  } else if (column.prop === 'freeBean') {
+    sortField.value = 'freeBean'
+  } else if (column.prop === 'createTime') {
+    sortField.value = 'createTime'
+  } else if (column.prop === 'auditTime') {
+    sortField.value = 'auditTime'
+  } else {
+    sortField.value = ''
+  }
+  sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
+  console.log('排序字段：', sortField.value)
+  console.log('排序方式：', sortOrder.value)
+  get()
 }
 const handleSearch = function () {
-    get()
-    getStats()
+  get()
+  getStats()
 }
 const get = async function () {
-    if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Recharge_Audit)) {
-        try {
-            if (dateRange.value && dateRange.value.length === 2) {
-                searchForm.value.createStartTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
-                searchForm.value.createEndTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
-            } else {
-                searchForm.value.createStartTime = ''
-                searchForm.value.createEndTime = ''
-            }
-            const params = {
-                pageNum: pagination.value.pageNum,//页码
-                pageSize: pagination.value.pageSize,//页面大小
-                beanAuditInfo: {
-                    jwcode: searchForm.value.jwcode,
-                    status: searchForm.value.status,
-                    market: searchForm.value.market,
-                    createStartTime: searchForm.value.createStartTime,
-                    createEndTime: searchForm.value.createEndTime,
-                    auditStartTime: searchForm.value.auditStartTime,
-                    auditEndTime: searchForm.value.auditEndTime,
-                    sortField: sortField.value,
-                    sortOrder: sortOrder.value
-                }
-            }
-            console.log('看看传给后端的参数：', params)
-            const res = await API({ url: '/beanAudit/selectBy', data: params })
-            tableData.value = res.data.list || []
-        } catch (error) {
-            console.error('获取数据失败', error)
+  if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Recharge_Audit)) {
+    try {
+      if (dateRange.value && dateRange.value.length === 2) {
+        searchForm.value.createStartTime = moment(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss')
+        searchForm.value.createEndTime = moment(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss')
+      } else {
+        searchForm.value.createStartTime = ''
+        searchForm.value.createEndTime = ''
+      }
+      const params = {
+        pageNum: pagination.value.pageNum,//页码
+        pageSize: pagination.value.pageSize,//页面大小
+        beanAuditInfo: {
+          jwcode: searchForm.value.jwcode,
+          status: searchForm.value.status,
+          market: searchForm.value.market,
+          createStartTime: searchForm.value.createStartTime,
+          createEndTime: searchForm.value.createEndTime,
+          auditStartTime: searchForm.value.auditStartTime,
+          auditEndTime: searchForm.value.auditEndTime,
+          sortField: sortField.value,
+          sortOrder: sortOrder.value
         }
-    }else{
-        ElMessage.error('无此权限')
+      }
+      console.log('看看传给后端的参数：', params)
+      const res = await API({url: '/beanAudit/selectBy', data: params})
+      tableData.value = res.data.list || []
+    } catch (error) {
+      console.error('获取数据失败', error)
     }
+  } else {
+    ElMessage.error('无此权限')
+  }
 }
 const getStats = async () => {
-    if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Recharge_Audit)) {
-        try {
-            const params = {
-                jwcode: searchForm.value.jwcode,
-                status: searchForm.value.status,
-                market: searchForm.value.market,
-                createStartTime: searchForm.value.createStartTime,
-                createEndTime: searchForm.value.createEndTime,
-                auditStartTime: searchForm.value.auditStartTime,
-                auditEndTime: searchForm.value.auditEndTime
-            }
+  if (findMenuById(menuTree.value, permissionMapping.View_Golden_Bean_Recharge_Audit)) {
+    try {
+      const params = {
+        jwcode: searchForm.value.jwcode,
+        status: searchForm.value.status,
+        market: searchForm.value.market,
+        createStartTime: searchForm.value.createStartTime,
+        createEndTime: searchForm.value.createEndTime,
+        auditStartTime: searchForm.value.auditStartTime,
+        auditEndTime: searchForm.value.auditEndTime
+      }
 
-            const res = await API({
-                url: '/beanAudit/statsBean',
-                data: params
-            })
+      const res = await API({
+        url: '/beanAudit/statsBean',
+        data: params
+      })
 
-            stats.value.num = res.data.num
-            stats.value.permanentBean = res.data.permanentBean
-            stats.value.freeBean = res.data.freeBean
-            stats.value.beanNum = res.data.beanNum
-            console.log('see see stats和搜索对象', stats.value, params)
-        } catch (error) {
-            console.log('请求失败', error)
-        }
-    }else{
-        ElMessage.error('无此权限')
+      stats.value.num = res.data.num
+      stats.value.permanentBean = res.data.permanentBean
+      stats.value.freeBean = res.data.freeBean
+      stats.value.beanNum = res.data.beanNum
+      console.log('see see stats和搜索对象', stats.value, params)
+    } catch (error) {
+      console.log('请求失败', error)
     }
+  } else {
+    ElMessage.error('无此权限')
+  }
 }
 // 通过
 const handleApprove = async (row) => {
-    if (findMenuById(menuTree.value, permissionMapping.Golden_Bean_Recharge_Approval)) {
-        try {
-            const params = {
-                id: row.id,
-                auditName: adminData.value.name,
-            }
-            await API({ url: '/beanAudit/status1', data: params })
-            ElMessage.success('审核通过成功')
-            get()
-            getStats()
-        } catch (error) {
-            console.error('审核通过失败', error)
-            ElMessage.error('操作失败')
-        }
-    } else {
-        ElMessage.error('无此权限')
+  if (findMenuById(menuTree.value, permissionMapping.Golden_Bean_Recharge_Approval)) {
+    try {
+      const params = {
+        id: row.id,
+        auditName: adminData.value.name,
+      }
+      await API({url: '/beanAudit/status1', data: params})
+      ElMessage.success('审核通过成功')
+      get()
+      getStats()
+    } catch (error) {
+      console.error('审核通过失败', error)
+      ElMessage.error('操作失败')
     }
+  } else {
+    ElMessage.error('无此权限')
+  }
 }
 
 // 驳回
 const handleReject = async () => {
-    if (findMenuById(menuTree.value, permissionMapping.Golden_Bean_Recharge_Approval)) {
-        if (!reason.value.trim()) {
-            ElMessage.warning('请输入驳回理由')
-            return
-        }
-        try {
-            const params = {
-                id: rejectRow.value.id,
-                auditName: adminData.value.adminName,
-                reason: reason.value
-            }
-            await API({ url: '/beanAudit/status2', data: params })
-            ElMessage.success('驳回成功')
-            rejectDialogVisible.value = false
-            get()
-            getStats()
-        } catch (error) {
-            console.error('驳回失败', error)
-            ElMessage.error('操作失败')
-        }
-    } else {
-        ElMessage.error('无此权限')
+  if (findMenuById(menuTree.value, permissionMapping.Golden_Bean_Recharge_Approval)) {
+    if (!reason.value.trim()) {
+      ElMessage.warning('请输入驳回理由')
+      return
+    }
+    try {
+      const params = {
+        id: rejectRow.value.id,
+        auditName: adminData.value.adminName,
+        reason: reason.value
+      }
+      await API({url: '/beanAudit/status2', data: params})
+      ElMessage.success('驳回成功')
+      rejectDialogVisible.value = false
+      get()
+      getStats()
+    } catch (error) {
+      console.error('驳回失败', error)
+      ElMessage.error('操作失败')
     }
+  } else {
+    ElMessage.error('无此权限')
+  }
 }
 const getToday = function () {
-    const today = new Date()
-    const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate())
-    const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
-    dateRange.value = [startTime, endTime]
-    console.log('dateRange', dateRange.value)
-    activeTimeRange.value = 'today'
+  const today = dayjs()
+  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  dateRange.value = [startTime, endTime]
+  console.log('dateRange', dateRange.value)
+  activeTimeRange.value = 'today'
 
-    get()
-    getStats()
+  get()
+  getStats()
 }
 const getYesterday = function () {
-    const yesterday = new Date()
-    yesterday.setDate(yesterday.getDate() - 1)
-    const startTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate())
-    const endTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1)
-    dateRange.value = [startTime, endTime]
-    console.log('dateRange', dateRange.value)
-    activeTimeRange.value = 'yesterday'
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  dateRange.value = [startTime, endTime]
+  console.log('dateRange', dateRange.value)
+  activeTimeRange.value = 'yesterday'
 
-    get()
-    getStats()
+  get()
+  getStats()
 }
 const get7Days = function () {
-    const today = new Date()
-    const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6)
-    const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
-    dateRange.value = [startTime, endTime]
-    console.log('dateRange', dateRange.value)
-    activeTimeRange.value = '7days'
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  dateRange.value = [startTime, endTime]
+  console.log('dateRange', dateRange.value)
+  activeTimeRange.value = '7days'
 
-    get()
-    getStats()
+  get()
+  getStats()
 }
 const resetSearch = function () {
-    const status = searchForm.value.status;
-    searchForm.value = {
-        jwcode: '',
-        market: '',
-        createStartTime: '',
-        createEndTime: '',
-        status: status,
-        auditStartTime: '',
-        auditEndTime: ''
-    }
-    dateRange.value = []
-    activeTimeRange.value = '' // 清除激活状态
+  const status = searchForm.value.status;
+  searchForm.value = {
+    jwcode: '',
+    market: '',
+    createStartTime: '',
+    createEndTime: '',
+    status: status,
+    auditStartTime: '',
+    auditEndTime: ''
+  }
+  dateRange.value = []
+  activeTimeRange.value = '' // 清除激活状态
 }
 
 const handleClick = function (tab) {
-    activeName.value = tab.props.name
-    if (tab.props.name === 'wait') {
-        adminWait()
-    } else if (tab.props.name === 'pass') {
-        adminPass()
-    } else if (tab.props.name === 'reject') {
-        adminReject()
-    }
+  activeName.value = tab.props.name
+  if (tab.props.name === 'wait') {
+    adminWait()
+  } else if (tab.props.name === 'pass') {
+    adminPass()
+  } else if (tab.props.name === 'reject') {
+    adminReject()
+  }
 }
 // 待审核充值明细
 const adminWait = async function () {
-    checkTab.value = 'pending'
-    searchForm.value.status = STATUS.PENDING
-    await get()
-    await getStats()
+  checkTab.value = 'pending'
+  searchForm.value.status = STATUS.PENDING
+  await get()
+  await getStats()
 }
 
 // 已通过充值明细
 const adminPass = async function () {
-    checkTab.value = 'pass'
-    searchForm.value.status = STATUS.APPROVED
-    await get()
-    await getStats()
+  checkTab.value = 'pass'
+  searchForm.value.status = STATUS.APPROVED
+  await get()
+  await getStats()
 }
 
 // 已驳回充值明细
 const adminReject = async function () {
-    checkTab.value = 'reject'
-    searchForm.value.status = STATUS.REJECTED
-    await get()
-    await getStats()
+  checkTab.value = 'reject'
+  searchForm.value.status = STATUS.REJECTED
+  await get()
+  await getStats()
 }
 const handleDatePickerChange = () => {
-    activeTimeRange.value = ''
+  activeTimeRange.value = ''
 }
 const handlePageSizeChange = function (val) {
-    pagination.value.pageSize = val
-    get()
+  pagination.value.pageSize = val
+  get()
 }
 const handleCurrentChange = function (val) {
-    pagination.value.pageNum = val
-    get()
+  pagination.value.pageNum = val
+  get()
 }
 onMounted(async () => {
-    getmarkets()
-    get()
-    getStats()
-    console.log("看看通信来的用户身份", adminData.value)
+  getmarkets()
+  get()
+  getStats()
+  console.log("看看通信来的用户身份", adminData.value)
 })
 </script>
 

From 97a4d06ec1a3d49225e539f38ab2f866dec83135 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 6 Aug 2025 13:56:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=E5=88=A0=E9=99=A4=E6=B1=87?=
 =?UTF-8?q?=E7=8E=87=E7=9A=84=E6=8F=90=E4=BA=A4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/managerecharge/rate.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 96abd59..32b0d4a 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -456,9 +456,7 @@ onMounted(async function () {
             <span>{{ rateEdit.rateName }}</span>可兑换 1 新币)
           </span>
         </el-form-item>
-        <el-form-item label="提交人:">
-          <el-input disabled :value="adminData.adminName" style="width: 240px"/>
-        </el-form-item>
+
         <el-form-item>
           <div class="dialog-footer">
             <el-button type="primary" @click="edit">修改</el-button>

From a78aa9f7814f4b97679ab84dc65f5b15c156e6a9 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 6 Aug 2025 15:14:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E6=97=B6=E9=97=B4=E8=BE=B9?=
 =?UTF-8?q?=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/bean/articleVideo.vue   | 6 +++++-
 src/views/consume/bean/dieHardFan.vue     | 6 +++++-
 src/views/consume/bean/liveStream.vue     | 7 +++++--
 src/views/recharge/beanOnlineRecharge.vue | 7 +++++--
 src/views/recharge/beanSystemRecharge.vue | 7 +++++--
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 49a7a2c..caef933 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -6,7 +6,10 @@ import API from '@/util/http.js'
 import moment from 'moment'
 import { ar } from 'element-plus/es/locales.mjs'
 // 之后整理一下
-
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1,23 , 59, 59),
+]
 /*
 ====================工具方法==============================
 */
@@ -504,6 +507,7 @@ const getTagText = (state) => {
                 style="width: 400px"
                 @change="handleDatePickerChange"
                 value-format="YYYY-MM-DD HH:mm:ss"
+                :default-time="defaultTime"
               />
               <el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
               <el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index b98237c..9c871b6 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -12,7 +12,10 @@ import moment from 'moment'
 
 // 时间格式化
 const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
-
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1,23 , 59, 59),
+]
 /*
 ====================数据=================================
 */
@@ -499,6 +502,7 @@ const getTagText = (state) => {
                 style="width: 400px"
                 @change="handleDatePickerChange"
                 value-format="YYYY-MM-DD HH:mm:ss"
+                :default-time="defaultTime"
               />
               <el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
               <el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 7d248b0..22510da 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -9,7 +9,10 @@ import moment from 'moment'
 /*
 ====================工具方法==============================
 */
-
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1,23 , 59, 59),
+]
 // 时间格式化
 const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
 
@@ -549,7 +552,7 @@ const getTagText = (state) => {
             <div class="head-card-element">
               <el-text class="mx-1"  >消费时间：</el-text>
               <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" />
+                end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" :default-time="defaultTime"/>
               <el-button @click="getToday()" style="margin-left: 10px"
                 :type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
               <el-button @click="getYesterday()" style="margin-left: 10px"
diff --git a/src/views/recharge/beanOnlineRecharge.vue b/src/views/recharge/beanOnlineRecharge.vue
index 5f3106e..5ef7c67 100644
--- a/src/views/recharge/beanOnlineRecharge.vue
+++ b/src/views/recharge/beanOnlineRecharge.vue
@@ -6,7 +6,10 @@ import { AiFillRead } from 'vue-icons-plus/ai'
 import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http'
-
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1,23 , 59, 59),
+]
 const selectData = ref({
     jwcode: '',
     market: '',
@@ -369,7 +372,7 @@ onMounted(async function () {
                             <el-text class="mx-1" size="large">充值时间：</el-text>
                             <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
                                 start-placeholder="起始时间" end-placeholder="结束时间" style="width: 350px"
-                                @change="handleDatePickerChange" />
+                                @change="handleDatePickerChange"  :default-time="defaultTime"/>
                             <el-button @click="getToday()" style="margin-left: 10px"
                                 :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
                             </el-button>
diff --git a/src/views/recharge/beanSystemRecharge.vue b/src/views/recharge/beanSystemRecharge.vue
index 619311f..5141fdb 100644
--- a/src/views/recharge/beanSystemRecharge.vue
+++ b/src/views/recharge/beanSystemRecharge.vue
@@ -17,7 +17,10 @@ const selectData = ref({
 const permanentBeans = ref(0)
 const beanNum = ref(0)
 const money = ref(0)
-
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1,23 , 59, 59),
+]
 //时间格式化
 const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
 const tableData = ref([])
@@ -335,7 +338,7 @@ onMounted(async function () {
                             <el-text class="mx-1" size="large">充值时间：</el-text>
                             <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
                                 start-placeholder="起始时间" end-placeholder="结束时间" style="width: 350px"
-                                @change="handleDatePickerChange" />
+                                @change="handleDatePickerChange" :default-time="defaultTime"/>
                             <el-button @click="getToday()" style="margin-left: 10px"
                                 :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
                             </el-button>