From f74defb124e2ee985c7a713c9e47b90062cfa555 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 19 Aug 2021 17:51:26 +0800
Subject: [PATCH] 修改

---
 pages/videoCall/videoCall.nvue |   19 ++++++++++++++-----
 pages/groupChat/groupChat.vue  |    8 +-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pages/groupChat/groupChat.vue b/pages/groupChat/groupChat.vue
index 762c7b1..3166af6 100644
--- a/pages/groupChat/groupChat.vue
+++ b/pages/groupChat/groupChat.vue
@@ -203,13 +203,7 @@
 								}
 							}
 
-							that.dataListTXL = [];
-							for (var i = 0; i < 100; i++) {
-								that.dataListTXL.push(resdata[0])
-							}
-
-
-							// that.dataListTXL = resdata;
+							that.dataListTXL = resdata;
 						}
 					})
 				} else if (this.current == 2) {
diff --git a/pages/videoCall/videoCall.nvue b/pages/videoCall/videoCall.nvue
index 18b5c50..4b6805a 100644
--- a/pages/videoCall/videoCall.nvue
+++ b/pages/videoCall/videoCall.nvue
@@ -439,10 +439,10 @@
 				// if (val == "Mains") { //视频发起人进入
 				console.log('视频发起人进入');
 				console.log(this.uid, '进入检测uid')
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
+				// uni.showLoading({
+				// 	title: '加载中',
+				// 	mask: true
+				// });
 				//加入房间
 				console.log('room', this.channel, 'useid', this.uid)
 				await RtcModule.joinChannel({
@@ -477,7 +477,16 @@
 				// RtcModule.leaveChannel((res) => {});
 				console.log("等待时候挂断");
 				uni.navigateBack();
-				this.closeAll();
+				// this.closeAll();
+				uni.request({
+					url: this.$store.state.api + '/pushMsg/closeVideoCall',
+					data: data,
+					success: (res) => {
+						// RtcModule.leaveChannel((res) => {});
+						// this.closeAll();
+						console.log(res, '成功关闭');
+					}
+				})
 			},
 			joinit() { //接受进入视频
 				// 传输接受的值

--
Gitblit v1.9.3