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

Merge branch 'develop' into 'sit'

Browse Source 
Develop

See merge request K17_AITS/tra-app!202
This commit is contained in:
田岩
2025-09-26 18:22:16 +08:00
parent 315c0b01f6 424dded8f7
commit 0314cd3cd0
11 changed files with 733 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+4 -2
View File
@@ -19,12 +19,14 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
# h5专用地址x2
# 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.91:9786'
# 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_TRAASK = 'http://25.64.16.144:9605'
src/App.vue
+16 -42
View File
@@ -7,53 +7,27 @@
animationType: 'slide-in-bottom'
});
});
// console.log('预加载');
},
onShow: function () {
// 获取浏览器版本信息
function getBrowserInfo() {
const userAgent = navigator.userAgent;
let browserName = '未知浏览器';
let version = '未知版本';
// function getBrowserInfo() {
// const userAgent = navigator.userAgent;
// let browserName = '未知浏览器';
// let version = '未知版本';
// 检测 Chrome
if (userAgent.indexOf('Chrome') > -1 && userAgent.indexOf('Edg') === -1) {
browserName = 'Chrome';
version = userAgent.match(/Chrome\/(\d+\.\d+)/)[1];
}
// 检测 Edge (Chromium内核)
else if (userAgent.indexOf('Edg') > -1) {
browserName = 'Edge';
version = userAgent.match(/Edg\/(\d+\.\d+)/)[1];
}
// 检测 Firefox
else if (userAgent.indexOf('Firefox') > -1) {
browserName = 'Firefox';
version = userAgent.match(/Firefox\/(\d+\.\d+)/)[1];
}
// 检测 Safari
else if (userAgent.indexOf('Safari') > -1 && userAgent.indexOf('Chrome') === -1) {
browserName = 'Safari';
version = userAgent.match(/Version\/(\d+\.\d+)/)[1];
}
return {
browser: browserName,
version: version,
userAgent: userAgent
};
}
// 使用示例
// const browserInfo = getBrowserInfo();
// console.log(`浏览器: ${browserInfo.browser}`);
// console.log(`版本号: ${browserInfo.version}`);
// console.log(`完整用户代理: ${browserInfo.userAgent}`);
// console.log('App Show')
// // 检测 Chrome
// if (userAgent.indexOf('Chrome') > -1 && userAgent.indexOf('Edg') === -1) {
// browserName = 'Chrome';
// version = userAgent.match(/Chrome\/(\d+\.\d+)/)[1];
// }
// return {
// browser: browserName,
// version: version,
// userAgent: userAgent
// };
// }
},
onHide: function () {
// console.log('App Hide')
}
};
</script>
src/components/image-preview/preview-detail-ios.vue
+2 -2
View File
@@ -122,7 +122,7 @@ export default {
if (val) {
this.showModelNow()
} else {
this.$refs.PopupRef.close()
// this.$refs.PopupRef.close()
this.showModel = false
}
}
@@ -170,7 +170,7 @@ export default {
}
},
showModelNow() {
this.$refs.PopupRef.open()
// this.$refs.PopupRef.open()
this.showModel = true
if (this.fileType === 'image') {
if (this.fileId) {
src/pages/course/study.vue
+1 -1
View File
@@ -159,7 +159,7 @@
import common from '@/common/common'
import TalkingItem from '@/pages/course/components/talkingItem.vue'
import ImagePreview from '@/components/image-preview/image-preview.vue'
import PreviewDetail from '@/components/image-preview/preview-detail.vue'
import PreviewDetail from '@/components/image-preview/preview-detail-ios.vue'
import TouchBtn from '@/pages/course/components/touchBtn.vue'
import {
src/pages/courseDetail/index.vue
+1 -1
View File
@@ -225,7 +225,7 @@
name: form.value.crsName,
crsId: crsId.value
});
common.navigateTo('/pages/practice/index');
common.navigateTo('/pages/practice/index?examStat='+form.value.examStat);
})
.finally(() => {
common.hideLoading();
src/pages/index/dialog.vue
+1 -1
View File
@@ -175,7 +175,7 @@
const watermarkRef = ref();
const userInfo = ref(getUserInfo());
const luimgAddr = computed(()=> unref(userInfo)?.mascotInfo?.imgAddr || '')
const userParams = '/' + (unref(userInfo)?.userName??'') + '/' + (unref(userInfo)?.loginName??'');
const userParams = '/' + (unref(userInfo)?.loginName??'')
const questionList = ref([
// '对公小程序开户流程？',
// '厅堂服务经理2025年管理办法？',
src/pages/index/preview.vue
+1 -1
View File
@@ -37,7 +37,7 @@ export default {
onLoad(params) {
this.fileId = params.fileId || ''
const userInfo = getUserInfo();
this.userParams = '/' + (userInfo?.userName??'') + '/' + (userInfo?.loginName??'');
this.userParams = '/' + (userInfo?.loginName??'')
},
onShow() {
if (getPhoneEnvBool('AND')) {
src/pages/me/index.vue
+1 -1
View File
@@ -92,7 +92,7 @@
</view>
</view>
<view class="scroll-view-item">
<view class="item" @click="common.navigateTo('/pages/test/index')">
<view class="item" @click="goTest()">
<image class="icon" src="@/static/images/me/examination.png"></image>
<view class="title">竞赛记录</view>
</view>
src/pages/practice/index.vue
+698 -726
View File
File diff suppressed because it is too large Load Diff
src/pages/practice/result.vue
+6
View File
@@ -86,6 +86,8 @@
};
// 去考试
const goto_examination = async () => {
// if (examStat.value.examStat === '01') return common.msg('该课程下暂无试题');
if (examStat.value === '02') return common.msg('该课程下的试题未设置考试规则');
if (loading.value !== '') return;
try {
loading.value = '01';
@@ -125,13 +127,17 @@
const exrId = ref('')
const examLenTm = ref('')
const stat = ref('')
const examStat = ref('')
const commit = ref(false)
onLoad((e) => {
console.log('xx23333');
crsId.value = e.crsId
name.value = e.name
exrId.value = e.exrId
examLenTm.value = e.examLenTm
stat.value = e.stat
examStat.value = e.examStat??''
console.log('xxxx111');
practiceCommitFun()
});
const practiceCommitFun = () => {
src/static/view-pdf/pdf/pdfh5.css
+2
View File
@@ -13,6 +13,8 @@
overflow: auto;
-webkit-overflow-scrolling: touch;
transition: all .3s;
box-sizing: border-box;
padding-bottom: 40px;
}
.pdfjs .pdfViewer {