From 4a1401605bfd401f35d71704eed87386f23623c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 19 Nov 2025 20:45:00 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/charts/index.vue | 29 ++++++++++++++++++----------- src/static/images/charts/cup.png | Bin 0 -> 65932 bytes src/static/images/charts/text.png | Bin 0 -> 4570 bytes 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 src/static/images/charts/cup.png create mode 100644 src/static/images/charts/text.png diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue index aabc5d9c..24483a33 100644 --- a/src/pages/charts/index.vue +++ b/src/pages/charts/index.vue @@ -1,6 +1,7 @@ @@ -82,9 +82,9 @@ overflow: hidden; .item-title { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + // white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; line-height: 44rpx; font-size: 29rpx; font-weight: 500; From 9ef11a72286fa59b28c9750094e4f8ae108d831b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 20 Nov 2025 11:02:12 +0800 Subject: [PATCH 5/9] fix: bug --- src/api/pointsAndRank.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/pointsAndRank.js b/src/api/pointsAndRank.js index 5e53ab2c..aa6a614b 100644 --- a/src/api/pointsAndRank.js +++ b/src/api/pointsAndRank.js @@ -45,16 +45,16 @@ export const addPointsByCheckIn = (data) => { */ export const addPointsByTask = (data) => { // base_url - // return request({ - // url: base_url + '/traPointsInfo/addPointsByTask', - // method: 'post', - // data - // }); return request({ - url: '/test/traPointsInfo/addPointsByTask', + url: base_url + '/traPointsInfo/addPointsByTask', method: 'post', data }); + // return request({ + // url: '/test/traPointsInfo/addPointsByTask', + // method: 'post', + // data + // }); }; /** From 96197fe05a7e4cf07b7a18f8f958124aaede441d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 20 Nov 2025 11:08:19 +0800 Subject: [PATCH 6/9] fix: bug --- .env.development.yh | 2 +- src/pages/sparring/chooseRole.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.env.development.yh b/.env.development.yh index 37f4a114..3934d26d 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -4,7 +4,7 @@ ENV = 'development.yh' VITE_APP_BASE_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_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' diff --git a/src/pages/sparring/chooseRole.vue b/src/pages/sparring/chooseRole.vue index 70f94dd0..ff4f26ca 100644 --- a/src/pages/sparring/chooseRole.vue +++ b/src/pages/sparring/chooseRole.vue @@ -88,7 +88,6 @@ }) } const onSwiperChange = (data) => { - console.log('轮播图切换:', e); currentIndex.value = data.index; } const isPreview = ref(false) From abb84a08d3467fa94422cb98663c72f32c97983c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 20 Nov 2025 11:17:54 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/points-and-badge/usePointsAndBadge.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/points-and-badge/usePointsAndBadge.js b/src/components/points-and-badge/usePointsAndBadge.js index bfa230f9..7d7a079c 100644 --- a/src/components/points-and-badge/usePointsAndBadge.js +++ b/src/components/points-and-badge/usePointsAndBadge.js @@ -107,9 +107,12 @@ export default function usePointsAndBadge() { setTimeout(() => { badgeRef.value.open(pointsList, badgesList, () => { badgeRef.value.close() + complete(true, '积分获取成功', res); }); }, pop_up_time); }); + }else{ + complete(true, '积分获取成功', res); } }); // complete(true, '积分获取成功', res); From ec8f0eef6355ae49a584feeadede5b8fbb7ac6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 20 Nov 2025 11:21:05 +0800 Subject: [PATCH 8/9] fix ;bug --- src/components/points-and-badge/usePointsAndBadge.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/points-and-badge/usePointsAndBadge.js b/src/components/points-and-badge/usePointsAndBadge.js index 7d7a079c..6ed8514f 100644 --- a/src/components/points-and-badge/usePointsAndBadge.js +++ b/src/components/points-and-badge/usePointsAndBadge.js @@ -118,7 +118,8 @@ export default function usePointsAndBadge() { // complete(true, '积分获取成功', res); } catch (error) { // console.error(`类型${type}积分获取失败：`, error); - // complete(false, '积分获取失败', error); + // console.log('积分获取失败') + complete(false, '积分获取失败', error); } }; From b468267e962c1aedc9b359cde7a068b7eb882a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 20 Nov 2025 15:29:15 +0800 Subject: [PATCH 9/9] =?UTF-8?q?feat=EF=BC=9A=E9=97=AE=E7=AD=94=E5=BE=BD?= =?UTF-8?q?=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development.yh | 4 ++-- .../points-and-badge/usePointsAndBadge.js | 18 ++++++++++++------ src/pages/index/dialog.vue | 6 ++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.env.development.yh b/.env.development.yh index 3934d26d..5166041e 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -4,8 +4,8 @@ ENV = 'development.yh' VITE_APP_BASE_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_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.154:9601' diff --git a/src/components/points-and-badge/usePointsAndBadge.js b/src/components/points-and-badge/usePointsAndBadge.js index 6ed8514f..94bd3f10 100644 --- a/src/components/points-and-badge/usePointsAndBadge.js +++ b/src/components/points-and-badge/usePointsAndBadge.js @@ -1,11 +1,12 @@ /** - 完成课程学习 首次完成1分 每天最多获取5分 完成课程学习 crsId 02 完成调用 杨航 - 完成课程练习 首次完成1分 每天最多获取5分 完成课程练习 crsId 04 完成练习调用 田岩 已完成 - 通过课程考试 首次完成1分 每天最多获取5分 通过课程考试 crsId 03 通过调用 田岩 已完成 + 完成课程学习 首次完成1分 每天最多获取5分 完成课程学习 crsId 02 完成调用 杨航 + 完成课程练习 首次完成1分 每天最多获取5分 完成课程练习 crsId 04 完成练习调用 田岩 已完成 + 通过课程考试 首次完成1分 每天最多获取5分 通过课程考试 crsId 03 通过调用 田岩 已完成 完成考试中心考试 首次完成1分 每天最多获取5分 完成考试中心考试 papersId 05 完成调用 田岩 已完成 - 完成竞赛PK 每次1分 每天最多获取5分 完成竞赛PK 11 完成调用 田岩 已完成 - 通过AI陪练练习 每次1分 每天最多获取5分 通过AI陪练练习 07 通过调用 杨航 - 通过AI陪练考试 每次1分 每天最多获取5分 通过AI陪练考试 08 通过调用 杨航 + 完成竞赛PK 每次1分 每天最多获取5分 完成竞赛PK 11 完成调用 田岩 已完成 + 获取AI问答 次数徽章 06 建立ws完成调用 杨航 + 通过AI陪练练习 每次1分 每天最多获取5分 通过AI陪练练习 07 通过调用 杨航 + 通过AI陪练考试 每次1分 每天最多获取5分 通过AI陪练考试 08 通过调用 杨航 签到 每日1积分， 第七天5积分， 第30天20积分， @@ -42,6 +43,11 @@ const typeConfig = { paramsKey: 'papersId', rule: '首次完成1分，每天最多5分' }, + '06': { + name: 'AI问答次数徽章', + paramsKey: '', + rule: '' + }, '07': { name: '通过AI陪练练习', paramsKey: '', diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 1f129a9d..0c17dee5 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -133,6 +133,8 @@ + + @@ -164,6 +166,9 @@ import Feedback from './components/feedback.vue'; import History from './components/history.vue'; import badge from '@/components/points-and-badge/badge'; + import points from '@/components/points-and-badge/points'; + import usePointsAndBadge from '@/components/points-and-badge/usePointsAndBadge'; + const { pointAndBadgesRun, badgeRef, pointsRef } = usePointsAndBadge(); const { statusBarHeight } = uni.getWindowInfo(); @@ -284,6 +289,7 @@ if (commond === 'ASK-START') { // console.log('开启对话！') reqBatch.value = body.reqBatch; + pointAndBadgesRun('06') return; } if (commond === 'ASK') {