Commit d2ef78b3 by 高淑倩

默认优惠券count

parent f9e5ef22
...@@ -284,7 +284,7 @@ wxService.page({ ...@@ -284,7 +284,7 @@ wxService.page({
wx.hideLoading() wx.hideLoading()
this.setData({ this.setData({
currentOrderList: data, currentOrderList: data,
defalutCoupon: data && data.couponDiscountPreviews && data.couponDiscountPreviews[0].couponDiscount, defalutCoupon: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponDiscount || '',
orderInitPrice: data.amount orderInitPrice: data.amount
},()=>{ },()=>{
// 实付款 // 实付款
......
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
</view> </view>
<view class="coupon"> <view class="coupon">
<view> <view>
<text class="price-label">优惠券{{defalutCoupon}}</text> <text class="price-label">优惠券</text>
<view class="select-coupon" bindtap="selectCoupon"> <view class="select-coupon" bindtap="selectCoupon">
<text class="coupon-price"> -{{currentCoupon ? currentCoupon : defalutCoupon}}{{defalutCoupon?'元': ''}}</text> <text class="coupon-price"> {{defalutCoupon?'-': ''}}{{currentCoupon ? currentCoupon : defalutCoupon}}{{defalutCoupon?'元': ''}}</text>
<!--<text class="{{haveCoupon ? 'coupon-price' : 'no-coupon'}}"> -{{currentCoupon ? currentCoupon : defalutCoupon}}</text>--> <!--<text class="{{haveCoupon ? 'coupon-price' : 'no-coupon'}}"> -{{currentCoupon ? currentCoupon : defalutCoupon}}</text>-->
<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" /> <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
</view> </view>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": -1, "current": 44,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -334,6 +334,13 @@ ...@@ -334,6 +334,13 @@
"pathName": "pages/my_11/my", "pathName": "pages/my_11/my",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "pages/my_11/my",
"pathName": "pages/my_11/my",
"query": "",
"scene": null
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment