From 5d6a42044726d7529b6d884c8419cce40ee9f0f1 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 15 Dec 2023 16:38:55 +0800 Subject: [PATCH] fix --- .env | 2 +- .env.production | 2 +- .env.test | 2 +- .env.test_build | 2 +- src/tool/https.js | 5 ++- src/views/trialApproval.vue | 81 ++++++++++++++++++++++++++++++++++--- 6 files changed, 83 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 53d90f69..2736cdc9 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ # NODE_ENV = 'production' NODE_ENV = 'development' -VUE_APP_BASE_URL = 'http://www.aida.com.hk' +VUE_APP_BASE_URL = 'http://18.167.251.121:10086' diff --git a/.env.production b/.env.production index abdf5d63..6457fbcb 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,2 @@ NODE_ENV = 'production' -VUE_APP_BASE_URL = 'http://www.aida.com.hk' +VUE_APP_BASE_URL = 'http://18.167.251.121:10086' diff --git a/.env.test b/.env.test index 261a1f5b..9c6509d7 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,3 @@ NODE_ENV = 'development' -VUE_APP_BASE_URL = 'http://18.167.251.121:10086' +VUE_APP_BASE_URL = 'http://18.167.251.121:10088' # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' diff --git a/.env.test_build b/.env.test_build index 75d587fe..130eaa41 100644 --- a/.env.test_build +++ b/.env.test_build @@ -1,4 +1,4 @@ NODE_ENV = 'production' # VUE_APP_BASE_URL = 'https://aida.com.hk/test' -VUE_APP_BASE_URL = 'http://18.167.251.121:10086' +VUE_APP_BASE_URL = 'http://18.167.251.121:10088' diff --git a/src/tool/https.js b/src/tool/https.js index 2f3c2019..c150a678 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -164,9 +164,10 @@ export const Https = { trialOrderList:`/api/account/trialOrderList`,//获取审批列表 switchIsAutoApproval:`/api/account/switchIsAutoApproval`,//切换是否自动审批 - switchIsAutoApproval:`/api/account/getIsAutoApproval`,//获取是否自动审批 + getIsAutoApproval:`/api/account/getIsAutoApproval`,//获取是否自动审批 trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批 - + trialOrderRefuse:`/api/account/trialOrderRefuse`,//拒绝审批 + }, axiosGet(url,config) { diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue index cee9f873..3565740d 100644 --- a/src/views/trialApproval.vue +++ b/src/views/trialApproval.vue @@ -9,6 +9,10 @@