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

.env.development

@@ -15,7 +15,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # h5专用地址
 
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # dev
@@ -27,10 +27,8 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
 
 # 任东
-
-#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_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.140:9604'
 # 张建成

src/pages/course/study.vue

@@ -719,7 +719,7 @@ onHide(() => {
   //#ifdef APP-PLUS
   uni.offKeyboardHeightChange(setHeight)
   // #endif
-  if (watchFlag.value === 1) return
+  // if (watchFlag.value === 1) return
   changePlayItemId('')
   socketStore.closeSocket()
   // common.show('提示信息', '检测到您已离开，即将退出学习页面。',false, '','确认').then((res) => {
@@ -739,6 +739,7 @@ onUnload(() => {
   changePlayItemId()
   teacherVoiceObj?.stop?.()
   teacherVoiceObj.src = ''
+  socketStore.closeSocket()
 })
 const testAnswer = computed(() => {
   if (talkingList.value.length < 5) return true

src/pages/index/dialog.vue

@@ -200,7 +200,9 @@
 
 
 	const createNewDialog = () => {
-		common.msg('已经是最新对话')
+		if(talkingList.value.length === 0){
+			common.msg('已经是最新对话')
+		}
 		common.redirectTo(`/pages/index/dialog`)
 	}
 	const showModelComfirm = ref(false)