|
|
@@ -272,18 +272,17 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- watch: {
|
|
|
- $route() {
|
|
|
- this.$nextTick(() => {
|
|
|
- this.changeScroll(this.scrollTop);
|
|
|
- });
|
|
|
- }
|
|
|
+ activated() {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.changeScroll(this.scrollTop);
|
|
|
+ });
|
|
|
},
|
|
|
beforeRouteLeave(to, from, next) {
|
|
|
- this.scrollTop = this.scrollWrapper.value.scrollTop;
|
|
|
if (!to.meta.menuPage) {
|
|
|
+ this.scrollTop = this.scrollWrapper.value.scrollTop;
|
|
|
this.setKeeps(['index', 'discover']);
|
|
|
} else {
|
|
|
+ this.scrollTop = 0;
|
|
|
this.setKeeps([]);
|
|
|
}
|
|
|
next();
|