Merge branch 'master' into deploy
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
<router-view :key="key" />
|
<router-view :key="key" />
|
||||||
</keep-alive>
|
</keep-alive>
|
||||||
</transition>
|
</transition>
|
||||||
|
<el-backtop :bottom="50" :right="40"><i class="el-icon-caret-top" /></el-backtop>
|
||||||
<div v-if="$store.state.settings.showFooter" id="el-main-footer">
|
<div v-if="$store.state.settings.showFooter" id="el-main-footer">
|
||||||
<span v-html="$store.state.settings.footerTxt" />
|
<span v-html="$store.state.settings.footerTxt" />
|
||||||
<span> ⋅ </span>
|
<span> ⋅ </span>
|
||||||
|
|||||||
Reference in New Issue
Block a user