修改优化

components/ui-calendar/ui-calendar.js

@@ -20,6 +20,13 @@ Component({
     },
     listedCount:{
       type:Array
+    },
+
+    year:{
+      type:String
+    },
+    month:{
+      type:String
     }
   },
   data: {
@@ -46,6 +53,13 @@ Component({
         indexT:data
       })
       console.log(data)
-    }
+    },
+    DateChange(e){
+      this.triggerEvent('DateChange', e.detail.value);
+    },
+    todayFun(){
+      this.triggerEvent('todayFun');
+
+    },
   }
 })

components/ui-calendar/ui-calendar.wxml

@@ -119,6 +119,23 @@
   }
 </wxs>
 <view class="cm-calendar">
+  <!-- 地图上方控件 -->
+  <view class="map_top">
+    <view class="today" bindtap="todayFun">
+      回到今天
+    </view>
+    <picker mode="region" value="{{timeValue}}" fields="month" mode="date" bindchange="DateChange">
+      <view class="dateTime">
+        <view class="dateLi years">
+          {{year}}年
+        </view>
+        <view class="dateLi month">
+          {{month}}月
+        </view>
+      </view>
+    </picker>
+  
+  </view>
   <view class="cm-calendar-hd">
     <block wx:for="{{weekDayArr}}" wx:key="weekDayKey">
       <view class="item">{{item}}</view>
@@ -132,7 +149,8 @@
           wx:for-index="index">
           <view wx:if="{{index < dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek }}"
             class="item"></view>
-              <view bindtap="onDayTap" data-index="{{index}}" wx:else data-year="{{dateUtil.getChangedDate(displayTime).year}}"
+          <view bindtap="onDayTap" data-index="{{index}}" wx:else
+            data-year="{{dateUtil.getChangedDate(displayTime).year}}"
             data-month="{{dateUtil.getChangedDate(displayTime).my_month}}"
             data-day="{{index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek}}"
             class="item {{dateUtil.isSelected(selectedDate, dateUtil.getChangedDate(displayTime).year, dateUtil.getChangedDate(displayTime).month, index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek,auctionCount,listedCount)}} ">

components/ui-calendar/ui-calendar.wxss

@@ -92,3 +92,28 @@
   color:#ffffff !important;
 
 }
+
+.map_top{
+  display: flex;
+  align-items: center;
+  justify-content:space-between;
+  padding:0 20rpx;
+}
+
+.dateTime{
+  display: flex; 
+}
+.dateTime .dateLi{
+  height: 50rpx;
+  line-height: 50rpx;
+  padding:0 20rpx;
+  border-radius: 25rpx;
+  border:2rpx solid #333333;
+  columns: #333333;
+  margin:0 10rpx;
+}
+.today{
+  font-size: 24rpx;
+  font-weight: bold;
+  color:#136AE7;
+}

pages/calculation/calculation.js

@@ -24,11 +24,37 @@ Page({
     }],
     list: [],
     refresher: false,
-    setScroll: true
+    setScroll: true,
+
+    
+    // 搜索框
+    is_search:false,
+    is_focusing:false,//是否聚焦
   },
 
   onReady() {
     this.refresh()
+  },
+ // 地图搜索框
+ searchFun(){
+  this.setData({
+    is_search:true,
+    is_focusing:true,
+  })
+},
+blurFun(){//隐藏
+  this.setData({
+    is_search:this.data.page.landListedId?true:false,
+    is_focusing:false,
+  })
+},
+ // 清空搜索内容
+ emptyFun(){
+  this.setData({
+    ['page.landListedId']:'',
+    is_focusing:true,
+  })
+  this.refresh();
 },
 
   onShow() {
@@ -122,6 +148,8 @@ Page({
    this.setData({
     [t]:e.detail.value
    })
+  this.refresh();
+
 },
 showInput(){
   if(this.data.inputShow==true){return false}

pages/calculation/calculation.wxml

@@ -1,11 +1,20 @@
 <view class="pages">
   <mp-navigation-bar ext-class="set-bar" title="测算" back="{{false}}"></mp-navigation-bar>
 
-  <view class="top">
-    <view class="search center" bindtap="showInput">
+  <view class="top look-top">
+    <!-- <view class="search center" bindtap="showInput">
       <image wx:if="{{!inputShow}}" src="../../assets/images/search-mini.png"></image>
       <input value="{{page.landListedId}}" bindconfirm="refresh" wx:if="{{inputShow}}" focus="true" bindblur="hideInput" class="form-input" bindinput="vmodel" type="text" />
+    </view> -->
+    <view class="look-search center {{is_search?'focusing':''}}" bindtap="searchFun">
+        <image class="look-s-icon" src="../../assets/images/search.png"></image>
+        <input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" bindconfirm="refresh" model:value="{{page.landListedId}}" hold-keyboard="true" bindinput="vmodel" bindblur="blurFun" placeholder="请输入搜索内容" />
+        <image class="del ml10" bindtap="emptyFun"
+        wx:if="{{page.landListedId != '' && page.landListedId}}" src="../../assets/images/del-icon.png" mode="widthFix"></image>
       </view>
+
+
+
     <view class="top-box center" bindtap="comeHistory">
       <image class="top-icon" src="../../assets/images/jiankong.png"></image>
       <text>测算监控</text>

pages/calculation/calculation.wxss

@@ -152,3 +152,28 @@
   text-align: center;
   padding-top: 50rpx;
 }
+
+
+
+/* 2021 07-28 */
+.look-top{
+  position: relative;
+}
+
+.look-search{
+  padding: 0 20rpx;
+}
+.look-search .look-s-icon{
+  margin-right: 10rpx;
+}
+.look-search input{
+  width: 0;
+  transition: all .5s ease;
+  width: 0;
+}
+.look-search.focusing input{
+  width: 350rpx;
+}
+.look-search .del{
+  width: 25rpx;
+}

pages/calendar/calendar.js

@@ -50,8 +50,9 @@ Page({
     listedCount: [],//有挂牌数量日期
   },
 
-  bindDateChange(res) {
-    let calendarDisplayTime = res.detail.value;
+  bindDateChange(value) {
+
+    let calendarDisplayTime = value.detail;
     console.log(calendarDisplayTime);
 
     this.setData({

pages/calendar/calendar.wxml

@@ -24,23 +24,16 @@
           <text>{{cityName}}</text>
           <image class="tag" src="../../assets/images/arrow-down.png"></image>
         </view>
-        <picker mode="region" value="{{timeValue}}" fields="month" mode="date" bindchange="bindDateChange">
-          <view class="dateTime">
-            <view class="dateLi years">
-              {{year}}年
-            </view>
-            <view class="dateLi month">
-              {{month}}月
-            </view>
-          </view>
-        </picker>
+       
 
       </view>
       <view class="cal-box">
         <image class="cal-back" src="../../assets/images/cal-back.png"></image>
         <view class="calendar-box">
           <!-- <calendar bind:callSomeFun="onShow"></calendar> -->
-          <ui-calendar ex-class="calendar-cm-month" id='calendarId' bindonDayTap="onCalendarDayTap" auctionCount="{{auctionCount}}"
+          <ui-calendar ex-class="calendar-cm-month" 
+          bindtodayFun="todayFun"
+          bindDateChange="bindDateChange" id='calendarId' bindonDayTap="onCalendarDayTap" auctionCount="{{auctionCount}}" year="{{year}}" month="{{month}}"
             listedCount="{{listedCount}}" displayTime="{{calendarDisplayTime}}" selectedDate="{{calendarSelectedDate}}"
             displayMonthNum="{{calendarDisplayMonthNum}}" is-show="{{isCalendarShow}}"></ui-calendar>
         </view>
@@ -56,9 +49,7 @@
         <image class="tab-tag" src="../../assets/images/tab-tag.png"></image>
       </view>
       </view>
-      <view class="today" bindtap="todayFun">
-        回到今天
-      </view>
+
     </view>
     <!-- 展示部分 -->
     <view wx:if="{{active == 1}}">

pages/calendar/calendar.wxss

@@ -118,11 +118,7 @@
   display: flex;
   align-items: center;
 }
-.today{
-  font-size: 24rpx;
-  font-weight: bold;
-  color:#136AE7;
-}
+
 .tab-item {
   display: flex;
   flex-direction: column;
@@ -172,15 +168,3 @@
   padding-right: 20rpx;
 
 }
-.dateTime{
-  display: flex; 
-}
-.dateTime .dateLi{
-  height: 50rpx;
-  line-height: 50rpx;
-  padding:0 20rpx;
-  border-radius: 25rpx;
-  border:2rpx solid #333333;
-  columns: #333333;
-  margin:0 10rpx;
-}

pages/look-list/look-list.js

@@ -42,7 +42,34 @@ Page({
     region: ["500000", "500100"],
 
     title:'',//传递待测算名
+
+       // 搜索框
+       is_search:false,
+       is_focusing:false,//是否聚焦
+  },
+// 地图搜索框
+searchFun(){
+  this.setData({
+    is_search:true,
+    is_focusing:true,
+  })
 },
+blurFun(){//隐藏
+  this.setData({
+    is_search:this.data.page.landCode?true:false,
+    is_focusing:false,
+  })
+},
+ // 清空搜索内容
+ emptyFun(){
+  this.setData({
+    ['page.landCode']:'',
+    is_focusing:true,
+  })
+  this.refresh();
+},
+
+
   // 选择城市
   bindAddressChangeCity(res) {
     let cityName = res.detail.value[1];
@@ -299,6 +326,8 @@ Page({
     this.setData({
      [t]:e.detail.value
     })
+  this.refresh();
+
  },
  showInput(){
   if(this.data.inputShow==true){return false}

pages/look-list/look-list.wxml

@@ -30,11 +30,19 @@
 <view class="pages">
   <mp-navigation-bar ext-class="set-bar" title="列表"></mp-navigation-bar>
   <view class="look-top" bindtap="inShow">
-    <view class="look-search center" bindtap="showInput">
+    <!-- <view class="look-search center" bindtap="showInput">
       <image wx:if="{{!inputShow}}" class="look-s-icon" src="../../assets/images/search.png"></image>
       <input value="{{page.landCode}}" bindconfirm="refresh" wx:if="{{inputShow}}" focus="true" bindblur="hideInput"
         class="form-input" bindinput="vmodel" type="text" />
-    </view>
+    </view> -->
+    <view class="look-search center {{is_search?'focusing':''}}" bindtap="searchFun">
+        <image class="look-s-icon" src="../../assets/images/search.png"></image>
+        <input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" bindconfirm="refresh" model:value="{{page.landCode}}" hold-keyboard="true" bindinput="vmodel" bindblur="blurFun" placeholder="请输入搜索内容" />
+        <image class="del ml10" bindtap="emptyFun"
+        wx:if="{{page.landListedId != '' && page.landListedId}}" src="../../assets/images/del-icon.png" mode="widthFix"></image>
+      </view>
+
+
     <view class="look-top-right flex-center" bindtap="comeBack">
       <image class="look-top-tag" src="../../assets/images/map.png"></image>
       <text class="look-top-text">地图</text>

pages/look-list/look-list.wxss

@@ -223,3 +223,27 @@
   border-top-right-radius: 8rpx;
   border-bottom-right-radius: 8rpx;
 }
+
+
+/* 2021 07-28 */
+.look-top{
+  position: relative;
+}
+
+.look-search{
+  padding: 0 20rpx;
+}
+.look-search .look-s-icon{
+  margin-right: 10rpx;
+}
+.look-search input{
+  width: 0;
+  transition: all .5s ease;
+  width: 0;
+}
+.look-search.focusing input{
+  width: 350rpx;
+}
+.look-search .del{
+  width: 25rpx;
+}