From 1962b16d7bdd837de56e17265642e4a6606c8f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Wed, 12 Jun 2024 11:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/0-conf.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/framework/0-conf.js b/framework/0-conf.js
index 400bb85..c3c1b5b 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -6,22 +6,18 @@ const proxyApi = "/api"
 // const proxyApi = 'http://192.168.2.42:9889/cashierService' // 王伟
 // const proxyApi = 'http://192.168.2.74:9888/cashierService' // 帆哥
 // const proxyApiwws = 'ws://192.168.2.74:9888/cashierService' // 测试
-// const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
-// const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
-
+const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
+const proxyApiwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
 // #endif
 
 // #ifdef H5
 const baseUrl = debug ? proxyApi : "https://wxcashiertest.sxczgkj.cn/cashierService"
-const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService' 
+const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
 // #endif
+
 // #ifdef APP || MP-WEIXIN
-const baseUrl = 'https://cashier.sxczgkj.cn/cashierService'// 线上
-const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上
-// const baseUrl = 'http://192.168.2.42:9888/cashierService'// 测试-w
-// const baseUrlwws ='wss://192.168.2.42:9999/netty' // 测试-w
-// const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
-// const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/netty' // 测试
+const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上
+const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上
 // #endif
 
 // import VConsole from "./vConsole.js"