Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/components/main/components/header-search/index.vue

@@ -32,7 +32,7 @@
 }
 .search .select .ivu-select-input,
 .search .select .ivu-select-item {
-  font-size: 14px !important;
+  font-size: 13px !important;
 }
 .search .ivu-select-input{
   padding-left: 19px;

template/admin/src/components/main/main.vue

@@ -44,10 +44,10 @@
       </Sider>
       <Content class="main-content-con">
         <Layout class="main-layout-con">
+          <div class="tag-nav-wrapper" v-if="!headMenuNoShow">
+            <tags-nav :value="$route" @input="handleClick" :list="tagNavList" @on-close="handleCloseTag" />
+          </div>
           <Content class="content-wrapper">
-            <div class="tag-nav-wrapper" v-if="!headMenuNoShow">
-              <tags-nav :value="$route" @input="handleClick" :list="tagNavList" @on-close="handleCloseTag" />
-            </div>
             <!-- <keep-alive :include="cacheList">
               <router-view v-if="reload" style="min-height: 600px" />
             </keep-alive> -->
@@ -302,6 +302,7 @@ export default {
 .main .tag-nav-wrapper {
   // height: 10px;
   background: unset;
+  padding:  0 15px;
 }
 .open-image {
   display: flex;
@@ -318,7 +319,7 @@ export default {
     width: 800px;
   }
 }
-.main-warper{
+.main-warper {
   min-height: calc(~'100vh - 166px');
 }
 </style>

template/admin/src/pages/setting/systemOutInterface/index.vue

@@ -892,7 +892,7 @@ export default {
   .main-btn {}
   .card-tree{
     width: 270px;
-    height: calc(100vh - 190px);
+    height: calc(100vh - 115px);
     overflow-y: scroll;
   }
   >>> .tree {
@@ -981,7 +981,7 @@ export default {
   }
   .right-card {
     flex: 1;
-    max-height: calc(100vh - 190px);
+    max-height: calc(100vh - 115px);
     overflow-y: scroll;
   }
 

template/admin/src/pages/system/maintain/systemFile/login.vue

@@ -1,9 +1,7 @@
 <template>
   <div>
     <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
-      </div>
     </div>
     <Row type="flex">
       <Col span="24">
@@ -105,10 +103,13 @@ export default {
 </script>
 
 <style scoped lang="stylus">
+.i-layout-page-header{
+  padding: 18px 32px;
+}
 .maxInpt{
-    max-width 400px
-    margin-left auto
-    margin-right auto
+    max-width: 400px;
+    margin-left: auto;
+    margin-right: auto;
 }
 .index_from{
   display: flex;
@@ -117,27 +118,33 @@ export default {
   align-items: center;
 }
 .trip{
-    width 400px
+    width: 400px;
     text-align: left;
-    color #aaa
+    color: #aaa;
 }
 .page-account-container{
-    text-align center
-    padding 200px 0
+    text-align: center;
+    padding: 200px 0;
 }
 .page-account-top{
-    margin-bottom 50px
+    margin-bottom: 50px;
 }
-.page-account-top-tit
-    font-size 30px
-    color #1890FF
-    font-weight 500
-.page-account-other
-    text-align center
-    color #1890FF
-    font-size 12px
-    span
-        cursor pointer
+.page-account-top-tit{
+  font-size:30px;
+  color:#1890FF;
+  font-weight:500;
+}
+
+.page-account-other{
+  text-align:center;
+  color:#1890FF;
+  font-size:12px;
+  span{
+    cursor: pointe;
+  }
+}
+
+
 >>> .btn{
   font-size: 15px !important;
 }