From 41b8ae18892b8989f22f8f0f4e30d955b2a3c887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 11 Sep 2025 10:30:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E9=BC=93=E5=8A=B1?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=8C=E8=A7=86=E9=A2=91=E9=81=AE=E7=BD=A9?= =?UTF-8?q?=E5=B1=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 12 ++++----- .../image-preview/image-preview.vue | 16 +++++++++--- .../image-preview/video-preview.vue | 25 +++++++++++-------- src/pages/course/components/talkingItem.vue | 4 +-- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/.env.development b/.env.development index 8904c30c..502e492f 100644 --- a/.env.development +++ b/.env.development @@ -6,10 +6,10 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 -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.16.122.65:7001' #VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' @@ -19,10 +19,10 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.16.122.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.21:9786' -VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' +# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +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' @@ -31,11 +31,11 @@ VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # 任东 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' -# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' +VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 张建成 -# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' +VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.144:9602' # 王洋洋 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue index a94bbb57..65e3e547 100644 --- a/src/components/image-preview/image-preview.vue +++ b/src/components/image-preview/image-preview.vue @@ -1,11 +1,13 @@ @@ -90,9 +92,14 @@ } }, methods: { + closePopup(){ + this.showModel = false + this.$refs.PopupRef.close() + }, showDetail(){ if(!!this.previewDetail){ this.showModel = true + this.$refs.PopupRef.open() } }, getPreviewUrlBlob(id) { @@ -151,7 +158,8 @@ \ No newline at end of file diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index f7875d56..eca8b63e 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -118,11 +118,11 @@ - + From 444244506e9d9b0059434128102c425608e69c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 11 Sep 2025 16:52:26 +0800 Subject: [PATCH 2/4] fix: bug --- .env.development | 6 +++--- src/pages/course/components/talkingItem.vue | 9 +++++++-- src/pages/course/study.vue | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 502e492f..239cbf5d 100644 --- a/.env.development +++ b/.env.development @@ -22,15 +22,15 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +# 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.91:9786' # UAT # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # 任东 -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' +VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index eca8b63e..d304916f 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -507,19 +507,24 @@ setVoiceTime(0) },100) } + // else{ + // setTimeout(()=>{ + // initVoice(readType, item, isplay) + // },200) + // } } const setVoiceTime = (sum) => { sum += 1 if(talkVoiceObj.value.duration){ voiceTime.value = ( Math.ceil(talkVoiceObj.value.duration) || 0 ) + 's' }else{ - if(sum === 10) { + if(sum === 100) { voiceTime.value = 0 + 's' return } setTimeout(()=>{ setVoiceTime(sum) - },200) + },300) } } const playQnsVoice = (readType = 'qns', item) =>{ diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 30b25bc9..8411859e 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -562,6 +562,7 @@ const nextQuestionSuccess = (info, type = 'next') => { processType: 'NEW-ANSER', //NEW-KNOW requestBody: JSON.stringify({ stdyId: unref(stdyId), + stdyPgrphId: info.stdyPgrphId, qnsId: info.qnsId }) }).then(res => { From 2bc746068c91b8fdeedb1c12fb255452f6a281dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Fri, 12 Sep 2025 09:29:40 +0800 Subject: [PATCH 3/4] fix: Bug --- .env.development | 2 +- src/components/image-preview/image-preview.vue | 2 ++ src/components/image-preview/video-preview.vue | 2 ++ src/pages/course/components/touchBtn.vue | 8 +++++++- src/store/storage.js | 9 ++++++++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index 239cbf5d..d340daff 100644 --- a/.env.development +++ b/.env.development @@ -30,7 +30,7 @@ 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_TRAAPP = 'http://25.64.16.130:9601' +# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue index 65e3e547..a443695b 100644 --- a/src/components/image-preview/image-preview.vue +++ b/src/components/image-preview/image-preview.vue @@ -94,11 +94,13 @@ methods: { closePopup(){ this.showModel = false + this.storageStore.setTouchBtnZIndex(1) this.$refs.PopupRef.close() }, showDetail(){ if(!!this.previewDetail){ this.showModel = true + this.storageStore.setTouchBtnZIndex(-1) this.$refs.PopupRef.open() } }, diff --git a/src/components/image-preview/video-preview.vue b/src/components/image-preview/video-preview.vue index f844c833..4fc8e46f 100644 --- a/src/components/image-preview/video-preview.vue +++ b/src/components/image-preview/video-preview.vue @@ -69,6 +69,7 @@ }, methods: { showModelNow(){ + this.storageStore.setTouchBtnZIndex(-1) this.$refs.PopupRef.open() this.showModel = true }, @@ -76,6 +77,7 @@ console.log('err：',info) }, playEnded(){ + this.storageStore.setTouchBtnZIndex(1) this.$refs.PopupRef.close() this.showModel = false }, diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index b1ac4d71..d7cfba2a 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -56,6 +56,9 @@ import { getPhoneEnvBool } from '@/common/common.js' + import { useStorageStore } from "@/store/storage.js" + + const storageStore = useStorageStore() const proxy = getCurrentInstance() const emit = defineEmits(['uploadVoice', 'submitAnswer', 'startRecord']) const props = defineProps({ @@ -102,6 +105,9 @@ const showTalkingModel = ref(false) const keyboardIsShow = ref(false) const talkModelRef= ref() + + const btnZindex = computed(()=> storageStore.getTouchBtnZIndex) + console.log(storageStore) watch(() => showTalkingModel.value, (val) => val ? talkModelRef.value.open() : talkModelRef.value.close()) watch(() => props.isLoading, () => {}, { deep: true, @@ -397,7 +403,7 @@ background-color: #fff; padding: 25rpx 30rpx 0; position: relative; - + z-index: v-bind(btnZindex); .touch-btn { height: 92rpx; box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, .06); diff --git a/src/store/storage.js b/src/store/storage.js index c0ae35ff..92b3833d 100644 --- a/src/store/storage.js +++ b/src/store/storage.js @@ -5,7 +5,8 @@ export const useStorageStore = defineStore('storageStore',{ state:()=>({ imgObjStr: '{}', videoObjStr: '{}', - audioObjStr: '{}' + audioObjStr: '{}', + touchBtnZIndex: 1 }), getters:{ imgObj(state){ @@ -16,9 +17,15 @@ export const useStorageStore = defineStore('storageStore',{ }, audioObj(state){ return JSON.parse(state.audioObjStr) + }, + getTouchBtnZIndex(state){ + return state.touchBtnZIndex } }, actions:{ + setTouchBtnZIndex(index = 1){ + this.touchBtnZIndex = index + }, setStorage(type, id, url) { if(type === 'image'){ let _obj = JSON.parse(this.imgObjStr) From f86f24557b7e788fae333d20384f03331112cbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Fri, 12 Sep 2025 09:59:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/components/image-preview/image-preview.vue | 2 +- src/components/image-preview/video-preview.vue | 10 ++++++---- src/pages/course/components/touchBtn.vue | 4 ++-- src/store/storage.js | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index d340daff..bebd5c21 100644 --- a/.env.development +++ b/.env.development @@ -22,9 +22,9 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' + 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.91:9786' # UAT # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue index a443695b..c767f559 100644 --- a/src/components/image-preview/image-preview.vue +++ b/src/components/image-preview/image-preview.vue @@ -94,7 +94,7 @@ methods: { closePopup(){ this.showModel = false - this.storageStore.setTouchBtnZIndex(1) + this.storageStore.setTouchBtnZIndex(9) this.$refs.PopupRef.close() }, showDetail(){ diff --git a/src/components/image-preview/video-preview.vue b/src/components/image-preview/video-preview.vue index 4fc8e46f..cbd04767 100644 --- a/src/components/image-preview/video-preview.vue +++ b/src/components/image-preview/video-preview.vue @@ -9,7 +9,7 @@ > - +