显示规则

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">
-            <button class="button_position">
-                <span style="color: #FFFFFF;">我要参加</span>
-            </button>
-        </div>
+    <div class="button_center" th:if="${active && !apply}" id="applyButton">
+        <button class="button_position">
+            <span style="color: #FFFFFF;">我要参加</span>
+        </button>
     </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,14 +86,12 @@
             </div>
         </div>
     </div>
-    <div th:unless="${expire}">
-        <div class="button_center cancel_posttion"  th:if="${apply}" id="cancelButton">
-            <button class="button_position button_color">
-                <span class="cancel">取消</span>
-            </button>
-        </div>
+    <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
+        <button class="button_position button_color">
+            <span class="cancel">取消</span>
+        </button>
     </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>