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

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

 const Vue = require('vue');
 const Vue = require('vue');
-const brandCate = require('channel/brand-cate.vue');
+const brandCateBox = require('channel/brand-cate-box.vue');
 
 
 new Vue({
 new Vue({
-    el: '#brand-cate',
+    el: '#brand-cate-box',
     components: {
     components: {
-        'brand-cate': brandCate
+        'brand-cate-box': brandCateBox
     }
     }
 });
 });

+<template>
+    <tab v-bind:page="'cate'"></tab>
+    <brand-cate v-bind:category="category" v-bind:jump="true" v-bind:gender="gender"></brand-cate>
+</template>
+<script>
+    const tip = require('common/tip');
+    const brandCate = require('channel/brand-cate.vue');
+    const tab = require('channel/tab.vue');
+    const $ = require('jquery');
+    const bus = require('common/vue-bus');
+
+    const channelTrans = {
+        men: {
+            key: 'MEN男士',
+            code: '1,3'
+        },
+        women: {
+            key: 'WOMEN女士',
+            code: '2,3'
+        },
+        lifestyle: {
+            key: 'LIFESTYLE生活',
+            code: '1,2,3'
+        }
+    };
+
+    module.exports = {
+        data() {
+            return {
+                category: [],
+                categoryResult: {},
+                gender: '1,3'
+            };
+        },
+        components: {
+            tab,
+            brandCate
+        },
+        methods: {
+            getCateList() {
+
+                $.ajax({
+                    url: '/cate/list.json'
+                }).then(result => {
+                    if (result.code === 200 && result.data) {
+                        this.$set('categoryResult', result.data);
+                        this.$set('category', this.categoryResult['MEN男士']);
+                    }
+                }).fail(() => {
+                    tip('网络错误');
+                });
+            }
+        },
+        created() {
+            this.getCateList();
+
+            bus.$on('channel.change', (page, channel) => {
+                this.$set('gender', channelTrans[channel].code);
+                this.$set('category', this.categoryResult[channelTrans[channel].key]);
+            });
+        }
+    };
+</script>

 <template>
 <template>
-    <tab v-bind:page="'cate'"></tab>
     <div class="cate-page" id='cate-page'>
     <div class="cate-page" id='cate-page'>
         <div class="cate-container clearfix">
         <div class="cate-container clearfix">
             <div class="content" style="height: 522px;">
             <div class="content" style="height: 522px;">
@@ -10,11 +9,15 @@
                 </ul>
                 </ul>
                 <div class="sub-level-container">
                 <div class="sub-level-container">
                     <ul class="sub-level">
                     <ul class="sub-level">
-                        <li><a href="/list?sort={{rightAll.sortId}}&sort_name=全部{{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a></li>
+                        <li >
+                            <a v-if="jump" href="/list?sort={{rightAll.sortId}}&sort_name=全部{{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a>
+                            <a v-else @click="noJumpReturn(rightAll.sortId, '全部' + rightAll.categoryName)">全部{{rightAll.categoryName}}</a>
+                        </li>
                     </ul>
                     </ul>
                     <ul class="sub-level">
                     <ul class="sub-level">
                         <li v-for="sub in cateNavRightData">
                         <li v-for="sub in cateNavRightData">
-                            <a href="/list?sort={{sub.relationParameter.sort}}&sort_name={{sub.categoryName}}&gender={{gender}}">{{sub.categoryName}}</a>
+                            <a v-if="jump" href="/list?sort={{sub.relationParameter.sort}}&sort_name={{sub.categoryName}}&gender={{gender}}">{{sub.categoryName}}</a>
+                            <a v-else @click="noJumpReturn(sub.relationParameter.sort, sub.categoryName)">{{sub.categoryName}}</a>
                         </li>
                         </li>
                     </ul>
                     </ul>
                 </div>
                 </div>
@@ -199,68 +202,40 @@
 }
 }
 </style>
 </style>
 <script>
 <script>
-    const $ = require('jquery');
-    const tip = require('common/tip');
-    const tab = require('channel/tab.vue');
-    const contentCode = require('content-code');
-    const qs = require('yoho-qs');
     const bus = require('common/vue-bus');
     const bus = require('common/vue-bus');
 
 
-    const channelTrans = {
-        men: {
-            key: 'MEN男士',
-            code: '1,3'
-        },
-        women: {
-            key: 'WOMEN女士',
-            code: '2,3'
-        },
-        lifestyle: {
-            key: 'LIFESTYLE生活',
-            code: '1,2,3'
-        }
-    };
-
     module.exports = {
     module.exports = {
-        props: [],
+        props: {
+            category: {
+                type: Array
+            },
+            jump: {
+                type: Boolean
+            },
+            gender: {
+                type: String
+            }
+        },
         data() {
         data() {
             return {
             return {
-                brandCate: [],
-                cateNavLeftData: [],
-                cateNavRightData: [],
-                topcurrent: 0,
-                widthli: 33.33,
-                leftcurrent: 0,
-                page: 'cate',
-                gender: '1,2,3',
-                rightAll: {},
-                contentCode: contentCode.brand[qs.channel || 'men']
+                cateNavLeftData: [], // 左侧分类数据
+                cateNavRightData: [], // 右侧分类数据
+                leftcurrent: 0, // 标记当前左侧选中条目
+                rightAll: {} // 全部XX
             };
             };
         },
         },
-        methods: {
-            getCateList() {
-                let data = {
-                    channel: ''
-                };
+        watch: {
+            category() {
+                this.$set('cateNavLeftData', this.category);
+                this.$set('cateNavRightData', this.cateNavLeftData ? this.cateNavLeftData[0].sub : []);
 
 
-                $.ajax({
-                    url: '/cate/list.json',
-                    data: data
-                }).then(result => {
-                    if (result.code === 200 && result.data) {
-                        this.$set('brandCate', result.data);
-                        this.$set('cateNavLeftData', result.data['MEN男士']);
-                        this.$set('cateNavRightData', result.data['MEN男士'] ? result.data['MEN男士'][0].sub : []);
-
-                        this.$set('rightAll', result.data['MEN男士'] ? {
-                            sortId: result.data['MEN男士'][0].relationParameter.sort,
-                            categoryName: result.data['MEN男士'][0].categoryName
-                        } : {});
-                    }
-                }).fail(() => {
-                    tip('网络错误');
-                });
-            },
+                this.$set('rightAll', this.cateNavLeftData ? {
+                    sortId: this.cateNavLeftData[0].relationParameter.sort,
+                    categoryName: this.cateNavLeftData[0].categoryName
+                } : {});
+            }
+        },
+        methods: {
             cateNavLeftFun(index, categoryId, categoryName) {
             cateNavLeftFun(index, categoryId, categoryName) {
                 this.leftcurrent = index;
                 this.leftcurrent = index;
                 this.cateNavRightData = this.cateNavLeftData[index].sub;
                 this.cateNavRightData = this.cateNavLeftData[index].sub;
@@ -268,23 +243,15 @@
                     sortId: categoryId,
                     sortId: categoryId,
                     categoryName: categoryName
                     categoryName: categoryName
                 };
                 };
-            }
-        },
-        components: {
-            tab
-        },
-        created() {
-            this.getCateList();
+            },
 
 
-            bus.$on('channel.change', (page, channel) => {
-                this.gender = channelTrans[channel].code;
-                this.cateNavLeftData = this.brandCate[channelTrans[channel].key];
-                this.cateNavRightData = this.cateNavLeftData ? this.cateNavLeftData[0].sub : [];
-                this.rightAll = {
-                    sortId: this.cateNavLeftData[0].relationParameter.sort,
-                    categoryName: this.cateNavLeftData[0].categoryName
-                };
-            });
+            /* 筛选列表使用返回值 */
+            noJumpReturn(categoryId, categoryName) {
+                bus.$emit('category.result', {
+                    id: categoryId,
+                    name: categoryName
+                });
+            }
         }
         }
     };
     };
 </script>
 </script>