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
936a248d
Commit
936a248d
authored
Apr 29, 2021
by
郭晓清
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
21e5fc69
03cdef0b
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
234 additions
and
144 deletions
+234
-144
learn.js
src/common/api/learn.js
+5
-1
appoint-time.vue
src/components/appoint/appoint-time.vue
+3
-3
index.vue
src/components/order/index.vue
+28
-15
index.vue
src/components/take/index.vue
+2
-1
index.vue
src/pages/learn/index.vue
+140
-92
detail.vue
src/pages/order/detail.vue
+45
-6
feedback.vue
src/pages/order/feedback.vue
+11
-26
No files found.
src/common/api/learn.js
View file @
936a248d
const
globalUrl
=
process
.
uniEnv
||
{}
const
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
const
collegeApiUrl
=
globalUrl
.
ucenterUrl
.
xueUrl
const
sysApiUrl
=
globalUrl
.
systemUrl
.
apiUrl
let
learnApiFun
=
function
(
vm
){
/* 通知消息基本信息 */
...
...
@@ -14,8 +15,11 @@ let learnApiFun = function(vm){
let
CourseSection
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
collegeApiUrl
+
'/v1/section-details'
,
params
);
/* 更新学习情况*/
let
updateLearnCourses
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
collegeApiUrl
+
'/v1/update-learn-courses'
,
params
);
/* 获取考试结果 */
let
getExamResult
=
async
(
examId
,
params
=
{})
=>
await
vm
.
$u
.
post
(
sysApiUrl
+
'/wxh-worker-rest/rest/exam/serviceRule/userExamInfo/'
+
vm
.
vuex_token
+
'?examId='
+
examId
,
params
);
const
learnApi
=
{
getTrainingNoticeList
,
CourseList
,
ChapterDetails
,
CourseSection
,
updateLearnCourses
getTrainingNoticeList
,
CourseList
,
ChapterDetails
,
CourseSection
,
updateLearnCourses
,
getExamResult
}
return
learnApi
}
...
...
src/components/appoint/appoint-time.vue
View file @
936a248d
...
...
@@ -50,7 +50,7 @@
</
template
>
<
script
>
let
now
=
Date
.
now
()
let
now
=
new
Date
(
new
Date
().
toLocaleDateString
()).
getTime
()
export
default
{
props
:
{
titleShow
:
{
...
...
@@ -98,7 +98,7 @@
return
{
currentDay
:
0
,
currentTime
:
null
,
appointTime
:
Date
.
now
()
,
appointTime
:
now
,
appointRange
:
""
,
num
:
0
,
hasLast
:
false
...
...
@@ -107,7 +107,7 @@
watch
:
{
title
()
{
this
.
currentDay
=
0
this
.
appointTime
=
Date
.
now
()
this
.
appointTime
=
now
this
.
currentTime
=
null
this
.
appointRange
=
""
}
...
...
src/components/order/index.vue
View file @
936a248d
...
...
@@ -32,9 +32,9 @@
<view
class=
"bottom-view"
>
<view>
<view
v-if=
"showCountTime"
class=
"bottom-left-view"
>
<view
:class=
"['bottom-tag-view',
{'
will': orderData.currentWillOverTime}]">
{{
tagText
}}
</view>
<u-count-down
:timestamp=
"
orderData.currentWillOverTime || orderData.currentOverTime
"
font-size=
"44"
color=
"#FF930D
"
@
change=
"handleChange"
ref=
"order-count-down"
></u-count-down>
<view
:class=
"['bottom-tag-view',
{'
timeout': timeout}]">
<text>
{{
tagText
}}
</text>
</view>
<u-count-down
:timestamp=
"
timestamp
"
font-size=
"44"
:color=
"timeout ? '#FA5A49' : '#FF930D'
"
@
change=
"handleChange"
ref=
"order-count-down"
></u-count-down>
</view>
<view
v-else-if=
"showTime"
>
<text>
{{
timeTitle
}}
</text>
...
...
@@ -69,7 +69,7 @@
orderStatus
:
0
,
// 工单状态
appointmentDatetime
:
''
,
// 预约时间
currentWillOverTime
:
10000
,
// 剩余时间
currentOverTime
:
0
,
// 超过时间
currentOverTime
:
new
Date
().
getTime
()
+
10000
,
// 超过时间点
auditDatetime
:
'2021.04.19 12:45:09'
,
// 审核时间
submissionTime
:
'2021.04.19 16:24:48'
,
// 提交时间
auditResults
:
{},
// 审核结果
...
...
@@ -97,7 +97,8 @@
},
data
()
{
return
{
timeout
:
false
,
timestamp
:
0
,
};
},
computed
:
{
...
...
@@ -204,8 +205,8 @@
return
this
.
orderData
.
orderServiceType
==
'安装'
},
tagText
()
{
return
this
.
orderData
.
currentWillOverTime
?
'剩'
:
'超
'
},
return
this
.
timeout
?
'超'
:
'剩
'
},
timeText
()
{
return
this
.
orderType
==
4
?
this
.
orderData
.
submissionTime
:
this
.
orderData
.
auditDatetime
},
...
...
@@ -232,6 +233,10 @@
orderType
()
{
return
this
.
types
[
this
.
type
]
}
},
created
()
{
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
new
Date
().
getTime
()
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
)
},
methods
:
{
handleClick
()
{
...
...
@@ -241,8 +246,15 @@
handleClickCell
()
{
this
.
$emit
(
'click'
)
},
handleChange
(
timestamp
)
{
if
(
this
.
orderData
.
currentOverTime
)
this
.
$refs
[
'order-count-down'
].
seconds
+=
2
handleChange
(
timestamp
)
{
console
.
log
(
timestamp
)
if
(
this
.
timeout
)
this
.
$refs
[
'order-count-down'
].
seconds
+=
2
if
(
timestamp
==
0
&&
!
this
.
timeout
)
{
setTimeout
(()
=>
{
this
.
timestamp
=
1
this
.
timeout
=
true
},
1000
)
}
},
getDistance
(
Latitud
,
Longitud
)
{
return
this
.
distance
(
Latitud
,
Longitud
,
this
.
location
[
0
],
this
.
location
[
1
])
...
...
@@ -389,18 +401,19 @@
align-items
:
center
;
.bottom-tag-view
{
text-align
:
center
;
width
:
52rpx
;
height
:
52rpx
;
border-radius
:
26rpx
;
line-height
:
56rpx
;
color
:
#FFFFFF
;
font-size
:
26rpx
;
background-color
:
#FA5A49
;
margin-right
:
20rpx
;
background-color
:
#FF930D
;
margin-right
:
20rpx
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
&
.
will
{
background-color
:
#F
F930D
;
&
.
timeout
{
background-color
:
#F
A5A49
;
}
}
}
...
...
src/components/take/index.vue
View file @
936a248d
...
...
@@ -78,7 +78,7 @@
data
()
{
return
{
showType
:
1
,
standardShow
:
tru
e
,
standardShow
:
fals
e
,
cameraInfo
:
{
devicePosition
:
'back'
,
flash
:
'auto'
...
...
@@ -120,6 +120,7 @@
this
.
initData
()
photo
.
currentItem
=
this
.
currentItem
if
(
this
.
currentItem
.
images
.
length
>
0
)
this
.
standardShow
=
true
},
computed
:
{
titleTxt
()
{
...
...
src/pages/learn/index.vue
View file @
936a248d
This diff is collapsed.
Click to expand it.
src/pages/order/detail.vue
View file @
936a248d
...
...
@@ -75,11 +75,16 @@
</view>
<view
v-if=
"orderRecords.length == 0"
class=
"no-record-view"
>
当前暂无履约记录
</view>
<view
v-else
>
<view
class=
"order"
v-for=
"(record,index) in shwoOrderRecords"
:key=
"record.operationContent"
>
<view
class=
"order-cell between-cell"
>
<view
class=
"record-line-view"
>
<view
class=
"order-cell between-cell"
v-for=
"(record,index) in shwoOrderRecords"
:key=
"record.operationContent"
>
<view
class=
"node-view"
></view>
<view
class=
"line-view-left"
>
<text>
{{
$u
.
timeFormat
(
record
.
operationDatetime
,
'yyyy.mm.dd hh:MM:ss'
)
}}
</text>
</view>
<view
class=
"line-view-right"
>
<text
style=
"color: red;"
>
{{
record
.
overTime
?
'(超时)'
:
''
}}{{
record
.
exception
?
'(异常)'
:
''
}}
</text>
<text>
{{
record
.
operationType
}}
</text>
<text>
{{
$u
.
timeFormat
(
record
.
operationDatetime
,
'yyyy-mm-dd hh:MM:ss'
)
}}
</text>
<text
style=
"color: red;"
>
{{
record
.
overTime
?
'超时 '
:
''
}}{{
record
.
exception
?
' 异常'
:
''
}}
</text>
</view>
</view>
</view>
<view
v-if=
"orderRecords.length > showLenght"
>
...
...
@@ -783,6 +788,41 @@
color
:
#333333
;
margin-top
:
30rpx
;
}
.record-line-view
{
padding-left
:
30rpx
;
position
:
relative
;
margin-left
:
6rpx
;
}
.line-view-left
{
width
:
270rpx
;
flex-shrink
:
0
;
}
.line-view-right
{
text-align
:
right
;
}
.
record-line-view
:
:
before
{
content
:
" "
;
position
:
absolute
;
left
:
0
;
top
:
20rpx
;
width
:
1px
;
bottom
:
20rpx
;
border-left
:
1px
dashed
#2272FF
;
transform-origin
:
0
0
;
transform
:
scaleX
(
0
.5
);
}
.node-view
{
margin-top
:
16rpx
;
position
:
absolute
;
left
:
-3px
;
background-color
:
#2272FF
;
border-radius
:
7rpx
;
width
:
14rpx
;
height
:
14rpx
;
z-index
:
1
;
}
.address-cell
{
height
:
24rpx
;
...
...
@@ -900,7 +940,6 @@
// 页面公用css
.order-cell
{
height
:
48rpx
;
font-size
:
26rpx
;
font-weight
:
400
;
color
:
#333333
;
...
...
@@ -912,6 +951,6 @@
.between-cell
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
flex-start
;
}
</
style
>
src/pages/order/feedback.vue
View file @
936a248d
...
...
@@ -75,7 +75,7 @@
</
template
>
<
script
>
let
now
=
Date
.
now
()
let
now
=
new
Date
(
new
Date
().
toLocaleDateString
()).
getTime
()
import
appointTime
from
'@/components/appoint/appoint-time.vue'
export
default
{
data
()
{
...
...
@@ -132,7 +132,8 @@
nextTraceDatetime
:
''
,
// 下次跟踪时间
remark
:
''
,
// 备注
},
appointTitle
:
"预约时间"
appointTitle
:
"预约时间"
,
num
:
0
,
};
},
components
:{
...
...
@@ -162,7 +163,6 @@
},
},
async
onLoad
(
e
)
{
// this.$u.vuex('vuex_token', 'RTOKEN7493e6defc2f1a77782f105dc297a9366763fec5');
this
.
orderId
=
1
this
.
categoryId
=
88
if
(
e
)
{
...
...
@@ -173,8 +173,6 @@
title
:
"数据加载中"
,
mask
:
true
})
this
.
loadCalendar
()
this
.
loadTimerange
()
await
this
.
initPageData
()
},
methods
:
{
...
...
@@ -182,7 +180,8 @@
async
initPageData
()
{
let
self
=
this
let
params
=
{
categoryId
:
self
.
categoryId
}
let
res
=
await
self
.
$u
.
api
.
feedbackConfig
(
params
)
let
pse
=
await
Promise
.
all
([
self
.
$u
.
api
.
feedbackConfig
(
params
),
self
.
loadCalendar
(),
self
.
loadTimerange
()])
let
res
=
pse
[
0
]
if
(
res
&&
res
.
code
==
200
)
{
self
.
config
=
res
.
data
self
.
initParams
()
...
...
@@ -219,7 +218,7 @@
self
.
appointTitle
=
'预约时间'
if
(
self
.
dateList
&&
self
.
timeList
)
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
if
(
self
.
dateList
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
item
.
disabled
=
true
}
else
{
item
.
disabled
=
false
...
...
@@ -241,7 +240,7 @@
async
loadCalendar
()
{
let
self
=
this
let
params
=
{
num
:
1
num
:
this
.
num
}
let
res
=
await
this
.
$u
.
api
.
workerCalendar
(
params
)
if
(
res
&&
res
.
code
==
200
)
{
...
...
@@ -283,25 +282,11 @@
if
(
data
&&
data
.
time
)
{
let
num
=
data
.
num
let
time
=
data
.
time
this
.
num
=
num
if
(
num
==
0
)
{
this
.
dateList
=
[
{
day
:
time
,
timeRange
:
[]},
{
day
:
time
+
(
1
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
2
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
3
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
4
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
5
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
6
*
86400000
),
timeRange
:
[]},
]
this
.
loadCalendar
()
}
else
{
this
.
dateList
=
[
{
day
:
time
,
timeRange
:
[]},
{
day
:
time
+
(
1
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
2
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
3
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
4
*
86400000
),
timeRange
:
[]},
{
day
:
time
+
(
5
*
86400000
),
timeRange
:
[]},
]
this
.
loadCalendar
()
}
}
...
...
@@ -435,7 +420,7 @@
margin-right
:
-24rpx
;
.txt-item
{
border-radius
:
12rpx
;
padding
:
24rpx
38
rpx
;
padding
:
24rpx
24
rpx
;
width
:
196rpx
;
height
:
72rpx
;
text-align
:
center
;
...
...
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