Merge branch 'dev' into test

src/views/game/jl/index.vue

@@ -58,6 +58,17 @@
           />
         </div>
       </n-col>
+      <n-col :span="24">
+        <div mt-10 flex items-center>
+          <span w-100>投注时间：</span>
+          <n-date-picker
+            v-model:formatted-value="queryData.time1"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            clearable
+          />
+        </div>
+      </n-col>
       <n-col :span="24">
         <div mt-10>
           <n-button type="primary" @click="get_list">搜索</n-button>
@@ -109,6 +120,7 @@ const queryData = ref({
   hall_id: null,
   status: null,
   time: null,
+  time1: null,
 })
 
 const options = ref([])
@@ -199,6 +211,8 @@ const get_list = async () => {
     pageSize: pagination.value.pageSize,
     StartTime: queryData.value.time ? queryData.value.time[0] : '',
     EndTime: queryData.value.time ? queryData.value.time[1] : '',
+    UseStartTime: queryData.value.time1 ? queryData.value.time1[0] : '',
+    UseEndTime: queryData.value.time1 ? queryData.value.time1[1] : '',
   }
   Reflect.deleteProperty(obj, 'time')
   const res = await api.getData(obj)