Merge branch '7/10' into develop

7 years ago · 3e48a1c82a
parent ec4fe4976e ba846d542b
commit 3e48a1c82a
12 changed files with 148 additions and 0 deletions
--- a/src/main/resources/templates/activity/loving_merchants/loving_merchants_intro.html
+++ b/src/main/resources/templates/activity/loving_merchants/loving_merchants_intro.html
@ -0,0 +1,81 @@
 <!DOCTYPE HTML>
 <html xmlns:th="http://www.thymeleaf.org" lang="zh">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
    <meta http-equiv="cache-control" content="max-age=0">
    <meta http-equiv="cache-control" content="no-cache">
    <meta http-equiv="expires" content="0">
    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
    <meta http-equiv="pragma" content="no-cache">
    <title>RoyalPay Payment</title>
    <link rel="stylesheet" href="/static/templates/activity/loving_merchants/intro.css">
    <script>
        var _hmt = _hmt || [];
        (function () {
            var hm = document.createElement("script");
            hm.src = "https://hm.baidu.com/hm.js?d7e727bd889ea69d369cba051844dfe5";
            var s = document.getElementsByTagName("script")[0];
            s.parentNode.insertBefore(hm, s);
        })();
    </script>
 </head>
 <body>
 <header>
    <div class="title_img">
        <img src="/static/templates/activity/loving_merchants/title_heart.png">
    </div>
 </header>
 <div class="content">
    <div class="banner_img">
        <img height="112" width="344" src="/static/templates/activity/loving_merchants/banner.png">
    </div>
    <div class="circular_img">
        <img src="/static/templates/activity/loving_merchants/circular.png">
        <img src="/static/templates/activity/loving_merchants/hearttip.png">
        <span></span>
    </div>
    <div class="intro">
        <h1 class="activ_img">
            <img src="/static/templates/activity/loving_merchants/introduce.png">
        </h1>
        <div class="intro_content">
            <p>感谢您，正在成就着远在中国孤残儿童的健康梦想！</p>
            <p>您通过Royalpay完成的每一笔消费，Royalpay都会向半边天基金会捐献0.01澳元，用于孤残儿童的健康恢复.</p>
            <p>和Royalpay一起，让爱传递！</p>
            <p>Thank you, you are making a meaningful contribution to the children with disabilities in
                China!</p>
            <p>Each payment you paid via Royalpay, we will donate $0.01AUD to Half The Sky Foundation（HTSF),
                servicing a purpose of helping health recovery of the disabled child in China.</p>
            <p>Passing your loving to the world with Royalpay！</p>
        </div>
    </div>
    <div class="intro">
        <h1 class="activ_img">
            <img src="/static/templates/activity/loving_merchants/sign up.png">
        </h1>
        <div class="intro_content">
            <p>参加的半边天爱心公益活动的商户，支付页将会被爱心点亮；未报名参加的用户，可联系我们RoyalPay客服人员为您报名参加。每一笔支付，每一笔心意。</p>
            <p>The loving logo will be lighted up on the payment page for every loving merchant that has joined
                in the charity activity of HTSF. Please kindly contact our customer service team to sign up for
                the activity.
                Passing your loving on via each payment
            </p>
        </div>
    </div>
    <div class="qrcode_img">
        <img height="100" width="100" src="/static/templates/activity/loving_merchants/royalpay_qrcode.png">
        <div>RoyalPay官方客服号</div>
        <div>RoyalPay official customer service QRCode</div>
    </div>
 </div>
 <footer>
    <img src="/static/templates/activity/loving_merchants/group.png">
 </footer>
 </body>
 </html>
--- a/src/main/ui/static/templates/activity/loving_merchants/banner.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/banner.png
--- a/src/main/ui/static/templates/activity/loving_merchants/bg.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/bg.png
--- a/src/main/ui/static/templates/activity/loving_merchants/circular.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/circular.png
--- a/src/main/ui/static/templates/activity/loving_merchants/group.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/group.png
--- a/src/main/ui/static/templates/activity/loving_merchants/hearttip.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/hearttip.png
--- a/src/main/ui/static/templates/activity/loving_merchants/intro.css
+++ b/src/main/ui/static/templates/activity/loving_merchants/intro.css
@ -0,0 +1,67 @@
 body{
    margin: 0 auto;
    padding: 0;
    background: #FF5E5E;
 }
 header{
    position:relative;
    height: 130px;
    margin-top: 25px;
    background: url("title.png") no-repeat center;
 }
 .title_img{
    text-align: right;
    height: 140px;
 }
 .content{
    background: url("bg.png") no-repeat center;
    margin-top: 10px;
    padding: 0px 13px 0px 13px;
 }
 .banner_img {
    text-align: center;
    padding-top: 25px;
 }
 .circular_img{
    text-align: center;
    margin-top: -3px;
 }
 .circular_img img{
    vertical-align: middle;
 }
 .circular_img span{
    display:inline-block;
    height:100%;
    vertical-align:middle;
 }
 .activ_img{
    text-align: center;
 }
 .intro{
    font-family: PingFangSC-Regular;
    font-size: 14px;
    color: #333333;
    letter-spacing: 0.31px;
    line-height:21px;
 }
 .intro_content{
    padding: 0px 32px 5px 32px;
 }
 .qrcode_img{
    text-align: center;
    padding-bottom: 50px;
 }
 .qrcode_img img{
    height: 128px;
    width: 128px;
 }
 .qrcode_img div{
    font-family: Avenir-Book;
    font-size: 12px;
    color: #333333;
    letter-spacing: 0.26px;
 }
 footer{
    margin-top: -38px;
    text-align: center;
 }
--- a/src/main/ui/static/templates/activity/loving_merchants/introduce.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/introduce.png
--- a/src/main/ui/static/templates/activity/loving_merchants/royalpay_qrcode.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/royalpay_qrcode.png
--- a/src/main/ui/static/templates/activity/loving_merchants/sign
+++ b/src/main/ui/static/templates/activity/loving_merchants/sign
--- a/src/main/ui/static/templates/activity/loving_merchants/title.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/title.png
--- a/src/main/ui/static/templates/activity/loving_merchants/title_heart.png
+++ b/src/main/ui/static/templates/activity/loving_merchants/title_heart.png