代合合并

2025-12-16 17:01:48 +08:00
parent d661561403 645122c182
commit 08eaa9f438
10 changed files with 170 additions and 59 deletions
--- a/common/config.js
+++ b/common/config.js
@@ -32,11 +32,17 @@ uni.conf = {
 	baseUrlwws,
 };

+console.log('uni.conf',uni.conf)
+
 export const changeEnv = (env) => {
 	if (env === "test") {
+		let baseUrl = "http://192.168.1.42"
+		// #ifdef H5
+		baseUrl = "/api"
+		// #endif
 		uni.conf = {
 			debug: true,
-			baseUrl: "http://192.168.1.42",
+			baseUrl,
 			phpUrl: 'http://192.168.1.42:8787/api/',
 			phpChatWx: 'ws://192.168.1.42:2348',
 			version: 100,