Commit 3c82f1f68ec2f47f0ebb19ab76345177ca80de8f
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test
Showing
3 changed files
with
9 additions
and
3 deletions
packageD/pages/shop/order_detail/order_detail.wxml
| @@ -68,7 +68,10 @@ | @@ -68,7 +68,10 @@ | ||
| 68 | <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}"> | 68 | <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}"> |
| 69 | -- | 69 | -- |
| 70 | </view> | 70 | </view> |
| 71 | - <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view> | 71 | + <view wx:if="{{order.exp_type==2}}">同城配送</view> |
| 72 | + <view wx:elif="{{order.exp_type==1}}">自提</view> | ||
| 73 | + <view wx:else >物流({{order.shipping_name}})</view> | ||
| 74 | + | ||
| 72 | </view> | 75 | </view> |
| 73 | <view class="item"> | 76 | <view class="item"> |
| 74 | <view>买家留言</view> | 77 | <view>买家留言</view> |
pages/giftpack/giftpacklist/giftpacklist.wxml
| 1 | +<wxs module="filter" src="../../../utils/filter.wxs"></wxs> | ||
| 1 | <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}"> | 2 | <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}"> |
| 2 | <view class="box_top data-v-3a5b7e36"> | 3 | <view class="box_top data-v-3a5b7e36"> |
| 3 | <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image> | 4 | <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image> |
pages/user/order_detail/order_detail.wxml
| @@ -79,9 +79,11 @@ | @@ -79,9 +79,11 @@ | ||
| 79 | <view>配送方式</view> | 79 | <view>配送方式</view> |
| 80 | <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}"> | 80 | <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}"> |
| 81 | -- | 81 | -- |
| 82 | - </view> | 82 | + </view> |
| 83 | + | ||
| 83 | <view wx:if="{{order.exp_type==2}}">同城配送</view> | 84 | <view wx:if="{{order.exp_type==2}}">同城配送</view> |
| 84 | - <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?"物流（"+order.shipping_name+')':'自提'}}</view> | 85 | + <view wx:elif="{{order.exp_type==1}}">自提</view> |
| 86 | + <view wx:else>物流({{order.shipping_name}})</view> | ||
| 85 | </view> | 87 | </view> |
| 86 | <view class="item"> | 88 | <view class="item"> |
| 87 | <view>买家留言</view> | 89 | <view>买家留言</view> |