Authored by 李奇

订单详情页优惠券0.00不显示

1 -import OrderListService from '../../pages/orderList/orderListService.js';  
2 -import OrderActionService from './orderActionService.js';  
3 -import event from '../../utils/event';  
4 -  
5 Component({ 1 Component({
6 properties: { 2 properties: {
7 show: { 3 show: {
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </view> 8 </view>
9 <block wx:else> 9 <block wx:else>
10 <scroll-view class="coupon-scroll" scroll-y> 10 <scroll-view class="coupon-scroll" scroll-y>
11 - <block wx:for="{{coupons}}" wx:key="index"> 11 + <block wx:for="{{coupons}}" wx:key="{{item.coupon_code}}">
12 <view class="coupon-item"> 12 <view class="coupon-item">
13 <view class="left"> 13 <view class="left">
14 <text class="value">{{item.coupon_value_str}}</text> 14 <text class="value">{{item.coupon_value_str}}</text>
@@ -117,8 +117,6 @@ Page({ @@ -117,8 +117,6 @@ Page({
117 data.buttons = data.buttons.filter(item => { 117 data.buttons = data.buttons.filter(item => {
118 return item.code !== 'modify_address'; 118 return item.code !== 'modify_address';
119 }); 119 });
120 -  
121 - console.log(data.buttons)  
122 } 120 }
123 121
124 if (data && data.buttons && data.buttons.length > 0) { 122 if (data && data.buttons && data.buttons.length > 0) {
@@ -183,7 +181,7 @@ Page({ @@ -183,7 +181,7 @@ Page({
183 } 181 }
184 router.go('logistics', params); 182 router.go('logistics', params);
185 } else { 183 } else {
186 - if (actionCode === 'cancel_order') { 184 + if (actionCode === 'cancel_order' && this.data.data.isOffline !== 'Y') {
187 return ctx.setData({ 185 return ctx.setData({
188 cancelConfirm: true, 186 cancelConfirm: true,
189 cancelOrderCode: orderCode 187 cancelOrderCode: orderCode
@@ -43,8 +43,10 @@ @@ -43,8 +43,10 @@
43 <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.feePrice}}</text> 43 <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.feePrice}}</text>
44 </view> 44 </view>
45 <view class='order-detail-count-view' wx:if="{{data.priceInfo.couponCutPrice}}"> 45 <view class='order-detail-count-view' wx:if="{{data.priceInfo.couponCutPrice}}">
46 - <text class='order-detail-sum-grey-txt'>优惠券:</text>  
47 - <text class='order-detail-sum-grey-txt'>-¥{{data.priceInfo.couponCutPrice}}</text> 46 + <block wx:if="{{data.priceInfo.couponCutPrice != '0.00' && data.priceInfo.couponCutPrice != '0'}}">
  47 + <text class='order-detail-sum-grey-txt'>优惠券:</text>
  48 + <text class='order-detail-sum-grey-txt'>-¥{{data.priceInfo.couponCutPrice}}</text>
  49 + </block>
48 </view> 50 </view>
49 <view class='order-detail-count-view'> 51 <view class='order-detail-count-view'>
50 <text class='order-detail-sum-black-txt'>实际金额:</text> 52 <text class='order-detail-sum-black-txt'>实际金额:</text>