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
216aa567
Commit
216aa567
authored
Jul 30, 2021
by
Damon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0
parents
2655ef8e
28e6d620
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
40 additions
and
30 deletions
+40
-30
index.vue
src/components/experience-pop/index.vue
+1
-1
detailLearn.vue
src/pages/cert/detailLearn.vue
+2
-2
cert.vue
src/pages/index/cert.vue
+1
-1
index.vue
src/pages/index/index.vue
+4
-3
mine.vue
src/pages/index/mine.vue
+3
-2
manualBinding.vue
src/pages/learn/manualBinding.vue
+6
-3
record.vue
src/pages/learn/record.vue
+7
-7
score.vue
src/pages/learn/score.vue
+3
-2
selectSpecial.vue
src/pages/learn/selectSpecial.vue
+11
-7
certify.vue
src/pages/mine/certify.vue
+2
-2
No files found.
src/components/experience-pop/index.vue
View file @
216aa567
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
v-model=
"visible"
v-model=
"visible"
mode=
"center"
mode=
"center"
safe-area-inset-bottom
safe-area-inset-bottom
width=
"6
9
0rpx"
width=
"6
5
0rpx"
:mask-close-able=
"flase"
:mask-close-able=
"flase"
close-icon-color=
"#FFFFFF"
close-icon-color=
"#FFFFFF"
height=
"86%"
height=
"86%"
...
...
src/pages/cert/detailLearn.vue
View file @
216aa567
...
@@ -112,7 +112,7 @@ export default {
...
@@ -112,7 +112,7 @@ export default {
return
this
.
learnData
.
startDate
||
' '
return
this
.
learnData
.
startDate
||
' '
},
},
learnDate
()
{
learnDate
()
{
return
this
.
learnData
.
startDate
+
'~'
+
this
.
learnData
.
endDate
return
String
(
this
.
learnData
.
startDate
).
length
>
1
&&
(
this
.
learnData
.
startDate
+
'~'
+
this
.
learnData
.
endDate
)
||
' '
},
},
name
()
{
name
()
{
return
this
.
learnData
.
name
||
' '
return
this
.
learnData
.
name
||
' '
...
@@ -121,7 +121,7 @@ export default {
...
@@ -121,7 +121,7 @@ export default {
return
this
.
learnData
.
idCard
||
' '
return
this
.
learnData
.
idCard
||
' '
},
},
company
()
{
company
()
{
return
this
.
workPlace
return
this
.
workPlace
||
' '
},
},
subjectName
()
{
subjectName
()
{
return
this
.
learnData
.
subjectName
||
' '
return
this
.
learnData
.
subjectName
||
' '
...
...
src/pages/index/cert.vue
View file @
216aa567
...
@@ -277,7 +277,7 @@ export default {
...
@@ -277,7 +277,7 @@ export default {
continue
continue
}
}
let
item
=
{}
let
item
=
{}
item
.
certificateName
=
res
[
key
].
echoMap
.
questionWarehouseId
.
title
.
replace
(
'作业'
,
'证'
)
item
.
certificateName
=
res
[
key
].
echoMap
.
questionWarehouseId
.
title
item
.
id
=
res
[
key
].
echoMap
.
questionWarehouseId
.
id
item
.
id
=
res
[
key
].
echoMap
.
questionWarehouseId
.
id
item
.
bgImage
=
this
.
learnCertImage
item
.
bgImage
=
this
.
learnCertImage
item
.
type
=
'learn'
item
.
type
=
'learn'
...
...
src/pages/index/index.vue
View file @
216aa567
...
@@ -503,9 +503,10 @@ export default {
...
@@ -503,9 +503,10 @@ export default {
},
},
})
})
}
else
{
}
else
{
this
.
$u
.
route
({
this
.
show
=
true
url
:
'pages/learn/selectCategory'
,
// this.$u.route({
})
// url: 'pages/learn/selectCategory',
// })
}
}
},
},
// getProvinceList() {
// getProvinceList() {
...
...
src/pages/index/mine.vue
View file @
216aa567
...
@@ -134,8 +134,9 @@ export default {
...
@@ -134,8 +134,9 @@ export default {
},
},
avatar
()
{
avatar
()
{
return
(
return
(
(
this
.
student
&&
this
.
student
.
avatarPath
)
||
(
this
.
vuex_token
&&
(
this
.
userInfo
&&
this
.
userInfo
.
avatarUrl
)
||
((
this
.
student
&&
this
.
student
.
avatarPath
)
||
this
.
userInfo
.
avatarUrl
))
||
this
.
pic
this
.
pic
)
)
},
},
...
...
src/pages/learn/manualBinding.vue
View file @
216aa567
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
></u-navbar>
></u-navbar>
<view
class=
"body-view"
>
<view
class=
"body-view"
>
<view
class=
"image-view"
<view
class=
"image-view"
><image
class=
"image"
:src=
"
successImage
"
></image
><image
class=
"image"
:src=
"
kapianImage"
mode=
"widthFix
"
></image
></view>
></view>
<view
class=
"content-view"
>
<view
class=
"content-view"
>
<view
class=
"field-title"
>
学习卡卡号
</view>
<view
class=
"field-title"
>
学习卡卡号
</view>
...
@@ -97,6 +97,9 @@ export default {
...
@@ -97,6 +97,9 @@ export default {
borderRadius
:
'12rpx'
,
borderRadius
:
'12rpx'
,
}
}
},
},
kapianImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'kapian.png'
},
placeplaceholderStyle
()
{
placeplaceholderStyle
()
{
return
'color:#9EA5BB;font-size:28rpx'
return
'color:#9EA5BB;font-size:28rpx'
},
},
...
@@ -166,8 +169,8 @@ export default {
...
@@ -166,8 +169,8 @@ export default {
text-align
:
center
;
text-align
:
center
;
.image
{
.image
{
width
:
700rpx
;
width
:
700rpx
;
height
:
360rpx
;
//
height: 360rpx;
background-color
:
red
;
//
background-color: red;
border-radius
:
24rpx
;
border-radius
:
24rpx
;
box-shadow
:
0px
10px
16px
rgba
(
29
,
53
,
155
,
0
.2
);
box-shadow
:
0px
10px
16px
rgba
(
29
,
53
,
155
,
0
.2
);
}
}
...
...
src/pages/learn/record.vue
View file @
216aa567
...
@@ -182,8 +182,8 @@ export default {
...
@@ -182,8 +182,8 @@ export default {
this
.
chartData
.
series
=
[
this
.
chartData
.
series
=
[
{
{
name
:
'时间轴1'
,
name
:
'时间轴1'
,
pointShape
:
"circle"
,
pointShape
:
'circle'
,
legendShape
:
"circle"
,
legendShape
:
'circle'
,
data
:
[
data
:
[
[
10000
,
55
],
[
10000
,
55
],
[
30000
,
25
],
[
30000
,
25
],
...
@@ -194,8 +194,8 @@ export default {
...
@@ -194,8 +194,8 @@ export default {
},
},
{
{
name
:
'时间轴2'
,
name
:
'时间轴2'
,
pointShape
:
"circle"
,
pointShape
:
'circle'
,
legendShape
:
"circle"
,
legendShape
:
'circle'
,
data
:
[
data
:
[
[
0
,
25
],
[
0
,
25
],
[
20000
,
55
],
[
20000
,
55
],
...
@@ -295,8 +295,8 @@ export default {
...
@@ -295,8 +295,8 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.record-view
{
.record-view
{
display
:
flex
;
//
display: flex;
flex-direction
:
column
;
//
flex-direction: column;
height
:
100vh
;
height
:
100vh
;
position
:
relative
;
position
:
relative
;
background-color
:
#f7f9fc
;
background-color
:
#f7f9fc
;
...
@@ -340,7 +340,7 @@ export default {
...
@@ -340,7 +340,7 @@ export default {
}
}
border-radius
:
24rpx
24rpx
0
0
;
border-radius
:
24rpx
24rpx
0
0
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
height
:
100%
;
height
:
calc
(
100vh
-
178px
)
;
overflow
:
auto
;
overflow
:
auto
;
.scroll-view
{
.scroll-view
{
height
:
100%
;
height
:
100%
;
...
...
src/pages/learn/score.vue
View file @
216aa567
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
>
>
</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"
>
...
@@ -230,8 +231,8 @@ export default {
...
@@ -230,8 +231,8 @@ export default {
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.score-view
{
.score-view
{
display
:
flex
;
//
display: flex;
flex-direction
:
column
;
//
flex-direction: column;
height
:
100vh
;
height
:
100vh
;
background-color
:
#f7f9fc
;
background-color
:
#f7f9fc
;
::-webkit-scrollbar
{
::-webkit-scrollbar
{
...
...
src/pages/learn/selectSpecial.vue
View file @
216aa567
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<view
class=
"selected-list-content"
>
<view
class=
"selected-list-content"
>
<view
class=
"label-content"
>
<view
class=
"label-content"
>
<view
<view
v-for=
"(item, index) in
lable
s"
v-for=
"(item, index) in
showLabel
s"
:key=
"index"
:key=
"index"
class=
"special-item"
class=
"special-item"
hover-class=
"hover-class"
hover-class=
"hover-class"
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<image
:src=
"item.image"
class=
"item-image"
></image>
<image
:src=
"item.image"
class=
"item-image"
></image>
<view
class=
"item-title"
>
{{
item
.
title
}}
</view>
<view
class=
"item-title"
>
{{
item
.
title
}}
</view>
<view
<view
>
共
<text
class=
"item-count"
>
{{
i
nfo
[
item
.
key
]
}}
</text
>
共
<text
class=
"item-count"
>
{{
i
tem
.
number
}}
</text
>
道
</view
>
道
</view
>
>
</view>
</view>
...
@@ -43,35 +43,39 @@ export default {
...
@@ -43,35 +43,39 @@ export default {
},
},
computed
:
{
computed
:
{
// 1.顺序答题 2.随机练习 3.模拟考试 4.收藏答题 5.错题答题 6.专项练习-单选 7.专项练习-多选 8.专项练习-判断 9.专项练习-答案是
// 1.顺序答题 2.随机练习 3.模拟考试 4.收藏答题 5.错题答题 6.专项练习-单选 7.专项练习-多选 8.专项练习-判断 9.专项练习-答案是
lables
()
{
lables
()
{
return
[
return
[
{
{
key
:
'oneAnswerCount'
,
number
:
this
.
info
[
'oneAnswerCount'
]
,
title
:
'单选题'
,
title
:
'单选题'
,
source
:
6
,
source
:
6
,
image
:
process
.
uniEnv
.
qn_base_url
+
'danxuan.png'
,
image
:
process
.
uniEnv
.
qn_base_url
+
'danxuan.png'
,
},
},
{
{
key
:
'anyAnswerCount'
,
number
:
this
.
info
[
'anyAnswerCount'
]
,
title
:
'多选题'
,
title
:
'多选题'
,
source
:
7
,
source
:
7
,
image
:
process
.
uniEnv
.
qn_base_url
+
'duoxuan.png'
,
image
:
process
.
uniEnv
.
qn_base_url
+
'duoxuan.png'
,
},
},
{
{
key
:
'trueOrFalseCount'
,
number
:
this
.
info
[
'trueOrFalseCount'
]
,
title
:
'判断题'
,
title
:
'判断题'
,
source
:
8
,
source
:
8
,
image
:
process
.
uniEnv
.
qn_base_url
+
'panduan.png'
,
image
:
process
.
uniEnv
.
qn_base_url
+
'panduan.png'
,
},
},
{
{
key
:
'trueAnswerCount'
,
number
:
this
.
info
[
'trueAnswerCount'
]
,
title
:
'判断题(结果为正确)'
,
title
:
'判断题(结果为正确)'
,
source
:
9
,
source
:
9
,
image
:
process
.
uniEnv
.
qn_base_url
+
'zhengquepanduanti.png'
,
image
:
process
.
uniEnv
.
qn_base_url
+
'zhengquepanduanti.png'
,
},
},
]
]
},
},
showLabels
()
{
return
this
.
lables
.
filter
((
item
)
=>
{
return
item
.
number
>
0
})
},
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
this
.
getPageInfo
()
this
.
getPageInfo
()
...
...
src/pages/mine/certify.vue
View file @
216aa567
...
@@ -147,7 +147,7 @@ export default {
...
@@ -147,7 +147,7 @@ export default {
},
},
getFront
()
{
getFront
()
{
//身份证正面图片识别
//身份证正面图片识别
upload
.
getPhoto
(
1
,
this
.
token
).
then
((
res
)
=>
{
upload
.
getPhoto
(
2
,
this
.
token
).
then
((
res
)
=>
{
this
.
student
.
identityFrontPath
=
res
.
key
this
.
student
.
identityFrontPath
=
res
.
key
this
.
$u
.
api
this
.
$u
.
api
.
getCertifyInfoByType
(
'front'
,
{
.
getCertifyInfoByType
(
'front'
,
{
...
@@ -165,7 +165,7 @@ export default {
...
@@ -165,7 +165,7 @@ export default {
},
},
getBack
()
{
getBack
()
{
//身份证反面图片识别
//身份证反面图片识别
upload
.
getPhoto
(
1
,
this
.
token
).
then
((
res
)
=>
{
upload
.
getPhoto
(
2
,
this
.
token
).
then
((
res
)
=>
{
this
.
student
.
identityBackPath
=
res
.
key
this
.
student
.
identityBackPath
=
res
.
key
this
.
$u
.
api
this
.
$u
.
api
.
getCertifyInfoByType
(
'back'
,
{
.
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