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
ac5f81fd
Commit
ac5f81fd
authored
Apr 22, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
3512b2fd
d895716c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
628 additions
and
13 deletions
+628
-13
appoint-time.vue
src/components/appoint/appoint-time.vue
+212
-0
pages.json
src/pages.json
+10
-2
index.vue
src/pages/index/index.vue
+2
-6
detail.vue
src/pages/order/detail.vue
+228
-5
feedback.vue
src/pages/order/feedback.vue
+176
-0
No files found.
src/components/appoint/appoint-time.vue
0 → 100644
View file @
ac5f81fd
<!-- 预约时间 -->
<
template
>
<view
:class=
"
{'con-box':titleShow}">
<view
class=
"title"
v-if=
"titleShow"
>
{{
'预约时间'
}}
</view>
<view
class=
"u-m-t-40"
>
<view
class=
"appoint-box"
>
<view
class=
"select-date"
>
<view
class=
"u-flex u-row-between "
>
<view
class=
"txt"
>
选择日期
</view>
<view
class=
"txt active"
>
2021.04.21
</view>
</view>
<view
class=
"u-m-t-30 u-flex u-row-between date-list"
>
<view
:class=
"
{'date-item':true,'active':index===currentDay}"
@click="dateChange(item,index,dateList)" v-for="(item,index) in dateList" :key="index">
<text
class=
"day"
>
{{
item
.
weekDay
}}
</text>
<text
class=
"day day1"
>
{{
item
.
day
}}
</text>
</view>
<view
class=
"next"
@
click=
"weekChange"
>
<u-icon
name=
"arrow-right"
color=
"#2979ff"
size=
"28"
></u-icon>
</view>
</view>
</view>
<!-- weekChange -->
<view
class=
"select-time u-p-t-50"
>
<view
class=
"u-flex u-row-between"
>
<view
class=
"txt"
>
选择时间
</view>
<view
class=
"txt active"
>
14:00-16:00
</view>
</view>
<view
class=
"u-p-t-30 u-flex u-flex-wrap time-list"
>
<view
@
click=
"timeChange(item,index,timeList)"
:class=
"
{'time-item':true,'active':index===currentTime}" v-for="(item,index) in timeList"
:key="index">
<text
class=
"time"
>
{{
item
}}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
</
template
>
<
script
>
export
default
{
props
:
{
titleShow
:
{
type
:
Boolean
,
default
:
true
},
},
data
()
{
return
{
currentDay
:
0
,
currentTime
:
0
,
dateList
:
[{
weekDay
:
'周三'
,
day
:
'21'
},
{
weekDay
:
'周三'
,
day
:
'21'
},
{
weekDay
:
'周三'
,
day
:
'21'
},
{
weekDay
:
'周三'
,
day
:
'21'
},
{
weekDay
:
'周三'
,
day
:
'21'
},
{
weekDay
:
'周三'
,
day
:
'21'
},
],
timeList
:
[
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
,
'06:00-08:00'
]
}
},
methods
:
{
getDateList
()
{
// 获取日期
},
dateChange
(
item
,
index
,
list
)
{
let
data
=
{
item
,
index
,
list
,
}
this
.
currentDay
=
index
this
.
$emit
(
'date-change'
,
data
)
},
timeChange
(
item
,
index
,
list
)
{
let
data
=
{
item
,
index
,
list
,
}
this
.
currentTime
=
index
this
.
$emit
(
'time-change'
,
data
)
},
weekChange
(
item
,
index
,
list
)
{
let
data
=
{
item
,
index
,
list
,
}
this
.
$emit
(
'week-change'
,
data
)
},
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.con-box
{
margin-top
:
30rpx
;
padding
:
30rpx
30rpx
30rpx
20rpx
;
border-radius
:
12rpx
;
background-color
:
#FFFFFF
;
.title
{
font-weight
:
bold
;
font-size
:
32rpx
;
line-height
:
32rpx
;
color
:
#333
;
}
}
.txt
{
font-size
:
26rpx
;
line-height
:
26rpx
;
color
:
#333
;
&
.active
{
color
:
#2272FF
}
}
.date-list
{
background-color
:
#F4F5F7
;
.next
{
width
:
60rpx
;
height
:
120rpx
;
line-height
:
120rpx
;
text-align
:
center
;
border-left
:
2rpx
solid
#fff
;
}
.date-item
{
padding
:
20rpx
20rpx
16rpx
;
border-radius
:
12rpx
;
.day
{
display
:
block
;
font-size
:
24rpx
;
line-height
:
26rpx
;
color
:
#999
;
&
.day1
{
width
:
48rpx
;
height
:
48rpx
;
margin-top
:
10rpx
;
border-radius
:
50%
;
font-size
:
28rpx
;
text-align
:
center
;
line-height
:
48rpx
;
}
}
&
.active
{
// background-color: #2272FF;
.day
{
color
:
#2272FF
;
&
.day1
{
background-color
:
#2272FF
;
color
:
#fff
!
important
;
}
}
}
}
}
.time-list
{
margin-bottom
:
-30rpx
;
.time-item
{
min-width
:
196rpx
;
margin-right
:
26rpx
;
margin-bottom
:
24rpx
;
border-radius
:
12rpx
;
padding
:
26rpx
20rpx
24rpx
;
background-color
:
#F4F5F7
;
&
:nth-child
(
3n
)
{
margin-right
:
0
;
}
&
.active
{
background-color
:
#2272FF
;
.time
{
color
:
#fff
;
}
}
.time
{
font-size
:
26rpx
;
line-height
:
26rpx
;
color
:
#999
;
}
}
}
</
style
>
src/pages.json
View file @
ac5f81fd
...
...
@@ -21,6 +21,14 @@
"style"
:
{
"navigationBarTitleText"
:
"订单-完工配置"
}
},{
"path"
:
"pages/order/feedback"
,
"style"
:
{
"navigationBarTitleText"
:
"订单-过程反馈"
,
"enablePullDownRefresh"
:
false
,
"navigationStyle"
:
"custom"
,
//
隐藏系统导航栏
"disableScroll"
:
true
}
},
{
"path"
:
"pages/mine/index"
,
...
...
@@ -264,8 +272,8 @@
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
{
"name"
:
"订单 -
完工配置
"
,
//模式名称
"path"
:
"pages/order/
complete
"
,
//启动页面,必选
"name"
:
"订单 -
过程反馈
"
,
//模式名称
"path"
:
"pages/order/
feedback
"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
}
]
...
...
src/pages/index/index.vue
View file @
ac5f81fd
<
template
>
<view
class=
"content"
>
<!--
<scroll-view
class=
"scroll-view"
scroll-y
style=
"height: 100%; width: 100%"
@
scrolltolower=
"reachBottom"
@
scroll=
"handleScroll"
refresher-enabled
:refresher-triggered=
"triggered"
@
refresherrefresh=
"onRefresh"
scroll-anchoring
@
refresherrestore=
"onRestore"
@
refresherpulling=
"triggered = true"
:show-scrollbar=
"false"
enable-back-to-top
>
-->
<view
style=
"width: 700rpx; height: 800rpx"
>
<!--
<view
class=
"title-view"
>
充电桩自营平台
</view>
-->
<u-navbar
:is-back=
"false"
background=
"
{background: transparent}"
:is-fixed=
"false"
:background=
"
{ background: 'transparent' }"
:border-bottom="false"
:is-fixed="false"
>
<text
class=
"title-view"
>
充电桩自营平台
</text>
</u-navbar>
...
...
src/pages/order/detail.vue
View file @
ac5f81fd
...
...
@@ -3,9 +3,70 @@
<u-navbar
back-icon-color=
"#FFFFFF"
:background=
"background"
:border-bottom=
"false"
></u-navbar>
<view
class=
"header"
>
<view
class=
"title"
>
订单信息
</view>
<view
class=
"button"
@
click=
"rejectOrder"
>
拒单
</view>
<view
v-show=
"allowRejection"
class=
"button"
@
click=
"rejectOrder"
>
拒单
</view>
</view>
<view
class=
"content"
>
<view
class=
"card base-item"
>
<view
class=
"top-item"
>
<view
class=
"left"
>
<view
class=
"tag"
>
{{
order
.
orderServiceType
}}
</view>
<text
class=
"title"
>
{{
order
.
categoryName
}}
</text>
</view>
<view
class=
"right"
>
分配单
</view>
</view>
<view
class=
"order-cell"
>
<text>
工单编号:
</text>
<text>
{{
order
.
orderNumber
}}
</text>
</view>
<view
class=
"order-cell between-cell"
>
<view
class=
"left"
>
<text>
客户信息:
</text>
<text>
{{
order
.
contactName
}}
</text>
</view>
<u-image
width=
"60rpx"
height=
"60rpx"
:src=
"phoneIcon"
></u-image>
</view>
<view
class=
"order-cell"
>
<text>
联系方式:
</text>
<text>
{{
order
.
contactPhone
}}
</text>
</view>
<view
class=
"between-cell address-cell"
>
<view
class=
"left"
>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<text
class=
"address-txt"
>
{{
order
.
contactAddress
}}
</text>
</view>
<u-image
width=
"60rpx"
height=
"60rpx"
:src=
"navigationIcon"
></u-image>
</view>
</view>
<view
class=
"card order-item"
>
<view
class=
"top-item"
>
<text
class=
"title"
>
订单内容
</text>
</view>
<view
class=
"order-cell between-cell"
>
<text>
品牌:
</text>
<text>
{{
order
.
brandName
}}
</text>
</view>
<view
class=
"order-cell between-cell"
>
<text>
数量:
</text>
<text>
x
{{
order
.
orderProductCount
}}
</text>
</view>
<view
class=
"order-cell between-cell"
>
<text>
信息:
</text>
<text>
{{
order
.
serviceContent
}}
</text>
</view>
<view
class=
"order-cell between-cell"
>
<text>
备注:
</text>
<text>
{{
order
.
serviceContent
}}
</text>
</view>
</view>
<view
class=
"card order-item record-item"
>
<view
class=
"top-item"
>
<text
class=
"title"
>
履约记录
</text>
</view>
<view
class=
"order-cell between-cell"
>
<text>
接单时间:2021.04.21 16:40:35
</text>
</view>
</view>
</view>
<view
class=
"content"
></view>
</view>
</
template
>
...
...
@@ -20,10 +81,69 @@
// 还可以设置背景图size属性
// backgroundSize: 'cover',
// 渐变色
}
},
orderId
:
null
,
order
:
{},
allowRejection
:
false
,
};
},
onLoad
(
e
)
{
if
(
e
&&
e
.
id
)
{
this
.
orderId
=
e
.
id
}
else
{
// 异常处理
}
this
.
loadOrderDetail
()
},
computed
:
{
phoneIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/dianhua-1@2x.png'
},
navigationIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/daohang-1@2x.png'
},
},
methods
:
{
loadOrderDetail
()
{
let
self
=
this
let
timestamp
=
new
Date
().
getTime
();
let
order
=
{
brandName
:
'沃尔沃'
,
categoryId
:
1
,
categoryName
:
'充电桩'
,
contactAddress
:
'湾街道荔枝花园D座125号'
,
contactAddressLatitud
:
'116.3896'
,
contactAddressLongitud
:
'39.91917'
,
contactCity
:
4403
,
contactCityText
:
'深圳市'
,
contactCommunity
:
440306
,
contactCommunityText
:
'宝安区'
,
contactId
:
1
,
contactName
:
'郭小清'
,
contactPhone
:
'13631612077'
,
contactProvince
:
44
,
contactProvinceText
:
'广东省'
,
contactStreet
:
44030601
,
contactStreetText
:
'新安街道'
,
lianbaoBrandId
:
1
,
orderBusinessType
:
'R'
,
orderId
:
1
,
orderNumber
:
'OR2021041809827'
,
orderProductCount
:
1
,
orderServiceType
:
'安装'
,
orderStatus
:
'30'
,
serviceContent
:
'沃尔沃全球标充电桩(国标32A,4G联网)'
,
orderBusinessTypeText
:
'订单池'
,
auditResults
:
[],
currentWillOverTime
:
timestamp
,
currentOverTime
:
timestamp
,
appointmentDatetime
:
timestamp
,
auditDatetime
:
timestamp
,
}
self
.
order
=
order
},
/**
* 拒单
*/
...
...
@@ -39,8 +159,6 @@
width
:
750rpx
;
height
:
100vh
;
overflow
:
auto
;
// height: 1600rpx;
// background: linear-gradient(360deg, #F4F5F7 0%, #2272FF 100%);
background-color
:
#F4F5F7
;
background-image
:
linear-gradient
(
to
top
,
#F4F5F7
,
#2272FF
);
background-size
:
750rpx
600rpx
;
...
...
@@ -69,6 +187,111 @@
}
.content
{
height
:
2000rpx
;
.card
{
background-color
:
#FFFFFF
;
margin
:
0
30rpx
20rpx
30rpx
;
padding
:
30rpx
30rpx
0
30rpx
;
border-radius
:
6px
;
}
.base-item
{
padding-bottom
:
36rpx
;
.top-item
{
display
:
flex
;
justify-content
:
space-between
;
margin-bottom
:
20rpx
;
.left
{
display
:
flex
;
align-items
:
center
;
.tag
{
text-align
:
center
;
width
:
84rpx
;
height
:
40rpx
;
background-image
:
linear-gradient
(
270deg
,
#47ABFF
0%
,
#2272FF
100%
);
border-radius
:
8rpx
;
font-size
:
22rpx
;
font-weight
:
500
;
color
:
#FFFFFF
;
line-height
:
40rpx
;
}
.title
{
margin-left
:
30rpx
;
height
:
36rpx
;
font-size
:
36rpx
;
font-weight
:
bold
;
color
:
#333333
;
line-height
:
36rpx
;
}
}
.right
{
text-align
:
center
;
width
:
100rpx
;
height
:
40rpx
;
background
:
#F4F5F7
;
border-radius
:
22rpx
;
font-size
:
22rpx
;
font-weight
:
400
;
color
:
#333333
;
line-height
:
40rpx
;
}
}
.address-cell
{
height
:
24rpx
;
font-size
:
24rpx
;
font-weight
:
400
;
color
:
#333333
;
line-height
:
24rpx
;
.left
{
.address-txt
{
margin-left
:
8rpx
;
}
}
}
}
.order-item
{
padding-bottom
:
34rpx
;
.top-item
{
display
:
flex
;
justify-content
:
space-between
;
margin-bottom
:
20rpx
;
.title
{
height
:
36rpx
;
font-size
:
36rpx
;
font-weight
:
bold
;
color
:
#333333
;
line-height
:
36rpx
;
}
}
.address-cell
{
height
:
24rpx
;
font-size
:
24rpx
;
font-weight
:
400
;
color
:
#333333
;
line-height
:
24rpx
;
.left
{
.address-txt
{
margin-left
:
8rpx
;
}
}
}
}
.record-item
{
}
}
}
// 页面公用css
.order-cell
{
height
:
48rpx
;
font-size
:
26rpx
;
font-weight
:
400
;
color
:
#333333
;
line-height
:
48rpx
;
margin-bottom
:
30rpx
;
}
.between-cell
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
}
</
style
>
src/pages/order/feedback.vue
0 → 100644
View file @
ac5f81fd
<!-- 过程反馈 -->
<
template
>
<view
class=
"feedback-box bg"
>
<u-navbar
back-icon-color=
"#FFFFFF"
:background=
"background"
title=
"过程反馈"
title-color=
"#fff"
:border-bottom=
"false"
></u-navbar>
<view
class=
"content u-p-l-30 u-p-r-30"
>
<view
class=
"width-320 u-m-t-20"
>
<u-subsection
:bold=
"false"
:current=
"curNow"
:list=
"list"
active-color=
"white"
bg-color=
"white"
height=
"72"
inactive-color=
"#666"
button-color=
"#2272FF"
border-radius=
"36"
></u-subsection>
</view>
<view
class=
"con-box"
>
<view
class=
"title"
>
{{
feedback
.
own
.
title
}}
</view>
<view
class=
"u-flex u-flex-wrap"
>
<view
:class=
"
{'txt-item':true,'active':true}" v-for="(txt,index) in feedback.own.list" :key="index">
<text
class=
"txt"
>
{{
txt
}}
</text>
</view>
</view>
</view>
<view
class=
"con-box"
>
<view
class=
"title"
>
{{
feedback
.
type
.
title
}}
</view>
<view
class=
"u-flex u-flex-wrap"
>
<view
:class=
"
{'txt-item':true,'active':false}" v-for="(txt,index) in feedback.type.list" :key="index">
<text
class=
"txt"
>
{{
txt
}}
</text>
</view>
</view>
<u-input
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
</view>
<appoint-time
@
dateChange=
"dateChange"
@
timeChange=
"timeChange"
@
weekChange=
"weekChange"
></appoint-time>
</view>
<view
class=
"u-m-60"
>
<button
class=
"btn"
>
确定
</button>
</view>
</view>
</
template
>
<
script
>
import
appointTime
from
'@/components/appoint/appoint-time.vue'
export
default
{
data
()
{
return
{
background
:
{
backgroundColor
:
'none'
,
},
// questionList: ['个人', '客户', '现场/客户'],
feedback
:
{
own
:{
title
:
'问题归属'
,
list
:[
'个人'
,
'客户'
,
'现场/客户'
],
},
type
:{
title
:
'问题类型'
,
list
:[
'有事耽搁'
,
'未带齐工具'
,
'个人改约'
,
'其他'
]
},
appoint
:{
title
:
'预约时间'
,
}
},
list
:[
'报备'
,
'预约'
],
curNow
:
1
};
},
components
:{
appointTime
},
methods
:
{
/**
* 拒单
*/
rejectOrder
()
{
console
.
log
(
"点击拒单"
)
},
sectionChange
(
index
)
{
this
.
curNow
=
index
;
},
weekChange
(
data
){
// 点击下一周
console
.
log
(
data
,
'week-data'
)
},
dateChange
(
data
){
// 点击日期选择
console
.
log
(
data
,
'week-data'
)
},
timeChange
(
data
){
// 时间段选择变化
console
.
log
(
data
,
'week-data'
)
},
}
}
</
script
>
<
style
lang=
"scss"
>
.bg
{
width
:
750rpx
;
height
:
100vh
;
overflow
:
auto
;
background-color
:
#F4F5F7
;
background-image
:
linear-gradient
(
to
top
,
#F4F5F7
0%
,
#2272FF
100%
);
background-size
:
750rpx
600rpx
;
background-repeat
:
no-repeat
;
}
/
deep
/
.u-subsection
{
padding
:
4rpx
!
important
;
}
.con-box
{
margin-top
:
30rpx
;
padding
:
30rpx
30rpx
30rpx
20rpx
;
border-radius
:
12rpx
;
background-color
:
#FFFFFF
;
.title
{
font-weight
:
bold
;
font-size
:
32rpx
;
line-height
:
32rpx
;
color
:
#333
;
}
&
>
.u-flex
{
margin-top
:
40rpx
;
margin-right
:
-20rpx
;
.txt-item
{
border-radius
:
12rpx
;
padding
:
24rpx
38rpx
;
min-width
:
196rpx
;
text-align
:
center
;
margin-right
:
20rpx
;
margin-bottom
:
20rpx
;
background-color
:
#F4F5F7
;
&
.active
{
background-color
:
#2272FF
;
.txt
{
color
:
#fff
;
}
}
}
}
.txt
{
display
:block
;
font-size
:
26rpx
;
line-height
:
26rpx
;
color
:
#333
;
}
.textarea
{
/
deep
/
.u-input
{
textarea
{
margin-top
:
20rpx
;
border
:
2rpx
solid
#ECECEC
;
padding
:
18rpx
30rpx
;
}
}
}
}
.btn
{
padding
:
30rpx
;
border-radius
:
52rpx
;
line-height
:
44rpx
;
font-size
:
32rpx
;
text-align
:
center
;
background-color
:
#2272FF
;
color
:
#fff
;
&
:
:
after
{
content
:
''
;
height
:
0
;
}
}
.width-320
{
width
:
320rpx
;
}
</
style
>
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