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
a373361b
authored
Aug 15, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.9' of 192.168.10.6:caosy/fun-admin into f-6.6.9
parents
636ecebe
adc12b38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaysuccess.ftl
src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl
View file @
a373361b
...
...
@@ -479,6 +479,16 @@ function getResourceList(page){
</td>
</tr>
<tr>
<td style="text-align:left">可分享</td>
<td style="text-align:left">
<#if dto.shared == 1>
是
<#elseif dto.shared == 0>
否
</#if>
</td>
</tr>
<tr>
<#if dto.sendToUserType == 1>
<td style="text-align:left">发放用户类型</td>
<td style="text-align:left">${dto.sendToUserValueMsg!}</td>
...
...
src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaysuccess.ftl
View file @
a373361b
...
...
@@ -11,6 +11,9 @@
<th>实付金额</th>
<th>状态</th>
<th>推荐码</th>
<th>下单渠道</th>
<th>推荐人</th>
<th>推荐人UID</th>
<th>接管人</th>
</tr>
...
...
@@ -24,6 +27,13 @@
<td>${item.totalAmount!}</td>
<td>${item.orderStatusString!}</td>
<td>${item.recommendCode!}</td>
<#if item.platform =='MP'>
<td>小程序</td>
<#else>
<td>${item.platform!}</td>
</#if>
<td>${item.recommendName!}</td>
<td>${item.recommendUid!}</td>
<td>${item.receiver!}</td>
</tr>
</#list>
...
...
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