From a0925a4ec74f3f8c47fb7bb1b6c49a5e91f2db7b Mon Sep 17 00:00:00 2001
From: lr <axhang1015@163.com>
Date: Fri, 21 Feb 2025 17:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/App.vue                              |  37 -------
 jiuyi2/common/js/config.js                  |   2 +-
 jiuyi2/common/js/util.js                    |   1 +
 jiuyi2/components/footerMenu/footerMenu.vue |  49 +++++----
 jiuyi2/components/news/groupList.vue        |   2 +-
 jiuyi2/components/news/msgList.vue          | 115 +++++++++++++-------
 jiuyi2/components/shop/detail/makeOrder.vue |   4 +-
 jiuyi2/pages/mine/setting/usePay.vue        |   2 +-
 jiuyi2/pages/mine/switch-accounts/index.vue |   2 +-
 jiuyi2/pages/news/chatGroup.vue             |   2 +-
 jiuyi2/pages/news/news.vue                  |  22 +++-
 jiuyi2/vite.config.js                       |   4 +-
 12 files changed, 134 insertions(+), 108 deletions(-)

diff --git a/jiuyi2/App.vue b/jiuyi2/App.vue
index 7b35e690..edff6b17 100644
--- a/jiuyi2/App.vue
+++ b/jiuyi2/App.vue
@@ -14,8 +14,6 @@ onLaunch(() => {
 	getUserinfo()
 	// 获取系统配置
 	getConfig()
-	// 获取未读消息数量
-	getNoReadNum()
 })
 
 // 获取用户信息
@@ -53,41 +51,6 @@ function getConfig() {
 		}
 	})
 }
-
-// 获取未读消息数量
-async function getNoReadNum() {
-	// uni.removeTabBarBadge({
-	// 	index: 2,
-	// 	text: "",
-	// });
-	// api.getNoReadNum().then(rs => {
-	// 	if (rs.code == 200) {
-	// 		uni.setTabBarBadge({
-	// 			index: 0,
-	// 			text: "11",
-	// 		});
-	// 	}
-	// })
-
-	// uni.setTabBarBadge({
-	// 	index: 2,
-	// 	text: "11",
-	// });
-
-	// const res = await uni.request({ url: 'API_URL' });
-	// const count = res.data.unread;
-
-
-	// setTimeout(() => {
-	// 	uni.setTabBarBadge({
-	// 		index: 1,
-	// 		text: '10',
-	// 		success: function () {
-	// 			console.log(11111);
-	// 		},
-	// 	})
-	// }, 1000)
-}
 </script>
 
 <style lang="scss">
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 6522293b..2b4096ae 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -7,7 +7,7 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-	host: 'https://b433d23.r24.cpolar.top/',
+	// host: 'https://1e49a851.r24.cpolar.top/',
 	// #endif
 	// 支付方式配置
 	payType: {
diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js
index ff57358a..3961d7bd 100644
--- a/jiuyi2/common/js/util.js
+++ b/jiuyi2/common/js/util.js
@@ -1427,6 +1427,7 @@ const util = {
 				uni.$emit('login')
 
 				setTimeout(() => {
+					util.loginTencent(userinfo)
 					uni.reLaunch({
 						url: '/pages/index/index'
 					})
diff --git a/jiuyi2/components/footerMenu/footerMenu.vue b/jiuyi2/components/footerMenu/footerMenu.vue
index a42a390f..98132eb0 100644
--- a/jiuyi2/components/footerMenu/footerMenu.vue
+++ b/jiuyi2/components/footerMenu/footerMenu.vue
@@ -138,6 +138,12 @@ const showMenu = computed(() => {
 // 未读数量
 const noReadNum = ref(0)
 
+const getReadNum = () => {
+	getNoReadNum()
+}
+
+defineExpose({ getReadNum })
+
 // 加载完成之后
 onMounted(() => {
 	// 开启监听
@@ -153,7 +159,7 @@ onMounted(() => {
 	// proxy.$refs.alert.open()
 
 })
-onLoad(()=>{ 
+onLoad(() => {
 	// 获取未读消息数量
 	getNoReadNum()
 })
@@ -228,7 +234,7 @@ function getNoReadNum() {
 	}
 
 	// #ifdef APP
-	const unreadCount = uni.$chat.getTotalUnreadMessageCount(); 
+	const unreadCount = uni.$chat.getTotalUnreadMessageCount();
 	noReadNum.value = +unreadCount > 99 ? '99+' : unreadCount;
 	// #endif
 
@@ -245,7 +251,7 @@ function getNoReadNum() {
 
 				<view class="option" :class="{ active: item.page === page }" v-if="item.type == 'option'">
 					<text class="text">{{ item.name }}</text>
-					<span class="pot" v-if="item.page == 'news' && noReadNum != 0">{{ noReadNum }}</span>
+					<view class="pot" v-if="item.page == 'news' && noReadNum != 0">{{ noReadNum }}</view>
 				</view>
 
 				<view class="middle" v-else-if="item.type === 'middle'">
@@ -351,23 +357,28 @@ $boderSize: 2rpx;
 			color: #999;
 		}
 
-		.option {
-			position: relative;
+	}
 
-			.pot {
-				position: absolute;
-				top: -16rpx;
-				right: -30rpx;
-				height: 24rpx;
-				min-width: 24rpx;
-				line-height: 24rpx;
-				border-radius: 24rpx;
-				background: #FF6B17;
-				color: #fff;
-				font-size: 20rpx;
-				padding: 4rpx;
-				text-align: center;
-			}
+	.option {
+		position: relative;
+		z-index: 1;
+
+		.pot {
+			position: absolute;
+			top: -16rpx;
+			right: -30rpx;
+			height: 24rpx;
+			/* #ifndef APP-NVUE */
+			min-width: 24rpx;
+			/* #endif */
+			line-height: 24rpx;
+			border-radius: 24rpx;
+			background: #FF6B17;
+			color: #fff;
+			font-size: 20rpx;
+			padding: 4rpx;
+			text-align: center;
+			z-index: 11;
 		}
 	}
 
diff --git a/jiuyi2/components/news/groupList.vue b/jiuyi2/components/news/groupList.vue
index d6f09c98..6a4da375 100644
--- a/jiuyi2/components/news/groupList.vue
+++ b/jiuyi2/components/news/groupList.vue
@@ -52,7 +52,7 @@
 
 	// 移除监听
 	function removeListener() {
-		uni.$chat.off(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED);
+		uni.$chat.off(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED,()=>{});
 	}
 
 	// 获取群组列表
diff --git a/jiuyi2/components/news/msgList.vue b/jiuyi2/components/news/msgList.vue
index a003a04e..48b77f75 100644
--- a/jiuyi2/components/news/msgList.vue
+++ b/jiuyi2/components/news/msgList.vue
@@ -93,28 +93,66 @@ function addListener() {
 
 // 移除监听
 function removeListener() {
-	// #ifdef APP
-	uni.$chat.off(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED);
-	// #endif
+	uni.$chat.off(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED, () => { });
 }
 
 // 获取消息列表
 function getList() {
-	api.news.getMessageList({
-		query: {
-			userId: userinfo.value.id,
-		}
-	}).then(rs => {
-		if (rs.code == 200) {
-			// list.data = handleList(rs.data);
-			list.data = handleList(JSON.parse(rs.msg).SessionItem);
-			return
-		}
-		util.alert({
-			content: rs.msg,
-			showCancel: false,
+	// 验证sdk是否准备完毕
+	let isReady = uni.$chat.isReady();
+	if (!isReady) {
+		setTimeout(function () {
+			getList();
+		}, 800);
+		return
+	}
+
+	uni.$emit('updateNum', {})
+
+	uni.$chat.getConversationList().then(rs => {
+		let res = rs.data.conversationList
+		let arr = []
+		res.forEach(item => {
+			let obj = {}
+			obj.type = item.type;
+			obj.chatText = item.lastMessage.messageForShow;
+			obj.MsgTime = handleDate(item.lastMessage.lastTime);
+			obj.unreadCount = item.unreadCount;
+
+			if (item.type == 'C2C') {
+				obj.avatar = item.userProfile.avatar;
+				obj.name = item.userProfile.nick;
+				obj.userID = item.userProfile.userID;
+			} else if (item.type == 'GROUP') {
+				obj.avatar = item.groupProfile.avatar;
+				obj.name = item.groupProfile.name;
+				obj.num = item.groupProfile.memberCount;
+				obj.groupID = item.groupProfile.groupID;
+			}
+			arr.push(obj)
 		})
+
+		list.data = arr;
+
 	})
+
+	// api.news.getMessageList({
+	// 	query: {
+	// 		userId: userinfo.value.id,
+	// 	}
+	// }).then(rs => {
+	// 	if (rs.code == 200) {
+	// 		let msg = JSON.parse(rs.msg);
+
+	// 		list.data = handleList(msg.SessionItem);
+
+	// 		return
+	// 	}
+	// 	util.alert({
+	// 		content: rs.msg,
+	// 		showCancel: false,
+	// 	})
+	// })
 }
 
 /**
@@ -130,27 +168,28 @@ function handleList(list) {
 		}, 800);
 		return
 	}
+	if (list) {
+		list.forEach(item => {
+			item.MsgTime = handleDate(item.MsgTime)
 
-	list.forEach(item => {
-		item.MsgTime = handleDate(item.MsgTime)
+			let type = item.Type == 1 ? `C2C${item.To_Account}` : `GROUP${item.GroupId}`;
+			uni.$chat.getConversationProfile(type).then(rs => {
+				let res = rs.data.conversation;
 
-		let type = item.Type == 1 ? `C2C${item.To_Account}` : `GROUP${item.GroupId}`;
-		uni.$chat.getConversationProfile(type).then(rs => {
-			let res = rs.data.conversation;
-
-			item.chatText = res.lastMessage.messageForShow;
-			item.unreadCount = res.unreadCount;
-			if (item.Type == 1) {
-				item.avatar = res.userProfile.avatar;
-				item.name = res.userProfile.nick;
-			} else if (item.Type == 2) {
-				item.avatar = res.groupProfile.avatar;
-				item.name = res.groupProfile.name;
-				item.num = res.groupProfile.memberCount;
-			}
+				item.chatText = res.lastMessage.messageForShow;
+				item.unreadCount = res.unreadCount;
+				if (item.Type == 1) {
+					item.avatar = res.userProfile.avatar;
+					item.name = res.userProfile.nick;
+				} else if (item.Type == 2) {
+					item.avatar = res.groupProfile.avatar;
+					item.name = res.groupProfile.name;
+					item.num = res.groupProfile.memberCount;
+				}
 
+			})
 		})
-	})
+	}
 
 	return list
 }
@@ -178,15 +217,15 @@ function handleList(list) {
 function handleChat(item) {
 	let param = {};
 	// 单聊
-	if (item.groupId == null) {
+	if (item.type == 'C2C') {
 		param.type = 'C2C'
 		param.name = `${item.name}`
-		param.msgId = `${item.To_Account}`
+		param.msgId = `${item.userID}`
 	} else {
 		// 群聊
 		param.type = 'GROUP'
 		param.name = `${item.name}`
-		param.msgId = `${item.GroupId}`
+		param.msgId = `${item.groupID}`
 		param.num = `${item.num}`
 	}
 
@@ -216,7 +255,7 @@ function delMsg(item) {
 		return
 	}
 
-	let conversationId = item.Type == 1 ? `C2C${item.To_Account}` : `GROUP${item.GroupId}`;
+	let conversationId = item.Type == 1 ? `C2C${item.userID}` : `GROUP${item.groupID}`;
 
 	uni.$chat.deleteConversation(conversationId).then(rs => {
 		getList()
@@ -234,7 +273,7 @@ function setRead(item) {
 		return
 	}
 
-	let conversationId = item.Type == 1 ? `C2C${item.To_Account}` : `GROUP${item.GroupId}`;
+	let conversationId = item.Type == 1 ? `C2C${item.userID}` : `GROUP${item.groupID}`;
 	uni.$chat.setMessageRead({
 		conversationID: conversationId,
 	}).then(rs => {
diff --git a/jiuyi2/components/shop/detail/makeOrder.vue b/jiuyi2/components/shop/detail/makeOrder.vue
index e1339d0c..d297c5e0 100644
--- a/jiuyi2/components/shop/detail/makeOrder.vue
+++ b/jiuyi2/components/shop/detail/makeOrder.vue
@@ -226,7 +226,7 @@
 			color: #333;
 			background-color: #F7F7F7;
 			border-radius: 10rpx;
-			transition: .3s;
+			// transition: .3s;
 			border: 2rpx solid #F7F7F7;
 
 			.text {}
@@ -244,7 +244,7 @@
 
 			// 不能选
 			&.disabled {
-				background-color: F7F7F7;
+				background-color: #F7F7F7;
 
 				.txt {
 					color: #999;
diff --git a/jiuyi2/pages/mine/setting/usePay.vue b/jiuyi2/pages/mine/setting/usePay.vue
index 9987d642..dd2db1ac 100644
--- a/jiuyi2/pages/mine/setting/usePay.vue
+++ b/jiuyi2/pages/mine/setting/usePay.vue
@@ -36,7 +36,7 @@
 		screenHeight,
 		bottomSafeAreaHeight
 	} from '@/components/public/Mixins.js'
-	import JyCommonHead from '@/components/public/jy-common-head'
+	// import JyCommonHead from '@/components/public/jy-common-head'
 
 	const PayUse = ref(false)
 	// 我是关闭服务
diff --git a/jiuyi2/pages/mine/switch-accounts/index.vue b/jiuyi2/pages/mine/switch-accounts/index.vue
index 1bb2ff8e..47f3d9e6 100644
--- a/jiuyi2/pages/mine/switch-accounts/index.vue
+++ b/jiuyi2/pages/mine/switch-accounts/index.vue
@@ -39,7 +39,7 @@
 		ref,
 		inject
 	} from 'vue'
-	import JyCommonHead from '@/components/public/jy-common-head'
+	// import JyCommonHead from '@/components/public/jy-common-head'
 	import {
 		useStore
 	} from 'vuex'
diff --git a/jiuyi2/pages/news/chatGroup.vue b/jiuyi2/pages/news/chatGroup.vue
index b3ef684e..0ab363d6 100644
--- a/jiuyi2/pages/news/chatGroup.vue
+++ b/jiuyi2/pages/news/chatGroup.vue
@@ -59,7 +59,7 @@
 
 	// 移除监听
 	function removeListener() {
-		uni.$chat.off(TencentCloudChat.EVENT.GROUP_LIST_UPDATED);
+		uni.$chat.off(TencentCloudChat.EVENT.GROUP_LIST_UPDATED,()=>{});
 	}
 
 	// 获取群组列表
diff --git a/jiuyi2/pages/news/news.vue b/jiuyi2/pages/news/news.vue
index 994fc7ce..29316378 100644
--- a/jiuyi2/pages/news/news.vue
+++ b/jiuyi2/pages/news/news.vue
@@ -37,7 +37,7 @@ const menuList = reactive([
 	{
 		key: 'group',
 		name: '即时消息',
-		load: true,
+		load: false,
 	}, {
 		key: 'friend',
 		name: '通讯录',
@@ -68,6 +68,7 @@ const userinfo = computed(() => {
 const menuCurrent = computed(() => {
 	return menuList[menuIndex.value]
 })
+const footerMneuRef = ref()
 
 onLoad(() => {
 	// 初始化菜单
@@ -75,6 +76,11 @@ onLoad(() => {
 
 	// 开启监听
 	addListener()
+
+	// 更新未读数量
+	uni.$on('updateNum', (val) => {
+		getNoRead()
+	})
 })
 
 onUnload(() => {
@@ -82,6 +88,12 @@ onUnload(() => {
 	removeListener()
 })
 
+function getNoRead() {
+	setTimeout(() => {
+		footerMneuRef.value.getReadNum();
+	}, 200)
+}
+
 // 开启监听
 function addListener() {
 	uni.$chat.on(TencentCloudChat.EVENT.SDK_READY, imLoading);
@@ -95,7 +107,7 @@ function imLoading() {
 // 移除监听
 function removeListener() {
 	// #ifdef APP
-	uni.$chat.off(TencentCloudChat.EVENT.SDK_READY);
+	uni.$chat.off(TencentCloudChat.EVENT.SDK_READY,()=>{});
 	// #endif
 }
 
@@ -201,7 +213,7 @@ function getUserInfos(userRecommend) {
 		<swiper class="swiper" :current="menuIndex" disable-touch="true">
 			<!-- 群组 -->
 			<swiper-item>
-				<msgList v-if="menuList[0].load" :type="menuIndex" />
+				<msgList v-if="menuList[0].load" :type="menuIndex" @updateNum="updateNum" />
 				<view class="loading" v-else>正在加载</view>
 			</swiper-item>
 
@@ -213,13 +225,13 @@ function getUserInfos(userRecommend) {
 
 			<!-- 视频消息 -->
 			<swiper-item>
-				<msgList v-if="menuList[2].load" :type="menuIndex" />
+				<msgList v-if="menuList[2].load" :type="menuIndex" @updateNum="updateNum" />
 				<view class="loading" v-else>正在加载</view>
 			</swiper-item>
 
 			<!-- 商城消息 -->
 			<swiper-item>
-				<msgList v-if="menuList[3].load" :type="menuIndex" />
+				<msgList v-if="menuList[3].load" :type="menuIndex" @updateNum="updateNum" />
 			</swiper-item>
 		</swiper>
 	</view>
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 47c96de2..a3922799 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,8 +3,8 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-// let target = 'http://91f.xyz:8080'
-let target = 'https://b433d23.r24.cpolar.top/'
+let target = 'http://91f.xyz:8080'
+// let target = 'https://1e49a851.r24.cpolar.top/'
 
 export default defineConfig({
 	plugins: [uni()],