Merge branch 'develop' into release/1.0

@@ -46,7 +46,7 @@ const _getInfoNumData = (uid) => {
         method: 'app.address.gethidden' // 用户地址的数据
     }, {
         code: 200
-    }), singleAPI.get('brower', {
+    }), singleAPI.get('favorite', {
         method: 'app.favorite.getFavoriteCount', // 获取用户收藏商品总数
         uid: uid
     }, {

@@ -37,14 +37,14 @@
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
-    "winston-daily-rotate-file": "^1.1.4",
+    "winston-daily-rotate-file": "^1.3.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "0.0.40"
+    "yoho-node-lib": "0.0.41"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",
     "babel-core": "^6.13.2",
-    "babel-loader": "^6.2.4",
+    "babel-loader": "^6.2.5",
     "babel-plugin-transform-runtime": "^6.12.0",
     "babel-preset-es2015": "^6.13.2",
     "babel-runtime": "^6.11.6",
@@ -61,7 +61,7 @@
     "handlebars-loader": "^1.3.0",
     "husky": "^0.11.6",
     "jquery": "2.2.4",
-    "nodemon": "^1.10.0",
+    "nodemon": "^1.10.2",
     "postcss-assets": "^4.0.1",
     "postcss-cachebuster": "^0.1.3",
     "postcss-calc": "^5.2.1",
@@ -82,12 +82,12 @@
     "stylelint-processor-html": "^1.0.0",
     "vue": "1.0.26",
     "vue-infinite-scroll": "0.2.3",
-    "vue-lazyload": "0.4.5",
+    "vue-lazyload": "^0.5.0",
     "vue-loader": "^8.5.3",
     "vue-swipe": "0.2.6",
     "vue-touch": "1.1.0",
-    "webpack": "^1.13.1",
-    "webpack-dashboard": "0.0.1",
+    "webpack": "^1.13.2",
+    "webpack-dashboard": "^0.1.1",
     "webpack-dev-server": "^1.14.1",
     "webpack-stream": "^3.1.0",
     "yoho-cookie": "1.2.0",

@@ -17,7 +17,7 @@ html,
 body {
     width: 100%;
     font-size: 24px;
-    font-family: Helvetica, Roboto, "Heiti SC", "黑体", Arial;
+    font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
     line-height: 1.4;
 }
 

+/* BrownStd standard */
+@font-face {
+    font-family: "BrownStd";
+    src: resolve("brownstd/BrownStd-Regular.eot"); /* IE9 */
+    src: resolve("brownstd/BrownStd-Regular.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Regular.woff") format("woff"), resolve("brownstd/BrownStd-Regular.ttf") format("truetype"), resolve("brownstd/BrownStd-Regular.svg#iconfont") format("svg"); /* iOS 4.1- */
+}
+
+/* BrownStd-Bold */
+@font-face {
+    font-family: "BrownStd-Bold";
+    src: resolve("brownstd/BrownStd-Bold.eot"); /* IE9 */
+    src: resolve("brownstd/BrownStd-Bold.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Bold.woff") format("woff"), resolve("brownstd/BrownStd-Bold.ttf") format("truetype"), resolve("brownstd/BrownStd-Bold.svg#iconfont") format("svg"); /* iOS 4.1- */
+}
+
+.brown-bold {
+    font-family: "BrownStd-Bold" !important;
+}
+
+/* BrownStd-Italic */
+@font-face {
+    font-family: "BrownStd-Italic";
+    src: resolve("brownstd/BrownStd-Italic.eot"); /* IE9 */
+    src: resolve("brownstd/BrownStd-Italic.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Italic.woff") format("woff"), resolve("brownstd/BrownStd-Italic.ttf") format("truetype"), resolve("brownstd/BrownStd-Italic.svg#iconfont") format("svg"); /* iOS 4.1- */
+}
+
+.brown-italic {
+    font-family: "BrownStd-Italic" !important;
+}
+
+/* BrownStd-Light */
+@font-face {
+    font-family: "BrownStd-Light";
+    src: resolve("brownstd/BrownStd-Light.eot"); /* IE9 */
+    src: resolve("brownstd/BrownStd-Light.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Light.woff") format("woff"), resolve("brownstd/BrownStd-Light.ttf") format("truetype"), resolve("brownstd/BrownStd-Light.svg#iconfont") format("svg"); /* iOS 4.1- */
+}
+
+.brown-light {
+    font-family: "BrownStd-Light" !important;
+}

 @import "reset";
 @import "common";
 @import "color";
+@import "font";
 @import "list";
 @import "icon";
 @import "tip";

@@ -7,7 +7,7 @@
                 </div>
             </template>
             <a class="item ellipsis" href="{{item.sortUrl}}">
-                {{item.sortNameEn}}{{item.sortName}}
+                {{(item.sortNameEn || '').trim()}}{{item.sortName}}
             </a>
         </template>
     </div>
@@ -63,10 +63,17 @@
             position: relative;
             display: block;
             padding: 0 30px;
-            height: 126px;
-            line-height: 126px;
-            font-size: 30px;
+            height: 124px;
+            line-height: 124px;
+            font-size: 36px;
             font-weight: bold;
+            font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
+
+            &:first-child {
+                height: 142px;
+                line-height: 142px;
+                font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
+            }
 
             &:after {
                 content: "";
@@ -84,11 +91,17 @@
         }
 
         .sep {
+            margin-top: -1px;
             width: 100%;
-            height: 22px;
+            height: 20px;
             background: #f6f6f6;
-            border-top: 2PX solid #eee;
-            border-bottom: 2PX solid #eee;
+            border-top: 1px solid #eee;
+            border-bottom: 1px solid #eee;
+
+            & + .item {
+                height: 142px;
+                line-height: 142px;
+            }
         }
     }