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

@@ -4,6 +4,6 @@
 |首页| /|
 |首页| /|
 |侧边栏| /sidebar| 只有 app 使用|
 |侧边栏| /sidebar| 只有 app 使用|
 |品牌列表| /brand-list| |
 |品牌列表| /brand-list| |
-|品牌店铺| /brand?domain=colormad| |
-|品牌店铺分享页面| /brand-share?domain=colormad| |
+|品牌店铺| /product/brand?domain=colormad| |
+|品牌店铺分享页面| /product/brand-share?domain=colormad| |
 |商品详情| /product/{productId}| |
 |商品详情| /product/{productId}| |

@@ -6,8 +6,6 @@
  */
  */
 'use strict';
 'use strict';
 
 
-// const _ = require('lodash');
-// const helpers = global.yoho.helpers;
 const mRoot = '../models';
 const mRoot = '../models';
 const brandModel = require(`${mRoot}/brand`);
 const brandModel = require(`${mRoot}/brand`);
 
 
@@ -16,46 +14,6 @@ const brandModel = require(`${mRoot}/brand`);
  */
  */
 module.exports = {
 module.exports = {
 
 
-    /* 品牌店铺页面 */
-    index: (req, res) => {
-        res.render('brand/index', {
-            module: 'channel',
-            page: 'brand',
-            domain: req.domain
-        });
-    },
-
-    /* 获取品牌店铺介绍 */
-    getShopInfo: (req, res) => {
-        brandModel.getBrandData({
-            domain: req.query.domain,
-            uid: req.user.uid
-        }).then(result => {
-            res.json(result);
-        });
-    },
-
-    /* 获取商品列表 */
-    getBrandShopGoods: (req, res) => {
-        brandModel.getBrandShopGoodsData({
-            sort: req.body.sort,
-            page: req.body.page,
-            channel: req.body.filter.channel || 'men',
-            gender: req.body.filter.gender || '1,2,3',
-            brand: req.body.filter.brand,
-            shopId: req.body.filter.shopId,
-            order: req.body.filter.order || 's_t_desc',
-            limit: req.body.filter.limit || '60',
-            color: req.body.filter.color,
-            price: req.body.filter.price,
-            size: req.body.filter.size,
-            pd: req.body.filter.pd,
-            tagsFilter: req.body.filter.tagsFilter
-        }).then(result => {
-            res.json(result);
-        });
-    },
-
     /* 品牌列表页 */
     /* 品牌列表页 */
     brandList: (req, res) => {
     brandList: (req, res) => {
 
 
@@ -75,26 +33,6 @@ module.exports = {
         });
         });
     },
     },
 
 
-    /* 品牌店铺分享页面 */
-    brandShare: (req, res) => {
-        res.render('brand/brand-share', {
-            module: 'channel',
-            page: 'brand-share'
-        });
-    },
-
-    /* 收藏店铺 */
-    collectShop: (req, res) => {
-        brandModel.collectShopData({
-            shopId: req.body.shopId,
-            favId: req.body.favId,
-            uid: req.user.uid,
-            type: 'shop'
-        }).then(result => {
-            res.json(result);
-        });
-    },
-
     /* 全部分类 */
     /* 全部分类 */
     cate: (req, res) => {
     cate: (req, res) => {
         res.render('brand/cate', {
         res.render('brand/cate', {

@@ -22,92 +22,6 @@ const yhChannel = {
 module.exports = {
 module.exports = {
 
 
     /**
     /**
-     * 从接口获取品牌店铺数据
-     * @returns {*}
-     */
-    getShopInfoData(params) {
-        let finalParams = {
-            method: 'app.shops.getIntro',
-            shop_id: params.shopId
-        };
-
-        if (params.uid) {
-            Object.assign(finalParams, {
-                uid: params.uid
-            });
-        }
-
-        return api.get('', finalParams);
-    },
-
-    /**
-     * 通过品牌域名获取品牌信息
-     * @param params
-     */
-    getBrandInfoByDomain(params) {
-        return api.get('', {
-            method: 'web.brand.byDomain',
-            domain: params.domain
-        });
-    },
-
-
-    getShopsDecoratorList(params) {
-        return api.get('', {
-            method: 'app.shopsdecorator.getList',
-
-        });
-    },
-
-    /**
-     * 从接口获取品牌店铺商品数据
-     * @returns {*}
-     */
-    getBrandShopGoodsOriginData(params) {
-        return api.get('', {
-            method: 'app.search.brand',
-            yh_channel: params.channel ? yhChannel[params.channel].channel : '1',
-            brand: params.brand,
-            shop_id: params.shopId,
-            order: params.order,
-            limit: params.limit,
-            page: params.page,
-            gender: params.gender,
-            color: params.color,
-            price: params.price,
-            size: params.size,
-            p_d: params.pd,
-            sort: params.sort,
-            tags_filter: params.tagsFilter
-        });
-    },
-
-    /**
-     * 收藏取消收藏店铺
-     * @param params
-     * @returns {*}
-     */
-    collectShopOriginData(params) {
-        let finalParams = {
-            id: params.shopId,
-            fav_id: params.shopId,
-            uid: params.uid,
-            type: params.type
-        };
-
-        if (params.isFav) {
-            Object.assign(finalParams, {
-                method: 'app.favorite.add'
-            });
-        } else {
-            Object.assign(finalParams, {
-                method: 'app.favorite.cancel'
-            });
-        }
-        return api.get('', finalParams);
-    },
-
-    /**
      * 从接口获取品牌列表页数据
      * 从接口获取品牌列表页数据
      * @returns {*}
      * @returns {*}
      */
      */
@@ -127,16 +41,5 @@ module.exports = {
             method: 'app.sort.get'
             method: 'app.sort.get'
         })
         })
         );
         );
-    },
-
-    /**
-     * 从接口获取品类资源位数据
-     * @returns {*}
-     */
-    getCateResource(params) {
-        return api.get('', Object.assign(params, {
-            method: 'app.sort.get'
-        })
-        );
     }
     }
 };
 };

@@ -5,14 +5,12 @@
  * Time: 13:51
  * Time: 13:51
  */
  */
 'use strict';
 'use strict';
-const path = require('path');
+
 const api = global.yoho.API;
 const api = global.yoho.API;
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const brandApi = require('./brand-api');
 const brandApi = require('./brand-api');
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
 const _ = require('lodash');
 const _ = require('lodash');
-const processProductList = require(path.join(global.utils, '/beautify/product')).processProductList;
-const camelCase = global.yoho.camelCase;
 
 
 /**
 /**
  * 处理品牌一览品牌列表数据
  * 处理品牌一览品牌列表数据
@@ -53,94 +51,6 @@ const handleBrandList = origin => {
 };
 };
 
 
 /**
 /**
- * 获取品牌店铺数据
- * @param params
- * @returns {*|Promise.<TResult>}
- */
-const getBrandData = params => {
-    let finalResult = {};
-
-    return api.all([
-        brandApi.getBrandInfoByDomain({domain: params.domain})
-    ]).then(result => {
-
-        if (result[0].code === 200) {
-
-            /* 品牌有店铺 */
-            if (result[0].data.shop_id) {
-                return api.all([
-                    brandApi.getShopInfoData({
-                        shopId: result[0].data.shop_id,
-                        uid: params.uid
-                    })
-                ]).then(subResult => {
-                    if (subResult[0].code === 200) {
-
-                        /* TODO 判断是否是使用 BLK 模板，不使用 BLK 模板的就直接返回 */
-                        if (subResult[0].data.shop_template_type === '2') {
-                            Object.assign(finalResult, {
-
-                                /* TODO 背景图取资源位，接口未开发 */
-                                brandBg: 'http://7xwj52.com1.z0.glb.clouddn.com/brandbg.jpg',
-
-                                /* TODO 是否显示店铺 LOGO，接口未开发 */
-                                showBrandLogo: false,
-                                brandLogo: subResult[0].data.shop_logo,
-                                brandName: subResult[0].data.shop_name,
-                                brandIntro: subResult[0].data.shop_intro
-                            });
-                            return finalResult;
-                        } else {
-                            logger.info('no BLK template');
-                        }
-                    } else {
-                        logger.error('getShopInfoData api code no 200');
-                    }
-                });
-            } else {
-                logger.info('brand has no shop');
-            }
-        } else {
-            logger.error('getBrandOriginData api code no 200');
-        }
-    });
-};
-
-/**
- * 获取品牌店铺商品数据
- * @param params
- * @returns {*|Promise.<TResult>}
- */
-const getBrandShopGoodsData = params => {
-    let finalResult = {};
-
-    return api.all([brandApi.getBrandShopGoodsOriginData(params)]).then(result => {
-        if (result[0].code === 200) {
-            Object.assign(finalResult, {
-                data: {
-                    productList: processProductList(result[0].data.productList)
-                }
-            });
-        } else {
-            logger.error('getBrandShopGoodsOriginData api code no 200');
-        }
-
-        return camelCase(finalResult);
-    });
-};
-
-/**
- * 收藏店铺
- * @param params
- * @returns {*|Promise.<TResult>}
- */
-const collectShopData = params => {
-    return api.all([brandApi.collectShopOriginData(params)]).then(result => {
-        return result[0];
-    });
-};
-
-/**
  * 获取品牌列表页数据
  * 获取品牌列表页数据
  * @param params
  * @param params
  */
  */
@@ -234,24 +144,7 @@ const getCateListData = params => {
     });
     });
 };
 };
 
 
-/**
- * 获取品类资源位数据
- * @param params
- * @returns {*|Promise.<TResult>}
- */
-const getCateResource = params => {
-    let finalResult = {};
-
-    return brandApi.getCateResource(params).then(result => {
-        return finalResult;
-    });
-};
-
 module.exports = {
 module.exports = {
-    getBrandData,
-    getBrandShopGoodsData,
     getBrandListData,
     getBrandListData,
-    getCateListData,
-    getCateResource,
-    collectShopData
+    getCateListData
 };
 };

@@ -17,15 +17,10 @@ router.get('/', channel.index); // 首页
 router.get('/channel/channel.json', channel.channel); // 查询所有频道
 router.get('/channel/channel.json', channel.channel); // 查询所有频道
 router.get('/channel/resources.json', channel.resources); // 资源位接口
 router.get('/channel/resources.json', channel.resources); // 资源位接口
 router.get('/channel/goods.json', channel.goods); // 首页查询商品列表
 router.get('/channel/goods.json', channel.goods); // 首页查询商品列表
-router.get('/brand', brand.index); // 店铺首页
-router.get('/get-shop-info', brand.getShopInfo); // 店铺介绍
-router.post('/get-brand-shop-goods', brand.getBrandShopGoods); // 店铺介绍
 router.get('/brand-list', brand.brandList); // 品牌列表页
 router.get('/brand-list', brand.brandList); // 品牌列表页
 router.get('/get-brand-list', brand.getBrandList); // 获取品牌列表数据
 router.get('/get-brand-list', brand.getBrandList); // 获取品牌列表数据
-router.get('/brand-share', brand.brandShare); // 获取品牌列表数据
 
 
 router.get('/cate-resource', brand.cateResource); // 品类资源位页面
 router.get('/cate-resource', brand.cateResource); // 品类资源位页面
-router.post('/collect-shop', brand.collectShop); // 收藏品牌店铺
 router.get('/cate', brand.cate); // 全部分类
 router.get('/cate', brand.cate); // 全部分类
 router.get('/get-cate-list', brand.getCateList); // 全部分类数据列表
 router.get('/get-cate-list', brand.getCateList); // 全部分类数据列表
 
 

-<div id="brand-share">
-    <brand-share-box></brand-share-box>
-</div>

-<div id="brand">
-    <brand-box></brand-box>
-</div>

+/**
+ * Created by PhpStorm.
+ * User: Targaryen
+ * Date: 2016/7/26
+ * Time: 10:34
+ */
+'use strict';
+
+const mRoot = '../models';
+const shopModel = require(`${mRoot}/shop`);
+
+module.exports = {
+
+    /* 品牌店铺页面 */
+    index: (req, res) => {
+        res.render('shop/index', {
+            module: 'product',
+            page: 'shop'
+        });
+    },
+
+    /* 获取品牌店铺介绍 */
+    getShopInfo: (req, res) => {
+        shopModel.getShopData({
+            domain: req.query.domain,
+            uid: req.user.uid
+        }).then(result => {
+            res.json(result);
+        });
+    },
+
+    /* 获取商品列表 */
+    getBrandShopGoods: (req, res) => {
+        shopModel.getBrandShopGoodsData({
+            sort: req.body.sort,
+            page: req.body.page,
+            channel: req.body.filter.channel || 'men',
+            gender: req.body.filter.gender || '1,2,3',
+            brand: req.body.filter.brand,
+            shopId: req.body.filter.shopId,
+            order: req.body.filter.order || 's_t_desc',
+            limit: req.body.filter.limit || '60',
+            color: req.body.filter.color,
+            price: req.body.filter.price,
+            size: req.body.filter.size,
+            pd: req.body.filter.pd,
+            tagsFilter: req.body.filter.tagsFilter
+        }).then(result => {
+            res.json(result);
+        });
+    },
+
+    /* 收藏店铺 */
+    collectShop: (req, res) => {
+        shopModel.collectShopData({
+            shopId: req.body.shopId,
+            favId: req.body.favId,
+            uid: req.user.uid,
+            type: 'shop'
+        }).then(result => {
+            res.json(result);
+        });
+    },
+
+    /* 品牌店铺分享页面 */
+    shopShare: (req, res) => {
+        res.render('shop/share', {
+            module: 'product',
+            page: 'shop-share'
+        });
+    }
+};

+/**
+ * Created by PhpStorm.
+ * User: Targaryen
+ * Date: 2016/7/26
+ * Time: 10:35
+ */
+'use strict';
+const api = global.yoho.API;
+const yhChannel = {
+    men: {
+        channel: '1'
+    },
+    women: {
+        channel: '2'
+    },
+    lifestyle: {
+        channel: '4'
+    }
+};
+
+exports.module = {
+    /**
+     * 通过品牌域名获取品牌信息
+     * @param params
+     */
+    getBrandInfoByDomain(params) {
+        return api.get('', {
+            method: 'web.brand.byDomain',
+            domain: params.domain
+        });
+    },
+
+    /**
+     * 从接口获取品牌店铺数据
+     * @returns {*}
+     */
+    getShopInfoData(params) {
+        let finalParams = {
+            method: 'app.shops.getIntro',
+            shop_id: params.shopId
+        };
+
+        if (params.uid) {
+            Object.assign(finalParams, {
+                uid: params.uid
+            });
+        }
+
+        return api.get('', finalParams);
+    },
+
+    /**
+     * TODO 从接口获得店铺装修资源
+     * @param params
+     * @returns {*}
+     */
+    getShopsDecoratorList(params) {
+        return api.get('', {
+            method: 'app.shopsdecorator.getList',
+            shop_id: params.shopId
+        });
+    },
+
+    /**
+     * 从接口获取品牌店铺商品数据
+     * @returns {*}
+     */
+    getBrandShopGoodsOriginData(params) {
+        return api.get('', {
+            method: 'app.search.brand',
+            yh_channel: params.channel ? yhChannel[params.channel].channel : '1',
+            brand: params.brand,
+            shop_id: params.shopId,
+            order: params.order,
+            limit: params.limit,
+            page: params.page,
+            gender: params.gender,
+            color: params.color,
+            price: params.price,
+            size: params.size,
+            p_d: params.pd,
+            sort: params.sort,
+            tags_filter: params.tagsFilter
+        });
+    },
+
+    /**
+     * 收藏取消收藏店铺
+     * @param params
+     * @returns {*}
+     */
+    collectShopOriginData(params) {
+        let finalParams = {
+            id: params.shopId,
+            fav_id: params.shopId,
+            uid: params.uid,
+            type: params.type
+        };
+
+        if (params.isFav) {
+            Object.assign(finalParams, {
+                method: 'app.favorite.add'
+            });
+        } else {
+            Object.assign(finalParams, {
+                method: 'app.favorite.cancel'
+            });
+        }
+        return api.get('', finalParams);
+    }
+};

+/**
+ * Created by PhpStorm.
+ * User: Targaryen
+ * Date: 2016/7/26
+ * Time: 10:34
+ */
+'use strict';
+const logger = global.yoho.logger;
+const api = global.yoho.API;
+const shopApi = require('./shop-api');
+const path = require('path');
+const processProductList = require(path.join(global.utils, '/beautify/product')).processProductList;
+const camelCase = global.yoho.camelCase;
+
+/**
+ * 获取品牌店铺数据
+ * @param params
+ * @returns {*|Promise.<TResult>}
+ */
+const getShopData = params => {
+    let finalResult = {};
+
+    return api.all([
+        shopApi.getBrandInfoByDomain({domain: params.domain})
+    ]).then(result => {
+
+        if (result[0].code === 200) {
+
+            /* 品牌有店铺 */
+            if (result[0].data.shop_id) {
+                return api.all([
+                    shopApi.getShopInfoData({
+                        shopId: result[0].data.shop_id,
+                        uid: params.uid
+                    })
+                ]).then(subResult => {
+                    if (subResult[0].code === 200) {
+
+                        /* TODO 判断是否是使用 BLK 模板，不使用 BLK 模板的就直接返回 */
+                        if (subResult[0].data.shop_template_type === '2') {
+                            Object.assign(finalResult, {
+
+                                /* TODO 背景图取资源位，接口未开发 */
+                                brandBg: 'http://7xwj52.com1.z0.glb.clouddn.com/brandbg.jpg',
+
+                                /* TODO 是否显示店铺 LOGO，接口未开发 */
+                                showBrandLogo: false,
+                                brandLogo: subResult[0].data.shop_logo,
+                                brandName: subResult[0].data.shop_name,
+                                brandIntro: subResult[0].data.shop_intro
+                            });
+                            return finalResult;
+                        } else {
+                            logger.info('no BLK template');
+                        }
+                    } else {
+                        logger.error('getShopInfoData api code no 200');
+                    }
+                });
+            } else {
+                logger.info('brand has no shop');
+            }
+        } else {
+            logger.error('getBrandOriginData api code no 200');
+        }
+    });
+};
+
+/**
+ * 获取品牌店铺商品数据
+ * @param params
+ * @returns {*|Promise.<TResult>}
+ */
+const getBrandShopGoodsData = params => {
+    let finalResult = {};
+
+    return api.all([shopApi.getBrandShopGoodsOriginData(params)]).then(result => {
+        if (result[0].code === 200) {
+            Object.assign(finalResult, {
+                data: {
+                    productList: processProductList(result[0].data.productList)
+                }
+            });
+        } else {
+            logger.error('getBrandShopGoodsOriginData api code no 200');
+        }
+
+        return camelCase(finalResult);
+    });
+};
+
+/**
+ * 收藏店铺
+ * @param params
+ * @returns {*|Promise.<TResult>}
+ */
+const collectShopData = params => {
+    return api.all([shopApi.collectShopOriginData(params)]).then(result => {
+        return result[0];
+    });
+};
+
+exports.module = {
+    getShopData,
+    getBrandShopGoodsData,
+    collectShopData
+};

@@ -19,6 +19,15 @@ router.post('/search', search.fetchProducts);
 router.get('/filter', search.subFilter);
 router.get('/filter', search.subFilter);
 router.get('/filters.json', search.fetchFilters);
 router.get('/filters.json', search.fetchFilters);
 
 
+// 品牌店铺页面
+const shop = require(`${cRoot}/shop`);
+
+router.get('/shop', shop.index); // 店铺首页
+router.get('/get-shop-info', shop.getShopInfo); // 店铺介绍
+router.post('/get-brand-shop-goods', shop.getBrandShopGoods); // 店铺商品列表
+router.post('/collect-shop', shop.collectShop); // 收藏品牌店铺
+router.get('/shop-share', shop.shopShare); // 品牌店铺分享页面
+
 // 商品详情controller
 // 商品详情controller
 const detail = require(`${cRoot}/detail`);
 const detail = require(`${cRoot}/detail`);
 
 

+<div id="shop">
+    <shop-box></shop-box>
+</div>

+<div id="share">
+    <share-box></share-box>
+</div>

@@ -7,15 +7,15 @@
 
 
 const Vue = require('yoho-vue');
 const Vue = require('yoho-vue');
 const lazyload = require('yoho-vue-lazyload');
 const lazyload = require('yoho-vue-lazyload');
-const brandShareBox = require('channel/brand-share-box.vue');
+const shareBox = require('product/shop/share-box.vue');
 
 
 require('common/vue-filter');
 require('common/vue-filter');
 
 
 Vue.use(lazyload);
 Vue.use(lazyload);
 
 
 new Vue({
 new Vue({
-    el: '#brand-share',
+    el: '#share',
     components: {
     components: {
-        brandShareBox
+        shareBox
     }
     }
 });
 });

@@ -8,14 +8,14 @@ const Vue = require('yoho-vue');
 const lazyload = require('yoho-vue-lazyload');
 const lazyload = require('yoho-vue-lazyload');
 const infinitScroll = require('yoho-vue-infinite-scroll');
 const infinitScroll = require('yoho-vue-infinite-scroll');
 
 
-const brandBox = require('channel/brand-box.vue');
+const shopBox = require('product/shop/shop-box.vue');
 
 
 Vue.use(lazyload);
 Vue.use(lazyload);
 Vue.use(infinitScroll);
 Vue.use(infinitScroll);
 
 
 new Vue({
 new Vue({
-    el: '#brand',
+    el: '#shop',
     components: {
     components: {
-        brandBox
+        shopBox
     }
     }
 });
 });

@@ -9,7 +9,7 @@
     </div>
     </div>
 </template>
 </template>
 <style>
 <style>
-	.share-bottom {
+    .share-bottom {
         width: 100%;
         width: 100%;
         padding: 20px 10px;
         padding: 20px 10px;
         background: #fff;
         background: #fff;
@@ -37,7 +37,7 @@
         }
         }
 
 
         .new-user {
         .new-user {
-            float: left;]
+            float: left;
             border: #fff solid 2px;
             border: #fff solid 2px;
         }
         }
 
 
@@ -64,4 +64,4 @@
             }
             }
         }
         }
     };
     };
-</script>
+</script>

@@ -53,8 +53,7 @@
     }
     }
 </style>
 </style>
 <script>
 <script>
-    const brandShopTop = require('channel/brand-shop-top.vue');
-    const shareBottom = require('channel/share-bottom.vue');
+    const shareBottom = require('product/shop/share-bottom.vue');
 
 
     module.exports = {
     module.exports = {
 
 
@@ -68,7 +67,6 @@
             };
             };
         },
         },
         components: {
         components: {
-            brandShopTop,
             shareBottom
             shareBottom
         }
         }
     };
     };

 <template>
 <template>
-    <brand-top-bar v-bind:share-data="shareData"></brand-top-bar>
-    <brand-shop-top v-bind:shop-info="shopInfo"></brand-shop-top>
+    <top-bar v-bind:share-data="shareData"></top-bar>
+    <shop-top v-bind:shop-info="shopInfo"></shop-top>
     <goods-list v-bind:data="productList"></goods-list>
     <goods-list v-bind:data="productList"></goods-list>
     <drawer v-ref:drawer>
     <drawer v-ref:drawer>
         <filter :config.once="filterConfig"></filter>
         <filter :config.once="filterConfig"></filter>
@@ -12,8 +12,8 @@
     const qs = require('yoho-qs');
     const qs = require('yoho-qs');
     const bus = require('common/vue-bus');
     const bus = require('common/vue-bus');
     const tip = require('common/tip');
     const tip = require('common/tip');
-    const brandTopBar = require('channel/brand-top-bar.vue'); // 顶部栏，包括返回、收藏店铺、分享，打开筛选页面
-    const brandShopTop = require('channel/brand-shop-top.vue'); // 店铺头部信息
+    const topBar = require('product/shop/top-bar.vue'); // 顶部栏，包括返回、收藏店铺、分享，打开筛选页面
+    const shopTop = require('product/shop/shop-top.vue'); // 店铺头部信息
     const goodsList = require('product/list.vue');
     const goodsList = require('product/list.vue');
     const drawer = require('product/drawer.vue');
     const drawer = require('product/drawer.vue');
     const filter = require('product/filter.vue');
     const filter = require('product/filter.vue');
@@ -132,8 +132,8 @@
             }
             }
         },
         },
         components: {
         components: {
-            brandTopBar,
-            brandShopTop,
+            topBar,
+            shopTop,
             goodsList,
             goodsList,
             drawer,
             drawer,
             filter
             filter