From 3360c095fbd62abc5aa27189e5c9f12b4a218d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=81=A5?= <usedtofly@163.com>
Date: Sun, 1 Aug 2021 20:30:09 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/calendar/calendar.js     | 22 +++++++++++-----------
 pages/look-list/look-list.wxml |  2 +-
 pages/look/look.wxml           |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

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 };
 </wxs>
 <view class="pages">
-  <mp-navigation-bar ext-class="set-bar" title="土地池"></mp-navigation-bar>
+  <mp-navigation-bar ext-class="set-bar" title="列表"></mp-navigation-bar>
   <view class="look-top" bindtap="inShow">
     <view class="look-search center" bindtap="showInput">
       <image wx:if="{{!inputShow}}" class="look-s-icon" src="../../assets/images/search.png"></image>
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 @@
 
       <view class="look-top-right flex-center" bindtap="comeList">
         <image class="look-top-tag" src="../../assets/images/s-icon.png"></image>
-        <text class="look-top-text">土地池</text>
+        <text class="look-top-text">列表</text>
       </view>
       <!-- 搜索内容 -->
       <view class="searchList" wx:if="{{ is_searchList}}">