diff --git a/.env.development b/.env.development
index bb51aee8..64707e11 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ 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:7002'
@@ -19,23 +19,25 @@ 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:7001'
+
# 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_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..c767f559 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -1,11 +1,13 @@
-
-
+
+
+
+
@@ -90,9 +92,16 @@
}
},
methods: {
+ closePopup(){
+ this.showModel = false
+ this.storageStore.setTouchBtnZIndex(9)
+ this.$refs.PopupRef.close()
+ },
showDetail(){
if(!!this.previewDetail){
this.showModel = true
+ this.storageStore.setTouchBtnZIndex(-1)
+ this.$refs.PopupRef.open()
}
},
getPreviewUrlBlob(id) {
@@ -151,7 +160,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..d304916f 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -118,11 +118,11 @@
-
+
@@ -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/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index d7373368..a838b912 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()
+ storageStore.setTouchBtnZIndex(9)
+ const btnZindex = computed(()=> storageStore.getTouchBtnZIndex)
+
watch(() => showTalkingModel.value, (val) => val ? talkModelRef.value.open() : talkModelRef.value.close())
watch(() => props.isLoading, () => {}, {
deep: true,
@@ -397,7 +403,11 @@
background-color: #fff;
padding: 25rpx 30rpx 0;
position: relative;
+<<<<<<< HEAD
z-index: 0;
+=======
+ z-index: v-bind(btnZindex);
+>>>>>>> f86f24557b7e788fae333d20384f03331112cbd5
.touch-btn {
height: 92rpx;
box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, .06);
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 => {
diff --git a/src/store/storage.js b/src/store/storage.js
index c0ae35ff..c63b23b6 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: 9
}),
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)