diff --git a/pages/calendar/calendar.js b/pages/calendar/calendar.js index a4bb65a..1a95735 100644 --- a/pages/calendar/calendar.js +++ b/pages/calendar/calendar.js @@ -104,17 +104,17 @@ Page({ onShow: function () { let demo =wx.getStorageSync("date"); let timer=this.data.timer; - // if(demo){ - // timer=demo.time - // this.setData({ - // timer - // }) - // }else{ - // timer = moment().format('YYYY-MM-DD') - // this.setData({ - // timer - // }) - // } + if(demo){ + timer=demo.time + this.setData({ + timer + }) + }else{ + timer = moment().format('YYYY-MM-DD') + this.setData({ + timer + }) + } if(this.data.active===1){ diff --git a/pages/look-list/look-list.wxml b/pages/look-list/look-list.wxml index 4ce5831..74fa70b 100644 --- a/pages/look-list/look-list.wxml +++ b/pages/look-list/look-list.wxml @@ -28,7 +28,7 @@ module.exports = { setTag: setTag }; - + diff --git a/pages/look/look.wxml b/pages/look/look.wxml index 261643b..c99e305 100644 --- a/pages/look/look.wxml +++ b/pages/look/look.wxml @@ -27,7 +27,7 @@ - 土地池 + 列表