Merge branch 'master' into 2.0

README.md

@@ -1,13 +1,13 @@
 <p align="center">
     <a href="https://www.iviewui.com">
-        <img width="200" src="https://file.iviewui.com/logo.svg">
+        <img width="200" src="https://file.iviewui.com/logo-new.svg">
     </a>
 </p>
 
 # iView Admin
 [![](https://img.shields.io/travis/iview/iview-admin.svg?style=flat-square)](https://travis-ci.org/iview/iview-admin)
 [![vue](https://img.shields.io/badge/vue-2.5.10-brightgreen.svg?style=flat-square)](https://github.com/vuejs/vue)
-[![iview ui](https://img.shields.io/badge/iview-2.14.3-brightgreen.svg?style=flat-square)](https://github.com/iview/iview)
+[![iview ui](https://img.shields.io/badge/iview-3.0.0-brightgreen.svg?style=flat-square)](https://github.com/iview/iview)
 [![npm](https://img.shields.io/npm/l/express.svg)]()
 
 
@@ -16,7 +16,7 @@
 
 [使用文档](https://lison16.github.io/iview-admin-doc/#/)
 
-[在线访问](https://iview.github.io/iview-admin)
+[在线访问](https://admin.iviewui.com/)
 
 [简化版模板](https://github.com/iview/iview-admin/tree/template)
 

src/view/main/main.vue

@@ -1,6 +1,6 @@
 <template>
   <Layout style="height: 100%" class="main">
-    <Sider hide-trigger collapsible :width="256" :collapsed-width="64" v-model="collapsed" class="left-sider" style="overflow: hidden;">
+    <Sider hide-trigger collapsible :width="256" :collapsed-width="64" v-model="collapsed" :class="collapsed ? '' : 'left-sider'" :style="{overflow: collapsed ? '' : 'hidden'}">
       <side-menu  :active-name="$route.name" :collapsed="collapsed" @on-select="turnToPage" :menu-list="menuList">
         <!-- 需要放在菜单上面的内容，如Logo，写在side-menu标签内部，如下 -->
         <div class="logo-con">