From c37a30478efb626b3a64d0d655e3b4304157594f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 22 Jul 2025 14:11:16 +0800 Subject: [PATCH 01/11] 2 --- .env.development | 4 ++-- src/pages/course/index.vue | 3 ++- src/pages/index/dialog.vue | 12 +++++++----- src/pages/index/index.vue | 4 ++-- src/pages/login/login.vue | 3 ++- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index a7b52e29..80cab90f 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' # app入口 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' @@ -17,4 +17,4 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # h5专用地址 -VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' \ No newline at end of file +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7003' \ No newline at end of file diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 1fbf94f6..68a6b6b2 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -368,7 +368,8 @@ import { onShow } from "@dcloudio/uni-app" overflow-y: auto; z-index: 2; background-color: #f9f9f9; - box-shadow: 0rpx 3.85rpx 38rpx rgba(0,0,0,.05); + box-shadow: 0rpx 19rpx 19rpx rgba(160,160,160,.5); + border-radius: 0 0 20rpx 20rpx; padding: 0rpx 25rpx; box-sizing: border-box; .filter-type{ diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index d5f27998..c0f99472 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -117,7 +117,7 @@ import { commonUploadVoiceFile } from "@/api/common.js" - + const socketStore = useSocketStore() const { SocketObj } = storeToRefs(socketStore) const userInfo = computed(() => getUserInfo()) @@ -470,6 +470,7 @@ display: flex; flex-direction: column; height: 100vh; + overflow: hidden; .top-bg{ background: linear-gradient(16deg,rgba(234,246,255,0) 0%,#c3e6ff 100%); height: 480rpx; @@ -485,8 +486,8 @@ position: absolute; overflow: hidden; left:0; - top: 0; - height: 100%; + top: 1%; + height: 102%; width: 100%; padding: 0; box-sizing: border-box; @@ -616,14 +617,15 @@ } .question-item{ white-space: nowrap; - height: 76rpx; - line-height: 74rpx; + height: 66rpx; + line-height: 66rpx; background-color: #fff; border: 2rpx solid #e0dede; padding: 0 16rpx; border-radius: 11rpx; margin-right: 16rpx; display: inline-block; + font-size: 26rpx; &:last-child{ margin-right: 0; } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index f5ff929b..2a738d35 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -708,18 +708,18 @@ .study_duration_div { height: 162rpx; background: linear-gradient(180deg, rgba(238, 246, 255, 0.65) 0%, #C5DFFD 4%, #FFFFFF 100%); + border-radius: 23rpx; display: flex; justify-content: space-around; z-index: 20; - + .item { flex: 1; // background-color: red; display: flex; flex-direction: column; justify-content: center; - .top { font-family: PingFangSC, PingFang SC; font-weight: 400; diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 38a882ed..76ae587e 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -118,7 +118,8 @@ const login_fun = (): void => { back_state.value = false; common.navigateBack(); // 返回登录的上一页 } else { - common.switchTab('/pages/index/index'); + // common.switchTab('/pages/index/index'); + common.redirectTo('/pages/index/dialog', {animationType: 'slide-in-bottom'}); } } }) From ce57ad38610d2d9c38547627c15304d03b989a62 Mon Sep 17 00:00:00 2001 From: yanghang Date: Tue, 22 Jul 2025 14:25:05 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix=EF=BC=9B=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/components/touchBtn.vue | 3 +-- src/pages/course/index.vue | 7 ++++--- src/pages/index/dialog.vue | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 69f1d7ca..6b272a48 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -10,7 +10,7 @@ + placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入文字"> @@ -115,7 +115,6 @@ const initRecord = () => { let _recordPerm = uni.getAppAuthorizeSetting() let _state = _recordPerm.microphoneAuthorized if(_state === 'authorized'){ - console.log('大大大大大'); showTalkingModel.value = true } }) diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 1fbf94f6..ff98e60b 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -284,12 +284,13 @@ import { onShow } from "@dcloudio/uni-app" getPrdLineTypeListApi().then(res=>{ coursePrdlineList.value = res.body||[] }) - getTraTagListApi().then(res=>{ - tagsTree.value = res.body||[] - }) changeTab({name:'全部'}) }) onActivated(() => { + // 重新获取标签信息 + getTraTagListApi().then(res=>{ + tagsTree.value = res.body||[] + }) changeTab({name:activeTab.value || '全部'}) }); diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index d5f27998..98c38aa3 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -400,7 +400,7 @@ }else{ talkingList.value.pop() uni.showToast({ - title: '语音内容不能为空!', + title: '未识别到文字!', icon: "none", duration:1000 }); From 47c9c53f3d749eda0f4269a80f36ee1a038520b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 22 Jul 2025 15:37:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/dialog.vue | 697 ++++++++++++++++++++----------------- src/pages/index/index.vue | 18 +- src/pages/login/login.vue | 17 +- 3 files changed, 399 insertions(+), 333 deletions(-) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index c0f99472..b3ac284d 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -3,7 +3,8 @@ - + @@ -16,7 +17,7 @@ - + Hi,我是{{ userInfo.mascotInfo?.mascotName || ''}} 工作学习,我都能帮你! 试试他的能力 @@ -25,36 +26,22 @@ - {{questionList[item-1]}} + {{questionList[item-1]}} - {{questionList[item + Math.ceil(questionList.length/2)-1]}} + @click="sendText(questionList[item + Math.ceil(questionList.length/2)-1])"> + {{questionList[item + Math.ceil(questionList.length/2)-1]}} - - + + @@ -90,36 +77,56 @@ - + \ No newline at end of file diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 2a738d35..928cdf01 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -225,6 +225,7 @@ diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index e0d7eb04..835e2e8d 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -32,11 +32,11 @@ {{item.label}} - + {{itemT.label}} - + @@ -284,6 +284,9 @@ import { onShow } from "@dcloudio/uni-app" getPrdLineTypeListApi().then(res=>{ coursePrdlineList.value = res.body||[] }) + getTraTagListApi().then(res=>{ + tagsTree.value = res.body||[] + }) changeTab({name:'全部'}) }) onActivated(() => { @@ -369,8 +372,8 @@ import { onShow } from "@dcloudio/uni-app" overflow-y: auto; z-index: 2; background-color: #f9f9f9; - box-shadow: 0rpx 19rpx 19rpx rgba(160,160,160,.5); - border-radius: 0 0 20rpx 20rpx; + box-shadow: 0rpx 12rpx 20rpx rgba(160,160,160,.25); + border-radius: 0 0 0rpx 0rpx; padding: 0rpx 25rpx; box-sizing: border-box; .filter-type{ @@ -385,7 +388,8 @@ import { onShow } from "@dcloudio/uni-app" .filter-type-list{ overflow: hidden; .filter-type-item{ - width: calc(25% - 18rpx); + // width: calc(25% - 18rpx); + display: inline-block; font-size: 29rpx; box-sizing: border-box; padding:0 20rpx; @@ -401,7 +405,7 @@ import { onShow } from "@dcloudio/uni-app" border-radius: 6rpx; margin-bottom: 20rpx; &:nth-child(4n){ - margin-right: 0; + margin-right: 24rpx; } &.is-active{ color: #06f; diff --git a/src/pages/index/components/talking-item.vue b/src/pages/index/components/talking-item.vue index 2a17752d..a539d4d5 100644 --- a/src/pages/index/components/talking-item.vue +++ b/src/pages/index/components/talking-item.vue @@ -49,7 +49,7 @@ \ No newline at end of file From ce3372b67c3a9fbfb2838daceec868695f29fa27 Mon Sep 17 00:00:00 2001 From: yanghang Date: Tue, 22 Jul 2025 16:13:31 +0800 Subject: [PATCH 06/11] fix: bug --- src/pages/course/components/touchBtn.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index f5e49c48..e322ca3e 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -107,6 +107,7 @@ const initRecord = () => { if(!isOut.value){ if(startFlag.value !== 2){ common.msg('说话时间太短,没有听清!') + showTalkingModel.value = false return } emit('uploadVoice', audioPath.value) From 128babf07f0b01bef96568ca07a11e572a17f26c Mon Sep 17 00:00:00 2001 From: yanghang Date: Tue, 22 Jul 2025 16:16:35 +0800 Subject: [PATCH 07/11] fix: bug --- src/pages/course/components/touchBtn.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index e322ca3e..46cdd72a 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -206,6 +206,7 @@ const getRecordPermission = (obj) => { } const isMoving = ref(false) const showOverlayTalking = (obj) => { + if(showTalkingModel.value) return if(isLoadingState.value){ uni.showToast({ title: props.loadingText, From 4be586d247c748d0604590f574ba114280d644b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 22 Jul 2025 16:18:24 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E9=A6=96=E9=A1=B52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/dialog.vue | 6 +++--- src/pages/index/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index afdfc714..29d8b6e6 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -725,7 +725,7 @@ } } } - } + .talking-list{ height: calc(100% - 832rpx); @@ -734,5 +734,5 @@ .talking-scroll-list{ height: 100%; } - } } - \ No newline at end of file + } + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 928cdf01..43089de3 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -860,4 +860,4 @@ flex-direction: column; background-color: #F6F8FF; } - \ No newline at end of file + From e093df6f25e8c2c3b536516eefe2a0ce7c190080 Mon Sep 17 00:00:00 2001 From: yanghang Date: Tue, 22 Jul 2025 16:31:59 +0800 Subject: [PATCH 09/11] fix: bug --- src/pages/course/components/touchBtn.vue | 12 +++++++----- src/pages/index/dialog.vue | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 46cdd72a..4d4f6c50 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -106,11 +106,13 @@ const initRecord = () => { showTalkingModel.value = false if(!isOut.value){ if(startFlag.value !== 2){ - common.msg('说话时间太短,没有听清!') showTalkingModel.value = false - return + nextTick(() => { + common.msg('说话时间太短,没有听清!') + }) + }else{ + emit('uploadVoice', audioPath.value) } - emit('uploadVoice', audioPath.value) } }) unref(recordObjCom).onStart(() => { @@ -133,8 +135,8 @@ const startRecord = () => { const stopRecord = () => { if(unref(recordObjCom).stop){ try{ - unref(recordObjCom)?.stop() - }catch{ + unref(recordObjCom).stop() + }finally{ showTalkingModel.value = false } }else{ diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 72090774..db22ddd1 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -522,8 +522,8 @@ position: absolute; overflow: hidden; left: 0; - top: 1%; - height: 102%; + top: 0%; + height: 100%; width: 100%; padding: 0; box-sizing: border-box; @@ -716,7 +716,7 @@ } .talking-list { - height: calc(100% - 834rpx); + height: calc(100% - 832rpx); padding: 12rpx 24rpx; box-sizing: border-box; From 397bbb2ed50ed3e440af4dba27754d2515b87600 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, 22 Jul 2025 17:10:25 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=8C=89=E4=BD=8F=E8=AF=B4=E8=AF=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/components/touchBtn.vue | 37 ++++++++++++++----- src/pages/courseDetail/components/comment.vue | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 4d4f6c50..6a6a7243 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -103,16 +103,27 @@ const initRecord = () => { // stopRecord() unref(recordObjCom)?.onStop((res, duration)=>{ audioPath.value = res.tempFilePath - showTalkingModel.value = false if(!isOut.value){ if(startFlag.value !== 2){ - showTalkingModel.value = false - nextTick(() => { - common.msg('说话时间太短,没有听清!') + // setTimeout(() => { + // showTalkingModel.value = false + // nextTick(() => { + // // showTalkingModel.value = false + // common.msg('说话时间太短,没有听清!') + // }) + // },100) + closeModel(()=>{ + nextTick(() => { + // showTalkingModel.value = false + common.msg('说话时间太短,没有听清!') + }) }) }else{ + closeModel() emit('uploadVoice', audioPath.value) } + }else{ + closeModel() } }) unref(recordObjCom).onStart(() => { @@ -133,15 +144,21 @@ const startRecord = () => { } const stopRecord = () => { - if(unref(recordObjCom).stop){ try{ - unref(recordObjCom).stop() - }finally{ - showTalkingModel.value = false + if(unref(recordObjCom).stop){ + unref(recordObjCom).stop() + }else{ + closeModel() + } + }catch{ + closeModel() } - }else{ +} +const closeModel = (cb = () => {}) => { + setTimeout(() => { showTalkingModel.value = false - } + cb && cb() + },100) } // #endif //#ifndef APP-PLUS diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue index 1ba652de..ec11be8a 100644 --- a/src/pages/courseDetail/components/comment.vue +++ b/src/pages/courseDetail/components/comment.vue @@ -75,7 +75,7 @@ @click="common.navigateTo('/pages/courseDetail/submit?crsNum='+props.crsNum+'&imgId='+props.imgId)">发布评价 - + From 775293da3d5e3c57f7e6c993af3c4ab48af28f83 Mon Sep 17 00:00:00 2001 From: yanghang Date: Tue, 22 Jul 2025 17:11:09 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=89=A9=E5=A4=A7=E7=82=B9=E5=87=BB=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/study.vue | 7 +++++-- src/pages/courseDetail/index.vue | 9 ++++++--- src/pages/courseDetail/submit.vue | 5 +++-- src/pages/me/index.vue | 2 ++ src/pages/search/search.vue | 7 ++++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index e28d2642..07d95aa8 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -953,6 +953,7 @@ const chooseRateNow = (item) => { display: flex; flex-direction: column; .body-title{ + height: 150rpx; text-align: center; font-size: 33rpx; @@ -965,9 +966,11 @@ const chooseRateNow = (item) => { // margin-bottom: 23rpx; .arrow-icon{ position: absolute; - left:36rpx; - top:80rpx; + left:21rpx; + top:65rpx; color: #000; + padding: 15rpx; + // background-color: red; } } .study-num{ diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index f235a184..708c55c8 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -148,9 +148,12 @@ .back_div { margin-right: 10rpx; position: fixed; - left: 46rpx; - top: 64rpx; - + left: 25rpx; + top: 45rpx; + // background-color: red; + // width: 60rpx; + // height: 60rpx; + padding: 20rpx; .back-icon { position: relative; width: 40rpx; diff --git a/src/pages/courseDetail/submit.vue b/src/pages/courseDetail/submit.vue index 74acac21..d65eeb6f 100644 --- a/src/pages/courseDetail/submit.vue +++ b/src/pages/courseDetail/submit.vue @@ -251,8 +251,9 @@ align-items: center; .back_div { - margin-right: 10rpx; - + // margin-right: 10rpx; + padding: 15rpx; + // background-color: red; .back-icon { position: relative; width: 40rpx; diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index 9a005ea2..ca39711f 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -59,6 +59,7 @@ + @@ -77,6 +78,7 @@ 我的报告 + diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue index fd34b95f..80c3939f 100644 --- a/src/pages/search/search.vue +++ b/src/pages/search/search.vue @@ -62,14 +62,15 @@ } .fixed_search_div { - padding: calc(10rpx + var(--status-bar-height)) 15rpx 24rpx 30rpx; + padding: calc(10rpx + var(--status-bar-height)) 15rpx 24rpx 10rpx; background: linear-gradient(90deg, #F1F7FF 0%, #D8EDFF 50%, #C3E6FF 100%); display: flex; align-items: center; .back_div { - margin-right: 10rpx; - + // margin-right: 10rpx; + padding: 10rpx 10rpx 10rpx 20rpx; + // background-color: red; .back-icon { position: relative; width: 40rpx;