Merge branch 'dev' of http://git.coreshop.cn/jianweie/coreshoppro into dev

CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue

@@ -273,7 +273,7 @@
 	const state = reactive<{
 		orderType : PaymentTypeEnum;    // 订单类型
 		tabList : Array<TabList>;       // 送达方式
-		tabSelectType : OrderDistributionEnum; // 送达方式类型
+		tabSelectType ?: OrderDistributionEnum; // 送达方式类型
 		userDefaultShip : AddressType;  // 默认地址数据
 		leaveMsg : string;              // 卖家留言
 		cartData : any;                 // 商品购物车数据
@@ -295,9 +295,9 @@
 		tabList: [
 			{ name: '快递物流', type: OrderDistributionEnum.mailing, show: false, },
 			{ name: '同城配送', type: OrderDistributionEnum.homeDelivery, show: false, }, 
-			{ name: '门店自提', type: OrderDistributionEnum.selfDelivery, show: false  , }
+			{ name: '门店自提', type: OrderDistributionEnum.selfDelivery, show: false, } 
 		],
-		tabSelectType: OrderDistributionEnum.mailing,
+		tabSelectType: null,
 		userDefaultShip: {},
 		leaveMsg: "",
 		cartData: {},
@@ -586,6 +586,10 @@
 	/** 立即购买 */
 	async function onSubmit() {
 		let delivery : any = {};
+		if (!state.tabSelectType) {
+			handleShowToast('请选择下单配送方式');
+			return;
+		}
 		/** 如果是快递物流 / 同城送货 */
 		if (state.tabSelectType === OrderDistributionEnum.mailing || state.tabSelectType == OrderDistributionEnum.homeDelivery) {
 			if (!state.userDefaultShip.id || !state.userDefaultShip.areaId) {