Skip to content

Commit d5347ca

Browse files
committed
brandName bug
1 parent 76e469f commit d5347ca

File tree

8 files changed

+18
-20
lines changed

8 files changed

+18
-20
lines changed

web/public/index.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,7 @@
218218
window._CONFIG['defaultUploadType'] = 'qiniu' //local本地 qiniu七牛
219219
window._CONFIG['qn_base'] = "http://open.qn.teaching.vip/" //七牛云存储地址
220220
window._CONFIG['qn_area'] = 'z0' //七牛区域 z0:华东 z1:华北 z2:华南 na0:北美 as0:东南亚 cn-east-2:华东-浙江2
221-
window._CONFIG['brandName'] = "Teaching" //品牌名
222-
window._CONFIG['brandDesc'] = "Teaching开源Steam教学平台" //品牌介绍
223-
window._CONFIG['beian'] = "沪ICP备20009532号-4" //备案号
224221
localStorage.setItem("CONFIG", JSON.stringify(window._CONFIG))
225-
window.document.title = window._CONFIG['brandName']
226222
</script>
227223
</head>
228224

web/src/components/layouts/TabLayout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
165165
// update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
166166
changeTitle(title) {
167-
let projectTitle = window._CONFIG['brandName'] + " 教学平台"
167+
let projectTitle = this.$store.getters.sysConfig.brandName
168168
// 首页特殊处理
169169
if (this.$route.path === indexKey) {
170170
document.title = projectTitle

web/src/components/layouts/UserLayout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
mixins: [mixinDevice],
3838
data () {
3939
return {
40-
brandName: window._CONFIG['brandName']
40+
brandName: this.$store.getters.sysConfig.brandName
4141
}
4242
},
4343
mounted () {

web/src/components/page/GlobalFooter.vue

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<template>
22
<div class="footer">
3-
<div class="links">
4-
<a href="http://teaching.vip" target="_blank">首页</a>
5-
<a href="https://github.com/open-scratch/teaching" target="_blank">
6-
<a-icon type="github"/>
7-
</a>
8-
</div>
93
<div class="copyright">
104
Copyright
115
<a-icon type="copyright"/>
12-
2020 <span>{{brandName}}</span>
6+
2020
7+
<span>{{brandName}}</span>
8+
<a-divider type="vertical"></a-divider>
9+
<div class="links">
10+
<a href="https://github.com/open-scratch/teaching" target="_blank">
11+
<a-icon type="github"/>
12+
</a>
13+
</div>
1314
</div>
15+
1416
</div>
1517
</template>
1618

@@ -19,7 +21,7 @@
1921
name: "LayoutFooter",
2022
data() {
2123
return {
22-
brandName:window._CONFIG['brandName']
24+
brandName: this.$store.getters.sysConfig.brandName
2325
}
2426
},
2527
}
@@ -33,7 +35,7 @@
3335
3436
.links {
3537
margin-bottom: 8px;
36-
38+
display: inline;
3739
a {
3840
color: rgba(0, 0, 0, .45);
3941

web/src/components/page/GlobalHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
headerIndexRight: {},
9898
topSmenuStyle: {}
9999
},
100-
brandName: window._CONFIG['brandName']
100+
brandName: this.$store.getters.sysConfig.brandName
101101
}
102102
},
103103
watch: {

web/src/components/tools/Logo.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
data () {
2424
return {
25-
brandName: window._CONFIG['brandName']
25+
brandName: this.$store.getters.sysConfig.brandName
2626
}
2727
},
2828
}

web/src/views/dashboard/Index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<h1>欢迎使用{{brandName}}教学系统</h1>
3+
<h1>欢迎使用{{brandName}}</h1>
44
</div>
55
</template>
66

@@ -14,7 +14,7 @@
1414
},
1515
data() {
1616
return {
17-
brandName: window._CONFIG['brandName']
17+
brandName: this.$store.getters.sysConfig.brandName
1818
}
1919
},
2020
created() {

web/src/views/home/modules/UserEnter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
2020
export default {
2121
data() {
2222
return {
23-
brandName: window._CONFIG['brandName'],
23+
brandName: this.$store.getters.sysConfig.brandName,
2424
token: '',
2525
}
2626
},

0 commit comments

Comments
 (0)