From 4333a32461a7315aba41acdbe823849114b61c20 Mon Sep 17 00:00:00 2001
From: zhangxiaobin <977277822@qq.com>
Date: Thu, 12 Jul 2018 13:43:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20wx:for=20=20=20wx:key?=
 =?UTF-8?q?=20warning=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/pages/icon/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/pages/icon/index.wxml b/examples/pages/icon/index.wxml
index 58fc895..2443589 100644
--- a/examples/pages/icon/index.wxml
+++ b/examples/pages/icon/index.wxml
@@ -1,5 +1,5 @@
 <i-grid>
-    <view class="icon-item" wx:for="{{ list }}">
+    <view class="icon-item" wx:key="{{ index }}" wx:for="{{ list }}">
         <i-icon type="{{ item }}" size="28" color="#80848f"></i-icon>
         <view class="icon-item-name">{{ item }}</view>
     </view>

From d845aa10757fd4980f4edef81353a5b67e0becc8 Mon Sep 17 00:00:00 2001
From: zhangxiaobin <977277822@qq.com>
Date: Thu, 12 Jul 2018 14:37:55 +0800
Subject: [PATCH 2/4] =?UTF-8?q?i-input=20=E5=A2=9E=E5=8A=A0=20placeholderS?=
 =?UTF-8?q?tyle=20=20=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AEplaceholder=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/pages/input/index.wxml | 1 +
 src/input/index.js              | 6 +++++-
 src/input/index.wxml            | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/examples/pages/input/index.wxml b/examples/pages/input/index.wxml
index 826a75b..5c27a6d 100644
--- a/examples/pages/input/index.wxml
+++ b/examples/pages/input/index.wxml
@@ -1,6 +1,7 @@
 <i-panel title="基础用法">
     <i-input value="{{ value1 }}" title="收货人" autofocus placeholder="名字" />
     <i-input value="{{ value2 }}" type="number" title="联系电话" placeholder="请输入手机号" />
+    <i-input value="{{ value2 }}" type="number" title="联系电话" placeholderStyle="color:red;" placeholder="请输入手机号" />
     <i-input value="{{ value3 }}" type="textarea" title="详细地址" placeholder="请输入详细地址(最多50字)" maxlength="50" />
     <i-input value="{{ value4 }}" title="用户信息" disabled />
 </i-panel>
diff --git a/src/input/index.js b/src/input/index.js
index c9d4c41..10ed2fd 100644
--- a/src/input/index.js
+++ b/src/input/index.js
@@ -1,7 +1,7 @@
 Component({
     behaviors: ['wx://form-field'],
 
-    externalClasses: ['i-class'],
+    externalClasses: ['i-class', 'i-placeholder-class'],
 
     properties: {
         title: {
@@ -20,6 +20,10 @@ Component({
             type: String,
             value: ''
         },
+        placeholderStyle: {
+            type: String,
+            value: ''
+        },
         autofocus: {
             type: Boolean,
             value: false
diff --git a/src/input/index.wxml b/src/input/index.wxml
index 52b0ee3..fa471e2 100644
--- a/src/input/index.wxml
+++ b/src/input/index.wxml
@@ -13,6 +13,7 @@
         bindinput="handleInputChange"
         bindfocus="handleInputFocus"
         bindblur="handleInputBlur"
+        placeholder-style="{{ placeholderStyle }}"
     ></textarea>
     <input
         wx:else
@@ -27,5 +28,6 @@
         bindinput="handleInputChange"
         bindfocus="handleInputFocus"
         bindblur="handleInputBlur"
+        placeholder-style="{{ placeholderStyle }}"
     />
 </view>

From 7a2d268efe1d8f032c704deef6eef76ea6e2dc5f Mon Sep 17 00:00:00 2001
From: zhangxiaobin <977277822@qq.com>
Date: Thu, 12 Jul 2018 14:39:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=20i-placeholder-class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/input/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/index.js b/src/input/index.js
index 10ed2fd..824f977 100644
--- a/src/input/index.js
+++ b/src/input/index.js
@@ -1,7 +1,7 @@
 Component({
     behaviors: ['wx://form-field'],
 
-    externalClasses: ['i-class', 'i-placeholder-class'],
+    externalClasses: ['i-class'],
 
     properties: {
         title: {

From 01aa19514bc8302a06e26f31ac5f30be62a322fd Mon Sep 17 00:00:00 2001
From: zhangxiaobin <977277822@qq.com>
Date: Thu, 12 Jul 2018 14:56:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/pages/icon/index.wxml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/pages/icon/index.wxml b/examples/pages/icon/index.wxml
index 2f8e8d8..6f4e1b6 100644
--- a/examples/pages/icon/index.wxml
+++ b/examples/pages/icon/index.wxml
@@ -1,6 +1,5 @@
 <i-grid>
     <view class="icon-item" wx:for="{{ list }}" wx:key="{{ item }}">
->>>>>>> 00b71726fc40652d61d0401cd3cf8fc17095bab5
         <i-icon type="{{ item }}" size="28" color="#80848f"></i-icon>
         <view class="icon-item-name">{{ item }}</view>
     </view>