From bad6e6aebd39bdadcaebf947f2b671490c9ef0bf Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Fri, 16 Mar 2018 19:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/mondelay/mondelay.html       | 13 +++++++++----
 .../static/templates/activity/mondelay/mondelay.css | 13 ++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index 607b13dc8..a3815d92b 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -88,7 +88,7 @@
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
         <button class="button_position button_color">
-            <span class="cancel">取消</span>
+            <span class="cancel">放弃活动资格</span>
         </button>
     </div>
 
@@ -98,9 +98,14 @@
 <div class="shape3_position"><img src="/static/templates/activity/mondelay/shape3@2x.png"></div>
 <div class="shape4_position"><img src="/static/templates/activity/mondelay/shape4@2x.png"></div>
 <div class="shape5_position"><img src="/static/templates/activity/mondelay/shape5@2x.png"></div>
-<footer class="royal_position"><img src="/static/templates/activity/mondelay/logo copy@2x.png">
-    <div  class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
-</footer>
+<div th:class="${list==null&&expire }?'margin_top_80'">
+    <div th:class="${list==null ||(active && apply) }?'margin_top_0'">
+        <footer class="royal_position"><img src="/static/templates/activity/mondelay/logo copy@2x.png">
+            <div th:if="${list!=null}" class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
+        </footer>
+    </div>
+</div>
+
 </body>
 </html>
 <script type="text/javascript" data-th-inline="javascript">
diff --git a/src/main/ui/static/templates/activity/mondelay/mondelay.css b/src/main/ui/static/templates/activity/mondelay/mondelay.css
index 6101d9567..8e64dea98 100644
--- a/src/main/ui/static/templates/activity/mondelay/mondelay.css
+++ b/src/main/ui/static/templates/activity/mondelay/mondelay.css
@@ -83,6 +83,13 @@ h2{
     background: url("button@2x.png") no-repeat center;
     border-radius: 100px;
     padding: 15px 30px;
+    margin-bottom: 25px;
+}
+.margin_top_0{
+    margin-top: -30px;
+}
+.margin_top_80{
+    margin-top: 90px;
 }
 .button_active span{
     font-family: Avenir-Medium;
@@ -92,11 +99,11 @@ h2{
 .button_color{
     background-image: linear-gradient(0deg, #195ED0 0%, #4BBCF3 100%);
     border-radius: 100px;
-    margin-bottom: -16px;
+    padding: 10px 5px
 }
 .cancel{
     color: #FFFFFF;
-    padding: 13px 24px;
+    padding: 20px 20px;
 }
 .content_table{
     font-family: PingFang-SC-Semibold;
@@ -120,7 +127,7 @@ tbody tr:nth-child(odd){
     opacity: 0.7;
 }
 .royal_position{
-    margin-top: 50px;
+    margin-top: 30px;
     margin-bottom: 20px;
     text-align: center;
     position: relative;