Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
3c4d74314d
@ -1807,7 +1807,7 @@ export default {
|
||||
dynamic_year: {
|
||||
fix: '固定年份',
|
||||
dynamic: '動態年份',
|
||||
current: '當年',
|
||||
current: '今年',
|
||||
last: '去年'
|
||||
},
|
||||
dynamic_month: {
|
||||
|
||||
@ -1817,7 +1817,7 @@ export default {
|
||||
dynamic_year: {
|
||||
fix: '固定年份',
|
||||
dynamic: '动态年份',
|
||||
current: '当年',
|
||||
current: '今年',
|
||||
last: '去年'
|
||||
},
|
||||
dynamic_month: {
|
||||
|
||||
@ -517,7 +517,7 @@ export default {
|
||||
})
|
||||
},
|
||||
initHasStar() {
|
||||
starStatus(this.panelInfo.id, false).then(res => {
|
||||
this.panelInfo && this.panelInfo.id && starStatus(this.panelInfo.id, false).then(res => {
|
||||
this.hasStar = res.data
|
||||
})
|
||||
},
|
||||
|
||||
@ -317,7 +317,7 @@ export default {
|
||||
})
|
||||
},
|
||||
initHasStar() {
|
||||
starStatus(this.panelInfo.id).then(res => {
|
||||
this.panelInfo && this.panelInfo.id && starStatus(this.panelInfo.id).then(res => {
|
||||
this.hasStar = res.data
|
||||
})
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user