From 4360b46a4b254e7b54d65e9c4907506a455dec2b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Apr 2021 09:14:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/clientManagement/clientManagement.vue | 1 -
src/views/system/cs.vue | 6 +++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index bdc9ea3..5c9f94d 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -707,7 +707,6 @@
}else{
that.form.city = val.addressComponent.city;
}
-
that.form.district = val.addressComponent.district;
});
}
diff --git a/src/views/system/cs.vue b/src/views/system/cs.vue
index 27d561c..88df297 100644
--- a/src/views/system/cs.vue
+++ b/src/views/system/cs.vue
@@ -730,7 +730,11 @@
}
//写入新的省市区
that.form.province = val.addressComponent.province;
- that.form.city = val.addressComponent.city;
+ if(val.addressComponent.city==""){
+ that.form.city = val.addressComponent.province;
+ }else{
+ that.form.city = val.addressComponent.city;
+ }
that.form.district = val.addressComponent.district;
}
},
--
Gitblit v1.9.3