|
|
@ -971,7 +971,8 @@ |
|
|
if (this.startingPriceCheckAmount + 0.0001 >= this.startingPriceAmount) return true; |
|
|
if (this.startingPriceCheckAmount + 0.0001 >= this.startingPriceAmount) return true; |
|
|
uni.showToast({ |
|
|
uni.showToast({ |
|
|
title: `不满${this.formatAmountText(this.startingPriceAmount)}元起送条件`, |
|
|
title: `不满${this.formatAmountText(this.startingPriceAmount)}元起送条件`, |
|
|
icon: 'none' |
|
|
icon: 'none', |
|
|
|
|
|
duration: 1500 |
|
|
}); |
|
|
}); |
|
|
setTimeout(() => { |
|
|
setTimeout(() => { |
|
|
this.backToGroupBuySingle(); |
|
|
this.backToGroupBuySingle(); |
|
|
@ -1274,7 +1275,7 @@ |
|
|
if (matched && String(res.result.id) === String(regionId)) { |
|
|
if (matched && String(res.result.id) === String(regionId)) { |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
this.tui.toast('收货地址不在当前区域配送范围内'); |
|
|
this.tui.toast('收货地址不在当前区域配送范围内', 1500); |
|
|
return false; |
|
|
return false; |
|
|
}).catch(() => { |
|
|
}).catch(() => { |
|
|
this.tui.toast('地址范围校验失败,请稍后重试'); |
|
|
this.tui.toast('地址范围校验失败,请稍后重试'); |
|
|
@ -1636,7 +1637,7 @@ |
|
|
if (deliveryType === 1 && !isJoiningFaceToFace) { |
|
|
if (deliveryType === 1 && !isJoiningFaceToFace) { |
|
|
payload.addressId = this.formData.address ? this.formData.address.id : null; |
|
|
payload.addressId = this.formData.address ? this.formData.address.id : null; |
|
|
payload.getAreaId = this.shopItem.shopArea || null; |
|
|
payload.getAreaId = this.shopItem.shopArea || null; |
|
|
payload.putAreaId = this.isSocialArea ? null : (this.formData.address ? this.formData.address.areaId : null); |
|
|
payload.putAreaId = this.formData.address ? (this.isSocialArea ? this.formData.address.id : this.formData.address.areaId) : null; |
|
|
if (this.shopItem.supportTransferDelivery == 1) { |
|
|
if (this.shopItem.supportTransferDelivery == 1) { |
|
|
payload.transferDelivery = 1; |
|
|
payload.transferDelivery = 1; |
|
|
payload.transferAddressId = this.shopItem.transferAddressId; |
|
|
payload.transferAddressId = this.shopItem.transferAddressId; |
|
|
|