Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

订单完成查看物流

See merge request !156

src/pages/confirmOrder/confirmOrder.js

@@ -336,7 +336,7 @@ wxService.page({
          }
           this.setData({
             currentOrderList: data,
-            defalutCoupon: data.couponDiscountPreviews[0].couponSettingDTO.type == 1 ? data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponSettingDTO.faceAmount / 100 : data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDiscount,
+            defalutCoupon: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponSettingDTO.type == 1 ? data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0].couponSettingDTO.faceAmount / 100 : data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDiscount,
             defalutCouponId: data && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDTOS[0] && data.couponDiscountPreviews[0].couponDTOS[0].id || '',
             orderInitPrice: data.amount
           }, () => {

src/pages/orderDetail/orderDetail.wxml

@@ -4,7 +4,7 @@
 		<view class="refund-status">
 			<view
 			 class="look-logistics"
-			 wx-if="{{detail.status == 'D'}}"
+			 wx-if="{{detail.status == 'D' || detail.status == 'R' }}"
 			 data-id="{{detail.id}}"
 			 data-code="{{detail.logistic.supplierCode}}"
 			 data-logisticsNo="{{detail.logistic.code}}"