From 2152c11b861d8cad050f0f584c73e06e01d735af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 25 Nov 2025 14:56:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=E5=B7=A6=E5=88=92?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/pages.json | 1 + src/pages/sparring/result.vue | 4 +++- src/pages/sparring/tip.vue | 2 +- src/pagesB.json | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index ea92cff2..67f5d356 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' @@ -14,7 +14,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://192.168.108.129' # dev -# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT diff --git a/src/pages.json b/src/pages.json index 20c296e6..6909ab85 100644 --- a/src/pages.json +++ b/src/pages.json @@ -515,6 +515,7 @@ "path": "pages/sparring/result", "style": { "navigationBarTitleText": "AI陪练报告", + "disableSwipeBack": true, "app-plus": { "titleNView": false } diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 5bc4ab0a..4f4c9688 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -87,7 +87,8 @@ import { onShow, onLoad, - onUnload + onUnload, + onBackPress } from '@dcloudio/uni-app'; import common from '@/common/common' import Feedback from './components/feedback.vue'; @@ -275,6 +276,7 @@ getData() }); onMounted(() => {}) + onBackPress((res) => res.from === 'backbutton'); \ No newline at end of file + diff --git a/src/pages/sparring/talk1.nvue b/src/pages/sparring/talk1.nvue new file mode 100644 index 00000000..ed73cf88 --- /dev/null +++ b/src/pages/sparring/talk1.nvue @@ -0,0 +1,112 @@ + + + + diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue index 17494741..37784c21 100644 --- a/src/pages/sparring/tip.vue +++ b/src/pages/sparring/tip.vue @@ -7,7 +7,7 @@ - + {{ detailInfo.traName }} 内容由AI生成 @@ -100,7 +100,8 @@ import { onShow, onLoad, - onUnload + onUnload, + onBackPress } from '@dcloudio/uni-app'; import common from '@/common/common'; import TouchBtn from './components/touchBtn.vue'; @@ -404,40 +405,31 @@ }); watchFlag.value += 1; }; - + const goBack = () => { + if (detailInfo.value.traInterTyp === '01') { + overTalking() + }else{ + common.navigateBack() + } + } const overTalking = () => { - partnerChatReportTrigger({ - execId: execId.value, - traId: traId.value, - talkingType: isPreview.value? 'preview' : 'practice' - }).then(res=>{ - watchFlag.value = 1; - socketStore?.closeSocket(); - changePlayItemId('') - pointAndBadgesRun(talkingType.value === '01'? '07': '08', null, ()=>{ - common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':'')) - }) + common.show('提示','确定结束陪练吗？').then(res => { + if (res) { + partnerChatReportTrigger({ + execId: execId.value, + traId: traId.value, + talkingType: isPreview.value? 'preview' : 'practice' + }).then(res=>{ + watchFlag.value = 1; + socketStore?.closeSocket(); + changePlayItemId('') + pointAndBadgesRun(talkingType.value === '01'? '07': '08', null, ()=>{ + common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':'')) + }) + }) + } }) } - const getPointsList = (pointsList = [], badgesList = []) => { - pointsRef.value.open(pointsList, badgesList); - - } - const badgeConfirm = (status, pointsList = [], badgesList = []) => { - badgeRef.value.close(); - overTalking() - }; - // 积分确认 - const pointsConfirm = (status, pointsList = [], badgesList = []) => { - pointsRef.value.close(); - if (badgesList.length > 0) { - nextTick(() => { - setTimeout(() => { - badgeRef.value.open(pointsList, badgesList); - }, 500); - }); - } - }; const sendMessage = (data) => { unref(SocketObj).send(data); }; @@ -458,6 +450,7 @@ onMounted(() => { // getDetailInfo() }) + onBackPress((res) => res.from === 'backbutton');