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
d9778aff
Commit
d9778aff
authored
Aug 25, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 订单列表接UI
parent
f7cdfa91
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
19 deletions
+41
-19
fiveOrders.vue
src/components/order/fiveOrders.vue
+25
-13
index.vue
src/components/order/index.vue
+16
-5
list.vue
src/pages/mine/order/list.vue
+0
-1
No files found.
src/components/order/fiveOrders.vue
View file @
d9778aff
...
@@ -4,16 +4,17 @@
...
@@ -4,16 +4,17 @@
mode=
"center"
mode=
"center"
safe-area-inset-bottom
safe-area-inset-bottom
closeable
closeable
width=
"6
5
0rpx"
width=
"6
9
0rpx"
border-radius=
"12"
border-radius=
"12"
@
close=
"handleClose"
@
close=
"handleClose"
close-icon-color=
"#333333"
>
>
<view
class=
"pop-view"
>
<view
class=
"pop-view"
>
<
view
class=
"head-view"
<
image
:src=
"chakanjiluImage"
class=
"back-image"
mode=
"widthFix"
></image>
>
最近查看
<view
class=
"head-message"
<view
class=
"head-view"
>
>
最近查看或操作过的5条订单
</view
<view>
最近查看记录
</view>
></view
<view
class=
"head-message"
>
最近查看或操作过的5条订单
</view>
>
</view
>
<view
class=
"none-view"
v-if=
"orderList.length
<
=
0
"
>
<view
class=
"none-view"
v-if=
"orderList.length
<
=
0
"
>
<NoOrder
text=
"当前暂无查看记录"
/>
<NoOrder
text=
"当前暂无查看记录"
/>
</view>
</view>
...
@@ -66,6 +67,9 @@ export default {
...
@@ -66,6 +67,9 @@ export default {
orderList
()
{
orderList
()
{
return
this
.
vuex_last_five_orders
.
filter
((
item
)
=>
item
)
||
[]
return
this
.
vuex_last_five_orders
.
filter
((
item
)
=>
item
)
||
[]
},
},
chakanjiluImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'chakanjilu.png'
},
},
},
watch
:
{
watch
:
{
visible
(
val
)
{
visible
(
val
)
{
...
@@ -150,17 +154,24 @@ export default {
...
@@ -150,17 +154,24 @@ export default {
max-height
:
900rpx
;
max-height
:
900rpx
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
display
:
relative
;
.back-image
{
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
z-index
:
-1
;
}
.head-view
{
.head-view
{
padding
:
30rpx
30rpx
2
4
rpx
30rpx
;
padding
:
30rpx
30rpx
2
0
rpx
30rpx
;
font-size
:
4
0
rpx
;
font-size
:
4
8
rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#333333
;
color
:
#333333
;
border-bottom
:
2rpx
solid
#f4f5f7
;
.head-message
{
.head-message
{
font-size
:
28
rpx
;
font-size
:
32
rpx
;
color
:
#
999999
;
color
:
#
2272ff
;
font-weight
:
400
;
font-weight
:
400
;
margin-top
:
1
0
rpx
;
margin-top
:
1
4
rpx
;
}
}
}
}
.none-view
{
.none-view
{
...
@@ -171,7 +182,8 @@ export default {
...
@@ -171,7 +182,8 @@ export default {
height
:
100%
;
height
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
.bottom-tip
{
.bottom-tip
{
margin-bottom
:
30rpx
;
margin-bottom
:
44rpx
;
margin-top
:
30rpx
;
}
}
}
}
}
}
...
...
src/components/order/index.vue
View file @
d9778aff
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
:style=
"item.style"
:style=
"item.style"
>
>
<view
class=
"info-left-view"
>
<view
class=
"info-left-view"
>
<view
v-if=
"item.symbol"
class=
"symbol-view"
>
</view>
<view
class=
"info-title"
>
<view
class=
"info-title"
>
<text>
{{
item
.
name
+
':'
}}
</text>
<text>
{{
item
.
name
+
':'
}}
</text>
</view>
</view>
...
@@ -51,8 +52,8 @@
...
@@ -51,8 +52,8 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"line-view"
></view>
<template
v-if=
"!isSimple"
>
<template
v-if=
"!isSimple"
>
<view
class=
"line-view"
></view>
<view
class=
"reason-view"
v-if=
"showReason"
>
<view
class=
"reason-view"
v-if=
"showReason"
>
<view
class=
"reason-title"
><text>
未通过原因:
</text></view>
<view
class=
"reason-title"
><text>
未通过原因:
</text></view>
<view
class=
"reason-text"
<view
class=
"reason-text"
...
@@ -204,8 +205,9 @@ export default {
...
@@ -204,8 +205,9 @@ export default {
return
this
.
isSimple
return
this
.
isSimple
?
{
?
{
orderNumber
:
{
orderNumber
:
{
symbol
:
true
,
name
:
'工单编号'
,
name
:
'工单编号'
,
style
:
'font-weight: 450'
,
style
:
'font-weight: 450
;font-size: 28rpx
'
,
icon
:
'arrow-right'
,
icon
:
'arrow-right'
,
},
},
contactName
:
{
name
:
'客户信息'
,
content
:
'contactPhone'
},
contactName
:
{
name
:
'客户信息'
,
content
:
'contactPhone'
},
...
@@ -529,8 +531,9 @@ export default {
...
@@ -529,8 +531,9 @@ export default {
background-color
:
#dddddd
;
background-color
:
#dddddd
;
}
}
&
.simple
{
&
.simple
{
padding
:
0rpx
;
margin
:
20rpx
30rpx
;
margin
:
30rpx
;
padding-top
:
12rpx
;
box-shadow
:
0
0
16rpx
rgba
(
51
,
51
,
51
,
0
.1
);
}
}
.order-top-view
{
.order-top-view
{
display
:
flex
;
display
:
flex
;
...
@@ -588,7 +591,15 @@ export default {
...
@@ -588,7 +591,15 @@ export default {
align-items
:
center
;
align-items
:
center
;
.info-left-view
{
.info-left-view
{
display
:
flex
;
display
:
flex
;
align-items
:
flex-start
;
justify-content
:
flex-start
;
align-items
:
center
;
.symbol-view
{
background-color
:
#2272ff
;
width
:
6rpx
;
height
:
28rpx
;
border-radius
:
6rpx
;
margin-right
:
10rpx
;
}
.info-title
{
.info-title
{
flex-shrink
:
0
;
flex-shrink
:
0
;
align-items
:
center
;
align-items
:
center
;
...
...
src/pages/mine/order/list.vue
View file @
d9778aff
...
@@ -57,7 +57,6 @@
...
@@ -57,7 +57,6 @@
<
script
>
<
script
>
import
OrderCell
from
'@/components/order/index.vue'
import
OrderCell
from
'@/components/order/index.vue'
import
NoOrder
from
'@/components/order/noOrder.vue'
import
NoOrder
from
'@/components/order/noOrder.vue'
import
Complete
from
'../../order/complete.vue'
export
default
{
export
default
{
components
:
{
components
:
{
...
...
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