Merge branch 'feature/coupon' into develop
Showing
2 changed files
with
4 additions
and
3 deletions
| @@ -12,7 +12,8 @@ | @@ -12,7 +12,8 @@ | ||
| 12 | <div class="coupon-name">{{item.couponName}}</div> | 12 | <div class="coupon-name">{{item.couponName}}</div> |
| 13 | <div class="sub">{{item.receiveStartTime}} - {{item.receiveEndTime}}</div> | 13 | <div class="sub">{{item.receiveStartTime}} - {{item.receiveEndTime}}</div> |
| 14 | </div> | 14 | </div> |
| 15 | - <cube-button :class="['item-button', item.receive === 'N' ? 'active' : '']" @click="clickButton(item)">{{item.receive === 'N' ? '已领取' : '立即领取'}}</cube-button> | 15 | + <div :class="['item-button', item.receive === 'N' ? 'active' : '']" @click="clickButton(item)"> |
| 16 | + {{item.receive === 'N' ? '已领取' : '立即领取'}}</div> | ||
| 16 | </div> | 17 | </div> |
| 17 | </li> | 18 | </li> |
| 18 | </ul> | 19 | </ul> |
| @@ -51,7 +52,6 @@ export default { | @@ -51,7 +52,6 @@ export default { | ||
| 51 | watch: { | 52 | watch: { |
| 52 | 'yoho.context.isLogin': function(val) { | 53 | 'yoho.context.isLogin': function(val) { |
| 53 | this.isLogin = val; | 54 | this.isLogin = val; |
| 54 | - let that = this; | ||
| 55 | } | 55 | } |
| 56 | }, | 56 | }, |
| 57 | mounted() { | 57 | mounted() { |
| @@ -138,6 +138,7 @@ export default { | @@ -138,6 +138,7 @@ export default { | ||
| 138 | border-radius: 40px; | 138 | border-radius: 40px; |
| 139 | background: #002B47; | 139 | background: #002B47; |
| 140 | color: #fff; | 140 | color: #fff; |
| 141 | + line-height: 80px; | ||
| 141 | text-align: center; | 142 | text-align: center; |
| 142 | font-size: 24px; | 143 | font-size: 24px; |
| 143 | 144 |
-
Please register or login to post a comment