xdc/fast
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(sign): 优化签到领券设置功能

Browse Source 
- 添加优惠券选择器功能
- 优化签到天数和概率输入范围
- 更新签到状态为禁用/启用选项
- 调整表单布局和样式
- 优化数据表格显示
This commit is contained in:
夏大川
2025-06-17 11:19:12 +08:00
parent 9ba854cc76
commit 5227396484
6 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/shopro/Coupon.php
View File

@@ -36,7 +36,9 @@ class Coupon extends Common
if (!$this->request->isAjax()) { if (!$this->request->isAjax()) {
return $this->view->fetch(); 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) { $coupons = $this->model->sheepFilter()->paginate($this->request->param('list_rows', 10))->each(function ($coupon) {
// 优惠券领取和使用数量 // 优惠券领取和使用数量
$coupon->get_num = $coupon->get_num; $coupon->get_num = $coupon->get_num;

18
application/admin/lang/zh-cn/zy/sign/sign_set.php
View File

@@ -1,13 +1,17 @@
<?php <?php
return [ return [
'Last' => '连续天数', 'Last' => '连续签到(a)',
'Chance1' => '概率1', 'Chance1' => '概率(b)',
'Coupon1_id' => '券1', 'Coupon1_id' => '券(c)',
'Chance2' => '概率2', 'Chance2' => '概率(d)',
'Coupon2_id' => '券2', 'Coupon2_id' => '券(e)',
'Status' => '状态（0禁用,1启用）', 'Status' => '状态',
'Create_time' => '创建时间', 'Create_time' => '创建时间',
'Update_time' => '修改时间', 'Update_time' => '修改时间',
'Coupon.name' => '名称' 'Coupon1.name' => '券(c)名称',
'Coupon2.name' => '券(e)名称',
'Status0' => '禁用',
'Status1' => '启用',
]; ];

65
application/admin/view/zy/sign/sign_set/add.html
View File

@@ -1,53 +1,46 @@
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Last')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Last')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-10 col-sm-8">
<input id="c-last" data-rule="required" class="form-control" name="row[last]" type="number" value="1"> <input id="c-last" data-rule="required" class="form-control" name="row[last]" type="number" value="1"
min="1" max="100">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Chance1')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Chance1')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-2 col-sm-2">
<input id="c-chance1" data-rule="required" class="form-control" name="row[chance1]" type="number" value="0"> <input id="c-chance1" data-rule="required" class="form-control" name="row[chance1]" type="number" value="0"
min="0" max="100">
</div>
<label class="control-label col-xs-2 col-sm-1">{:__('Coupon1_id')}:</label>
<div class="col-xs-6 col-sm-5">
<input id="c-coupon1_id" data-rule="required" data-source="shopro/coupon/index"
class="form-control selectpage" name="row[coupon1_id]" type="text" value="">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Coupon1_id')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Chance2')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-2 col-sm-2">
<input id="c-coupon1_id" data-rule="required" data-source="shopro/coupon/index" class="form-control selectpage" name="row[coupon1_id]" type="text" value=""> <input id="c-chance2" data-rule="required" class="form-control" name="row[chance2]" type="number" value="0"
min="0" max="100">
</div>
<label class="control-label col-xs-2 col-sm-1">{:__('Coupon2_id')}:</label>
<div class="col-xs-6 col-sm-5">
<input id="c-coupon2_id" data-rule="required" data-source="shopro/coupon/index"
class="form-control selectpage" name="row[coupon2_id]" type="text" value="">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Chance2')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-10 col-sm-8">
<input id="c-chance2" data-rule="required" class="form-control" name="row[chance2]" type="number" value="0"> {:build_radios('row[status]', ['0'=>__('Status0'), '1'=>__('Status1')],1)}
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Coupon2_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-coupon2_id" data-rule="required" data-source="shopro/coupon/index" class="form-control selectpage" name="row[coupon2_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="0">
</div>
</div>
<!-- <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
</div>
</div> -->
<div class="form-group layer-footer"> <div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label> <label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">

51
application/admin/view/zy/sign/sign_set/edit.html
View File

@@ -1,41 +1,47 @@
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Last')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Last')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-10 col-sm-8">
<input id="c-last" data-rule="required" class="form-control" name="row[last]" type="number" value="{$row.last|htmlentities}"> <input id="c-last" data-rule="required" class="form-control" name="row[last]" type="number" value="{$row.last|htmlentities}"
min="1" max="100">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Chance1')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Chance1')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-2 col-sm-2">
<input id="c-chance1" data-rule="required" class="form-control" name="row[chance1]" type="number" value="{$row.chance1|htmlentities}"> <input id="c-chance1" data-rule="required" class="form-control" name="row[chance1]" type="number" value="{$row.chance1|htmlentities}"
min="0" max="100">
</div>
<label class="control-label col-xs-2 col-sm-1">{:__('Coupon1_id')}:</label>
<div class="col-xs-6 col-sm-5">
<input id="c-coupon1_id" data-rule="required" data-source="shopro/coupon/index"
class="form-control selectpage" name="row[coupon1_id]" type="text" value="{$row.coupon1_id|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Coupon1_id')}:</label> <label class="control-label col-xs-2 col-sm-2">{:__('Chance2')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-2 col-sm-2">
<input id="c-coupon1_id" data-rule="required" data-source="shopro/coupon/index" class="form-control selectpage" name="row[coupon1_id]" type="text" value="{$row.coupon1_id|htmlentities}"> <input id="c-chance2" data-rule="required" class="form-control" name="row[chance2]" type="number" value="{$row.chance2|htmlentities}"
</div> min="0" max="100">
</div> </div>
<div class="form-group"> <label class="control-label col-xs-2 col-sm-1">{:__('Coupon2_id')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Chance2')}:</label> <div class="col-xs-6 col-sm-5">
<div class="col-xs-12 col-sm-8"> <input id="c-coupon2_id" data-rule="required" data-source="shopro/coupon/index"
<input id="c-chance2" data-rule="required" class="form-control" name="row[chance2]" type="number" value="{$row.chance2|htmlentities}"> class="form-control selectpage" name="row[coupon2_id]" type="text" value="{$row.coupon2_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Coupon2_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-coupon2_id" data-rule="required" data-source="shopro/coupon/index" class="form-control selectpage" name="row[coupon2_id]" type="text" value="{$row.coupon2_id|htmlentities}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}"> {:build_radios('row[status]', ['0'=>__('Status0'), '1'=>__('Status1')],$row.status)}
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@@ -48,6 +54,7 @@
<input id="c-update_time" readonly class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{$row.update_time}"> <input id="c-update_time" readonly class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{$row.update_time}">
</div> </div>
</div> </div>
<div class="form-group layer-footer"> <div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label> <label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">

22
public/assets/js/backend/zy/sign/sign_set.js
View File

@@ -24,20 +24,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id', sortName: 'id',
columns: [ columns: [
[ [
{checkbox: true}, { checkbox: true },
{field: 'id', title: __('Id')}, { field: 'id', title: __('Id') },
{field: 'last', title: __('Last')}, { field: 'last', title: __('Last') },
{field: 'chance1', title: __('Chance1')}, { field: 'chance1', title: __('Chance1') },
{field: 'coupon1.name', title: __('Coupon.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, { field: 'coupon1.name', title: __('Coupon1.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content },
// {field: 'coupon1_id', title: __('Coupon1_id')}, // {field: 'coupon1_id', title: __('Coupon1_id')},
{field: 'chance2', title: __('Chance2')}, { field: 'chance2', title: __('Chance2') },
{field: 'coupon2.name', title: __('Coupon.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, { field: 'coupon2.name', title: __('Coupon2.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content },
// {field: 'coupon2_id', title: __('Coupon2_id')}, // {field: 'coupon2_id', title: __('Coupon2_id')},
{field: 'status', title: __('Status')}, { 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: 'create_time', title: __('Create_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false },
{field: 'update_time', title: __('Update_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: '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 }
] ]
] ]
}); });

0
runtime/.gitkeep Normal file → Executable file
View File