wxd / MShopWeApp

Commit 52d80ff748406755e16afcb3ddf1db2e91733cd3

Authored by yvan.ni
2 parents 30de34b9 b733dc34

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

Inline Side-by-side
Showing 1 changed file with 8 additions and 6 deletions
pages/user/order_list/order_list.wxml
  View file @52d80ff
... ... @@ -97,6 +97,7 @@
97 97 <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
98 98 <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
99 99 <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
  100 + <view class="abs flex-center fs26" wx:if="{{goods.prom_type==9}}">幸运购</view>
100 101 </navigator>
101 102 <!-- 商品内容 -->
102 103 <view class="Commodity_content">
... ... @@ -179,11 +180,11 @@
179 180 </view>
180 181 </view>
181 182 <view class="links flex-right-vertical fs24 padding">
182   - <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
  183 + <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
183 184 <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
184 185 <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
185 186 <!---has_rt部分退---->
186   - <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
  187 + <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1 && !(item.order_goods[0].prom_type==9)}}">
187 188 <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
188 189 <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
189 190 </block>
... ... @@ -194,8 +195,9 @@
194 195 </block>
195 196 <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
196 197 <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
197   -
198   - <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}">订单详情</navigator>
  198 +
  199 + <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>
  200 + <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
199 201  
200 202 <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
201 203 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
... ... @@ -221,9 +223,9 @@
221 223 <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
222 224  
223 225 <!-- 积分购 拼团 搭配购没有有再来一单 -->
224   - <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 }}">
  226 + <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 && !(item.order_goods[0].prom_type==9)}}">
225 227 <view bindtap="moreOrder" class="commodity_To_evaluate flex-level comment_go"
226   - data-index="{{index}}" >再来一单</view>
  228 + data-index="{{index}}">再来一单</view>
227 229 </block>
228 230  
229 231  
... ...