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
74af15b1
Commit
74af15b1
authored
Jul 30, 2021
by
linwenqing
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
67f8d2cc
9ee910f4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
86 deletions
+67
-86
index.vue
src/components/pop-view/index.vue
+1
-6
answer.vue
src/pages/learn/answer.vue
+16
-20
examSetting.vue
src/pages/learn/examSetting.vue
+50
-59
score.vue
src/pages/learn/score.vue
+0
-1
No files found.
src/components/pop-view/index.vue
View file @
74af15b1
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
:loading=
"loading"
:loading=
"loading"
@
click=
"handleClickSure"
@
click=
"handleClickSure"
>
>
{{
buttonText
}}
确定
</u-button>
</u-button>
</view>
</view>
</view>
</view>
...
@@ -61,11 +61,6 @@ export default {
...
@@ -61,11 +61,6 @@ export default {
type
:
String
,
type
:
String
,
default
:
''
,
default
:
''
,
},
},
buttonText
:
{
// 确定按钮
type
:
String
,
default
:
'确定'
,
},
},
},
data
()
{
data
()
{
return
{
return
{
...
...
src/pages/learn/answer.vue
View file @
74af15b1
...
@@ -293,15 +293,11 @@ export default {
...
@@ -293,15 +293,11 @@ export default {
source
:
this
.
source
,
source
:
this
.
source
,
}
}
uni
.
showLoading
({
title
:
'加载中'
,
})
this
.
$u
.
api
.
getQuestionTotal
(
params
).
then
((
res
)
=>
{
this
.
$u
.
api
.
getQuestionTotal
(
params
).
then
((
res
)
=>
{
uni
.
hideLoading
()
// 列表总长度,一定要在第一次请求列表数据前明确该值
// 列表总长度,一定要在第一次请求列表数据前明确该值
// 否则无法知道下一页是否还有数据
// 否则无法知道下一页是否还有数据
let
total
=
parseInt
(
res
)
||
0
let
total
=
parseInt
(
res
)
||
0
//
if (total > 0) {
if
(
total
>
0
)
{
// 考试
// 考试
if
(
this
.
type
===
2
)
{
if
(
this
.
type
===
2
)
{
this
.
pageSize
=
this
.
totalPoint
this
.
pageSize
=
this
.
totalPoint
...
@@ -317,7 +313,7 @@ export default {
...
@@ -317,7 +313,7 @@ export default {
let
index
=
let
index
=
this
.
source
===
1
?
this
.
lastIndex
[
this
.
questionWarehouseId
]
||
0
:
0
this
.
source
===
1
?
this
.
lastIndex
[
this
.
questionWarehouseId
]
||
0
:
0
this
.
refresh
(
i
?
i
:
index
)
this
.
refresh
(
i
?
i
:
index
)
//
}
}
})
})
},
},
// 切换
// 切换
...
@@ -348,7 +344,7 @@ export default {
...
@@ -348,7 +344,7 @@ export default {
if
(
currentValue
.
submitStatus
)
accumulator
++
if
(
currentValue
.
submitStatus
)
accumulator
++
return
accumulator
return
accumulator
},
0
)
},
0
)
if
(
count
>
1
)
{
if
(
count
>
0
)
{
this
.
handPapers
()
this
.
handPapers
()
return
return
}
}
...
...
src/pages/learn/examSetting.vue
View file @
74af15b1
...
@@ -52,26 +52,6 @@
...
@@ -52,26 +52,6 @@
</view>
</view>
</view>
</view>
</picker>
</picker>
<!--
<view
class=
"select-area"
>
<view
@
click=
"handleClickArea"
class=
"area-text-view"
>
<text>
{{
currentProvince
.
label
}}
</text>
<u-icon
name=
"arrow-down"
></u-icon>
</view>
<view
class=
"loading-view"
v-if=
"loading"
>
<u-loading
mode=
"flower"
></u-loading>
</view>
<u-picker
mode=
"selector"
:range=
"range"
v-model=
"show"
:params=
"params"
safe-area-inset-bottom
cancel-color=
"#9EA5BB"
confirm-color=
"#2953FF"
:default-region=
"defaultRegion"
@
confirm=
"handleConform"
></u-picker>
</view>
-->
</view>
</view>
<view
class=
"bottom-view"
>
<view
class=
"bottom-view"
>
<u-button
<u-button
...
@@ -80,6 +60,7 @@
...
@@ -80,6 +60,7 @@
shape=
"circle"
shape=
"circle"
:disabled=
"buttonDisabled"
:disabled=
"buttonDisabled"
:type=
"buttonDisabled ? '' : 'primary'"
:type=
"buttonDisabled ? '' : 'primary'"
throttle-time=
"250"
>
>
确定
确定
</u-button>
</u-button>
...
@@ -233,8 +214,8 @@ export default {
...
@@ -233,8 +214,8 @@ export default {
console
.
log
(
res
)
console
.
log
(
res
)
this
.
range
=
res
||
[]
this
.
range
=
res
||
[]
},
},
async
handleClickSubmit
()
{
handleClickSubmit
()
{
if
(
this
.
buttonDisabled
)
return
//
if (this.buttonDisabled) return
if
(
this
.
range
.
length
<=
0
||
this
.
range
.
length
==
null
)
{
if
(
this
.
range
.
length
<=
0
||
this
.
range
.
length
==
null
)
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
title
:
'该类型和区域没有的题库'
,
title
:
'该类型和区域没有的题库'
,
...
@@ -246,6 +227,7 @@ export default {
...
@@ -246,6 +227,7 @@ export default {
})
})
return
return
}
}
if
(
this
.
index
==
0
)
{
if
(
this
.
index
==
0
)
{
this
.
changeIndex
()
this
.
changeIndex
()
}
}
...
@@ -254,18 +236,18 @@ export default {
...
@@ -254,18 +236,18 @@ export default {
type
:
this
.
selectedTypeId
,
type
:
this
.
selectedTypeId
,
}
}
// 获取科目对应的题库
// 获取科目对应的题库
let
res
=
await
this
.
$u
.
api
.
getQuestionWarehouse
(
this
.
category
.
id
,
param
)
this
.
$u
.
api
.
getQuestionWarehouse
(
this
.
category
.
id
,
param
)
.
then
((
res
)
=>
{
if
(
res
&&
res
.
length
>
0
)
{
if
(
res
&&
res
.
length
>
0
)
{
let
data
=
res
[
0
]
let
data
=
res
[
0
]
// 学员增加自己的题库
// 学员增加自己的题库
let
result
=
await
this
.
$u
.
api
this
.
$u
.
api
.
addQuestionWarehouse
({
.
addQuestionWarehouse
({
questionWarehouseId
:
data
.
id
,
questionWarehouseId
:
data
.
id
,
})
})
.
catch
((
err
)
=>
{
.
then
((
result
)
=>
{
console
.
log
(
err
)
})
if
(
result
)
{
if
(
result
)
{
data
.
isAdd
=
true
data
.
isAdd
=
true
this
.
setPageInfo
(
data
)
this
.
setPageInfo
(
data
)
...
@@ -284,6 +266,11 @@ export default {
...
@@ -284,6 +266,11 @@ export default {
}
else
{
}
else
{
this
.
showPop
=
false
this
.
showPop
=
false
}
}
})
.
catch
((
err
)
=>
{
this
.
showPop
=
false
console
.
log
(
err
)
})
}
else
{
}
else
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
title
:
'该类型和区域没有的题库'
,
title
:
'该类型和区域没有的题库'
,
...
@@ -294,6 +281,10 @@ export default {
...
@@ -294,6 +281,10 @@ export default {
},
},
})
})
}
}
})
.
catch
((
err
)
=>
{
console
.
log
(
err
)
})
},
},
changeIndex
()
{
changeIndex
()
{
for
(
var
i
=
0
;
i
<
this
.
range
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
range
.
length
;
i
++
)
{
...
...
src/pages/learn/score.vue
View file @
74af15b1
...
@@ -44,7 +44,6 @@
...
@@ -44,7 +44,6 @@
>
>
</view>
</view>
</CircleProgress>
</CircleProgress>
<view
style=
"height:600rpx;width:100%"
></view>
</view>
</view>
<view
class=
"head-view"
>
<view
class=
"head-view"
>
<view
class=
"image-view"
>
<view
class=
"image-view"
>
...
...
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