diff --git a/otherPages/authentication/connectAddress/detail.vue b/otherPages/authentication/connectAddress/detail.vue index 154b76a..1a16534 100644 --- a/otherPages/authentication/connectAddress/detail.vue +++ b/otherPages/authentication/connectAddress/detail.vue @@ -31,7 +31,7 @@ - + @@ -105,7 +105,7 @@ longitude: null, address: null, status: true, - distance: null, + rangeNo: null, disabledDate: [], }) @@ -163,6 +163,15 @@ } const onSave = async () => { + // 验证接单范围是否在3-15公里之间 + if (form.value.rangeNo < 3 || form.value.rangeNo > 15) { + uni.showToast({ + title: '接单范围必须在3-15公里之间', + icon: 'none' + }) + return + } + let code = null; if (eidtItem?.value?.id) { let result = await udpateAddress({ diff --git a/otherPages/authentication/examination/train.vue b/otherPages/authentication/examination/train.vue index b0f8a98..7a82547 100644 --- a/otherPages/authentication/examination/train.vue +++ b/otherPages/authentication/examination/train.vue @@ -106,7 +106,7 @@ onShow(() => { position: sticky; top: 0; background-image: linear-gradient(180deg, #FFBF60 0, #ffbf60 2%, #ffbf60 8%, #f2f2f2 90%); - + z-index: 99; .progress { margin-top: 19rpx; } diff --git a/otherPages/authentication/serve/upload.vue b/otherPages/authentication/serve/upload.vue index 72b369e..81bfb32 100644 --- a/otherPages/authentication/serve/upload.vue +++ b/otherPages/authentication/serve/upload.vue @@ -4,6 +4,8 @@ + + 注意:这段内容将会在您的喂养员个人主页,做为"服务案例”展示,并开放给其他铲屎官查看,请认真编辑哟! @@ -198,7 +200,6 @@ const onSave = async () => { try { - const { serviceType, serviceTime, @@ -207,6 +208,42 @@ fileList, } = form + // 表单验证 + if (!serviceType || serviceType.length === 0) { + return uni.showToast({ + title: '请选择服务类型', + icon: 'none' + }) + } + + if (!serviceTime) { + return uni.showToast({ + title: '请选择服务时间', + icon: 'none' + }) + } + + if (!serviceSpot) { + return uni.showToast({ + title: '请选择服务地点', + icon: 'none' + }) + } + + if (!text) { + return uni.showToast({ + title: '请输入服务描述', + icon: 'none' + }) + } + + if (!fileList || fileList.length === 0) { + return uni.showToast({ + title: '请上传服务图片', + icon: 'none' + }) + } + const data = { userId: store.getters.userInfo.userId, serviceType: serviceType.join(','), @@ -232,7 +269,10 @@ uni.navigateBack() }, 1000) } catch (err) { - + uni.showToast({ + title: '提交失败,请重试', + icon: 'none' + }) } } @@ -264,7 +304,8 @@ .tips { padding: 8rpx 16rpx; - background-color: rgb(255, 250, 242); + background-color: #FFFAF2; + color: #FFBF60; } .li { diff --git a/otherPages/userManage/pet/petInfo.vue b/otherPages/userManage/pet/petInfo.vue index 86899f0..078ce0f 100644 --- a/otherPages/userManage/pet/petInfo.vue +++ b/otherPages/userManage/pet/petInfo.vue @@ -399,10 +399,10 @@ } .personal-pet-img { - width: 100%; height: 118px; background-color: #fff; padding: 10px 20px; + } .personal-pet-basic-info { diff --git a/pages/myOrdersManage/components/systemOrder.vue b/pages/myOrdersManage/components/systemOrder.vue index c36b2c8..71945ed 100644 --- a/pages/myOrdersManage/components/systemOrder.vue +++ b/pages/myOrdersManage/components/systemOrder.vue @@ -114,9 +114,9 @@ import PetServicePopup from './petServicePopup.vue'; // 跳转订单详情 const toOrderDetail = (id) => { - uni.navigateTo({ - url: `/otherPages/orderTakingManage/detail/index?id=${id}&type=my` - }); + // uni.navigateTo({ + // url: `/otherPages/orderTakingManage/detail/index?id=${id}&type=my` + // }); } // 显示服务时间弹窗 diff --git a/pages/workbenchManage/index.scss b/pages/workbenchManage/index.scss index 76df674..87f814e 100644 --- a/pages/workbenchManage/index.scss +++ b/pages/workbenchManage/index.scss @@ -3,7 +3,9 @@ } .container{ padding: 0 20rpx 20rpx; - margin-top: 20rpx; + margin-top: 28rpx; + position: relative; + z-index: 9; &-list{ padding: 26rpx 20rpx; background: #FFFFFF; diff --git a/pages/workbenchManage/index.vue b/pages/workbenchManage/index.vue index 4af49d5..f60e25c 100644 --- a/pages/workbenchManage/index.vue +++ b/pages/workbenchManage/index.vue @@ -1,7 +1,15 @@