From 5227396484457d5200d2a90fc6afd0c478054f98 Mon Sep 17 00:00:00 2001 From: xiadc <251308692@qq.com> Date: Tue, 17 Jun 2025 11:19:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(sign):=20=E4=BC=98=E5=8C=96=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E9=A2=86=E5=88=B8=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加优惠券选择器功能 - 优化签到天数和概率输入范围 - 更新签到状态为禁用/启用选项 - 调整表单布局和样式 - 优化数据表格显示 --- .../admin/controller/shopro/Coupon.php | 4 +- .../admin/lang/zh-cn/zy/sign/sign_set.php | 18 +++-- .../admin/view/zy/sign/sign_set/add.html | 67 +++++++++---------- .../admin/view/zy/sign/sign_set/edit.html | 51 ++++++++------ public/assets/js/backend/zy/sign/sign_set.js | 22 +++--- runtime/.gitkeep | 0 6 files changed, 84 insertions(+), 78 deletions(-) mode change 100644 => 100755 runtime/.gitkeep diff --git a/application/admin/controller/shopro/Coupon.php b/application/admin/controller/shopro/Coupon.php index ee0b8f6..1c0ab15 100644 --- a/application/admin/controller/shopro/Coupon.php +++ b/application/admin/controller/shopro/Coupon.php @@ -36,7 +36,9 @@ class Coupon extends Common if (!$this->request->isAjax()) { return $this->view->fetch(); } - + if ($this->request->request('keyField')) { + return $this->selectpage(); + } $coupons = $this->model->sheepFilter()->paginate($this->request->param('list_rows', 10))->each(function ($coupon) { // 优惠券领取和使用数量 $coupon->get_num = $coupon->get_num; diff --git a/application/admin/lang/zh-cn/zy/sign/sign_set.php b/application/admin/lang/zh-cn/zy/sign/sign_set.php index 1f8cd4f..c3005e6 100644 --- a/application/admin/lang/zh-cn/zy/sign/sign_set.php +++ b/application/admin/lang/zh-cn/zy/sign/sign_set.php @@ -1,13 +1,17 @@ '连续天数', - 'Chance1' => '概率1', - 'Coupon1_id' => '券1', - 'Chance2' => '概率2', - 'Coupon2_id' => '券2', - 'Status' => '状态（0禁用,1启用）', + 'Last' => '连续签到(a)', + 'Chance1' => '概率(b)', + 'Coupon1_id' => '券(c)', + 'Chance2' => '概率(d)', + 'Coupon2_id' => '券(e)', + 'Status' => '状态', 'Create_time' => '创建时间', 'Update_time' => '修改时间', - 'Coupon.name' => '名称' + 'Coupon1.name' => '券(c)名称', + 'Coupon2.name' => '券(e)名称', + + 'Status0' => '禁用', + 'Status1' => '启用', ]; diff --git a/application/admin/view/zy/sign/sign_set/add.html b/application/admin/view/zy/sign/sign_set/add.html index f83a6d4..c0aca5e 100644 --- a/application/admin/view/zy/sign/sign_set/add.html +++ b/application/admin/view/zy/sign/sign_set/add.html @@ -1,57 +1,50 @@
- -
- + +
+
+
- -
- + +
+ +
+ +
+
+
- -
- + +
+ +
+ +
+
+
- -
- + +
+ {:build_radios('row[status]', ['0'=>__('Status0'), '1'=>__('Status1')],1)}
-
- -
- -
-
-
- -
- -
-
- +
- + \ No newline at end of file diff --git a/application/admin/view/zy/sign/sign_set/edit.html b/application/admin/view/zy/sign/sign_set/edit.html index 43b9306..1e549f2 100644 --- a/application/admin/view/zy/sign/sign_set/edit.html +++ b/application/admin/view/zy/sign/sign_set/edit.html @@ -1,41 +1,47 @@
- -
- + +
+
+
- -
- + +
+ +
+ +
+
+ +
- -
- -
-
-
- -
- -
-
-
- -
- + +
+ +
+ +
+
+
- + {:build_radios('row[status]', ['0'=>__('Status0'), '1'=>__('Status1')],$row.status)}
+
@@ -48,6 +54,7 @@
+
diff --git a/public/assets/js/backend/zy/sign/sign_set.js b/public/assets/js/backend/zy/sign/sign_set.js index 0a3bb44..dba9916 100644 --- a/public/assets/js/backend/zy/sign/sign_set.js +++ b/public/assets/js/backend/zy/sign/sign_set.js @@ -24,20 +24,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin sortName: 'id', columns: [ [ - {checkbox: true}, - {field: 'id', title: __('Id')}, - {field: 'last', title: __('Last')}, - {field: 'chance1', title: __('Chance1')}, - {field: 'coupon1.name', title: __('Coupon.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + { checkbox: true }, + { field: 'id', title: __('Id') }, + { field: 'last', title: __('Last') }, + { field: 'chance1', title: __('Chance1') }, + { field: 'coupon1.name', title: __('Coupon1.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content }, // {field: 'coupon1_id', title: __('Coupon1_id')}, - {field: 'chance2', title: __('Chance2')}, - {field: 'coupon2.name', title: __('Coupon.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + { field: 'chance2', title: __('Chance2') }, + { field: 'coupon2.name', title: __('Coupon2.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content }, // {field: 'coupon2_id', title: __('Coupon2_id')}, - {field: 'status', title: __('Status')}, - {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + { field: 'status', title: __('Status'), formatter: Table.api.formatter.label, searchList: { 0: __('Status0'), 1: __('Status1') } }, + { field: 'create_time', title: __('Create_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false }, + { field: 'update_time', title: __('Update_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false }, // {field: 'coupon.id', title: __('Coupon.id')}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + { field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate } ] ] }); diff --git a/runtime/.gitkeep b/runtime/.gitkeep old mode 100644 new mode 100755