Skip to content

Commit

Permalink
优惠券列表页面
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaobinwu committed May 25, 2017
1 parent 2010feb commit 2633205
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pages/coupon-list/coupon-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ Page({
})
}).then(res => {
this.setData({
couponData: this.data.couponData.concat(type==3 ? obj : obj1)
couponData: this.data.couponData.concat(type==3 ? obj : obj1),
showLoadingFlag: false
});
}).catch((e)=>{
console.log(e)
Expand Down
2 changes: 1 addition & 1 deletion template/coupon-item/coupon-item.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<view class="basic-info {{(type === 1 ? cpn.type == 3 : (cpn.coupon_sta == 2 || cpn.coupon_sta == 3)) ? 'basic-info-gray' : ''}}" data-todetail="{{toDetail}}" bindtap="_showCouponDetail" data-id="{{cpn.id}}">
<image wx:if="{{cpn.exp_soon}}" class="exp-soon" src="../../image/will-expired.png"></image>
<view class="use-target-price">
<view>{{cpn.tag}}</view>
<view class="coupon-tag">{{cpn.tag}}</view>
<view class="price {{(type === 1 ? cpn.type == 3 : (cpn.coupon_sta == 2 || cpn.coupon_sta == 3)) ? 'price-gray' : ''}}">
<text class="price-label">¥</text>
<text class="price-num">{{cpn.showDiscountMoney}}</text>
Expand Down
3 changes: 3 additions & 0 deletions template/coupon-item/coupon-item.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
flex-direction:column;
justify-content:space-between;
}
.use-target-price .coupon-tag{
font-size: 26rpx;
}
.use-target-price .price{
color:#f6559c;
}
Expand Down

0 comments on commit 2633205

Please sign in to comment.