diff --git a/examples/app.vue b/examples/app.vue
index 8ac93645..a651d69a 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -54,6 +54,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
                 <li><router-link to="/modal">Modal</router-link></li>
                 <li><router-link to="/message">Message</router-link></li>
                 <li><router-link to="/notice">Notice</router-link></li>
+                <li><router-link to="/avatar">Avatar</router-link></li>
             </ul>
         </nav>
         <router-view></router-view>
diff --git a/examples/main.js b/examples/main.js
index 495da89d..f48654a7 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -180,6 +180,10 @@ const router = new VueRouter({
         {
             path: '/notice',
             component: require('./routers/notice.vue')
+        },
+        {
+            path: '/avatar',
+            component: require('./routers/avatar.vue')
         }
     ]
 });
diff --git a/examples/routers/avatar.vue b/examples/routers/avatar.vue
new file mode 100644
index 00000000..3a90b10a
--- /dev/null
+++ b/examples/routers/avatar.vue
@@ -0,0 +1,8 @@
+<template>
+    <Avatar></Avatar>
+</template>
+<script>
+    export default {
+
+    }
+</script>
diff --git a/examples/routers/poptip.vue b/examples/routers/poptip.vue
index 8d5f7f4f..4261d041 100644
--- a/examples/routers/poptip.vue
+++ b/examples/routers/poptip.vue
@@ -1,21 +1,24 @@
 <template>
-    <div>
-        <Poptip trigger="hover" title="提示标题" content="提示内容">
-            <Button>hover 激活</Button>
-        </Poptip>
-        <Poptip transfer title="提示标题" content="提示内容">
-            <Button>click 激活</Button>
-        </Poptip>
-        <Poptip trigger="focus" title="提示标题" content="提示内容">
-            <Button>focus 激活</Button>
-        </Poptip>
-        <Poptip trigger="focus" title="提示标题" content="提示内容">
-            <i-input placeholder="输入框的 focus"></i-input>
+    <div style="margin: 100px;">
+        <Poptip
+                confirm
+                transfer
+                title="您确认删除这条内容吗？"
+                @on-ok="ok"
+                @on-cancel="cancel">
+            <Button>删除</Button>
         </Poptip>
     </div>
 </template>
 <script>
     export default {
-
+        methods: {
+            ok () {
+                this.$Message.info('点击了确定');
+            },
+            cancel () {
+                this.$Message.info('点击了取消');
+            }
+        }
     }
 </script>
diff --git a/src/components/avatar/avatar.vue b/src/components/avatar/avatar.vue
new file mode 100644
index 00000000..58856771
--- /dev/null
+++ b/src/components/avatar/avatar.vue
@@ -0,0 +1,26 @@
+<template>
+    <span>
+
+    </span>
+</template>
+<script>
+    const prefixCls = 'ivu-avatar';
+
+    export default {
+        name: 'Avatar',
+        props: {
+
+        },
+        data () {
+            return {
+
+            };
+        },
+        computed: {
+
+        },
+        methods: {
+
+        }
+    };
+</script>
\ No newline at end of file
diff --git a/src/components/avatar/index.js b/src/components/avatar/index.js
new file mode 100644
index 00000000..9f578606
--- /dev/null
+++ b/src/components/avatar/index.js
@@ -0,0 +1,2 @@
+import Avatar from './avatar.vue';
+export default Avatar;
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index fd9bdad4..40062326 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,6 +3,7 @@ import 'core-js/fn/array/find-index';
 
 import Affix from './components/affix';
 import Alert from './components/alert';
+import Avatar from './components/avatar';
 import BackTop from './components/back-top';
 import Badge from './components/badge';
 import Breadcrumb from './components/breadcrumb';
@@ -49,6 +50,7 @@ import locale from './locale';
 const iview = {
     Affix,
     Alert,
+    Avatar,
     BackTop,
     Badge,
     Breadcrumb,
diff --git a/src/styles/components/avatar.less b/src/styles/components/avatar.less
new file mode 100644
index 00000000..15fc68cf
--- /dev/null
+++ b/src/styles/components/avatar.less
@@ -0,0 +1,5 @@
+@avatar-prefix-cls: ~"@{css-prefix}avatar";
+
+.@{avatar-prefix-cls} {
+
+}
\ No newline at end of file
diff --git a/src/styles/components/index.less b/src/styles/components/index.less
index 880f375a..4850ba3f 100644
--- a/src/styles/components/index.less
+++ b/src/styles/components/index.less
@@ -38,4 +38,5 @@
 @import "carousel";
 @import "rate";
 @import "upload";
-@import "tree";
\ No newline at end of file
+@import "tree";
+@import "avatar";
\ No newline at end of file