Merge branch 'new-func#1' into 'master'

修复分页器

See merge request pigbigbig/beyond-clouds-front!110

components/pc/pagination.vue

@@ -76,7 +76,9 @@
     },
     },
     watch:{
     watch:{
       currentPage(pre,now){
       currentPage(pre,now){
-        this.clickToTop();
+        if(this.type===1){
+          this.clickToTop();
+        }
         this.$emit(config.event.listenPageChange,pre)
         this.$emit(config.event.listenPageChange,pre)
       }
       }
     },
     },