Merge branch 'refs/heads/milestone-20250728-金币前端三期' into lihui/feature-20250728114233-金币前端三期

src/views/audit/beanAudit.vue

@@ -370,6 +370,7 @@ const resetSearch = function () {
 }
 
 const handleClick = function (tab) {
+  resetSearch()                                                                                                                                                                                         
   activeName.value = tab.props.name
   if (tab.props.name === 'wait') {
     adminWait()

src/views/recharge/beanOnlineRecharge.vue

@@ -7,8 +7,8 @@ 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),
+    new Date(2000, 1, 1, 0, 0, 0),
+    new Date(2000, 2, 1, 23, 59, 59),
 ]
 const selectData = ref({
     jwcode: '',
@@ -141,13 +141,13 @@ const reset = () => {
 //查询
 const search = () => {
     getObj.value.pageNum = 1
-      //判断精网号查询是否为数字
+    //判断精网号查询是否为数字
     getObj.value.pageNum = 1
-    if(selectData.value.jwcode){
+    if (selectData.value.jwcode) {
         const numRef = /^\d{1,9}$/;
-        if(!numRef.test(selectData.value.jwcode)){
+        if (!numRef.test(selectData.value.jwcode)) {
             ElMessage.error('请检查精网号格式')
-            return 
+            return
         }
     }
     get()
@@ -381,7 +381,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"  :default-time="defaultTime"/>
+                                @change="handleDatePickerChange" :default-time="defaultTime" />
                             <el-button @click="getToday()" style="margin-left: 10px"
                                 :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
                             </el-button>
@@ -410,7 +410,13 @@ onMounted(async function () {
                 <!-- 设置表格容器的高度和滚动样式 -->
                 <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
                     <el-table :data="tableData" style="width: 100%" height="520px" @sort-change="handleSortChange">
-                        <el-table-column type="id" prop='id' label="ID" min-width="80px" fixed="left"></el-table-column>
+                        <el-table-column type="index" label="序号" width="80px" fixed="left">
+                            <template #default="scope">
+                                <span>{{
+                                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                                    }}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column fixed="left" prop="name" label="姓名" min-width="120" />
                         <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
                         <el-table-column prop="market" label="所属地区" min-width="100px" />
@@ -475,6 +481,4 @@ onMounted(async function () {
         </template>
     </el-dialog>
 </template>
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/recharge/beanSystemRecharge.vue

@@ -19,8 +19,8 @@ const freeBean = 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),
+    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') : ''
@@ -141,11 +141,11 @@ const reset = () => {
 const search = () => {
     //判断精网号查询是否为数字
     getObj.value.pageNum = 1
-    if(selectData.value.jwcode){
+    if (selectData.value.jwcode) {
         const numRef = /^\d{1,9}$/;
-        if(!numRef.test(selectData.value.jwcode)){
+        if (!numRef.test(selectData.value.jwcode)) {
             ElMessage.error('请检查精网号格式')
-            return 
+            return
         }
     }
     get()
@@ -348,7 +348,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" :default-time="defaultTime"/>
+                                @change="handleDatePickerChange" :default-time="defaultTime" />
                             <el-button @click="getToday()" style="margin-left: 10px"
                                 :type="activeTimeRange === 'today' ? 'primary' : ''"> 今
                             </el-button>
@@ -383,7 +383,13 @@ onMounted(async function () {
                 <!-- 设置表格容器的高度和滚动样式 -->
                 <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
                     <el-table :data="tableData" style="width: 100%" height="520px" @sort-change="handleSortChange">
-                        <el-table-column type="id" prop="id" label="ID" min-width="80px" fixed="left"></el-table-column>
+                        <el-table-column type="index" label="序号" width="80px" fixed="left">
+                            <template #default="scope">
+                                <span>{{
+                                    scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+                                    }}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column fixed="left" prop="name" label="姓名" min-width="100" />
                         <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
                         <el-table-column prop="market" label="所属地区" min-width="100px" />