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

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
 # DEV
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # app入口
 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
@@ -15,23 +15,18 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # h5专用地址
 
-# 王洋洋
-# VITE_APP_BASE_H5_API_Url = 'http://25.64.16.140:9604'
-# 岳世凯
-# VITE_APP_BASE_H5_API_Url = 'http://25.64.16.141:9701'
-# 任东
-# VITE_APP_BASE_H5_API_Url = 'http://25.64.16.130:9602'
-# 线上
-
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
-#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116:7001'
 
 # 任东
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
 # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.130:9604'
 # 张建成
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
+VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.144:9602'
 # 王洋洋
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
 # 于嘉文

src/pages/course/components/talkingItem.vue

@@ -414,6 +414,7 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 	}
 	const playVoice = (readType = 'pgth') =>{
 		let _content = showContent.value
+		console.log(_content)
 		if(!_content){
 			common.msg('没有可以播放的文字信息！')
 			return

src/pages/course/components/touchBtn.vue

@@ -276,6 +276,9 @@
 	const getRecordPermission = (obj) => {
 		if (isTalking.value) {
 			common.msg('操作频繁，请稍后重试！')
+			setTimeout(() => {
+				isTalking.value = false
+			}, 500)
 			return
 		}
 		showOverlayTalking(obj)

src/pages/course/index.vue

@@ -345,6 +345,9 @@ import { onShow } from "@dcloudio/uni-app"
 		})
 		changeTab({name:activeTab.value || '全部'})
 	});
+	onShow(()=>{
+		changeTab({name:activeTab.value || '全部'})
+	})
 </script>
 
 

src/pages/course/study.vue

@@ -768,6 +768,7 @@ const uploadRecordNow = voicePath => {
   })
     .then(res => {
       let _res = JSON.parse(res.data)
+			console.log(_res)
       if (_res.rtnCode === '0000') {
         talkingList.value = talkingList.value.map(t => {
           if (t.id === _id) {
@@ -778,7 +779,9 @@ const uploadRecordNow = voicePath => {
               qnsId: _data.qnsId,
               talkingContent: '',
               talkingVoice: voicePath,
-              intrctId: _res.body.chatBody,
+              recordId: _res.body.chatBody.recordId,
+							asrStartTm: unref(lastTalkingInfo).asrStartTm,
+							stdyPgrphId: _res.body.chatBody.stdyPgrphId,
               type: 1,
               userInfo: {
                 ...choiceTeacherInfo.value
@@ -789,12 +792,14 @@ const uploadRecordNow = voicePath => {
             return t
           }
         })
+				console.log(11111,_res.body.chatBody)
         scrollToBottomNow()
       } else {
       }
       setIsUploadingVoice()
     })
     .catch(err => {
+			console.log('err',err)
       setIsUploadingVoice()
       talkingList.value = talkingList.value.filter(t => t.id !== _id)
       uni.showToast({