lilinsen 6 years ago
parent
commit
2a83968f8a
2 changed files with 36 additions and 53 deletions
  1. 32 19
      sites/doc/app.vue
  2. 4 34
      sites/doc/info.vue

+ 32 - 19
sites/doc/app.vue

@@ -5,7 +5,12 @@
     </div>
     <div class="md-swaper" @click="clearSearch" v-else>
       <div class="hder">
-        
+        <div class="logo">
+          <a href="#/index" class="logo-link">
+            <img src="./asset/css/i/nut.png" alt>
+          </a>
+          <span class="version">v{{version}}</span>
+        </div>
         <div class="h-nav">
           <search/>
           <ul class="list">
@@ -37,10 +42,10 @@
         </div>
       </div>
       <div class="demo-wrapper">
-        <router-view class="demo-nav fixed-box"></router-view>
+        <router-view class="demo-nav"></router-view>
         
         <keep-alive include="index">
-          <router-view class="doc-cont fl-right" :class="showPhone?'':'docpad'" name="main"></router-view>
+          <router-view class="doc-cont" :class="showPhone?'':'docpad'" name="main"></router-view>
         </keep-alive>
         <div v-if="showPhone" class="showPhone">
           <div class="ph">
@@ -76,6 +81,7 @@
 import "./asset/css/common.scss";
 import "./asset/css/style-blue.scss";
 import { packages } from "../../src/config.json";
+import { version } from "../../package.json";
 import search from "./search.vue";
 import leftNav from './info.vue'
 export default {
@@ -89,7 +95,8 @@ export default {
       showPhone: false,
       searchCurName: "",
       searchIndex: 0,
-      codeurl: ""     
+      codeurl: "",
+      version
     };
   },
   watch: {
@@ -196,14 +203,6 @@ export default {
 };
 </script>
 <style lang="scss">
-.fixed-box{
-  position: fixed;
-  z-index: 99999;
-  background: #fff;
-  height: 100%;
-  overflow-y: scroll;
-  top:0;
-}
 .fade-enter-active,
 .fade-leave-active {
   transition: opacity 0.5s;
@@ -234,7 +233,27 @@ export default {
   align-items: center;
   margin-bottom: 50px;
   z-index: 42;
-
+  .logo {
+    width: 295px;
+    height: 65px;
+    border-right: 1px solid #d8d8d8;
+    display: flex;
+    align-items: center;
+    flex-shrink: 0;
+    .logo-link {
+      display: inline-block;
+    }
+    img {
+      display: block;
+      width: 120px;
+      height: 46px;
+      flex-grow: 0;
+      flex-shrink: 0;
+      margin: 0 10px 0 30px;
+    }
+    color: #999;
+    font-size: 12px;
+  }
   .version {
     display: inline-block;
     margin-top: 7px;
@@ -246,7 +265,6 @@ export default {
     padding-left: 42px;
     align-items: center;
     width: 100%;
-    margin-left: 300px;
     select {
       width: 74px;
       height: 28px;
@@ -414,9 +432,6 @@ export default {
       }
     }
   }
-  .fl-right{
-    margin-left: 310px;
-  }
 }
 .foot {
   height: 120px;
@@ -429,8 +444,6 @@ export default {
   position: absolute;
   bottom: 0;
   width: 100%;
-  padding-left: 300px;
-  box-sizing: border-box;
   a {
     color: #fff;
     text-decoration: none;

+ 4 - 34
sites/doc/info.vue

@@ -1,11 +1,5 @@
 <template>
   <div class="main-menu lt-nv">
-    <div class="logo">
-      <a href="#/index" class="logo-link">
-        <img src="./asset/css/i/nut.png" alt>
-      </a>
-      <span class="version">v{{version}}</span>
-    </div>
     <ol class="nav-l-1">
       <dt>指南</dt>
       <dd :class="curName=='intr' ?'l-1 curs':'l-1'">
@@ -24,7 +18,7 @@
         <a href="https://github.com/jdf2e/nutui/releases" target="_blank">更新日志</a>
       </dd>
     </ol>
-    <ol class="cplist">
+    <ol>
       <dt>组件</dt>
       <dd
         class="l-1"
@@ -58,7 +52,7 @@
 </template>
 <script>
 import { sorts, packages } from "../../src/config.json";
-import { version } from "../../package.json";
+
 export default {
   name: "index",
   data() {
@@ -67,8 +61,7 @@ export default {
       packages: {},
       sortedPackages: [],
       cur: [],
-      curName: "",
-      version:version
+      curName: ""
     };
   },
  
@@ -153,27 +146,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-  .logo {
-    width: 295px;
-    height: 65px;
-    border-right: 1px solid #d8d8d8;
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    .logo-link {
-      display: inline-block;
-    }
-    img {
-      display: block;
-      width: 120px;
-      height: 46px;
-      flex-grow: 0;
-      flex-shrink: 0;
-      margin: 0 10px 0 30px;
-    }
-    color: #999;
-    font-size: 12px;
-  }
 .fade-enter-active,
 .fade-leave-active {
   transition: all 1s;
@@ -205,9 +177,7 @@ dd {
     cursor: pointer;
   }
 }
-.cplist{
-  padding-bottom: 20px;
-}
+
 .lt-nv {
   font-size: 14px;
   width: 295px;