Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
h5-base
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
new-sing
h5-base
Commits
aae384cb
Commit
aae384cb
authored
Sep 05, 2019
by
IvyXia123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
正式环境bug发布
parent
f74f61b2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
+8
-7
growthRecord.vue
src/components/growthRecord.vue
+2
-1
evaluate.vue
src/components/newLesson/evaluate.vue
+2
-2
index.vue
src/components/newLesson/index.vue
+1
-1
main.js
src/main.js
+3
-3
No files found.
src/components/growthRecord.vue
View file @
aae384cb
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<span
class=
"num"
>
{{
itemChild
.
parent_child
}}
</span>
<span
class=
"num"
>
{{
itemChild
.
parent_child
}}
</span>
</div>
</div>
<div
class=
"rowthRecord-content-sub"
@
click=
"xiajiantou(itemChild.id)"
>
<div
class=
"rowthRecord-content-sub"
@
click=
"xiajiantou(itemChild.id)"
>
<span
class=
"fa-text"
:data-id=
"itemChild.id"
:data-int=
"1"
v-html=
"itemChild.growth_record"
></span>
<span
class=
"fa-text"
:data-id=
"itemChild.id"
:data-int=
"1"
v-html=
"itemChild.growth_record
.replace(/\n/g, '
<br/>
')
">
</span>
<span
class=
""
><img
class=
"xiajiantou"
:src=
"scoringCategoryImage.xiajiantou"
alt=
""
></span>
<!-- @click="xiajiantou(itemChild.id)" -->
<span
class=
""
><img
class=
"xiajiantou"
:src=
"scoringCategoryImage.xiajiantou"
alt=
""
></span>
<!-- @click="xiajiantou(itemChild.id)" -->
</div>
</div>
<div
class=
"timer"
>
{{
itemChild
.
created_at
.
split
(
' '
)[
1
]
}}
</div>
<div
class=
"timer"
>
{{
itemChild
.
created_at
.
split
(
' '
)[
1
]
}}
</div>
...
@@ -60,6 +60,7 @@
...
@@ -60,6 +60,7 @@
methods
:
{
methods
:
{
async
userGrowthRecordList
()
{
async
userGrowthRecordList
()
{
const
userGrowthRecordData
=
await
getUserGrowthListApi
();
const
userGrowthRecordData
=
await
getUserGrowthListApi
();
if
(
userGrowthRecordData
.
length
===
0
)
return
userGrowthRecordData
.
map
(
item
=>
{
userGrowthRecordData
.
map
(
item
=>
{
item
.
monthArr
=
[];
item
.
monthArr
=
[];
for
(
let
k
in
item
.
month
)
{
for
(
let
k
in
item
.
month
)
{
...
...
src/components/newLesson/evaluate.vue
View file @
aae384cb
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<!-- 输入框 -->
<!-- 输入框 -->
<div
class=
"checkbox-put"
>
<div
class=
"checkbox-put"
>
<!--
<div
contenteditable=
"true"
class=
"checkbox-put-contenteditable"
v-text=
"myHtmlCode"
@
input=
"handleInput"
placeholder=
"点击输入宝贝今天的学习表现、收获…"
></div>
-->
<!--
<div
contenteditable=
"true"
class=
"checkbox-put-contenteditable"
v-text=
"myHtmlCode"
@
input=
"handleInput"
placeholder=
"点击输入宝贝今天的学习表现、收获…"
></div>
-->
<textarea
class=
"checkbox-put-contenteditable"
v-model=
"myHtmlCode"
@
change=
"handleInput"
></textarea>
<textarea
placeholder=
"点击输入宝贝今天的学习表现、收获…"
class=
"checkbox-put-contenteditable"
v-model=
"myHtmlCode"
@
change=
"handleInput"
></textarea>
<div
class=
"checkbox-text"
>
*可输入15-100字
</div>
<div
class=
"checkbox-text"
>
*可输入15-100字
</div>
</div>
</div>
<!-- btn -->
<!-- btn -->
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
lessonDetail
=
JSON
.
parse
(
localStorage
.
getItem
(
"lessonDetail"
)),
// 获取延长时间
lessonDetail
=
JSON
.
parse
(
localStorage
.
getItem
(
"lessonDetail"
)),
// 获取延长时间
lookTime
=
(
nowTime
-
lessonDetail
.
nowTime
)
/
1000
,
lookTime
=
(
nowTime
-
lessonDetail
.
nowTime
)
/
1000
,
watchLog
=
{
page_type
:
0
,
page_id
:
page_id
,
stay_time
:
lookTime
};
watchLog
=
{
page_type
:
0
,
page_id
:
page_id
,
stay_time
:
lookTime
};
const
subUserLessonDatac
=
await
subUserLessonApi
(
elementId
,
category_id
,
periods_id
,
watchLog
)
const
subUserLessonDatac
=
await
subUserLessonApi
(
elementId
,
category_id
,
periods_id
,
lookTime
)
this
.
totalStarNum
=
subUserLessonDatac
.
total_star_num
this
.
totalStarNum
=
subUserLessonDatac
.
total_star_num
},
},
/**
/**
...
...
src/components/newLesson/index.vue
View file @
aae384cb
...
@@ -418,7 +418,7 @@
...
@@ -418,7 +418,7 @@
this
.
parent_category_id
=
this
.
$route
.
query
.
parent_category_id
;
this
.
parent_category_id
=
this
.
$route
.
query
.
parent_category_id
;
this
.
course_type
=
this
.
$route
.
query
.
course_type
;
this
.
course_type
=
this
.
$route
.
query
.
course_type
;
this
.
countTimeFn
()
this
.
countTimeFn
()
//
this.lesson = JSON.parse(localStorage.getItem("lessonDetail"));
this
.
lesson
=
JSON
.
parse
(
localStorage
.
getItem
(
"lessonDetail"
));
// debugger
// debugger
getUserWatchApi
({
category_id
:
this
.
category_id
}).
then
(
res
=>
{
getUserWatchApi
({
category_id
:
this
.
category_id
}).
then
(
res
=>
{
this
.
watchDetail
=
res
;
this
.
watchDetail
=
res
;
...
...
src/main.js
View file @
aae384cb
...
@@ -39,9 +39,9 @@ Vue.config.errorHandler = errorHandler;
...
@@ -39,9 +39,9 @@ Vue.config.errorHandler = errorHandler;
Vue
.
prototype
.
$throw
=
(
error
)
=>
errorHandler
(
error
,
this
);
Vue
.
prototype
.
$throw
=
(
error
)
=>
errorHandler
(
error
,
this
);
Vue
.
prototype
.
$common
=
common
Vue
.
prototype
.
$common
=
common
//VConsole关闭屏蔽代码
//VConsole关闭屏蔽代码
if
(
process
.
env
.
NODE_ENV
!=
'production'
)
{
//
if (process.env.NODE_ENV != 'production') {
new
VConsole
();
//
new VConsole();
}
//
}
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
next
()
next
()
...
...
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