From 7eb43b153b20f9f116efbab3be2f66424a0affea Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 15 Jul 2025 15:23:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9B=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../image-preview/image-preview.vue           |  8 +++-
 src/pages.json                                | 14 +------
 src/pages/course/components/talkingItem.vue   |  9 ++++-
 src/pages/course/components/touchBtn.vue      | 39 +++++++++++++++----
 src/pages/course/study.vue                    | 28 ++++++++++---
 src/pages/courseDetail/index.vue              |  2 +-
 src/pages/index/dialog.vue                    | 10 +++--
 src/pages/index/index.vue                     |  2 +-
 src/pagesOther.json                           |  2 +-
 9 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index c281727d..8e766627 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -64,6 +64,10 @@
 		watch: {
 			imgId: {
 				handler(newval, oldval) {
+					if(newval.indexOf('/') === 0) {
+						this.imgUrlShow = this.base_url + newval
+						return
+					}
 					if(newval.indexOf('http') === 0){
 						this.imgUrlShow = newval
 						return
@@ -128,7 +132,9 @@
 		},
 		mounted() {
 			if (this.imgId) {
-				if(this.imgId.indexOf('http') === 0){
+				if(this.imgId.indexOf('/') === 0) {
+					this.imgUrlShow = this.base_url + this.imgId
+				}else if(this.imgId.indexOf('http') === 0){
 					this.imgUrlShow = this.imgId
 				}else{
 					this.getPreviewUrlBlob(this.imgId);
diff --git a/src/pages.json b/src/pages.json
index 4cd6d89d..5ffa6f61 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -162,7 +162,7 @@
             },
             {
                 "text": "学习",
-                "pagePath": "pages/study/index"
+                "pagePath": "pages/course/index"
             },
             {
                 "text": "场景",
@@ -198,15 +198,5 @@
             "bounce": "none"
         }
     },
-    "uniIdRouter": {},
-	"condition" : { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
-	}
+    "uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 5e5a3430..43b5ec4e 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -147,8 +147,13 @@
 					></image>
 				</view>
 				<view class="icon text-btn" v-if="type === 1" @click.stop="translateVoice(dataInfo)">文</view>
-				<view class="icon text-right-btn" @click.stop="finishQuestion(dataInfo)" v-if="isLast">完成</view>
-				<view class="icon text-right-btn" @click.stop="withdraw" v-show="showWithdraw">撤回
+				<view class="icon text-right-btn" @click.stop="finishQuestion(dataInfo)" v-show="isLast">完成</view>
+				<view 
+					class="icon text-right-btn" 
+					@click.stop="withdraw" 
+					v-show="isLast"
+				>撤回
+				<!-- v-show="showWithdraw" -->
 				</view>
 			</view>
 		</view>
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index e6c25f2f..9bc227b7 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script setup>
-import { toRefs, ref, computed, unref, onMounted, onUnmounted, nextTick } from 'vue';
+import { toRefs, ref, computed, unref, onMounted, onUnmounted, nextTick, watch } from 'vue';
 import common from '../../../common/common';
 import permission from '@/common/permission.js'
 const emit = defineEmits(['uploadVoice', 'submitAnswer','startRecord'])
@@ -46,9 +46,17 @@ const props = defineProps({
 	isDisabled:{
 		default: Boolean,
 		type: true
+	},
+	isLoading:{
+		default:	false,
+		type: Boolean
 	}
 })
 const { isDisabled } = toRefs(props)
+const isLoadingState = computed(() => props.isLoading)
+watch(()=>props.isLoading,()=>{},{
+	deep:true,immediate:true
+})
 const showTalkingModel = ref(false)
 const keyboardIsShow = ref(false)
 const answerValue = ref('')
@@ -63,6 +71,12 @@ const initRecord = () => {
 	recordObjCom.value = uni.getRecorderManager()
 	unref(recordObjCom)?.onStop((res, duration)=>{
 		audioPath.value = res.tempFilePath
+		uni.saveFile({
+			tempFilePath:res.tempFilePath,
+			success:(res)=>{
+				console.log(res)
+			}
+		})
 	})
 	unref(recordObjCom).start({format:'mp3'})
 	stopRecord()
@@ -99,10 +113,6 @@ onMounted(async ()=>{
 	// 	}
 	// // #endif
 })
-// const playRecord = () => {
-// 	audioObj.src = audioPath.value
-// 	unref(audioObj).play()
-// }
 // 录音结束
 
 // 记录 按下移动位置
@@ -116,6 +126,9 @@ const isOut = computed(() => {
 	let moveVal = (windowInfo.screenHeight - touchY.value) > _btnHeight
 	return moveVal
 })
+const outScreen = computed(()=>{
+	(windowInfo.screenHeight - touchY.value) <= 0
+})
 const recNum = ref(1)
 const activeNum = ref(1)
 
@@ -135,8 +148,16 @@ const getRecordPermission = async (obj) => {
 	// #endif
 }
 const showOverlayTalking = (obj) => {
-	recNum.value += 1
+	if(isLoadingState.value){
+		uni.showToast({
+			title: '发送回答中，请稍后再试！',
+			icon: "none",
+			duration:1000
+		})
+		return
+	}
 	emit('startRecord')
+	recNum.value += 1
 	if(!isDisabled.value){
 		showTalkingModel.value = true
 		touchX.value = obj.changedTouches[0].pageX
@@ -150,7 +171,7 @@ const showOverlayTalking = (obj) => {
 		},59 * 1010)
 	}else{
 		uni.showToast({
-			title: '请先获取问题信息！',
+			title: '暂无问题需要回答！',
 			icon: "none",
 			duration:1000
 		})
@@ -169,6 +190,7 @@ const hideOverlayTalking = (obj) => {
 			},1000)
 		}
 	}else{
+		showTalkingModel.value = false
 		common.msg('录音失败，请重试!')
 	}
 	activeNum.value = recNum.value
@@ -177,6 +199,9 @@ const hideOverlayTalking = (obj) => {
 const handleMove = (obj) => {
 	touchX.value = obj.changedTouches[0].pageX
 	touchY.value = obj.changedTouches[0].pageY
+	if(outScreen.value){
+		hideOverlayTalking(obj)
+	}
 }
 // 发送文本
 const showKeyboard = () => {
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 0ab17c52..ac21596f 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -82,7 +82,8 @@
 				@uploadVoice="uploadRecordNow" 
 				@submitAnswer="submitAnswerNow"
 				@startRecord="changePlayItemId('')"
-				:isDisabled="((lastTalkingInfo.type||0) !== 4)  ||  isUploadingVoice"
+				:isLoading="isUploadingVoice"
+				:isDisabled="((lastTalkingInfo.type||0) !== 4)"
 			/>
 		</view>
 		<uv-overlay :show="showSeekModel" opacity=".6" @click="showSeekModel = false">
@@ -194,7 +195,7 @@ const getData = async (flag) => {
 				step.value = 2
 				return
 			}
-			common.show('提示信息', '此门课程已有学习历史，请选择是否继续学习？',true, '重新开始','继续学习').then((res) => {
+			common.show('提示', '系统检测到您已存在学习记录，要继续学习吗？',true, '重新学习','继续学习').then((res) => {
 				if(res) {
 					// 继续学习 ， 获取学习历史接口
 					// 滚动到最下面
@@ -341,7 +342,7 @@ const getGraphInfoUnStudy = (flag = 0) => {
 			common.show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗？',true, '取消','去评论').then((res) => {
 				if(res) {
 					// 去评论
-					common.navigateTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
+					common.navigateTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`)
 				}else{
 					// 取消
 					common.navigateTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
@@ -565,9 +566,11 @@ const sendMessage = (data) => {
 }
 // ws 结束
 const startPgrphId = ref('')
+const imageId = ref('')
 onLoad((params) => {
 	crsId.value = params.crsId||'';
 	crsNum.value = params.crsNum||'';
+	imageId.value = params.imgId || ''
 	startPgrphId.value = params.pgrphId||'';
 	getData('1');
 });
@@ -617,7 +620,7 @@ const uploadRecordNow = (voicePath) => {
 				userInfo: {...choiceTeacherInfo.value},
 				id: _id
 			})
-			isUploadingVoice.value = false
+			setIsUploadingVoice()
 			scrollToBottomNow()
 		// #endif
 		//#ifdef APP-PLUS
@@ -660,9 +663,9 @@ const uploadRecordNow = (voicePath) => {
 				})
 				scrollToBottomNow()
 			}else{}
-			isUploadingVoice.value = false
+			setIsUploadingVoice()
 		}).catch(err=>{
-			isUploadingVoice.value = false
+			setIsUploadingVoice()
 			talkingList.value = talkingList.value.filter(t=>t.id !== _id)
 			uni.showToast({
 				title: '系统异常，请联系管理员',
@@ -672,12 +675,22 @@ const uploadRecordNow = (voicePath) => {
 		})
 		// #endif
 }
+const setIsUploadingVoice = (flag = false) => {
+	if(flag){
+		isUploadingVoice.value = true
+	}else{
+		setTimeout(()=>{
+			isUploadingVoice.value = false
+		},100)
+	}
+}
 // 发送文本
 const submitAnswerNow = (val, cb) => {
 	if(!testAnswer.value){
 		common.msg('每个问题最多连续发送五次答案！')
 		return
 	}
+	isUploadingVoice.value = true
 	let _data = {
 		qnsId: unref(lastTalkingInfo).qnsId,// 问题ID 必输项:true  类型:String
 		pgrphId: unref(lastTalkingInfo).pgrphId,// 段落ID 必输项:true  类型:String
@@ -691,6 +704,7 @@ const submitAnswerNow = (val, cb) => {
 		requestBody: JSON.stringify(_data)
 	})
 	.then(res=>{
+		setIsUploadingVoice()
 		let _id = new Date().getTime() + 'id'
 		let _body = res.body|| {}
 		if(!_body.chatBody) {
@@ -709,6 +723,8 @@ const submitAnswerNow = (val, cb) => {
 		})
 		scrollToBottomNow()
 		cb && cb()
+	}).catch(()=>{
+		setIsUploadingVoice()
 	})
 }
 // 撤回 
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index 29af4020..99a6c51d 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -52,7 +52,7 @@
 		<view class="btn-box btn-box-height font_pf" v-if="[0,1].includes(tabAct)">
 
 			<uv-button type="primary"
-				@click="common.navigateTo('/pages/course/study?crsNum='+crsNum+'&crsId='+form.crsId)">去学习</uv-button>
+				@click="common.navigateTo('/pages/course/study?crsNum='+crsNum+'&crsId='+form.crsId + '&imgId=' + form.imgId)">去学习</uv-button>
 			<uv-button type="primary">去练习</uv-button>
 			<uv-button type="primary">去考试</uv-button>
 
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 36d0ee0c..8f0d2897 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -3,7 +3,7 @@
 		<!-- <MarkdownPreview/> -->
 		<view class="top-bg"></view>
 		<view class="bot-bg"></view>
-		<view class="index-dialog-body">
+		<scroll-view class="index-dialog-body" :scroll-y="true" upper-threshold="0" refresher-enabled="true" refresher-default-style="none" @refresherrefresh="scrolltolower">
 			<view class="seek-setting">
 				设置
 				<image src="@/static/images/course/setting.png" alt="" class="image-icon"></image>
@@ -84,7 +84,7 @@
 				@startRecord="startRecordCallback"
 				:isDisabled="false"
 			/>
-		</view>
+		</scroll-view>
 	</view>
 </template>
 
@@ -126,14 +126,16 @@
 	const routerTo = (type) => {
 		switch(type){
 			case 'AI学':
-				common.navigateTo('/pages/course/index')
+				common.switchTab('/pages/course/index')
 				break;
 			default:
 				common.msg('页面建设中，敬请期待！')
 			break;
 		}
 	}
-	
+	const scrolltolower = () => {
+		common.switchTab('/pages/index/index')
+	}
 	const uploadRecordNow = (voicePath) => {
 	}
 	
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e901fc62..fce1636c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -80,7 +80,7 @@
 			<!-- 8个导航 -->
 			<view class="navigation_div">
 				<view class="group">
-					<view class="item" @click="common.navigateTo('/pages/course/index')">
+					<view class="item" @click="common.switchTab('/pages/course/index')">
 						<image class="icon" src="@/static/images/index/navigation_course.png"></image>
 						<view class="title">课程中心</view>
 					</view>
diff --git a/src/pagesOther.json b/src/pagesOther.json
index 7e95572b..a5ec24b1 100644
--- a/src/pagesOther.json
+++ b/src/pagesOther.json
@@ -62,7 +62,7 @@
 			},
 			{
 				"text": "学习",
-				"pagePath": "pages/study/index"
+				"pagePath": "pages/course/index"
 			},
 			{
 				"text": "场景",