Authored by 张文文

Merge branch 'feature/coupon' into develop

... ... @@ -12,7 +12,8 @@
<div class="coupon-name">{{item.couponName}}</div>
<div class="sub">{{item.receiveStartTime}} - {{item.receiveEndTime}}</div>
</div>
<cube-button :class="['item-button', item.receive === 'N' ? 'active' : '']" @click="clickButton(item)">{{item.receive === 'N' ? '已领取' : '立即领取'}}</cube-button>
<div :class="['item-button', item.receive === 'N' ? 'active' : '']" @click="clickButton(item)">
{{item.receive === 'N' ? '已领取' : '立即领取'}}</div>
</div>
</li>
</ul>
... ... @@ -51,7 +52,6 @@ export default {
watch: {
'yoho.context.isLogin': function(val) {
this.isLogin = val;
let that = this;
}
},
mounted() {
... ... @@ -138,6 +138,7 @@ export default {
border-radius: 40px;
background: #002B47;
color: #fff;
line-height: 80px;
text-align: center;
font-size: 24px;
... ...
{
"name": "xianyu-ufo-app-web",
"version": "1.5.8",
"version": "1.5.9",
"private": true,
"description": "Xianyu Project With Express",
"repository": {
... ...