创建会议修正

2025-12-27 19:23:33 +08:00
parent 50df8495c7
commit 750c112eac
12 changed files with 448 additions and 343 deletions
--- a/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue
+++ b/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue
@@ -66,7 +66,7 @@
 						</view>
 						<!-- 会议消息卡片 -->
 						<view class="message-content meeting-card-wrapper" v-if="msg.messageType === 'meet' && msg.contentExtra">
-							<MeetingCard :meeting="getMeetingData(msg.contentExtra)" @join="handleJoinMeeting" />
+							<MeetingCard :meetingId="msg.content" @join="handleJoinMeeting" />
 							<text class="message-time">{{ formatTime(msg.sendTime) }}</text>
 						</view>
 						<!-- 普通消息 -->
@@ -81,7 +81,7 @@
 					<view class="message-row self-row" v-else>
 						<!-- 会议消息卡片 -->
 						<view class="message-content meeting-card-wrapper" v-if="msg.messageType === 'meet' && msg.contentExtra">
-							<MeetingCard :meeting="getMeetingData(msg.contentExtra)" @join="handleJoinMeeting" />
+							<MeetingCard :meetingId="msg.content" @join="handleJoinMeeting" />
 							<text class="message-time">{{ formatTime(msg.sendTime) }}</text>
 						</view>
 						<!-- 普通消息 -->
@@ -410,11 +410,13 @@ function formatTime(time?: string): string {
 }

 // 获取会议数据（将contentExtra转换为VideoMeetingVO）
-function getMeetingData(contentExtra: Record<string, any> | undefined): VideoMeetingVO {
-	if (!contentExtra) {
-		return {} as VideoMeetingVO
+// 从消息extra中提取meetingId
+function getMeetingId(contentExtra: Record<string, any> | undefined): string {
+	if (!contentExtra || !contentExtra.meetingId) {
+		console.warn('[chatRoom] contentExtra中没有meetingId:', contentExtra)
+		return ''
 	}
-	return contentExtra as VideoMeetingVO
+	return contentExtra.meetingId as string
 }

 // Markdown渲染函数（返回富文本HTML）
@@ -553,119 +555,20 @@ function handleWorkcaseAction() {
 }

 // 发起会议 - 跳转到会议创建页面
-async function startMeeting() {
-	// 先检查是否有活跃会议
-	try {
-		const res = await workcaseChatAPI.getActiveMeeting(roomId.value)
-		if (res.success && res.data) {
-			// 已有活跃会议，直接加入
-			const meetingPageUrl = res.data.iframeUrl
-			const meetingId = res.data.meetingId
-			const meetingName = res.data.meetingName || '视频会议'
-
-			// 构建完整的会议URL（包含域名和workcase路径）
-			const protocol = window.location.protocol
-			const host = window.location.host
-			const fullPath = meetingPageUrl.startsWith('/workcase')
-				? meetingPageUrl
-				: '/workcase' + meetingPageUrl
-			// 附加roomId参数，用于离开会议后返回聊天室
-			const fullMeetingUrl = `${protocol}//${host}${fullPath}&roomId=${roomId.value}`
-
-			// 小程序环境：显示提示，引导用户复制链接在浏览器打开
-			uni.showModal({
-				title: '视频会议',
-				content: '微信小程序暂不支持视频会议，请复制链接在浏览器中打开',
-				confirmText: '复制链接',
-				cancelText: '取消',
-				success: (res) => {
-					if (res.confirm) {
-						uni.setClipboardData({
-							data: fullMeetingUrl,
-							success: () => {
-								uni.showToast({
-									title: '链接已复制，请在浏览器中打开',
-									icon: 'none',
-									duration: 3000
-								})
-							}
-						})
-					}
-				}
-			})
-			return
-		}
-	} catch (e) {
-		console.log('[chatRoom] 无活跃会议')
-	}
-
-	// 没有活跃会议，创建新会议
-	try {
-		const createRes = await workcaseChatAPI.createMeeting({
-			roomId: roomId.value,
-			meetingName: roomName.value || '视频会议'
-		})
-
-		if (createRes.success && createRes.data) {
-			const meetingId = createRes.data.meetingId
-
-			// 开始会议
-			await workcaseChatAPI.startMeeting(meetingId)
-
-			// 加入会议获取会议页面URL
-			const joinRes = await workcaseChatAPI.joinMeeting(meetingId)
-			if (joinRes.success && joinRes.data && joinRes.data.iframeUrl) {
-				const meetingPageUrl = joinRes.data.iframeUrl
-
-				// 构建完整的会议URL（包含域名和workcase路径）
-				const protocol = window.location.protocol
-				const host = window.location.host
-				const fullPath = meetingPageUrl.startsWith('/workcase')
-					? meetingPageUrl
-					: '/workcase' + meetingPageUrl
-				// 附加roomId参数，用于离开会议后返回聊天室
-				const fullMeetingUrl = `${protocol}//${host}${fullPath}&roomId=${roomId.value}`
-
-				// 小程序环境：显示提示，引导用户复制链接在浏览器打开
-				uni.showModal({
-					title: '会议已创建',
-					content: '微信小程序暂不支持视频会议，请复制链接在浏览器中打开',
-					confirmText: '复制链接',
-					cancelText: '取消',
-					success: (res) => {
-						if (res.confirm) {
-							uni.setClipboardData({
-								data: fullMeetingUrl,
-								success: () => {
-									uni.showToast({
-										title: '链接已复制，请在浏览器中打开',
-										icon: 'none',
-										duration: 3000
-									})
-								}
-							})
-						}
-					}
-				})
-			} else {
-				uni.showToast({
-					title: '获取会议链接失败',
-					icon: 'none'
-				})
-			}
-		} else {
+function startMeeting() {
+	// 跳转到会议创建页面
+	const url = `/pages/meeting/meetingCreate/MeetingCreate?roomId=${roomId.value}${workcaseId.value ? '&workcaseId=' + workcaseId.value : ''}`
+	console.log('[chatRoom] 跳转会议创建页面:', url)
+	uni.navigateTo({
+		url: url,
+		fail: (err) => {
+			console.error('[chatRoom] 跳转会议创建页面失败:', err)
 			uni.showToast({
-				title: createRes.message || '创建会议失败',
+				title: '跳转失败',
 				icon: 'none'
 			})
 		}
-	} catch (error) {
-		console.error('[chatRoom] 创建会议失败:', error)
-		uni.showToast({
-			title: '创建会议失败',
-			icon: 'none'
-		})
-	}
+	})
 }

 // 加入会议（从MeetingCard点击加入）
@@ -793,24 +696,25 @@ function disconnectWebSocket() {
 // 处理接收到的新消息
 function handleNewMessage(message: ChatRoomMessageVO) {
 	console.log('[chatRoom] 收到新消息:', message)
-	
-	// 避免重复添加自己发送的消息（自己发送的消息已经通过sendMessage添加到列表）
-	if (message.senderId === currentUserId.value) {
-		console.log('[chatRoom] 跳过自己发送的消息')
+
+	// 避免重复添加自己发送的普通消息（自己发送的消息已经通过sendMessage添加到列表）
+	// 但会议消息（meet类型）始终添加，因为它是系统生成的通知
+	if (message.messageType !== 'meet' && message.senderId === currentUserId.value) {
+		console.log('[chatRoom] 跳过自己发送的普通消息')
 		return
 	}
-	
+
 	// 检查消息是否已存在（避免重复）
 	const exists = messages.some(m => m.messageId === message.messageId)
 	if (exists) {
 		console.log('[chatRoom] 消息已存在，跳过')
 		return
 	}
-	
+
 	// 添加新消息到列表
 	messages.push(message)
 	nextTick(() => scrollToBottom())
-	
+
 	// 可以添加消息提示音或震动
 	// uni.vibrateShort()
 }
--- a/urbanLifelineWeb/packages/workcase_wechat/pages/meeting/meetingCard/MeetingCard.uvue
+++ b/urbanLifelineWeb/packages/workcase_wechat/pages/meeting/meetingCard/MeetingCard.uvue
@@ -1,6 +1,9 @@
 <template>
    <!-- 消息会议卡片 -->
-	<view :class="['meeting-card', meeting.status ? `meeting-card--${meeting.status}` : '']">
+	<view v-if="loading" class="meeting-card meeting-card--loading">
+		<text class="meeting-card-loading">加载中...</text>
+	</view>
+	<view v-else-if="meeting" :class="['meeting-card', meeting.status ? `meeting-card--${meeting.status}` : '']">
 		<view class="meeting-card-header">
 			<view class="meeting-card-title">{{ meeting.meetingName || '未命名会议' }}</view>
 			<view class="meeting-card-status">
@@ -29,36 +32,76 @@
            </button>
 		</view>
 	</view>
+	<view v-else class="meeting-card meeting-card--error">
+		<text class="meeting-card-error">会议信息加载失败</text>
+	</view>
 </template>
 <script setup lang="ts">
 import type { VideoMeetingVO } from '../../../types/workcase/chatRoom'
 import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { workcaseChatAPI } from '../../../api/workcase'

 interface Props {
-	meeting: VideoMeetingVO
+	meetingId: string
 }

 const props = defineProps<Props>()
-console.log("meeting", JSON.stringify(props.meeting))
 const emit = defineEmits<{
 	join: [meetingId: string]
 }>()

+// 会议详情（从API获取的实时数据）
+const meeting = ref<VideoMeetingVO | null>(null)
+const loading = ref(false)
+
 // 当前时间，每秒更新
 const currentTime = ref(Date.now())
-let timer: ReturnType<typeof setInterval> | null = null
+let timeTimer: ReturnType<typeof setInterval> | null = null
+let refreshTimer: ReturnType<typeof setInterval> | null = null
+
+// 获取会议详情
+async function fetchMeetingInfo() {
+	if (!props.meetingId) return
+
+	try {
+		loading.value = true
+		const result = await workcaseChatAPI.getMeetingInfo(props.meetingId)
+		if (result.success && result.data) {
+			meeting.value = result.data
+			console.log('[MeetingCard] 获取会议信息成功:', result.data)
+		} else {
+			console.error('[MeetingCard] 获取会议信息失败:', result.message)
+		}
+	} catch (error) {
+		console.error('[MeetingCard] 获取会议信息异常:', error)
+	} finally {
+		loading.value = false
+	}
+}

 onMounted(() => {
+	// 初始加载会议信息
+	fetchMeetingInfo()
+
 	// 每秒更新当前时间
-	timer = setInterval(() => {
+	timeTimer = setInterval(() => {
 		currentTime.value = Date.now()
 	}, 1000)
+
+	// 每30秒刷新会议状态
+	refreshTimer = setInterval(() => {
+		fetchMeetingInfo()
+	}, 30000)
 })

 onUnmounted(() => {
-	if (timer !== null) {
-		clearInterval(timer)
-		timer = null
+	if (timeTimer !== null) {
+		clearInterval(timeTimer)
+		timeTimer = null
+	}
+	if (refreshTimer !== null) {
+		clearInterval(refreshTimer)
+		refreshTimer = null
 	}
 })

@@ -82,32 +125,26 @@ function formatDateTime(dateStr?: string): string {
 * 计算倒计时文本
 */
 const countdownText = computed((): string => {
-	const meeting = props.meeting
-	if (!meeting) {
+	if (!meeting.value || !meeting.value.startTime || !meeting.value.endTime) {
 		return ''
 	}
-	
-	// 检查必要字段
-	if (!meeting.startTime || !meeting.endTime) {
-		return ''
-	}
-	
+
 	// advance 默认为 0
-	const advanceMinutes = meeting.advance || 0
+	const advanceMinutes = meeting.value.advance || 0

 	const now = currentTime.value
 	// iOS和小程序兼容性处理
-	const startTime = new Date(meeting.startTime.replace(' ', 'T')).getTime()
-	const endTime = new Date(meeting.endTime.replace(' ', 'T')).getTime()
-	
+	const startTime = new Date(meeting.value.startTime.replace(' ', 'T')).getTime()
+	const endTime = new Date(meeting.value.endTime.replace(' ', 'T')).getTime()
+
 	// 检查时间解析是否有效
 	if (isNaN(startTime) || isNaN(endTime)) {
 		return ''
 	}
-	
+
 	const advanceTime = startTime - advanceMinutes * 60 * 1000

-	if (meeting.status === 'ended') {
+	if (meeting.value.status === 'ended') {
 		return '会议已结束'
 	}

@@ -131,7 +168,7 @@ const countdownText = computed((): string => {
 		return '可以入会'
 	} else if (now < endTime) {
 		// 会议进行中
-		if (meeting.status === 'ongoing') {
+		if (meeting.value.status === 'ongoing') {
 			return '会议进行中'
 		} else {
 			return '可以入会'
@@ -146,30 +183,25 @@ const countdownText = computed((): string => {
 * 是否可以加入会议
 */
 const canJoinMeeting = computed((): boolean => {
-	const meeting = props.meeting
-	if (!meeting) {
-		return false
-	}
-	
-	if (!meeting.startTime || !meeting.endTime) {
+	if (!meeting.value || !meeting.value.startTime || !meeting.value.endTime) {
 		return false
 	}

-	if (meeting.status === 'ended') {
+	if (meeting.value.status === 'ended') {
 		return false
 	}

-	const advanceMinutes = meeting.advance || 0
+	const advanceMinutes = meeting.value.advance || 0
 	const now = currentTime.value
 	// iOS和小程序兼容性处理
-	const startTime = new Date(meeting.startTime.replace(' ', 'T')).getTime()
-	const endTime = new Date(meeting.endTime.replace(' ', 'T')).getTime()
-	
+	const startTime = new Date(meeting.value.startTime.replace(' ', 'T')).getTime()
+	const endTime = new Date(meeting.value.endTime.replace(' ', 'T')).getTime()
+
 	// 检查时间解析是否有效
 	if (isNaN(startTime) || isNaN(endTime)) {
 		return false
 	}
-	
+
 	const advanceTime = startTime - advanceMinutes * 60 * 1000

 	// 在允许入会的时间窗口内（提前入会时间 ~ 结束时间）
@@ -180,8 +212,10 @@ const canJoinMeeting = computed((): boolean => {
 * 按钮文本
 */
 const buttonText = computed((): string => {
-	const meeting = props.meeting
-	if (meeting.status === 'ended') {
+	if (!meeting.value) {
+		return '加载中'
+	}
+	if (meeting.value.status === 'ended') {
 		return '会议已结束'
 	}
 	if (!canJoinMeeting.value) {
@@ -195,12 +229,12 @@ const buttonText = computed((): string => {
 */
 function handleJoinMeeting() {
 	console.log('[MeetingCard] handleJoinMeeting 被点击', {
-		meetingId: props.meeting.meetingId,
+		meetingId: props.meetingId,
 		canJoin: canJoinMeeting.value,
-		meeting: props.meeting
+		meeting: meeting.value
 	})

-	if (!props.meeting.meetingId) {
+	if (!props.meetingId) {
 		console.error('[MeetingCard] 会议ID不存在')
 		uni.showToast({
 			title: '会议ID不存在',
@@ -211,14 +245,14 @@ function handleJoinMeeting() {

 	if (!canJoinMeeting.value) {
 		console.warn('[MeetingCard] 不允许加入会议', {
-			status: props.meeting.status,
+			status: meeting.value?.status,
 			canJoin: canJoinMeeting.value
 		})
 		return
 	}

-	console.log('[MeetingCard] 触发join事件, meetingId:', props.meeting.meetingId)
-	emit('join', props.meeting.meetingId)
+	console.log('[MeetingCard] 触发join事件, meetingId:', props.meetingId)
+	emit('join', props.meetingId)
 }
 </script>
 <style scoped lang="scss">
--- a/urbanLifelineWeb/packages/workcase_wechat/pages/meeting/meetingCreate/MeetingCreate.scss
+++ b/urbanLifelineWeb/packages/workcase_wechat/pages/meeting/meetingCreate/MeetingCreate.scss
@@ -0,0 +1,116 @@
+.meeting-create-page {
+	min-height: 100vh;
+	background-color: #f5f7fa;
+	padding-bottom: 120rpx;
+}
+
+.page-header {
+	background-color: #fff;
+	padding: 32rpx;
+	border-bottom: 1px solid #ebeef5;
+}
+
+.page-title {
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #303133;
+}
+
+.form-container {
+	background-color: #fff;
+	margin-top: 16rpx;
+}
+
+.form-item {
+	padding: 24rpx 32rpx;
+	border-bottom: 1px solid #ebeef5;
+}
+
+.form-item.required .label-text::after {
+	content: ' *';
+	color: #f56c6c;
+}
+
+.form-label {
+	display: flex;
+	align-items: center;
+	margin-bottom: 16rpx;
+}
+
+.label-text {
+	font-size: 28rpx;
+	color: #606266;
+	font-weight: 500;
+}
+
+.required-star {
+	color: #f56c6c;
+	margin-left: 8rpx;
+}
+
+.form-input {
+	width: 100%;
+	padding: 16rpx 24rpx;
+	border: 1px solid #dcdfe6;
+	border-radius: 8rpx;
+	font-size: 28rpx;
+	color: #303133;
+}
+
+.picker-display {
+	padding: 16rpx 24rpx;
+	border: 1px solid #dcdfe6;
+	border-radius: 8rpx;
+	font-size: 28rpx;
+	color: #303133;
+}
+
+.picker-display .placeholder {
+	color: #c0c4cc;
+}
+
+.form-tip {
+	margin-top: 8rpx;
+}
+
+.form-tip text {
+	font-size: 24rpx;
+	color: #909399;
+}
+
+.form-footer {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	justify-content: space-between;
+	padding: 24rpx 32rpx;
+	background-color: #fff;
+	border-top: 1px solid #ebeef5;
+	box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+}
+
+.btn {
+	flex: 1;
+	padding: 24rpx 0;
+	border-radius: 8rpx;
+	font-size: 32rpx;
+	text-align: center;
+	border: none;
+}
+
+.btn-cancel {
+	background-color: #f5f7fa;
+	color: #606266;
+	margin-right: 16rpx;
+}
+
+.btn-submit {
+	background-color: #409eff;
+	color: #fff;
+}
+
+.btn-submit[loading] {
+	opacity: 0.7;
+}
--- a/urbanLifelineWeb/packages/workcase_wechat/pages/meeting/meetingCreate/MeetingCreate.uvue
+++ b/urbanLifelineWeb/packages/workcase_wechat/pages/meeting/meetingCreate/MeetingCreate.uvue
@@ -114,8 +114,8 @@
 <script setup lang="ts">
 import { ref, reactive, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { workcaseChatAPI } from '../../api/workcase/workcaseChat'
-import type { CreateMeetingParam } from '../../types/workcase/chatRoom'
+import { workcaseChatAPI } from '../../../api/workcase/workcaseChat'
+import type { CreateMeetingParam } from '../../../types/workcase/chatRoom'

 // 路由参数
 const roomId = ref('')
@@ -328,120 +328,5 @@ function handleCancel() {
 </script>

 <style scoped lang="scss">
-.meeting-create-page {
-	min-height: 100vh;
-	background-color: #f5f7fa;
-	padding-bottom: 120rpx;
-}
-
-.page-header {
-	background-color: #fff;
-	padding: 32rpx;
-	border-bottom: 1px solid #ebeef5;
-}
-
-.page-title {
-	font-size: 36rpx;
-	font-weight: 600;
-	color: #303133;
-}
-
-.form-container {
-	background-color: #fff;
-	margin-top: 16rpx;
-}
-
-.form-item {
-	padding: 24rpx 32rpx;
-	border-bottom: 1px solid #ebeef5;
-}
-
-.form-item.required .label-text::after {
-	content: ' *';
-	color: #f56c6c;
-}
-
-.form-label {
-	display: flex;
-	align-items: center;
-	margin-bottom: 16rpx;
-}
-
-.label-text {
-	font-size: 28rpx;
-	color: #606266;
-	font-weight: 500;
-}
-
-.required-star {
-	color: #f56c6c;
-	margin-left: 8rpx;
-}
-
-.form-input {
-	width: 100%;
-	padding: 16rpx 24rpx;
-	border: 1px solid #dcdfe6;
-	border-radius: 8rpx;
-	font-size: 28rpx;
-	color: #303133;
-}
-
-.picker-display {
-	padding: 16rpx 24rpx;
-	border: 1px solid #dcdfe6;
-	border-radius: 8rpx;
-	font-size: 28rpx;
-	color: #303133;
-}
-
-.picker-display .placeholder {
-	color: #c0c4cc;
-}
-
-.form-tip {
-	margin-top: 8rpx;
-}
-
-.form-tip text {
-	font-size: 24rpx;
-	color: #909399;
-}
-
-.form-footer {
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	display: flex;
-	justify-content: space-between;
-	padding: 24rpx 32rpx;
-	background-color: #fff;
-	border-top: 1px solid #ebeef5;
-	box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
-}
-
-.btn {
-	flex: 1;
-	padding: 24rpx 0;
-	border-radius: 8rpx;
-	font-size: 32rpx;
-	text-align: center;
-	border: none;
-}
-
-.btn-cancel {
-	background-color: #f5f7fa;
-	color: #606266;
-	margin-right: 16rpx;
-}
-
-.btn-submit {
-	background-color: #409eff;
-	color: #fff;
-}
-
-.btn-submit[loading] {
-	opacity: 0.7;
-}
+@import url('./MeetingCreate.scss')
 </style>