diff --git a/.env.development b/.env.development index a0892d0..f755446 100644 --- a/.env.development +++ b/.env.development @@ -2,11 +2,11 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://192.168.1.107:8080' +VUE_APP_BASE_API = 'http://192.168.1.50:8080' # VUE_APP_BASE_API = 'https://plus.hwms.shop' # socket 连接地址 -VUE_APP_WS_URL = 'ws://192.168.1.107:8080' +VUE_APP_WS_URL = 'ws://192.168.1.50:8080' # VUE_APP_WS_URL = 'ws://plus.hwms.shop' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/src/views/system/service/index.vue b/src/views/system/service/index.vue index 587f864..f36024c 100644 --- a/src/views/system/service/index.vue +++ b/src/views/system/service/index.vue @@ -226,7 +226,7 @@ export default { serviceLoginApi(id) .then(res => { Cookies.set('SerToken', res.data.token) - window.open(SettingMer.httpUrl + res.data.url) + window.open(location.origin + res.data.url) }) .catch(res => { this.$message.error(res.message)