From 8fbf649dc52404eece465d0c02a67ac9d81e0fef Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Tue, 28 Oct 2025 11:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newuser/newuserList/hook.tsx       |  8 +++++---
 src/views/newuser/newuserList/searchMore.vue | 17 ++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/views/newuser/newuserList/hook.tsx b/src/views/newuser/newuserList/hook.tsx
index 4485c35..508f90b 100644
--- a/src/views/newuser/newuserList/hook.tsx
+++ b/src/views/newuser/newuserList/hook.tsx
@@ -20,7 +20,7 @@ import {
   banUserData
 } from "@/api/modules/newuserList";
 import { addDialog } from "@/components/ReDialog";
-import { object } from "vue-types";
+// import { object } from "vue-types";
 export function useData() {
   const formRef = ref();
   const searchFormMore = ref({
@@ -43,11 +43,13 @@ export function useData() {
     background: true
   });
   const searchForm = ref({
+    user_code: '',
     search: "",
     is_sys_tester: "",
     is_real: ""
   });
   const searchLabel = ref([
+    { label: "会员ID", prop: "user_code", type: "input" },
     { label: "昵称/手机号查询", prop: "search", type: "input" },
     {
       label: "官方账号",
@@ -161,8 +163,8 @@ export function useData() {
     }
     const { data, code } = await queryList({
       ...formData,
-      // coin1: searchForm.value.coin1 ? searchForm.value.coin1 : '',
-      // coin2: searchForm.value.coin2 ? searchForm.value.coin2 : '',
+      coin1: searchForm.value.coin1 !== '' ? searchForm.value.coin1 : '',
+      coin2: searchForm.value.coin2 !== '' ? searchForm.value.coin2 : '',
       page: pagination.value.currentPage,
       page_limit: pagination.value.pageSize
     });
diff --git a/src/views/newuser/newuserList/searchMore.vue b/src/views/newuser/newuserList/searchMore.vue
index f6dd799..1208f55 100644
--- a/src/views/newuser/newuserList/searchMore.vue
+++ b/src/views/newuser/newuserList/searchMore.vue
@@ -27,13 +27,14 @@ defineExpose({ getRef });
   <el-form ref="ruleFormRef" :model="newFormInline" label-position="top" label-width="120px">
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="ID" prop="user_code">
-          <el-input v-model="newFormInline.user_code"></el-input>
+        <el-form-item label="登录设备" prop="login_device">
+          <el-input v-model="newFormInline.login_device"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="登录设备" prop="login_device">
-          <el-input v-model="newFormInline.login_device"></el-input>
+        <el-form-item label="创建时间" prop="createtime">
+          <el-date-picker style="width: 100%;" v-model="newFormInline.createtime" type="date" placeholder="选择创建时间">
+          </el-date-picker>
         </el-form-item>
       </el-col>
     </el-row>
@@ -62,7 +63,7 @@ defineExpose({ getRef });
       </el-col>
     </el-row>
     <el-row type="flex" :gutter="20" justify="center">
-      <el-col :span="12">
+      <el-col :span="24">
         <el-form-item label="金币区间" prop="nickname">
           <el-row :gutter="20">
             <el-col :span="10">
@@ -76,12 +77,6 @@ defineExpose({ getRef });
 
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="创建时间" prop="createtime">
-          <el-date-picker style="width: 100%;" v-model="newFormInline.createtime" type="date" placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
     </el-row>
   </el-form>
 </template>