sx
/
jiuyiUniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp

This commit is contained in:
sx 2025-02-20 15:39:41 +08:00
parent fcdc7ad20a e290d77397
commit 4e769f24ed
7 changed files with 515 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jiuyi2/api/news.js
View File

@ -208,10 +208,11 @@ export const news = {
})
},
// 群聊发消息
// 消息列表
getMessageList(param) {
return util.request({
url: `/user/chat/getMessageList`,
// url: `/user/chat/getMessageList`,
url: `/user/chat/getMsgListById`,
query: param.query,
data: param.data,
method: 'GET'

9
jiuyi2/components/footerMenu/footerMenu.vue
View File

@ -15,6 +15,9 @@ import {
reactive,
watch,
} from 'vue'
import {
onLoad,
} from "@dcloudio/uni-app"
// 工具库
import util from '@/common/js/util';
const {
@ -149,6 +152,8 @@ onMounted(() => {
//
// proxy.$refs.alert.open()
})
onLoad(()=>{
// 获取未读消息数量
getNoReadNum()
})
@ -182,6 +187,7 @@ function handleMenu(item) {
else uni.navigateTo({
url: `/${item.pagePath}`,
})
getNoReadNum()
return
}
//
@ -221,9 +227,10 @@ function getNoReadNum() {
return
}
// #ifdef APP
const unreadCount = uni.$chat.getTotalUnreadMessageCount();
noReadNum.value = +unreadCount > 99 ? '99+' : unreadCount;
// #endif
}
</script>

2
jiuyi2/components/index/collectAdd.vue
View File

@ -43,9 +43,11 @@
})
onBeforeUnmount(() => {
// #ifdef APP
uni.offKeyboardHeightChange(rs => {
console.log('rs', rs)
})
// #endif
})
/**

317
jiuyi2/components/news/book.vue
View File

@ -1,11 +1,11 @@
<script setup>
/**
/**
* 通讯录
*/
import {
import {
useStore,
} from 'vuex'
import {
} from 'vuex'
import {
ref,
computed,
reactive,
@ -13,164 +13,164 @@
onUnmounted,
inject,
getCurrentInstance,
} from 'vue'
// 工具库
import util from '@/common/js/util.js'
// 腾讯云聊天
import TencentCloudChat from '@tencentcloud/chat';
// api
import api from '@/api/index.js'
import pinyin from 'js-pinyin'
import {
} from 'vue'
// 工具库
import util from '@/common/js/util.js'
// 腾讯云聊天
import TencentCloudChat from '@tencentcloud/chat';
// api
import api from '@/api/index.js'
import pinyin from 'js-pinyin'
import {
forEach
} from 'lodash';
const {
} from 'lodash';
const {
proxy
} = getCurrentInstance();
const store = useStore()
const userinfo = computed(() => {
} = getCurrentInstance();
const store = useStore()
const userinfo = computed(() => {
let result = store.state.userinfo
return result
})
const msgType = {}
// 用户列表
const userList = reactive({
})
const msgType = {}
// 用户列表
const userList = reactive({
data: [],
pageNum: 1,
pageSize: 10,
total: 0,
})
// 当前操作的用户
let user = reactive({})
// 列表下标
const listKey = ref('')
// 字母列表
const letterList = [{
})
// 当前操作的用户
let user = reactive({})
// 列表下标
const listKey = ref('')
// 字母列表
const letterList = [{
key: 'other',
name: '#',
},
{
},
{
key: 'a',
name: 'A',
},
{
},
{
key: 'b',
name: 'B',
},
{
},
{
key: 'c',
name: 'C',
},
{
},
{
key: 'd',
name: 'D',
},
{
},
{
key: 'e',
name: 'E',
},
{
},
{
key: 'f',
name: 'F',
},
{
},
{
key: 'g',
name: 'G',
},
{
},
{
key: 'h',
name: 'H',
},
{
},
{
key: 'i',
name: 'I',
},
{
},
{
key: 'j',
name: 'J',
},
{
},
{
key: 'k',
name: 'K',
},
{
},
{
key: 'l',
name: 'L',
},
{
},
{
key: 'm',
name: 'M',
},
{
},
{
key: 'n',
name: 'N',
},
{
},
{
key: 'o',
name: 'O',
},
{
},
{
key: 'p',
name: 'P',
},
{
},
{
key: 'q',
name: 'Q',
},
{
},
{
key: 'r',
name: 'R',
},
{
},
{
key: 's',
name: 'S',
},
{
},
{
key: 't',
name: 'T',
},
{
},
{
key: 'u',
name: 'U',
},
{
},
{
key: 'v',
name: 'V',
},
{
},
{
key: 'w',
name: 'W',
},
{
},
{
key: 'x',
name: 'X',
},
{
},
{
key: 'y',
name: 'Y',
},
{
},
{
key: 'z',
name: 'Z',
},
]
// 是否移动
const touchmove = ref(false)
// 字母列表dom属性
const letterDom = reactive({
},
]
// 是否移动
const touchmove = ref(false)
// 字母列表dom属性
const letterDom = reactive({
itemHeight: 0,
minHeight: 0,
maxHeight: 0,
height: 0,
})
// 右滑菜单
const rightOption = [{
})
// 右滑菜单
const rightOption = [{
text: '删除',
style: {
backgroundColor: '#F85050'
},
fn: (user) => delFriend(user),
},
},
// {
// text: '修改备注',
// style: {
@ -178,9 +178,9 @@
// },
// fn: (user) => setFriendNote(user),
// },
]
]
onMounted(() => {
onMounted(() => {
// 获取朋友列表
getFriendList()
// 获取字母属性
@ -189,42 +189,45 @@
addlistener()
// proxy.$refs.note.open()
})
})
onUnmounted(() => {
onUnmounted(() => {
removelistener()
})
})
const viewData = ref([])
const viewData = ref([])
// 添加加好友监听
function addlistener() {
// 添加加好友监听
function addlistener() {
let onFriendListUpdated = (event) => {
console.log('onFriendListUpdated', event.data);
getFriendList()
}
// #ifdef APP
uni.$chat.on(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, onFriendListUpdated);
}
// #endif
}
// 移除加好友监听
function removelistener() {
uni.$chat.off(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, () => {});
}
// 移除加好友监听
function removelistener() {
// #ifdef APP
uni.$chat.off(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, () => { });
// #endif
}
// 获取朋友列表
function getFriendList() {
// 获取朋友列表
function getFriendList() {
// 验证sdk是否准备完毕
let isReady = uni.$chat.isReady();
console.log('getFriendList', isReady)
if (!isReady) {
setTimeout(function() {
setTimeout(function () {
getFriendList()
}, 500);
return
}
console.log('getFriendList')
//
api.news.getFriendList().then(rs => {
@ -239,13 +242,13 @@
showCancel: false,
})
})
}
}
/**
/**
* 用户列表排序
* @param {Object} userList
*/
function handleUserList(userList) {
function handleUserList(userList) {
// 筛选后的用户列表
const userArr = []
// 遍历用户列表
@ -279,11 +282,11 @@
// return surnameA.localeCompare(surnameB);
// });
return userArr;
}
}
// 获取
function getLetterProperty() {
// 获取
function getLetterProperty() {
const query = uni.createSelectorQuery().in(proxy);
query.select(".letterBox").boundingClientRect((data) => {
@ -292,15 +295,15 @@
letterDom.maxHeight = data.bottom
letterDom.itemHeight = data.height / letterList.length
}).exec();
}
}
// 手指触摸开始
function handleTouchStart(ev) {
// 手指触摸开始
function handleTouchStart(ev) {
touchmove.value = true
}
}
// 手指触摸移动
function handleTouchMove(ev) {
// 手指触摸移动
function handleTouchMove(ev) {
if (!touchmove.value) return
// 判断临界值
let result = ev.touches[0].pageY
@ -313,36 +316,36 @@
// 修改下标
listKey.value = letterList[index].key
}
}
// 手指触摸结束
function handleTouchEnd(ev) {
// 手指触摸结束
function handleTouchEnd(ev) {
touchmove.value = false
}
}
/**
/**
* 点击字母
* @param {Object} item 点击的当前项
*/
function handleLetter(item) {
function handleLetter(item) {
listKey.value = item.key
}
}
/**
/**
* 右滑菜单
* @param {Object} ev 默认事件
* @param {Object} user 用户信息
*/
function handleSwipeAction(ev, user) {
function handleSwipeAction(ev, user) {
ev.content.fn(user)
proxy.$refs.swipeAction.closeAll()
}
}
/**
/**
* 删除好友
* @param {Object} user 需要删除的好友信息
*/
function delFriend(user) {
function delFriend(user) {
new Promise((resolve, reject) => {
util.alert({
content: `确认删除好友${user.remark || user.userNickname}？`
@ -367,23 +370,23 @@
})
})
})
}
}
/**
/**
* 设置好友备注
* @param {Object} ev 需要操作的好友信息
*/
function setFriendNote(ev) {
function setFriendNote(ev) {
// 合并用户信息
Object.assign(user, ev)
// 打开设置用户备注弹窗
setTimeout(() => {
proxy.$refs.note.open()
}, 50)
}
}
// 设置好友备注
function handleSaveNote() {
// 设置好友备注
function handleSaveNote() {
api.news.setNotes({
query: {
name: user.note || '',
@ -402,29 +405,29 @@
showCancel: false,
})
})
}
}
/**
/**
* 点击用户
* @param {Object} user 当前用户信息
*/
function handleUser(user) {
function handleUser(user) {
util.toChat({
name: user.remark || user.userNickname,
msgId: user.userId,
type: 'C2C',
})
}
}
/**
/**
* 跳转
* @param {Object} url
*/
function link(url) {
function link(url) {
uni.navigateTo({
url,
})
}
}
</script>
<template>
@ -449,10 +452,10 @@
<view class="letter ptb10 plr30 c666 f20">{{ item.letter }}</view>
<view class="child pl30 pr50">
<uni-swipe-action-item :right-options="rightOption" v-for="(user, secIndex) in item.child"
:key="secIndex" @click="handleSwipeAction($event,user)">
:key="secIndex" @click="handleSwipeAction($event, user)">
<view class="item rows ptb20" @click="handleUser(user)">
<image class="wh80 avatar cir" :src="user.avatar" mode="aspectFill" />
<view class="name thd f1 ml20 c333 f32">{{user.remark || user.userNickname}}</view>
<view class="name thd f1 ml20 c333 f32">{{ user.remark || user.userNickname }}</view>
</view>
</uni-swipe-action-item>
</view>
@ -475,7 +478,7 @@
<uni-popup ref="note" type="bottom" mask-background-color="rgba(0,0,0,0)">
<view class="noteAlt popBot plr25 bfff">
<view class="header rows ptb20">
<view class="title c333 f34">设置好友({{user.remark}})备注</view>
<view class="title c333 f34">设置好友({{ user.remark }})备注</view>
<uni-icons type="closeempty" size="40rpx" @click="$refs.note.close()" />
</view>
@ -489,8 +492,8 @@
</template>
<style lang="scss" scoped>
// 朋友列表
.firendBox {
// 朋友列表
.firendBox {
height: 100%;
.scroll {
@ -510,18 +513,18 @@
border-top: 2rpx solid #eee;
}
}
}
}
// 字母列表
.letterBox {
// 字母列表
.letterBox {
position: absolute;
top: 50%;
right: 0;
transform: translateY(-50%);
}
}
// 设置好友备注
.noteAlt {
// 设置好友备注
.noteAlt {
box-shadow: 0 0 20rpx #0003;
.content {
@ -531,5 +534,5 @@
border-radius: 20rpx;
}
}
}
}
</style>

126
jiuyi2/components/news/msgList.vue
View File

@ -69,7 +69,7 @@ const list = reactive([])
onMounted(() => {
if (props.type == 0) {
getList()
} else if(props.type == 1) {
} else if (props.type == 1) {
// 视频消息
} else if (props.type == 2) {
// 商城消息
@ -79,7 +79,7 @@ onMounted(() => {
})
onUnmounted(() => {
// removeListener()
removeListener()
})
// 开启监听消息
@ -93,7 +93,9 @@ function addListener() {
// 移除监听
function removeListener() {
uni.$chat.on(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED);
// #ifdef APP
uni.$chat.off(TencentCloudChat.EVENT.CONVERSATION_LIST_UPDATED);
// #endif
}
// 获取消息列表
@ -104,7 +106,8 @@ function getList() {
}
}).then(rs => {
if (rs.code == 200) {
list.data = handleList(rs.data);
// list.data = handleList(rs.data);
list.data = handleList(JSON.parse(rs.msg).SessionItem);
return
}
util.alert({
@ -112,17 +115,6 @@ function getList() {
showCancel: false,
})
})
// // 验证sdk是否准备完毕
// let isReady = uni.$chat.isReady();
// if (!isReady) {
// setTimeout(function () {
// getList();
// }, 1000);
// return
// }
// uni.$chat.getMessageList({})
}
/**
@ -130,53 +122,37 @@ function getList() {
* @param {Object} item
*/
function handleList(list) {
list.forEach(item => {
item.callbackJson = JSON.parse(item.callbackJson);
if (item.groupId != null) {
item.unreadCount = getGroupNoReadNum(item.groupId)
}
if (item.callbackJson.callback_json.length) {
let msgType = item.callbackJson.callback_json[0].MsgType;
if (msgType == TencentCloudChat.TYPES.MSG_TEXT) {
item.chatText = item.callbackJson.callback_json[0].MsgContent.Text
} else if (msgType == TencentCloudChat.TYPES.MSG_IMAGE) {
item.chatText = '[图片]'
} else if (msgType == TencentCloudChat.TYPES.MSG_AUDIO) {
item.chatText = '[语音]'
} else if (msgType == TencentCloudChat.TYPES.MSG_VIDEO) {
item.chatText = '[视频]'
} else if (msgType == TencentCloudChat.TYPES.MSG_CUSTOM) {
if (item.callbackJson.callback_json[0].businessType == 'redPacket') {
item.chatText = `[红包] ${item.callbackJson.blessing}`
} else if (item.callbackJson.callback_json[0].businessType == '1') {
// if (item.callbackJson.callback_json[0].call_type == '1') {
// item.chatText = '[语音通话]'
// } else if (item.callbackJson.callback_json[0].call_type == '2') {
// item.chatText = '[视频通话]'
// }
}
}
}
})
return list
}
// 查询群聊未读数量
function getGroupNoReadNum(groupId) {
// 验证sdk是否准备完毕
let isReady = uni.$chat.isReady();
if (!isReady) {
setTimeout(function () {
getGroupNoReadNum(groupId);
handleList(list);
}, 800);
return
}
const unreadCount = uni.$chat.getTotalUnreadMessageCount('GROUP', groupId);
list.forEach(item => {
item.MsgTime = handleDate(item.MsgTime)
return unreadCount;
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;
}
})
})
return list
}
// // 点击用户
@ -204,14 +180,14 @@ function handleChat(item) {
// 单聊
if (item.groupId == null) {
param.type = 'C2C'
param.name = `${item.callbackJson.from_name}`
param.msgId = `${item.callbackJson.from_id}`
param.name = `${item.name}`
param.msgId = `${item.To_Account}`
} else {
// 群聊
param.type = 'GROUP'
param.name = `${item.groupChatDTO.name}`
param.msgId = `${item.groupId}`
param.num = `${item.groupChatDTO.memberCount}`
param.name = `${item.name}`
param.msgId = `${item.GroupId}`
param.num = `${item.num}`
}
setRead(item)
@ -240,7 +216,7 @@ function delMsg(item) {
return
}
let conversationId = item.groupId == null ? `C2C${item.fromId}` : `GROUP${item.groupId}`;
let conversationId = item.Type == 1 ? `C2C${item.To_Account}` : `GROUP${item.GroupId}`;
uni.$chat.deleteConversation(conversationId).then(rs => {
getList()
@ -258,7 +234,7 @@ function setRead(item) {
return
}
let conversationId = item.groupId == null ? `C2C${item.fromId}` : `GROUP${item.groupId}`;
let conversationId = item.Type == 1 ? `C2C${item.To_Account}` : `GROUP${item.GroupId}`;
uni.$chat.setMessageRead({
conversationID: conversationId,
}).then(rs => {
@ -266,6 +242,21 @@ function setRead(item) {
})
}
// 时间转换
function handleDate(timestamp) {
var timestamp = +timestamp * 1000;
var date = new Date(timestamp);
var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
var formattedDate = M + D + h + m + s;
return formattedDate
}
</script>
@ -326,25 +317,28 @@ function setRead(item) {
@click="handleMenu($event, item)">
<view class="item rows ptb20 plr30" @click.stop="handleChat(item)">
<view class="image wh90 pr">
<template v-if="item.groupId == null">
<!-- <template v-if="item.groupId == null">
<image class="cir wh90" :src="item.callbackJson.from_url" mode="aspectFill" />
</template>
<template v-else>
<template v-else>
<image class="cir wh90" :src="item.groupChatDTO.groupFaceUrl" mode="aspectFill" />
</template>
</template> -->
<image class="cir wh90" :src="item.avatar" mode="aspectFill" />
<view class="mark pa t0 r0 cfff f22 cir" v-if="item.unreadCount">{{ item.unreadCount }}
</view>
</view>
<view class="col f1 ml20">
<view class="rows">
<template v-if="item.groupId == null">
<view class="name f1 thd c333 f32">{{ item.name }}</view>
<!-- <template v-if="item.groupId == null">
<view class="name f1 thd c333 f32">{{ item.callbackJson.from_name }}</view>
</template>
<template v-else>
<view class="name f1 thd c333 f32">{{ item.groupChatDTO.name }}</view>
</template>
</template> -->
<view class="datetime c999 f22">
{{ util.formatTime('MM-dd HH:mm', item.createTime) }}</view>
{{ util.formatTime('MM-dd HH:mm', item.MsgTime) }}</view>
</view>
<view class="desc thd mt10 c666 f24">{{ item.chatText }}</view>
</view>

9
jiuyi2/pages/news/chat/chat.vue
View File

@ -155,7 +155,9 @@ function addListener() {
}, 200)
}
// #ifdef APP
uni.$chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, onMessageReceived);
// #endif
}
// 监听内容滚动
@ -210,6 +212,7 @@ function sendMsg(param) {
data: param.data,
}).then((rs) => {
if (rs.code == 200) {
getHistory()
param.success ? param.success() : ''
return
}
@ -310,15 +313,15 @@ function getMoreHistroy() {
*/
function getHistory(param = {}) {
// 验证sdk是否准备完毕
// #ifdef APP
let isReady = uni.$chat.isReady();
//
if (!isReady && userinfo.value.id) {
setTimeout(function () {
getHistory(param)
getHistory()
}, 200);
return
}
//
// #endif
loading.value = true
// 获取单聊聊天记录

2
jiuyi2/pages/news/news.vue
View File

@ -94,7 +94,9 @@ function imLoading() {
// 移除监听
function removeListener() {
// #ifdef APP
uni.$chat.off(TencentCloudChat.EVENT.SDK_READY);
// #endif
}
/**