diff --git a/.env.development b/.env.development index 0a824990..fa823236 100644 --- a/.env.development +++ b/.env.development @@ -23,13 +23,13 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.64.16.130:9602' # 线上 -# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116:7001' # 任东 -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_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_TRAASK = 'http://25.64.16.144:9605' # 王洋洋 diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue index 516a9ec5..40e24717 100644 --- a/src/components/course-item/course-item.vue +++ b/src/components/course-item/course-item.vue @@ -7,11 +7,11 @@ {{itemInfo.crsName}} - + {{item.tagName}} - + 更新:{{itemInfo.mtTime}} 已学:{{itemInfo.accmStdyCnt}}人次 @@ -115,18 +115,17 @@ margin-bottom: 10rpx; } .item-tags{ - padding-bottom: 0 !important; .item-tag-view{ white-space: nowrap; - height: 38rpx; + height: 44rpx; .item-tag{ height: 38rpx; - line-height: 36rpx; + line-height: 34rpx; box-sizing: border-box; font-size: 20rpx; background-color: #fff; color: #ffa150; - border: 1rpx solid #ffa150; + border: 2rpx solid #ffa150; padding: 0 20rpx; border-radius: 8rpx; margin-right: 20rpx; @@ -147,6 +146,9 @@ color: rgb(102,102,102); margin-top: 6rpx; } + .item-publish{ + margin-top: 0rpx; + } } } \ No newline at end of file diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 05169996..075c5f61 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -105,7 +105,8 @@ onActivated } from 'vue' import common from '@/common/common'; - import TouchBtn from '@/pages/course/components/touchBtn.vue' + import { setupKeyboardHeightListener } from '@/common/common' + import TouchBtn from '@/pages/course/components/touchBtn.vue' import TalkingItem from './components/talking-item.vue'; import PreviewVue from './components/preview.vue'; import { @@ -663,6 +664,7 @@ initsocketTask() }; onLoad(() => { + changeAppHeightBottom() if (!common.isLogin()) { common.navigateTo('/pages/login/login') return @@ -689,7 +691,22 @@ const keyboardHeight = ref('0px') const setHeight = (res) => { - keyboardHeight.value = res.height + 'px' + keyboardHeight.value = (res.height || 0) + 'px' + } + 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 } //#ifdef APP-PLUS onHide(() => { @@ -702,6 +719,7 @@ onUnload(() => { watchFlag.value = 1 socketStore?.closeSocket() + // setupKeyboardHeightListener(changeAppHeightBottom) }) defineExpose({ refreshData @@ -733,13 +751,14 @@ .index-dialog-body { position: absolute; overflow: hidden; - left: 0; - bottom: 0%; - height: calc(100% - v-bind(keyboardHeight)); + height: calc(100% - v-bind(totalBotHeight)); width: 100%; padding: 0; + bottom: 0; + left: 0; box-sizing: border-box; padding-top: v-bind(pageTopPadding); + // padding-bottom: v-bind(bottomHeight); // display: flex; // flex-direction: column; @@ -931,7 +950,7 @@ } .talking-list { - height: calc(100% - 832rpx + v-bind(pageTopPadding)); + height: calc(100% - 772rpx ); padding: 12rpx 24rpx; box-sizing: border-box; @@ -942,13 +961,13 @@ } - .talking-list { - height: calc(100% - 832rpx); - padding: 12rpx 24rpx; - box-sizing: border-box; + // .talking-list { + // height: calc(100% - 832rpx); + // padding: 12rpx 24rpx; + // box-sizing: border-box; - .talking-scroll-list { - height: 100%; - } - } + // .talking-scroll-list { + // height: 100%; + // } + // } \ No newline at end of file