杨航解决BUG
This commit is contained in:
+3
-3
@@ -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 = '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.65:7001'
|
||||||
#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116: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_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_TRAASK = 'http://25.64.16.144:9605'
|
# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
|
||||||
# 王洋洋
|
# 王洋洋
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="cont-box">
|
<view class="cont-box">
|
||||||
<view class="item-title">{{itemInfo.crsName}}</view>
|
<view class="item-title">{{itemInfo.crsName}}</view>
|
||||||
<uv-scroll-list class="item-tags" :indicator="false">
|
<scroll-view class="item-tags" :scroll-x="true">
|
||||||
<view class="item-tag-view">
|
<view class="item-tag-view">
|
||||||
<view class="item-tag" v-for="item in tagsShowList">{{item.tagName}}</view>
|
<view class="item-tag" v-for="item in tagsShowList">{{item.tagName}}</view>
|
||||||
</view>
|
</view>
|
||||||
</uv-scroll-list>
|
</scroll-view>
|
||||||
<view class="item-publish">更新:{{itemInfo.mtTime}}</view>
|
<view class="item-publish">更新:{{itemInfo.mtTime}}</view>
|
||||||
<view class="item-num">已学:{{itemInfo.accmStdyCnt}}人次</view>
|
<view class="item-num">已学:{{itemInfo.accmStdyCnt}}人次</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -115,18 +115,17 @@
|
|||||||
margin-bottom: 10rpx;
|
margin-bottom: 10rpx;
|
||||||
}
|
}
|
||||||
.item-tags{
|
.item-tags{
|
||||||
padding-bottom: 0 !important;
|
|
||||||
.item-tag-view{
|
.item-tag-view{
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
height: 38rpx;
|
height: 44rpx;
|
||||||
.item-tag{
|
.item-tag{
|
||||||
height: 38rpx;
|
height: 38rpx;
|
||||||
line-height: 36rpx;
|
line-height: 34rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
font-size: 20rpx;
|
font-size: 20rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
color: #ffa150;
|
color: #ffa150;
|
||||||
border: 1rpx solid #ffa150;
|
border: 2rpx solid #ffa150;
|
||||||
padding: 0 20rpx;
|
padding: 0 20rpx;
|
||||||
border-radius: 8rpx;
|
border-radius: 8rpx;
|
||||||
margin-right: 20rpx;
|
margin-right: 20rpx;
|
||||||
@@ -147,6 +146,9 @@
|
|||||||
color: rgb(102,102,102);
|
color: rgb(102,102,102);
|
||||||
margin-top: 6rpx;
|
margin-top: 6rpx;
|
||||||
}
|
}
|
||||||
|
.item-publish{
|
||||||
|
margin-top: 0rpx;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
+33
-14
@@ -105,7 +105,8 @@
|
|||||||
onActivated
|
onActivated
|
||||||
} from 'vue'
|
} from 'vue'
|
||||||
import common from '@/common/common';
|
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 TalkingItem from './components/talking-item.vue';
|
||||||
import PreviewVue from './components/preview.vue';
|
import PreviewVue from './components/preview.vue';
|
||||||
import {
|
import {
|
||||||
@@ -663,6 +664,7 @@
|
|||||||
initsocketTask()
|
initsocketTask()
|
||||||
};
|
};
|
||||||
onLoad(() => {
|
onLoad(() => {
|
||||||
|
changeAppHeightBottom()
|
||||||
if (!common.isLogin()) {
|
if (!common.isLogin()) {
|
||||||
common.navigateTo('/pages/login/login')
|
common.navigateTo('/pages/login/login')
|
||||||
return
|
return
|
||||||
@@ -689,7 +691,22 @@
|
|||||||
|
|
||||||
const keyboardHeight = ref('0px')
|
const keyboardHeight = ref('0px')
|
||||||
const setHeight = (res) => {
|
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
|
//#ifdef APP-PLUS
|
||||||
onHide(() => {
|
onHide(() => {
|
||||||
@@ -702,6 +719,7 @@
|
|||||||
onUnload(() => {
|
onUnload(() => {
|
||||||
watchFlag.value = 1
|
watchFlag.value = 1
|
||||||
socketStore?.closeSocket()
|
socketStore?.closeSocket()
|
||||||
|
// setupKeyboardHeightListener(changeAppHeightBottom)
|
||||||
})
|
})
|
||||||
defineExpose({
|
defineExpose({
|
||||||
refreshData
|
refreshData
|
||||||
@@ -733,13 +751,14 @@
|
|||||||
.index-dialog-body {
|
.index-dialog-body {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
left: 0;
|
height: calc(100% - v-bind(totalBotHeight));
|
||||||
bottom: 0%;
|
|
||||||
height: calc(100% - v-bind(keyboardHeight));
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding-top: v-bind(pageTopPadding);
|
padding-top: v-bind(pageTopPadding);
|
||||||
|
// padding-bottom: v-bind(bottomHeight);
|
||||||
// display: flex;
|
// display: flex;
|
||||||
// flex-direction: column;
|
// flex-direction: column;
|
||||||
|
|
||||||
@@ -931,7 +950,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.talking-list {
|
.talking-list {
|
||||||
height: calc(100% - 832rpx + v-bind(pageTopPadding));
|
height: calc(100% - 772rpx );
|
||||||
padding: 12rpx 24rpx;
|
padding: 12rpx 24rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
@@ -942,13 +961,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.talking-list {
|
// .talking-list {
|
||||||
height: calc(100% - 832rpx);
|
// height: calc(100% - 832rpx);
|
||||||
padding: 12rpx 24rpx;
|
// padding: 12rpx 24rpx;
|
||||||
box-sizing: border-box;
|
// box-sizing: border-box;
|
||||||
|
|
||||||
.talking-scroll-list {
|
// .talking-scroll-list {
|
||||||
height: 100%;
|
// height: 100%;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
</style>
|
</style>
|
||||||
Reference in New Issue
Block a user