diff --git a/.env.development b/.env.development index 8224cab..a697e09 100644 --- a/.env.development +++ b/.env.development @@ -3,11 +3,11 @@ ENV = 'development' # http://192.168.1.43:8324/admin # http://mer.crmeb.net/admin # 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/service/customer/index.vue b/src/views/service/customer/index.vue index 64ca654..7585142 100644 --- a/src/views/service/customer/index.vue +++ b/src/views/service/customer/index.vue @@ -220,7 +220,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);