From 85202f5350895dd2d482b5a5e9c3fa4a3827d902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 23 Sep 2025 16:27:25 +0800 Subject: [PATCH 1/2] 1 --- .env.development | 13 ++++++++----- .env.production | 2 +- src/api/request.js | 3 +++ src/pages/examination/index.vue | 2 +- src/pages/messageNotification/index.vue | 4 +++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index 23e0e4f5..aa71a2c4 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,10 @@ ENV = 'development' # 'development' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +# VITE_APP_BASE_API_Url = ' http://25.18.122.66:9786' +#sit +# VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' @@ -12,12 +15,12 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' -# VITE_APP_BASE_API_Url = 'http://25.16.122.92:9786' -# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' +# VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' +VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # h5专用地址x2 - -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +#sit +# 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_TRAASK = 'http://25.64.16.144:9605' diff --git a/.env.production b/.env.production index 143ff549..6cbcc735 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ ENV = 'production' # base api -VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' \ No newline at end of file +VITE_APP_BASE_API_Url = 'http://localhost:7000' \ No newline at end of file diff --git a/src/api/request.js b/src/api/request.js index df5aceb1..519dfdf0 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -6,6 +6,7 @@ import common from '@/common/common.js' const ENV = import.meta.env export const get_base_url = (url = '') => { + if (ENV.MODE === 'development') { // 开发环境 // #ifdef H5 if (url) { @@ -20,7 +21,9 @@ export const get_base_url = (url = '') => { return ENV.VITE_APP_BASE_API_Url // #endif } else { // 其他环境，包括生产环境，sit环境，uat环境 + return ENV.VITE_APP_BASE_API_Url + // return ENV.VITE_APP_BASE_API_Url } } diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index e4ee7859..84f5c46b 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -386,7 +386,7 @@ paperData.flagQueryDetail = examination.flagQueryDetail || 'Y'; mode = paperData.examId ? 'PAPERS' : 'CRS'; // 课程考试CRS，考试中心考试PAPERS // 设置缓存的键的名称 - + examinationAnswerCacheKey = 'examinationAnswerCache' + paperData.execId; answerCacheList.value = common.getValue(examinationAnswerCacheKey); console.log('assaasas', answerCacheList.value); diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue index 3ddba7e8..af9ed9b6 100644 --- a/src/pages/messageNotification/index.vue +++ b/src/pages/messageNotification/index.vue @@ -73,6 +73,7 @@ import type_02 from '@/static/images/messageNotification/type_02.png'; import type_03 from '@/static/images/messageNotification/type_03.png'; import type_04 from '@/static/images/messageNotification/type_04.png'; + import type_05 from '@/static/images/messageNotification/type_05.png'; import useZpaging from '@/composables/useZpaging.js'; const { pagingRef, queryList, data_list, reload } = useZpaging({ fetchFunction: queryTraPersonalMessageNoticePaging @@ -81,7 +82,8 @@ '01': type_01, '02': type_02, '03': type_03, - '04': type_04 + '04': type_04, + '05': type_05 }; const readLoading = ref(false); const offset = ref(0); From ced4aeb2f4c6a2c58904d00accfb17d644791064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 23 Sep 2025 18:11:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=A7=92=E6=95=B0=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=80=E7=9B=B4=E6=8C=89=E7=9D=80=E5=8F=91=E9=80=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BA=A4=E5=8D=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- src/components/examination/question.vue | 3 ++- src/components/examination/touchBtn.vue | 25 ++++++++++++++----- src/components/examination/useAudio.js | 15 +++++++---- .../image-preview/image-preview.vue | 4 +-- src/pages/course/components/talkingItem.vue | 2 +- src/pages/examination/index.vue | 19 ++++++++------ src/pages/examination/result.vue | 21 +++++++++++----- 8 files changed, 62 insertions(+), 31 deletions(-) diff --git a/.env.development b/.env.development index 04bfcc69..03ca039c 100644 --- a/.env.development +++ b/.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:7002' # VITE_APP_BASE_API_Url = ' http://25.18.122.66:9786' #sit # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' @@ -25,7 +25,7 @@ ENV = 'development' # 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.91:9786' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' diff --git a/src/components/examination/question.vue b/src/components/examination/question.vue index 14332801..4ae9c17d 100644 --- a/src/components/examination/question.vue +++ b/src/components/examination/question.vue @@ -176,12 +176,12 @@ }; const playVoice = () => { - // isPlaying.value = true; console.log('点击播放'); innerAudio.playAudio(); }; let unsubscribe = () => {}; onMounted(() => { + console.log('question的onMounted'); // 2. 监听 Store 中 isPlaying 的变化，实时同步 // unsubscribe = innerAudio.$subscribe((mutation, state) => { // isPlaying.value = state.isPlaying; @@ -214,6 +214,7 @@ console.log('去下载oss内容333', props.dataInfo); if (newVal === '' && props.dataInfo.ossKey) { // 去下载oss内容 + console.log('真下载oss内容'); downloadFile(props.dataInfo.ossKey).then((res) => { voiceTime.value = ''; innerAudio.setAudioSrc(res.tempFilePath); diff --git a/src/components/examination/touchBtn.vue b/src/components/examination/touchBtn.vue index 613c08ff..b96eaa55 100644 --- a/src/components/examination/touchBtn.vue +++ b/src/components/examination/touchBtn.vue @@ -73,7 +73,7 @@