diff --git a/.env.development b/.env.development index 23e0e4f5..03ca039c 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,18 @@ 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 +#sit +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' + + # 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_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/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 @@ diff --git a/src/pages/example/components/question.vue b/src/pages/example/components/question.vue new file mode 100644 index 00000000..d8623d81 --- /dev/null +++ b/src/pages/example/components/question.vue @@ -0,0 +1,266 @@ + + + + + \ No newline at end of file diff --git a/src/pages/example/components/talking-item.vue b/src/pages/example/components/talking-item.vue new file mode 100644 index 00000000..d7b49adb --- /dev/null +++ b/src/pages/example/components/talking-item.vue @@ -0,0 +1,81 @@ + + + + + \ No newline at end of file diff --git a/src/pages/example/dialog.vue b/src/pages/example/dialog.vue new file mode 100644 index 00000000..7304c9de --- /dev/null +++ b/src/pages/example/dialog.vue @@ -0,0 +1,1042 @@ + + + + + diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index 92a5f0ba..32f89394 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -115,6 +115,7 @@ :border="false" @click="common.navigateTo('/pages/preview/index')" > + 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); diff --git a/src/pagesB.json b/src/pagesB.json index 7ac67e83..d23cfa10 100644 --- a/src/pagesB.json +++ b/src/pagesB.json @@ -43,6 +43,16 @@ "titleNView": false } } - } + }, + { + "path": "pages/example/dialog", + "style": { + "navigationBarTitleText": "AI问答演示", + "app-plus": { + "titleNView": false, + "animationType": "fade-in" + } + } + }, ] } \ No newline at end of file diff --git a/src/store/storage.js b/src/store/storage.js index c63b23b6..22cc4f81 100644 --- a/src/store/storage.js +++ b/src/store/storage.js @@ -23,7 +23,7 @@ export const useStorageStore = defineStore('storageStore',{ } }, actions:{ - setTouchBtnZIndex(index = 1){ + setTouchBtnZIndex(index = 12){ this.touchBtnZIndex = index }, setStorage(type, id, url) {