diff --git a/.env.development b/.env.development index 15dbabb..03b4db5 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,6 @@ ENV = 'development' # base api -VUE_APP_BASE_API = https://sstt.115.langye.net -#VUE_APP_BASE_API = http://sstt.ali251.langye.net/ +#VUE_APP_BASE_API = https://sstt.115.langye.net +VUE_APP_BASE_API = http://sstt.ali251.langye.net/ VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file diff --git a/.env.staging b/.env.staging index a8793a0..8021542 100644 --- a/.env.staging +++ b/.env.staging @@ -4,5 +4,6 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = '/stage-api' +VUE_APP_BASE_API = http://sstt.ali251.langye.net/ +VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file diff --git a/src/api/common.js b/src/api/common.js new file mode 100644 index 0000000..8b213c6 --- /dev/null +++ b/src/api/common.js @@ -0,0 +1,10 @@ +import request from "@/utils/request"; + +export function getVillages (params,isLoading) { + return request({ + url: "/api/admin/chart/villages", + method: "get", + params, + isLoading + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 315dcd4..6c23ca5 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,7 +14,7 @@ let loading ; const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 10000, // request timeout + timeout: 20000, // request timeout isLoading:true }) diff --git a/src/views/area/index.vue b/src/views/area/index.vue new file mode 100644 index 0000000..9628f1b --- /dev/null +++ b/src/views/area/index.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue index b5eab59..32184f3 100644 --- a/src/views/customer/component/addCustomer.vue +++ b/src/views/customer/component/addCustomer.vue @@ -185,6 +185,7 @@