Showing
3 changed files
with
26 additions
and
10 deletions
| @@ -597,6 +597,10 @@ | @@ -597,6 +597,10 @@ | ||
| 597 | height: inherit; | 597 | height: inherit; |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | + .padding-20 { | ||
| 601 | + padding: 20px 0 !important; | ||
| 602 | + } | ||
| 603 | + | ||
| 600 | .coupon-big { | 604 | .coupon-big { |
| 601 | height: 120px; | 605 | height: 120px; |
| 602 | width: 580px; | 606 | width: 580px; |
| @@ -636,7 +640,7 @@ | @@ -636,7 +640,7 @@ | ||
| 636 | position: absolute; | 640 | position: absolute; |
| 637 | height: inherit; | 641 | height: inherit; |
| 638 | line-height: 25px; | 642 | line-height: 25px; |
| 639 | - margin-top: 10px; | 643 | + padding: 10px 0; |
| 640 | } | 644 | } |
| 641 | } | 645 | } |
| 642 | 646 | ||
| @@ -683,7 +687,7 @@ | @@ -683,7 +687,7 @@ | ||
| 683 | position: absolute; | 687 | position: absolute; |
| 684 | height: inherit; | 688 | height: inherit; |
| 685 | line-height: 25px; | 689 | line-height: 25px; |
| 686 | - margin-top: 10px; | 690 | + padding: 10px 0; |
| 687 | } | 691 | } |
| 688 | } | 692 | } |
| 689 | } | 693 | } |
| @@ -67,9 +67,15 @@ | @@ -67,9 +67,15 @@ | ||
| 67 | {{name}} | 67 | {{name}} |
| 68 | </span> | 68 | </span> |
| 69 | </div> | 69 | </div> |
| 70 | - <div class='coupon-right'> | ||
| 71 | - {{#if status}} 立即领取 {{^}} 已领取 {{/if}} | ||
| 72 | - </div> | 70 | + {{#if status}} |
| 71 | + <div class='coupon-right receive-btn'> | ||
| 72 | + 立即领取 | ||
| 73 | + </div> | ||
| 74 | + {{^}} | ||
| 75 | + <div class='coupon-right padding-20'> | ||
| 76 | + 已领取 | ||
| 77 | + </div> | ||
| 78 | + {{/if}} | ||
| 73 | </div><!--/coupon-big--> | 79 | </div><!--/coupon-big--> |
| 74 | {{/each}} | 80 | {{/each}} |
| 75 | {{^}} | 81 | {{^}} |
| @@ -84,9 +90,15 @@ | @@ -84,9 +90,15 @@ | ||
| 84 | {{name}} | 90 | {{name}} |
| 85 | </span> | 91 | </span> |
| 86 | </div> | 92 | </div> |
| 87 | - <div class='coupon-right'> | ||
| 88 | - {{#if status}} 立即领取 {{^}} 已领取 {{/if}} | ||
| 89 | - </div> | 93 | + {{#if status}} |
| 94 | + <div class='coupon-right receive-btn'> | ||
| 95 | + 立即领取 | ||
| 96 | + </div> | ||
| 97 | + {{^}} | ||
| 98 | + <div class='coupon-right padding-20'> | ||
| 99 | + 已领取 | ||
| 100 | + </div> | ||
| 101 | + {{/if}} | ||
| 90 | </div><!--/coupon-small--> | 102 | </div><!--/coupon-small--> |
| 91 | {{/each}} | 103 | {{/each}} |
| 92 | {{/if}} | 104 | {{/if}} |
| @@ -514,8 +514,8 @@ class ListModel | @@ -514,8 +514,8 @@ class ListModel | ||
| 514 | 'name' => $value['coupon_name'], | 514 | 'name' => $value['coupon_name'], |
| 515 | 'pic' => $value['coupon_pic'], | 515 | 'pic' => $value['coupon_pic'], |
| 516 | 'money' => $value['money'], | 516 | 'money' => $value['money'], |
| 517 | - // 'status' => $key === 1, | ||
| 518 | - 'status' => $value['status'] === 1, | 517 | + 'status' => $key === 1, |
| 518 | + // 'status' => $value['status'] === 1, | ||
| 519 | ); | 519 | ); |
| 520 | } | 520 | } |
| 521 | } | 521 | } |
-
Please register or login to post a comment