From d1973de005fe67daa75f48495f5e7e82e57bc943 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Mon, 19 Aug 2024 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/order-goods/order-goods.vue | 11 +++++++++++
 components/order-list/order-list.vue   | 10 +++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/components/order-goods/order-goods.vue b/components/order-goods/order-goods.vue
index f29921d..5dfb41b 100644
--- a/components/order-goods/order-goods.vue
+++ b/components/order-goods/order-goods.vue
@@ -68,6 +68,13 @@
 				</view>
 			</view>
 			<view class="flex footer-block">
+				<view class="goods-footer flex p-r-0" v-if="orderStatus == 2 || orderStatus == 3">
+					<view class="flex-1"></view>
+					<router-link
+						:to="{path: '/bundle/pages/goods_logistics/goods_logistics', query: {id: delivery[index].id && delivery[index].id || 0}}">
+						<button size="sm" class="btn plain br60 lighter" hover-class="none">查看物流</button>
+					</router-link>
+				</view>
 				<view class="goods-footer flex p-r-0" v-if="link && item.comment_btn || item.refund_btn">
 					<view class="flex-1"></view>
 					<router-link v-if="item.comment_btn"
@@ -123,6 +130,10 @@
 			orderStatus: {
 				type: Number,
 				default: 0
+			},
+			delivery: {
+				type: Array,
+				default: () => []
 			}
 		},
 		methods: {
diff --git a/components/order-list/order-list.vue b/components/order-list/order-list.vue
index 8e8857a..abff88c 100644
--- a/components/order-list/order-list.vue
+++ b/components/order-list/order-list.vue
@@ -32,7 +32,11 @@
 						</view>
 					</view>
 					<view class="order-con">
-						<order-goods :list="item.order_goods" :isJumpGoods="false"></order-goods>
+						<order-goods :list="item.order_goods" :isJumpGoods="false" :orderStatus="item.order_status" :delivery="item.delivery_data" v-if="item.delivery_btn"></order-goods>
+						
+						<!-- 虚拟发货不显示物流 -->
+						<order-goods :list="item.order_goods" :isJumpGoods="false" v-if="!item.delivery_btn"></order-goods>
+						
 						<view class="all-price flex row-right">
 							<text class="muted xs">共{{item.goods_count}}件商品，实付款：</text>
 							<price-format weight="500" :subscript-size="30" :first-size="30" :second-size="30"
@@ -55,12 +59,12 @@
 								取消订单
 							</button>
 						</view>
-						<view v-if="item.delivery_btn" @tap.stop="">
+	<!-- 					<view v-if="item.delivery_btn" @tap.stop="">
 							<router-link
 								:to="{path: '/bundle/pages/goods_logistics/goods_logistics', query: {id: item.id}}">
 								<button size="sm" class="btn plain br60 lighter" hover-class="none">查看物流</button>
 							</router-link>
-						</view>
+						</view> -->
 						
                         <view v-if="item.content_btn" @tap.stop="" class="m-l-20">
                         	<router-link