Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_cuetpapmdg.css');
+@import url('//at.alicdn.com/t/font_2077629_cata4y2l5e8.css');
 
 html,
 body,

src/layouts/MainLayout.vue

@@ -132,12 +132,14 @@
     </q-header>
     <q-page-container class="window-height">
       <div class="row items-stretch full-height">
-        <a @click="changeLeft">隐藏{{IsShowLeft}}</a>
         <div style="box-shadow: 2px 0 10px 0 rgba(237,238,240,0.50);font-family:perfectFont;"
-          class="text-subtitle2 second-menu-bg" :style="{'width':IsShowLeft?'20px':'180px'}"
+          class="text-subtitle2 second-menu-bg" :style="{'width':IsShowLeft?'0':'180px'}"
           v-if="secondNavs && secondNavs.length>0">
-
           <div class="full-width left-menu-box q-pt-md">
+            <div class="is-show-menu-2"  @click="changeLeft">
+              <a v-if="!IsShowLeft"><i class="iconfont icon-line-arrow-left"></i></a>
+              <a v-else><i class="iconfont icon-arrow-right"></i></a>
+            </div>
             <q-list style="width:180px;overflow:hidden">
               <template v-for="(x,i) in secondNavs">
                 <q-item :to="x.MenuUrl" clickable v-ripple :active="currentPath==x.MenuUrl" v-if="x.SubList.length==0"
@@ -271,7 +273,20 @@
   .full-width {
     height: 100%;
   }
-
+  .is-show-menu-2{
+    position: absolute;
+    width: 35px;
+    height:35px;
+    line-height: 30px;
+    border-radius: 50%;
+    background: #2961fe;
+    color:#fff;
+    padding: 2px 8px;
+    right: -37px;
+    top: 1px;   
+    cursor: pointer;
+    z-index: 10;
+  }
   .head-bg {
     background-image: url('~assets/images/page/top.png');
     background-position: right;
@@ -285,7 +300,7 @@
     background-repeat: no-repeat;
     background-size: 100% auto;
     height: 100%;
-
+    position: relative;
   }
 
   .hide-scrollbar {