|
|
@@ -178,9 +178,12 @@ Component({
|
|
|
this.data.dateList.forEach(item => {
|
|
|
let index = timeArr.indexOf(item.dateString)
|
|
|
let diff = new Date(item.dateString).dayDiff(new Date(this.data.defaultTime))
|
|
|
- console.log(diff,item,this.data.defaultTime);
|
|
|
+ let month = new Date(item.dateString).getMonth()
|
|
|
+ let monthDefault = new Date(this.data.defaultTime).getMonth()
|
|
|
+
|
|
|
+ console.log(diff,month,monthDefault);
|
|
|
// 判断未来日期 不能显示标题
|
|
|
- if (diff <= 0) {
|
|
|
+ if (diff <= 0 && month==monthDefault) {
|
|
|
// 正常 显示文字
|
|
|
item.isnormal = true
|
|
|
item.title = index !== -1?this.data.spot[index].title:null
|