Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -27,7 +27,7 @@ const component = {
                 module: 'me',
                 page: 'index',
                 noLocalCSS: true,
-                head_ico: proData && proData.head_ico ? helpers.image(proData.head_ico, 200, 200) : '',
+                head_ico: proData && proData.head_ico ? helpers.image(proData.head_ico, 174, 174) : '',
                 nickname: Object.keys(proData).length ? proData.nickname : '登录/注册'
             };
 

@@ -3,8 +3,8 @@
         <span class="setting icon icon-setting" id="setting"></span>
         <a class="user-info auth" id="user-info" href='/me/mydetails'>
             <span class="user-avatar"  {{#if head_ico}} style="background-image: url('{{head_ico}}');" {{/if}}></span>
-            <span class="username">{{nickname}}</span>
         </a>
+        <span class="username">{{nickname}}</span>
     </div>
     <div class="my-order">
         <a class="order-title auth"  href="/me/order?type=1">

@@ -32,7 +32,7 @@ router.get('/product/list.json', productList.fetchProducts);
 // 品牌店铺页面
 const shop = require(`${cRoot}/shop`);
 
-router.get('/brand', shop.index); // 品牌 集合页
+// router.get('/brand', shop.index); // 品牌 集合页
 router.get('/product/shop/info.json', shop.getShopInfo); // 店铺介绍
 router.get('/product/shop/goods.json', shop.getBrandShopGoods); // 店铺商品列表
 router.post('/product/shop/collect.json', shop.collectShop); // 收藏品牌店铺
@@ -51,9 +51,9 @@ router.get(/\/product\/cart-count.json/, detail.getCartCount);
 router.get(/\/product\/search_product\.json/, detail.search);
 
 // alias:  TODO: 测试完成 删除一下router,并更新资源位
-router.get(/\/brand\/share\/(.*)/, shop.shopShare); // 品牌店铺分享页面
+// router.get(/\/brand\/share\/(.*)/, shop.shopShare); // 品牌店铺分享页面
 router.get(/\/item\/([\d]+)(.*)\.html/, detail.index); // 商品详情routers
-router.get(/\/brand\/(.*)/, shop.index); // 店铺首页
+// router.get(/\/brand\/(.*)/, shop.index); // 店铺首页
 
 router.get('/new', newProduct.index);
 router.get('/new.json', newProduct.fetchProducts);
@@ -66,6 +66,4 @@ router.get('/search.json', search.fetchProducts); // ajax
 
 
 
-
-
 module.exports = router;

@@ -75,7 +75,8 @@ if (isProduction) {
         appName: 'm.yohoblk.com',
         domains: {
             api: 'http://api.yoho.yohoops.org/',
-            service: 'http://service.yoho.yohoops.org/'
+            service: 'http://service.yoho.yohoops.org/',
+            favApi: 'http://192.168.102.31:8092/'
         },
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -95,7 +96,8 @@ if (isProduction) {
             // service: 'http://dev-service.yohops.com:9999/'
 
             api: 'http://api-test1.yohops.com:9999/',
-            service: 'http://service-test1.yohops.com:9999/'
+            service: 'http://service-test1.yohops.com:9999/',
+            favApi: 'http://192.168.102.31:8092/'
         },
         memcache: {
             master: ['127.0.0.1:12111'],

@@ -28,7 +28,7 @@
     "express-handlebars": "^3.0.0",
     "express-session": "^1.14.0",
     "influxdb-winston": "^1.0.1",
-    "lodash": "^4.14.1",
+    "lodash": "^4.14.2",
     "memcached": "^2.2.1",
     "moment": "^2.14.1",
     "morgan": "^1.7.0",
@@ -50,7 +50,7 @@
     "babel-runtime": "^6.11.6",
     "eslint": "^3.2.2",
     "eslint-config-yoho": "^1.0.1",
-    "eslint-plugin-html": "^1.5.1",
+    "eslint-plugin-html": "^1.5.2",
     "extract-text-webpack-plugin": "^1.0.1",
     "gulp": "^3.9.1",
     "gulp-cssnano": "^2.1.2",
@@ -70,6 +70,7 @@
     "postcss-crip": "^2.0.0",
     "postcss-position": "^0.5.0",
     "postcss-pxtorem": "^3.3.1",
+    "postcss-scss": "^0.1.9",
     "postcss-short": "^1.4.0",
     "postcss-sprites": "^3.3.0",
     "postcss-use": "^2.2.0",
@@ -81,7 +82,7 @@
     "stylelint-processor-html": "^1.0.0",
     "vue": "1.0.26",
     "vue-infinite-scroll": "0.2.3",
-    "vue-lazyload": "0.4.3",
+    "vue-lazyload": "^0.4.5",
     "vue-loader": "^8.5.3",
     "vue-swipe": "0.2.6",
     "vue-touch": "1.1.0",

@@ -143,7 +143,9 @@ gulp.task('dist', ['ge'], () => {
 gulp.task('postcss-dev', () => {
     return gulp.src('scss/index.css')
         .pipe(sourcemaps.init())
-        .pipe(postcss(postcssPlugin(env.dev)))
+        .pipe(postcss(postcssPlugin(env.dev), {
+            parser: require('postcss-scss')
+        }))
         .pipe(sourcemaps.write('.'))
         .pipe(gulp.dest('css/'));
 });
@@ -171,7 +173,9 @@ gulp.task('font', () => {
 // postcss compile in pro
 gulp.task('postcss', ['assets'], () => {
     return gulp.src('scss/index.css')
-        .pipe(postcss(postcssPlugin(env.pro)))
+        .pipe(postcss(postcssPlugin(env.pro), {
+            parser: require('postcss-scss')
+        }))
         .pipe(cssnano({
             safe: true
         }))
@@ -183,7 +187,12 @@ gulp.task('webpack-dev-server', () => {
     const devConfig = Object.assign({}, webpackConfig, {
         devtool: '#inline-source-map',
         vue: {
-            postcss: postcssPlugin(env.dev),
+            postcss: {
+                plugins: postcssPlugin(env.dev),
+                options: {
+                    parser: require('postcss-scss')
+                }
+            },
             autoprefixer: false,
             loaders: {
                 css: ExtractTextPlugin.extract(['css?-url'])
@@ -213,7 +222,12 @@ gulp.task('webpack-dev-server', () => {
 gulp.task('webpack', ['assets'], (done) => {
     const proConfig = Object.assign({}, webpackConfig, {
         vue: {
-            postcss: postcssPlugin(env.pro),
+            postcss: {
+                plugins: postcssPlugin(env.dev),
+                options: {
+                    parser: require('postcss-scss')
+                }
+            },
             autoprefixer: false,
             loaders: {
                 css: ExtractTextPlugin.extract(['css?-url'])

@@ -7,6 +7,7 @@
     }
 
     .my-header {
+        height: 469px;
         background: resolve("me/header-bg.png");
         background-size: cover;
     }
@@ -14,56 +15,52 @@
     .setting {
         position: fixed;
         top: 40px;
-        left: 15px;
+        left: 30px;
         font-size: 46px;
     }
 
     .user-info {
         display: block;
         position: relative;
+        top: 145px;
         padding: 0 30px;
         margin: 0 180px;
         color: #000;
         font-size: 34px;
-        line-height: 138px;
-        height: 469px;
         text-align: center;
 
         .user-avatar {
             display: inline-block;
             position: relative;
-            top: 150px;
-            width: 200px;
-            height: 200px;
+            width: 174px;
+            height: 174px;
             border-radius: 50%;
             margin: 0 auto;
             border: 3px solid #b0b0b0;
             background: resolve("me/user-icon.png");
             background-size: 100%;
         }
+    }
 
-        .username {
-            display: block;
-            padding: 0 16px;
-            text-overflow: ellipsis;
-            position: relative;
-            margin: 0 auto;
-            top: 60px;
-            white-space: nowrap;
-            font-size: 32px;
-            max-width: 260px;
-        }
+    .username {
+        display: block;
+        text-align: center;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 32px;
+        position: relative;
+        top: 140px;
     }
 
     .my-order {
-        margin-bottom: 30px;
-        border-top: 1px solid #e0e0e0;
-        border-bottom: 1px solid #e0e0e0;
+        margin-bottom: 20px;
+        border-top: 1px solid #eee;
+        border-bottom: 1px solid #eee;
         background: #fff;
 
         .order-title {
             display: block;
-            padding: 0 29px;
+            padding: 0 30px;
             font-size: 34px;
             line-height: 88px;
 
@@ -79,9 +76,9 @@
         }
 
         .order-type {
-            padding: 20px 30px;
+            padding: 20px 0;
             text-align: center;
-            border-top: 1px solid #e0e0e0;
+            border-top: 1px solid #eee;
 
             .icon {
                 font-size: 45px;
@@ -93,16 +90,21 @@
                 color: #444;
                 font-size: 24px;
                 line-height: 1.5;
-                width: 170px;
+                width: 72px;
+                margin-left: 132px;
 
                 &.highlight {
                     background: #eee;
                 }
 
+                &:first-child {
+                    margin-left: 34px;
+                }
+
                 .num {
                     position: absolute;
                     top: -35px;
-                    right: 20px;
+                    right: -20px;
                     width: 72px;
                     height: 72px;
                     font-size: 34px;
@@ -118,9 +120,9 @@
     }
 
     .group-list {
-        margin-bottom: 30px;
-        border-top: 1px solid #e0e0e0;
-        border-bottom: 1px solid #e0e0e0;
+        margin-bottom: 20px;
+        border-top: 1px solid #eee;
+        border-bottom: 1px solid #eee;
         background: #fff;
 
         .glist-item {
@@ -128,7 +130,7 @@
             position: relative;
             padding: 0 30px;
             font-size: 34px;
-            line-height: 90px;
+            line-height: 88px;
             overflow: hidden;
 
             &.highlight {
@@ -142,7 +144,7 @@
                 bottom: 0;
                 width: 100%;
                 height: 0;
-                border-top: 1px solid #e0e0e0;
+                border-top: 1px solid #eee;
             }
 
             &:last-child:after {
@@ -151,7 +153,6 @@
         }
 
         .icon {
-            margin-right: 5px;
             font-size: 34px;
             vertical-align: top;
         }

@@ -49,7 +49,7 @@
         </div>
     </div>
 </template>
-<style class="scss">
+<style>
     $bgcolor: #fff;
 
     .editorial-page {