合并

config/app.js

@@ -6,44 +6,43 @@ let openPlantGrass = '-openPlantGrass-'
 let httpApi
 let httpApiTwo
 let httpApiThree
+let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
+const env = 'dev'; // 开发
-
+// const env = 'prod'; // 生产
-const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
-	
 	case 'prod':
 		httpApi = 'https://shop.lihaink.cn' // 生产
 		httpApiTwo = 'https://nk.lihaink.cn'
 		httpApiThree = 'http://ceshi-oa.lihaink.cn'
 		httpApiFour = 'https://worker-task.lihaink.cn'
+		wsApi = 'wss://shop.lihaink.cn'
 		break;
 	case 'prew':
 		httpApi = 'https://test.shop.lihaink.cn' //预发布环境
 		httpApiTwo = "https://nk.lihaink.cn"
 		httpApiThree = 'http://ceshi-oa.lihaink.cn'
 		httpApiFour = 'https://preview-worker-task.lihaink.cn'
+		wsApi = 'wss://test.shop.lihaink.cn'
 		break;
-		
 	default:
 		httpApi = "https://crmeb-test.shop.lihaink.cn" // 测试
 		httpApiTwo = "https://nk.lihaink.cn"
 		httpApiThree = 'http://ceshi-oa.lihaink.cn'
 		httpApiFour = 'https://ceshi-worker-task.lihaink.cn'
+		httpApiFive = 'https://ceshi-zhibo.lihaink.cn'
+		wsApi = 'wss://crmeb-test.shop.lihaink.cn'
 }
 
-
-
-
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
-// let wsApi = 'ws://192.168.3.20:8324'
+// wsApi = 'ws://192.168.1.17:8324'
-let wsApi = 'wss://shop.lihaink.cn'
+let wsApi_one = 'wss://ceshi-zhibo.lihaink.cn/chat_room'
 
 module.exports = {
-  ENV: env,
+	ENV: env,
 	// 请求域名 格式： https://您的域名
 	// #ifdef MP || APP-PLUS
 	// HTTP_REQUEST_URL: httpApi,
@@ -53,10 +52,10 @@ module.exports = {
 	HTTP_REQUEST_URL_FOUR: httpApiFour,
 	VUE_APP_WS_URL: `${wsApi}?type=user`,
 	// #endif
-	
+
 	// #ifdef H5
 	//H5接口是浏览器地址
-	HTTP_REQUEST_URL_FOUR: httpApiFour|| window.location.protocol + "//" + window.location.host,
+	HTTP_REQUEST_URL_FOUR: httpApiFour || window.location.protocol + "//" + window.location.host,
 	HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host,
 	HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host,
 	// 聊天长连接地址