msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
master
kira 6 years ago
parent f3e074bb6b 3e2a90f4c6
commit caef37d544
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
src/main/resources/templates/activity/encourage_money/desc.html
Unescape View File

@ -32,7 +32,7 @@
<img src="/static/templates/activity/encourage_money/title-icon.png" class="title-icon title-icon-right">
</div>
<div class="content">
用户在支持微信支付的商户进行消费，金额<span class="notice">≥10澳币</span>时，
用户在支持RoyalPay的商户使用微信、支付宝进行消费，金额<span class="notice">≥10澳币</span>时，
立即获得随机鼓励金。最高可达888元，每人每天可领取<span class="notice">三次</span>。
</div>
</div>

18
src/main/resources/templates/activity/encourage_money/my.html
Unescape View File

@ -32,26 +32,26 @@
</div>
<div class="balance-log-container" data-th-if="${balance_status['logs']}">
<div class="item" data-th-each="item : ${balance_status['logs']}" data-th-classappend="${item['is_today']}?'today':''" >
<div class="date-box data-box-amount" style="width: 30%; text-align: center;" data-th-text="${item['date_str']}">
</div>
<div class="date-box data-box-amount" style="width: 30%; text-align: center" data-th-classappend="${item['type']} eq 'Debit'?'debit':''" data-th-text="${#numbers.formatDecimal(item['amount'],1,2)}"></div>
<div class="date-box data-box-amount" style="width: 40%; text-align: center;font-size: 14px" data-th-if="${item['factor']}>1" data-th-text="|已翻${item['factor']}倍|">
<div class="item" data-th-each="item : ${balance_status['logs']}" data-th-classappend="${item['is_today']}?'today':''" >
<div class="date-box data-box-amount" style="width: 30%; text-align: center;" data-th-text="${item['date_str']}">
</div>
<div class="date-box data-box-amount" style="width: 30%; text-align: center" data-th-classappend="${item['type']} eq 'Debit'?'used':''" data-th-text="${'$'+#numbers.formatDecimal(item['amount'],1,2)}"></div>
</div>
<div class="date-box data-box-amount" style="width: 40%; text-align: center;font-size: 14px" data-th-if="${item['factor']}>1" data-th-text="|已翻${item['factor']}倍|">
</div>
</div>
</div>
<div class="balance-footer">
<div class="row">
<div class="label">已用鼓励金：</div>
<div class="count" data-th-text="${#numbers.formatDecimal(balance_status['member']['used_amount'],1,2)}"></div>
<div class="count" data-th-text="${'$'+#numbers.formatDecimal(balance_status['member']['used_amount'],1,2)}"></div>
</div>
<div class="row">
<div class="label">当前鼓励金余额：</div>
<div class="count available" data-th-text="${#numbers.formatDecimal(balance_status['member']['encourage_balance'],1,2)}"></div>
<div class="count available" data-th-text="${'$'+#numbers.formatDecimal(balance_status['member']['encourage_balance'],1,2)}"></div>
</div>
</div>
</div>

3
src/main/ui/static/templates/activity/encourage_money/my.css
Unescape View File

@ -209,3 +209,6 @@ data-box-amount{
width: 30%;
text-align: center;
}
.used{
text-decoration: line-through;
}

Write Preview
Loading…
Cancel
Save