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

 <template>
 <template>
     <div v-if="channel.length" class="channel-tab">
     <div v-if="channel.length" class="channel-tab">
-        <div class="channel" v-for="(index, item) in channel" v-bind:class="{focus: index === current}" v-on:click="changeChannel(index)">
+        <div class="channel" v-for="(index, item) in channel" v-bind:class="{focus: index === current}" v-on:click="changeChannel(index)" v-bind:style="{width: (1 / channel.length) * 100 + '%'}">
             <span class="name">{{item.name | uppercase}}</span>
             <span class="name">{{item.name | uppercase}}</span>
         </div>
         </div>
     </div>
     </div>
@@ -84,7 +84,6 @@
         .channel {
         .channel {
             display: inline-block;
             display: inline-block;
             line-height: 90px;
             line-height: 90px;
-            width: 33%;
             color: #999;
             color: #999;
 
 
             &.focus {
             &.focus {

@@ -183,9 +183,9 @@
 
 
     module.exports = {
     module.exports = {
         components: {
         components: {
-            'content-block': require('./content-block.vue'),
-            'product-list': require('component/product/list.vue'),
-            'top-nav': require('./top-nav.vue')
+            contentBlock: require('./content-block.vue'),
+            productList: require('component/product/list.vue'),
+            topNav: require('./top-nav.vue')
         },
         },
         data() {
         data() {
             return {
             return {

@@ -103,8 +103,10 @@
                     if (result.code === 200) {
                     if (result.code === 200) {
                         if (this.editorialList.length > 0 && result.data.list.length > 0) {
                         if (this.editorialList.length > 0 && result.data.list.length > 0) {
                             this.$set('editorialList', this.editorialList.concat(result.data.list));
                             this.$set('editorialList', this.editorialList.concat(result.data.list));
-                        } else {
+                        } else if (result.data.list.length > 0) {
                             this.editorialList = result.data.list;
                             this.editorialList = result.data.list;
+                        } else {
+                            this.scrollDisabled = true;
                         }
                         }
                     } else {
                     } else {
                         this.scrollDisabled = true;
                         this.scrollDisabled = true;