From 92bf458c1300fd14199a04af911a8bd6ae449c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Fri, 26 Sep 2025 16:42:39 +0800 Subject: [PATCH 1/5] foix: bug --- src/pages/index/dialog.vue | 2 +- src/pages/index/preview.vue | 2 +- src/static/view-pdf/pdf/pdfh5.css | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index da26415d..ef5d44cb 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -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??'') + '/' + (unref(userInfo)?.loginName??''); const questionList = ref([ // '对公小程序开户流程？', // '厅堂服务经理2025年管理办法？', diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue index d64637f0..8b1c661d 100644 --- a/src/pages/index/preview.vue +++ b/src/pages/index/preview.vue @@ -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??'') + '/' + (userInfo?.loginName??''); }, onShow() { if (getPhoneEnvBool('AND')) { diff --git a/src/static/view-pdf/pdf/pdfh5.css b/src/static/view-pdf/pdf/pdfh5.css index df83a53a..3fab6a92 100644 --- a/src/static/view-pdf/pdf/pdfh5.css +++ b/src/static/view-pdf/pdf/pdfh5.css @@ -13,6 +13,8 @@ overflow: auto; -webkit-overflow-scrolling: touch; transition: all .3s; + box-sizing: border-box; + padding-bottom: 40px; } .pdfjs .pdfViewer { From 89cc278179329a18341d86ec7629d4e4cc64fd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Fri, 26 Sep 2025 16:48:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/dialog.vue | 2 +- src/pages/index/preview.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index ef5d44cb..7b00709f 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -175,7 +175,7 @@ const watermarkRef = ref(); const userInfo = ref(getUserInfo()); const luimgAddr = computed(()=> unref(userInfo)?.mascotInfo?.imgAddr || '') - const userParams = '/' + (unref(userInfo)?.loginName??'') + '/' + (unref(userInfo)?.loginName??''); + const userParams = '/' + (unref(userInfo)?.loginName??'') const questionList = ref([ // '对公小程序开户流程？', // '厅堂服务经理2025年管理办法？', diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue index 8b1c661d..bca1f462 100644 --- a/src/pages/index/preview.vue +++ b/src/pages/index/preview.vue @@ -37,7 +37,7 @@ export default { onLoad(params) { this.fileId = params.fileId || '' const userInfo = getUserInfo(); - this.userParams = '/' + (userInfo?.loginName??'') + '/' + (userInfo?.loginName??''); + this.userParams = '/' + (userInfo?.loginName??'') }, onShow() { if (getPhoneEnvBool('AND')) { From 180640f3c0d4853704cad08f3d1bee26295dca88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Fri, 26 Sep 2025 17:31:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=B8=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 58 ++++++++++++------------------------------ src/pages/me/index.vue | 2 +- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/src/App.vue b/src/App.vue index 836567cb..b5f9ab78 100644 --- a/src/App.vue +++ b/src/App.vue @@ -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') } }; diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index ffee5ce9..38dfea4d 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -92,7 +92,7 @@ - + 竞赛记录 From fc9b0f455e7ab5780f916f7da166f79ca31eb3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Fri, 26 Sep 2025 17:44:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- src/components/image-preview/preview-detail-ios.vue | 4 ++-- src/pages/course/study.vue | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.development b/.env.development index b1b3050b..79a42a14 100644 --- a/.env.development +++ b/.env.development @@ -19,12 +19,12 @@ 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.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_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' diff --git a/src/components/image-preview/preview-detail-ios.vue b/src/components/image-preview/preview-detail-ios.vue index 837b7ed4..70f348d5 100644 --- a/src/components/image-preview/preview-detail-ios.vue +++ b/src/components/image-preview/preview-detail-ios.vue @@ -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) { diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 17bb4724..48438acb 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -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 { From 3aa40795a962d5454d62d10feb281e6537bc3f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Fri, 26 Sep 2025 18:10:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=83=E4=B9=A0?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=8E=BB=E8=80=83=E8=AF=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B2=A1=E5=88=A4=E6=96=AD=E8=80=83=E8=AF=95=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/pages/courseDetail/index.vue | 2 +- src/pages/practice/index.vue | 1424 +++++++++++++++--------------- src/pages/practice/result.vue | 6 + 4 files changed, 707 insertions(+), 729 deletions(-) diff --git a/.env.development b/.env.development index b1b3050b..df4a2df3 100644 --- a/.env.development +++ b/.env.development @@ -20,11 +20,11 @@ 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' diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index eeb28782..3de74b76 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -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(); diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue index fb3099b6..be67ffb1 100644 --- a/src/pages/practice/index.vue +++ b/src/pages/practice/index.vue @@ -1,787 +1,759 @@ diff --git a/src/pages/practice/result.vue b/src/pages/practice/result.vue index b7e5b847..107e36d3 100644 --- a/src/pages/practice/result.vue +++ b/src/pages/practice/result.vue @@ -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 = () => {