|
|
|
@ -153,7 +153,8 @@ export default { |
|
|
|
provinceId: "", |
|
|
|
cityId: "", |
|
|
|
alertShow: false, |
|
|
|
address: "" |
|
|
|
address: "", |
|
|
|
flag: false |
|
|
|
}; |
|
|
|
}, |
|
|
|
components: { |
|
|
|
@ -172,6 +173,7 @@ export default { |
|
|
|
methods: { |
|
|
|
//监听地区选择的完成按钮 |
|
|
|
getName() { |
|
|
|
console.log(1); |
|
|
|
let arr = this.addressValue[2].split("&") || ""; |
|
|
|
this.districtId = arr[0]; |
|
|
|
this.merchantNo = arr[2]; |
|
|
|
@ -203,7 +205,10 @@ export default { |
|
|
|
}, |
|
|
|
//获取城市名称 |
|
|
|
change(name) { |
|
|
|
this.addressValue = name; |
|
|
|
if (this.flag) { |
|
|
|
console.log(1); |
|
|
|
this.addressValue = name; |
|
|
|
} |
|
|
|
}, |
|
|
|
//加载商品列表 |
|
|
|
getGoodsList() { |
|
|
|
@ -281,6 +286,7 @@ export default { |
|
|
|
this.merchantNo = 2; |
|
|
|
//区id |
|
|
|
this.districtId = "440106000"; |
|
|
|
this.addressValue = []; |
|
|
|
this.getGoodsList(); |
|
|
|
} |
|
|
|
this.show = false; |
|
|
|
@ -317,13 +323,18 @@ export default { |
|
|
|
.then(res => { |
|
|
|
if (res.data.allAddress && res.data.userAddress) { |
|
|
|
this.addressData = res.data.allAddress; |
|
|
|
this.flag = true; |
|
|
|
let data = res.data; |
|
|
|
this.provinceId = data.userAddress.provinceId; |
|
|
|
this.cityId = data.userAddress.cityId; |
|
|
|
this.districtId = data.userAddress.districtId; |
|
|
|
// this.provinceId = data.userAddress.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; |
|
|
|
if ( |
|
|
|
data.userAddress.type != 1 && |
|
|
|
@ -386,17 +397,17 @@ export default { |
|
|
|
getId() { |
|
|
|
let str = localStorage.getItem("cityName") || ""; |
|
|
|
if (!str) { |
|
|
|
return; |
|
|
|
} else { |
|
|
|
let arr = str.split(","); |
|
|
|
console.log(arr); |
|
|
|
this.addressValue = arr; |
|
|
|
this.provinceId = arr[0].split("&")[0]; |
|
|
|
this.cityId = arr[1].split("&")[0]; |
|
|
|
let cityNameArr = arr[2].split("&"); |
|
|
|
this.districtId = cityNameArr[0]; |
|
|
|
this.defaultCity = cityNameArr[1]; |
|
|
|
this.merchantNo = cityNameArr[2]; |
|
|
|
} |
|
|
|
let arr = str.split(","); |
|
|
|
console.log(arr); |
|
|
|
this.addressValue = arr; |
|
|
|
this.provinceId = arr[0].split("&")[0]; |
|
|
|
this.cityId = arr[1].split("&")[0]; |
|
|
|
let cityNameArr = arr[2].split("&"); |
|
|
|
this.districtId = cityNameArr[0]; |
|
|
|
this.defaultCity = cityNameArr[1]; |
|
|
|
this.merchantNo = cityNameArr[2]; |
|
|
|
}, |
|
|
|
getData() { |
|
|
|
let get = async () => { |
|
|
|
@ -414,7 +425,6 @@ export default { |
|
|
|
// this.getdefaultAddress(); |
|
|
|
// this.getAddress(); |
|
|
|
// this.getLocation(); |
|
|
|
console.log(2); |
|
|
|
this.getData(); |
|
|
|
this.ShareWenXin(); |
|
|
|
} |
|
|
|
|