fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 95880b57577cb65ce11975421d052cb73a10d6eb 2 parents 7eee0774 f9ecd477

Merge branch 'feature/freeShipping' into release/6.0

Inline Side-by-side
Showing 2 changed files with 17 additions and 6 deletions
... ... @@ -27,7 +27,6 @@
<div class="coupons-card{{#isEqual couponType 5}} coupons-freight{{/isEqual}}">
<div class="coupons-card-header">
<p class="left-title">{{useRemark}}</p>
<p class="right-title">{{overState}}</p>
</div>
<div class="coupons-card-content">
<div class="coupons-card-row">
... ... @@ -37,7 +36,12 @@
<p class="coupons-full" title="{{rule}}">{{rule}}</p>
{{/if}}
</div>
<div class="coupons-dtl">{{beginTime}} - {{endTime}}</div>
<div class="coupons-dtl">
<p>{{beginTime}} - {{endTime}}</p>
{{#if overState}}
<p class="red">({{overState}})</p>
{{/if}}
</div>
</div>
</div>
</div>
... ... @@ -61,7 +65,6 @@
<div class="coupons-card coupons-use{{#isEqual couponType 5}} coupons-freight{{/isEqual}}">
<div class="coupons-card-header">
<p class="left-title">{{useRemark}}</p>
<p class="right-title">{{overState}}</p>
</div>
<div class="coupons-card-content">
<div class="coupons-card-row">
... ... @@ -100,7 +103,6 @@
<div class="coupons-card coupons-invalid">
<div class="coupons-card-header">
<p class="left-title">{{useRemark}}</p>
<p class="right-title">{{overState}}</p>
</div>
<div class="coupons-card-content">
<div class="coupons-card-row">
... ...
... ... @@ -84,7 +84,7 @@
overflow: hidden;
p.left-title {
width: 160px;
width: 220px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
... ... @@ -141,8 +141,13 @@
.coupons-card-content .coupons-card-row .coupons-dtl {
display: table-cell;
padding-left: 10px;
padding-top: 17px;
font-weight: bold;
vertical-align: middle;
}
.red {
color: red;
font-weight: normal;
}
}
... ... @@ -182,6 +187,10 @@
width: 388px;
}
.coupons-info .coupons-text {
padding: 0 25px;
}
.coupons-opt {
.btn {
width: 90px;
... ...