Merge branch 'hotfix' into develop

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

@@ -33,11 +33,11 @@
         </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-th-text="${item['date_str']}">
+                    <div class="date-box data-box-amount" style="width: 30%; text-align: center;" data-th-text="${item['date_str']}">
                     </div>
-                    <div class="count" 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="${#numbers.formatDecimal(item['amount'],1,2)}"></div>
 
-                        <div class="factor" data-th-if="${item['factor']}>1" data-th-text="|已翻${item['factor']}倍|">
+                        <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>
 

src/main/ui/static/templates/activity/encourage_money/my.css

@@ -204,3 +204,8 @@ div,span,a,img{
 .link-box a{
     color: #fff;
 }
+
+data-box-amount{
+    width: 30%;
+    text-align: center;
+}