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
f8e8bac3
authored
Nov 06, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员专享分区
parent
3551f304
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 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/system/UserInfoDetail.ftl
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/form.ftl
View file @
f8e8bac3
...
...
@@ -204,7 +204,31 @@
</#if>
</div>
</div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">区域限制</label>
<div class="controls">
<#if dto.regionCode??>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="100" <#if dto.regionCode == "100">checked</#if>>
<span style="padding-right: 20px;">上海</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="110" <#if dto.regionCode == "110">checked</#if>>
<span style="padding-right: 20px;">广州</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="120" <#if dto.regionCode == "120">checked</#if>>
<span style="padding-right: 20px;">北京</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="0" <#if dto.regionCode == "0">checked</#if>>
<span style="padding-right: 20px;">不限</span>
<#else>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="100" checked>
<span style="padding-right: 20px;">上海</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="110" >
<span style="padding-right: 20px;">广州</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="120" >
<span style="padding-right: 20px;">北京</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="0" >
<span style="padding-right: 20px;">不限</span>
</#if>
</div>
</div>
</div>
</div>
...
...
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl
View file @
f8e8bac3
...
...
@@ -14,7 +14,8 @@
<@com.layout title="查询现金券规则" module="marketing" current="buyVoucherActivity_list" pageCss=pageCssContent pageJs=pageJsContent>
<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.textInput "dto.activityName" "style=\"margin-left: 5px;\"" "活动名称"/>
<@com.singleSelectQuery "dto.regionCode" enums["com.ctrip.fun.common.vo.basic.VoucherRegionCodeEnum"] "" "限制类型"/>
<@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>
...
...
@@ -27,6 +28,7 @@
<th style="width:6%">社员价</th>
<th style="width:6%">嘉宾价</th>
<th style="width:7%">购买限制</th>
<th style="width:7%">区域限制</th>
<th style="width:10%">活动开始时间</th>
<th style="width:10%">活动结束时间</th>
<th style="width:9%">限制购买次数</th>
...
...
@@ -55,6 +57,22 @@
<#default>
未知
</#switch>
<#switch item.regionCode>
<#case "100">
<td>上海</td>
<#break>
<#case "110">
<td>广州</td>
<#break>
<#case "120">
<td>北京</td>
<#break>
<#case "0">
<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 @
f8e8bac3
...
...
@@ -168,7 +168,6 @@
<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">
...
...
@@ -179,6 +178,21 @@
</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="regionCode" value="100" >
<span style="padding-right: 20px;">上海</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="110">
<span style="padding-right: 20px;">广州</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="120">
<span style="padding-right: 20px;">北京</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="0" checked>
<span style="padding-right: 20px;">不限</span>
</div>
</div>
<div class="long_content_div control-group ">
<input type="hidden" id="domain" value="${imageServer}">
...
...
src/main/webapp/WEB-INF/templates/system/UserInfoDetail.ftl
View file @
f8e8bac3
...
...
@@ -645,7 +645,7 @@ $(function() {
<
#
if
vourcher
.
ruleId
??
>
<button
type=
"button"
class=
"btn-warning view-voucher"
data-ruleid=
"${vourcher.ruleId}"
>
规则
</button>
</
#
if>
<
#
if
"${
Session
['
SPRING_SECURITY_CONTEXT
'].
authentication
.
name
}"
==
"
fuhaoy
"
||
"${
Session
['
SPRING_SECURITY_CONTEXT
'].
authentication
.
name
}"
==
"
kyu
"
>
<
#
if
"${
Session
['
SPRING_SECURITY_CONTEXT
'].
authentication
.
name
}"
==
"
fuhaoy
"
||
"${
Session
['
SPRING_SECURITY_CONTEXT
'].
authentication
.
name
}"
==
"
kyu
"
||
"${
Session
['
SPRING_SECURITY_CONTEXT
'].
authentication
.
name
}"
==
"
bowu
"
>
<button
type=
"button"
class=
"btn-danger delete-voucher"
>
删除
</button>
</
#
if>
</form>
...
...
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