Merge remote-tracking branch 'origin/mondelay' into mondelay

master
eason.qian 7 years ago
commit 9ac5b10c0b

@ -17,8 +17,16 @@
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script> <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
</head> </head>
<body> <body>
<div class="title_img"> <div th:class="!${expire}?'margin_bottom'">
<h1><img src="/static/templates/activity/mondelay/title@2x.png"></h1> <div class="title_img">
<h1><img src="/static/templates/activity/mondelay/title@2x.png"></h1>
</div>
</div>
<div class="activity_close" th:if="${expire}">
<div class="line"></div>
<div class="activity_text">活动已结束</div>
<div class="line"></div>
</div> </div>
<div class="content ul_font"> <div class="content ul_font">
<div class="h2_width"> <div class="h2_width">
@ -39,52 +47,64 @@
<li>本活动最终解释权归RoyalPay所有</li> <li>本活动最终解释权归RoyalPay所有</li>
</ul> </ul>
</div> </div>
<div class="button_center" th:if="!${apply}" id="applyButton"> <div class="button_center" th:unless="${active}">
<button class="button_position"> <button class="button_position button_active">
<span style="color: #FFFFFF;">我要参加</span> <span style="color:#9BFBFE;"><font th:text="${#dates.format(active_date, 'MM-dd')}"></font> 敬请期待</span>
</button> </button>
</div> </div>
<div th:class="${apply}?'margin_top'"> <div th:if="${active}">
<div class="content"> <div th:unless="${expire}">
<div class="h3_width"> <div class="button_center" th:if="!${apply}" id="applyButton">
<h2>补贴金额记录</h2> <button class="button_position">
<span style="color: #FFFFFF;">我要参加</span>
</button>
</div> </div>
</div>
<div th:class="${apply}?'margin_top'" th:if="${list.size()>0}">
<div class="content">
<div class="h3_width">
<h2>补贴金额记录</h2>
</div>
<div class="amount_title"> <div class="amount_title">
<h5>累计补贴金额</h5> <h5>累计补贴金额</h5>
<div class="total_redpack">$ <span th:text="${total_redpack}"></span></div> <div class="total_redpack">$ <span th:text="${total_redpack}"></span></div>
</div> </div>
<div class="content_table"> <div class="content_table">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>时间</th> <th>时间</th>
<th style="text-align: right">补贴金额</th> <th style="text-align: right">补贴金额</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="redpack:${list}"> <tr th:each="redpack:${list}">
<td th:text="${#dates.format(redpack['send_time'], 'yyyy-MM-dd')}">>04-01 12:00</td> <td th:text="${#dates.format(redpack['send_time'], 'yyyy-MM-dd')}">>04-01 12:00</td>
<td style="text-align: right" th:text="${redpack['redpack_amount']}">$5.00</td> <td style="text-align: right" th:text="${redpack['redpack_amount']}">$5.00</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</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>
</div> </div>
</div> </div>
<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="shape1_position"><img src="/static/templates/activity/mondelay/shape1@2x.png"></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="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="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="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> <div class="shape5_position"><img src="/static/templates/activity/mondelay/shape5@2x.png"></div>
<div class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div> <footer class="royal_position"><img src="/static/templates/activity/mondelay/logo copy@2x.png">
<footer class="royal_position"><img src="/static/templates/activity/mondelay/logo@2x.png"> <div class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
</footer> </footer>
</body> </body>
</html> </html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

@ -123,6 +123,7 @@ tbody tr:nth-child(odd){
margin-top: 50px; margin-top: 50px;
margin-bottom: 20px; margin-bottom: 20px;
text-align: center; text-align: center;
position: relative;
} }
.royal_position img{ .royal_position img{
height: 25px; height: 25px;
@ -174,6 +175,7 @@ tbody tr:nth-child(odd){
.shape6_position{ .shape6_position{
position: absolute; position: absolute;
left: -9px; left: -9px;
top: -40px;
z-index: -1; z-index: -1;
} }
.shape6_position img{ .shape6_position img{

Loading…
Cancel
Save