diff --git a/.env.development b/.env.development index fa050679..44372854 100644 --- a/.env.development +++ b/.env.development @@ -26,7 +26,7 @@ VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.130:9604' # 张建成 # 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_TRASTUDY = 'http://25.64.16.144:9602' # 王洋洋 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 于嘉文 diff --git a/src/api/index.js b/src/api/index.js index 5f5e6a05..cd5e5e84 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -85,4 +85,7 @@ export const queryCrsInfoByRecmd = (data) => { method: 'post', data }); -}; \ No newline at end of file +}; + + + diff --git a/src/api/messageNotification.js b/src/api/messageNotification.js index 72fa6ef2..3022df25 100644 --- a/src/api/messageNotification.js +++ b/src/api/messageNotification.js @@ -31,4 +31,12 @@ export const oneTimeRead = (data) => { toastErrors: true, data }); +}; + +export const noticeMessageCount = (data) => { + return request({ + url: base_url + '/traPersonalMessageNotice/noticeMessageCount', + method: 'post', + data + }); }; \ No newline at end of file diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 4fa1de10..4ff2eea2 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -79,8 +79,8 @@ @startRecord="changePlayItemId('')" :isLoading="isUploadingVoice" :onlyVoice="answerOnlyVoice" - :adjustPosition="true" :canAnswer="testAnswer" + :adjustPosition="true" :canAnswerText="'每个问题最多连续发送五次答案!'" :isDisabled="(lastTalkingInfo.type || 0) !== 4" /> @@ -667,6 +667,7 @@ const sendMessage = data => { const startPgrphId = ref('') const imageId = ref('') onLoad(params => { + changeAppHeightBottom() watchFlag.value = 1 isPreview.value = params.isPreview === 'preview' crsId.value = params.crsId || '' @@ -683,8 +684,24 @@ onMounted(() => { const keyboardHeight = ref('0px') const setHeight = res => { keyboardHeight.value = res.height + 'px' - scrollToBottomNow() + // scrollToBottomNow() } + + const keyBoardIsHide = computed(() => { + return parseInt(keyboardHeight.value) == 0 + }) + const bottomHeight = ref('0px') + const totalBotHeight = computed(()=> { + return keyBoardIsHide.value ? 0 + 'px': parseInt(keyboardHeight.value) - parseInt(bottomHeight.value) + 'px' + }) + const changeAppHeightBottom = (height) => { + //#ifdef APP-PLUS + // 获取系统信息 + const systemInfo = uni.getSystemInfoSync(); + // 计算安全区域底部高度 + bottomHeight.value = systemInfo.screenHeight - systemInfo.safeArea.bottom + 'px' + // #endif + } onHide(() => { //#ifdef APP-PLUS uni.offKeyboardHeightChange(setHeight) @@ -1040,11 +1057,14 @@ const chooseRateNow = item => { } -