wxd / MShopWeApp

Commit 42da7999018c2eca8a43f89f7baebe6f384b2f03

Authored by yvan.ni
2 parents 0551d6da cdb607b0

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 2 changed files with 41 additions and 18 deletions
packageC/pages/presell/cart/cart.wxml
  View file @42da799
... ... @@ -10,7 +10,8 @@
10 10 <view class="pdr20">
11 11 <text class="iconfont icon-qianbao fs60"></text>
12 12 </view>
13   -
  13 +
  14 +
14 15 <view wx:if="{{wait_dj}}">
15 16 <view>等待买家付定金</view>
16 17 <view>{{filters.format_time(act.start_time,1)}} - {{filters.format_time(act.end_time,1)}} </view>
... ... @@ -30,7 +31,7 @@
30 31 <view>等待买家付尾款</view>
31 32 <view class="fs22">请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消</view>
32 33 </view>
33   - <view wx:if="{{wait_fh}}">
  34 + <view wx:if="{{wait_fh && order.order_status!=6}}">
34 35 <view>等待商家发货</view>
35 36 <view class="fs22">将在{{filters.format_time(send_time,1)}}后发货</view>
36 37 </view>
... ... @@ -220,7 +221,7 @@
220 221 </view>
221 222  
222 223  
223   - <view class="set-mes bdr_b-14" wx:if="{{presell.deposit_pay_time>0 && presell.tail_pay_state==0 && !no_start && !wait_dj && order.order_status<2}}">
  224 + <view class="set-mes bdr_b-14" wx:if="{{presell.presell_type==0 && presell.deposit_pay_time>0 && presell.tail_pay_state==0 && !no_start && !wait_dj && order.order_status<2}}">
224 225 <view wx:if="{{order.store_prom}}">
225 226 <icon color="#f23030" size="16" type="info"></icon>
226 227 {{order.store_prom}}
... ... @@ -293,21 +294,42 @@
293 294 <view>商品金额</view>
294 295 <view class="co-red">￥ {{filters.toFix(allpice,2)}}元</view>
295 296 </view>
296   - <view class="item" wx:if="{{exp_price>0}}">
297   - <view>配送费用</view>
298   - <view class="co-red">￥ {{filters.toFix(exp_price,2)}}元</view>
299   - </view>
300   -
301   - <view class="item" wx:if="{{quan_price>0}}">
302   - <view>优惠券优惠</view>
303   - <view class="co-red">￥ -{{filters.toFix(quan_price,2)}}元</view>
304   - </view>
305   -
306   - <view class="item" wx:if="{{order_prom_amount>0}}">
307   - <view>订单优惠</view>
308   - <view class="co-red">￥ -{{filters.toFix(order_prom_amount,2)}}元</view>
309   - </view>
310   -
  297 +
  298 + <!-- 未支付订单，没有取消的 -->
  299 + <block wx:if="{{order.pay_status<1 && order.order_status<2}}">
  300 + <view class="item" wx:if="{{exp_price>0}}">
  301 + <view>配送费用</view>
  302 + <view class="co-red">￥ {{filters.toFix(exp_price,2)}}元</view>
  303 + </view>
  304 +
  305 + <view class="item" wx:if="{{quan_price>0}}">
  306 + <view>优惠券优惠</view>
  307 + <view class="co-red">￥ -{{filters.toFix(quan_price,2)}}元</view>
  308 + </view>
  309 +
  310 + <view class="item" wx:if="{{order_prom_amount>0}}">
  311 + <view>订单优惠</view>
  312 + <view class="co-red">￥ -{{filters.toFix(order_prom_amount,2)}}元</view>
  313 + </view>
  314 + </block>
  315 +
  316 + <block else>
  317 + <view class="item" wx:if="{{order.shipping_status>0}}">
  318 + <view>配送费用</view>
  319 + <view class="co-red">￥ {{filters.toFix(order.shipping_status,2)}}元</view>
  320 + </view>
  321 +
  322 + <view class="item" wx:if="{{order.coupon_price>0}}">
  323 + <view>优惠券优惠</view>
  324 + <view class="co-red">￥ -{{filters.toFix(order.coupon_price,2)}}元</view>
  325 + </view>
  326 +
  327 + <view class="item" wx:if="{{order.order_prom_amount>0}}">
  328 + <view>订单优惠</view>
  329 + <view class="co-red">￥ -{{filters.toFix(order.order_prom_amount,2)}}元</view>
  330 + </view>
  331 +
  332 + </block>
311 333 </view>
312 334  
313 335 <view class="information bdr14 mgt20">
... ...
pages/user/order_list/order_list.wxml
  View file @42da799
... ... @@ -59,6 +59,7 @@
59 59 <view wx:if="{{item.order_status==3 && item.pt_status!=6}}" class="flex-center" >已取消<view class="lin"></view>
60 60 <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
61 61 </view>
  62 + <view wx:if="{{item.order_status==6}}">退款成功</view>
62 63 </block>
63 64 <block wx:else>退款中</block>
64 65  
... ...