Skip to content

caosy / fun-admin

Go to a project
Commit 0ec13a5c by caosy
Options

买劵活动分类

parent f639ed0c
Inline Side-by-side
Showing with 47 additions and 1 deletions
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/form.ftl
...@@ -288,6 +288,26 @@ ...@@ -288,6 +288,26 @@
</#if> </#if>
</div> </div>
</div> </div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">买劵活动类型</label>
<div class="controls">
<#if dto.activityType??>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="1" <#if dto.activityType == 1>checked</#if>>
<span style="padding-right: 20px;">套票</span>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="2" <#if dto.activityType == 2>checked</#if>>
<span style="padding-right: 20px;">培训产品</span>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="3" <#if dto.activityType == 3>checked</#if>>
<span style="padding-right: 20px;">超级会员</span>
<#else>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="1" checked>
<span style="padding-right: 20px;">套票</span>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="2" >
<span style="padding-right: 20px;">培训产品</span>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="3" >
<span style="padding-right: 20px;">超级会员</span>
</#if>
</div>
</div>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<style> <style>
.table th, .table td{ text-align:center;vertical-align:middle;} .table th, .table td{ text-align:center;vertical-align:middle;}
.widthShow { .widthShow {
width: 1250px; width: 1350px;
} }
</style> </style>
</#assign> </#assign>
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<@com.singleSelectQuery "dto.regionCode" enums["com.ctrip.fun.common.vo.basic.VoucherRegionCodeEnum"] "" "区域类型"/> <@com.singleSelectQuery "dto.regionCode" enums["com.ctrip.fun.common.vo.basic.VoucherRegionCodeEnum"] "" "区域类型"/>
<@com.singleSelectQuery "dto.voucherType" enums["com.ctrip.fun.common.vo.basic.VoucherTypeCodeEnum"] "" "劵类型"/> <@com.singleSelectQuery "dto.voucherType" enums["com.ctrip.fun.common.vo.basic.VoucherTypeCodeEnum"] "" "劵类型"/>
<@com.singleSelectQuery "dto.overdueCanBuy" enums["com.ctrip.fun.common.vo.basic.OverdueCanBuyCodeEnum"] "" "过期会员限制"/> <@com.singleSelectQuery "dto.overdueCanBuy" enums["com.ctrip.fun.common.vo.basic.OverdueCanBuyCodeEnum"] "" "过期会员限制"/>
<@com.singleSelectQuery "dto.activityType" enums["com.ctrip.fun.common.vo.basic.ActivityTypeCodeEnum"] "" "买劵活动类型"/>
<@com.textInputTwoDate "dto.createdTimeStart" "dto.createdTimeEnd" "style=\"margin-left: 5px;\"" "创建时间"/> <@com.textInputTwoDate "dto.createdTimeStart" "dto.createdTimeEnd" "style=\"margin-left: 5px;\"" "创建时间"/>
<button type="submit" class="btn btn-primary">查询</button> <button type="submit" class="btn btn-primary">查询</button>
<button type="button" class="btn btn-success" onclick="javascript:location.href='/buyVoucherActivity/queryList';" style="margin-left:20px;">重置</button> <button type="button" class="btn btn-success" onclick="javascript:location.href='/buyVoucherActivity/queryList';" style="margin-left:20px;">重置</button>
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
<th style="width:7%">显示途径</th> <th style="width:7%">显示途径</th>
<th style="width:6%">卷类型</th> <th style="width:6%">卷类型</th>
<th style="width:7%">过期会员限制</th> <th style="width:7%">过期会员限制</th>
<th style="width:7%">买劵活动类型</th>
<th style="width:10%">活动开始时间</th> <th style="width:10%">活动开始时间</th>
<th style="width:10%">活动结束时间</th> <th style="width:10%">活动结束时间</th>
<th style="width:8%">限制购买次数</th> <th style="width:8%">限制购买次数</th>
...@@ -114,6 +116,19 @@ ...@@ -114,6 +116,19 @@
<#default> <#default>
未知 未知
</#switch> </#switch>
<#switch item.activityType>
<#case 1>
<td>套票</td>
<#break>
<#case 2>
<td>培训产品</td>
<#break>
<#case 3>
<td>超级会员</td>
<#break>
<#default>
未知
</#switch>
<td>${item.activityStart?string("yyyy-MM-dd")}</td> <td>${item.activityStart?string("yyyy-MM-dd")}</td>
<td>${item.activityEnd?string("yyyy-MM-dd")}</td> <td>${item.activityEnd?string("yyyy-MM-dd")}</td>
<td>${item.buyLimitTimes!}</td> <td>${item.buyLimitTimes!}</td>
......
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/view.ftl
...@@ -224,6 +224,17 @@ ...@@ -224,6 +224,17 @@
<span style="padding-right: 20px;">可购买</span> <span style="padding-right: 20px;">可购买</span>
</div> </div>
</div> </div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">买劵活动类型</label>
<div class="controls">
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="1" checked>
<span style="padding-right: 20px;">套票</span>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="2">
<span style="padding-right: 20px;">培训产品</span>
<input style="margin-bottom: 5px;" type="radio" name="activityType" value="3" >
<span style="padding-right: 20px;">超级会员</span>
</div>
</div>
<div class="long_content_div control-group "> <div class="long_content_div control-group ">
<input type="hidden" id="domain" value="${imageServer}"> <input type="hidden" id="domain" value="${imageServer}">
......
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 sign in to comment