diff --git a/.env.development.yh b/.env.development.yh
index e9359d3e..910048f4 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -4,7 +4,7 @@ ENV = 'development.yh'
VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue
index f696c2b2..b3ef3b56 100644
--- a/src/pages/sparring/talk.vue
+++ b/src/pages/sparring/talk.vue
@@ -1,6 +1,140 @@
-
+
+
+
+
+
+
+
+
+ {{ detailInfo.chaName }}
+ {{ timeShow }}
+
+
+
+ {{ detailInfo.sceneDesc }}
+
+
+
+
\ No newline at end of file
+ import {
+ queryTraPartnerCharacterInfoById,
+ partnerChatReportTrigger
+ } from "@/api/sparring.js"
+ import ImagePreview from '@/components/image-preview/image-preview.vue';
+
+ 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
+ }
+ talkComRef.value.prepare()
+ })
+ }
+ const timeShow = ref('12:11')
+ const closeTalking = () => {
+ talkComRef.value.close()
+ }
+ onLoad((params) => {
+ traId.value = params.traId;
+ chaId.value = params.chaId;
+ talkingType.value = params.type;
+ isPreview.value = params.isPreview === '1'
+ getDetailInfo()
+ });
+
+
\ No newline at end of file
diff --git a/src/pages/sparring/talkCom.nvue b/src/pages/sparring/talkCom.nvue
index 098c07b0..074e3206 100644
--- a/src/pages/sparring/talkCom.nvue
+++ b/src/pages/sparring/talkCom.nvue
@@ -1,114 +1,91 @@
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index e6e13cf6..123d90a8 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -227,7 +227,7 @@
// #endif
}
const toTalking = () => {
- common.navigateTo('/pages/sparring/talk?traId=' + traId.value + '&chaId=' + chaId.value)
+ common.navigateTo('/pages/sparring/talk?traId=' + traId.value + '&chaId=' + chaId.value+ '&type=' + talkingType.value+ '&isPreview=' + (isPreview.value?'1':'0'))
}
const activeVoiceTalkingItemId = ref('')
// 关闭播放状态
diff --git a/src/static/images/sparring/close-talk.png b/src/static/images/sparring/close-talk.png
new file mode 100644
index 00000000..90ed80fe
Binary files /dev/null and b/src/static/images/sparring/close-talk.png differ