From fb2b466f6f5497a217f353fe115bc18769e2f3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E5=9F=8E?=
 <141405260+17521612761@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:12:00 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E5=95=86=E5=AE=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E9=9C=80=E8=A6=81=E6=A0=B8=E9=94=80=E5=88=B8?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpackage/merchant/serviceVerification/index/index.vue  | 5 ++++-
 .../pages/subpackage/merchant/takeDelivery/index/index.vue   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/serviceVerification/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/serviceVerification/index/index.vue
index e1704cd5..6c57de85 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/serviceVerification/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/serviceVerification/index/index.vue
@@ -107,13 +107,16 @@
 	}
 
 	const getServiceVerificationTicketInfo = async () => {
+        if (!state.id) { return };
 		const ladingInfo : Response<any> = await queryServiceVerificationTicketInfo({ id: state.id });
 		if (ladingInfo.status) {
 			state.ticket = ladingInfo.data.ticket;
 			state.service = ladingInfo.data.service;
 			state.serviceOrder = ladingInfo.data.serviceOrder;
 			state.ticket['checkboxValue'] = [`${ladingInfo.data.ticket?.redeemCode}`];
-		}
+		}else{
+           handleShowToast(ladingInfo.msg); 
+        }
 	}
 
 	/** 确认核销 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/takeDelivery/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/takeDelivery/index/index.vue
index c230b6d2..7ea743af 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/takeDelivery/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/merchant/takeDelivery/index/index.vue
@@ -97,13 +97,16 @@
 	}
 
 	const getLadingInfo = async () => {
+        if (!state.id) { return };
 		const ladingInfo : Response<any> = await queryLadingInfo({ id: state.id });
 		if (ladingInfo.status) {
 			state.list = ladingInfo.data.map((item : any) => {
 				item['checkboxValue'] = [`${item.id}`];
 				return item;
 			});
-		}
+		}else{
+           handleShowToast(ladingInfo.msg); 
+        }
 	}
 
 	/** 组合商品数据传入组件 */