Commit 2ce6d11d authored by Facius's avatar Facius

feat: 【前台】上游地址修改优化

parent da54d548
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<view class="between-cell address-cell"> <view class="between-cell address-cell">
<view class="left-address"> <view class="left-address">
<u-icon name="map" size="28"></u-icon> <u-icon name="map" size="28"></u-icon>
<text class="address-txt">{{ formatAddress }}</text> <text class="address-txt">{{ order.customerAddress }}</text>
</view> </view>
<image <image
v-if="showOperate" v-if="showOperate"
...@@ -109,18 +109,18 @@ export default { ...@@ -109,18 +109,18 @@ export default {
return {} return {}
}, },
computed: { computed: {
formatAddress() { // formatAddress() {
let self = this // let self = this
let address = '' // let address = ''
if (self.order) { // if (self.order) {
address = self.order.contactProvinceText || '' // address = self.order.contactProvinceText || ''
address += self.order.contactCityText || '' // address += self.order.contactCityText || ''
address += self.order.contactCommunityText || '' // address += self.order.contactCommunityText || ''
address += self.order.contactStreetText || '' // address += self.order.contactStreetText || ''
address += self.order.contactAddress || '' // address += self.order.contactAddress || ''
} // }
return address // return address
}, // },
phoneIcon() { phoneIcon() {
//self-support/icon/dianhua-0@2x.png //self-support/icon/dianhua-0@2x.png
if (this.operate) { if (this.operate) {
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
:src="dizhiImage" :src="dizhiImage"
mode="widthFix" mode="widthFix"
></image> ></image>
<text>{{ formatAddress(orderData) }}</text> <text>{{ orderData.customerAddress }}</text>
</view> </view>
<view v-if="showDistance" class="address-right-view"> <view v-if="showDistance" class="address-right-view">
{{ orderDistance }}km {{ orderDistance }}km
...@@ -129,6 +129,7 @@ export default { ...@@ -129,6 +129,7 @@ export default {
orderBusinessType: 'R', // 业务类型 R 为抢单 orderBusinessType: 'R', // 业务类型 R 为抢单
orderId: '0', // 订单id orderId: '0', // 订单id
partnerSerialNumber: '', // 上游单号 partnerSerialNumber: '', // 上游单号
customerAddress: '', // 上游地址
} }
}, },
}, },
...@@ -496,17 +497,17 @@ export default { ...@@ -496,17 +497,17 @@ export default {
}, 1000) }, 1000)
} }
}, },
formatAddress(order) { // formatAddress(order) {
let address = '' // let address = ''
if (order) { // if (order) {
address = order.contactProvinceText || '' // address = order.contactProvinceText || ''
address += order.contactCityText || '' // address += order.contactCityText || ''
address += order.contactCommunityText || '' // address += order.contactCommunityText || ''
address += order.contactStreetText || '' // address += order.contactStreetText || ''
address += order.contactAddress || '' // address += order.contactAddress || ''
} // }
return address // return address
}, // },
/** /**
* echo distance(116.3896,39.91917,116.3940,39.91726); * echo distance(116.3896,39.91917,116.3940,39.91726);
* 计算两点之间直线距离 * 计算两点之间直线距离
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment