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

@@ -245,7 +245,8 @@ const intercept = (url) => {
         // 品牌 品类
         if (/\/brand$/.test(path) || /\/cate$/.test(path)) {
             return yoho.goTab({
-                index: 1
+                index: 1,
+                headerIndex: /\/brand$/.test(path) ? 0 : 1
             });
         }
 

@@ -19,6 +19,7 @@ const yoho = require('yoho');
 const Vue = require('vue');
 const util = require('common/util');
 const interceptClick = require('common/intercept-click');
+const bus = require('common/vue-bus');
 
 // 隐藏 App 默认显示的 loading
 Vue.mixin({
@@ -37,6 +38,7 @@ $(() => {
         yoho.showLoading(false); // 隐藏 App 默认显示的 loading
         util.visibilitychange();
     }
+
     $body.on('click', 'a[href]', function() {
         // 拦截跳转
         if (!$(this).hasClass('no-intercept')) {
@@ -44,4 +46,9 @@ $(() => {
             return false;
         }
     });
+
+    yoho.addNativeMethod('triggerEvent', (eventName) => {
+        alert(eventName);
+        bus.$emit(eventName);
+    });
 });

@@ -4,17 +4,17 @@
         <div class="cate-container clearfix">
             <div class="content" style="height: 522px;">
                 <ul class="primary-level">
-                    <li v-for="(index, ca) in cateNavLeftData" v-bind:class="{focus: index === leftcurrent}" class="p-level-item" v-on:click='cateNavLeftFun(index, ca.categoryId, ca.categoryName)'>
+                    <li v-for="(index, ca) in cateNavLeftData" v-bind:class="{focus: index === leftcurrent}" class="p-level-item" v-on:click='cateNavLeftFun(index, ca.relationParameter.sort, ca.categoryName)'>
                         {{ca.categoryName}}
                     </li>
                 </ul>
                 <div class="sub-level-container">
                     <ul class="sub-level">
-                        <li><a href="/list?sort={{rightAll.categoryId}}&sort_name={{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a></li>
+                        <li><a href="/list?sort={{rightAll.sortId}}&sort_name={{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a></li>
                     </ul>
                     <ul class="sub-level">
                         <li v-for="sub in cateNavRightData">
-                            <a href="/list?sort={{sub.categoryId}}&sort_name={{sub.categoryName}}&gender={{gender}}">{{sub.categoryName}}</a>
+                            <a href="/list?sort={{sub.relationParameter.sort}}&sort_name={{sub.categoryName}}&gender={{gender}}">{{sub.categoryName}}</a>
                         </li>
                     </ul>
                 </div>
@@ -237,8 +237,6 @@
         },
         methods: {
             getCateList() {
-                let self = this;
-
                 let data = {
                     channel: ''
                 };
@@ -248,12 +246,12 @@
                     data: data
                 }).then(result => {
                     if (result.code === 200 && result.data) {
-                        self.$set('brandCate', result.data);
-                        self.$set('cateNavLeftData', result.data['MEN男士']);
-                        self.$set('cateNavRightData', result.data['MEN男士'] ? result.data['MEN男士'][0].sub : []);
+                        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男士'] ? {
-                            categoryId: result.data['MEN男士'][0].categoryId,
+                            sortId: result.data['MEN男士'][0].relationParameter.sort,
                             categoryName: result.data['MEN男士'][0].categoryName
                         } : {});
                     }
@@ -265,7 +263,7 @@
                 this.leftcurrent = index;
                 this.cateNavRightData = this.cateNavLeftData[index].sub;
                 this.rightAll = {
-                    categoryId: categoryId,
+                    sortId: categoryId,
                     categoryName: categoryName
                 };
             }