From 9a77e73f05788154bcefb8052a8c5dd434b82e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sat, 1 Apr 2023 11:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9D=80=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/create.vue               | 11 +++++------
 src/pages/service/other/distribution.vue |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/order/create.vue b/src/pages/order/create.vue
index d742960..2defc57 100644
--- a/src/pages/order/create.vue
+++ b/src/pages/order/create.vue
@@ -172,17 +172,16 @@ export default {
          * 下单支付
          */
         pay() {
-            if (!this.isAgree) {
-                uni.showToast({
-                    title: "请先阅读并同意《服务协议》《隐私政策》",
-                    icon: "none",
-                });
-                return;
+            if (!this.addressId) {
+                return this.$utils.toast("请选择地址");
             }
             if (!this.date || !this.time) {
                 return this.$utils.toast("请选择时间和日期");
             }
             let datetime = this.date + " " + this.time;
+            if (!this.isAgree) {
+                return this.$utils.toast("请先阅读并同意《服务协议》《隐私政策》");
+            }
             this.$models.order
                 .createOrder({
                     ids: this.orderData,
diff --git a/src/pages/service/other/distribution.vue b/src/pages/service/other/distribution.vue
index 0a0dfd0..05d40f3 100644
--- a/src/pages/service/other/distribution.vue
+++ b/src/pages/service/other/distribution.vue
@@ -201,6 +201,9 @@ export default {
          * 提交订单
          */
         submit() {
+            if (!this.pickupAddressId || !this.unloadAddressId) {
+                return this.$utils.toast("请选择地址");
+            }
             if (!this.date || !this.time) {
                 return this.$utils.toast("请选择时间和日期");
             }