wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 17:23:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
15093570141
2024-11-10 16:57:10 +08:00
parent 380bb582e4 63c01b5018
commit 34274cfc70
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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