From 9fa9b61c0053267110a2883bedb9d3f0993c644b Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 21 May 2024 16:41:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  2 +-
 pages/user-address-save/user-address-save.vue | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/App.vue b/App.vue
index 4699ac56..e62e022c 100644
--- a/App.vue
+++ b/App.vue
@@ -90,7 +90,7 @@
                 weixin_privacy_setting_timer: null,
                 
                 // 弹出获取用户当前位置（0否, 1是）
-                get_user_location_status: 1,
+                get_user_location_status: 0,
                 get_user_location_timer: null,
 
                 // 微信小程序打开地图使用（0否, 1是）【腾讯位置服务路线规划】插件、（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index 01c505a9..6e67cb99 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -717,7 +717,16 @@
                     region_picker_show: false,
                 });
             },
-            region_event(address1, address2, address3) {
+            region_event(address1, address2, address3) {
+                if((address1 || null) == null) {
+                    address1 = {};
+                }
+                if((address2 || null) == null) {
+                    address2 = {};
+                }
+                if((address3 || null) == null) {
+                    address3 = {};
+                }
                 this.setData({
                     province_id: address1.id || null,
                     city_id: address2.id || null,