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

@@ -13,8 +13,10 @@
                 </ul>
             </div>
             <div class="filter-detail" v-show="!filterDown">
-                <filter-item v-for="item in filterItems" :key="item.name" :name="item.name" :choices="item.choices"
-                             v-if="item.choices.length"></filter-item>
+                <div class="filter-items">
+                    <filter-item v-for="item in filterItems" :key="item.name" :name="item.name" :choices="item.choices"
+                                 v-if="item.choices.length"></filter-item>
+                </div>
                 <div class="action">
                     <p class="tip">您可以选择一个或多个筛选项进行筛选</p>
                     <v-touch tag="a" class="action-btn filter-btn" @tap="filterSearch">筛选</v-touch>
@@ -412,6 +414,11 @@ export default {
         overflow: auto;
         background-color: #fff;
 
+        .filter-items {
+            max-height: 540px;
+            overflow: auto;
+        }
+
         .action {
             padding: 0 30px;
 

@@ -11,7 +11,8 @@
         </div>
         <div class="pagination-wrapper">
             <ul class="page-items">
-                <li v-for="index in slideCount" :key="index" class="page-item" :class="{active: index == activeIndex}"></li>
+                <li v-for="index in slideCount" :key="index" class="page-item"
+                    :class="{active: index - 1 == activeIndex}"></li>
             </ul>
         </div>
     </div>

@@ -99,11 +99,11 @@
                 }, locationQuery, this.filter))
                     .done(res => {
                         if (res.data) {
-                            self.page = res.data.page;
-                            self.totalPage = res.data.page_total;
+                            this.page = res.data.page;
+                            this.totalPage = res.data.page_total;
                             this.productList = this.productList.concat(res.data.product_list);
 
-                            if (!self.filterConfig) {
+                            if (!this.filterConfig) {
                                 this.filterConfig = res.data.filter;
                             }
                         }