Merge branch 'feature/url' of duanxiaoduan/tmr-admin into develop

src/api/common.js

@@ -116,7 +116,7 @@ export function GetAccount(data) {
 
 export function postJson(url,data) {
   return request({
-    url: process.env.VUE_APP_BASE_API + url,
+    url: url,
     method: 'post',
     timeout: 600000,
     data
@@ -134,7 +134,7 @@ export function postJson2(url,data) {
 
 export function getJson(url,data) {
   return request({
-    url: process.env.VUE_APP_BASE_API + url + data,
+    url: url + data,
     method: 'get'
   })
 }

src/utils/request.js

@@ -12,7 +12,7 @@ if (DoMainString) {
 console.log(URL,'===========URL')
 
 if(URL.indexOf('/')==0 && URL.length==1){
-  URL= window.location.protocol + "//"+window.location.host+aa
+  URL= window.location.protocol + "//"+window.location.host+URL
 }
 
 const service = axios.create({