diff --git a/.env.development.yh b/.env.development.yh
index 33d4540f..e5b3101e 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -4,8 +4,8 @@ ENV = 'development.yh'
# 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'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index 2b862b5f..b6265e64 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -2,7 +2,7 @@
- {{ subject_type_text }}
+ {{ subject_type_text }}
{{ item.tgtGrade }}分
@@ -44,14 +44,13 @@
-
+
{{ subject_data.qnsContent }}
-
+
-
@@ -106,7 +105,7 @@
{{ myResultLabel.join('') }}
-
+
你的答案：
{{ subject_data.anserResult ?? '' }}
@@ -171,7 +170,7 @@
// 学习: study
// 考试结算页 settlement
// 练习记录页 practice_record, 'practice_record'
- return ['examination', 'practice', 'mistake', 'mistake_in', 'study', 'study_answer', 'settlement', 'practice_record', 'pk_in'].includes(
+ return ['examination', 'practice', 'mistake', 'mistake_in', 'study', 'study_answer', 'study_record', 'settlement', 'practice_record', 'pk_in'].includes(
value
);
}
@@ -318,7 +317,7 @@
if (item_answer.value.includes(analysisVo.itemId)) {
item_answer.value = item_answer.value.filter((id) => id !== analysisVo.itemId);
modelValue.value = item_answer.value;
- if (!['study','study_answer'].includes(props.mode)) {
+ if (!['study','study_answer', 'study_record'].includes(props.mode)) {
muCheckbox('choose');
}
} else if (props.item.qnsTyp === 'SN') {
@@ -332,7 +331,7 @@
// 多选直接插入
item_answer.value.push(analysisVo.itemId);
modelValue.value = item_answer.value;
- if (!['study','study_answer'].includes(props.mode)) {
+ if (!['study','study_answer', 'study_record'].includes(props.mode)) {
muCheckbox('choose');
}
} else if (props.item.qnsTyp === 'JD') {
@@ -473,6 +472,7 @@
margin-top: 28rpx;
}
.reference_answer {
+ white-space: pre-line;
.reference_answer_title {
font-weight: 700;
font-size: 30rpx;
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index 62cc3ded..719abab3 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -84,11 +84,11 @@
imgId: {
handler(newval, oldval) {
if (newval.indexOf('/') === 0) {
- this.imgUrlShow = this.base_url + newval;
+ this.imgUrlShow = this.base_url + newval + '?tk=' + this.token;
return;
}
if (newval.indexOf('http') === 0) {
- this.imgUrlShow = newval;
+ this.imgUrlShow = newval + '?tk=' + this.token;
return;
}
if (newval && this.watching) {
diff --git a/src/pages/courseRecord/components/esQuestion.vue b/src/pages/courseRecord/components/esQuestion.vue
index 4695d8bd..e684cd29 100644
--- a/src/pages/courseRecord/components/esQuestion.vue
+++ b/src/pages/courseRecord/components/esQuestion.vue
@@ -9,12 +9,13 @@
-
+
+
@@ -119,6 +120,8 @@
font-size: 30rpx;
margin-top: 20rpx;
margin-bottom: 20rpx;
+ font-weight: bold;
+ color: #333333;
}
.talking-info {
diff --git a/src/pages/courseRecord/components/esQuestionAnswer.vue b/src/pages/courseRecord/components/esQuestionAnswer.vue
index c5de046d..ddb0f118 100644
--- a/src/pages/courseRecord/components/esQuestionAnswer.vue
+++ b/src/pages/courseRecord/components/esQuestionAnswer.vue
@@ -49,6 +49,7 @@
import {
onUnload
} from '@dcloudio/uni-app';
+ import { getToken } from '@/common/common.js'
const props = defineProps({
dataInfo: {
default: () => ({
@@ -135,10 +136,11 @@
emit('buutton_click', type, props.dataInfo);
};
const pauseVoice = () => {
+ console.log('pauseVoice')
if (!talkVoiceObj.value) return;
talkVoiceObj.value.pause();
isPlaying.value = false;
- emit('changePlay', '');
+ // emit('changePlay', '');
};
const playVoice = () => {
emit('changePlay', unref(dataInfo)?.ossAddr);
@@ -149,7 +151,7 @@
talkVoiceObj.value.src = '';
if (unref(dataInfo).ossAddr) {
setTimeout(() => {
- talkVoiceObj.value.src = unref(dataInfo).ossAddr;
+ talkVoiceObj.value.src = unref(dataInfo).ossAddr + '?tk=' + getToken();
talkVoiceObj.value.play();
isPlaying.value = true;
}, 100);
@@ -160,22 +162,26 @@
talkVoiceObj.value = uni.createInnerAudioContext();
let prevTime = -1;
talkVoiceObj.value.onEnded(() => {
+ console.log('onEnded')
emit('changePlay', '');
prevTime = -1;
talkVoiceObj.value.src = '';
});
talkVoiceObj.value.onStop(() => {
+ console.log('onEnded')
emit('changePlay', '');
prevTime = -1;
talkVoiceObj.value.src = '';
});
talkVoiceObj.value.onPause(() => {
+ console.log('onEnded')
prevTime = talkVoiceObj.value.currentTime;
emit('changePlay', '');
});
talkVoiceObj.value.onError(() => {
- prevTime = -1;
- emit('changePlay', '');
+ console.log('onError')
+ // prevTime = -1;
+ // emit('changePlay', '');
});
talkVoiceObj.value.onPlay(() => {
prevTime = talkVoiceObj.value.currentTime;
@@ -195,7 +201,7 @@
}
});
if (unref(dataInfo).intrctWay === '02') {
- itemVoice.value = unref(dataInfo).ossAddr;
+ itemVoice.value = unref(dataInfo).ossAddr + '?tk=' + getToken();
talkVoiceObj.value.src = itemVoice.value;
setTimeout(() => {
setVoiceTime(0);
diff --git a/src/pages/courseRecord/components/talkingItem.vue b/src/pages/courseRecord/components/talkingItem.vue
index 319016f6..31cf0fd0 100644
--- a/src/pages/courseRecord/components/talkingItem.vue
+++ b/src/pages/courseRecord/components/talkingItem.vue
@@ -31,10 +31,13 @@
{{ showContent }}
-
-
+
+
+
+
@@ -257,7 +260,7 @@
})
return _sum
})
- const mode = ref('study') // 考试 examination 练习practice 学习study
+ const mode = ref('study_record') // 考试 examination 练习practice 学习study
const showWithdraw = computed(() => {
let _isMe = unref(lastQuestionInfo).qstLogId === unref(dataInfo).qstLogId