From 69a4c1824b27b59048ebd0e2c8b9ab7331d7e75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 15 Jul 2025 15:00:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=95=A5=E5=BE=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 4 ++++ src/pages/courseDetail/components/comment.vue | 2 +- src/pages/courseDetail/components/knowledge.vue | 1 - src/pages/courseDetail/index.vue | 3 ++- src/pages/index/index.vue | 8 ++++---- src/pages/test/index.vue | 1 + 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 8ae452a8..e4668703 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -4,6 +4,10 @@ { "playground" : "standard", "type" : "uni-app:app-android" + }, + { + "playground" : "standard", + "type" : "uni-app:app-ios" } ] } diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue index acbd367b..dd1b0f66 100644 --- a/src/pages/courseDetail/components/comment.vue +++ b/src/pages/courseDetail/components/comment.vue @@ -78,7 +78,7 @@ + :placeholder="reply_data.placeholder" :focus="true" :maxlength="100"> diff --git a/src/pages/courseDetail/components/knowledge.vue b/src/pages/courseDetail/components/knowledge.vue index 4235b5b0..4aede1ad 100644 --- a/src/pages/courseDetail/components/knowledge.vue +++ b/src/pages/courseDetail/components/knowledge.vue @@ -12,7 +12,6 @@ {{ item.pgrphStdyStateName }} - {{ item.pgrphContent }} diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 29af4020..cf0236c4 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -201,7 +201,8 @@ .bg_div { position: fixed; width: 100%; - + width: calc(100% + 4rpx); + left: -4rpx; .back-image { width: 100%; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index e901fc62..d553ed4f 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -131,7 +131,7 @@ - + {{item.crsName}} @@ -164,7 +164,7 @@ - + {{item.crsName}} @@ -196,7 +196,7 @@ - + {{item.crsName}} @@ -383,7 +383,7 @@ width: 146rpx !important; border-radius: 16rpx; } - + // 底线样式 .bottom_line { margin: 0 auto; diff --git a/src/pages/test/index.vue b/src/pages/test/index.vue index 644f6292..32432e94 100644 --- a/src/pages/test/index.vue +++ b/src/pages/test/index.vue @@ -24,6 +24,7 @@ import { get_base_url } from '../../api/request'; const url = get_base_url(); const ENV = import.meta.env const appBaseInfo = uni.getAppBaseInfo() +console.log('appBaseInfo', appBaseInfo); \ No newline at end of file diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index cf4fa96a..92b24b85 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -5,7 +5,7 @@ - + 课程中心 diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index ac21596f..9da2eb2c 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -8,7 +8,7 @@ - + 语言选择，开启学习之旅 @@ -43,7 +43,7 @@ - + 课程学习 @@ -317,6 +317,9 @@ const nextStep = () => { const pgrphNum = ref(1) const showOrder = ref(0) const isLastPgrph = ref(false) +const backRouter = ()=>{ + common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) +} // 获取段落 const getGraphInfoUnStudy = (flag = 0) => { console.log(isLastPgrph.value) @@ -334,7 +337,6 @@ const getGraphInfoUnStudy = (flag = 0) => { requestBody: JSON.stringify(_data) }).then(res=>{ let _body = res.body|| {} - console.log(_body) if(!_body.chatBody) { return } @@ -342,10 +344,10 @@ const getGraphInfoUnStudy = (flag = 0) => { common.show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗？',true, '取消','去评论').then((res) => { if(res) { // 去评论 - common.navigateTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`) + common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`) }else{ // 取消 - common.navigateTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) + common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) } }).finally(() => {}) return @@ -387,6 +389,7 @@ const getQuestionInfoUnStudy = (pgrphId) => { .then(res=>{ let _id = new Date().getTime() + 'id' let _body = res.body || {} + console.log(_body) if(_body.chatBody && _body.chatBody?.stdyStat !== 'N'){ let _id = new Date().getTime() + 'id' lastTalkingInfo.value = { diff --git a/src/pages/index/components/answer.vue b/src/pages/index/components/answer.vue index f63c3005..2c8c3905 100644 --- a/src/pages/index/components/answer.vue +++ b/src/pages/index/components/answer.vue @@ -1,9 +1,19 @@ - - \ No newline at end of file diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 8f0d2897..9a773039 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -92,7 +92,6 @@ import { ref } from 'vue' import common from '@/common/common'; import TouchBtn from '@/pages/course/components/touchBtn.vue' - import MarkdownPreview from '@/components/markdown-preview/markdown-preview.vue'; import TalkingItem from './components/talking-item.vue'; const questionList = ref([ '对公小程序开户流程？', From b2b4a8938c405cfc1836cc282c2724476c23ead5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E7=94=B5=E8=84=91?= Date: Tue, 15 Jul 2025 16:13:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- README.en.md | 6 ++++-- src/pages/courseDetail/index.vue | 10 ++++------ src/pages/courseDetail/submit.vue | 5 +++++ src/pages/index/index.vue | 6 ++---- src/pages/me/index.vue | 26 ++++++++++++++------------ 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/.env.development b/.env.development index c27d2b64..c596220c 100644 --- a/.env.development +++ b/.env.development @@ -13,7 +13,7 @@ ENV = 'development' # DEV VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' -# http://25.18.122.65:7001/download/dev-jax.apk + # app入口 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' #VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' diff --git a/README.en.md b/README.en.md index 9ad8216b..85462a72 100644 --- a/README.en.md +++ b/README.en.md @@ -1,3 +1,5 @@ -npm i --registry=http://25.12.10.69:8081/repository/aliyun-npm/ +npm install --registry=http://25.12.10.69:8081/repository/aliyun-npm/ -npm 淘宝源下载 ：npm config set registry https://registry.npmmirror.com \ No newline at end of file +npm 淘宝源下载 ：npm config set registry https://registry.npmmirror.com + +npm config set registry http://25.12.10.69:8081/repository/aliyun-npm/ \ No newline at end of file diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 39e9430a..ec1a2de3 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -115,7 +115,7 @@ }; const toStudyPrgh = (info) => { common.navigateTo('/pages/course/study?crsNum=' + crsNum.value + '&crsId=' + form.value.crsId + '&pgrphId=' + - info.pgrphId) + info.pgrphId+ '&imgId=' + form.imgId) } const bgOpacity = computed(() => { @@ -128,17 +128,15 @@ } onLoad((params) => { crsNum.value = params.crsNum; - getData(); uni.$on('refresh_comment_data', () => { commentRef.value.getData(); }) - uni.$on('refresh_course_detail_data', () => { - getData(); - }) }); + onShow(()=>{ + getData(); + }) onUnload(() => { uni.$off('refresh_comment_data') - uni.$off('refresh_course_detail_data') }); diff --git a/src/pages/courseDetail/submit.vue b/src/pages/courseDetail/submit.vue index c670a83a..1b341fc5 100644 --- a/src/pages/courseDetail/submit.vue +++ b/src/pages/courseDetail/submit.vue @@ -70,6 +70,7 @@ "bbsContent": '', // 评价内容 }) const imgId = ref('') + const from = ref('') const sliderChange = (event) => { formData.bbsGrade = event.detail.value } @@ -86,12 +87,16 @@ common.msg('发表成功') setTimeout(() => { uni.$emit('refresh_comment_data') + if(from.value === 'study'){ + } else { + } common.navigateBack() }, 500) }) } onLoad((params) => { formData.crsNum = params.crsNum; + from.value = params.from; imgId.value = params.imgId; }); diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index f72c4d69..2d55fb31 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -14,9 +14,7 @@ 消息 - - 30 - + 30 @@ -495,7 +493,7 @@ position: absolute; top: 0; left: 0; - width: 100%; + width: calc(100% + 4rpx); height: 870rpx; z-index: -1; } diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index 502d656e..9269b5c7 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -74,7 +74,7 @@ 考试记录 - + 我的报告 @@ -91,7 +91,7 @@ - + @@ -192,16 +192,18 @@ imageAddr: '', }); const goTest = () => { - const now = Date.now(); - if (now - lastClickTime.value > 500) { - clickCount.value = 0; - } - clickCount.value++; - lastClickTime.value = now; - if (clickCount.value == 6) { - common.navigateTo('/pages/test/index'); - clickCount.value = 0; - } + console.log('goTest'); + common.navigateTo('/pages/test/index'); + // const now = Date.now(); + // if (now - lastClickTime.value > 500) { + // clickCount.value = 0; + // } + // clickCount.value++; + // lastClickTime.value = now; + // if (clickCount.value == 6) { + // common.navigateTo('/pages/test/index'); + // clickCount.value = 0; + // } };