From d9527778739514433fd6bf6b3f69b503593a9ead Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 16 Jul 2018 19:13:18 +0800
Subject: [PATCH 1/2] update

---
 .../resources/templates/activity/encourage_money/desc.html  | 2 +-
 .../resources/templates/activity/encourage_money/my.html    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/activity/encourage_money/desc.html b/src/main/resources/templates/activity/encourage_money/desc.html
index e682e8830..595bfe20e 100644
--- a/src/main/resources/templates/activity/encourage_money/desc.html
+++ b/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>
diff --git a/src/main/resources/templates/activity/encourage_money/my.html b/src/main/resources/templates/activity/encourage_money/my.html
index 88794911e..554b883d6 100644
--- a/src/main/resources/templates/activity/encourage_money/my.html
+++ b/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>

From 3e2a90f4c698a053f82700f906cc274b21555653 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 16 Jul 2018 21:05:56 +0800
Subject: [PATCH 2/2] update

---
 .../templates/activity/encourage_money/my.html | 18 +++++++++---------
 .../templates/activity/encourage_money/my.css  |  3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/templates/activity/encourage_money/my.html b/src/main/resources/templates/activity/encourage_money/my.html
index 554b883d6..a5b4f9cf4 100644
--- a/src/main/resources/templates/activity/encourage_money/my.html
+++ b/src/main/resources/templates/activity/encourage_money/my.html
@@ -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="${'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']}倍|">
+            <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="${'AUD '+#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="${'AUD '+#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>
diff --git a/src/main/ui/static/templates/activity/encourage_money/my.css b/src/main/ui/static/templates/activity/encourage_money/my.css
index 3549ad19f..26ea48c06 100644
--- a/src/main/ui/static/templates/activity/encourage_money/my.css
+++ b/src/main/ui/static/templates/activity/encourage_money/my.css
@@ -209,3 +209,6 @@ data-box-amount{
     width: 30%;
     text-align: center;
 }
+.used{
+    text-decoration: line-through;
+}