Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!186

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 # 'development'
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # VITE_APP_BASE_API_Url = ' http://25.18.122.66:9786'
 #sit
 # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
@@ -19,7 +19,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # h5专用地址x2
 
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+#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.78:9786'
 

src/components/examination/subject.vue

@@ -13,7 +13,12 @@
 						class="img"
 						@click="mark_click()"
 					></image>
-					<image :src="feedbackIcon()" class="img" @click="feedback_click()"></image>
+					<image
+						:src="feedbackIcon()"
+						class="img"
+						@click="feedback_click()"
+						v-if="props.mode2 !== 'mistake'"
+					></image>
 				</view>
 				<template v-if="['mistake'].includes(props.mode)">
 					<view class="expand_button_div" @click="toggleExpand()">
@@ -161,6 +166,10 @@
 		clearResult: {
 			type: Boolean,
 			default: true
+		},
+		mode2: {
+			type: String,
+			default: ''
 		}
 	});
 
@@ -190,7 +199,6 @@
 			item_answer.value = typeof newVal === 'string' ? newVal.split(',') : newVal;
 		},
 		{ deep: true }
-		
 	);
 	// watch(
 	// 	item_answer,
@@ -200,7 +208,7 @@
 	// 	},
 	// 	{ deep: true }
 	// );
-	
+
 	const feedback_click = () => {
 		emit('subject_click', 'feedback', props.item);
 	};

src/pages/course/components/talkingItem.vue

@@ -711,7 +711,7 @@
 <style lang="scss">
 	.ai-answer {
 		width: 100%;
-		// overflow: hidden;
+		overflow: hidden;
 		margin-bottom: 20rpx;
 
 		.user-info {

src/pages/course/components/touchBtn.vue

@@ -113,9 +113,13 @@
 		adjustPosition: {
 			default: false,
 			type: Boolean
-		}
+		},
+		formatType: {
+			default: 'mp3',// 生成语音文件类型
+			type: String
+		},
 	});
-	const { isDisabled, onlyVoice, adjustPosition } = toRefs(props);
+	const { isDisabled, onlyVoice, adjustPosition, formatType } = toRefs(props);
 	const isLoadingState = computed(() => props.isLoading);
 
 	const showTalkingModel = ref(false);
@@ -225,7 +229,7 @@
 	const startRecord = () => {
 		isStartNum.value += 1;
 		unref(recordObjCom).start({
-			format: 'mp3'
+			format: formatType.value
 		});
 	};
 

src/pages/course/study.vue

@@ -206,7 +206,6 @@
 	const isContinue = ref('N')
 	// 初始化数据
 	const getData = async flag => {
-		isContinue.value = 'N'
 		try {
 			const {
 				body
@@ -247,9 +246,9 @@
 						.then(res => {
 							if (res) {
 								// 继续学习 ， 获取学习历史接口
+								isContinue.value = 'Y'
 								// 滚动到最下面
 								scrollToBottomNow()
-								isContinue.value = 'Y'
 								sendMessage({
 									commond: 'STDY',
 									body: {
@@ -823,7 +822,7 @@
 				crsId: crsId.value,
 				teacherNo: choiceTeacher.value,
 				studyType: isPreview.value ? 'P' : 'S',
-				isContinue: isContinue.value,
+				isContinue: 'Y',
 				stdyId: stdyId.value
 			}).then(res => {
 				const {

src/pages/example/dialog.vue

@@ -50,7 +50,7 @@
 						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents"></TalkingItem>
 				</scroll-view>
 			</view>
-			<TouchBtn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow"
+			<TouchBtn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow" formatType="wav"
 				@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
 				:adjustPosition="true" :isDisabled="isHistory" />
 		</scroll-view>
@@ -605,8 +605,9 @@
 			isLoading: true
 		});
 		scrollToBottomNow();
-		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
+		commonUploadVoiceFile(voicePath, '/traask/traTestchat/voiceTrans', {})
 			.then((_res) => {
+				console.log(_res)
 				if (!!(_res.body.transContent || '').trim()) {
 					talkingList.value.pop();
 					askData.value = {

src/pages/index/dialog.vue

@@ -38,7 +38,7 @@
 			<view class="ai-info">
 				<!-- <image src="@/static/images/dialog/pet-3.png" alt="" class="image-pet-bg"></image> -->
 				<image src="@/static/images/dialog/pet-bg-base.png" alt="" class="image-pet-bg"></image>
-				<image :src="userInfo?.mascotInfo?.imgAddr || ''" alt="" class="image-pet" mode="widthFix"></image>
+				<image :src="luimgAddr" alt="" class="image-pet" mode="widthFix"></image>
 				<view class="ai-info-bg-box">
 					<view class="hello-text">{{ userInfo ? 'Hi，我是' + userInfo?.mascotInfo?.mascotName : 'Hi' }}</view>
 					<view class="info-text">工作学习，我都能帮你！</view>
@@ -174,6 +174,7 @@
 	const feedbackRef = ref();
 	const watermarkRef = ref();
 	const userInfo = ref(getUserInfo());
+	const luimgAddr = computed(()=> unref(userInfo)?.mascotInfo?.imgAddr || '')
 	const userParams = '/' + (unref(userInfo)?.userName??'') + ' ' + (unref(userInfo)?.loginName??'');
 	const questionList = ref([
 		// '对公小程序开户流程？',
@@ -840,6 +841,7 @@
 		uni.offKeyboardHeightChange(setHeight);
 	});
 	onShow(() => {
+		userInfo.value = getUserInfo();
 		uni.onKeyboardHeightChange(setHeight);
 		nextTick(() => {
 			watermarkRef.value?.updateWatermarkText();

src/pages/wrongQuestionRecord/correct.vue

@@ -50,6 +50,7 @@
                   v-else
                   :item="item"
                   :mode="mode"
+                  mode2="mistake"
                   :isPreview="item.isPreview"
                   :clearResult="item.clearResult"
                   @subject_click="subject_click"
@@ -95,7 +96,7 @@ const feedbackRef = ref(null);
 const dialogRef = ref(null);
 const touchBtnRef = ref(null);
 
-const mode = ref('practice'); // 考试 examination 练习practice
+const mode = ref('practice'); // 考试 examination 练习practice 错题本: mistake
 const paperData = reactive({
   name: '' // 名称
 }); // 试卷信息