Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李俊赕
self-support
Commits
2ce6d11d
Commit
2ce6d11d
authored
Sep 16, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 【前台】上游地址修改优化
parent
da54d548
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
25 deletions
+26
-25
detail.vue
src/components/order/detail.vue
+13
-13
index.vue
src/components/order/index.vue
+13
-12
No files found.
src/components/order/detail.vue
View file @
2ce6d11d
...
...
@@ -43,7 +43,7 @@
<view
class=
"between-cell address-cell"
>
<view
class=
"left-address"
>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<text
class=
"address-txt"
>
{{
format
Address
}}
</text>
<text
class=
"address-txt"
>
{{
order
.
customer
Address
}}
</text>
</view>
<image
v-if=
"showOperate"
...
...
@@ -109,18 +109,18 @@ export default {
return
{}
},
computed
:
{
formatAddress
()
{
let
self
=
this
let
address
=
''
if
(
self
.
order
)
{
address
=
self
.
order
.
contactProvinceText
||
''
address
+=
self
.
order
.
contactCityText
||
''
address
+=
self
.
order
.
contactCommunityText
||
''
address
+=
self
.
order
.
contactStreetText
||
''
address
+=
self
.
order
.
contactAddress
||
''
}
return
address
},
//
formatAddress() {
//
let self = this
//
let address = ''
//
if (self.order) {
//
address = self.order.contactProvinceText || ''
//
address += self.order.contactCityText || ''
//
address += self.order.contactCommunityText || ''
//
address += self.order.contactStreetText || ''
//
address += self.order.contactAddress || ''
//
}
//
return address
//
},
phoneIcon
()
{
//self-support/icon/dianhua-0@2x.png
if
(
this
.
operate
)
{
...
...
src/components/order/index.vue
View file @
2ce6d11d
...
...
@@ -45,7 +45,7 @@
:src=
"dizhiImage"
mode=
"widthFix"
></image>
<text>
{{
formatAddress
(
orderData
)
}}
</text>
<text>
{{
orderData
.
customerAddress
}}
</text>
</view>
<view
v-if=
"showDistance"
class=
"address-right-view"
>
{{
orderDistance
}}
km
...
...
@@ -129,6 +129,7 @@ export default {
orderBusinessType
:
'R'
,
// 业务类型 R 为抢单
orderId
:
'0'
,
// 订单id
partnerSerialNumber
:
''
,
// 上游单号
customerAddress
:
''
,
// 上游地址
}
},
},
...
...
@@ -496,17 +497,17 @@ export default {
},
1000
)
}
},
formatAddress
(
order
)
{
let
address
=
''
if
(
order
)
{
address
=
order
.
contactProvinceText
||
''
address
+=
order
.
contactCityText
||
''
address
+=
order
.
contactCommunityText
||
''
address
+=
order
.
contactStreetText
||
''
address
+=
order
.
contactAddress
||
''
}
return
address
},
//
formatAddress(order) {
//
let address = ''
//
if (order) {
//
address = order.contactProvinceText || ''
//
address += order.contactCityText || ''
//
address += order.contactCommunityText || ''
//
address += order.contactStreetText || ''
//
address += order.contactAddress || ''
//
}
//
return address
//
},
/**
* echo distance(116.3896,39.91917,116.3940,39.91726);
* 计算两点之间直线距离
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment