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
4e0e8c14
Commit
4e0e8c14
authored
Jul 26, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' into test
parents
4023e7e7
abd20ca4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
26 deletions
+32
-26
index.vue
src/pages/index/index.vue
+17
-13
detail.vue
src/pages/learn/detail.vue
+15
-13
No files found.
src/pages/index/index.vue
View file @
4e0e8c14
...
@@ -246,22 +246,26 @@ export default {
...
@@ -246,22 +246,26 @@ export default {
},
},
},
},
onLoad
()
{
onLoad
()
{
this
.
loading
=
true
if
(
this
.
vuex_token
)
{
this
.
getProvinceList
()
this
.
loading
=
true
this
.
getProvinceList
()
}
},
},
onShow
()
{
onShow
()
{
let
pages
=
getCurrentPages
()
if
(
this
.
vuex_token
)
{
let
page
=
pages
[
pages
.
length
-
1
]
let
pages
=
getCurrentPages
()
let
info
=
page
.
info
let
page
=
pages
[
pages
.
length
-
1
]
if
(
info
)
{
let
info
=
page
.
info
this
.
selected
=
info
if
(
info
)
{
page
.
info
=
null
this
.
selected
=
info
this
.
visible
=
info
.
state
page
.
info
=
null
this
.
queryMyQuestionWarehouseDetail
(
this
.
selected
.
id
)
this
.
visible
=
info
.
state
}
else
{
this
.
queryMyQuestionWarehouseDetail
(
this
.
selected
.
id
)
this
.
queryMyQuestionWarehouseDetail
(
this
.
info
.
id
||
0
)
}
else
{
this
.
queryMyQuestionWarehouseDetail
(
this
.
info
.
id
||
0
)
}
this
.
chagefinishCount
()
}
}
this
.
chagefinishCount
()
},
},
methods
:
{
methods
:
{
initData
()
{
initData
()
{
...
...
src/pages/learn/detail.vue
View file @
4e0e8c14
...
@@ -98,14 +98,14 @@ export default {
...
@@ -98,14 +98,14 @@ export default {
computed
:
{
computed
:
{
detail01Image
()
{
detail01Image
()
{
return
process
.
uniEnv
.
qn_base_url
+
'detail01.png'
return
process
.
uniEnv
.
qn_base_url
+
'shiherenqun-d.png'
},
detail02Image
()
{
return
process
.
uniEnv
.
qn_base_url
+
'detail02.png'
},
detail03Image
()
{
return
process
.
uniEnv
.
qn_base_url
+
'detail03.png'
},
},
// detail02Image() {
// return process.uniEnv.qn_base_url + 'detail02.png'
// },
// detail03Image() {
// return process.uniEnv.qn_base_url + 'detail03.png'
// },
shiherenqunImage
()
{
shiherenqunImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'shiherenqun.png'
return
process
.
uniEnv
.
qn_base_url
+
'shiherenqun.png'
},
},
...
@@ -125,7 +125,8 @@ export default {
...
@@ -125,7 +125,8 @@ export default {
return
process
.
uniEnv
.
qn_base_url
+
'zhutu.png'
return
process
.
uniEnv
.
qn_base_url
+
'zhutu.png'
},
},
images
()
{
images
()
{
return
[
this
.
detail01Image
,
this
.
detail02Image
,
this
.
detail03Image
]
// return [this.detail01Image, this.detail02Image, this.detail03Image]
return
[
this
.
detail01Image
]
},
},
buttonStyle
()
{
buttonStyle
()
{
return
{
return
{
...
@@ -422,16 +423,17 @@ export default {
...
@@ -422,16 +423,17 @@ export default {
margin-top
:
56rpx
;
margin-top
:
56rpx
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
border-radius
:
24rpx
;
border-radius
:
24rpx
;
padding
:
56rpx
30rpx
;
padding
:
56rpx
24rpx
90rpx
24rpx
;
text-align
:
left
;
.outline-view
{
.outline-view
{
font-size
:
28rpx
;
font-size
:
28rpx
;
color
:
#5a6073
;
color
:
#5a6073
;
margin-bottom
:
32rpx
;
text-align
:
center
;
}
}
.crowd-image
{
.crowd-image
{
width
:
62
2rpx
;
width
:
59
2rpx
;
height
:
120
rpx
;
height
:
214
rpx
;
margin-top
:
24
rpx
;
margin-top
:
70
rpx
;
}
}
}
}
}
}
...
...
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