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
f639ed0c
authored
Jan 18, 2022
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
过期会员是否可以购买
parent
8ec3ee29
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
8 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 @
f639ed0c
...
...
@@ -159,8 +159,8 @@
<@form.textInput path="dto.activityName" attributes="class=\"input-medium\"" label="活动名称" required = true />
<@form.textInput path="dto.communePrice" attributes="class=\"input-medium\"" label="社员价" required = true />
<@form.textInput path="dto.guestPrice" attributes="class=\"input-medium\"" label="嘉宾价" required = true />
<@form.textInput path="dto.grossPrice" attributes="class=\"input-medium\"" label="
真实
毛利" required = true />
<@form.textInput path="dto.realPrice" attributes="class=\"input-medium\"" label="
虚拟
毛利" required = true />
<@form.textInput path="dto.grossPrice" attributes="class=\"input-medium\"" label="
虚拟
毛利" required = true />
<@form.textInput path="dto.realPrice" attributes="class=\"input-medium\"" label="
真实
毛利" required = true />
<@form.textInput path="dto.buyLimitTimes" attributes="class=\"input-medium\"" label="限制购买数量" required = true />
<@form.textInput path="dto.voucherIds" attributes="class=\"input-medium\"" label="券ID拼接(英文逗号分割)" required = true />
<div class="long_content_div control-group" id="isSendRedPacketshow">
...
...
@@ -272,6 +272,23 @@
</div>
</div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">过期会员限制</label>
<div class="controls">
<#if dto.overdueCanBuy??>
<input style="margin-bottom: 5px;" type="radio" name="overdueCanBuy" value="1" <#if dto.overdueCanBuy == 1>checked</#if>>
<span style="padding-right: 20px;">不可购买</span>
<input style="margin-bottom: 5px;" type="radio" name="overdueCanBuy" value="2" <#if dto.overdueCanBuy == 2>checked</#if>>
<span style="padding-right: 20px;">可购买</span>
<#else>
<input style="margin-bottom: 5px;" type="radio" name="overdueCanBuy" value="1" checked>
<span style="padding-right: 20px;">不可购买</span>
<input style="margin-bottom: 5px;" type="radio" name="overdueCanBuy" value="2" >
<span style="padding-right: 20px;">可购买</span>
</#if>
</div>
</div>
</div>
</div>
...
...
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl
View file @
f639ed0c
...
...
@@ -7,7 +7,7 @@
<style>
.table th, .table td{ text-align:center;vertical-align:middle;}
.widthShow {
width: 1
10
0px;
width: 1
25
0px;
}
</style>
</#assign>
...
...
@@ -17,6 +17,7 @@
<@com.textInput "dto.activityName" "style=\"margin-left: 5px;\"" "活动名称"/>
<@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.overdueCanBuy" enums["com.ctrip.fun.common.vo.basic.OverdueCanBuyCodeEnum"] "" "过期会员限制"/>
<@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>
...
...
@@ -26,17 +27,18 @@
<tr>
<th style="width:5%">ID</th>
<th style="width:12%">活动名称</th>
<th style="width:
6
%">社员价</th>
<th style="width:
6
%">嘉宾价</th>
<th style="width:
5
%">社员价</th>
<th style="width:
5
%">嘉宾价</th>
<th style="width:7%">购买限制</th>
<th style="width:7%">区域限制</th>
<th style="width:7%">显示途径</th>
<th style="width:6%">卷类型</th>
<th style="width:7%">过期会员限制</th>
<th style="width:10%">活动开始时间</th>
<th style="width:10%">活动结束时间</th>
<th style="width:
9
%">限制购买次数</th>
<th style="width:
8
%">限制购买次数</th>
<th style="width:9%">创建日期</th>
<th style="width:
5
%">操作</th>
<th style="width:
6
%">操作</th>
<th style="width:10%">活动统计</th>
</tr>
</thead>
...
...
@@ -102,6 +104,16 @@
<#default>
未知
</#switch>
<#switch item.overdueCanBuy>
<#case 1>
<td>不可购买</td>
<#break>
<#case 2>
<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 @
f639ed0c
...
...
@@ -214,6 +214,16 @@
<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="overdueCanBuy" value="1" checked>
<span style="padding-right: 20px;">不可购买</span>
<input style="margin-bottom: 5px;" type="radio" name="overdueCanBuy" value="2">
<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 @
f639ed0c
...
...
@@ -533,7 +533,7 @@ $(function() {
<br/>
<label
style=
"font-size:16px;display:inline-block"
>
积分详情
</label>
<label
style=
"font-size:16px;display:inline-block"
>
个人总积分:${bean.currentIntegral}
</label>
<
a
id=
"add_integral"
class=
"btn "
href=
"javascript:;"
>
增加积分
</a>
<
#
--
<
a
id=
"add_integral"
class=
"btn "
href=
"javascript:;"
>
增加积分
</a>
-->
<a
id=
"minus_integral"
class=
"btn "
href=
"javascript:;"
>
抵扣积分
</a>
</div>
<
#
if
userMemberIntegralLogList
??
&&
(
userMemberIntegralLogList
?
size
)
gt
0
>
...
...
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