Merge branch 'dev' into 'master'

uniapp【优化】：优化商家管理查找需要核销券的提示

See merge request jianweie/coreshoppro!103

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); 
+        }
 	}
 
 	/** 确认核销 */

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); 
+        }
 	}
 
 	/** 组合商品数据传入组件 */