Merge branch 'master' of http://139.159.180.147/air/mini-program

pages/calendar/calendar.js

@@ -106,17 +106,17 @@ Page({
   onShow: function () {
     let demo =wx.getStorageSync("date");
     let timer=this.data.timer;
-    // if(demo){
+    if(demo){
-    //   timer=demo.time
+      timer=demo.time
-    //   this.setData({
+      this.setData({
-    //     timer
+        timer
-    //   })
+      })
-    // }else{
+    }else{
-    //   timer = moment().format('YYYY-MM-DD')
+      timer = moment().format('YYYY-MM-DD')
-    //   this.setData({
+      this.setData({
-    //     timer
+        timer
-    //   })
+      })
-    // }
+    }
 
     $api.getLandlistedList({annoDate:timer,city:this.data.cityName}).then(res=>{
       console.log(res.data)

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>

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}}">