Merge branch 'feature/iview' into feature/login

@@ -16,8 +16,10 @@
             </Submenu>
             </Submenu>
         </Menu>
         </Menu>
         <div class="layout-menu-foot">
         <div class="layout-menu-foot">
-            <a href="/YOHO!BUY%E6%9C%89%E8%B4%A7%E5%B9%B3%E5%8F%B0%E8%BF%9D%E8%A7%84%E8%A1%8C%E4%B8%BA%E5%AE%9A%E4%B9%89%E5%8F%8A%E6%89%A3%E5%88%86%E8%AF%B4%E6%98%8E+VOL.02+.pdf" target="_blank">平台规则</a>
-            <i class="ivu-icon ivu-icon-help-circled"></i>
+            <a href="/YOHO!BUY%E6%9C%89%E8%B4%A7%E5%B9%B3%E5%8F%B0%E8%BF%9D%E8%A7%84%E8%A1%8C%E4%B8%BA%E5%AE%9A%E4%B9%89%E5%8F%8A%E6%89%A3%E5%88%86%E8%AF%B4%E6%98%8E+VOL.02+.pdf" target="_blank">
+                <span>平台规则</span>
+                <i class="ivu-icon ivu-icon-help-circled"></i>
+            </a>
         </div>
         </div>
     </div>
     </div>
 </template>
 </template>
@@ -66,6 +68,8 @@ export default {
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
+$menuBg: #495060;
+$collapseMenuBg: #313540;
 $collapseMenuWidth: 200px;
 $collapseMenuWidth: 200px;
 $collapseWidth: 50px;
 $collapseWidth: 50px;
 $collapseLeftBorder: 2px;
 $collapseLeftBorder: 2px;
@@ -74,7 +78,7 @@ $collapseLeftBorder: 2px;
     .ivu-menu-submenu-title {
     .ivu-menu-submenu-title {
         margin-left: 0;
         margin-left: 0;
         border-left: solid 2px #fff;
         border-left: solid 2px #fff;
-        background-color: #313540 !important;
+        background-color: $collapseMenuBg !important;
         transition: border 0s;
         transition: border 0s;
     }
     }
 }
 }
@@ -140,7 +144,7 @@ $collapseLeftBorder: 2px;
         }
         }
 
 
         .ivu-menu {
         .ivu-menu {
-            background: #313540 !important;
+            background: $collapseMenuBg !important;
             display: none;
             display: none;
             position: absolute;
             position: absolute;
             top: 49px;
             top: 49px;
@@ -170,7 +174,7 @@ $collapseLeftBorder: 2px;
             width: $collapseMenuWidth;
             width: $collapseMenuWidth;
             left: $collapseWidth - $collapseLeftBorder;
             left: $collapseWidth - $collapseLeftBorder;
             top: 0;
             top: 0;
-            background-color: #313540;
+            background-color: $collapseMenuBg;
             z-index: 2;
             z-index: 2;
             line-height: 49px;
             line-height: 49px;
             padding-left: 43px;
             padding-left: 43px;
@@ -192,5 +196,14 @@ $collapseLeftBorder: 2px;
             overflow: hidden;
             overflow: hidden;
         }
         }
     }
     }
+
+    .layout-menu-foot {
+        padding-left: 0px;
+        text-align: center;
+
+        span {
+            display: none;
+        }
+    }
 }
 }
 </style>
 </style>

@@ -78,6 +78,7 @@ export default {
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
+$menuBg: #495060;
 body {
 body {
     color: #444;
     color: #444;
 }
 }
@@ -105,7 +106,7 @@ body {
     }
     }
 
 
     .layout-menu-left {
     .layout-menu-left {
-        background: #1c2438;
+        background: $menuBg;
         min-width: 170px;
         min-width: 170px;
         max-width: 200px;
         max-width: 200px;
     }
     }

@@ -56,7 +56,7 @@
     "express": "^4.15.2",
     "express": "^4.15.2",
     "express-session": "^1.15.2",
     "express-session": "^1.15.2",
     "font-awesome": "^4.7.0",
     "font-awesome": "^4.7.0",
-    "iview": "^2.0.0-rc.16",
+    "iview": "^2.0.0-rc.18",
     "lodash": "^4.17.4",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",
     "moment": "^2.18.1",
     "promise-polyfill": "^6.0.2",
     "promise-polyfill": "^6.0.2",

@@ -235,9 +235,9 @@ async-foreach@^0.1.3:
   version "0.1.3"
   version "0.1.3"
   resolved "http://npm.yoho.cn/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
   resolved "http://npm.yoho.cn/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
 
 
-async-validator@^1.6.7:
+async-validator@^1.7.1:
   version "1.7.1"
   version "1.7.1"
-  resolved "http://npm.yoho.cn/async-validator/-/async-validator-1.7.1.tgz#89d3d7a384ca5d05e0f07bf51754d591e2cfec61"
+  resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.7.1.tgz#89d3d7a384ca5d05e0f07bf51754d591e2cfec61"
   dependencies:
   dependencies:
     babel-runtime "6.x"
     babel-runtime "6.x"
 
 
@@ -3408,11 +3408,11 @@ istanbul-lib-instrument@^1.4.2:
     istanbul-lib-coverage "^1.1.1"
     istanbul-lib-coverage "^1.1.1"
     semver "^5.3.0"
     semver "^5.3.0"
 
 
-iview@^2.0.0-rc.16:
-  version "2.0.0-rc.17"
-  resolved "http://npm.yoho.cn/iview/-/iview-2.0.0-rc.17.tgz#0827582c750a718b952e7e51eb99d93693edd7d8"
+iview@^2.0.0-rc.18:
+  version "2.0.0-rc.18"
+  resolved "https://registry.yarnpkg.com/iview/-/iview-2.0.0-rc.18.tgz#c00a11643622626feeb277e0de83b45077a8787c"
   dependencies:
   dependencies:
-    async-validator "^1.6.7"
+    async-validator "^1.7.1"
     core-js "^2.4.1"
     core-js "^2.4.1"
     deepmerge "^1.3.1"
     deepmerge "^1.3.1"
     popper.js "^0.6.4"
     popper.js "^0.6.4"