From a4c20f32eb36c1f99068a137e4ff0fd1bd329bb0 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 18 Apr 2019 16:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86=E6=9C=BA?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8B=E6=90=9C=E7=B4=A2=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/search.wpy  | 32 +++++++++++++++++---------------
 src/style/search.less |  2 ++
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/pages/search.wpy b/src/pages/search.wpy
index b9a68c4..9fcc3e9 100644
--- a/src/pages/search.wpy
+++ b/src/pages/search.wpy
@@ -7,7 +7,7 @@
   .grid-list {
     display: flex;
     flex-wrap: wrap;
-    padding: 5rpx;
+    padding: 5rpx 0;
   }
 
 </style>
@@ -16,17 +16,19 @@
     <view class="top-action-bar">
       <view class="weui-search-bar">
         <view class="weui-search-bar__form">
-          <view class="weui-search-bar__box">
+          <view class="weui-search-bar__box" hidden="{{!inputShowed}}">
             <icon class="weui-icon-search_in-box" type="search" size="14"></icon>
-            <input type="text" class="weui-search-bar__input" confirm-type="search" placeholder="输入游戏名" value="{{inputVal}}" focus="{{inputShowed}}" bindconfirm="endInput" />
-            <view class="weui-icon-clear" wx:if="{{inputVal.length > 0}}" bindtap="clearInput">
+            <input type="text" class="weui-search-bar__input" confirm-type="search" placeholder="" value="{{inputVal}}" focus="{{inputShowed}}" bindconfirm="endInput" />
+            <view class="weui-icon-clear" hidden="{{inputVal.length === 0}}" bindtap="clearInput">
               <icon type="clear" size="14"></icon>
             </view>
           </view>
-          <label class="weui-search-bar__label" hidden="{{inputShowed}}" bindtap="showInput">
-            <icon class="weui-icon-search" type="search" size="14"></icon>
-            <view class="weui-search-bar__text">输入游戏名</view>
-          </label>
+          <view class="weui-search-bar__box" hidden="{{inputShowed}}">
+            <label class="weui-search-bar__label"  bindtap="showInput">
+              <icon class="weui-icon-search" type="search" size="14"></icon>
+              <view class="weui-search-bar__text">输入游戏名</view>
+            </label>
+          </view>
         </view>
         <view class="weui-search-bar__cancel-btn" hidden="{{!inputShowed}}" bindtap="hideInput">取消</view>
       </view>
@@ -48,16 +50,16 @@
         </view>
       </view>
     </view>
-    <view >
-      <repeat for="{{records}}" item="item" >
-        <recordCell :item="item" @gameCellTap.user="gameTap" :showAll.sync = 'showAll'/>
-      </repeat>
-    </view>
-    <!--<view class="grid-list">-->
+    <!--<view >-->
       <!--<repeat for="{{records}}" item="item" >-->
-        <!--<gridCell :item="item" @gameCellTap.user="gameTap" :showAll.sync = 'showAll'/>-->
+        <!--<recordCell :item="item" @gameCellTap.user="gameTap" :showAll.sync = 'showAll'/>-->
       <!--</repeat>-->
     <!--</view>-->
+    <view class="grid-list">
+      <repeat for="{{records}}" item="item" >
+        <gridCell :item="item" @gameCellTap.user="gameTap" :showAll.sync = 'showAll'/>
+      </repeat>
+    </view>
     <zanLoadmore :loading.sync="loading" :nodata.sync="noData" :nomore.sync="noMore" nodata_str="暂无数据"></zanLoadmore>
     <toast/>
   </view>
diff --git a/src/style/search.less b/src/style/search.less
index b86f5ac..c682db5 100644
--- a/src/style/search.less
+++ b/src/style/search.less
@@ -51,6 +51,7 @@
   width: 100%;
   box-sizing: border-box;
   z-index: 1;
+  height: @weuiSearchBarHeight;
 }
 .weui-search-bar__input {
   height: @weuiSearchBarHeight;
@@ -76,6 +77,7 @@
   color: #9B9B9B;
   background: #FFFFFF;
   line-height: @weuiSearchBarHeight;
+  height: 28px;
 }
 .weui-search-bar__cancel-btn {
   margin-left: 10px;