Merge branch 'mondelay' into develop

src/main/resources/templates/activity/mondelay/mondelay.html

@@ -47,20 +47,17 @@
         <li>本活动最终解释权归RoyalPay所有</li>
     </ul>
 </div>
-<div class="button_center" th:unless="${active}">
+<div class="button_center" th:if="${!active && !expire}">
     <button class="button_position button_active">
         <span style="color:#9BFBFE;"><font th:text="${#dates.format(active_date, 'MM-dd')}"></font> 敬请期待</span>
     </button>
 </div>
-<div th:if="${active}">
-    <div th:unless="${expire}">
-        <div class="button_center" th:if="!${apply}" id="applyButton">
+    <div class="button_center" th:if="${active && !apply}" id="applyButton">
         <button class="button_position">
             <span style="color: #FFFFFF;">我要参加</span>
         </button>
     </div>
-    </div>
-    <div th:class="${apply}?'margin_top'" th:if="${list.size()>0}">
+    <div th:class="${apply}?'margin_top'" th:if="${list!=null}">
         <div class="content">
             <div class="h3_width">
                 <h2>补贴金额记录</h2>
@@ -89,23 +86,26 @@
             </div>
         </div>
     </div>
-    <div th:unless="${expire}">
-        <div class="button_center cancel_posttion"  th:if="${apply}" id="cancelButton">
+    <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>
-    </div>
-</div>
+
 
 <div class="shape1_position"><img src="/static/templates/activity/mondelay/shape1@2x.png"></div>
 <div class="shape2_position"><img src="/static/templates/activity/mondelay/shape2@2x.png"></div>
 <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">

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;