From 653fe596acbce730ea9d44e4a3ecd70916364589 Mon Sep 17 00:00:00 2001 From: que01 Date: Sat, 19 Sep 2026 12:20:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=96=87=E6=A1=88=E7=BA=A0=E5=81=8F=E4=B8=BA=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E5=93=81=E7=89=8C=E8=AF=AD=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/miniapp/app.json | 2 +- apps/miniapp/pages/booking/index.json | 2 +- apps/miniapp/pages/booking/index.wxml | 6 +++--- apps/miniapp/pages/bookings/index.js | 2 +- apps/miniapp/pages/bookings/index.wxml | 4 ++-- apps/miniapp/pages/index/index.wxml | 8 ++++---- apps/miniapp/pages/services/index.wxml | 2 +- apps/miniapp/utils/labels.js | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/miniapp/app.json b/apps/miniapp/app.json index 6710702..7027ebf 100644 --- a/apps/miniapp/app.json +++ b/apps/miniapp/app.json @@ -1,4 +1,4 @@ { "pages": ["pages/index/index", "pages/services/index", "pages/booking/index", "pages/bookings/index"], - "window": { "navigationBarTitleText": "阿桂的家常小灶", "navigationBarBackgroundColor": "#FBF7F1", "navigationBarTextStyle": "black", "backgroundColor": "#FBF7F1" } + "window": { "navigationBarTitleText": "个人品牌", "navigationBarBackgroundColor": "#FBF7F1", "navigationBarTextStyle": "black", "backgroundColor": "#FBF7F1" } } diff --git a/apps/miniapp/pages/booking/index.json b/apps/miniapp/pages/booking/index.json index 431195f..6f36cc1 100644 --- a/apps/miniapp/pages/booking/index.json +++ b/apps/miniapp/pages/booking/index.json @@ -1 +1 @@ -{"navigationBarTitleText":"预约套餐","navigationBarBackgroundColor":"#FBF7F1","navigationBarTextStyle":"black"} +{"navigationBarTitleText":"提交需求","navigationBarBackgroundColor":"#FBF7F1","navigationBarTextStyle":"black"} diff --git a/apps/miniapp/pages/booking/index.wxml b/apps/miniapp/pages/booking/index.wxml index cd2d33b..fc06bc6 100644 --- a/apps/miniapp/pages/booking/index.wxml +++ b/apps/miniapp/pages/booking/index.wxml @@ -1,7 +1,7 @@ {{service.name || '选择预约服务'}}{{service.priceText || '人工沟通报价'}}今日可订 数量{{quantity}} 份 - 取餐方式 - - ● 提交后由摊主人工确认,确认后再安排制作。 + 合作方式 + + ● 提交后品牌方会与你确认需求、时间和合作方式。 diff --git a/apps/miniapp/pages/bookings/index.js b/apps/miniapp/pages/bookings/index.js index d843d8d..a03b4bd 100644 --- a/apps/miniapp/pages/bookings/index.js +++ b/apps/miniapp/pages/bookings/index.js @@ -4,6 +4,6 @@ Page({ data: { loading: true, error: '', bookings: [], cancellingId: '' }, onLoad() { this.load(); }, onShow() { this.load(); }, load() { const token = wx.getStorageSync('customerToken'); if (!token) return this.setData({ loading: false, bookings: [], error: '' }); this.setData({ loading: true, error: '' }); customerRequest('/customer/bookings').then((items) => this.setData({ bookings: (Array.isArray(items) ? items : []).map(bookingViewModel), loading: false })).catch((error) => this.setData({ loading: false, error: error.message || '网络请求失败' })); }, - retry() { this.load(); }, contact() { wx.showToast({ title: '暂未配置联系方式', icon: 'none' }); }, + retry() { this.load(); }, contact() { const brand = getApp().globalData.brand || {}; if (brand.contactPhone) return wx.makePhoneCall({ phoneNumber: brand.contactPhone }); if (brand.contactWechat) return wx.showModal({ title: '联系品牌方', content: '微信号:' + brand.contactWechat, showCancel: false }); wx.showToast({ title: '暂未配置联系方式', icon: 'none' }); }, cancel(e) { const id = e.currentTarget.dataset.id; if (this.data.cancellingId) return; wx.showModal({ title: '取消预约', content: '确定取消这笔预约吗?', success: (result) => { if (!result.confirm) return; this.setData({ cancellingId: id }); customerRequest('/customer/bookings/' + id + '/cancel', { method: 'POST', data: {} }).then(() => { this.setData({ cancellingId: '' }); wx.showToast({ title: '已取消预约', icon: 'success' }); this.load(); }).catch((error) => { this.setData({ cancellingId: '' }); wx.showToast({ title: error.message || '取消失败', icon: 'none' }); }); } }); } }); diff --git a/apps/miniapp/pages/bookings/index.wxml b/apps/miniapp/pages/bookings/index.wxml index 4d4ba34..99e1405 100644 --- a/apps/miniapp/pages/bookings/index.wxml +++ b/apps/miniapp/pages/bookings/index.wxml @@ -8,8 +8,8 @@ {{item.serviceName}}{{item.quantityLabel}} · {{item.fulfillmentLabel}} · {{item.requestedTime || '时间待确认'}} {{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}{{item.statusLabel}} - - 取消后请及时告知摊主,避免食材浪费。 + + 如需调整,请尽早联系品牌方。 常见问题 ›○ 怎么确认预约? ›○ 配送范围有多远? ›○ 可以改时间吗? › diff --git a/apps/miniapp/pages/index/index.wxml b/apps/miniapp/pages/index/index.wxml index 3441ef0..fc8f493 100644 --- a/apps/miniapp/pages/index/index.wxml +++ b/apps/miniapp/pages/index/index.wxml @@ -3,10 +3,10 @@ 加载中... {{error}} - 今天吃什么现做家常饭 - 品牌简介{{brand.description || '个人经营的家常小灶,套餐现做,也可预约小型聚餐和私厨定制。'}} - 营业时间{{brand.hours || '11:00—20:00'}}›摊位地址{{brand.address || '校园路社区便民点 12 号'}}配送说明{{brand.deliveryNote || '满 30 元周边配送,也可自取'}} - + {{brand.name || '个人品牌'}}{{brand.tagline || '把专业能力,变成值得信赖的体验'}} + 关于我{{brand.description || '这里展示你的专业背景、工作方式与品牌理念。'}} + 服务时间{{brand.hours || '工作日 10:00—18:00'}}›所在位置{{brand.address || '线上 / 线下均可沟通'}}合作说明{{brand.deliveryNote || '提交需求后,我会尽快与你联系'}} + 今日服务 {{item.name}}{{item.description}}{{item.priceText}} diff --git a/apps/miniapp/pages/services/index.wxml b/apps/miniapp/pages/services/index.wxml index 4afd169..6195147 100644 --- a/apps/miniapp/pages/services/index.wxml +++ b/apps/miniapp/pages/services/index.wxml @@ -1 +1 @@ -服务列表今日可订● 普通套餐日常家常饭● 私厨服务聚餐定制加载中...暂无可订服务{{item.name}}{{item.bookingEnabled ? '今日可订' : '暂不可订'}}{{item.description}}{{item.priceText || '面议'}} +服务列表可咨询● 标准服务清晰的服务方案● 定制合作按需求沟通加载中...{{error}}暂无可咨询服务{{item.name}}{{item.bookingEnabled ? '可咨询' : '暂不可用'}}{{item.description}}{{item.priceText || '沟通报价'}} diff --git a/apps/miniapp/utils/labels.js b/apps/miniapp/utils/labels.js index 7689c93..91afa4b 100644 --- a/apps/miniapp/utils/labels.js +++ b/apps/miniapp/utils/labels.js @@ -1,5 +1,5 @@ const STATUS_LABELS = { received: '待确认', contacting: '沟通中', confirmed: '已确认', completed: '已完成', cancelled: '已取消' }; -const FULFILLMENT_LABELS = { pickup: '自取', delivery: '配送' }; +const FULFILLMENT_LABELS = { pickup: '线上沟通', delivery: '线下沟通' }; function bookingViewModel(item) { return {