Merge branch 'feature/brand' into develop

@@ -37,9 +37,21 @@ module.exports = {
 
 
     /* 获取商品列表 */
     /* 获取商品列表 */
     getBrandShopGoods: (req, res) => {
     getBrandShopGoods: (req, res) => {
-        let params = req.query;
-
-        brandModel.getBrandShopGoodsData(params).then(result => {
+        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);
             res.json(result);
         });
         });
     },
     },

@@ -4,7 +4,6 @@
  * @date: 2016/05/09
  * @date: 2016/05/09
  */
  */
 'use strict';
 'use strict';
-const brand = require('./brand');
 
 
 /**
 /**
  * 频道选择页
  * 频道选择页
@@ -18,4 +17,4 @@ const component = {
     }
     }
 };
 };
 
 
-module.exports = Object.assign(component, brand);
+module.exports = component;

@@ -65,7 +65,20 @@ module.exports = {
      */
      */
     getBrandShopGoodsOriginData(params) {
     getBrandShopGoodsOriginData(params) {
         return api.get('', {
         return api.get('', {
-            method: ''
+            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
         });
         });
     },
     },
 
 
@@ -82,7 +95,7 @@ module.exports = {
             type: params.type
             type: params.type
         };
         };
 
 
-        if (isFav) {
+        if (params.isFav) {
             Object.assign(finalParams, {
             Object.assign(finalParams, {
                 method: 'app.favorite.add'
                 method: 'app.favorite.add'
             });
             });

@@ -17,7 +17,7 @@ router.get('/', channel.index); // 首页
 router.get('/resources', channel.resources); // 资源位接口
 router.get('/resources', channel.resources); // 资源位接口
 router.get('/brand', brand.index); // 店铺首页
 router.get('/brand', brand.index); // 店铺首页
 router.get('/get-brand-intro', brand.getBrandIntro); // 店铺介绍
 router.get('/get-brand-intro', brand.getBrandIntro); // 店铺介绍
-router.get('/get-brand-shop-goods', brand.getBrandShopGoods); // 店铺介绍
+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('/brand-share', brand.brandShare); // 获取品牌列表数据

@@ -14,7 +14,7 @@
     "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js",
     "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js",
     "lint-js": "eslint -c .eslintrc --cache --fix .",
     "lint-js": "eslint -c .eslintrc --cache --fix .",
     "lint-css": "stylelint --config .stylelintrc public/scss/**/*.css",
     "lint-css": "stylelint --config .stylelintrc public/scss/**/*.css",
-    "lint-vue": "stylelint --extract --config .stylelintrc public/vue/**/*.vue; eslint -c .eslintrc --cache --fix public/vue/**/*.vue",
+    "lint-vue": "stylelint --extract --config .stylelintrc public/vue/**/*.vue || eslint -c .eslintrc --cache --fix public/vue/**/*.vue",
     "precommit": "node lint.js"
     "precommit": "node lint.js"
   },
   },
   "license": "MIT",
   "license": "MIT",

@@ -31,8 +31,8 @@
                 filterConfig: global.filterConfig,
                 filterConfig: global.filterConfig,
 
 
                 // query
                 // query
-                url: '/product/list',
-                sort: 3,
+                url: '/get-brand-shop-goods',
+                sort: '',
                 filter: {},
                 filter: {},
                 page: 0, // page= 0 未搜索, 1 并且productList.length =0 没有数据, page = page_total 全部加载完
                 page: 0, // page= 0 未搜索, 1 并且productList.length =0 没有数据, page = page_total 全部加载完
                 totalPage: 3,
                 totalPage: 3,
@@ -58,11 +58,10 @@
                 let data = {};
                 let data = {};
 
 
                 $.ajax({
                 $.ajax({
-                    method: 'post',
-                    url: '/product/list',
+                    url: this.url,
                     data: data
                     data: data
                 }).done(result => {
                 }).done(result => {
-                    this.$set('productList', this.productList.concat(result.data.productList));
+                    this.productList = result.data.productList;
                 }).fail(() => {
                 }).fail(() => {
                     tip('网络错误');
                     tip('网络错误');
                 });
                 });
@@ -83,8 +82,8 @@
                     sort: this.sort,
                     sort: this.sort,
                     filter: this.filter,
                     filter: this.filter,
                     page: this.page
                     page: this.page
-                }).done(res => {
-                    self.$set('productList', self.productList.concat(res.data.productList));
+                }).done(result => {
+                    this.productList = result.data.productList;
                 }).fail(error => {
                 }).fail(error => {
                     self.page--;
                     self.page--;
                     console.log(error);
                     console.log(error);

@@ -30,7 +30,8 @@
     font-size: 36px;
     font-size: 36px;
     font-family: helvetica, Arial, "黑体";
     font-family: helvetica, Arial, "黑体";
 
 
-    ul,  li {
+    ul,
+    li {
         margin: 0;
         margin: 0;
         padding: 0;
         padding: 0;
         list-style: none;
         list-style: none;

@@ -57,6 +57,8 @@
     const shareBottom = require('channel/share-bottom.vue');
     const shareBottom = require('channel/share-bottom.vue');
 
 
     module.exports = {
     module.exports = {
+
+        /* TODO 数据需要从接口获取 */
         data() {
         data() {
             return {
             return {
                 brandName: 'COLORMAD',
                 brandName: 'COLORMAD',

@@ -22,7 +22,8 @@
 .cate-resource {
 .cate-resource {
     width: 100%;
     width: 100%;
 
 
-    ul, li {
+    ul,
+    li {
         margin: 0;
         margin: 0;
         padding: 0;
         padding: 0;
     }
     }