Merge branch 'release' into dev

# Conflicts:
#	src/layout/components/main.vue

src/layout/components/main.vue

@@ -64,7 +64,7 @@ const setBacktopClass = computed(() => {
 	else return `.layout-backtop .el-scrollbar__wrap`;
 });
 // 页面加载前
-onMounted(async () => {
+onMounted( async () => {
 	NextLoading.done(600);
 	// 监听页面需要滚动事件
 	mittBus.on('scrollTopEmit', (res: any) => {