Merge branch '2.0' of https://github.com/iview/iview into iview-2.0

examples/routers/date.vue

@@ -1,5 +1,5 @@
 <template>
-    <Date-picker type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
+    <Date-picker type="daterange" placeholder="选择日期" disabled style="width: 200px"></Date-picker>
 </template>
 <script>
     export default {

examples/routers/poptip.vue

@@ -1,32 +1,12 @@
 <template>
-    <div style="margin: 100px;">
-        <Poptip
-                confirm
-                title="您确认删除这条内容吗？"
-                @on-ok="ok"
-                @on-cancel="cancel">
-            <Button>删除</Button>
-        </Poptip>
-        <Poptip
-                confirm
-                title="Are you sure delete this task?"
-                @on-ok="ok"
-                @on-cancel="cancel"
-                ok-text="yes"
-                cancel-text="no">
-            <Button>国际化</Button>
+    <div>
+        <Poptip trigger="focus" title="提示标题" content="提示内容">
+            <i-input placeholder="输入框的 focus"></i-input>
         </Poptip>
     </div>
 </template>
 <script>
     export default {
-        methods: {
-            ok () {
-                this.$Message.info('点击了确定');
-            },
-            cancel () {
-                this.$Message.info('点击了取消');
-            }
-        }
+
     }
 </script>