From f76c438f1dd7a6b1255d0eb929c2e8a853ed5a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 7 Aug 2018 14:59:51 +0800
Subject: [PATCH] [bugfix] Field: clear icon position

---
 example/pages/field/index.wxml | 2 +-
 packages/field/README.md       | 3 ++-
 packages/field/index.wxml      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/example/pages/field/index.wxml b/example/pages/field/index.wxml
index 26fd4aaa..4f311724 100644
--- a/example/pages/field/index.wxml
+++ b/example/pages/field/index.wxml
@@ -1,6 +1,6 @@
 <demo-block title="基础用法">
   <van-cell-group>
-    <van-field value="{{ value }}" placeholder="请输入用户名" border="{{ false }}" />
+    <van-field value="{{ value }}" placeholder="请输入用户名" border="{{ false }}" clearable />
   </van-cell-group>
 </demo-block>
 
diff --git a/packages/field/README.md b/packages/field/README.md
index 322bc72e..d1fdc1b8 100644
--- a/packages/field/README.md
+++ b/packages/field/README.md
@@ -144,6 +144,7 @@
 | left-icon | 输入框左侧图标 (可选值见 Icon 组件)  | `String` | - |
 | confirm-type | 设置键盘右下角按钮的文字，仅在 type='text' 时生效 | `String` | `done` |
 | cursor-spacing | 输入框聚焦时底部与键盘的距离 | `Number` | `50` |
+| use-icon-slot | 是否使用 icon slot  | `Boolean` | `false` |
 | use-button-slot | 是否使用 button slot  | `Boolean` | `false` |
 
 ### Event
@@ -162,7 +163,7 @@
 | 名称 | 说明 |
 |-----------|-----------|
 | label | 自定义输入框标签，如果设置了`label`属性则不生效 |
-| icon | 自定义输入框尾部图标，如果设置了`icon`属性则不生效 |
+| icon | 自定义输入框尾部图标，需要设置`use-icon-slot`属性，如果设置了`icon`属性则不生效 |
 | button | 自定义输入框尾部按钮，需要设置`use-button-slot`属性 |
 
 ### 外部样式类
diff --git a/packages/field/index.wxml b/packages/field/index.wxml
index 6489d083..7542fa1d 100644
--- a/packages/field/index.wxml
+++ b/packages/field/index.wxml
@@ -52,7 +52,7 @@
       custom-class="van-field__clear"
       bind:touchstart="onClear"
     />
-    <view class="van-field__icon-container" bind:tap="onTapIcon">
+    <view class="van-field__icon-container" wx:if="{{ icon || useIconSlot }}" bind:tap="onTapIcon">
       <van-icon
         wx:if="{{ icon }}"
         name="{{ icon }}"