wxd / MShopWeApp

Commit 4f7a77b811a51562189565cbbd9e1ce4fc3006f8

Authored by yvan.ni
1 parent bdb37342

整单退的控制

Inline Side-by-side
Showing 4 changed files with 20 additions and 2 deletions
pages/user/order_detail/order_detail.js
  View file @4f7a77b
... ... @@ -70,6 +70,16 @@ Page({
70 70 success:async function (eb) {
71 71 r.order_goods=eb.data.data.pageData;
72 72  
  73 + var glist = r.order_goods;
  74 + for(var i in glist){
  75 + if(glist[i].is_gift){
  76 + r.is_prom=1;
  77 + }
  78 + }
  79 +
  80 +
  81 +
  82 +
73 83 //------------对比一下有没有退款记录------------
74 84 await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
75 85 data: { order_id: r.order_id, store_id: os.stoid,
... ...
pages/user/order_detail/order_detail.wxml
  View file @4f7a77b
... ... @@ -35,7 +35,7 @@
35 35 <view class="goods-num">×{{item.goods_num}}</view>
36 36  
37 37 <!-- 不是整单退的时候 -->
38   - <block wx:if="{{order.is_all_return!=1 && item.discount!=0}}">
  38 + <block wx:if="{{order.is_all_return!=1 && order.discount==0 && order.coupon_price<=0 && order.order_prom_amount<=0 && order.discount_amount<0 && item.prom_type!=5 && !order.is_prom}}">
39 39 <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
40 40 data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==1 && !order.is_bedistri}}">申请退款</view>
41 41 <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
... ...
pages/user/order_list/order_list.js
  View file @4f7a77b
... ... @@ -112,6 +112,14 @@ Page({
112 112 tt = res;
113 113 })
114 114  
  115 + var glist = tt.data.data.pageData;
  116 + for(var i in glist){
  117 + if(glist[i].is_gift){
  118 + data[ind].is_prom=1;
  119 + }
  120 + }
  121 +
  122 +
115 123 //------------对比一下有没有退款记录------------
116 124 await getApp().request.promiseGet("/api/weshop/order/returngoods/page", {
117 125 data: {
... ...
pages/user/order_list/order_list.wxml
  View file @4f7a77b
... ... @@ -67,7 +67,7 @@
67 67 </view>
68 68 <view class="flex-level-right fs26 refund">
69 69 <!-- 不是整单退的时候 -->
70   - <block wx:if="{{item.is_all_return!=1 && item.discount!=0}}">
  70 + <block wx:if="{{item.is_all_return!=1 && item.discount==0 && item.coupon_price<=0 && item.order_prom_amount<=0 && item.discount_amount<0 && goods.prom_type!=5 && !item.is_prom}}">
71 71 <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1 && !item.is_bedistri }}">申请退款</view>
72 72 <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
73 73 <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
... ...