From 431645c0bfe32540f8760c63c96d990748684bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 4 Mar 2026 16:42:10 +0800 Subject: [PATCH] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E=E5=90=89?= =?UTF-8?q?=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=9C=80?= =?UTF-8?q?=E6=B1=82=5F=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=A4=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/pages/index/dialog.vue | 1 - .../learningTasks/components/content-item.vue | 52 +- src/pages/learningTasks/details2.vue | 699 ------------------ src/pages/sparring/components/talk-list.vue | 5 +- 5 files changed, 48 insertions(+), 711 deletions(-) delete mode 100644 src/pages/learningTasks/details2.vue diff --git a/.env.development b/.env.development index 93437482..f620d0e7 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # DEV diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 3e8c9059..2af76cf5 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -174,7 +174,6 @@ import { useStorageStore } from '@/store/storage.js'; import { storeToRefs } from 'pinia'; import { onLoad, onShow, onUnload, onHide, onBackPress, onLaunch } from '@dcloudio/uni-app'; - import { get_base_url, goto_login_fun } from '@/api/request'; import { getUserInfo, getPhoneEnvBool } from '@/common/common'; import { commonUploadVoiceFile } from '@/api/common.js'; diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue index 61daaf21..5586e011 100644 --- a/src/pages/learningTasks/components/content-item.vue +++ b/src/pages/learningTasks/components/content-item.vue @@ -18,11 +18,14 @@ 完成人数: {{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }} - - 进度: - + + + + + {{progress}} + @@ -41,11 +44,14 @@ }); const emit = defineEmits(['click_item']); const item = computed(() => props.item); + const progress = computed(() => { + // 计算进度百分比(保留两位小数) + const total = item.value.sumCrs ?? item.value.taskNumber ?? 0; + if (total === 0) return '0%'; + const completed = item.value.finishCrs ?? item.value.learnedNumber ?? 0; + return Math.min(Math.round((completed / total) * 10000) / 100, 100) + '%'; + }); const getStatusClass = (item) => { - // 01进行中、02已完成、03已超时 - // if (isFinish === '00') return 'in_progress'; - // if (isFinish === '01') return 'completed'; - // return 'expired'; if (item.isFinish === '02') return 'completed'; if (item.isTimeOut === '02') return 'expired'; return 'expired'; @@ -104,7 +110,7 @@ padding-top: 16rpx; padding-bottom: 12rpx; display: flex; - + .img_div { position: relative; width: 256rpx; @@ -163,7 +169,10 @@ } .people_progress_div { + display: flex; + align-items: center; + flex-wrap: nowrap; font-weight: 400; font-size: 22rpx; color: #666; @@ -174,6 +183,31 @@ height: 24rpx; // overflow: hidden; } + // 进度条 + .progress-div { + position: relative; + background-color: #D9DEE8; + width: 100%; + height: 14rpx; + border-radius: 10rpx; + overflow: hidden; + .progress-line { + position: absolute; + top: 0; + left: 0; + background-color: #0066FF; + width: v-bind(progress); + height: 100%; + border-radius: 10rpx; + } + } + .progress-text{ + font-family: Arial, Helvetica, sans-serif; + margin-left: 8rpx; + font-weight: 600; + color: #0066ff; + font-size: 22rpx; + } } } diff --git a/src/pages/learningTasks/details2.vue b/src/pages/learningTasks/details2.vue deleted file mode 100644 index ecb36513..00000000 --- a/src/pages/learningTasks/details2.vue +++ /dev/null @@ -1,699 +0,0 @@ - - - - - diff --git a/src/pages/sparring/components/talk-list.vue b/src/pages/sparring/components/talk-list.vue index 0b38d4fd..0e5c22ef 100644 --- a/src/pages/sparring/components/talk-list.vue +++ b/src/pages/sparring/components/talk-list.vue @@ -45,7 +45,7 @@ const emits = defineEmits(['clickTipButton']); const customStyle = { height: '60rpx', - width: '200rpx' + width: '210rpx' }; // 点击回答提示按钮 const clickTipButton = () => { @@ -140,6 +140,9 @@ } .answerTipButtonDiv { margin: 20rpx 0 20rpx 0; + :deep(.uv-button__loading-text) { + white-space: nowrap !important; + } } .answerTipButton { margin: 20rpx 0 20rpx 0;