From d4d05080bd6e2c8e5130a335285b74336598aa33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Mon, 17 Nov 2025 13:31:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/study.vue | 6 ++++++ src/pages/index/dialog.vue | 1 + src/pages/sparring/result.vue | 2 ++ src/pages/sparring/tip.vue | 7 ++++--- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 21397279..ce425527 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -119,6 +119,8 @@ + + @@ -134,6 +136,8 @@ import TalkingItem from '@/pages/course/components/talkingItem.vue' import ImagePreview from '@/components/image-preview/image-preview.vue' import PreviewDetail from '@/components/image-preview/preview-detail.vue' import TouchBtn from '@/pages/course/components/touchBtn.vue' +import badge from '@/components/points-and-badge/badge'; +import points from '@/components/points-and-badge/points'; import { useSocketStore } from '@/store/socket.js' import { useStorageStore } from '@/store/storage.js' @@ -159,6 +163,8 @@ const flagVal = ref('1') const isUploadingVoice = ref(false) const isPreview = ref(false) const IsAndEnv = ref(getPhoneEnvBool('AND')) +const badgeRef = ref(null); +const pointsRef = ref(null); const ajaxApi = computed(() => (isPreview.value ? textChartPreviewApi : textChartApi)) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index ae474ff7..8a047825 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -163,6 +163,7 @@ } from '@/api/dialog.js'; import Feedback from './components/feedback.vue'; import History from './components/history.vue'; + import badge from '@/components/points-and-badge/badge'; const { statusBarHeight } = uni.getWindowInfo(); diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index dcdadc6b..a309e982 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -99,6 +99,7 @@ } from "@/api/sparring.js" const traId = ref('') const execId = ref('') + const talkingType = ref('') const feedbackRef = ref() const roleInfo = ref({}) const showAllTalk = ref(false) @@ -251,6 +252,7 @@ onLoad((params) => { traId.value = params.traId; execId.value = params.execId + talkingType.value = params.type; showLoading.value = true getData() }); diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index 6b97136a..2e318ba0 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -249,7 +249,7 @@ const answerText = ref('') const touchBtnCallBack = ref(null) const initsocketTask = () => { - let _src = talkingType.value === 'preview'?'/trapractice/partnersocket/open':'/trapractice/partnersocket/open' + let _src = talkingType.value === 'preview'?'/trapractice/previewsocket/open':'/trapractice/partnersocket/open' socketStore.creatSocket(_src + '?summary='); // unref(SocketObj).on('open', (res)=>{ // if(!answerIsOver.value){ @@ -404,11 +404,12 @@ const overTalking = () => { partnerChatReportTrigger({ execId: execId.value, - traId: traId.value + traId: traId.value, + talkingType: talkingType.value }).then(res=>{ watchFlag.value = 1; socketStore?.closeSocket(); - common.navigateTo('/pages/sparring/result?traId=' + traId.value + '&execId=' + execId.value) + common.navigateTo('/pages/sparring/result?traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value) }) } const sendMessage = (data) => { From 4c6fdfd6b7a0687c1ea6c1e8e31d320acab69a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Mon, 17 Nov 2025 14:40:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/sparring/chooseRole.vue | 5 +++-- src/pages/sparring/components/talking-item.vue | 6 +++++- src/pages/sparring/detail.vue | 13 +++++++------ src/pages/sparring/result.vue | 5 ++++- src/pages/sparring/tip.vue | 10 ++++++---- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/pages/sparring/chooseRole.vue b/src/pages/sparring/chooseRole.vue index e90b0c5b..70f94dd0 100644 --- a/src/pages/sparring/chooseRole.vue +++ b/src/pages/sparring/chooseRole.vue @@ -91,13 +91,14 @@ console.log('轮播图切换:', e); currentIndex.value = data.index; } - + const isPreview = ref(false) const toTip = () => { - common.navigateTo('/pages/sparring/tip?traId=' + traId.value + '&chaId=' + activeRole.value.chaId + '&type=' + talkingType.value) + common.navigateTo('/pages/sparring/tip?traId=' + traId.value + '&chaId=' + activeRole.value.chaId + '&type=' + talkingType.value+ '&isPreview=' + (isPreview.value ?'1':'')) } onLoad((params) => { traId.value = params.traId; talkingType.value = params.type + isPreview.value = params.isPreview === '1' }); onMounted(() => { getDetailInfo() diff --git a/src/pages/sparring/components/talking-item.vue b/src/pages/sparring/components/talking-item.vue index 7173256b..06426b37 100644 --- a/src/pages/sparring/components/talking-item.vue +++ b/src/pages/sparring/components/talking-item.vue @@ -16,7 +16,7 @@ :isAnswering="props.isAnswering" @handleEvents="handleEvents" :activeVoiceId="activeVoiceId"> - + 回答提示 @@ -71,6 +71,10 @@ default: false, type: Boolean }, + isExam: { + default: false, + type: Boolean + }, }) watch(() => props.activeVoiceId, () => {}, { deep: true, diff --git a/src/pages/sparring/detail.vue b/src/pages/sparring/detail.vue index 26db1305..c3c3fed6 100644 --- a/src/pages/sparring/detail.vue +++ b/src/pages/sparring/detail.vue @@ -60,12 +60,13 @@ @click="previewFile(item)"> {{ item.dataName }}.{{ item.dataSuffix }} - - 预览陪练 + + + + 去练习 + 去考试 @@ -118,7 +119,7 @@ }) } const toChooseRole = type => { - common.navigateTo('/pages/sparring/chooseRole?traId=' + traId.value + '&type=' + type) + common.navigateTo('/pages/sparring/chooseRole?traId=' + traId.value + '&type=' + type + '&isPreview=' + (isPreview.value ?'1':'')) } const isPreview = ref(false) onLoad(params => { diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index a309e982..caae7a50 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -182,7 +182,8 @@ const getData = () => { partnerChatReport({ traId: traId.value, - execId: execId.value + execId: execId.value, + talkingType: isPreview.value? 'preview' : 'practice' // traId: 'PARTNERINFO02501812207220251103160409000007402', // execId: 'db2f275b-c04a-4572-83dd-74a95ff49d67' }).then(res => { @@ -249,11 +250,13 @@ console.log(_str) return _str } + const isPreview = ref(false) onLoad((params) => { traId.value = params.traId; execId.value = params.execId talkingType.value = params.type; showLoading.value = true + isPreview.value = params.isPreview === '1' getData() }); onMounted(() => {}) diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index 2e318ba0..8212515e 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -58,7 +58,7 @@ @@ -129,6 +129,7 @@ const traId = ref('') const chaId = ref('') const talkingType = ref('') + const isPreview = ref(false) const detailInfo = ref({}) const currentIndex = ref(0) const showRoleInfo = ref(false) @@ -249,7 +250,7 @@ const answerText = ref('') const touchBtnCallBack = ref(null) const initsocketTask = () => { - let _src = talkingType.value === 'preview'?'/trapractice/previewsocket/open':'/trapractice/partnersocket/open' + let _src = isPreview.value ?'/trapractice/previewsocket/open':'/trapractice/partnersocket/open' socketStore.creatSocket(_src + '?summary='); // unref(SocketObj).on('open', (res)=>{ // if(!answerIsOver.value){ @@ -405,11 +406,11 @@ partnerChatReportTrigger({ execId: execId.value, traId: traId.value, - talkingType: talkingType.value + talkingType: isPreview.value? 'preview' : 'practice' }).then(res=>{ watchFlag.value = 1; socketStore?.closeSocket(); - common.navigateTo('/pages/sparring/result?traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value) + common.navigateTo('/pages/sparring/result?traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':'')) }) } const sendMessage = (data) => { @@ -422,6 +423,7 @@ traId.value = params.traId; chaId.value = params.chaId; talkingType.value = params.type; + isPreview.value = params.isPreview === '1' getDetailInfo() }); onUnload(() => { From 01720e9550fa70faa3942eba940ff881c5d9227d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Mon, 17 Nov 2025 16:07:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=AF=B9=E8=AF=9D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/dialog.vue | 6 ++++++ src/pages/search/search.vue | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 8a047825..e492a5e7 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -650,6 +650,12 @@ case '错题': common.navigateTo('/pages/wrongQuestionRecord/index'); break; + case '去PK': + common.navigateTo('/pages/competition/index'); + break; + case '分析': + common.navigateTo('/pages/analytics/study'); + break; default: common.msg('页面建设中，敬请期待！'); break; diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue index 4c4cf6a7..3c2deddb 100644 --- a/src/pages/search/search.vue +++ b/src/pages/search/search.vue @@ -48,6 +48,12 @@ 暂无任何搜索记录 +