提交 784387eb authored 作者: 王鹏飞's avatar 王鹏飞

Merge branch 'master' into sofia

...@@ -4,7 +4,8 @@ module.exports = { ...@@ -4,7 +4,8 @@ module.exports = {
apiBaseURL: 'https://learn-api2.ezijing.com', apiBaseURL: 'https://learn-api2.ezijing.com',
others: { others: {
url: '/app/learn/course', url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/sofia/login/index' loginUrl: 'https://login2.ezijing.com/sofia/login/index',
messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
}, },
webpack: { webpack: {
externals: { externals: {
......
...@@ -5,7 +5,8 @@ module.exports = { ...@@ -5,7 +5,8 @@ module.exports = {
// apiBaseURL: '/', // apiBaseURL: '/',
others: { others: {
url: '/app/learn/course', url: '/app/learn/course',
loginUrl: 'https://login.ezijing.com/sofia/login/index' loginUrl: 'https://login.ezijing.com/sofia/login/index',
messageBaseURL: ''
}, },
webpack: { webpack: {
externals: { externals: {
......
...@@ -5,7 +5,8 @@ module.exports = { ...@@ -5,7 +5,8 @@ module.exports = {
// apiBaseURL: '/', // apiBaseURL: '/',
others: { others: {
url: '/app/learn/course', url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/sofia/login/index' loginUrl: 'https://login2.ezijing.com/sofia/login/index',
messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
}, },
isUploadStatic: false, isUploadStatic: false,
webpack: { webpack: {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -72,16 +72,17 @@ ...@@ -72,16 +72,17 @@
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },
"dependencies": { "dependencies": {
"@ckeditor/ckeditor5-build-classic": "^24.0.0", "@ckeditor/ckeditor5-build-classic": "^25.0.0",
"@ckeditor/ckeditor5-vue2": "^1.0.5", "@ckeditor/ckeditor5-vue2": "^1.0.5",
"axios": "^0.21.0", "@ezijing/web-message-sdk": "^0.2.1",
"core-js": "^3.8.1", "axios": "^0.21.1",
"core-js": "^3.9.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"element-ui": "^2.14.1", "element-ui": "^2.15.1",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"qrcode.vue": "^1.7.0", "qrcode.vue": "^1.7.0",
"qs": "^6.9.4", "qs": "^6.9.6",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.2", "vue-i18n": "^8.22.2",
"vue-loader": "^15.9.5", "vue-loader": "^15.9.5",
......
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
<div class="text-title" @click="setStatus">{{ $t('components.learnSysLayout.navigation.title') }}</div> <div class="text-title" @click="setStatus">{{ $t('components.learnSysLayout.navigation.title') }}</div>
</div> </div>
<div class="nav-right"> <div class="nav-right">
<div class="notify" @click="goNotify()"> <div class="nav-message"></div>
<!-- <div class="notify" @click="goNotify()">
{{ $t('components.learnSysLayout.navigation.tip') }} {{ $t('components.learnSysLayout.navigation.tip') }}
<div class="num" v-if="this.$store.getters.myMsg != 0">{{ this.$store.getters.myMsg }}</div> <div class="num" v-if="this.$store.getters.myMsg != 0">{{ this.$store.getters.myMsg }}</div>
</div> </div> -->
<!-- <language-switch /> --> <!-- <language-switch /> -->
</div> </div>
</div> </div>
...@@ -16,8 +17,8 @@ ...@@ -16,8 +17,8 @@
<script> <script>
import LanguageSwitch from '@/components/languageSwitch/index.vue' import LanguageSwitch from '@/components/languageSwitch/index.vue'
import cAction from '../../action' // import cAction from '../../action'
import Message from '@ezijing/web-message-sdk'
export default { export default {
components: { LanguageSwitch }, components: { LanguageSwitch },
data() { data() {
...@@ -26,14 +27,15 @@ export default { ...@@ -26,14 +27,15 @@ export default {
} }
}, },
mounted() { mounted() {
cAction.Other.getNavMsg() // cAction.Other.getNavMsg()
.then(data => { // .then(data => {
this.$store.commit('myMsg', data.num) // this.$store.commit('myMsg', data.num)
}) // })
.catch(e => { // .catch(e => {
this.$message.error(e.message) // this.$message.error(e.message)
}) // })
.finally(() => {}) // 新版通知
Message({ container: '.nav-message', source: 'SOFIA_WEB', baseURL: webConf.others.messageBaseURL })
}, },
methods: { methods: {
goNotify() { goNotify() {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论