tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Browse Source
This commit is contained in:
田岩
2025-12-22 16:52:26 +08:00
parent 14ce12f941 6c2d0f6f52
commit f74c981b2f
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+1 -1
View File
@@ -7,7 +7,7 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
.env.development.yh
+3 -3
View File
@@ -2,14 +2,14 @@
ENV = 'development.yh'
# 'development.yh'
# 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.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_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601'
VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602'
# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602'
src/common/common.js
+16 -1
View File
@@ -14,7 +14,14 @@ function msg(title, duration = 1000) {
});
}
let isShowConfirm = false
function show(title, msg, showCancel = true, cancelText = '取消', confirmText = '确定') {
if(isShowConfirm) {
return new Promise((resolve, reject) => {
reject({});
});
}
isShowConfirm = true
return new Promise((resolve, reject) => {
// 创建通用参数对象
const dialogOptions = {
@@ -26,7 +33,9 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText
success: (res) => {
// 统一处理成功回调，解析为布尔值
resolve(!!res.confirm);
}
isShowConfirm = false
},
};
// #ifdef APP-PLUS
if (getPhoneEnvBool('AND')) {
@@ -35,6 +44,7 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText
...dialogOptions,
cancel: () => {
console.log('用户点击取消');
isShowConfirm = false
resolve(false); // 取消时也返回Promise结果
}
});
@@ -43,6 +53,7 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText
uni.showModal({
...dialogOptions,
fail: (res) => {
isShowConfirm = false
reject(res);
}
});
@@ -52,6 +63,7 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText
uni.showModal({
...dialogOptions,
fail: (res) => {
isShowConfirm = false
reject(res);
}
});
@@ -59,6 +71,9 @@ function show(title, msg, showCancel = true, cancelText = '取消', confirmText
});
}
const closeStatus = () => {
isShowConfirm = false
}
const loading = (title = '加载中', mask = true) => uni.showLoading({
title: title,
mask: mask
src/pages/course/components/talkingItem.vue
+18 -5
View File
@@ -60,10 +60,10 @@
<!-- 试题问题反馈 -->
<!-- <RadioSubjectRequest v-if="[8].indexOf(type) >= 0 && dataInfo.qnsTyp !== 'ES'" :item="dataInfo" :mode="mode" @subject_click="subject_click" /> -->
<!-- 段落图片视频预览 -->
<view v-if="type === 3" style="overflow: hidden">
<view v-if="type === 3" style="overflow: hidden;padding-top: 10rpx;">
<ImagePreview class="cont-img-box" v-for="item in (dataInfo.imageAddrs || []) "
:imgId="item" :previewDetail="false" @click="previewImage(item)"></ImagePreview>
<VideoPreview class="cont-img-box" v-if="(dataInfo.vidoAddrs || []).length > 0"
<VideoPreview class="cont-img-box cont-video-box" v-if="(dataInfo.vidoAddrs || []).length > 0"
:fileId="dataInfo.vidoAddrs[0].vidAddr"
:picId="dataInfo.vidoAddrs[0].vidImgAddr" @click="previewVideo(dataInfo.vidoAddrs[0])">
</VideoPreview>
@@ -913,6 +913,8 @@
}
.file-items{
float: left;
width: 100%;
padding-top: 12rpx;
.file-item {
line-height: 36rpx;
@@ -921,14 +923,25 @@
color: #06f;
}
}
.cont-img-box {
width: 433rpx;
height: 269rpx;
float: left;
width: calc(33% - 13.34rpx);
height: 130rpx;
border-radius: 15rpx;
overflow: hidden;
background-color: #fafafa;
margin-bottom: 20rpx;
margin-right: 20rpx;
&.cont-video-box{
width: 433rpx;
height: 269rpx;
margin-right: 0rpx;
}
&:nth-child(3n){
margin-right: 0;
}
}
}
src/pages/sparring/tip.vue
+4 -1
View File
@@ -290,6 +290,7 @@ const showModelComfirm = ref(false)
const reconcatNum = ref(0)
const answerText = ref('')
const touchBtnCallBack = ref(null)
const stopAnswerCallBack = ref(false)
let isLeave = false
const initsocketTask = () => {
let _src = isPreview.value ? '/trapractice/previewsocket/open' : '/trapractice/partnersocket/open'
@@ -310,7 +311,7 @@ const initsocketTask = () => {
if (watchFlag.value === 1 || showModelComfirm.value) return
if (reconcatNum.value === 5) {
common.msg('系统网络异常，请稍后再试！')
common.redirectTo(`/pages/index/dialog`)
common.reLaunch(`/pages/index/dialog`)
return
}
showModelComfirm.value = true
@@ -473,6 +474,7 @@ const initsocketTask = () => {
watchFlag.value += 1
}
const goBack = () => {
console.log(222,detailInfo.value.traInterTyp === '01')
if (detailInfo.value.traInterTyp === '01') {
overTalking()
} else {
@@ -585,6 +587,7 @@ onMounted(() => {
// getDetailInfo()
})
onBackPress(res => {
console.log(1111)
if (res.from === 'backbutton') {
goBack()
return true