Merge branch 'feature-creative-center' into uat
This commit is contained in:
@@ -195,10 +195,13 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
showTimeTimeoutId: 0,
|
||||
};
|
||||
},
|
||||
beforeUnmount() {
|
||||
this.pager.clear();
|
||||
if(this.showTimeTimeoutId) clearTimeout(this.showTimeTimeoutId);
|
||||
},
|
||||
async mounted() {
|
||||
|
||||
@@ -220,7 +223,10 @@ export default defineComponent({
|
||||
this.shopData = buildShopDataDemo(this.scene);
|
||||
|
||||
if(this.config.is_show_time && this.config.show_time){
|
||||
setTimeout(() => this.$emit("next"), this.config.show_time * 1000)
|
||||
this.showTimeTimeoutId = setTimeout(() => {
|
||||
this.showTimeTimeoutId = 0;
|
||||
this.$emit("next");
|
||||
}, this.config.show_time * 1000)
|
||||
}
|
||||
|
||||
if(this.config.is_three_dimensions) {
|
||||
|
||||
Reference in New Issue
Block a user