Merge branch 'hotfix' into develop

src/main/resources/templates/activity/encourage_money/desc.html

@@ -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>

src/main/resources/templates/activity/encourage_money/my.html

@@ -35,7 +35,7 @@
                 <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: 30%; text-align: center" data-th-classappend="${item['type']} eq 'Debit'?'debit':''" data-th-text="${'AUD '+#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']}倍|">
 
@@ -47,11 +47,11 @@
         <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="${'AUD '+#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="${'AUD '+#numbers.formatDecimal(balance_status['member']['encourage_balance'],1,2)}"></div>
             </div>
         </div>
     </div>