diff --git a/.gitignore b/.gitignore index c121daee..be270b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -203,4 +203,5 @@ cython_debug/ THAI-Platform/* urbanLifelineWeb/packages/wechat_demo/* urbanLifelineWeb/packages/workcase_wechat/unpackage/* -docs/AI训练资料 \ No newline at end of file +docs/AI训练资料 +tellhow-app2/ \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1ddf..574dfaab 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,8 @@ + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index c10af20f..80478e6a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,10 @@ { "maven.view": "hierarchical", "editor.tabSize": 4, + "[*.ts]": { + "editor.tabSize": 2 + }, + "[*.vue]": { + "editor.tabSize": 2 + } } \ No newline at end of file diff --git a/ai-management-platform b/ai-management-platform new file mode 160000 index 00000000..410de71b --- /dev/null +++ b/ai-management-platform @@ -0,0 +1 @@ +Subproject commit 410de71bf2e4b1d4878de04f07edaad378b214e6 diff --git a/pigx-ai-app b/pigx-ai-app new file mode 160000 index 00000000..f1588359 --- /dev/null +++ b/pigx-ai-app @@ -0,0 +1 @@ +Subproject commit f1588359101450ff35b165f9c6d0ee9874a87022 diff --git a/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue b/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue index b9fbf964..c2dbc6b2 100644 --- a/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue +++ b/urbanLifelineWeb/packages/workcase_wechat/pages/chatRoom/chatRoom/chatRoom.uvue @@ -715,9 +715,33 @@ async function handleJoinMeeting(meetingId: string) { console.log('[handleJoinMeeting] 完整会议URL:', fullMeetingUrl) - // 跳转到会议页面 - uni.navigateTo({ - url: `/pages/meeting/Meeting?meetingId=${meetingId}&meetingName=${encodeURIComponent(meetingName)}&jitsiIframeUrl=${encodeURIComponent(fullMeetingUrl)}` + // 小程序环境:显示提示,引导用户复制链接在浏览器打开 + uni.showModal({ + title: '视频会议', + content: '微信小程序暂不支持视频会议,请复制链接在浏览器中打开', + confirmText: '复制链接', + cancelText: '取消', + success: (res) => { + if (res.confirm) { + // 复制链接到剪贴板 + uni.setClipboardData({ + data: fullMeetingUrl, + success: () => { + uni.showToast({ + title: '链接已复制,请在浏览器中打开', + icon: 'none', + duration: 3000 + }) + }, + fail: () => { + uni.showToast({ + title: '复制失败,请手动复制', + icon: 'none' + }) + } + }) + } + } }) } else { console.error('[handleJoinMeeting] 加入会议失败, isSuccess:', isSuccess, 'data:', meetingData)