From 0ee4ec3ca94da2cc5fddde75f30498b662784fab 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 10:45:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 48 +++++++++++++++--------------- src/common/dialogMessage.js | 30 +++++++++---------- src/pages/course/index.vue | 12 ++++---- src/pages/me/index.vue | 7 ++--- src/pages/test/index.vue | 58 ++++++++++++++++++++++++++----------- 5 files changed, 89 insertions(+), 66 deletions(-) diff --git a/src/api/login.js b/src/api/login.js index 5c99ccb9..fa52f126 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -133,31 +133,31 @@ export const queryCurrentUser = (data) => request({ // 生成唯一文件名，避免冲突 const filename = pathName.split('/').pop() const localFilePath = '_downloads/' + filename - + console.log('localFilePath', localFilePath, url); // 先检查是否存在 - // uni.getFileInfo({ - // filePath: localFilePath, - // success: () => { - // console.log('头像已存在，无需下载'); - // updateUserAvatar(localFilePath) - // }, - // fail: () => { - // console.log('开始下载头像:', url); - // const dtask = plus.downloader.createDownload( - // url, { - // method: 'GET', - // filename: '_downloads/' + filename - // }, - // (download, status) => { - // if (status === 200) { - // console.log('头像下载成功:', download.filename); - // updateUserAvatar(download.filename) - // } - // } - // ) - // dtask.start(); - // } - // }) + uni.getFileInfo({ + filePath: localFilePath, + success: () => { + console.log('头像已存在，无需下载'); + updateUserAvatar(localFilePath) + }, + fail: () => { + console.log('开始下载头像:', url); + const dtask = plus.downloader.createDownload( + url, { + method: 'GET', + filename: '_downloads/' + filename + }, + (download, status) => { + if (status === 200) { + console.log('头像下载成功:', download.filename); + updateUserAvatar(download.filename) + } + } + ) + dtask.start(); + } + }) } catch (error) { diff --git a/src/common/dialogMessage.js b/src/common/dialogMessage.js index 522b4708..d215f8c4 100644 --- a/src/common/dialogMessage.js +++ b/src/common/dialogMessage.js @@ -4,46 +4,46 @@ export default function showDialog(options) { left: '0', height: '100%', width: '100%', - backgroundColor: 'rgba(0,0,0,0.5)', + backgroundColor: 'rgba(0,0,0,0.1)', position: 'fixed' }); const screenWidth = plus.screen.resolutionWidth; const screenHeight = plus.screen.resolutionHeight; const borderRadius = 10; - const contentPadding = 20; // 内容左右内边距 - const lineHeight = 24; // 单行文本行高 + const contentPadding = 12; // 内容左右内边距 + const lineHeight = 17; // 单行文本行高 const maxLines = 2; // 最大行数 - const fontSize = 16; // 字体大小 + const fontSize = 14; // 字体大小 // 判断内容和标题是否存在 const hasContent = options.content && options.content.trim() !== ''; const hasTitle = options.title && options.title.trim() !== ''; // 弹窗宽度计算 - const modalWidth = Math.min(0.8 * screenWidth, 500); + const modalWidth = Math.min(0.65 * screenWidth, 500); const modalLeft = (screenWidth - modalWidth) / 2; // 内容区域可用宽度 const contentAvailableWidth = modalWidth - 2 * contentPadding - 10; // 动态计算各部分高度 - const titleHeight = hasTitle ? 30 : 0; + const titleHeight = hasTitle ? 20 : 0; const titleToContentSpacing = (hasTitle && hasContent) ? 10 : 0; const contentHeight = hasContent ? (lineHeight * maxLines) : 0; const contentToBtnSpacing = 10; - const btnHeight = 50; + const btnHeight = 46; // 弹窗总高度 - let modalHeight = contentPadding + titleHeight + titleToContentSpacing + contentHeight + contentToBtnSpacing + btnHeight; + let modalHeight = contentPadding + 6 + titleHeight + titleToContentSpacing + contentHeight + contentToBtnSpacing + btnHeight; modalHeight = options.showCancel ? Math.min(modalHeight, 300) : Math.min(modalHeight, 250); // 位置计算 const modalTop = (screenHeight - modalHeight) / 2; - const contentAreaTop = modalTop + contentPadding; + const contentAreaTop = modalTop + contentPadding + 6; const titleTop = hasTitle ? contentAreaTop : 0; - // Fix: Calculate contentTop properly when there's no content + let contentTop; if (hasContent) { contentTop = hasTitle ? (titleTop + titleHeight + titleToContentSpacing) : contentAreaTop; @@ -77,7 +77,7 @@ export default function showDialog(options) { position: { top: titleTop + 'px', left: modalLeft + 'px', width: modalWidth + 'px', height: titleHeight + 'px' }, textStyles: { color: '#000', - size: '20px', + size: '18px', align: 'center', fontWeight: 'bold', verticalAlign: 'middle' @@ -146,7 +146,7 @@ export default function showDialog(options) { height: lineHeightPx + 'px' }, textStyles: { - color: '#666', + color: '#111', size: fontSizePx + 'px', align: 'center', verticalAlign: 'top', @@ -165,19 +165,19 @@ export default function showDialog(options) { elements.push({ tag: 'rect', id: 'divider', - position: { top: btnTop + 'px', left: modalLeft + 'px', width: modalWidth + 'px', height: '1px' }, + position: { top: btnTop + 'px', left: modalLeft + 'px', width: modalWidth + 'px', height: '0.5px' }, rectStyles: { color: '#b3b3b3' } }); view.draw(elements); - + // 绘制按钮（不变） if (options.showCancel) { const btnWidth = Math.floor((modalWidth - 2 * borderRadius) / 2); view.draw([ { tag: 'rect', id: 'cancelBtn', position: { top: (btnTop + 2) + 'px', left: (modalLeft + borderRadius) + 'px', width: btnWidth + 'px', height: (btnHeight - 3) + 'px' }, rectStyles: { color: '#fff' } }, { tag: 'font', id: 'cancelText', text: options.cancelText || '取消', position: { top: btnTop + 'px', left: (modalLeft + borderRadius) + 'px', width: btnWidth + 'px', height: btnHeight + 'px' }, textStyles: { color: '#007AFF', size: '16px', align: 'center', verticalAlign: 'middle' } }, - { tag: 'rect', id: 'btnDivider', position: { top: btnTop + 'px', left: (modalLeft + borderRadius + btnWidth) + 'px', width: '1px', height: btnHeight + 'px' }, rectStyles: { color: '#b3b3b3' } }, + { tag: 'rect', id: 'btnDivider', position: { top: btnTop + 'px', left: (modalLeft + borderRadius + btnWidth) + 'px', width: '0.5px', height: btnHeight + 'px' }, rectStyles: { color: '#b3b3b3' } }, { tag: 'rect', id: 'confirmBtn', position: { top: (btnTop + 2) + 'px', left: (modalLeft + borderRadius + btnWidth + 1) + 'px', width: btnWidth + 'px', height: (btnHeight - 3) + 'px' }, rectStyles: { color: '#fff' } }, { tag: 'font', id: 'confirmText', text: options.confirmText || '确定', position: { top: btnTop + 'px', left: (modalLeft + borderRadius + btnWidth + 1) + 'px', width: btnWidth + 'px', height: btnHeight + 'px' }, textStyles: { color: '#007AFF', size: '16px', align: 'center', verticalAlign: 'middle' } } ]); diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 0912b77f..1fbf94f6 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -281,12 +281,12 @@ import { onShow } from "@dcloudio/uni-app" getCourseTypeListApi().then(res=>{ courseTypeList.value = res.body||[] }) - // getPrdLineTypeListApi().then(res=>{ - // coursePrdlineList.value = res.body||[] - // }) - // getTraTagListApi().then(res=>{ - // tagsTree.value = res.body||[] - // }) + getPrdLineTypeListApi().then(res=>{ + coursePrdlineList.value = res.body||[] + }) + getTraTagListApi().then(res=>{ + tagsTree.value = res.body||[] + }) changeTab({name:'全部'}) }) onActivated(() => { diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index 44f9d3d1..777c2a8f 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -8,10 +8,9 @@ - - - + + diff --git a/src/pages/test/index.vue b/src/pages/test/index.vue index b8eeb68a..b5f2b3b1 100644 --- a/src/pages/test/index.vue +++ b/src/pages/test/index.vue @@ -32,24 +32,23 @@ import showDialog from '@/common/dialogMessage' const bbbb = () => { - showDialog({ - title: '提示信息', - content: '检测到您已离开，即将退出学习页面。', - confirmText: '确认', - showCancel: false, - cancelText: '再想想', - success: (res) => { - if (res.confirm) { - console.log('用户点击确定'); - } - }, - cancel: () => { - console.log('用户点击取消'); - } + // showDialog({ + // title: '提示信息', + // content: '检测到您已离开，即将退出学习页面。', + // confirmText: '确认', + // showCancel: false, + // cancelText: '再想想', + // success: (res) => { + // if (res.confirm) { + // console.log('用户点击确定'); + // } + // }, + // cancel: () => { + // console.log('用户点击取消'); + // } - }); - } - const aaaa = () => { + // }); + showDialog({ title: '提示', content: '检测到您已存在学习记录，要继续学习吗？', @@ -66,6 +65,31 @@ } }); } + const aaaa = () => { + common.show('提示','检测到您已存在学习记录，要继续学习吗？','继续学习', '重新学习').then(res => { + + }) + + +// function show(title, msg, showCancel = true, cancelText = '取消', confirmText = '确定') { + + + // showDialog({ + // title: '提示', + // content: '检测到您已存在学习记录，要继续学习吗？', + // confirmText: '重新学习', + // showCancel: true, + // cancelText: '继续学习', + // success: (res) => { + // if (res.confirm) { + // console.log('用户点击确定'); + // } + // }, + // cancel: () => { + // console.log('用户点击取消'); + // } + // }); + }