Jelajahi Sumber

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-html into deploy

lilei 4 tahun lalu
induk
melakukan
acfa0d7ee4

+ 1 - 1
src/components/GlobalHeader/GlobalHeader.vue

@@ -21,7 +21,7 @@
           </div>
         </div>
       </a-layout-header>
-      <multi-tab :class="[fixedHeader ? 'ant-header-fixedMultiTab' : 'ant-header-multiTab',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]" v-if="multiTab"></multi-tab>
+      <!-- <multi-tab :class="[fixedHeader ? 'ant-header-fixedMultiTab' : 'ant-header-multiTab',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]" v-if="multiTab"></multi-tab> -->
     </div>
   </transition>
 </template>

+ 3 - 3
src/config/defaultSettings.js

@@ -17,12 +17,12 @@ export default {
   primaryColor: '#ff0000', // primary color of ant design
   navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
-  contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu
-  fixedHeader: true, // sticky header
+  contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
+  fixedHeader: false, // sticky header
   fixSiderbar: false, // sticky siderbar
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
-  multiTab: true,
+  multiTab: false,
   production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true',
   // vue-ls options
   storageOptions: {

+ 3 - 2
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '105px' : '0' }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '64px' : '0' }">
         <transition name="page-transition">
           <route-view/>
         </transition>
@@ -113,7 +113,8 @@ export default {
     } else {
       // 没有权限时只显示首页
       const noqx = asyncRouterMap.find((item) => item.path === '/').children
-      this.menus = [noqx.find(item => item.path === '/home')]
+      // this.menus = [noqx.find(item => item.path === '/home')]
+      this.menus = noqx
     }
     this.collapsed = !this.sidebarOpened
   },

+ 10 - 8
src/permission.js

@@ -78,14 +78,16 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    // 未登录
-    if (whiteList.includes(to.name)) {
-      // 在免登录白名单,直接进入
-      next()
-    } else {
-      next({ path: '/user/login', query: { redirect: to.fullPath } })
-      NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
-    }
+    console.log(111111)
+    next()
+    // // 未登录
+    // if (whiteList.includes(to.name)) {
+    //   // 在免登录白名单,直接进入
+    //   next()
+    // } else {
+    //   next({ path: '/user/login', query: { redirect: to.fullPath } })
+    //   NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
+    // }
   }
 })