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
03cdef0b
Commit
03cdef0b
authored
Apr 29, 2021
by
Damon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
534d6fe9
8d78ae70
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
174 additions
and
109 deletions
+174
-109
learn.js
src/common/api/learn.js
+5
-1
index.vue
src/components/order/index.vue
+28
-15
index.vue
src/pages/learn/index.vue
+140
-92
feedback.vue
src/pages/order/feedback.vue
+1
-1
No files found.
src/common/api/learn.js
View file @
03cdef0b
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/order/index.vue
View file @
03cdef0b
...
...
@@ -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/pages/learn/index.vue
View file @
03cdef0b
This diff is collapsed.
Click to expand it.
src/pages/order/feedback.vue
View file @
03cdef0b
...
...
@@ -420,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