diff --git a/.env.development b/.env.development index 94f0d442..f354029a 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ ENV = 'development' #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7002' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' @@ -21,7 +21,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # sit -#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' +VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT diff --git a/src/pages/courseDetail/components/introduce.vue b/src/pages/courseDetail/components/introduce.vue index 116bef91..97a6f729 100644 --- a/src/pages/courseDetail/components/introduce.vue +++ b/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, diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 4f2443f2..c04e63d1 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -96,7 +96,20 @@ + - + - + + @@ -97,6 +111,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 +119,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 +131,7 @@ let leaveStartTime = 0; // 离开开始时间 const mode = ref('practice'); // 考试 examination 练习practice const systemInfo = uni.getSystemInfoSync(); - + const paperData = reactive({ exrId: '', crsId: '', @@ -365,16 +379,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 +490,12 @@ onUnload(() => { stopTimer(); }); - + onBackPress((res) => { - if(res.from === 'backbutton') { - exit_practice() + if (res.from === 'backbutton') { + exit_practice(); return true; - } + } });