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

@@ -7,18 +7,21 @@
 <script>
 <script>
     const contentCode = require('content-code');
     const contentCode = require('content-code');
     const qs = require('yoho-qs');
     const qs = require('yoho-qs');
+    const cookie = require('yoho-cookie');
 
 
     const tab = require('channel/tab.vue');
     const tab = require('channel/tab.vue');
     const resources = require('component/resources/index.vue');
     const resources = require('component/resources/index.vue');
     const brandList = require('channel/brand-list.vue');
     const brandList = require('channel/brand-list.vue');
     const brandSearch = require('channel/brand-search.vue');
     const brandSearch = require('channel/brand-search.vue');
 
 
+    const detaultChannel = qs.channel || cookie.get('_Channel') || 'men';
 
 
     module.exports = {
     module.exports = {
         data() {
         data() {
             return {
             return {
                 page: 'brand',
                 page: 'brand',
-                contentCode: contentCode.brand[qs.channel || 'men']
+                channel: detaultChannel,
+                contentCode: contentCode.brand[detaultChannel]
             };
             };
         },
         },
         components: {
         components: {

@@ -22,15 +22,18 @@
 <script>
 <script>
     const contentCode = require('content-code');
     const contentCode = require('content-code');
     const qs = require('yoho-qs');
     const qs = require('yoho-qs');
+    const cookie = require('yoho-cookie');
 
 
     const tab = require('channel/tab.vue');
     const tab = require('channel/tab.vue');
     const resources = require('component/resources/index.vue');
     const resources = require('component/resources/index.vue');
 
 
+    const detaultChannel = qs.channel || cookie.get('_Channel') || 'men';
+
     module.exports = {
     module.exports = {
         data() {
         data() {
             return {
             return {
                 page: 'cate',
                 page: 'cate',
-                contentCode: contentCode.cate[qs.channel || 'men']
+                contentCode: contentCode.cate[detaultChannel]
             };
             };
         },
         },
         components: {
         components: {

@@ -5,17 +5,20 @@
 
 
 <script>
 <script>
     const qs = require('yoho-qs');
     const qs = require('yoho-qs');
+    const cookie = require('yoho-cookie');
     const contentCode = require('content-code');
     const contentCode = require('content-code');
     const bus = require('common/vue-bus');
     const bus = require('common/vue-bus');
 
 
     const tab = require('channel/tab.vue');
     const tab = require('channel/tab.vue');
     const resources = require('component/resources/index.vue');
     const resources = require('component/resources/index.vue');
 
 
+    const detaultChannel = qs.channel || cookie.get('_Channel') || 'men';
+
     module.exports = {
     module.exports = {
         data() {
         data() {
             return {
             return {
                 page: 'channel',
                 page: 'channel',
-                contentCode: contentCode.channel[qs.channel || 'men']
+                contentCode: contentCode.channel[detaultChannel]
             };
             };
         },
         },
         components: {
         components: {

@@ -22,7 +22,7 @@
         props: {
         props: {
             current: {
             current: {
                 type: Number,
                 type: Number,
-                default: 0
+                default: +cookie.get('_ChannelIndex') || 0
             },
             },
             page: {
             page: {
                 type: String,
                 type: String,
@@ -62,6 +62,7 @@
                 this.current = index;
                 this.current = index;
                 bus.$emit('channel.change', this.page, this.channel[index].channel);
                 bus.$emit('channel.change', this.page, this.channel[index].channel);
                 cookie.set('_Channel', this.channel[index].channel);
                 cookie.set('_Channel', this.channel[index].channel);
+                cookie.set('_ChannelIndex', index);
             }
             }
         }
         }
     };
     };