添加注释

master
yujialong 3 years ago
parent 4b111a6cca
commit 3a42006ece
  1. 1
      src/layouts/footer/index.vue
  2. 1
      src/layouts/home/index.vue
  3. 2
      src/pages/information.vue
  4. 32
      src/pages/match.vue
  5. 1
      src/pages/matchDetail.vue

@ -15,7 +15,6 @@ export default {
}, },
methods: { methods: {
setBg(name){ setBg(name){
console.log(1111,name)
if(name == 'backstage'){ if(name == 'backstage'){
this.isWhite = true this.isWhite = true
}else{ }else{

@ -45,6 +45,7 @@ export default {
this.collapse = msg; this.collapse = msg;
}); });
// ,
bus.$on('setBg', name => { bus.$on('setBg', name => {
this.curModule = name this.curModule = name
this.$refs.header.setLogo(name) this.$refs.header.setLogo(name)

@ -122,10 +122,12 @@ export default {
this.loadIns = Loading.service() this.loadIns = Loading.service()
this.$get(this.api.queryAllColumns,data).then(res => { this.$get(this.api.queryAllColumns,data).then(res => {
this.menuList = res.data.columnTree this.menuList = res.data.columnTree
// ,
if(this.historyId){ if(this.historyId){
this.defaultIndex = this.historyId this.defaultIndex = this.historyId
this.getContent(this.historyId) this.getContent(this.historyId)
}else{ }else{
//
if(this.menuList[0].secondColumn.length){ if(this.menuList[0].secondColumn.length){
this.getContent(this.menuList[0].secondColumn[0].id) this.getContent(this.menuList[0].secondColumn[0].id)
this.defaultIndex = this.menuList[0].secondColumn[0].id this.defaultIndex = this.menuList[0].secondColumn[0].id

@ -138,12 +138,13 @@ export default {
let minute = second * 60 let minute = second * 60
let hour = minute * 60 let hour = minute * 60
let now = new Date().getTime() let now = new Date().getTime()
let signUpStartTime = new Date(that.core.dateCompatible(item.signUpStartTime)).getTime() let signUpStartTime = new Date(that.core.dateCompatible(item.signUpStartTime)).getTime() //
let signUpEndTime = new Date(that.core.dateCompatible(item.signUpEndTime)).getTime() let signUpEndTime = new Date(that.core.dateCompatible(item.signUpEndTime)).getTime() //
let playStartTime = new Date(that.core.dateCompatible(item.playStartTime)).getTime() let playStartTime = new Date(that.core.dateCompatible(item.playStartTime)).getTime() //
let playEndTime = new Date(that.core.dateCompatible(item.playEndTime)).getTime() let playEndTime = new Date(that.core.dateCompatible(item.playEndTime)).getTime() //
switch(item.status){ switch(item.status){
case 0: // statusgetData
case 0:
if(now > signUpStartTime){ if(now > signUpStartTime){
item.status = 1 item.status = 1
}else{ }else{
@ -233,29 +234,30 @@ export default {
let covers = [] let covers = []
this.listData.forEach((n,k) => { this.listData.forEach((n,k) => {
let now = new Date().getTime() let now = new Date().getTime()
let signUpStartTime = new Date(this.core.dateCompatible(n.signUpStartTime)).getTime() let signUpStartTime = new Date(this.core.dateCompatible(n.signUpStartTime)).getTime() //
let signUpEndTime = new Date(this.core.dateCompatible(n.signUpEndTime)).getTime() let signUpEndTime = new Date(this.core.dateCompatible(n.signUpEndTime)).getTime() //
let playStartTime = new Date(this.core.dateCompatible(n.playStartTime)).getTime() let playStartTime = new Date(this.core.dateCompatible(n.playStartTime)).getTime() //
let playEndTime = new Date(this.core.dateCompatible(n.playEndTime)).getTime() let playEndTime = new Date(this.core.dateCompatible(n.playEndTime)).getTime() //
if(now < signUpStartTime){ if(now < signUpStartTime){ //
n.status = 0 n.status = 0
n.end = Math.floor((signUpStartTime - now) / time) n.end = Math.floor((signUpStartTime - now) / time)
}else if(now > signUpStartTime && now < signUpEndTime){ }else if(now > signUpStartTime && now < signUpEndTime){ //
n.status = 1 n.status = 1
n.end = Math.floor((signUpEndTime - now) / time) n.end = Math.floor((signUpEndTime - now) / time)
}else if(now > signUpEndTime && now < playStartTime){ }else if(now > signUpEndTime && now < playStartTime){ // ,
n.status = 3 n.status = 3
n.end = Math.floor((playStartTime - now) / time) n.end = Math.floor((playStartTime - now) / time)
}else if(now > playStartTime && now < playEndTime){ }else if(now > playStartTime && now < playEndTime){ //
n.status = 4 n.status = 4
n.end = Math.floor((playEndTime - now) / time) n.end = Math.floor((playEndTime - now) / time)
}else if(now > playEndTime){ }else if(now > playEndTime){ //
n.status = 5 n.status = 5
} }
// idid
let isInclude = contestIds.includes(n.id) let isInclude = contestIds.includes(n.id)
if(n.status == 1 && !isInclude){ if(n.status == 1 && !isInclude){ // ,,,status2,signuptrue,
n.status = 2 n.status = 2
n.signup = true n.signup = true
}else{ }else{

@ -102,6 +102,7 @@ export default {
let time = 60 * 60 * 1000 * 24 let time = 60 * 60 * 1000 * 24
let now = new Date().getTime() let now = new Date().getTime()
// match.vue
let signUpStartTime = new Date(data.signUpStartTime).getTime() let signUpStartTime = new Date(data.signUpStartTime).getTime()
let signUpEndTime = new Date(data.signUpEndTime).getTime() let signUpEndTime = new Date(data.signUpEndTime).getTime()
let playStartTime = new Date(data.playStartTime).getTime() let playStartTime = new Date(data.playStartTime).getTime()

Loading…
Cancel
Save