2025.03.15 工作代码提交

jiuyi2/api/news.js

@@ -130,6 +130,7 @@ export const news = {
 			method: 'POST',
 			data: param.data,
 			query: param.query,
+			load: true,
 		})
 	},
 
@@ -139,7 +140,7 @@ export const news = {
 			url: `/user/getRedPacketInfo`,
 			method: 'GET',
 			query: param.query,
-			load: 1,
+			load: true,
 		})
 	},
 
@@ -150,6 +151,7 @@ export const news = {
 			method: 'POST',
 			data: param.data,
 			query: param.query,
+			load: true,
 		})
 	},
 

jiuyi2/common/js/config.js

@@ -7,7 +7,6 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-	// host: 'http://762c9b48.r24.cpolar.top',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,

jiuyi2/common/js/util.js

@@ -134,7 +134,7 @@ const util = {
 					reject(res)
 				},
 				complete(rs) {
-					console.log('upload complete', rs)
+					// console.log('upload complete', rs)
 				}
 			})
 		})
@@ -213,7 +213,7 @@ const util = {
 				responseType: params.responseType || 'text',
 				// 请求成功返回
 				success: res => {
-					// console.log('request success', url, res, params.data ? params.data : '')
+					console.log('request success', url, res, params.data ? params.data : '')
 					// 关闭加载效果
 					if (params.load) {
 						uni.hideLoading()
@@ -602,6 +602,7 @@ const util = {
 			count: obj.type == 1 ? 1 : count - obj.value.length,
 			sourceType: obj.sourceType || ['album', 'camera'],
 			success: (rs) => {
+				console.log('rs', rs)
 				// 遍历图片返回列表
 				rs.tempFiles.forEach(item => {
 					// 限制大小
@@ -615,6 +616,7 @@ const util = {
 						file: item.path,
 						mode: 'img',
 						success(res) {
+							console.log('upload res', res)
 							if (res.code === 200) {
 								uni.getImageInfo({
 									src: item.path,
@@ -625,6 +627,7 @@ const util = {
 											width: imageInfo.width,
 											height: imageInfo
 												.height,
+											size: item.size,
 										});
 									},
 								})

jiuyi2/components/news/msgList.vue

@@ -114,8 +114,11 @@
 			res.forEach(item => {
 				let obj = {}
 				obj.type = item.type;
-				obj.chatText = item.lastMessage.messageForShow;
+				// 处理最近一条消息
+				obj.chatText = item.lastMessage.messageForShow
+				if (obj.chatText == "[自定义消息]") obj.chatText = item.lastMessage.payload.description || '[自定义消息]'
 				obj.MsgTime = handleDate(item.lastMessage.lastTime);
+				//
 				obj.unreadCount = item.unreadCount;
 
 				if (item.type == 'C2C') {

jiuyi2/pages/news/chat/chat.vue

@@ -149,24 +149,28 @@
 		uni.offKeyboardHeightChange(() => {})
 		// #endif
 		videoContext.value.stop()
+		// 移除监听消息
+		removeListener()
 	})
 
 	// 开启监听消息
 	function addListener() {
 		let onMessageReceived = function(event) {
 			console.log('TencentCloudChat.EVENT.MESSAGE_RECEIVED', event)
-			setTimeout(() => {
+			// 
-				// 获取历史记录
+			list.messageList.push(...event.data)
-				getHistory({
-					msgId: '',
-					limit: 1,
-				})
-			}, 200)
 		}
 
 		uni.$chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, onMessageReceived);
 	}
 
+	// 移除监听消息
+	function removeListener() {
+		let onMessageReceived = function(event) {}
+
+		uni.$chat.off(TencentCloudChat.EVENT.MESSAGE_RECEIVED, onMessageReceived);
+	}
+
 	// 监听内容滚动
 	function onContentScroll(ev) {
 		if (ev.scrollTop == 50) getMoreHistroy()
@@ -177,18 +181,26 @@
 
 	// 点击发送
 	function handleSend() {
+		// 
+		if (!content.value) {
+			util.alert('消息不能为空')
+			return
+		}
+		// 取消聚焦
 		inputFocus.value = false
 
+		// 创建文本消息
+		let message = uni.$chat.createTextMessage({
+			to: msg.id,
+			conversationType: msg.type,
+			payload: {
+				text: content.value
+			},
+		})
+
 		// 发送消息
 		sendMsg({
-			query: {
+			message,
-				formId: userinfo.value.id,
-				toUserId: msg.id,
-				msgType: TencentCloudChat.TYPES.MSG_TEXT,
-			},
-			data: {
-				text: content.value
-			},
 			success: () => {
 				// 清空已发送的消息
 				content.value = ''
@@ -202,7 +214,9 @@
 	 * @param {Object} message 消息对象
 	 */
 	function handlePlusSend(message) {
-		sendMsg(message)
+		sendMsg({
+			message
+		})
 	}
 
 	/**
@@ -210,22 +224,13 @@
 	 * @param {Object} param
 	 */
 	function sendMsg(param) {
-		// 
+		console.log('sendMsg', param.message)
-		let request = api.news.sendUserMsg
-		// 
-		if (msg.type == 'GROUP') request = api.news.sendGroupMsg
-		// if (msg.isCustomer) request = api.news.sendCusomterService 
-
 		// 发送消息
-		request({
+		uni.$chat.sendMessage(param.message).then((rs) => {
-			query: param.query,
+			console.log('send success', rs)
-			data: param.data,
+			if (rs.code == 0) {
-		}).then((rs) => {
+				// 
-			if (rs.code == 200) {
+				list.messageList.push(rs.data.message)
-				// getHistory({
-				// 	msgId: '',
-				// 	limit: 1,
-				// })
 				param.success ? param.success() : ''
 				return
 			}
@@ -240,14 +245,14 @@
 
 	/**
 	 * 打开红包详情
-	 * @param {Object} ev
+	 * @param {Object} event 默认事件
 	 */
-	function handleRedPacket(ev) {
+	function handleRedPacket(event) {
-		messageItem.value = ev
+		console.log('event', event)
 		api.news.getRedPacketInfo({
 			query: {
 				// 红包id
-				redPacketId: ev.callbackData.callback_json[0].businessId
+				redPacketId: event.formatData.id,
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
@@ -310,10 +315,9 @@
 
 	// 获取更多消息记录
 	function getMoreHistroy() {
-		// 获取第一条消息记录
+		// if(list.isCompleted) return
-		if (list.total <= list.data.length) return
 		getHistory({
-			msgId: list.data[0].id
+			msgId: list.messageList[0].ID
 		})
 	}
 
@@ -558,15 +562,15 @@
 
 	<view class="tool bfff" id="tool">
 		<view class="tool-group">
+			<!-- 摁住说话 -->
 			<!-- 语音 -->
 			<image src="/static/news-voice.png" mode="widthFix" class="thumb" @click="handleTool('voice')"></image>
-			<!-- 摁住说话 -->
 			<template v-if="toolStatus == 'voice'">
 				<JyVoice @send="voiceSend" :msg="msg" />
 			</template>
 			<!-- 输入框 -->
 			<template v-if="toolStatus != 'voice'">
-				<uni-easyinput @focus="onFocus" type="text" v-model="content" :clearable="false" class="input"
+				<uni-easyinput @focus="onFocus" type="text" v-model.trim="content" :clearable="false" class="input"
 					:adjust-position="false" @keyboardheightchange="keyboardheightchange" placeholder="请输入你的问题"
 					confirmType="发送" :focus="inputFocus" />
 			</template>

jiuyi2/pages/news/chat/components/news-temp/index.vue

@@ -11,6 +11,9 @@
 		computed,
 		defineEmits,
 	} from 'vue'
+	// 工具库
+	import util from '@/common/js/util';
+
 	import NewsAudio from '@/static/audio.png'
 	import JyCommodityInformation from '@/components/public/jy-commodity-information'
 	const props = defineProps({
@@ -30,7 +33,11 @@
 	const store = useStore()
 	const emit = defineEmits(['openRedBag', 'viewVideo'])
 	// 格式化
-	const formatData = computed(() => props.item)
+	const formatData = computed(() => {
+		let result = props.item.payload.data || ''
+		if (result) result = JSON.parse(result)
+		return result
+	})
 	//音频
 	const innerAudioContext = uni.createInnerAudioContext();
 	// 播放语音
@@ -41,10 +48,7 @@
 		})
 	}
 	// 用户信息
-	const userinfo = computed(() => {
+	const userinfo = computed(() => store.state.userinfo)
-		let result = store.state.userinfo
-		return result
-	})
 
 	// 拨打电话
 	function handleCall() {
@@ -58,20 +62,34 @@
 
 	// 开红包
 	function handleOpenRedBag() {
-		emit('openRedBag', props.item)
+		emit('openRedBag', {
+			item: props.item,
+			formatData: formatData.value,
+		})
 	}
 
 	// 看视频
 	function handleViewVideo(item) {
 		emit('viewVideo', item)
 	}
+
+	/**
+	 * 看图片
+	 * @param {Object} urls 图片路径数组
+	 */
+	function handleViewImage(urls) {
+		uni.previewImage({
+			urls,
+		})
+	}
 </script>
 
 <template>
 	<view class="content pr">
 		<!-- 图片 -->
 		<template v-if="item.type === TencentCloudChat.TYPES.MSG_IMAGE">
-			<image class="br10" :src="formatData.MsgContent.ImageInfoArray[0].URL" mode="widthFix" />
+			<image class="br10" :src="item.payload.imageInfoArray[0].imageUrl" mode="widthFix"
+				@click="util.view_imgs([item.payload.imageInfoArray[0].imageUrl],0)" />
 		</template>
 		<!-- 文字 -->
 		<template v-else-if="item.type === TencentCloudChat.TYPES.MSG_TEXT">
@@ -140,12 +158,12 @@
 					<!-- 红包 -->
 					<view class="redPacket br10" :class="{'disabled': 0}" @click="handleOpenRedBag">
 						<view class="df aic">
-							<image class="img fs0 mr10" src="/static/image/pages/news/group/create.png" />
+							<image class="img fs0 mr10" src="/static/image/red-envelope.png" />
-							<view class="red-packet-text cfff">{{ formatData.data.blessing }}</view>
+							<view class="red-packet-text cfff">{{ formatData.blessing }}</view>
 						</view>
 						<!-- 分割线 -->
 						<view class="line"></view>
-						<view class="f20" style="color:#FBD3A4">{{ formatData.data.payType == 1 ? '余额红包' : '积分红包' }}
+						<view class="f20" style="color:#FBD3A4">{{ formatData.redPacketType == 1 ? '余额红包' : '积分红包' }}
 						</view>
 					</view>
 				</template>

jiuyi2/pages/news/chat/fn.js

@@ -18,7 +18,7 @@ export const getHistoryMsg = async (option) => {
 		nextReqMessageID: option.nextReqMessageID,
 	}
 
-	console.log('options', options);
+	console.log('getHistoryMsg', options);
 	return new Promise((resolve, reject) => {
 		uni.$chat.getMessageList(options).then((res) => {
 			resolve(res)

jiuyi2/pages/news/chat/jy-plus.vue

@@ -1,37 +1,40 @@
 <script setup>
-// + 页面
+	// + 页面
-// 腾讯云聊天
+	// 腾讯云聊天
-import TencentCloudChat from '@tencentcloud/chat';
+	import TencentCloudChat from '@tencentcloud/chat';
-import {
+	import {
 		ref,
 		reactive,
 		nextTick,
 		computed,
-} from 'vue'
+	} from 'vue'
-import {
+	import {
 		screenHeight
-} from '@/components/public/Mixins'
+	} from '@/components/public/Mixins'
-import JyCommodityInformation from '@/components/public/jy-commodity-information'
+	import JyCommodityInformation from '@/components/public/jy-commodity-information'
-// api
+	// api
-import api from '@/api/index.js'
+	import api from '@/api/index.js'
-// 工具库
+	// 工具库
-import util from '@/common/js/util.js'
+	import util from '@/common/js/util.js'
-import { inject } from 'vue'
+	import {
+		inject
+	} from 'vue'
 
-const { checkLink } = inject('util');
+	const {
-// 
+		checkLink
-const props = defineProps({
+	} = inject('util');
+	// 
+	const props = defineProps({
 		msg: {
 			type: Object,
 		},
-})
+	})
 
-// 调用父级方法
+	// 调用父级方法
-const emit = defineEmits(['plusClick', 'send'])
+	const emit = defineEmits(['plusClick', 'send'])
-// 加号菜单
+	// 加号菜单
-const plusList = computed(() => {
+	const plusList = computed(() => {
-	let result = [
+		let result = [{
-		{
 			type: 'picture.png',
 			label: '照片',
 			value: 'chooseImage',
@@ -43,8 +46,7 @@ const plusList = computed(() => {
 			type: 'pages/news/group/create.png',
 			label: '红包',
 			value: 'redEnvelope',
-		}
+		}]
-	]
 
 		const isCustomer = props.msg.isCustomer;
 
@@ -65,23 +67,23 @@ const plusList = computed(() => {
 			value: 'chooseShop',
 		})
 		return result
-})
+	})
 
-const popupRef = ref(null)
+	const popupRef = ref(null)
-const popupRE = ref(null)
+	const popupRE = ref(null)
-const formData = reactive({
+	const formData = reactive({
 		name: ''
-})
+	})
-const popupData = reactive({
+	const popupData = reactive({
 		show: false,
 		title: '选择订单'
-})
+	})
 
-// 订单列表
+	// 订单列表
-const list = reactive([])
+	const list = reactive([])
 
-// 加号方法对象
+	// 加号方法对象
-const plusClickObj = {
+	const plusClickObj = {
 		voice: () => {
 			// 菜单
 			const menu = [{
@@ -133,7 +135,7 @@ const plusClickObj = {
 							'5': '已收货',
 							'6': '已完成',
 							'9': '已取消',
-					}[item.status]
+						} [item.status]
 						return item
 					}))
 
@@ -169,7 +171,7 @@ const plusClickObj = {
 					sendType: {
 						'C2C': 1,
 						'GROUP': 2,
-				}[props.msg.type],
+					} [props.msg.type],
 					num: props.msg.num,
 				})
 			})
@@ -180,7 +182,7 @@ const plusClickObj = {
 		takePhoto: () => {
 			console.log('takePhoto')
 			sendMsgImg({
-			sourceType: ['album'],
+				sourceType: ['camera'],
 			})
 		},
 
@@ -191,54 +193,37 @@ const plusClickObj = {
 				sourceType: ['album'],
 			})
 		}
-}
-
-// 发送图片消息
-function sendMsgImg(option) {
-	util.upload_image({
-		count: 1,
-		type: 1,
-		success: rs => {
-			emit('send', {
-				query: {
-					toUserId: props.msg.id,
-					msgType: TencentCloudChat.TYPES.MSG_IMAGE,
-				},
-				data: {
-					imgUrl: rs.value
-				},
-			})
 	}
-	})
+
-	return
+	// 发送图片消息
-	// 选择图片
+	function sendMsgImg(option) {
 		uni.chooseImage({
-		count: 1,
+			count: 8,
-		sourceType: option.sourceType, // 从相册选择
+			sourceType: option.sourceType,
-		success: (res) => {
+			success: res => {
+				console.log('res', res)
+				// 创建图片消息
 				let message = uni.$chat.createImageMessage({
 					to: props.msg.id,
 					conversationType: props.msg.type,
 					payload: {
-					file: res
+						file: res,
 					},
-				onProgress: function (event) {
-					console.log('file uploading:', event)
-				}
 				})
+				emit('send', message)
 				return
 			}
-	});
+		})
-}
+	}
 
-// 咨询订单
+	// 咨询订单
-const consult = (content) => {
+	const consult = (content) => {
 		let obj = {
 			content,
 			type: 'order'
 		}
 		popupRef.value.close()
-}
+	}
 </script>
 
 <template>
@@ -280,7 +265,7 @@ const consult = (content) => {
 </template>
 
 <style scoped lang="scss">
-.NewsPlus {
+	.NewsPlus {
 		// 一行四个 
 		display: grid;
 		grid-template-columns: repeat(4, 1fr);
@@ -290,9 +275,9 @@ const consult = (content) => {
 			background-color: #fff;
 			border-radius: 20rpx;
 		}
-}
+	}
 
-.jy-popup {
+	.jy-popup {
 		width: 100%;
 		border-radius: 20px 20px 0px 0px;
 
@@ -340,5 +325,5 @@ const consult = (content) => {
 			font-size: 22rpx;
 			color: #3D3D3D;
 		}
-}
+	}
 </style>

jiuyi2/pages/news/chat/jy-voice.vue

@@ -16,39 +16,39 @@
 </template>
 
 <script setup>
-import {
+	import {
 		ref,
 		defineEmits
-} from 'vue'
+	} from 'vue'
-// 腾讯云聊天
+	// 腾讯云聊天
-import TencentCloudChat from '@tencentcloud/chat';
+	import TencentCloudChat from '@tencentcloud/chat';
-const props = defineProps({
+	const props = defineProps({
 		msg: {
 			type: Object
 		},
-})
+	})
-const emit = defineEmits(['send'])
+	const emit = defineEmits(['send'])
-//录音
+	//录音
-// #ifdef APP-PLUS
+	// #ifdef APP-PLUS
-const recorderManager = uni.getRecorderManager();
+	const recorderManager = uni.getRecorderManager();
-// #endif
+	// #endif
-// 录音时长
+	// 录音时长
-const voiceLength = ref(0);
+	const voiceLength = ref(0);
-// 录音定时器
+	// 录音定时器
-const voiceTimer = ref(null);
+	const voiceTimer = ref(null);
-// 录音文本
+	// 录音文本
-const voiceText = ref('按住 说话');
+	const voiceText = ref('按住 说话');
-// 录音提示
+	// 录音提示
-const voiceTis = ref('手指上滑 取消发送');
+	const voiceTis = ref('手指上滑 取消发送');
-// 录音图标显示
+	// 录音图标显示
-const voiceFlg = ref(false);
+	const voiceFlg = ref(false);
-// 录音开始Y坐标
+	// 录音开始Y坐标
-const voicePageY = ref(0);
+	const voicePageY = ref(0);
-// 录音结束
+	// 录音结束
-const voiceStop = ref(false);
+	const voiceStop = ref(false);
-const str = '';
+	const str = '';
-// 录音相关
+	// 录音相关
-const sv = {
+	const sv = {
 		// 按下触发
 		touchstartVoice: (e) => {
 			voicePageY.value = (e.changedTouches[0].pageY).toFixed(2);
@@ -115,10 +115,10 @@ const sv = {
 			recorderManager.stop(); // 录音结束
 			console.log('录音结束');
 		}
-};
+	};
-// #ifdef APP-PLUS
+	// #ifdef APP-PLUS
-// 监听录音停止事件
+	// 监听录音停止事件
-recorderManager.onStop((res) => {
+	recorderManager.onStop((res) => {
 		// 被打断等情况不发送
 		if (voiceStop.value) {
 			return
@@ -158,7 +158,7 @@ recorderManager.onStop((res) => {
 					file: res
 				},
 				// 音频上传进度回调
-			onProgress: function (event) {
+				onProgress: function(event) {
 					console.log('file uploading:', event)
 				}
 			})
@@ -177,11 +177,11 @@ recorderManager.onStop((res) => {
 		}
 		// 
 
-})
+	})
-// #endif
+	// #endif
 </script>
 <style scoped lang="scss">
-.voice_box {
+	.voice_box {
 		padding: 20rpx 0;
 		margin: 0 20rpx;
 		border-radius: 50rpx;
@@ -190,13 +190,13 @@ recorderManager.onStop((res) => {
 		display: flex;
 		align-items: center;
 		justify-content: center;
-}
+	}
 
-.hidden {
+	.hidden {
 		display: none !important;
-}
+	}
 
-.record {
+	.record {
 		width: 40vw;
 		height: 40vw;
 		position: fixed;
@@ -285,5 +285,5 @@ recorderManager.onStop((res) => {
 				color: #f09b37;
 			}
 		}
-}
+	}
 </style>

jiuyi2/vite.config.js

@@ -4,7 +4,6 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';
 
 let target = 'http://91f.xyz:8080'
-// let target = 'http://762c9b48.r24.cpolar.top'
 
 export default defineConfig({
 	plugins: [uni()],