Skip to content

T
tl_estate
Commit a170fd25 authored by clone's avatar clone
Browse files
Options

Merge branch '0308-3.1.2' of https://gitee.com/zwyjjc/tl_estate into 0308-3.1.2

parents 2662808c fb735442
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 5 deletions
application/index/view/redEnvelope/cashAccountList.html
View file @ a170fd25
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="pull-right"> <div class="pull-right">
<ul class="bread_btn"> <ul class="bread_btn">
<li> <li>
<a href="#modal" data-toggle="modal" class="btn btn-info"><i class="icon-plus"></i>新增活动</a>
</li> </li>
</ul> </ul>
</div> </div>
......
application/index/view/redEnvelope/cashBackList.html
View file @ a170fd25
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="pull-right"> <div class="pull-right">
<ul class="bread_btn"> <ul class="bread_btn">
<li> <li>
<a href="#modal" data-toggle="modal" class="btn btn-info"><i class="icon-plus"></i>新增活动</a>
</li> </li>
</ul> </ul>
</div> </div>
......
application/index/view/redEnvelope/redEnvelopeList.html
View file @ a170fd25
{layout name="global/frame_two_tpl" /} {layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="redEnvelopeList" /> <input type="hidden" class="page-load" id="redEnvelopeList" />
<style> <style>
.input-width{
display: inline-block;
height: 34px;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857143;
color: #555;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.input-width-s{
width: 100px;
}
.input-width-m{
width: 180px;
}
.input-width-l{
width: 400px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -51,4 +76,75 @@ ...@@ -51,4 +76,75 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="modal-add" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" style="width: 800px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
新增奖励活动
</h4>
</div>
<div class="modal-body">
<form class="form-horizontal" id='form_reset'>
<div class="form-group">
<label class="col-sm-3 control-label">活动名称：</label>
<input type="text" value="" name="title" class="input-width-l input-width" placeholder="请输入">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">奖励类型：</label>
<input type="radio" name="user_status" value="1"><label class="control-label">返现红包</label>&nbsp;&nbsp;
<input type="radio" name="user_status" value="0"><label class="control-label">现金</label>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">金额：</label>
<input type="number" name="user_status" class="input-width-s input-width" value="0">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">奖励动作：</label>
<input type="radio" name="user_status" value="1"><label class="control-label">首次登陆</label>&nbsp;&nbsp;
<input type="radio" name="user_status" value="0"><label class="control-label">邀请登陆</label>&nbsp;&nbsp;
<input type="radio" name="user_status" value="0"><label class="control-label">邀请成交</label>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">活动有效期：</label>
<label class="control-label">创建时间:</label>
<input class="input-width-m input-width" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
<label class="control-label">—</label>
<input class="input-width-m input-width" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">奖励的有效期：</label>
<label>发放日后的</label><input type="number" name="user_status" value="0" class="input-width-s input-width"><label>天内有效</label>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">活动发放总次数：</label>
<input type="radio" name="user_status" value="1"><label class="control-label">不限</label>
<input type="radio" name="user_status" value="0"><label class="control-label">最多</label>
<input type="number" name="user_status" value="0" class="input-width-s input-width">个
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用户可得红包数：</label>
<input type="radio" name="user_status" value="1"><label class="control-label">不限</label>
<input type="radio" name="user_status" value="0"><label class="control-label">最多</label>
<input type="number" name="user_status" value="0" class="input-width-s input-width">个
</div>
<div class="form-group">
<label class="col-sm-3 control-label">活动规则：</label>
<textarea name="" rows="" cols="" style="height: 80px;width: 300px;border-radius: 6px;"></textarea>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_add">
提交
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
public/resource/js/redEnvelopeList.js
View file @ a170fd25
...@@ -52,7 +52,7 @@ define (['doT', 'text!temp/red_envelope_list_template_tpl.html', 'css!style/home ...@@ -52,7 +52,7 @@ define (['doT', 'text!temp/red_envelope_list_template_tpl.html', 'css!style/home
$ ("#picture_list").html (doTtmpl (data.data.list)); $ ("#picture_list").html (doTtmpl (data.data.list));
/*分页代码*/ /*分页代码*/
add_page(data.data.total,pageNo,picture.pageSize,picture.getList); add_page(data.data.total,pageNo,redEnvelope.pageSize,redEnvelope.getList);
$ ('.J_preview').preview (); $ ('.J_preview').preview ();
} }
}); });
......
public/resource/template/red_envelope_list_template_tpl.html
View file @ a170fd25
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<td>[%= it[item]['create_time'] %]</td> <td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['create_time'] %]</td> <td>[%= it[item]['create_time'] %]</td>
<td> <td>
<a class="btn1 btn-success is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-target="#modal-show">编辑</a> <a class="btn1 btn-success is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-add">编辑</a>
</td> </td>
</tr> </tr>
[% } %] [% } %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment