From a10d9ce7652c5cadcf3e867403d04baaa44158d4 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 10:50:48 +0800
Subject: [PATCH 1/3] [fix]

---
 src/main/ui/annual_bill.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index f9c775ac4..86141597d 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -754,14 +754,6 @@
             <div class="slide2-wish-text" style="text-align: center; margin-top: 40px;">
                 RoyalPay作为一家无缝对接中国消费者与澳洲商家的Fintech企业,致力于提供更安全便捷的支付体验, 助力全球跨境支付业务蓬勃发展。感谢您的加入,让我们离智慧生活的新时代又近了一步！
             </div>
-
-
-            <!-- <div class="bottom">
-                <div class="bottom-text2">滑动查看2019账单</div>
-                <div class="bottom-img">
-                    <img src="static/images/annualBill/up@2x.png" onclick="slideNextPage()">
-                </div>
-            </div> -->
         </div>
     </div>
 

From 4328c7ef5f731887424286f7b4077eb19275fa4b Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Mon, 21 Jan 2019 15:08:03 +0800
Subject: [PATCH 2/3] [fix]

---
 src/main/ui/annual_bill.html | 261 ++++++++++++++++++-----------------
 1 file changed, 137 insertions(+), 124 deletions(-)

diff --git a/src/main/ui/annual_bill.html b/src/main/ui/annual_bill.html
index 86141597d..026901e6a 100644
--- a/src/main/ui/annual_bill.html
+++ b/src/main/ui/annual_bill.html
@@ -133,16 +133,26 @@
             <div style="height: 2.5rem;"></div>
 
             <ul class="slide2-data" style="margin-left: 50px; margin-right: 30px;">
-                <li>2018年通过RoyalPay完成无卡支付的用户</li>
-                <li id="payedUsersNum">819,677</li>
+                <li>2018年通过RoyalPay完成线上&线下的用户达</li>
+                <li>
+                    <!--819,677-->
+                    <span id="payedUsersNum">300</span>
+                    <span>万人</span>
+                </li>
                 <li>较去年增长</li>
                 <li>
-                    <span id="payedUsersGrowNum">142</span>
+                    <!--<span id="payedUsersGrowNum">-->
+                        <!--&lt;!&ndash;142&ndash;&gt;-->
+                        <!--321.53-->
+                    <!--</span>-->
+                    321.53
                     <span>%</span>
                 </li>
-                <li>平均每天达</li>
+                <li>平均每天超</li>
                 <li style="position: relative;">
-                    <span id="dailyPayedUsersNum">2,245</span>
+                    <span id="dailyPayedUsersNum">
+                        8,219
+                    </span>
                     <span>人</span>
                     <div style="position: absolute; width: 9rem; left: 40%; bottom: -2rem">
                         <img src="static/images/annualBill/shanghuzengz@2x.png">
@@ -176,8 +186,11 @@
             <ul class="slide2-data" style="padding-left: 45%; padding-right: 30px; padding-top: 3rem; padding-bottom: 4rem; background-image: url('static/images/annualBill/money@2x.png'); background-repeat: no-repeat; background-size: 45%; position: relative;">
                 <li>2018年每月流水超</li>
                 <li>
-                    <span>$</span>
-                    <span id="transactionAmount">71,588,990</span>
+                    <span id="transactionAmount">
+                        <!--71,588,990-->
+                        81,588,990
+                    </span>
+                    <span> AUD</span>
                 </li>
                 <li>平均每一分钟就有超过</li>
                 <li>
@@ -449,7 +462,7 @@
                 </div>
                 <div class="gateway-offline">
                     <span class="orange-dot"></span>
-                    <span class="gray-text" style="vertical-align: middle">线上支付渠道</span>
+                    <span class="gray-text" style="vertical-align: middle">线下支付渠道</span>
                 </div>
             </div>
 
@@ -619,105 +632,105 @@
         </div>
 
         <!-- 第十三屏 -->
-        <div class="swiper-slide slide2 slide13">
-            <div class="slide2-title">
-                <label>半边天慈善活动</label><br>
-                <label>排行榜</label>
-            </div>
-
-            <div class="slide2-wish-text">
-                半边天活动参与商户活动期间交易笔数TOP10
-            </div>
+        <!--<div class="swiper-slide slide2 slide13">-->
+            <!--<div class="slide2-title">-->
+                <!--<label>半边天慈善活动</label><br>-->
+                <!--<label>排行榜</label>-->
+            <!--</div>-->
 
-            <div class="slide2-hr">
-                <div class="left"></div>
-            </div>
-            <!--<div style="padding: 30px; margin-top: 30px;">-->
-                <!--<img src="static/images/annualBill/paihang.png">-->
+            <!--<div class="slide2-wish-text">-->
+                <!--半边天活动参与商户活动期间交易笔数TOP10-->
             <!--</div>-->
 
-            <div class="paihangbang">
-                <ul>
-                    <li>
-                        <label class="industry-name text-right">51GO</label>
-                        <label id="top1" class="blue-to-green" style="width: 0%;"></label>
-                        <label class="top-value">
-                            <span id="top1value">117605</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">代购之家</label>
-                        <label id="top2" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top2value">70977</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">HOMETOWN SUPERMARKET</label>
-                        <label id="top3" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top3value">64384</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">BUY@HOME</label>
-                        <label id="top4" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top4value">55873</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">HM SYD</label>
-                        <label id="top5" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top5value">47897</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">FUMAO</label>
-                        <label id="top6" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top6value">46678</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">BNE GIFT<br> STATION</label>
-                        <label id="top7" style="width: 0%;" class="blue-to-green width-transition"></label>
-                        <label class="top-value">
-                            <span id="top7value">43596</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">OZ 团团</label>
-                        <label id="top8" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top8value">42848</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">DAILY MARKET<br> 美天超市</label>
-                        <label id="top9" style="width: 0%;" class="blue-to-green"></label>
-                        <label class="top-value">
-                            <span id="top9value">40646</span>笔
-                        </label>
-                    </li>
-                    <li>
-                        <label class="industry-name text-right left">OWELEE<br> HEALTH STORE</label>
-                        <label id="top10" style="width: 0%;" class="blue-to-green width-transition"></label>
-                        <label class="top-value">
-                            <span id="top10value">38557</span>笔
-                        </label>
-                    </li>
-                </ul>
-            </div>
+            <!--<div class="slide2-hr">-->
+                <!--<div class="left"></div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;<div style="padding: 30px; margin-top: 30px;">&ndash;&gt;-->
+                <!--&lt;!&ndash;<img src="static/images/annualBill/paihang.png">&ndash;&gt;-->
+            <!--&lt;!&ndash;</div>&ndash;&gt;-->
+
+            <!--<div class="paihangbang">-->
+                <!--<ul>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right">51GO</label>-->
+                        <!--<label id="top1" class="blue-to-green" style="width: 0%;"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top1value">117605</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">代购之家</label>-->
+                        <!--<label id="top2" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top2value">70977</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">HOMETOWN SUPERMARKET</label>-->
+                        <!--<label id="top3" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top3value">64384</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">BUY@HOME</label>-->
+                        <!--<label id="top4" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top4value">55873</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">HM SYD</label>-->
+                        <!--<label id="top5" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top5value">47897</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">FUMAO</label>-->
+                        <!--<label id="top6" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top6value">46678</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">BNE GIFT<br> STATION</label>-->
+                        <!--<label id="top7" style="width: 0%;" class="blue-to-green width-transition"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top7value">43596</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">OZ 团团</label>-->
+                        <!--<label id="top8" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top8value">42848</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">DAILY MARKET<br> 美天超市</label>-->
+                        <!--<label id="top9" style="width: 0%;" class="blue-to-green"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top9value">40646</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                    <!--<li>-->
+                        <!--<label class="industry-name text-right left">OWELEE<br> HEALTH STORE</label>-->
+                        <!--<label id="top10" style="width: 0%;" class="blue-to-green width-transition"></label>-->
+                        <!--<label class="top-value">-->
+                            <!--<span id="top10value">38557</span>笔-->
+                        <!--</label>-->
+                    <!--</li>-->
+                <!--</ul>-->
+            <!--</div>-->
 
-            <!-- <div class="bottom">
-                <div class="bottom-text2">滑动查看2019账单</div>
-                <div class="bottom-img">
-                    <img src="static/images/annualBill/up@2x.png" onclick="slideNextPage()">
-                </div>
-            </div> -->
-        </div>
+            <!--&lt;!&ndash; <div class="bottom">-->
+                <!--<div class="bottom-text2">滑动查看2019账单</div>-->
+                <!--<div class="bottom-img">-->
+                    <!--<img src="static/images/annualBill/up@2x.png" onclick="slideNextPage()">-->
+                <!--</div>-->
+            <!--</div> &ndash;&gt;-->
+        <!--</div>-->
 
         <!-- 第十四屏 -->
         <div class="swiper-slide">
@@ -777,13 +790,13 @@
     var merchantNum = 16000;
 
     var payedUsersAnimObject = {
-        payedUsersNum: 819667,
-        payedUsersGrowNum: 142,
-        dailyPayedUsersNum: 2245
+        payedUsersNum: 300,
+        payedUsersGrowNum: 321.53,
+        dailyPayedUsersNum: 8219
     };
 
     // var transactionAmount = 37425582;
-    var transactionAmount = 71588990;
+    var transactionAmount = 81588990;
 
     var payCountAnimObject = {
         onlineMerchant: 696,
@@ -967,7 +980,7 @@
             slideChangeTransitionEnd: function(event) {
                 var bottomText = document.getElementById('bottom-text');
                 if(this.activeIndex > 0) {
-                    bottomText.style.color = "#FFFFFF"
+                    bottomText.style.color = "#FFFFFF";
                     document.getElementById('bottom-img').src = 'static/images/annualBill/up@2x.png'
                 } else {
                     bottomText.style.color = '#1C2029';
@@ -993,7 +1006,7 @@
                         });
                     }
                 }
-                if (this.activeIndex == 14) {
+                if (this.activeIndex == 13) {
                     document.getElementById('bottom').style.display = 'none'
                 } else {
                     document.getElementById('bottom').style.display = 'block'
@@ -1108,21 +1121,21 @@
                     top9: 40646,
                     top10: 38557
                 };
-                var total = 569061;
-                if (this.activeIndex == 12) {
-
-                    for (var key in paihangbangObject) {
-                        document.getElementById(key).classList.add("width-transition");
-                        document.getElementById(key).style.width = paihangbangObject[key]/total*200 + '%';
-
-                        var topAnim = new CountUp(key + 'value', 0, paihangbangObject[key], 0, numAnimTime)
-                        topAnim.start();
-                    }
-                } else {
-                    for (var key in paihangbangObject) {
-                        document.getElementById(key).style.width = 0 + '%';
-                    }
-                }
+                // var total = 569061;
+                // if (this.activeIndex == 12) {
+                //
+                //     for (var key in paihangbangObject) {
+                //         document.getElementById(key).classList.add("width-transition");
+                //         document.getElementById(key).style.width = paihangbangObject[key]/total*200 + '%';
+                //
+                //         var topAnim = new CountUp(key + 'value', 0, paihangbangObject[key], 0, numAnimTime)
+                //         topAnim.start();
+                //     }
+                // } else {
+                //     for (var key in paihangbangObject) {
+                //         document.getElementById(key).style.width = 0 + '%';
+                //     }
+                // }
             }
         },
     });

From 4c7e643b59e601682efe0b3a9c38c2535a6909f7 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Tue, 22 Jan 2019 17:01:37 +0800
Subject: [PATCH 3/3] [fix]

---
 .../activities/app_index/core/AppActService.java     |  2 +-
 .../app_index/core/impls/AppActServiceImp.java       |  4 +---
 .../activities/app_index/web/AppActController.java   | 12 ++++++++++--
 src/main/ui/static/cms/templates/article_editor.html |  9 ++++++++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java
index 08e8032da..c79bfbb4b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/AppActService.java
@@ -23,5 +23,5 @@ public interface AppActService {
 
     void published(JSONObject manager,String act_id,boolean is_valid);
 
-    void sendAnnualBillMessage();
+    void sendAnnualBillMessage(JSONObject params);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
index bc30022fd..90b824470 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
@@ -119,11 +119,9 @@ public class AppActServiceImp implements AppActService {
     }
 
     @Override
-    public void sendAnnualBillMessage() {
+    public void sendAnnualBillMessage(JSONObject params) {
 
         logger.debug("sendAnnualMessage Begin");
-        JSONObject params = new JSONObject();
-        params.put("client_id", 9);
         List<JSONObject> tokens = clientDeviceTokenMapper.listAllTokens(params);
         for (JSONObject devToken : tokens) {
             Runnable task = () -> {
diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java
index e23be209f..c104c4694 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/web/AppActController.java
@@ -46,9 +46,17 @@ public class AppActController {
         appActService.published(manager,act_id,is_valid);
     }
 
-    @GetMapping(value = "/annual/bill")
+    @GetMapping(value = "/annual/bill/test")
+    public String testSendAnnualBillMessage() {
+        JSONObject params = new JSONObject();
+        params.put("client_id", 9);
+        appActService.sendAnnualBillMessage(params);
+        return "success";
+    }
+
+    @GetMapping(value = "/annual/bill/all")
     public String sendAnnualBillMessage() {
-        appActService.sendAnnualBillMessage();
+        appActService.sendAnnualBillMessage(null);
         return "success";
     }
 }
diff --git a/src/main/ui/static/cms/templates/article_editor.html b/src/main/ui/static/cms/templates/article_editor.html
index 7c9cd1bf5..57061f8ee 100644
--- a/src/main/ui/static/cms/templates/article_editor.html
+++ b/src/main/ui/static/cms/templates/article_editor.html
@@ -24,7 +24,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label ng-if="catId!='app_activity' and catId!='app_ad" class="col-md-2 control-label" for="desc-input">HTML Description</label>
+                        <label ng-if="catId!='app_activity' && catId!='app_ad'" class="col-md-2 control-label" for="desc-input">HTML Description</label>
                         <label ng-if="catId=='app_activity'" class="col-md-2 control-label" for="desc-input">HomePage AD</label>
                         <label ng-if="catId=='app_ad'" class="col-md-2 control-label" for="desc-input">App Launch AD</label>
                         <div class="col-md-10">
@@ -61,6 +61,13 @@
                             <p ng-if="catId=='app_ad'"class="small text-warning">(广告展示时间(s))</p>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label" for="kw-input">url</label>
+                        <div class="col-md-10">
+                            <input ng-model="reference.url" type="text" name="title" id="url-input" class="form-control">
+                            <p class="small text-warning">(跳转H5页面链接)</p>
+                        </div>
+                    </div>
                 </form>
                 <div class="form-group">
                     <label class="control-label">Content</label>