Merge remote-tracking branch 'origin/develop' into develop

@@ -3,8 +3,10 @@
 |Name | Path| Note|
 |首页| /|
 |侧边栏| /sidebar| 只有 app 使用|
-|品牌列表| /brand-list| |
-|品牌店铺| /product/brand?domain=colormad| |
+|品牌列表| /brands| |
+|品类| /cate| |
+|全部分类| /cate-all| |
+|品牌店铺| /product/shop?domain=sctest1| |
 |品牌店铺分享页面| /product/brand-share?domain=colormad| |
 |商品详情| /product/{productId}| |
 |资讯列表| /news| |

@@ -17,11 +17,11 @@ router.get('/', channel.index); // 首页
 router.get('/channel/channel.json', channel.channel); // 查询所有频道
 router.get('/channel/resources.json', channel.resources); // 资源位接口
 router.get('/channel/goods.json', channel.goods); // 首页查询商品列表
-router.get('/brand-list', brand.brandList); // 品牌列表页
+router.get('/brands', brand.brandList); // 品牌列表页
 router.get('/get-brand-list', brand.getBrandList); // 获取品牌列表数据
 
-router.get('/cate-resource', brand.cateResource); // 品类资源位页面
-router.get('/cate', brand.cate); // 全部分类
+router.get('/cate', brand.cateResource); // 品类资源位页面
+router.get('/cate-all', brand.cate); // 全部分类
 router.get('/get-cate-list', brand.getCateList); // 全部分类数据列表
 
 router.get('/sidebar', channel.sidebar); // 资源位接口

+/**
+ * Created by PhpStorm.
+ * User: Targaryen
+ * Date: 2016/7/27
+ * Time: 10:11
+ */
+'use strict';
+

@@ -53,34 +53,26 @@ const getShopData = params => {
                             isFav: subResult[0].data.is_favorite === 'Y'
                         });
 
-                        /* TODO shop_template_type 待接口确认 */
-                        if (subResult[0].data.shop_template_type === '3') {
-
-                            /* 取资源位店铺背景图 */
-                            return api.all([
-                                shopApi.getShopsDecoratorList({shopId: result[0].data.shop_id})
-                            ]).then(thResult => {
-                                if (thResult.code === 200) {
-                                    _.forEach(thResult[0].data.list, value => {
-
-                                        /* TODO resource_name 待接口确认 */
-                                        if (value.resource_name === 'shopTopBanner_BLK') {
-                                            Object.assign(finalResult, {
-                                                brandBg: value.resource_data.shopSrc
-                                            });
-                                        }
-                                    });
-
-                                } else {
-                                    logger.info('getShopsDecoratorList api code no 200');
-                                }
-
-                                return finalResult;
-                            });
-
-                        } else {
-                            logger.info('no BLK template resource');
-                        }
+                        /* 取资源位店铺背景图 */
+                        return api.all([
+                            shopApi.getShopsDecoratorList({shopId: result[0].data.shop_id})
+                        ]).then(thResult => {
+                            if (thResult.code === 200) {
+                                _.forEach(thResult[0].data.list, value => {
+
+                                    if (value.resource_name === 'shopTopBanner_app') {
+                                        Object.assign(finalResult, {
+                                            brandBg: value.resource_data.shopSrc
+                                        });
+                                    }
+                                });
+
+                            } else {
+                                logger.info('getShopsDecoratorList api code no 200');
+                            }
+
+                            return finalResult;
+                        });
                     } else {
                         logger.error('getShopInfoData api code no 200');
                     }

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Tue Jul 26 20:00:14 2016
+Created by FontForge 20120731 at Wed Jul 27 10:16:29 2016
  By admin
 </metadata>
 <defs>
@@ -16,7 +16,7 @@ Created by FontForge 20120731 at Tue Jul 26 20:00:14 2016
     ascent="896"
     descent="-128"
     x-height="792"
-    bbox="-0.0999985 -221.6 1457 896"
+    bbox="-0.75 -221.6 1457 896"
     underline-thickness="50"
     underline-position="-100"
     unicode-range="U+0078-E617"
@@ -80,6 +80,11 @@ q0 86 -60.5 146.5t-146.5 60.5zM388 282q-12 -12 -28 -17t-39 -5h-57v236h39q23 0 37
 l-108 -108z" />
     <glyph glyph-name="uniE610" unicode="&#xe610;" 
 d="M0 896v-1024q139 0 272 37t245 103t206.5 160.5t160.5 206.5t103 245t37 272h-1024zM657 281l-44 -43l-201 201l-201 -201l-43 43l201 201l-201 201l43 43l201 -201l201 201l44 -43l-201 -201z" />
+    <glyph glyph-name="uniE611" unicode="&#xe611;" horiz-adv-x="1313" 
+d="M1303 363l-599 533v-330q-159 -4 -283.5 -41t-196.5 -93t-122 -124t-69.5 -134t-27 -121.5t-6 -89t2.5 -34.5q65 83 120.5 131t136 82.5t184 47.5t261.5 15v-330z" />
+    <glyph glyph-name="uniE612" unicode="&#xe612;" 
+d="M490 406h-223v-44h267v356h-44v-312zM512 874q-100 0 -190.5 -39t-156 -104.5t-104.5 -156t-39 -190.5t39 -190.5t104.5 -156t156 -104.5t190.5 -39t190.5 39t156 104.5t104.5 156t39 190.5t-39 190.5t-104.5 156t-156 104.5t-190.5 39zM512 -54q-89 0 -170 34.5
+t-140 93.5t-93.5 140t-34.5 170t34.5 170t93.5 140t140 93.5t170 34.5t170 -34.5t140 -93.5t93.5 -140t34.5 -170t-34.5 -170t-93.5 -140t-140 -93.5t-170 -34.5z" />
     <glyph glyph-name="uniE617" unicode="&#xe617;" 
 d="M24 94l22 -22q9 -10 22 -10t23 10l424 430l420 -426q9 -9 21.5 -9t21.5 9l22 22q9 9 9 22t-9 23l-458 464q-5 5 -12 7q-9 7 -20.5 6t-20.5 -9l-465 -472q-9 -9 -9 -22t9 -23z" />
   </font>

@@ -24,8 +24,18 @@ const cate = {
     lifestyle: '6f7b590ed3844e680d4052fc5c4d98ad'
 };
 
+/* 资讯列表资源位 */
+const news = {
+    new: 'd4fdfcad1ec877d466d9780efaf4d296',
+    sports: 'e1f8dce8cb9de1a0977479c13c4d3dcc',
+    life: '5c0b9963d8b75e6fd788a2b49402be14',
+    sneakers: 'c4a62196c30cae5301e419aa3f77747b',
+    fashion: '70bc6b9d5c96bb7698eab85c7cd5ebbe'
+};
+
 module.exports = {
     channel,
     brand,
-    cate
+    cate,
+    news
 };

@@ -92,3 +92,11 @@
 .icon-importedlayers:before {
     content: "\e610";
 }
+
+.icon-sharenews:before {
+    content: "\e611";
+}
+
+.icon-timeshare:before {
+    content: "\e612";
+}

@@ -4,35 +4,37 @@
         <span class="tag">{{news.tag}}</span>
         <div class="img">
             <a href="{{news.href}}">
-                <img v-bind:src="news.src" alt="" />
+                <img v-lazy="news.src | resize 750 470" alt="" />
             </a>
         </div>
         <div class="title"><a href="{{news.href}}">{{news.title}}</a></div>
         <div class="news-des">
             {{news.des}}
         </div>
-        <div class="bottom">
-            <span class="icon time-icon"></span>
+        <hr>
+        <div class="bottom clearfix">
+            <span class="icon time-icon">&#xe612;</span>
             <span class="time">{{news.time}}</span>
-            <span class="icon share"></span>
+            <span class="icon share">&#xe611;</span>
         </div>
     </div>
 </template>
 <style>
     .news-box {
-        position: absolute;
+        background: #f6f6f6;
 
         .tag {
             position: relative;
-            top: 35px;
+            top: 42px;
             left: 0;
-            padding: 5px;
+            padding: 12px 24px;
             background: #000;
             color: #fff;
         }
+
         .img {
             width: 100%;
-            height: auto;
+            height: 470px;
             overflow: hidden;
 
             img {
@@ -41,19 +43,31 @@
         }
 
         .title {
+            background: #fff;
             font-size: 32px;
             font-weight: 700;
             padding: 10px 20px;
         }
 
         .news-des {
+            background: #fff;
             padding: 10px 20px;
             color: #939393;
         }
 
+        hr {
+            margin: 0 20px;
+            border: #eee 1px solid;
+        }
+
         .bottom {
             padding: 10px 20px;
+            background: #fff;
             color: #939393;
+
+            .share {
+                float: right;
+            }
         }
     }
 </style>
@@ -76,6 +90,14 @@
                         time: '04.19 18.05',
                         tag: '运动',
                         src: 'http://7xwj52.com1.z0.glb.clouddn.com/brandbg.jpg',
+                    },
+                    {
+                        href: '//m.yoholbk.com',
+                        title: '这是一个标题',
+                        des: '这是一个副标题',
+                        time: '04.19 18.05',
+                        tag: '运动',
+                        src: 'http://7xwj52.com1.z0.glb.clouddn.com/brandbg.jpg',
                     }
                 ]
             };