|
|
@@ -61,7 +61,8 @@
|
|
|
},
|
|
|
computed: {},
|
|
|
watch: {
|
|
|
- results: function (val, oldVal) {}
|
|
|
+ results: function (val, oldVal) {
|
|
|
+ }
|
|
|
},
|
|
|
created () {
|
|
|
if (localStorage.getItem('positionName')) {
|
|
|
@@ -101,33 +102,46 @@
|
|
|
this.showAlert = true
|
|
|
return
|
|
|
}
|
|
|
- // 地址定位
|
|
|
- if (config.addressPio.location === undefined) {
|
|
|
- console.log('location')
|
|
|
+ // 判断当前用户是否定位
|
|
|
+ if (config.addressPio.length === 0) {
|
|
|
config.addressPio.location = {
|
|
|
'lat': config.editAddress.position[1],
|
|
|
-
|
|
|
+ 'lng': config.editAddress.position[0]
|
|
|
}
|
|
|
- config.addressPio.location.lat = config.editAddress.position[1]
|
|
|
- config.addressPio.location.lng = config.editAddress.position[0]
|
|
|
- }
|
|
|
- console.log(config.addressPio.location)
|
|
|
- config.addressDetail = {
|
|
|
- 'province': config.addressPio.city,
|
|
|
- 'city': config.addressPio.city,
|
|
|
- 'area': config.addressPio.district,
|
|
|
- 'detail': this.userAddress,
|
|
|
- 'poi': {
|
|
|
- 'uid': config.addressPio.uid,
|
|
|
- 'name': config.addressPio.name
|
|
|
+ config.addressDetail = {
|
|
|
+ 'province': config.editAddress.address.province,
|
|
|
+ 'city': config.editAddress.address.city,
|
|
|
+ 'area': config.editAddress.address.area,
|
|
|
+ 'detail': this.userAddress,
|
|
|
+ 'poi': {
|
|
|
+ 'uid': config.editAddress.address.poi.uid,
|
|
|
+ 'name': config.editAddress.address.poi.name
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ config.addressDetail = {
|
|
|
+ 'province': config.addressPio.city,
|
|
|
+ 'city': config.addressPio.city,
|
|
|
+ 'area': config.addressPio.district,
|
|
|
+ 'detail': this.userAddress,
|
|
|
+ 'poi': {
|
|
|
+ 'uid': config.addressPio.uid,
|
|
|
+ 'name': config.addressPio.name
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 新增地址
|
|
|
- axios.get('api/shop/editAddress&request_from=weixin&name=' + this.userName + '&mobile=' + this.userMobile + '&user_id=' + config.userId + '&address_id=' + config.editAddress.address_id + '&address_position=' + JSON.stringify(config.addressPio.location) + '&address=' + JSON.stringify(config.addressDetail)).then(response => {
|
|
|
- if (response.data.success) {
|
|
|
-// this.$router.push({path: '/addressList'})
|
|
|
- this.$router.go(-1)
|
|
|
+ axios.get('api/shop/editAddress&request_from=weixin&name=' + this.userName + '&mobile=' + this.userMobile + '&user_id=' + config.userId + '&address_id=' + config.editAddress.address_id + '&address_position=' + JSON.stringify(config.addressPio.location) + '&address=' + JSON.stringify(config.addressDetail)).then(res => {
|
|
|
+ if (res.data.success) {
|
|
|
+ console.log(res.data)
|
|
|
+ this.$router.push({path: '/addressList'})
|
|
|
+
|
|
|
+// console.log(res.data.data.address)
|
|
|
+// console.log(config.shopAddress)
|
|
|
+// this.alertTitle = '恭喜'
|
|
|
+// this.alertContent = '修改成功!'
|
|
|
+// this.showAlert = true
|
|
|
return
|
|
|
} else {
|
|
|
this.alertTitle = '抱歉'
|
洪海涛