From 4a78305160da0fe279e5298da318dab1c7f15e93 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Mon, 19 Mar 2018 18:29:05 +0800
Subject: [PATCH] fix

---
 src/db/modify.sql                                      |  5 ++++-
 .../templates/activity/mondelay/mondelay.html          | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index 46de24d26..bbf38a50d 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -311,4 +311,7 @@ PRIMARY key (`id`)
 alter table sys_clients_devices add column is_offline  tinyint(1) NOT NULL DEFAULT '0';
 
 ALTER TABLE `sys_customer_relation`
-ADD COLUMN `globalpay_openid`  varchar(100) NULL AFTER `kanga_openid`;
\ No newline at end of file
+ADD COLUMN `globalpay_openid`  varchar(100) NULL AFTER `kanga_openid`;
+
+
+ALTER TABLE act_app_list ADD banner_img VARCHAR(200) NULL COMMENT 'App首页banner图片';
\ No newline at end of file
diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index a3815d92b..a0f0f40cf 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -11,7 +11,7 @@
     <meta http-equiv="pragma" content="no-cache">
     <link rel="stylesheet" href="/static/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/templates/activity/mondelay/mondelay.css?t=201607242202">
-    <title>余额增值，周一专享活动</title>
+    <title>跨境电商优选补贴计划</title>
 
     <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
     <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
@@ -35,15 +35,15 @@
     <ul>
         <li>参与商户<b class="font_color">每周一</b>即可获得营销补贴</li>
         <li>
-            营销补贴金额，<b class="font_color">以账户余额为基数</b>，折算<b class="font_color">年化比率不低于15%，最高20%</b>
+            营销补贴金额，<b class="font_color">以发放时账户余额为基数</b>，折算<b class="font_color">年化比率不低于15%，最高20%</b>
         </li>
         <li>
-            参与商户周一暂停清算，与周一营销补贴合并至周二一起清算
+            每周一15:00~16:00（GMT+10时区）发放营销补贴至商户营销账户。 参与商户周一暂停清算，进行补贴的计算和发放，周二恢复原有规则。
         </li>
         <li>
-            补贴活动周期：<b class="font_color">2018/3/10-2018/6/30</b>
+            补贴活动周期：<b class="font_color">2018/3/20-2018/6/30</b>
         </li>
-        <li>商户自愿参加，中途随时终止活动</li>
+        <li>商户自愿参加，可以随时取消（除周一外，周一为补贴的计算和发放日，在此期间无法进行报名和取消操作，17：00之后恢复报名和取消报名）</li>
         <li>本活动最终解释权归RoyalPay所有</li>
     </ul>
 </div>