Merge remote-tracking branch 'origin/feature/0905_登录注册流程重构' into test
# Conflicts: # src/App.vue # src/layouts/components/siderBar/menu-list.ts # src/views/components/login/index.vue
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<ConfigProvider :locale="zhCN" :theme="redTheme">
|
||||
<router-view v-if="$route.path === '/login' || ['ExploreList', 'ExploreDetail'].includes($route.name)" />
|
||||
<router-view v-if="$route.path === '/login' || ['ExploreList', 'ExploreDetail', 'Trial'].includes($route.name)" />
|
||||
<LayoutBasic v-else />
|
||||
</ConfigProvider>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user