From 57c777e1dadae35ed4eeb882ccadb6ed8c858690 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Sat, 12 Jan 2019 15:39:15 +0800 Subject: [PATCH] =?UTF-8?q?[bug=20fix]=20=E8=B0=83=E7=94=A8=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=9C=B0=E5=9D=80=E4=B8=8D=E8=83=BD=E5=86=99=E6=AD=BB?= =?UTF-8?q?=20http=EF=BC=8C=E4=B8=8D=E7=84=B6https=E7=9A=84=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=B0=B1=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E4=BA=86=E3=80=82=E6=94=B9=E4=B8=BA=20window?= =?UTF-8?q?.location.protocol//window.location.hostname:window.location.po?= =?UTF-8?q?rt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/axios.js | 2 +- src/views/Chain.vue | 3 ++- src/views/Network.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/axios.js b/src/services/axios.js index e544695..413e834 100644 --- a/src/services/axios.js +++ b/src/services/axios.js @@ -2,4 +2,4 @@ import axios from 'axios' // import app from './app' // 控制台应当默认访问控制台所在主机(localhost 或者 window.location.hostname)的 TIC后台,或者让用户在控制台启动时,自己设置一个节点主机。 -axios.defaults.baseURL = `http://${window.location.hostname}:8888/api/` +axios.defaults.baseURL = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/api/` diff --git a/src/views/Chain.vue b/src/views/Chain.vue index af9c729..6395135 100644 --- a/src/views/Chain.vue +++ b/src/views/Chain.vue @@ -89,10 +89,11 @@ import Vue from 'vue' import store from '../store' import VueSocketio from 'vue-socket.io' import io from 'socket.io-client' +import axios from 'axios' const { mapState, mapGetters, mapActions, mapMutations } = createNamespacedHelpers('chain') -Vue.use(VueSocketio, io(`http://${window.location.hostname}:8888/api/`), store) // todo: luk: 整个控制台应当依赖于同一个全局的节点地址变量。 +Vue.use(VueSocketio, io(axios.defaults.baseURL), store) export default { name: 'Chain', diff --git a/src/views/Network.vue b/src/views/Network.vue index 555ce3b..9777a9e 100644 --- a/src/views/Network.vue +++ b/src/views/Network.vue @@ -38,7 +38,7 @@ {{ props.item.index }} {{ props.item.accessPoint }} {{ props.item.ownerAddress }} - {{ props.item.brokenCount }} + {{ props.item.status }}