This commit is contained in:
杨航
2025-09-12 09:29:40 +08:00
parent 444244506e
commit 2bc746068c
5 changed files with 20 additions and 3 deletions
+1 -1
View File
@@ -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 = '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_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_TRAEXAM = 'http://25.64.16.140:9604'
@@ -94,11 +94,13 @@
methods: { methods: {
closePopup(){ closePopup(){
this.showModel = false this.showModel = false
this.storageStore.setTouchBtnZIndex(1)
this.$refs.PopupRef.close() this.$refs.PopupRef.close()
}, },
showDetail(){ showDetail(){
if(!!this.previewDetail){ if(!!this.previewDetail){
this.showModel = true this.showModel = true
this.storageStore.setTouchBtnZIndex(-1)
this.$refs.PopupRef.open() this.$refs.PopupRef.open()
} }
}, },
@@ -69,6 +69,7 @@
}, },
methods: { methods: {
showModelNow(){ showModelNow(){
this.storageStore.setTouchBtnZIndex(-1)
this.$refs.PopupRef.open() this.$refs.PopupRef.open()
this.showModel = true this.showModel = true
}, },
@@ -76,6 +77,7 @@
console.log('err',info) console.log('err',info)
}, },
playEnded(){ playEnded(){
this.storageStore.setTouchBtnZIndex(1)
this.$refs.PopupRef.close() this.$refs.PopupRef.close()
this.showModel = false this.showModel = false
}, },
+7 -1
View File
@@ -56,6 +56,9 @@
import { import {
getPhoneEnvBool getPhoneEnvBool
} from '@/common/common.js' } from '@/common/common.js'
import { useStorageStore } from "@/store/storage.js"
const storageStore = useStorageStore()
const proxy = getCurrentInstance() const proxy = getCurrentInstance()
const emit = defineEmits(['uploadVoice', 'submitAnswer', 'startRecord']) const emit = defineEmits(['uploadVoice', 'submitAnswer', 'startRecord'])
const props = defineProps({ const props = defineProps({
@@ -102,6 +105,9 @@
const showTalkingModel = ref(false) const showTalkingModel = ref(false)
const keyboardIsShow = ref(false) const keyboardIsShow = ref(false)
const talkModelRef= ref() const talkModelRef= ref()
const btnZindex = computed(()=> storageStore.getTouchBtnZIndex)
console.log(storageStore)
watch(() => showTalkingModel.value, (val) => val ? talkModelRef.value.open() : talkModelRef.value.close()) watch(() => showTalkingModel.value, (val) => val ? talkModelRef.value.open() : talkModelRef.value.close())
watch(() => props.isLoading, () => {}, { watch(() => props.isLoading, () => {}, {
deep: true, deep: true,
@@ -397,7 +403,7 @@
background-color: #fff; background-color: #fff;
padding: 25rpx 30rpx 0; padding: 25rpx 30rpx 0;
position: relative; position: relative;
z-index: v-bind(btnZindex);
.touch-btn { .touch-btn {
height: 92rpx; height: 92rpx;
box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, .06); box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, .06);
+8 -1
View File
@@ -5,7 +5,8 @@ export const useStorageStore = defineStore('storageStore',{
state:()=>({ state:()=>({
imgObjStr: '{}', imgObjStr: '{}',
videoObjStr: '{}', videoObjStr: '{}',
audioObjStr: '{}' audioObjStr: '{}',
touchBtnZIndex: 1
}), }),
getters:{ getters:{
imgObj(state){ imgObj(state){
@@ -16,9 +17,15 @@ export const useStorageStore = defineStore('storageStore',{
}, },
audioObj(state){ audioObj(state){
return JSON.parse(state.audioObjStr) return JSON.parse(state.audioObjStr)
},
getTouchBtnZIndex(state){
return state.touchBtnZIndex
} }
}, },
actions:{ actions:{
setTouchBtnZIndex(index = 1){
this.touchBtnZIndex = index
},
setStorage(type, id, url) { setStorage(type, id, url) {
if(type === 'image'){ if(type === 'image'){
let _obj = JSON.parse(this.imgObjStr) let _obj = JSON.parse(this.imgObjStr)