From f949519a326816ed854e36d2bd2cb03ece20b110 Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Tue, 12 Mar 2024 14:34:48 +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

---
 pages/order_details/index.vue    |  8 ++++----
 pages/user/index.vue             |  6 +++---
 pages/users/refund/logistics.vue | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 8423ebc..d4fdfd2 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -321,7 +321,7 @@
 				</view>
 				<block v-if="orderInfo.status == 0">
 					<view class="bnt cancel" @click="allRefund"
-						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款</view>
 				</block>
 				<block v-if="orderInfo.status == 9">
 					<view class="bnt cancel" @click="getCombinationRemove">取消拼团</view>
@@ -336,7 +336,7 @@
 					查看拼团</view>
 				<block v-if="orderInfo.status == 1">
 					<!-- <view class="bnt cancel" @click="allRefund"
-						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款</view> -->
 					<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>
@@ -355,7 +355,7 @@
 				</block>
 				<block v-if="orderInfo.status == 2">
 					<view class="bnt cancel" @click="allRefund"
-						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款</view>
 					<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>
@@ -371,7 +371,7 @@
 				</block>
 				<block v-if="orderInfo.status == 3">
 					<view class='bnt cancel' @click="delOrder">删除订单</view>
-					<view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0">批量退款
+					<view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0  && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款
 					</view>
 					<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">
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 30bf975..21a8169 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -666,9 +666,9 @@
 								item.num = data.noComment
 								break
 							case '售后/退款':
-								// item.num = data.refund
-								item.num = 0
-								break
+								item.num = data.refund
+								// item.num = 0
+								break;
 						}
 					})
 				})
diff --git a/pages/users/refund/logistics.vue b/pages/users/refund/logistics.vue
index b0d7868..9caf7ec 100644
--- a/pages/users/refund/logistics.vue
+++ b/pages/users/refund/logistics.vue
@@ -17,13 +17,16 @@
 					<view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">复制单号</view>
 					<!-- #endif -->
 				</view>
-				<view class='item' v-for="(item,index) in expressList" :key="index">
-					<view class='circular' :class='index === 0 ? "on":""'></view>
-					<view class='text' :class='index===0 ? "on-font on":""'>
-						<view>{{item.status}}</view>
-						<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
-					</view>
-				</view>
+        <block v-if="expressList.length>0">
+          <view class='item' v-for="(item,index) in expressList" :key="index">
+          	<view class='circular' :class='index === 0 ? "on":""'></view>
+          	<view class='text' :class='index===0 ? "on-font on":""'>
+          		<view>{{item.status}}</view>
+          		<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
+          	</view>
+          </view>
+        </block>
+				
 			</view>
 			<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend>
 		</view>