From 4f7a77b811a51562189565cbbd9e1ce4fc3006f8 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 26 May 2020 09:01:24 +0800
Subject: [PATCH] 整单退的控制

---
 pages/user/order_detail/order_detail.js   | 10 ++++++++++
 pages/user/order_detail/order_detail.wxml |  2 +-
 pages/user/order_list/order_list.js       |  8 ++++++++
 pages/user/order_list/order_list.wxml     |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 01c93a3..0be576f 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -70,6 +70,16 @@ Page({
                     success:async function (eb) {
                           r.order_goods=eb.data.data.pageData;
 
+                        var glist =  r.order_goods;
+                        for(var i in glist){
+                            if(glist[i].is_gift){
+                                r.is_prom=1;
+                            }
+                        }
+
+
+
+
                           //------------对比一下有没有退款记录------------
                           await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
                               data: { order_id: r.order_id, store_id: os.stoid,
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 9bbdb3f..b21ba3b 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -35,7 +35,7 @@
                 <view class="goods-num">×{{item.goods_num}}</view>
 
                 <!-- 不是整单退的时候 -->
-                <block wx:if="{{order.is_all_return!=1 && item.discount!=0}}">
+                <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}}">
                     <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
                           data-recid="{{item.goods_id}}"  wx:if="{{item.return_btn==1 && !order.is_bedistri}}">申请退款</view>
                     <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 63f0b68..722a076 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -112,6 +112,14 @@ Page({
           tt = res;
         })
 
+        var glist = tt.data.data.pageData;
+        for(var i in glist){
+            if(glist[i].is_gift){
+                data[ind].is_prom=1;
+            }
+        }
+
+
         //------------对比一下有没有退款记录------------
         await getApp().request.promiseGet("/api/weshop/order/returngoods/page", {
           data: {
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 93e0f37..efd98b2 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -67,7 +67,7 @@
               </view>
               <view class="flex-level-right fs26 refund">
                 <!-- 不是整单退的时候 -->
-                <block wx:if="{{item.is_all_return!=1 && item.discount!=0}}">
+                <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}}">
                   <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>
                   <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
                   <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
--
libgit2 0.21.4