Merge remote-tracking branch 'origin/dev' into dev

master
zhengchanglong 5 years ago
commit e3315ca26e

@ -160,6 +160,13 @@ class GiftbagController extends ThinkController {
$model || $this->error('模型不存在!');
if(IS_POST){
if ($_POST['giftbag_version'] == '3') {
$_POST['start_time'] = time();
}
$Model = D(parse_name(get_table_name($model['id']),1));
// 获取模型的字段信息
@ -174,6 +181,11 @@ class GiftbagController extends ThinkController {
}
}
$data = $Model->create();
if ($_POST['giftbag_version'] == '3') {
$data['start_time'] = time();
}
if($data){
$data['novice'] = str_replace(array("\r\n", "\r", "\n"), ",", $_POST['novice']);
$data['novice_num'] = count(explode(',',$data['novice']));

@ -77,7 +77,7 @@
<span class="form_radio">
<gt name="key" value="0">
<label id="type0">
<input type="radio" class="inp_radio js-typeradio" value="0" name="giftbag_version" > <span class="type{$key}">全部</span>
<input type="radio" class="inp_radio js-typeradio" value="0" name="giftbag_version" > <span class="type0">全部</span>
</label>
</gt>
<volist name=":get_systems_list()" id="vo">
@ -88,7 +88,7 @@
</gt>
</volist>
<label id="type3">
<input type="radio" class="inp_radio js-typeradio" value="3" name="giftbag_version" > <span class="type{$key}">超级签</span>
<input type="radio" class="inp_radio js-typeradio" value="3" name="giftbag_version" > <span class="type3">超级签</span>
</label>
</span>

@ -76,38 +76,48 @@
<td class="l">运营平台</td>
<td class="r table_radio">
<span class="form_radio">
<label id="type0">
<input type="radio" class="inp_radio js-typeradio" value="0" name="giftbag_version" disabled="true"> <span class="type0">全部</span>
</label>
<volist name=":get_systems_list()" id="vo">
<gt name="key" value="0">
<label id="type{$key}">
<input type="radio" class="inp_radio js-typeradio" value="{$key}" name="giftbag_version" disabled="true" > <span class="type{$key}">{$vo}</span>
</label>
</gt>
</volist></span>
</volist>
<label id="type3">
<input type="radio" class="inp_radio js-typeradio" value="3" name="giftbag_version" disabled="true"> <span class="type3" >超级签</span>
</label>
</span>
<input type="hidden" id="giftbag_version" name="giftbag_version" value="{$data.giftbag_version}">
</td>
</tr>
<tr>
<td class="l">礼包状态:</td>
<td class="r table_radio">
<span class="form_radio">
<if condition="$data['status'] eq 1">
<label>
<input type="radio" value="1" name="status" checked="checked"> 开启
</label>
<label>
<input type="radio" value="0" name="status" " > 关闭
</label>
<else/>
<if condition="$data.giftbag_version neq 3">
<tr>
<td class="l">礼包状态:</td>
<td class="r table_radio">
<span class="form_radio">
<if condition="$data['status'] eq 1">
<label>
<input type="radio" value="1" name="status" checked="checked"> 开启
</label>
<label>
<input type="radio" value="0" name="status" " > 关闭
</label>
<else/>
<label>
<input type="radio" value="1" name="status" "> 开启
</label>
<label>
<input type="radio" value="1" name="status" "> 开启
</label>
<label>
<input type="radio" value="0" name="status" checked="checked" > 关闭
</label>
</if>
</span>
</td>
</tr>
<input type="radio" value="0" name="status" checked="checked" > 关闭
</label>
</if>
</span>
</td>
</tr>
</if>
<if condition="$data.giftbag_version neq 3">
<tr>
<td class="l">礼包类型:</td>
<td class="r table_radio">
@ -126,12 +136,14 @@
</label></span>
</td>
</tr>
</if>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>礼包名称:</td>
<td class="r" >
<input type="text" class="txt " name="giftbag_name" value="{$data['giftbag_name']}" placeholder=" 输入区服名称">
</td>
</tr>
<if condition="$data.giftbag_version neq 3">
<tr>
<td class="l">礼包区服:</td>
<td class="r">
@ -141,6 +153,8 @@
<input type="hidden" id="server_name" name="server_name" value=""></input>
</td>
</tr>
</if>
<if condition="$data.giftbag_version neq 3">
<tr>
<td class="l">有效周期:</td>
<td class="r table_time">
@ -148,6 +162,7 @@
<input type="text" class="txtt time" name="end_time" <if condition="$data.end_time neq ''"> value="{:set_show_time($data['end_time'],'time','other')}" </if> placeholder="输入结束时间 不填表示 永久">
</td>
</tr>
</if>
<tr>
<td class="l">激活码:</td>
<td class="r">

@ -144,7 +144,7 @@
<td ><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
<td>{$data.game_name}</td>
<td>{$data.giftbag_name}</td>
<td >{:get_systems_name($data['giftbag_version'])}</td>
<td >{:get_systems_name($data['giftbag_version'])}<if condition="$data.giftbag_version eq 3">超级签<elseif condition="$data.giftbag_version eq 0"/>全部</if></td>
<td>{$data['novice_num']}</td>
<td>{$data['novice']}</td>
<td>

Loading…
Cancel
Save