Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
study
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
Damon
study
Commits
d2036f52
Commit
d2036f52
authored
Jul 30, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' of
https://git.banshouhui.com/wuzhenzhe/study
into dev-v1.0.0
parents
abcfa346
216aa567
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
24 deletions
+21
-24
mine.vue
src/pages/index/mine.vue
+3
-2
answer.vue
src/pages/learn/answer.vue
+16
-20
certify.vue
src/pages/mine/certify.vue
+2
-2
No files found.
src/pages/index/mine.vue
View file @
d2036f52
...
...
@@ -134,8 +134,9 @@ export default {
},
avatar
()
{
return
(
(
this
.
student
&&
this
.
student
.
avatarPath
)
||
(
this
.
userInfo
&&
this
.
userInfo
.
avatarUrl
)
||
(
this
.
vuex_token
&&
((
this
.
student
&&
this
.
student
.
avatarPath
)
||
this
.
userInfo
.
avatarUrl
))
||
this
.
pic
)
},
...
...
src/pages/learn/answer.vue
View file @
d2036f52
...
...
@@ -293,31 +293,27 @@ export default {
source
:
this
.
source
,
}
uni
.
showLoading
({
title
:
'加载中'
,
})
this
.
$u
.
api
.
getQuestionTotal
(
params
).
then
((
res
)
=>
{
uni
.
hideLoading
()
// 列表总长度,一定要在第一次请求列表数据前明确该值
// 否则无法知道下一页是否还有数据
let
total
=
parseInt
(
res
)
||
0
//
if (total > 0) {
// 考试
if
(
this
.
type
===
2
)
{
this
.
pageSize
=
this
.
totalPoint
total
=
this
.
totalPoint
}
this
.
total
=
total
if
(
total
>
0
)
{
// 考试
if
(
this
.
type
===
2
)
{
this
.
pageSize
=
this
.
totalPoint
total
=
this
.
totalPoint
}
this
.
total
=
total
// 练习模式-初始化答题卡列表
if
(
this
.
source
===
1
)
Utils
.
initAnswerCardList
(
total
,
this
)
this
.
cachePageDataMap
=
new
Map
()
// 练习模式-初始化答题卡列表
if
(
this
.
source
===
1
)
Utils
.
initAnswerCardList
(
total
,
this
)
this
.
cachePageDataMap
=
new
Map
()
// 上次答到了第几题
let
index
=
this
.
source
===
1
?
this
.
lastIndex
[
this
.
questionWarehouseId
]
||
0
:
0
this
.
refresh
(
i
?
i
:
index
)
//
}
// 上次答到了第几题
let
index
=
this
.
source
===
1
?
this
.
lastIndex
[
this
.
questionWarehouseId
]
||
0
:
0
this
.
refresh
(
i
?
i
:
index
)
}
})
},
// 切换
...
...
@@ -348,7 +344,7 @@ export default {
if
(
currentValue
.
submitStatus
)
accumulator
++
return
accumulator
},
0
)
if
(
count
>
1
)
{
if
(
count
>
0
)
{
this
.
handPapers
()
return
}
...
...
src/pages/mine/certify.vue
View file @
d2036f52
...
...
@@ -147,7 +147,7 @@ export default {
},
getFront
()
{
//身份证正面图片识别
upload
.
getPhoto
(
1
,
this
.
token
).
then
((
res
)
=>
{
upload
.
getPhoto
(
2
,
this
.
token
).
then
((
res
)
=>
{
this
.
student
.
identityFrontPath
=
res
.
key
this
.
$u
.
api
.
getCertifyInfoByType
(
'front'
,
{
...
...
@@ -165,7 +165,7 @@ export default {
},
getBack
()
{
//身份证反面图片识别
upload
.
getPhoto
(
1
,
this
.
token
).
then
((
res
)
=>
{
upload
.
getPhoto
(
2
,
this
.
token
).
then
((
res
)
=>
{
this
.
student
.
identityBackPath
=
res
.
key
this
.
$u
.
api
.
getCertifyInfoByType
(
'back'
,
{
...
...
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