diff --git a/src/api/index.js b/src/api/index.js index b12d5f3..8094c5d 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,7 +1,7 @@ import Setting from "@/setting"; const host = Setting.apiBaseURL const uploadURL = Setting.upload.apiURL; -const host2 = 'http://121.37.12.51/' +const host2 = 'http://118.31.167.228/' export default { logins: `users/users/user/login`, //登录 diff --git a/src/components/ueditorPlus/index.vue b/src/components/ueditorPlus/index.vue index 0d0283b..abd69f3 100644 --- a/src/components/ueditorPlus/index.vue +++ b/src/components/ueditorPlus/index.vue @@ -44,7 +44,7 @@ export default { methods: { initEditor () { this.$nextTick(() => { - const host = Setting.isPro || Setting.isZxy ? location.origin : `http://121.37.12.51` + const host = Setting.isPro || Setting.isZxy ? location.origin : `http://118.31.167.228` // eslint-disable-next-line no-undef this.instance = UE.getEditor(this.randomId, { UEDITOR_HOME_URL: Setting.isTest ? '/examination/static/ueditorPlus/' : '/static/ueditorPlus/', diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index e230f7d..6bb74e9 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -132,7 +132,7 @@ export default { initSocket ({ id, account }) { // 实例化socket this.socket = new WebSocket(`${Setting.isTest ? 'ws' : 'wss'}://${Setting.isDev ? '192.168.31.51:9100' : location.host}/nakadai/websocket/${id}/${account}`) - // this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`) + // this.socket = new WebSocket(`ws://118.31.167.228:9100/nakadai/websocket/${id}/${account}`) // 监听socket连接 this.socket.onopen = this.open; // 监听socket错误信息 diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 8c8be42..1be4039 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -127,6 +127,7 @@ export default { const res = await this.$post(this.api.checkUserNameOrWorkNumber) // 如果没有真实姓名,则弹框提示填写 if (!res.hasName) { + this.realNameForm.workNumber = res.workNumber || '' this.realNameVisible = true } }, diff --git a/src/pages/setting/list/info.vue b/src/pages/setting/list/info.vue index 12a03a0..239c36d 100644 --- a/src/pages/setting/list/info.vue +++ b/src/pages/setting/list/info.vue @@ -1,76 +1,51 @@