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

yvan.ni
2 parents 0551d6da cdb607b0
Showing 2 changed files with 41 additions and 18 deletions
packageC/pages/presell/cart/cart.wxml
pages/user/order_list/order_list.wxml
@@ -10,7 +10,8 @@
                 <view class="pdr20">
                     <text class="iconfont icon-qianbao fs60"></text>
                 </view>
-
+				
+			
                 <view wx:if="{{wait_dj}}">
                     <view>等待买家付定金</view>
                     <view>{{filters.format_time(act.start_time,1)}} - {{filters.format_time(act.end_time,1)}} </view>
@@ -30,7 +31,7 @@
                     <view>等待买家付尾款</view>
                     <view class="fs22">请于{{days}}天{{hours}}小时{{minutes}}分{{seconds}}秒内付款完成，超时订单将自动取消</view>
                 </view>
-                <view wx:if="{{wait_fh}}">
+                <view wx:if="{{wait_fh && order.order_status!=6}}">
                     <view>等待商家发货</view>
                     <view class="fs22">将在{{filters.format_time(send_time,1)}}后发货</view>
                 </view>
@@ -220,7 +221,7 @@
         </view>
-        <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}}">
+        <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}}">
             <view wx:if="{{order.store_prom}}">
                 <icon color="#f23030" size="16" type="info"></icon>
                 {{order.store_prom}}
@@ -293,21 +294,42 @@
                 <view>商品金额</view>
                 <view class="co-red">￥ {{filters.toFix(allpice,2)}}元</view>
             </view>
-            <view class="item" wx:if="{{exp_price>0}}">
-                <view>配送费用</view>
-                <view class="co-red">￥ {{filters.toFix(exp_price,2)}}元</view>
-            </view>
-
-            <view class="item" wx:if="{{quan_price>0}}">
-                <view>优惠券优惠</view>
-                <view class="co-red">￥ -{{filters.toFix(quan_price,2)}}元</view>
-            </view>
-
-            <view class="item" wx:if="{{order_prom_amount>0}}">
-                <view>订单优惠</view>
-                <view class="co-red">￥ -{{filters.toFix(order_prom_amount,2)}}元</view>
-            </view>
-
+			
+			<!-- 未支付订单，没有取消的 -->
+			<block wx:if="{{order.pay_status<1 && order.order_status<2}}">
+				<view class="item" wx:if="{{exp_price>0}}">
+					<view>配送费用</view>
+					<view class="co-red">￥ {{filters.toFix(exp_price,2)}}元</view>
+				</view>
+				
+				<view class="item" wx:if="{{quan_price>0}}">
+					<view>优惠券优惠</view>
+					<view class="co-red">￥ -{{filters.toFix(quan_price,2)}}元</view>
+				</view>
+				
+				<view class="item" wx:if="{{order_prom_amount>0}}">
+					<view>订单优惠</view>
+					<view class="co-red">￥ -{{filters.toFix(order_prom_amount,2)}}元</view>
+				</view>		
+			</block>
+			
+			<block else>
+				<view class="item" wx:if="{{order.shipping_status>0}}">
+					<view>配送费用</view>
+					<view class="co-red">￥ {{filters.toFix(order.shipping_status,2)}}元</view>
+				</view>
+				
+				<view class="item" wx:if="{{order.coupon_price>0}}">
+					<view>优惠券优惠</view>
+					<view class="co-red">￥ -{{filters.toFix(order.coupon_price,2)}}元</view>
+				</view>
+				
+				<view class="item" wx:if="{{order.order_prom_amount>0}}">
+					<view>订单优惠</view>
+					<view class="co-red">￥ -{{filters.toFix(order.order_prom_amount,2)}}元</view>
+				</view>	
+				
+			</block>
         </view>
         <view class="information bdr14 mgt20">
@@ -59,6 +59,7 @@
 					<view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
 					</view>
+					<view wx:if="{{item.order_status==6}}">退款成功</view>
 				</block>
 				<block wx:else>退款中</block>