diff --git a/.DS_Store b/.DS_Store
index af692fa..3cf60cd 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 28d8b43..213ef25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules/
 *.log
 /docs/_book/
 uploader-server/uploads
+.DS_Store
diff --git a/docs/component/toast.md b/docs/component/toast.md
index 612f557..06b06e6 100644
--- a/docs/component/toast.md
+++ b/docs/component/toast.md
@@ -10,15 +10,19 @@ toast 一般用于操作成功时的提示场景
 | content | <code>string</code> |  | toast的文字 |
 | options | <code>Object</code> &#124; <code>function</code> |  | 配置项或回调 |
 | [options.duration] | <code>number</code> | <code>3000</code> | 多少毫秒后关闭toast |
+| [options.type] | <code>'success'</code> &#124; <code>'warning' </code> &#124; <code>'error' </code>&#124; <code>'none' </code> | <code>'success'</code> | 显示的图标 |
 | [options.callback] | <code>function</code> |  | 关闭后的回调 |
-| [options.className] | <code>string</code> |  | 自定义类名 |
+| [options.className] | <code>string</code> |  | 自定义根节点类名 |
+| [options.extClass] | <code>string</code> |  | 自定义内容节点类名 |
 
 **Example**  
 ```js
 weui.toast('操作成功', 3000);
 weui.toast('操作成功', {
     duration: 3000,
-    className: 'custom-classname',
+    type: 'none'
+    className: 'root',
+    extClass: 'content',
     callback: function(){ console.log('close') }
 });
 ```
diff --git a/src/toast/toast.html b/src/toast/toast.html
index 3319d93..431cc86 100644
--- a/src/toast/toast.html
+++ b/src/toast/toast.html
@@ -1,7 +1,15 @@
 <div class="<%= className %>" role="alert">
     <div class="weui-mask_transparent"></div>
     <div class="weui-toast <%= extClass %>">
-        <i class="weui-icon_toast weui-icon-success-no-circle"></i>
+        <% if(type === 'success'){ %>
+            <i class="weui-icon_toast weui-icon-success-no-circle"></i>
+        <% } %>
+        <% if(type === 'warning'){ %>
+            <i class="weui-icon_toast weui-icon-success-no-circle weui-icon-warn"></i>
+        <% } %>
+        <% if(type === 'error'){ %>
+            <i class="weui-icon_toast weui-icon-success-no-circle weui-icon-cancel"></i>
+        <% } %>
         <p class="weui-toast__content"><%=content%></p>
     </div>
 </div>
diff --git a/src/toast/toast.js b/src/toast/toast.js
index 200a2aa..8d5c3fa 100644
--- a/src/toast/toast.js
+++ b/src/toast/toast.js
@@ -32,6 +32,7 @@ let _sington;
  * weui.toast('操作成功', 3000);
  * weui.toast('操作成功', {
  *     duration: 3000,
+ *     type: 'success' | 'warning' | 'error'| 'none'
  *     className: 'custom-classname',
  *     extClass: 'toast-classname',
  *     callback: function(){ console.log('close') }
@@ -54,6 +55,7 @@ function toast(content = '', options = {}) {
     options = $.extend({
         content: content,
         duration: 3000,
+        type: 'success',
         callback: $.noop,
         className: '',
         extClass: ''