diff --git a/pages/index.vue b/pages/index.vue index 5646f7b..dc556e9 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -522,7 +522,7 @@ import { bindCode } from '@/api/order/order.js' }, getCalendarDate() { let tomorrow = new Date() - tomorrow.setDate(tomorrow.getDate() + 2); + tomorrow.setDate(tomorrow.getDate()); this.startDate = this.formatDate(tomorrow); let threeMonthsLater = new Date(); threeMonthsLater.setMonth(threeMonthsLater.getMonth() + 3); diff --git a/pages/newOrder/address.vue b/pages/newOrder/address.vue index b3b0f24..d61efd3 100644 --- a/pages/newOrder/address.vue +++ b/pages/newOrder/address.vue @@ -203,6 +203,24 @@ this.$modal.showToast('请输入联系人') return false; } + // 所在地区与详细地址必填校验 + if(!params.province && !params.city && !params.district){ + this.$modal.showToast('请选择所在地区') + return false; + } + // 需具备定位信息(经纬度) + if(!params.latitude || !params.longitude){ + this.$modal.showToast('定位信息缺失,请重新选择所在地区') + this.addressInfo.province = '' + this.addressInfo.city = '' + this.addressInfo.district = '' + this.addressInfo.selectAddress = '' + return false; + } + if(!params.detailAddress){ + this.$modal.showToast('请输入详细地址') + return false; + } this.loading=true if(this.optionType=='edit'){ params.id = this.addressId; diff --git a/pages/newOrder/addressList.vue b/pages/newOrder/addressList.vue index e717cf3..c7e8b83 100644 --- a/pages/newOrder/addressList.vue +++ b/pages/newOrder/addressList.vue @@ -124,7 +124,7 @@ }, useAddress(params){ // 检查地址是否有经纬度信息 - if(!params.latitude || !params.longitude) { + if(!params.latitude || !params.longitude || (!params.province && !params.city && !params.district)) { uni.showModal({ title: '提示', content: '该地址缺少位置信息,需要重新定位,请点击确定重新选择位置', diff --git a/pages/newOrder/petList.vue b/pages/newOrder/petList.vue index 541882f..5f07a26 100644 --- a/pages/newOrder/petList.vue +++ b/pages/newOrder/petList.vue @@ -334,7 +334,7 @@ export default { }, getCalendarDate() { let tomorrow = new Date() - tomorrow.setDate(tomorrow.getDate() + 2); + tomorrow.setDate(tomorrow.getDate()); this.startDate = this.formatDate(tomorrow); // 获取三个月后的日期 diff --git a/pages/personalCenter/addressInfo.vue b/pages/personalCenter/addressInfo.vue index 648d697..b97bc4b 100644 --- a/pages/personalCenter/addressInfo.vue +++ b/pages/personalCenter/addressInfo.vue @@ -230,6 +230,26 @@ this.$modal.showToast('请输入联系人') return false; } + + // 所在地区与详细地址必填校验 + if(!params.province && !params.city && !params.district){ + this.$modal.showToast('请选择所在地区') + return false; + } + // 需具备定位信息(经纬度) + if(!params.latitude || !params.longitude){ + this.$modal.showToast('定位信息缺失,请重新选择所在地区') + this.addressInfo.province = '' + this.addressInfo.city = '' + this.addressInfo.district = '' + this.addressInfo.selectAddress = '' + return false; + } + if(!params.detailAddress){ + this.$modal.showToast('请输入详细地址') + return false; + } + this.loading=true console.log(params); if(this.optionType=='edit'){ diff --git a/utils/getUrl.js b/utils/getUrl.js index a63b854..7f40537 100644 --- a/utils/getUrl.js +++ b/utils/getUrl.js @@ -5,7 +5,7 @@ const accountInfo = wx.getAccountInfoSync(); const api={ - develop:"http://127.0.0.1:8002", + develop:"http://127.0.0.1:8080", // develop:"http://h5.xzaiyp.top", // develop:"https://api.catmdogd.com/prod-api", // develop:"https://api-test.catmdogd.com/test-api",