diff --git a/pages/order/complete-service.vue b/pages/order/complete-service.vue index c7b73a7..1d94310 100644 --- a/pages/order/complete-service.vue +++ b/pages/order/complete-service.vue @@ -28,7 +28,7 @@ - + 提交收款信息 @@ -219,6 +219,7 @@ const init = () => { } data.value = res + submitData.receive_type = res.order_info.receive_type }).catch(() => {}) } @@ -229,6 +230,7 @@ const submitData = reactive({ offline_total_type: 0,//尾款收款方:1=师傅收,2=公司收 amount: '',//收款金额 payment_image: '',//收款图片 + receive_type: null,//收款类型:1=定金,2=全款 }) const selectFinalPaymentMethod = () => { @@ -262,6 +264,10 @@ const validate = () => { return false } + if (data.value.order_info.receive_type === 2) { + return true + } + if (submitData.final_payment_method === null) { helpers.showToast('请选择收款方式') return false diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue index 23bc247..b0936f3 100644 --- a/pages/order/order-info.vue +++ b/pages/order/order-info.vue @@ -97,7 +97,7 @@ - + 完成图片 @@ -105,32 +105,34 @@ - - 优惠信息 - - {{data.order_info.online_amount}}元抵扣{{data.order_info.discount_amount}}元 - - - - 尾款收款方 - - {{ data.offline_total_type === 1 ? '师傅收' : '公司收' }} - - - - 收款金额 - - ¥{{ data.total > 0 ? data.total : data.online_total }} - - - - 收款凭证 - - - +