From 0c6b7fcacef99c8b69a486cdc5ccab871a915e7c Mon Sep 17 00:00:00 2001 From: ws Date: Mon, 27 Apr 2026 18:36:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 pages/scan/result/ 扫码结果页，展示预约详情 - 实现微信小程序码生成（wxacode.getUnlimited） - 添加环境版本自动检测（release/trial/develop） - 优化 qrcode-modal 组件，使用 Base64 图片替代本地生成 - 统一 API 接口抽离到 api.js 和 config.js - 优化代码结构，提升可读性和维护性 主要变更： 1. utils/api.js: 新增 getWxacode() 接口，支持生成小程序码 2. components/qrcode-modal: 改用 API 生成小程序码，移除本地 QRCode 依赖 3. pages/scan/result: 新增扫码结果展示页，解析 scene 参数 4. utils/config.js: 新增 WXACODE 配置项 --- components/qrcode-modal/qrcode-modal.js | 35 ++++++++++------------- components/qrcode-modal/qrcode-modal.wxml | 4 +-- components/qrcode-modal/qrcode-modal.wxss | 8 ++++-- pages/scan/result/index.js | 34 +++++++++++----------- utils/api.js | 32 +++++++++++++++++++-- utils/config.js | 3 +- 6 files changed, 71 insertions(+), 45 deletions(-) diff --git a/components/qrcode-modal/qrcode-modal.js b/components/qrcode-modal/qrcode-modal.js index 6f3db64..cf4a111 100644 --- a/components/qrcode-modal/qrcode-modal.js +++ b/components/qrcode-modal/qrcode-modal.js @@ -1,33 +1,28 @@ -const drawQrcode = require('../../utils/weapp.qrcode.esm.js').default +const { getWxacode } = require('../../utils/api') Component({ data: { visible: false, qrcodeId: '', - loading: true + loading: true, + qrcodePath: '' }, methods: { - show(id) { - this.setData({ visible: true, qrcodeId: id, loading: true }) - wx.nextTick(() => { - drawQrcode({ - width: 200, - height: 200, - canvasId: 'qrcodeCanvas', - _this: this, - text: id, - callback: () => { - this.setData({ loading: false }) - } - }) - }) + async show(id) { + this.setData({ visible: true, qrcodeId: id, loading: true, qrcodePath: '' }) + try { + const base64Image = await getWxacode(id, 'pages/scan/result/index') + this.setData({ qrcodePath: base64Image, loading: false }) + } catch (err) { + console.error('获取小程序码失败', err) + wx.showToast({ title: '二维码生成失败', icon: 'none' }) + this.setData({ loading: false }) + } }, onClose() { - this.setData({ visible: false, qrcodeId: '' }) - }, - - noop() {} + this.setData({ visible: false, qrcodeId: '', qrcodePath: '' }) + } } }) diff --git a/components/qrcode-modal/qrcode-modal.wxml b/components/qrcode-modal/qrcode-modal.wxml index cddfb5f..d5def5f 100644 --- a/components/qrcode-modal/qrcode-modal.wxml +++ b/components/qrcode-modal/qrcode-modal.wxml @@ -1,8 +1,8 @@ 预约凭证 - - + + diff --git a/components/qrcode-modal/qrcode-modal.wxss b/components/qrcode-modal/qrcode-modal.wxss index e31526d..8c6cef2 100644 --- a/components/qrcode-modal/qrcode-modal.wxss +++ b/components/qrcode-modal/qrcode-modal.wxss @@ -29,16 +29,20 @@ letter-spacing: 4rpx; } -.qrcode-canvas-wrap { +.qrcode-image-wrap { position: relative; width: 400rpx; height: 400rpx; border: 1rpx solid #e8eef5; border-radius: 16rpx; overflow: hidden; + background: #ffffff; + display: flex; + align-items: center; + justify-content: center; } -.qrcode-canvas { +.qrcode-image { width: 400rpx; height: 400rpx; } diff --git a/pages/scan/result/index.js b/pages/scan/result/index.js index 6ee9a0c..8518d26 100644 --- a/pages/scan/result/index.js +++ b/pages/scan/result/index.js @@ -1,4 +1,3 @@ -// pages/scan/result/index.js const { appointmentDB, formatRecord } = require('../../../utils/api') Page({ @@ -9,48 +8,49 @@ Page({ }, onLoad(options) { - const id = options.id + const id = this.extractId(options) if (!id) { - this.setData({ - loading: false, - error: '缺少预约记录ID' - }) + this.setData({ loading: false, error: '缺少预约记录ID' }) return } this.loadRecordDetail(id) }, + extractId(options) { + if (options.id) return options.id + if (!options.scene) return null + + const scene = decodeURIComponent(options.scene) + return scene.startsWith('id=') ? scene.substring(3) : scene + }, + async loadRecordDetail(id) { try { this.setData({ loading: true }) const result = await appointmentDB.getDetail(id) + if (!result) { - this.setData({ - loading: false, - error: '预约记录不存在' - }) + this.setData({ loading: false, error: '预约记录不存在' }) return } - const formatted = formatRecord(result) + const statusMap = { 'pending': '待审核', 'approved': '已通过', 'rejected': '已拒绝', 'cancelled': '已取消' } + this.setData({ record: { - ...formatted, - statusText: statusMap[formatted.status] || formatted.status + ...formatRecord(result), + statusText: statusMap[result.status] || result.status }, loading: false }) } catch (err) { console.error('加载预约记录详情失败', err) - this.setData({ - loading: false, - error: '加载失败，请稍后重试' - }) + this.setData({ loading: false, error: '加载失败，请稍后重试' }) } } }) \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index 30b4163..b43b758 100644 --- a/utils/api.js +++ b/utils/api.js @@ -144,7 +144,33 @@ const appointmentDB = { } } -module.exports = { - formatRecord, - appointmentDB +/** + * 获取小程序码 + * @param {string} scene - 场景值 + * @param {string} page - 页面路径 + * @returns {Promise} Base64图片数据 + */ +async function getWxacode(scene, page = 'pages/scan/result/index') { + const envVersion = wx.getAccountInfoSync().miniProgram.envVersion + + const base64Data = await request({ + url: BASE_URL + API.WXACODE, + method: 'POST', + header: { 'content-type': 'application/json' }, + data: { + scene, + page, + width: 430, + envVersion + } + }) + + return `data:image/jpeg;base64,${base64Data}` +} + +module.exports = { + request, + formatRecord, + appointmentDB, + getWxacode } diff --git a/utils/config.js b/utils/config.js index a3e1e20..2405283 100644 --- a/utils/config.js +++ b/utils/config.js @@ -26,7 +26,8 @@ const API = { APPOINTMENT_LIST: '/api/wx-mini/appointment/list', APPOINTMENT_CREATE: '/api/wx-mini/appointment/create', APPOINTMENT_CANCEL: '/api/wx-mini/appointment/cancel', - APPOINTMENT_DETAIL: '/api/wx-mini/appointment/detail' + APPOINTMENT_DETAIL: '/api/wx-mini/appointment/detail', + WXACODE: '/api/wx-mini/wxacode' } console.log('[config] 当前环境:', wx.getAccountInfoSync().miniProgram.envVersion, 'BASE_URL:', BASE_URL)