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

src/pages/course/components/touchBtnOnlyVoice.vue

@@ -487,6 +487,11 @@
 			});
 		}
 	};
+	const clearInputText = (text = '') => {
+		let oldText = answerValue.value
+		answerValue.value = text;
+		return oldText
+	}
 	const changeBtn = () => {
 		if (props.isDisabled) return;
 		keyboardIsShow.value = !keyboardIsShow.value;
@@ -495,6 +500,7 @@
 	onHide(() => {
 		isGettingPermission.value = true
 	})
+	defineExpose({clearInputText})
 </script>
 
 <style lang="scss" scoped>

src/pages/courseDetail/components/introduce.vue

@@ -66,8 +66,7 @@
 		modelValue: Object
 	});
 	import {ANSWER_METHOD_MAP} from '@/enum.js'
-	
-	const answerMethod = computed(() => ANSWER_METHOD_MAP[props.item?.answerMethod || ''] || ANSWER_METHOD_MAP['01']);
+	const answerMethod = computed(() => ANSWER_METHOD_MAP[props.modelValue?.answerMethod || ''] || ANSWER_METHOD_MAP['01']);
 	const previewFile = info => {
 		previewFileFnc({
 			fileId: info.fileId,

src/pages/examination/index.vue

@@ -96,7 +96,21 @@
 				</view>
 			</view>
 			<view class="touch-btn-div" :class="{ show: showTouchBtn }">
+				<TouchBtnOnlyVoice
+					v-if="answerMethod === '03'"
+					class="talk-btns"
+					ref="touchBtnRef"
+					@uploadVoice="touchBtnSubmit('voice', $event)"
+					@submitAnswer="touchBtnSubmit('text', $event)"
+					:isLoading="touchIsDisabled"
+					loadingText="只能进行一条回答"
+					:adjustPosition="false"
+					:isDisabled="false"
+					:onlyVoice="true"
+					:answerMethod="answerMethod"
+				/>
 				<TouchBtn
+					v-else
 					class="talk-btns"
 					ref="touchBtnRef"
 					@uploadVoice="touchBtnSubmit('voice',$event)"
@@ -162,6 +176,7 @@
 	import Subject from '@/components/examination/subject.vue';
 	// import TouchBtn from '@/components/examination/touchBtn.vue';
 	import TouchBtn from '@/pages/course/components/touchBtn.vue';
+	import TouchBtnOnlyVoice from '@/pages/course/components/touchBtnOnlyVoice.vue';
 	import { ref, reactive, computed, onMounted, nextTick } from 'vue';
 	import { onLoad, onBackPress } from '@dcloudio/uni-app';
 	import common from '@/common/common';
@@ -169,7 +184,6 @@
 	import { commonUploadVoiceFile } from '@/api/common.js';
 	import { optionErrorIcon, examinationSheetIcon, practiceExitIcon } from '@/common/imgSvg';
 	import { commitPaperExam, commitCrsExam, commitPaperCache } from '@/api/examination.js';
-
 	const answerIsOver = ref(true);
 	const feedbackRef = ref(null);
 	const dialogRef = ref(null);

src/pages/practice/index.vue

@@ -64,20 +64,36 @@
 				</swiper-item>
 			</swiper>
 		</view>
-		
+
 		<view class="fixed-box font_pf" :style="{ marginBottom: popup_input_bottom }">
 			<view class="touch-btn-div" :class="{ show: showTouchBtn }">
-				<TouchBtn
+				<TouchBtnOnlyVoice
+					v-if="answerMethod === '03'"
 					class="talk-btns"
 					ref="touchBtnRef"
-					@uploadVoice="touchBtnSubmit('voice',$event)"
-					@submitAnswer="touchBtnSubmit('text',$event)"
+					@uploadVoice="touchBtnSubmit('voice', $event)"
+					@submitAnswer="touchBtnSubmit('text', $event)"
+					:isLoading="touchIsDisabled"
+					loadingText="只能进行一条回答"
+					:adjustPosition="false"
+					:isDisabled="false"
+					:onlyVoice="true"
+					:answerMethod="answerMethod"
+				/>
+				<TouchBtn
+					v-else
+					class="talk-btns"
+					ref="touchBtnRef"
+					@uploadVoice="touchBtnSubmit('voice', $event)"
+					@submitAnswer="touchBtnSubmit('text', $event)"
 					:isLoading="touchIsDisabled"
 					loadingText="只能进行一条回答"
 					:adjustPosition="false"
 					:isDisabled="false"
 					:answerMethod="answerMethod"
+					
 				/>
+				
 			</view>
 		</view>
 		<!-- 反馈组件 -->
@@ -97,6 +113,7 @@
 	import CharactersSubject from '@/components/examination/characters-subject.vue';
 	// import TouchBtn from '@/components/examination/touchBtn.vue';
 	import TouchBtn from '@/pages/course/components/touchBtn.vue';
+	import TouchBtnOnlyVoice from '@/pages/course/components/touchBtnOnlyVoice.vue';
 	import common from '@/common/common';
 	import { setPageCache, formatSeconds, getPageCache, setupKeyboardHeightListener } from '@/common/common';
 	import { commonUploadVoiceFile } from '@/api/common.js';
@@ -104,7 +121,6 @@
 	import { practiceAnswer, practiceCommit, queryCrsPracticeAnswerResult } from '@/api/practice.js';
 	import { startExamByCrs } from '@/api/examination.js';
 	import { startPracticeByCrs } from '@/api/practice.js';
-
 	const swiperRef = ref(null);
 	const feedbackRef = ref(null);
 	const dialogRef = ref(null);
@@ -117,7 +133,7 @@
 	let leaveStartTime = 0; // 离开开始时间
 	const mode = ref('practice'); // 考试 examination 练习practice
 	const systemInfo = uni.getSystemInfoSync();
-	
+
 	const paperData = reactive({
 		exrId: '',
 		crsId: '',
@@ -365,16 +381,15 @@
 		paperData.crsId = practice.crsId;
 		paperData.name = practice.name;
 		paperData.exrId = practice.exrId;
+		answerMethod.value = practice.answerMethod ?? '01';
 		storageTopicList.value = practice.qnsInfoVos.map((res) => ({
 			...res,
 			isPreview: false,
 			clearResult: true,
 			es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定
 			my_answer: [],
-			answerMethod:answerMethod.value
+			answerMethod: answerMethod.value
 		}));
-		answerMethod.value = practice.answerMethod ?? '01'
-		console.log('answerMethod', answerMethod.value);
 		addProblem();
 		// 记录练习起始时间
 		practiceStartTime = new Date().getTime();
@@ -477,12 +492,12 @@
 	onUnload(() => {
 		stopTimer();
 	});
-	
+
 	onBackPress((res) => {
-		if(res.from === 'backbutton') {
-			exit_practice()
+		if (res.from === 'backbutton') {
+			exit_practice();
 			return true;
-		} 
+		}
 	});
 </script>