tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Browse Source
This commit is contained in:
田岩
2026-03-13 17:30:45 +08:00
parent cc35254347 9655fedd6e
commit 39cfe08495
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development.yh
+2 -2
View File
@@ -4,9 +4,9 @@ ENV = 'development.yh'
# VITE_APP_BASE_H5_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 = 'http://25.18.122.78:9786'
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_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'
src/pages/course/study.vue
+34 -16
View File
@@ -957,7 +957,7 @@
pgrphId: unref(lastTalkingInfo).pgrphId,
qnsId: unref(lastTalkingInfo).qnsId,
talkingContent: '',
talkingVoice: voicePath,
talkingVoice: '',
type: 1,
userInfo: {
...choiceTeacherInfo.value
@@ -965,9 +965,25 @@
id: _id
})
setIsUploadingVoice()
scrollToBottomNow()
// #endif
//#ifdef APP-PLUS
talkingList.value.push({
crsId: crsId.value,
pgrphId: unref(lastTalkingInfo).pgrphId,
qnsId: unref(lastTalkingInfo).qnsId,
talkingContent: '',
talkingVoice: '',
intrctId: '',
isLoading: true,
type: 1,
userInfo: {
...choiceTeacherInfo.value
},
id: _id
})
// #endif
scrollToBottomNow()
}
// 新录音组件语音提交
const submitVoice = ({
@@ -1019,11 +1035,13 @@
id: _id,
voiceTime: 0
}
talkingList.value.pop()
talkingList.value.push(_obj)
scrollToBottomNow()
setIsUploadingVoice()
})
.catch((err) => {
talkingList.value.pop()
setIsUploadingVoice()
})
}
@@ -1063,20 +1081,20 @@
scrollToBottomNow()
// #endif
//#ifdef APP-PLUS
talkingList.value.push({
crsId: crsId.value,
pgrphId: unref(lastTalkingInfo).pgrphId,
qnsId: unref(lastTalkingInfo).qnsId,
talkingContent: '',
talkingVoice: voicePath,
intrctId: '',
isLoading: true,
type: 1,
userInfo: {
...choiceTeacherInfo.value
},
id: _id
})
// talkingList.value.push({
// crsId: crsId.value,
// pgrphId: unref(lastTalkingInfo).pgrphId,
// qnsId: unref(lastTalkingInfo).qnsId,
// talkingContent: '',
// talkingVoice: voicePath,
// intrctId: '',
// isLoading: true,
// type: 1,
// userInfo: {
// ...choiceTeacherInfo.value
// },
// id: _id
// })
scrollToBottomNow()
let _path = isPreview.value ? '/trastudy/traStdychat/previewVoiceChart' : '/trastudy/traStdychat/voiceChart'
commonUploadVoiceFile(voicePath, _path, {
src/pages/sparring/components/answer.vue
+1
View File
@@ -145,6 +145,7 @@
talkVoiceObj.value.play();
}, 100);
} else {
emit('changePlay', unref(dataInfo)?.id);
playVoice();
}
};