'mergebrand'

@@ -26,6 +26,8 @@ yoho币        |    /home/mycurrency     |
 帮助中心详情  |    /home/help-detail     | 
 意见反馈      |    /home/feedback     | 
 关于我们      |    /home/about     | 
+物流详情    | /home/logistic?order_code=1609827614  |
+退换货物流详情|home/logistic?order_code=1609827614&type=refund|
 
 --------------------------------------------------------------------------------
 

@@ -31,23 +31,21 @@ module.exports = {
 
     /* 获取商品列表 */
     getBrandShopGoods: (req, res, next) => {
-        let filter = req.body.filter || {};
-
         shopModel.getBrandShopGoodsData({
-            domain: filter.domain,
+            domain: req.body.domain,
             sort: req.body.sort,
             page: req.body.page,
-            channel: filter.channel || 'men',
-            gender: filter.gender || '1,2,3',
-            brand: filter.brand,
-            shopId: filter.shopId,
-            order: filter.order || 's_t_desc',
-            limit: filter.limit || '60',
-            color: filter.color,
-            price: filter.price,
-            size: filter.size,
-            pd: filter.pd,
-            tagsFilter: filter.tagsFilter
+            channel: req.body.channel || 'men',
+            gender: req.body.gender || '1,2,3',
+            brand: req.body.brand,
+            shopId: req.body.shopId,
+            order: req.body.order || 's_t_desc',
+            limit: req.body.limit || '60',
+            color: req.body.color,
+            price: req.body.price,
+            size: req.body.size,
+            pd: req.body.pd,
+            tagsFilter: req.body.tagsFilter
         }).then(result => {
             res.json(result);
         }).catch(next);

 <template>
+    <tab v-bind:page="page"></tab>
     <div class="cate-page" id='cate-page'>
         <div class="cate-nav clearfix">
             <ul>
@@ -198,6 +199,9 @@
 <script>
     const $ = require('yoho-jquery');
     const tip = require('common/tip');
+    const tab = require('channel/tab.vue');
+    const contentCode = require('content-code');
+    const qs = require('yoho-qs');
 
     module.exports = {
         props: [],
@@ -208,7 +212,9 @@
                 cateNavRightData: [],
                 topcurrent: 0,
                 widthli: 25,
-                leftcurrent: 0
+                leftcurrent: 0,
+                page: 'cate',
+                contentCode: contentCode.brand[qs.channel || 'men']
             };
         },
         methods: {
@@ -241,6 +247,9 @@
                 this.cateNavRightData = this.cateNavLeftData[index].sub;
             }
         },
+        components: {
+            tab
+        },
         created() {
             this.getCateList();
         }

 <template>
     <shop-top v-bind:shop-info="shopInfo"></shop-top>
-    <goods-list v-bind:data="productList"></goods-list>
+    <div v-bind:class='{"shop-goods-top": !shopInfo.isBlkShop}'>
+        <goods-list v-bind:data="productList"></goods-list>
+    </div>
     <filter :config="filterConfig" v-ref:filter></filter>
     <top-bar v-bind:share-data="shareData"></top-bar>
 </template>
-
+<style>
+    .shop-goods-top {
+        margin-top: 140px;
+    }
+</style>
 <script>
     const $ = require('yoho-jquery');
-    const qs = require('yoho-qs');
+    const qs = require('yoho-qs/parse');
     const bus = require('common/vue-bus');
     const tip = require('common/tip');
 
@@ -24,7 +30,6 @@
     module.exports = {
         data() {
             return {
-                domain: qs.domain,
                 shareData: {}, // 分享相关数据
                 shopInfo: {}, // 店铺介绍相关数据
 
@@ -34,9 +39,7 @@
                 // query
                 url: '/product/shop/goods.json',
                 sort: '',
-                filter: {
-                    domain: qs.domain
-                },
+                filter: {},
                 page: 0, // page= 0 未搜索, 1 并且productList.length =0 没有数据, page = page_total 全部加载完
                 totalPage: 3,
 
@@ -64,7 +67,7 @@
                 $.get({
                     url: '/product/shop/info.json',
                     data: {
-                        domain: this.domain
+                        domain: locationQuery.domain
                     }
                 }).done(result => {
                     if (result) {
@@ -134,7 +137,7 @@
         },
         created() {
             const self = this;
-            
+
             this.getShopInfo();
             this.search();
             bus.$on('list.paging', () => {
@@ -155,7 +158,6 @@
              *  2. 关闭 filter 组件
              */
             bus.$on('filter.change', function({val}) {
-                console.log(val);
                 let filter = {};
 
                 $.each(val, (type, item) => {