From ee6e8272323e836af654fe40cbd35ff149f5a7d4 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 24 Jul 2024 22:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js        |  2 +-
 pages.json              | 18 +++++++++++++++---
 pages/msg/im.vue        |  9 ++-------
 utils/websocketUtils.js |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/common/config.js b/common/config.js
index 311e402..8f34f2a 100644
--- a/common/config.js
+++ b/common/config.js
@@ -10,7 +10,7 @@
 // const ROOTPATH = "http://1.92.152.160/sqx_fast";
 // const ROOTPATH1 = "http://1.92.152.160/sqx_fast";
 
-const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/websocket/";
+const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/chatSocket/";
 const ROOTPATH = "https://sausers.blxinchuang.com/sqx_fast";
 const ROOTPATH1 = "https://sausers.blxinchuang.com/sqx_fast";
 
diff --git a/pages.json b/pages.json
index 7c96f99..7f20640 100644
--- a/pages.json
+++ b/pages.json
@@ -278,20 +278,32 @@
 		{
 			"path": "pages/msg/index",
 			"style": {
-				"navigationBarTitleText": "消息"
+				"navigationBarTitleText": "消息",
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false
+				}
 			}
 		},
 		{
 			"path": "pages/msg/im",
 			"style": {
-				"navigationBarTitleText": "消息"
+				"navigationBarTitleText": "消息",
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false
+				}
 			}
 		},
 		{
 			"path": "pages/msg/message",
 			"style": {
 				"navigationBarTitleText": "系统消息",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false
+				}
 			}
 		},
 		// #ifdef H5
diff --git a/pages/msg/im.vue b/pages/msg/im.vue
index 78dd1ca..bf30984 100644
--- a/pages/msg/im.vue
+++ b/pages/msg/im.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view style="width: 100%;padding-bottom: 140rpx;">
+		<view style="width: 100%;padding-bottom: 140rpx;padding-top: 40rpx;">
 			<view style="display: flex;flex-direction: column;" v-for="(item,index) in ListItem" :key='index' >
 				<view style="margin-top: 15rpx;width: 100%;text-align: center;font-size: 26rpx;color: #999999;">
 					{{item.createTime}}</view>
@@ -197,18 +197,13 @@
 				uni.showLoading({
 					title: '连接中...'
 				})
-				// console.log(userId,'*******************',websocketUtils.getWsBaseUrl())
 				uni.connectSocket({
-					// url: 'ws://192.168.1.17:8881/gameTeamChat/' + userId + '_' + this.teamId,
-					// url: 'wss://game.shengqianxiong.com.cn/wss/gameTeamChat/' + userId + '_' + this.teamId,
-					// url: 'ws://192.168.1.17:8180/sqx_fast/chatSocket/' + userId,
-					url: 'wss://sausers.blxinchuang.com/wss/websocket/' + userId,
+					url: websocketUtils.getWsBaseUrl() + userId,
 					data() {
 						return {
 							msg: 'Hello'
 						}
 					},
-					// protocols: ['protocol1'],
 					header: {
 						'content-type': 'application/json'
 					},
diff --git a/utils/websocketUtils.js b/utils/websocketUtils.js
index 6240ccb..477f5eb 100644
--- a/utils/websocketUtils.js
+++ b/utils/websocketUtils.js
@@ -587,7 +587,7 @@ export function uploadFileUrl(){
 }
 
 export function getWsBaseUrl(){
-  return config('APIHOST');
+  return config('WSHOST1');
 }