Merge remote-tracking branch 'origin/release/1.0' into release/1.0

@@ -6,4 +6,5 @@ node_modules/
 *.log
 *.log
 .eslintcache
 .eslintcache
 app/bundle
 app/bundle
-public/
+public/
+.vscode/

 <template>
 <template>
     <Row class="layout-header">
     <Row class="layout-header">
         <Col :span="12" class="brand-title">
         <Col :span="12" class="brand-title">
-            <i class="fa fa-bars" aria-hidden="true" @click="$emit('menu-trigger')"></i>
+            <i class="iconfont icon-alignjustify" aria-hidden="true" @click="$emit('menu-trigger')"></i>
             {{userInfo.name}}
             {{userInfo.name}}
         </Col>
         </Col>
         <Col :span="12" class="shop-info">
         <Col :span="12" class="shop-info">
@@ -49,15 +49,15 @@ export default {
 .layout-header {
 .layout-header {
     height: 50px !important;
     height: 50px !important;
     background: #fff;
     background: #fff;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
     font-size: 14px;
     font-size: 14px;
     line-height: 20px;
     line-height: 20px;
     padding: 15px;
     padding: 15px;
     position: relative;
     position: relative;
 
 
     &.user-collapse {
     &.user-collapse {
-        height: 0px !important;
-        padding: 0px !important;
+        height: 0 !important;
+        padding: 0 !important;
         overflow: hidden;
         overflow: hidden;
 
 
         .fa-bars {
         .fa-bars {
@@ -67,7 +67,8 @@ export default {
     }
     }
 
 
     &.print-hide {
     &.print-hide {
-        display: none;  }
+        display: none;
+    }
 
 
     .fa {
     .fa {
         font-size: 20px;
         font-size: 20px;
@@ -75,7 +76,7 @@ export default {
         margin-right: 10px;
         margin-right: 10px;
         cursor: pointer;
         cursor: pointer;
     }
     }
-    
+
     .shop-info {
     .shop-info {
         text-align: right;
         text-align: right;
         padding-right: 20px;
         padding-right: 20px;
@@ -91,7 +92,7 @@ export default {
         }
         }
 
 
         .logout {
         .logout {
-            color: #F44545;
+            color: #f44545;
             font-size: 12px;
             font-size: 12px;
             margin-left: 5px;
             margin-left: 5px;
         }
         }

@@ -3,5 +3,8 @@ const page = r => require.ensure([], () => r(require('./overview')), 'home.overv
 export default {
 export default {
     path: '/overview.html',
     path: '/overview.html',
     name: 'overview',
     name: 'overview',
-    component: page
+    component: page,
+    meta: {
+        authPass: true
+    }
 };
 };

@@ -19,9 +19,7 @@ const plugin = {
     checkPurview() {
     checkPurview() {
         return Promise.resolve();
         return Promise.resolve();
 
 
-        // let pUrl = `/${_.split(to.name, '.').join('/')}`;
-
-        // let pur = _.find(purviews, p => p.menu_url === pUrl);
+        // let pur = _.find(Vue.$purviews, p => p.menu_url === to.path);
 
 
         // if (pur) {
         // if (pur) {
         //     return Promise.resolve();
         //     return Promise.resolve();
@@ -42,6 +40,8 @@ const plugin = {
                 user = Rsa.decrypt(user, Object);
                 user = Rsa.decrypt(user, Object);
                 return this.initPurview(Vue, user).then(() => {
                 return this.initPurview(Vue, user).then(() => {
                     next();
                     next();
+                }, () => {
+                    next();
                 });
                 });
             }
             }
             next();
             next();
@@ -65,7 +65,7 @@ const plugin = {
                 return next('/login.html');
                 return next('/login.html');
             }
             }
 
 
-            return this.checkPurview(Vue.$purviews, to).then(() => {
+            return this.checkPurview(Vue, to).then(() => {
                 return next();
                 return next();
             }, () => {
             }, () => {
                 return next('/401.html');
                 return next('/401.html');