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

master
eason.qian 7 years ago
commit 4ac5d4132c

@ -50,6 +50,11 @@
<h2>补贴金额记录</h2> <h2>补贴金额记录</h2>
</div> </div>
<div class="amount_title">
<h5>累计补贴金额</h5>
<div class="total_redpack">$ <span th:text="${total_redpack}"></span></div>
</div>
<div class="content_table"> <div class="content_table">
<table class="table"> <table class="table">
<thead> <thead>
@ -68,6 +73,11 @@
</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>
@ -75,7 +85,6 @@
<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> <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@2x.png"> <footer class="royal_position"><img src="/static/templates/activity/mondelay/logo@2x.png">
<button type="button" class="btn btn-primary" th:if="${apply}" id="cancelButton">取消</button>
</footer> </footer>
</body> </body>
</html> </html>

@ -1,6 +1,7 @@
body{ body{
background: url(background@2x.png) no-repeat center top; background: url(background@2x.png) no-repeat center top;
background-size: 100%; background-size: 100%;
background-color: #02218A;
} }
.title_img{ .title_img{
text-align: center; text-align: center;
@ -18,6 +19,22 @@ body{
width: 140px; width: 140px;
margin: 0 auto; margin: 0 auto;
} }
.amount_title{
margin-top: 24px;
margin-bottom: 10px;
text-align: center;
font-family: PingFangSC-Regular;
color: #2849DF;
letter-spacing: 0px;
}
amount_title h5{
font-size: 12px;
}
.total_redpack{
margin-top: -10px;
font-family: Avenir-Heavy;
font-size: 25px;
}
h2{ h2{
font-family:PingFang-SC-Medium; font-family:PingFang-SC-Medium;
font-size: 17px; font-size: 17px;
@ -62,6 +79,15 @@ h2{
border-style: none; border-style: none;
padding: 15px 50px; padding: 15px 50px;
} }
.button_color{
background-image: linear-gradient(0deg, #195ED0 0%, #4BBCF3 100%);
border-radius: 100px;
margin-bottom: -16px;
}
.cancel{
color: #FFFFFF;
padding: 13px 24px;
}
.content_table{ .content_table{
font-family: PingFang-SC-Semibold; font-family: PingFang-SC-Semibold;
font-size: 14px; font-size: 14px;
@ -84,18 +110,12 @@ tbody tr:nth-child(odd){
opacity: 0.7; opacity: 0.7;
} }
.royal_position{ .royal_position{
margin-top: 40px; margin-top: 50px;
margin-bottom: 20px; margin-bottom: 20px;
text-align: center;
} }
.royal_position img{ .royal_position img{
position: absolute;
right: 110px;
height: 25px; height: 25px;
z-index: 100;
}
.royal_position button{
position: absolute;
right: 30px;
} }
.shape1_position{ .shape1_position{
position: absolute; position: absolute;
@ -143,11 +163,11 @@ tbody tr:nth-child(odd){
} }
.shape6_position{ .shape6_position{
position: absolute; position: absolute;
left: 30px; left: -9px;
z-index: 0; z-index: -1;
} }
.shape6_position img{ .shape6_position img{
height: 90px; height: 100px;
} }
.margin_top{ .margin_top{
margin-top: 50px; margin-top: 50px;

Loading…
Cancel
Save