From 723059b09385b8e1dd838f4d076053300a257e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Thu, 4 Dec 2025 14:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E9=A1=B5=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .../cached-avatar/cached-avatar.vue           |   2 +-
 src/pages/competition/result.vue              |   1 +
 src/pages/sparring/talk.vue                   | 146 +++++++++---------
 4 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/.env.development b/.env.development
index 9a63819e..4e467440 100644
--- a/.env.development
+++ b/.env.development
@@ -5,13 +5,11 @@ 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:7001'
 
 
 
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
-
-
 # VITE_APP_BASE_API_Url = 'http://192.168.247.200'
 # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001'
 # VITE_APP_BASE_API_Url = 'http://192.168.108.129'
diff --git a/src/components/cached-avatar/cached-avatar.vue b/src/components/cached-avatar/cached-avatar.vue
index ff1a20b6..cc2475d3 100644
--- a/src/components/cached-avatar/cached-avatar.vue
+++ b/src/components/cached-avatar/cached-avatar.vue
@@ -8,7 +8,7 @@
 	import { ref, reactive, watch, onMounted } from 'vue';
 	import { defaultAvatar } from '@/enum.js';
 	import { getUserInfo } from '@/common/common';
-
+	
 	const imagePath = ref('');
 	const imageAddr = ref('');
 
diff --git a/src/pages/competition/result.vue b/src/pages/competition/result.vue
index d6077194..ec763a07 100644
--- a/src/pages/competition/result.vue
+++ b/src/pages/competition/result.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="main_div max_page">
+		<nav-bar :is_seat="true"></nav-bar>
 		<!-- 顶部一些按钮 -->
 		<view class="top-button-div">
 			<view class="back_div" @click="common.navigateBack()">
diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue
index 86dc3554..9c936d0c 100644
--- a/src/pages/sparring/talk.vue
+++ b/src/pages/sparring/talk.vue
@@ -1,90 +1,82 @@
 <template>
-	<talkCom ref="talkComRef" />
-	<ImagePreview class="show-box-avatar" :src="detailInfo.ossAddr" :isCache="true">
-	</ImagePreview>
+	<cached-avatar class="show-box-avatar"></cached-avatar>
 	<view class="show-box">
 		<view class="role-info">
-
-			<ImagePreview class="role-avatar" :src="detailInfo.ossAddr" :isCache="true">
-			</ImagePreview>
-			<view class="role-name">{{ detailInfo.chaName }}</view>
+			<cached-avatar class="role-avatar"></cached-avatar>
+			<view class="role-name">{{ userInfo.userName }}</view>
 			<view class="title-time">{{ timeShow }}</view>
 		</view>
 		<view class="body-scene">
-			<!-- 场景描述 -->
-			{{ detailInfo.sceneDesc }}
+			{{ sceneDesc }}
 		</view>
 		<view class="close-btn" @click="closeTalking"></view>
-		<!-- phone-icon.png -->
 	</view>
 </template>
-<script setup>
-	import {
-		onLoad,
-		onBackPress
-	} from '@dcloudio/uni-app'
-	import {
-		ref,
-		computed
-	} from 'vue'
-	import talkCom from './talkCom.nvue'
-	import {
-		queryTraPartnerCharacterInfoById,
-		partnerChatReportTrigger
-	} from "@/api/sparring.js"
-	import ImagePreview from '@/components/image-preview/image-preview.vue';
+<script>
+	import { getUserInfo } from '@/common/common';
+	import talkCom from './talkCom.nvue';
+	import { queryTraPartnerCharacterInfoById, partnerChatReportTrigger } from '@/api/sparring.js';
 	import common from '@/common/common';
 
-	const traId = ref('')
-	const chaId = ref('')
-	const talkingType = ref('')
-	const isPreview = ref(false)
-	const talkComRef = ref()
-	const detailInfo = ref({})
-	const getDetailInfo = () => {
-		queryTraPartnerCharacterInfoById({
-			traId: traId.value,
-			chaId: chaId.value
-		}).then(res => {
-			detailInfo.value = {
-				...res.body
+	export default {
+		components: {
+			talkCom // 注册组件
+		},
+		data() {
+			return {
+				traId: '',
+				chaId: '',
+				talkingType: '',
+				execId: '',
+				isPreview: '',
+				chaName: '',
+				sceneDesc: '',
+				timeShow: '',
+				isStop: '',
+				userInfo: {
+					userName: ''
+				},
+				ws: null,
+				wsUrl: 'wss://aitstest.jlbank.com.cn:7001/trapractice/voiceCallSocket/voiceCall?summary=3D072C9D242C96EA3F0FD647CB14A6F40B69FF5FF8BA968CB70A2AE3F812F1B6DFD1AAF7AEB6E777DFF5629704647095' // 替换为实际后端地址
+			};
+		},
+		methods: {
+			// 关闭通话
+			closeTalking() {
+				this.overTalking();
+			},
+			// 结束通话生成报告
+			overTalking() {
+				partnerChatReportTrigger({
+					execId: this.execId,
+					traId: this.traId,
+					talkingType: this.isPreview ? 'preview' : 'practice'
+				}).then((res) => {
+					common.navigateTo(
+						'/pages/sparring/result?isOver=1&traId=' +
+							this.traId +
+							'&execId=' +
+							this.execId +
+							'&type=' +
+							this.type +
+							'&isPreview=' +
+							(this.isPreview ? '1' : '')
+					);
+				});
 			}
-			talkComRef.value.prepare({
-				traId: traId.value,
-				chaId: chaId.value,
-				traTyp: talkingType.value
-			})
-		})
-	}
-	const timeShow = ref('12:11')
-	const closeTalking = () => {
-		talkComRef.value.close()
-		overTalking()
-	}
-	const overTalking = () => {
-		partnerChatReportTrigger({
-			execId: execId.value,
-			traId: traId.value,
-			talkingType: isPreview.value? 'preview' : 'practice'
-		}).then(res=>{
-			common.navigateTo('/pages/sparring/result?isOver=1&traId=' 
-			+ traId.value 
-			+ '&execId=' 
-			+ execId.value 
-			+ '&type=' 
-			+ talkingType.value 
-			+ '&isPreview=' 
-			+ (isPreview.value ?'1':''))
-		})
-	}
-	onLoad((params) => {
-		traId.value = params.traId;
-		chaId.value = params.chaId;
-		talkingType.value = params.type;
-		isPreview.value = params.isPreview === '1'
-		getDetailInfo()
-	});
-	onBackPress((res) => res.from === 'backbutton');
+		},
+		onLoad(e) {
+			// 页面加载时初始化数据
+			this.traId = e.traId ?? '';
+			this.chaId = e.chaId ?? '';
+			this.type = e.type ?? '';
+			this.isPreview = e.isPreview === '1';
+			this.userInfo = getUserInfo();
+		},
+		onBackPress(res) {
+			return res.from === 'backbutton';
+		}
+	};
 </script>
 <style scoped lang="scss">
 	.show-box {
@@ -141,8 +133,8 @@
 		width: calc(100% - 90rpx);
 		left: 45rpx;
 		padding: 25rpx;
-		color: rgba(255, 255, 255, .8);
-		border: 2px dashed rgba(255, 255, 255, .3);
+		color: rgba(255, 255, 255, 0.8);
+		border: 2px dashed rgba(255, 255, 255, 0.3);
 		border-radius: 15rpx;
 	}
 
@@ -161,4 +153,4 @@
 		left: 50%;
 		margin-left: -59rpx;
 	}
-</style>
\ No newline at end of file
+</style>