修改冲突

2024-10-21 16:55:58 +08:00
parent c6b4e503dc ae11d40951
commit 390f286140
35 changed files with 681 additions and 343 deletions
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -16,10 +16,11 @@ import {
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 // 测试服
-// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+// let baseUrl = 'http://192.168.1.15:8000'
 // 王伟本地测
 // let baseUrl = '/ww'
-let baseUrl = 'http://192.168.1.15:8000'
+// let baseUrl = 'http://192.168.1.15:8000'
 
 // 多少 ms 以内， 不提示loading 
 const loadingShowTime = 200