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
a06e5a45
Commit
a06e5a45
authored
Apr 30, 2021
by
刘用法
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
2acf81a6
4540bbe8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
index.vue
src/components/take/index.vue
+7
-8
index.vue
src/pages/learn/index.vue
+1
-0
No files found.
src/components/take/index.vue
View file @
a06e5a45
...
@@ -33,18 +33,14 @@
...
@@ -33,18 +33,14 @@
<view
v-show=
"standardShow"
class=
"page-mask"
:z-index=
"10000"
>
<view
v-show=
"standardShow"
class=
"page-mask"
:z-index=
"10000"
>
<photo-standard
:currentItem=
"currentItem"
/>
<photo-standard
:currentItem=
"currentItem"
/>
<view
class=
"btn-close"
>
<view
class=
"btn-close"
>
<image
@
click=
"closeShadow"
class=
"icon icon-close"
mode=
"aspectFit"
src=
"/static/photo/icon-close.png"
>
<image
@
click=
"closeShadow"
class=
"icon icon-close"
mode=
"aspectFit"
src=
"/static/photo/icon-close.png"
></image>
</image>
</view>
</view>
</view>
</view>
</view>
</view>
<photo-preview
v-if=
"showType === 2"
@
changeType=
"changeType"
@
finish=
"finish"
/>
<photo-preview
v-if=
"showType === 2"
@
changeType=
"changeType"
@
finish=
"finish"
/>
<photo-setting
v-if=
"showType === 3"
@
changeType=
"changeType"
/>
<photo-setting
v-if=
"showType === 3"
@
changeType=
"changeType"
/>
</view>
</view>
</
template
>
</
template
>
// 加载该组件需要在当前页面隐藏顶部导航栏,然后加上自定义导航栏,通过状态切换显示隐藏
<!-- <u-navbar v-if="!takeStatus" :is-back="false" :title-size="26" title-color="#000" title="我的"></u-navbar> -->
<
script
>
<
script
>
let
r
=
require
(
"@/libs/bmap-wx.min.js"
);
let
r
=
require
(
"@/libs/bmap-wx.min.js"
);
...
@@ -105,7 +101,7 @@
...
@@ -105,7 +101,7 @@
ratio
:
0
,
ratio
:
0
,
cameraChange
:
false
,
cameraChange
:
false
,
waterSetting
:
null
,
waterSetting
:
null
,
shadowInitShow
:
tru
e
,
// 第一次进入页面需显示弹窗
shadowInitShow
:
fals
e
,
// 第一次进入页面需显示弹窗
}
}
},
},
created
(
e
)
{
created
(
e
)
{
...
@@ -120,7 +116,10 @@
...
@@ -120,7 +116,10 @@
this
.
initData
()
this
.
initData
()
photo
.
currentItem
=
this
.
currentItem
photo
.
currentItem
=
this
.
currentItem
if
(
this
.
currentItem
.
images
.
length
>
0
)
this
.
standardShow
=
true
if
(
this
.
currentItem
.
images
.
length
>
0
)
{
this
.
shadowInitShow
=
true
this
.
standardShow
=
true
}
},
},
computed
:
{
computed
:
{
titleTxt
()
{
titleTxt
()
{
...
...
src/pages/learn/index.vue
View file @
a06e5a45
...
@@ -486,6 +486,7 @@
...
@@ -486,6 +486,7 @@
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examStatus
=
res
.
data
.
examStatus
;
let
examResult
=
res
.
data
.
examLevelResult
;
let
examResult
=
res
.
data
.
examLevelResult
;
this
.
examList
[
i
].
status
=
examResult
!=
''
?
examResult
:
'未通过'
;
this
.
examList
[
i
].
status
=
examResult
!=
''
?
examResult
:
'未通过'
;
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
...
...
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