Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
35858e26
authored
Nov 28, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加卷类型
parent
6a407f23
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
4 deletions
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/form.ftl
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/view.ftl
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/form.ftl
View file @
35858e26
...
...
@@ -229,6 +229,24 @@
</div>
</div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">卷类型</label>
<div class="controls">
<#if dto.voucherType??>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="0" <#if dto.voucherType == 0>checked</#if>>
<span style="padding-right: 20px;">正常卷</span>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="1" <#if dto.voucherType == 1>checked</#if>>
<span style="padding-right: 20px;">体验卷</span>
<#else>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="0" checked>
<span style="padding-right: 20px;">正常卷</span>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="1" >
<span style="padding-right: 20px;">体验金</span>
</#if>
</div>
</div>
</div>
</div>
...
...
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl
View file @
35858e26
...
...
@@ -15,7 +15,8 @@
<form class="form-inline search-box widthShow" action="" method="get" autocomplete="off" >
<@com.textInput "dto.id" "style=\"margin-left: 5px;\"" "活动ID"/>
<@com.textInput "dto.activityName" "style=\"margin-left: 5px;\"" "活动名称"/>
<@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.textInputTwoDate "dto.createdTimeStart" "dto.createdTimeEnd" "style=\"margin-left: 5px;\"" "创建时间"/>
<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>
...
...
@@ -24,15 +25,16 @@
<thead>
<tr>
<th style="width:5%">ID</th>
<th style="width:1
8
%">活动名称</th>
<th style="width:1
2
%">活动名称</th>
<th style="width:6%">社员价</th>
<th style="width:6%">嘉宾价</th>
<th style="width:7%">购买限制</th>
<th style="width:7%">区域限制</th>
<th style="width:6%">卷类型</th>
<th style="width:10%">活动开始时间</th>
<th style="width:10%">活动结束时间</th>
<th style="width:9%">限制购买次数</th>
<th style="width:
10
%">创建日期</th>
<th style="width:
9
%">创建日期</th>
<th style="width:5%">操作</th>
<th style="width:10%">活动统计</th>
</tr>
...
...
@@ -73,6 +75,16 @@
<#default>
未知
</#switch>
<#switch item.voucherType>
<#case 0>
<td>正常卷</td>
<#break>
<#case 1>
<td>体验卷</td>
<#break>
<#default>
未知
</#switch>
<td>${item.activityStart?string("yyyy-MM-dd")}</td>
<td>${item.activityEnd?string("yyyy-MM-dd")}</td>
<td>${item.buyLimitTimes!}</td>
...
...
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/view.ftl
View file @
35858e26
...
...
@@ -192,7 +192,15 @@
<span style="padding-right: 20px;">全国</span>
</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="voucherType" value="0" checked>
<span style="padding-right: 20px;">正常卷</span>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="1">
<span style="padding-right: 20px;">体验卷</span>
</div>
</div>
<div class="long_content_div control-group ">
<input type="hidden" id="domain" value="${imageServer}">
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment