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
6c4434a1
Commit
6c4434a1
authored
Aug 03, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' into test
parents
ed4b4d77
8be141fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
App.vue
src/App.vue
+1
-1
record.vue
src/pages/learn/record.vue
+7
-2
No files found.
src/App.vue
View file @
6c4434a1
...
@@ -85,7 +85,7 @@ export default {
...
@@ -85,7 +85,7 @@ export default {
this
.
$u
.
vuex
(
'orgId'
,
orgId
||
-
1
)
this
.
$u
.
vuex
(
'orgId'
,
orgId
||
-
1
)
}
else
{
}
else
{
if
(
scene
.
includes
(
options
.
scene
))
{
// 如果需要更新机构ID
if
(
scene
.
includes
(
options
.
scene
))
{
// 如果需要更新机构ID
if
(
!
orgId
)
{
// 针对重新载入小程序 安卓的query参数会清空
if
(
!
orgId
&&
options
.
path
===
'pages/index/index'
)
{
// 针对重新载入小程序 安卓的query参数会清空
// 如果没有参数,需要重置为平台的场景
// 如果没有参数,需要重置为平台的场景
const
platformScene
=
[
1005
,
1006
,
1026
,
1053
,
1145
,
1183
,
1017
]
const
platformScene
=
[
1005
,
1006
,
1026
,
1053
,
1145
,
1183
,
1017
]
if
(
platformScene
.
includes
(
options
.
scene
))
{
if
(
platformScene
.
includes
(
options
.
scene
))
{
...
...
src/pages/learn/record.vue
View file @
6c4434a1
...
@@ -197,6 +197,9 @@ export default {
...
@@ -197,6 +197,9 @@ export default {
if
(
e
&&
e
.
key
)
{
if
(
e
&&
e
.
key
)
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
// setTimeout(() => {
// setTimeout(() => {
if
(
e
.
key
==
'today'
)
{
e
.
key
=
'total'
}
this
.
scrollId
=
'part-'
+
e
.
key
this
.
scrollId
=
'part-'
+
e
.
key
// }, 500)
// }, 500)
})
})
...
@@ -222,7 +225,9 @@ export default {
...
@@ -222,7 +225,9 @@ export default {
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
days
=
[]
this
.
days
=
[]
for
(
var
item
of
res
)
{
for
(
var
item
of
res
)
{
this
.
days
.
push
(
item
.
time
.
replace
(
/
\-
0/g
,
'
\
-'
))
if
(
item
.
count
>=
10
)
{
this
.
days
.
push
(
item
.
time
.
replace
(
/
\-
0/g
,
'
\
-'
))
}
}
}
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
...
@@ -475,7 +480,7 @@ export default {
...
@@ -475,7 +480,7 @@ export default {
}
}
.list-view
{
.list-view
{
padding-bottom
:
44rpx
;
padding-bottom
:
44rpx
;
min-height
:
96
0rpx
;
min-height
:
24
0rpx
;
.list-content
{
.list-content
{
padding
:
0
30rpx
20rpx
30rpx
;
padding
:
0
30rpx
20rpx
30rpx
;
min-height
:
44rpx
;
min-height
:
44rpx
;
...
...
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