From 8a806a7ccf8bb1f8c713dd1fad976c5cd9c2ccbf Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 31 Mar 2017 15:35:45 +0800
Subject: [PATCH] fix search

---
 packages/search/src/search.vue    |  5 +--
 packages/zanui-css/src/search.css | 51 +++++++++++++------------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/packages/search/src/search.vue b/packages/search/src/search.vue
index fb70d53cf..b5696b096 100644
--- a/packages/search/src/search.vue
+++ b/packages/search/src/search.vue
@@ -5,13 +5,14 @@
       <input
         type="text"
         :placeholder="placeholder"
+        class="zan-search__input"
         v-model="value"
         v-refocus="focusStatus"
         @focus="handleFocus"
         @keyup.enter="handleSearch">
-      <zan-icon name="clear" @click="handleClean"></zan-icon>
+      <zan-icon name="clear" @click="handleClean" v-show="isFocus"></zan-icon>
     </div>
-    <div class="zan-search__cancel" :class="{ 'zan-search__cancel--focus' : isFocus }" @click="handleBack">取消</div>
+    <div class="zan-search__cancel" v-show="isFocus" @click="handleBack">取消</div>
   </div>
 </template>
 
diff --git a/packages/zanui-css/src/search.css b/packages/zanui-css/src/search.css
index d5991096a..e2a2c2860 100644
--- a/packages/zanui-css/src/search.css
+++ b/packages/zanui-css/src/search.css
@@ -3,67 +3,58 @@
 
 @component-namespace zan {
   @b search {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    align-items: center;
     position: relative;
     box-sizing: border-box;
     padding: 4px 15px;
     background-color: #F2F2F2;
 
     @m focus {
-      .zan-search__input-wrap {
-        width: 82%;   
-      }
-      .zan-icon-clear {
-        display: inline-block;
-      }
+      padding-right: 50px;
     }
 
     @e input-wrap {
       position: relative;
-      width: 90%;
       padding: 8px 24px 8px 35px;
       border: 1px solid $c-gray-light;
       border-radius: 4px;
       background-color: $c-white;
+    }
 
-      input {
-        width: 100%;
-        height: 14px;
-        font-size: 14px;
-        color: $c-gray-dark;
-        border: none;
-        outline: none;
-      }
+    @e input {
+      display: block;
+      width: 100%;
+      height: 14px;
+      font-size: 14px;
+      color: $c-gray-dark;
+      border: none;
+      outline: none;
     }
 
     @e cancel {
-      display: none;
-      color: #44BB00;
+      position: absolute;
+      line-height: 34px;
+      padding: 4px 0;
+      top: 0;
+      right: 10px;
       font-size: 14px;
-      white-space: nowrap;
-      margin-left: 5px;
-
-      @m focus {
-        display: block;
-      }
+      color: $c-green;
     }
 
     .zan-icon-search {
       color: $c-gray-darker;
       position: absolute;
-      top: 9px;
+      top: 8px;
       left: 10px;
       font-size: 16px;
+      line-height: 1;
     }
 
     .zan-icon-clear {
-      display: none;
+      font-size: 14px;
+      line-height: 1;
       position: absolute;
       right: 5px;
-      top: 8px;
+      top: 9px;
       color: #888;
     }
   }