Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-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
admin-base
Commits
679acb14
Commit
679acb14
authored
Sep 29, 2018
by
王
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
期数bug&&盒子列表bug
parent
ec73e610
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
8 deletions
+19
-8
boxTypeList.vue
src/components/box/boxTypeList.vue
+2
-2
index.vue
src/components/class/index.vue
+6
-5
index.vue
src/components/periods/index.vue
+11
-1
No files found.
src/components/box/boxTypeList.vue
View file @
679acb14
...
@@ -59,8 +59,8 @@
...
@@ -59,8 +59,8 @@
methods
:
{
methods
:
{
getBoxTypeList
(){
getBoxTypeList
(){
getBoxTypeListApi
().
then
(
res
=>
{
getBoxTypeListApi
().
then
(
res
=>
{
this
.
list
=
res
;
this
.
list
=
res
?
res
:
[]
;
if
(
this
.
nowId
===
''
)
{
if
(
this
.
nowId
===
''
&&
res
)
{
this
.
changeCateGory
(
res
[
0
].
id
)
this
.
changeCateGory
(
res
[
0
].
id
)
}
}
})
})
...
...
src/components/class/index.vue
View file @
679acb14
...
@@ -174,11 +174,11 @@
...
@@ -174,11 +174,11 @@
this
.
getClassList
()
this
.
getClassList
()
})
})
}
else
{
}
else
{
getPeriodsApi
({
goods_id
:
this
.
goodsList
[
0
].
id
}).
then
(
res
=>
{
//
getPeriodsApi({goods_id:this.goodsList[0].id}).then(res=>{
res
.
list
.
forEach
(
i
=>
{
i
.
name
=
i
.
title
});
//
res.list.forEach(i=>{i.name = i.title});
this
.
goodsList
[
0
].
children
=
res
.
list
;
//
this.goodsList[0].children = res.list;
this
.
periods
=
res
.
list
[
0
]
//
this.periods = res.list[0]
})
//
})
}
}
},
},
initPage
(){
initPage
(){
...
@@ -221,6 +221,7 @@
...
@@ -221,6 +221,7 @@
this
.
getClassList
();
this
.
getClassList
();
},
},
getClassList
(){
getClassList
(){
console
.
log
(
'getClassList this.periods'
,
this
.
periods
)
if
(
!
this
.
periods
)
return
;
if
(
!
this
.
periods
)
return
;
this
.
getTeacher
();
this
.
getTeacher
();
let
json
=
{
let
json
=
{
...
...
src/components/periods/index.vue
View file @
679acb14
...
@@ -173,6 +173,10 @@
...
@@ -173,6 +173,10 @@
page
page
},
},
methods
:
{
methods
:
{
dateCompare
(
val
){
let
nowDate
=
CommonJs
.
dateFmt
(
new
Date
(),
"yyyy-MM-dd"
);
return
((
new
Date
(
nowDate
.
replace
(
/-/g
,
"
\
/"
)))
>
(
new
Date
(
val
.
replace
(
/-/g
,
"
\
/"
))));
},
onPageChange
(
val
){
onPageChange
(
val
){
this
.
nowPage
=
val
this
.
nowPage
=
val
this
.
onSearch
()
this
.
onSearch
()
...
@@ -216,7 +220,13 @@
...
@@ -216,7 +220,13 @@
this
.
newDialog
.
show
=
true
;
this
.
newDialog
.
show
=
true
;
},
},
onEdit
(
row
){
onEdit
(
row
){
console
.
log
(
'onEdit'
,
row
);
if
(
this
.
dateCompare
(
row
.
start_at
))
{
this
.
$message
({
type
:
'error'
,
message
:
'期数已开始,不能编辑!'
});
return
;
}
let
weekList
=
[];
let
weekList
=
[];
if
(
row
.
rest_week_day
){
if
(
row
.
rest_week_day
){
row
.
rest_week_day
.
split
(
','
).
forEach
((
val
)
=>
{
row
.
rest_week_day
.
split
(
','
).
forEach
((
val
)
=>
{
...
...
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