From fb54dac18f14e4eec0d57dc77ef4744d44c43c98 Mon Sep 17 00:00:00 2001 From: lingling <1077478963@qq.com> Date: Sat, 22 Feb 2025 20:26:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=20?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=8F=90=E7=8E=B0=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E5=86=99=E5=85=A5=E7=A9=BA=E6=A0=BC=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/admin/api/v1/JobuserController.php | 1 + app/controller/admin/api/v1/WithdrawController.php | 2 +- public/js/index-78a2616f.js | 10 ++-------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/controller/admin/api/v1/JobuserController.php b/app/controller/admin/api/v1/JobuserController.php index aecac7d..da9784e 100644 --- a/app/controller/admin/api/v1/JobuserController.php +++ b/app/controller/admin/api/v1/JobuserController.php @@ -54,6 +54,7 @@ class JobuserController // 使用 join 进行关联查询 f_id 对应的用户名称 $users = $query->leftJoin('users as u', 'users.f_id', '=', 'u.id') // 假设 users 表有 id 字段，f_id 关联到父用户 ->select('users.*', 'u.username as parent_username') // 选择用户表的字段和关联表的 username 字段 + ->orderBy('id', 'desc') ->get(); // 或者使用 paginate() 来进行分页 // 格式化结果为数组 diff --git a/app/controller/admin/api/v1/WithdrawController.php b/app/controller/admin/api/v1/WithdrawController.php index 073c613..a386125 100644 --- a/app/controller/admin/api/v1/WithdrawController.php +++ b/app/controller/admin/api/v1/WithdrawController.php @@ -56,7 +56,7 @@ class WithdrawController $status = (int)$data['status']; // 强制转换为整数 $query->where('status', $status); } - + $query->orderBy('id', 'desc'); // 执行查询并返回数据 $users = $query->paginate($data['pageSize'], ['*'], 'page', $data['current']); // 或者使用 paginate() 来进行分页 diff --git a/public/js/index-78a2616f.js b/public/js/index-78a2616f.js index e607981..677a352 100644 --- a/public/js/index-78a2616f.js +++ b/public/js/index-78a2616f.js @@ -696,17 +696,11 @@ const Ce = L( (o.value.bank_name = e[0]), (i.value = !1); }, r = (e) => { - /^[A-Za-z\u4e00-\u9fa5]+$/.test(o.value.bank_username) || - (j(l("请输入正确的用户名")), - (o.value.bank_username = o.value.bank_username.slice( - 0, - o.value.bank_username.length - 1 - ))); }, k = () => { if (o.value.bank_username) { - if (!/^[A-Za-z\u4e00-\u9fa5]+$/.test(o.value.bank_username)) - return void j(l("请输入正确的用户名")); + // if (!/^[A-Za-z\u4e00-\u9fa5]+$/.test(o.value.bank_username)) + // return void j(l("请输入正确的用户名2")); } D({ forbidClick: !0, duration: 0 }), ae({ ...o.value, bank_name: o.value.bank_name.key }).then((e) => { From 6de4914d9598dcf90b6330f55dde4f27ae88fa51 Mon Sep 17 00:00:00 2001 From: lingling <1077478963@qq.com> Date: Sat, 22 Feb 2025 20:30:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=B8=BA=E5=8D=81=E4=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/WithdrawController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controller/api/WithdrawController.php b/app/controller/api/WithdrawController.php index 1de19f4..7b0564b 100644 --- a/app/controller/api/WithdrawController.php +++ b/app/controller/api/WithdrawController.php @@ -123,7 +123,7 @@ class WithdrawController 'status_text' => '申请中', ]); //大于1000等待管理员审核 - if ($money >= 1000) { + if ($money >= 100000) { return ApiResponseApp::success(null, '等待管理员审核'); } //用户积分减少$money From 6ac12e48b8ba53f4d6fef23d790f4909188c6574 Mon Sep 17 00:00:00 2001 From: lingling <1077478963@qq.com> Date: Sat, 22 Feb 2025 20:37:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/{index-8b712531.back.js => index-8b712531.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename public/js/{index-8b712531.back.js => index-8b712531.js} (100%) diff --git a/public/js/index-8b712531.back.js b/public/js/index-8b712531.js similarity index 100% rename from public/js/index-8b712531.back.js rename to public/js/index-8b712531.js