From cc3204ea93b0483b4cea59aa10f915682e8352fc Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 28 Mar 2024 16:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderGoods/index.vue | 12 ++++++++++--
 pages/order_details/index.vue   | 16 ++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 7eb01a7..10c0284 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -38,7 +38,7 @@
 								</view>
 								<view class="right-btn-box event_box">
 									<view class="btn-item"
-										v-if="evaluate != 2 && item.is_refund ==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0"
+										v-if="evaluate != 2 && item.is_refund ==0 && pay_type!= 10 && status==0 && (evaluate != 10 && evaluate != 11) && orderData.refund_status || item.refund_num > 0"
 										@click.stop="refund(item)">申请退款</view>
 									<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
 										{{item.product_num - item.refund_num}}
@@ -112,7 +112,7 @@
 						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}
 						</view>
 						<view class="btn-item"
-							v-if="evaluate != 2 && item.refund_switch==1 && (item.is_refund == 0 && evaluate != 9 && orderData.refund_status || item.refund_num > 0)"
+							v-if="evaluate != 2 && item.refund_switch==1 && pay_type!= 10 && status==0 && (item.is_refund == 0 && evaluate != 9 && orderData.refund_status || item.refund_num > 0)"
 							@click.stop="refund(item)">申请退款</view>
 						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0'
 							@click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
@@ -169,6 +169,14 @@
 				type: String,
 				default: '',
 			},
+      pay_type:{
+        type: [Number, String],
+        default: 0,
+      },
+      status:{
+        type: [Number, String],
+        default: 0,
+      },
 			jump: {
 				type: Boolean,
 				default: false,
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 6211341..099cf9e 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -132,13 +132,13 @@
 					<text class="iconfont icon-xiangyou"></text>
 				</view>
 				<block v-if="cartInfo.length>0">
-					<orderGoods :orderData='orderInfo' :evaluate='orderInfo.status'
+					<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"  :evaluate='orderInfo.status'
 						:activityType='orderInfo.activity_type' :orderId="order_id" :cartInfo="cartInfo" :jump="true">
 					</orderGoods>
 					<block
 						v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
 						v-for="(item,index) in orderInfo.takeOrderList" :key="index">
-						<orderGoods :orderData='item' :evaluate='item.status' :activityType='item.activity_type'
+						<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='item.status' :activityType='item.activity_type'
 							:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
 					</block>
 				</block>
@@ -333,20 +333,20 @@
 				<view class='bnt b-color' v-if="orderInfo.activity_type==4" @tap='goJoinPink'>查看拼团</view>
 				<block v-if="orderInfo.status == 1">
 					<view class="bnt cancel" @click="allRefund"
-						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch == 1">
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch == 1 && orderInfo.pay_type != 10 && orderInfo.status != 1">
 						批量退款</view>
-					<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
+					<!-- <navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
 						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
-					</navigator>
+					</navigator> -->
 					<view class='bnt b-color' @tap='confirmOrder'>确认收货</view>
 				</block>
 				<block v-if="orderInfo.status == 2">
 					<!-- <view class="bnt cancel" @click="allRefund"
 						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch == 1">
 						批量退款</view> -->
-					<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
+					<!-- <navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
 						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
-					</navigator>
+					</navigator> -->
 					<view class='bnt b-color' @click="goOrderConfirm"
 						v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 &&orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
 						再次购买</view>
@@ -363,7 +363,7 @@
 				</block>
 			</view>
 			<view class='footer acea-row row-right row-middle'
-				v-if="isGoodsReturn==false && orderInfo.status == 0 && refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch">
+				v-if="isGoodsReturn==false && orderInfo.status == 0 && refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.refund_switch && orderInfo.pay_type != 10">
 				<view class="bnt cancel" @click="allRefund">批量退款</view>
 			</view>
 		</view>