diff --git a/app.js b/app.js index edf5273..419407e 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest163? true : false; + data.isTest = data.isTest164? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js index 85d72d9..0e5322e 100644 --- a/pages/component/newCalendar/index.js +++ b/pages/component/newCalendar/index.js @@ -57,7 +57,8 @@ Component({ /** 视图收起/展开 */ toggleMode() { const { year, month} = this.data - if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year+1))) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === (year-1)))) { + let nowYear = parseInt(new Date().getFullYear()) + if ((this.data.currentViewType === 'week' && year != nowYear)) { return } this.setData({ @@ -189,6 +190,7 @@ Component({ }, /** 切换月份 */ changeMonthFun(e){ + let nowYear = parseInt(new Date().getFullYear()) if (this.data.currentViewType === "month") { let { year, @@ -203,7 +205,7 @@ Component({ year = (parseInt(month) + 1) > 12 ? year + 1 : year month = (parseInt(month) + 1) > 12 ? 1 : parseInt(month) + 1 } - if (year != this.data.year) { + if (year != nowYear) { return } this.setData({ @@ -220,7 +222,7 @@ Component({ nowDay } = this.data let type = e.currentTarget.dataset.type //类型 - if ((type == 'next' && this.data.weekDay[0].year === (year+1)) || (type == 'prev' && this.data.weekDay[0].year === (year-1))) { + if ((type == 'next' && this.data.weekDay[6].year === (nowYear+1)) || (type == 'prev' && this.data.weekDay[0].year === (nowYear-1))) { return } // if (type == 'next' && this.data.weekDay[0].year === 2025) {