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 @@