From 1aabaa91ad911a12fa8661e7b03959b4098a7adb Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Tue, 10 Jul 2018 16:32:39 +0800
Subject: [PATCH] move html

---
 .../loving_merchants_intro.html               |  18 +++++++++---------
 .../intro.css => css/loving_merchants.css}    |   4 ++--
 .../loving_merchants/banner.png               | Bin
 .../loving_merchants/bg.png                   | Bin
 .../loving_merchants/circular.png             | Bin
 .../loving_merchants/group.png                | Bin
 .../loving_merchants/hearttip.png             | Bin
 .../loving_merchants/introduce.png            | Bin
 .../loving_merchants/royalpay_qrcode.png      | Bin
 .../loving_merchants/sign up.png              | Bin
 .../loving_merchants/title.png                | Bin
 .../loving_merchants/title_heart.png          | Bin
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename src/main/{resources/templates => ui/static}/activity/loving_merchants/loving_merchants_intro.html (78%)
 rename src/main/ui/static/{templates/activity/loving_merchants/intro.css => css/loving_merchants.css} (87%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/banner.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/bg.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/circular.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/group.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/hearttip.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/introduce.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/royalpay_qrcode.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/sign up.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/title.png (100%)
 rename src/main/ui/static/{templates/activity => images}/loving_merchants/title_heart.png (100%)
diff --git a/src/main/resources/templates/activity/loving_merchants/loving_merchants_intro.html b/src/main/ui/static/activity/loving_merchants/loving_merchants_intro.html
similarity index 78%
rename from src/main/resources/templates/activity/loving_merchants/loving_merchants_intro.html
rename to src/main/ui/static/activity/loving_merchants/loving_merchants_intro.html
index 7e9a46db5..fa4b039fd 100644
--- a/src/main/resources/templates/activity/loving_merchants/loving_merchants_intro.html
+++ b/src/main/ui/static/activity/loving_merchants/loving_merchants_intro.html
@@ -9,7 +9,7 @@
     <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">
+    <link rel="stylesheet" href="/static/css/loving_merchants.css">
     <script>
         var _hmt = _hmt || [];
         (function () {
@@ -23,21 +23,21 @@
 <body>
 <header>
     <div class="title_img">
-        <img src="/static/templates/activity/loving_merchants/title_heart.png">
+        <img src="/static/images/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">
+        <img height="112" width="344" src="/static/images/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">
+        <img src="/static/images/loving_merchants/circular.png">
+        <img src="/static/images/loving_merchants/hearttip.png">
         <span></span>
     </div>
     <div class="intro">
         <h1 class="activ_img">
-            <img src="/static/templates/activity/loving_merchants/introduce.png">
+            <img src="/static/images/loving_merchants/introduce.png">
         </h1>
         <div class="intro_content">
             <p>感谢您，正在成就着远在中国孤残儿童的健康梦想！</p>
@@ -57,7 +57,7 @@
     </div>
     <div class="intro">
         <h1 class="activ_img">
-            <img src="/static/templates/activity/loving_merchants/sign up.png">
+            <img src="/static/images/loving_merchants/sign up.png">
         </h1>
         <div class="intro_content">
             <p>参加的半边天爱心公益活动的商户，支付页将会被爱心点亮；未报名参加的用户，可联系我们RoyalPay客服人员为您报名参加。每一笔支付，每一笔心意。</p>
@@ -69,13 +69,13 @@
         </div>
     </div>
     <div class="qrcode_img">
-        <img height="100" width="100" src="/static/templates/activity/loving_merchants/royalpay_qrcode.png">
+        <img height="100" width="100" src="/static/images/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">
+    <img src="/static/images/loving_merchants/group.png">
 </footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/ui/static/templates/activity/loving_merchants/intro.css b/src/main/ui/static/css/loving_merchants.css
similarity index 87%
rename from src/main/ui/static/templates/activity/loving_merchants/intro.css
rename to src/main/ui/static/css/loving_merchants.css
index 1a986abc7..4e1d6bb03 100644
--- a/src/main/ui/static/templates/activity/loving_merchants/intro.css
+++ b/src/main/ui/static/css/loving_merchants.css
@@ -7,14 +7,14 @@ header{
     position:relative;
     height: 130px;
     margin-top: 25px;
-    background: url("title.png") no-repeat center;
+    background: url("../images/loving_merchants/title.png") no-repeat center;
 }
 .title_img{
     text-align: right;
     height: 140px;
 }
 .content{
-    background: url("bg.png") no-repeat center;
+    background: url("../images/loving_merchants/bg.png") no-repeat center;
     margin-top: 10px;
     padding: 0px 13px 0px 13px;
 }
diff --git a/src/main/ui/static/templates/activity/loving_merchants/banner.png b/src/main/ui/static/images/loving_merchants/banner.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/banner.png
rename to src/main/ui/static/images/loving_merchants/banner.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/bg.png b/src/main/ui/static/images/loving_merchants/bg.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/bg.png
rename to src/main/ui/static/images/loving_merchants/bg.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/circular.png b/src/main/ui/static/images/loving_merchants/circular.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/circular.png
rename to src/main/ui/static/images/loving_merchants/circular.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/group.png b/src/main/ui/static/images/loving_merchants/group.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/group.png
rename to src/main/ui/static/images/loving_merchants/group.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/hearttip.png b/src/main/ui/static/images/loving_merchants/hearttip.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/hearttip.png
rename to src/main/ui/static/images/loving_merchants/hearttip.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/introduce.png b/src/main/ui/static/images/loving_merchants/introduce.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/introduce.png
rename to src/main/ui/static/images/loving_merchants/introduce.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/royalpay_qrcode.png b/src/main/ui/static/images/loving_merchants/royalpay_qrcode.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/royalpay_qrcode.png
rename to src/main/ui/static/images/loving_merchants/royalpay_qrcode.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/sign up.png b/src/main/ui/static/images/loving_merchants/sign up.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/sign up.png
rename to src/main/ui/static/images/loving_merchants/sign up.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/title.png b/src/main/ui/static/images/loving_merchants/title.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/title.png
rename to src/main/ui/static/images/loving_merchants/title.png
diff --git a/src/main/ui/static/templates/activity/loving_merchants/title_heart.png b/src/main/ui/static/images/loving_merchants/title_heart.png
similarity index 100%
rename from src/main/ui/static/templates/activity/loving_merchants/title_heart.png
rename to src/main/ui/static/images/loving_merchants/title_heart.png
