235283e5 by 任超

style:系统标题

1 parent 9cdd6ef4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="navbar-con"> 2 <div class="navbar-con">
3 <div class="navbar" v-theme.background="mTheme"> 3 <div class="navbar" v-theme.background="mTheme">
4 <div class="logo"> 4 <div class="logo">
5 <img v-if="logo" :src="logo" class="header-logo"> 5 {{ title }}
6 </div> 6 </div>
7 <div class="backdrop"> 7 <div class="backdrop">
8 <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" /> 8 <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" />
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
24 </div> 24 </div>
25 </template> 25 </template>
26 <script> 26 <script>
27 import defaultSettings from '@/settings'
27 import { mapGetters } from 'vuex' 28 import { mapGetters } from 'vuex'
28 export default { 29 export default {
29 computed: { 30 computed: {
...@@ -31,8 +32,7 @@ export default { ...@@ -31,8 +32,7 @@ export default {
31 }, 32 },
32 data () { 33 data () {
33 return { 34 return {
34 logo: require('../../image/logo.png'), 35 title: defaultSettings.title
35 noticeList: []
36 } 36 }
37 }, 37 },
38 methods: { 38 methods: {
...@@ -54,6 +54,12 @@ export default { ...@@ -54,6 +54,12 @@ export default {
54 <style lang="scss" scoped> 54 <style lang="scss" scoped>
55 .navbar-con { 55 .navbar-con {
56 position: relative; 56 position: relative;
57
58 .logo {
59 color: #fff;
60 font-size: 26px;
61 font-weight: 700;
62 }
57 } 63 }
58 64
59 .NoticeBar { 65 .NoticeBar {
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
8 </h1> 8 </h1>
9 </router-link> 9 </router-link>
10 <router-link v-else key="expand" class="sidebar-logo-link" to="/"> 10 <router-link v-else key="expand" class="sidebar-logo-link" to="/">
11 <img v-if="logo" :src="logo" class="sidebar-logo">
12 <h1 class="sidebar-title"> 11 <h1 class="sidebar-title">
13 {{ title }} 12 {{ title }}
14 </h1> 13 </h1>
...@@ -20,7 +19,6 @@ ...@@ -20,7 +19,6 @@
20 <script> 19 <script>
21 import defaultSettings from '@/settings' 20 import defaultSettings from '@/settings'
22 const { title } = defaultSettings 21 const { title } = defaultSettings
23 import logonImg from '@/image/logo.png'
24 export default { 22 export default {
25 name: 'SidebarLogo', 23 name: 'SidebarLogo',
26 props: { 24 props: {
...@@ -32,7 +30,6 @@ export default { ...@@ -32,7 +30,6 @@ export default {
32 data () { 30 data () {
33 return { 31 return {
34 title: title, 32 title: title,
35 logo: logonImg
36 } 33 }
37 } 34 }
38 } 35 }
......