diff --git a/src/core/models/get.js b/src/core/models/get.js index a10d5e6..1b5c822 100644 --- a/src/core/models/get.js +++ b/src/core/models/get.js @@ -74,6 +74,8 @@ export default { detail: response.data.address.doorplate, name: response.data.address.name, mobile: response.data.address.mobil, + lng: response.data.address.lng, + lat: response.data.address.lat, }, }; if (options.listType == "t1") { @@ -89,8 +91,22 @@ export default { cate: "配送订单", createTime: response.data.times, serviceTime: response.data.starttime, - pickupAddress: response.data.address, - unloadAddress: response.data.addressb, + pickupAddress: { + address: response.data.address_a.address, + detail: response.data.address_a.doorplate, + name: response.data.address_a.name, + mobile: response.data.address_a.mobil, + lng: response.data.address_a.lng, + lat: response.data.address_a.lat, + }, + unloadAddress: { + address: response.data.address_b.address, + detail: response.data.address_b.doorplate, + name: response.data.address_b.name, + mobile: response.data.address_b.mobil, + lng: response.data.address_b.lng, + lat: response.data.address_b.lat, + }, state: response.data.status, price: response.data.money, }; diff --git a/src/core/models/order.js b/src/core/models/order.js index 4f7a9a5..f68fd28 100644 --- a/src/core/models/order.js +++ b/src/core/models/order.js @@ -117,6 +117,8 @@ export default { detail: response.data.address.doorplate, name: response.data.address.name, mobile: response.data.address.mobil, + lng: response.data.address.lng, + lat: response.data.address.lat, }, }; if (options.listType == "t1") { @@ -132,8 +134,22 @@ export default { cate: "货运订单", createTime: response.data.times, serviceTime: response.data.starttime, - pickupAddress: response.data.address, - unloadAddress: response.data.addressb, + pickupAddress: { + address: response.data.address_a.address, + detail: response.data.address_a.doorplate, + name: response.data.address_a.name, + mobile: response.data.address_a.mobil, + lng: response.data.address_a.lng, + lat: response.data.address_a.lat, + }, + unloadAddress: { + address: response.data.address_b.address, + detail: response.data.address_b.doorplate, + name: response.data.address_b.name, + mobile: response.data.address_b.mobil, + lng: response.data.address_b.lng, + lat: response.data.address_b.lat, + }, state: response.data.status, price: response.data.money, }; diff --git a/src/pages/get/detail.vue b/src/pages/get/detail.vue index 3728ce7..54453b9 100644 --- a/src/pages/get/detail.vue +++ b/src/pages/get/detail.vue @@ -54,7 +54,7 @@ 上门地址 - + @@ -86,22 +86,22 @@ 取货地址 - + - {{ order.pickupAddress }} + {{ order.pickupAddress.address }}{{ order.pickupAddress.detail }} 卸货地址 - + - {{ order.unloadAddress }} + {{ order.unloadAddress.address }}{{ order.unloadAddress.detail }} @@ -177,6 +177,12 @@ export default { onReachBottom() {}, onPullDownRefresh() {}, methods: { + openLocation(lng, lat) { + uni.openLocation({ + longitude: parseFloat(lng), + latitude: parseFloat(lat), + }); + }, copyOrderId(orderId) { const that = this; uni.setClipboardData({ diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue index 50cd4a3..101e4ea 100644 --- a/src/pages/order/detail.vue +++ b/src/pages/order/detail.vue @@ -53,7 +53,7 @@ 上门地址 - + @@ -61,7 +61,7 @@ {{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }}) {{ order.address.mobile }} - 拨号 + 拨号 {{ order.address.address }}{{ order.address.detail }} @@ -87,22 +87,22 @@ 取货地址 - + - {{ order.pickupAddress }} + {{ order.pickupAddress.address }}{{ order.pickupAddress.detail }} 卸货地址 - + - {{ order.unloadAddress }} + {{ order.unloadAddress.address }}{{ order.unloadAddress.detail }} @@ -175,6 +175,12 @@ export default { onReachBottom() {}, onPullDownRefresh() {}, methods: { + openLocation(lng, lat) { + uni.openLocation({ + longitude: parseFloat(lng), + latitude: parseFloat(lat), + }); + }, copyOrderId(orderId) { const that = this; uni.setClipboardData({