diff --git a/src/view/home.vue b/src/view/home.vue index 4adea5e..47e2148 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -336,36 +336,6 @@ export default { data.userAddress.districtName; this.alertShow = true; } else if (data.userAddress.type == 2) { - this.provinceId = data.userAddress.provinceId - ? data.userAddress.provinceId - : this.provinceId; - this.cityId = data.userAddress.cityId - ? data.userAddress.cityId - : this.cityId; - this.districtId = data.userAddress.districtId - ? data.userAddress.districtId - : this.districtId; - this.defaultCity = data.userAddress.districtName - ? data.userAddress.districtName - : this.defaultCity; - this.merchantNo = data.userAddress.merchantNo; - this.addressValue = [ - this.provinceId + - "&" + - data.userAddress.provinceName, - this.cityId + - "&" + - data.userAddress.cityName, - this.districtId + - "&" + - data.userAddress.districtName + - "&" + - data.userAddress.merchantNo - ]; - localStorage.setItem( - "cityName", - this.addressValue.slice() - ); this.$vux.confirm.show({ title: "自动定位地址:", content: @@ -376,6 +346,40 @@ export default { this.show = true; }, onConfirm: () => { + this.provinceId = data.userAddress + .provinceId + ? data.userAddress.provinceId + : this.provinceId; + this.cityId = data.userAddress.cityId + ? data.userAddress.cityId + : this.cityId; + this.districtId = data.userAddress + .districtId + ? data.userAddress.districtId + : this.districtId; + this.defaultCity = data.userAddress + .districtName + ? data.userAddress.districtName + : this.defaultCity; + this.merchantNo = + data.userAddress.merchantNo; + this.addressValue = [ + this.provinceId + + "&" + + data.userAddress.provinceName, + this.cityId + + "&" + + data.userAddress.cityName, + this.districtId + + "&" + + data.userAddress.districtName + + "&" + + data.userAddress.merchantNo + ]; + localStorage.setItem( + "cityName", + this.addressValue.slice() + ); this.getGoodsList(); } });