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
cfdc7b40
Commit
cfdc7b40
authored
Jun 09, 2021
by
Damon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://git.banshouhui.com/lijundan/self-support
into dev
parents
4148b047
096c917d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
40 deletions
+64
-40
.env.js
.env.js
+2
-2
detail.vue
src/pages/order/detail.vue
+62
-38
No files found.
.env.js
View file @
cfdc7b40
src/pages/order/detail.vue
View file @
cfdc7b40
<
template
>
<
template
>
<view
class=
"order-wrap"
>
<view
class=
"order-wrap"
>
<u-navbar
:title=
"title"
title-color=
"#FFFFFF"
title-size=
"32"
back-icon-color=
"#FFFFFF"
:background=
"background"
:border-bottom=
"false"
></u-navbar>
<u-navbar
:title=
"title"
title-color=
"#FFFFFF"
title-size=
"32"
back-icon-color=
"#FFFFFF"
:background=
"background"
:border-bottom=
"false"
title-bold
></u-navbar>
<view
class=
"header"
v-if=
"order.currentOverTime && showTimeOut"
>
<view
class=
"header"
v-if=
"order.currentOverTime && showTimeOut || loading"
>
<image
class=
"bottom-tag-view"
:src=
"tagImage"
></image>
<!-- 倒计时 -->
<!-- 倒计时 -->
<view
class=
"title"
>
<view
class=
"title"
>
<view
class=
"bottom-tag-view"
><text>
{{
timeout
?
'超时'
:
'剩余'
}}
</text></view>
<u-count-down
:timestamp=
"timestamp"
font-size=
"28"
show-days
separator=
"zh"
separator-size=
"32"
height=
"40"
hide-zero-day
<u-count-down
:timestamp=
"timestamp"
font-size=
"28"
show-days
separator=
"zh"
separator-size=
"32"
height=
"40"
hide-zero-day
color=
"#2272FF"
separator-color=
"#FFFFFF"
@
change=
"timeOutChange"
ref=
"order-count-down"
bg-color=
"#FFFFFF"
></u-count-down>
:color=
"countColor"
separator-color=
"#FFFFFF"
@
change=
"timeOutChange"
ref=
"order-count-down"
bg-color=
"#FFFFFF"
></u-count-down>
</view>
<view
class=
"header-content"
>
<view
class=
"header-content"
>
<!-- 抓紧时间提示 -->
<!-- 抓紧时间提示 -->
<view
class=
"tip-text"
>
{{
tipText
}}
</view>
<view
class=
"tip-text"
>
{{
tipText
}}
</view>
...
@@ -15,6 +14,7 @@
...
@@ -15,6 +14,7 @@
<view
v-show=
"allowRejection"
class=
"reject-button"
@
click=
"$u.throttle(rejectOrder, 500)"
>
拒单
</view>
<view
v-show=
"allowRejection"
class=
"reject-button"
@
click=
"$u.throttle(rejectOrder, 500)"
>
拒单
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"content"
>
<view
class=
"content"
>
<!-- 订单详情 -->
<!-- 订单详情 -->
<view
class=
"card base-item"
>
<view
class=
"card base-item"
>
...
@@ -167,6 +167,7 @@
...
@@ -167,6 +167,7 @@
timeout
:
false
,
timeout
:
false
,
timestamp
:
0
,
timestamp
:
0
,
showFile
:
false
,
// 显示查看业务文件
showFile
:
false
,
// 显示查看业务文件
loading
:
true
}
}
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
...
@@ -260,9 +261,21 @@
...
@@ -260,9 +261,21 @@
}
}
}]
}]
},
},
countColor
()
{
return
this
.
timeout
?
'#FA5A49'
:
'#2272FF'
},
wenjianImage
()
{
wenjianImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'wenjian.png'
return
process
.
uniEnv
.
qn_base_url
+
'wenjian.png'
},
},
tagImage
()
{
return
this
.
timeout
?
this
.
chaoshiImage
:
this
.
shengyuImage
},
chaoshiImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'chaoshi.png'
},
shengyuImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'shengyu.png'
},
},
},
methods
:
{
methods
:
{
updateLocation
(){
updateLocation
(){
...
@@ -332,6 +345,7 @@
...
@@ -332,6 +345,7 @@
'orderId'
:
self
.
orderId
'orderId'
:
self
.
orderId
};
};
self
.
$u
.
api
.
orderDetail
(
data
,
self
.
orderId
).
then
((
res
)
=>
{
self
.
$u
.
api
.
orderDetail
(
data
,
self
.
orderId
).
then
((
res
)
=>
{
this
.
loading
=
false
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
self
.
order
=
res
.
data
self
.
order
=
res
.
data
this
.
getCurrentBtn
()
this
.
getCurrentBtn
()
...
@@ -814,6 +828,14 @@
...
@@ -814,6 +828,14 @@
}
}
};
};
</
script
>
</
script
>
<
style
lang=
"scss"
>
.order-wrap
{
.u-countdown-colon
{
margin-left
:
6rpx
;
margin-right
:
6rpx
;
}
}
</
style
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.order-wrap
{
.order-wrap
{
...
@@ -828,13 +850,23 @@
...
@@ -828,13 +850,23 @@
flex-direction
:
column
;
flex-direction
:
column
;
.header
{
.header
{
padding
:
4rpx
32rpx
14rpx
32rpx
;
padding
:
4rpx
32rpx
20rpx
32rpx
;
display
:
flex
;
align-items
:
center
;
.bottom-tag-view
{
width
:
116rpx
;
height
:
116rpx
;
flex-shrink
:
0
;
}
.title
{
margin-left
:
24rpx
;
margin-top
:
6rpx
;
width
:
100%
;
.header-content
{
.header-content
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
margin-top
:
12
rpx
;
margin-top
:
24
rpx
;
.tip-text
{
.tip-text
{
font-size
:
26rpx
;
font-size
:
26rpx
;
color
:
#EFEFEF
;
color
:
#EFEFEF
;
...
@@ -851,14 +883,6 @@
...
@@ -851,14 +883,6 @@
text-align
:
right
;
text-align
:
right
;
}
}
}
}
.title
{
display
:
flex
;
align-items
:
center
;
.bottom-tag-view
{
color
:
#FFFFFF
;
font-size
:
40rpx
;
margin-right
:
10rpx
;
}
}
}
}
}
...
...
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