Merge branch 'dev_7.1.0' into fixbug-ZYW

src/pages/confirmOrder/confirmOrder.js

@@ -25,7 +25,8 @@ wxService.page({
     orderPrice: null, // 订单金额
     orderInitPrice: 0,
     plusMemberPrice: 0, // plus 默认价
-    plusMemberName:''
+    plusMemberName:'',
+    defalutCoupon: ''
   },
 
   /**
@@ -283,6 +284,7 @@ wxService.page({
           wx.hideLoading()
           this.setData({ 
             currentOrderList: data,
+            defalutCoupon: data && data.couponDiscountPreviews && data.couponDiscountPreviews[0].couponDiscount,
             orderInitPrice: data.amount
           },()=>{
             // 实付款

src/pages/confirmOrder/confirmOrder.wxml

@@ -122,9 +122,10 @@
 				</view>
 				<view class="coupon">
 					<view>
-						<text class="price-label">优惠券</text>
+						<text class="price-label">优惠券{{defalutCoupon}}</text>
 						<view class="select-coupon" bindtap="selectCoupon">
-							<text class="{{haveCoupon ? 'coupon-price' : 'no-coupon'}}"> {{currentCoupon ? '-' : '无可用优惠券'}} {{currentCoupon}}</text>
+							<text class="coupon-price"> -{{currentCoupon ? currentCoupon : defalutCoupon}}{{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" />
 						</view>
 					</view>