Merge branch 'release/3.0' of http://git.yoho.cn/fe/yohoblk-wap into release/3.0

@@ -8,7 +8,7 @@
                 <div class="blk-header-right">
                 </div>
                 <div class="blk-header-main">
-                    <span class="blk-header-title">关于</span>
+                    <span class="blk-header-title">关于我们</span>
                 </div>
             </div>
             <div class="blk-header-gap"></div>

@@ -23,7 +23,7 @@
                     <ul class="sub-level">
                         <li v-for="(sub, index) in cateNavRightData" :key="index" :class="{'sub-checked': sub.checked}">
                             <div class="block ellipsis">
-                                <a v-if="jump" :href="`/product/list?sort=${sub.relation_parameter.sort}&sort_name=${sub.category_name}&gender=${gender}`">{{sub.category_name}}</a>
+                                <a class="ellipsis" v-if="jump" :href="`/product/list?sort=${sub.relation_parameter.sort}&sort_name=${sub.category_name}&gender=${gender}`">{{sub.category_name}}</a>
                                 <a v-else @click="noJumpReturn(sub.relation_parameter.sort, sub.category_name)">{{sub.category_name}}</a>
                             </div>
                             <div class="checked">

@@ -60,6 +60,12 @@ export default {
                 return;
             }
 
+            if (this.name === '折扣') {
+                this.$nextTick(() => {
+                    bus.$emit('choices.scrollBottom');
+                });
+            }
+
             bus.$emit('expand.choice.only', this.name);
         },
         toggleChoice(index, choice) {
@@ -152,6 +158,11 @@ export default {
         },
         foldExcept(name) {
             this.show = this.name === name;
+            if (name === '折扣') {
+                this.$nextTick(() => {
+                    bus.$emit('discount.scrollBottom');
+                });
+            }
         },
         subFilterChange(sub, filter){
             if (typeMap[this.name] === sub.subType) {

@@ -282,6 +282,10 @@ export default {
                 this.values[name] = [];
                 delete this.chosen[name];
             }
+        },
+        scrollBottom() {
+            let $el = document.querySelector('.filter-items');
+            $el.scrollTop = $el.scrollHeight;
         }
     },
     components: {
@@ -307,6 +311,7 @@ export default {
         });
 
         bus.$on('expand.subFilter', this.expandSub);
+        bus.$on('discount.scrollBottom', this.scrollBottom);
     }
 };
 </script>