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);