xiao007 5 miesięcy temu
rodzic
commit
568c63bb94
2 zmienionych plików z 10 dodań i 7 usunięć
  1. 8 5
      src/views/pages/dashboard.vue
  2. 2 2
      src/views/pages/user.vue

+ 8 - 5
src/views/pages/dashboard.vue

@@ -6,16 +6,17 @@
     <div style="display: flex;">
       <el-form style="flex: 1; display: flex; flex-wrap: wrap;" label-suffix=":" :model="query">
         <el-form-item :label="$t('name')" class='label'>
-          <el-input v-model="query.nickname" :placeholder="$t('userPlaceholder')"></el-input>
+          <el-input v-model="query.nickName" :placeholder="$t('userPlaceholder')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('roomNumber')" class='label'>
           <el-input v-model="query.roomId" :placeholder="$t('roomPlaceholder')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('session')" class='label'>
-          <el-select v-model="query.session" clearable >
+          <el-select v-model="query.gameType" clearable >
             <el-option :label="$t('primaryField')" value="1"></el-option>
             <el-option :label="$t('intermediateField')" value="2"></el-option>
             <el-option :label="$t('higherOrderField')" value="3"></el-option>
+            <el-option :label="$t('customRoom')" value="4"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('tiem')" class='label'>
@@ -49,7 +50,7 @@
             <el-table-column :label="$t('telephone')" prop="phone"></el-table-column>
             <el-table-column :label="$t('roomNumber')" prop="roomId"></el-table-column>
             <el-table-column :label="$t('session')" prop="session"></el-table-column>
-            <el-table-column :label="$t('startTime')" prop="starttime"></el-table-column>
+            <!-- <el-table-column :label="$t('startTime')" prop="starttime"></el-table-column> -->
             <el-table-column :label="$t('endTime')" prop="endtime"></el-table-column>
             <el-table-column :label="$t('disburse')" prop="income"></el-table-column>
             <el-table-column :label="$t('royalty')" prop="commission"></el-table-column>
@@ -76,7 +77,7 @@ const query = reactive({
   endTime: '',
   nickName: '',
   roomId: '',
-  session: '',
+  gameType: '',
 });
 const loading = ref(false);
 const tableData = ref([]);
@@ -102,7 +103,9 @@ const feachTableData = async() => {
   loading.value = true
   const params = {
       ...query,
-      ...pagination
+      ...pagination,
+      beginTime:new Date(query.beginTime).getTime(),
+      endTime:new Date(query.endTime).getTime()
     }
     try {
       const res = await request('post', '/admin/user/getUserGameRecordList', params)

+ 2 - 2
src/views/pages/user.vue

@@ -6,7 +6,7 @@
     <div style="display: flex;">
       <el-form style="flex: 1; display: flex;" label-suffix=":" :model="query">
         <el-form-item :label="$t('name')" style="width: 33%;">
-          <el-input v-model="query.nickname" :placeholder="$t('userPlaceholder')"></el-input>
+          <el-input v-model="query.nickName" :placeholder="$t('userPlaceholder')"></el-input>
         </el-form-item>
       </el-form>
       <el-button type="primary" @click="searchHandler">{{$t('inquire')}}</el-button>
@@ -71,7 +71,7 @@ import { ElMessage } from 'element-plus';
 import i18n from '@/utils/i18n'
 // 查询相关
 const query = reactive({
-  nickname: '',
+  nickName: '',
 });
 const loading = ref(false);
 const dialogVisible = ref(false);