fix: 完善预约订单交互与状态展示

This commit is contained in:
que01 committed 2026-09-19 11:51:58 +08:00
1 parent cd242767a6
commit 38e2a0fb64
5 files changed
+39 -7

No files matched your search

+5 -2
View File
@@ -15,7 +15,10 @@ export class RequestIdMiddleware {
requestId,
);
}
console.info("api request", { method: request.method, url: request.url, requestId });
(request as FastifyRequest & { requestId?: string }).requestId = requestId;
if (process.env.NODE_ENV === "development") {
console.info("api request", { method: request.method, url: request.url, requestId });
}
next();
}
}
@@ -39,7 +42,7 @@ export class ApiExceptionFilter implements ExceptionFilter {
code: `HTTP_${status}`,
message: typeof detail === "string" ? detail : "请求失败",
},
requestId: request.headers["x-request-id"] ?? null,
requestId: (request as FastifyRequest & { requestId?: string }).requestId ?? request.headers["x-request-id"] ?? null,
});
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
const API = getApp().globalData.apiBaseUrl;
Page({
data: { service: {}, form: {}, serviceId: '', quantity: 1, fulfillment: 'pickup', submitting: false },
onLoad(query) { wx.request({ url: API + '/public/services', success: (res) => { const service = res.data.find((item) => item.id === query.serviceId) || res.data.find((item) => item.priceAmount !== null) || {}; this.setData({ service, serviceId: service.id || '' }); } }); },
onLoad(query) { wx.request({ url: API + '/public/services', success: (res) => { const services = Array.isArray(res.data) ? res.data : []; const service = services.find((item) => item.id === query.serviceId) || services.find((item) => item.priceAmount !== null) || {}; this.setData({ service, serviceId: service.id || '' }); }, fail: () => wx.showToast({ title: '服务加载失败', icon: 'none' }) }); },
input(event) { this.setData({ ['form.' + event.currentTarget.dataset.key]: event.detail.value }); },
chooseFulfillment(event) { this.setData({ fulfillment: event.currentTarget.dataset.value }); },
increase() { if (this.data.quantity < 50) this.setData({ quantity: this.data.quantity + 1 }); },
+7 -1
View File
@@ -1 +1,7 @@
<view class="page"><view class="product"><view class="product-image"><image wx:if="{{service.coverUrl}}" src="{{service.coverUrl}}" mode="aspectFill"/><view wx:else class="dish-placeholder"></view></view><view class="product-copy"><text class="name">{{service.name || '选择预约服务'}}</text><text class="price">{{service.priceText || '人工沟通报价'}}</text></view><text class="available">今日可订</text></view><view class="quantity"><text>数量</text><view class="stepper"><button bindtap="decrease">−</button><text>{{quantity}} 份</text><button bindtap="increase">+</button></view></view><view class="fulfillment"><text class="field-title">取餐方式</text><view class="choices"><button class="choice active">自取</button><button class="choice">配送</button></view></view><view class="form"><label>联系人<input name="customerName" placeholder="怎么称呼你" bindinput="input" data-key="customerName"/></label><label>联系电话<input name="wechatId" placeholder="手机号或微信号" bindinput="input" data-key="wechatId"/></label><label>预约时间<input name="requestedTime" placeholder="例如:今天 12:30" bindinput="input" data-key="requestedTime"/></label><label>备注<textarea placeholder="口味、餐具或其他说明" bindinput="input" data-key="note"></textarea></label></view><view class="notice">● 提交后由摊主人工确认,确认后再安排制作。</view><button class="submit" loading="{{submitting}}" disabled="{{submitting}}" bindtap="submit">{{submitting ? '提交中...' : '提交预约'}}</button></view>
<view class="page">
<view class="product"><view class="product-image"><image wx:if="{{service.coverUrl}}" src="{{service.coverUrl}}" mode="aspectFill"/><view wx:else class="dish-placeholder"></view></view><view class="product-copy"><text class="name">{{service.name || '选择预约服务'}}</text><text class="price">{{service.priceText || '人工沟通报价'}}</text></view><text class="available">今日可订</text></view>
<view class="quantity"><text>数量</text><view class="stepper"><button bindtap="decrease">−</button><text>{{quantity}} 份</text><button bindtap="increase">+</button></view></view>
<view class="fulfillment"><text class="field-title">取餐方式</text><view class="choices"><button class="choice {{fulfillment === 'pickup' ? 'active' : ''}}" data-value="pickup" bindtap="chooseFulfillment">自取</button><button class="choice {{fulfillment === 'delivery' ? 'active' : ''}}" data-value="delivery" bindtap="chooseFulfillment">配送</button></view></view>
<view class="form"><label>联系人<input name="customerName" placeholder="怎么称呼你" bindinput="input" data-key="customerName"/></label><label>联系电话<input name="wechatId" placeholder="手机号或微信号" bindinput="input" data-key="wechatId"/></label><label>预约时间<input name="requestedTime" placeholder="例如:今天 12:30" bindinput="input" data-key="requestedTime"/></label><label wx:if="{{fulfillment === 'delivery'}}">配送地址<input name="deliveryAddress" placeholder="请输入配送地址" bindinput="input" data-key="deliveryAddress"/></label><label>备注<textarea placeholder="口味、餐具或其他说明" bindinput="input" data-key="note"></textarea></label></view>
<view class="notice">● 提交后由摊主人工确认,确认后再安排制作。</view><button class="submit" loading="{{submitting}}" disabled="{{submitting}}" bindtap="submit">{{submitting ? '提交中...' : '提交预约'}}</button>
</view>
+10 -2
View File
@@ -1,2 +1,10 @@
const API=getApp().globalData.apiBaseUrl;
Page({data:{loading:true,bookings:[]},onLoad(){this.load()},onShow(){this.load()},load(){const token=wx.getStorageSync('customerToken');if(!token){this.setData({loading:false});return}wx.request({url:API+'/customer/bookings',header:{Authorization:'Bearer '+token},success:r=>this.setData({bookings:r.data,loading:false}),fail:()=>this.setData({loading:false})})},cancel(e){const id=e.currentTarget.dataset.id;wx.showModal({title:'取消预约',content:'确定取消这笔预约吗?',success:r=>{if(!r.confirm)return;wx.request({url:API+'/customer/bookings/'+id+'/cancel',method:'POST',header:{Authorization:'Bearer '+wx.getStorageSync('customerToken'),'content-type':'application/json'},data:{},success:res=>{if(res.statusCode<300)this.load();else wx.showToast({title:res.data?.error?.message||'取消失败',icon:'none'})},fail:err=>wx.showToast({title:err.errMsg||'网络请求失败',icon:'none'})})}})}});
const API = getApp().globalData.apiBaseUrl;
const STATUS_LABELS = { received: '待确认', contacting: '沟通中', confirmed: '已确认', completed: '已完成', cancelled: '已取消' };
const FULFILLMENT_LABELS = { pickup: '自取', delivery: '配送' };
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: '' }); wx.request({ url: API + '/customer/bookings', header: { Authorization: 'Bearer ' + token }, success: (res) => { if (res.statusCode >= 300) return this.setData({ loading: false, error: res.data?.error?.message || '订单加载失败' }); const bookings = (Array.isArray(res.data) ? res.data : []).map((item) => ({ ...item, statusLabel: STATUS_LABELS[item.status] || '未知状态', fulfillmentLabel: FULFILLMENT_LABELS[item.fulfillmentType] || '待确认', serviceName: item.service?.name || item.items?.[0]?.serviceName || '红烧肉家常套餐', quantityLabel: `${item.items?.[0]?.quantity || 1} 份` })); this.setData({ bookings, loading: false }); }, fail: (error) => this.setData({ loading: false, error: error.errMsg || '网络请求失败' }) }); },
retry() { this.load(); }, contact() { 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 }); wx.request({ url: API + '/customer/bookings/' + id + '/cancel', method: 'POST', header: { Authorization: 'Bearer ' + wx.getStorageSync('customerToken'), 'content-type': 'application/json' }, data: {}, success: (res) => { this.setData({ cancellingId: '' }); if (res.statusCode < 300) { wx.showToast({ title: '已取消预约', icon: 'success' }); this.load(); } else wx.showToast({ title: res.data?.error?.message || '取消失败', icon: 'none' }); }, fail: (error) => { this.setData({ cancellingId: '' }); wx.showToast({ title: error.errMsg || '网络请求失败', icon: 'none' }); } }); } }); }
});
+16 -1
View File
@@ -1 +1,16 @@
<view class="page"><view class="heading-row"><text class="heading">我的订单</text><text class="phone">☎</text></view><view wx:if="{{loading}}" class="state">加载中...</view><view wx:elif="{{!bookings.length}}" class="empty">完成预约后,订单会显示在这里</view><view wx:else><view class="status-banner"><view><text class="status-title">待确认</text><text class="status-sub">摊主会尽快联系你</text></view><text class="check">✓</text></view><view wx:for="{{bookings}}" wx:key="id" class="card"><view class="card-visual"><view class="dish-placeholder"></view><view class="card-main"><text class="name">{{item.service.name || '红烧肉家常套餐'}}</text><text class="summary">{{item.items[0].quantity}} 份 · {{item.fulfillmentType || '自取'}} · {{item.requestedTime || '今天 12:30'}}</text></view></view><view class="card-foot"><text class="price">{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}</text><text class="status">{{item.status === 'received' ? '待确认' : item.status}}</text></view><view class="actions"><button class="contact" size="mini">联系摊主</button><button class="cancel" wx:if="{{item.status === 'received'}}" size="mini" data-id="{{item.id}}" bindtap="cancel">取消预约</button></view><text class="cancel-note" wx:if="{{item.status === 'received'}}">取消后请及时告知摊主,避免食材浪费。</text></view><view class="faq"><view class="faq-title">常见问题 <text>›</text></view><view>○ 怎么确认预约? <text>›</text></view><view>○ 配送范围有多远? <text>›</text></view><view>○ 可以改时间吗? <text>›</text></view></view></view></view>
<view class="page">
<view class="heading-row"><text class="heading">我的订单</text><text class="phone" bindtap="contact">☎</text></view>
<view wx:if="{{loading}}" class="state">加载中...</view>
<view wx:elif="{{error}}" class="state error"><text>{{error}}</text><button size="mini" bindtap="retry">重新加载</button></view>
<view wx:elif="{{!bookings.length}}" class="empty">完成预约后,订单会显示在这里</view>
<block wx:else>
<view class="status-banner"><view><text class="status-title">订单状态</text><text class="status-sub">查看每笔预约的最新进展</text></view><text class="check">✓</text></view>
<view wx:for="{{bookings}}" wx:key="id" class="card">
<view class="card-visual"><view class="dish-placeholder"></view><view class="card-main"><text class="name">{{item.serviceName}}</text><text class="summary">{{item.quantityLabel}} · {{item.fulfillmentLabel}} · {{item.requestedTime || '时间待确认'}}</text></view></view>
<view class="card-foot"><text class="price">{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}</text><text class="status">{{item.statusLabel}}</text></view>
<view class="actions"><button class="contact" size="mini" bindtap="contact">联系摊主</button><button class="cancel" wx:if="{{item.status === 'received'}}" loading="{{cancellingId === item.id}}" disabled="{{!!cancellingId}}" size="mini" data-id="{{item.id}}" bindtap="cancel">{{cancellingId === item.id ? '取消中...' : '取消预约'}}</button></view>
<text class="cancel-note" wx:if="{{item.status === 'received'}}">取消后请及时告知摊主,避免食材浪费。</text>
</view>
<view class="faq"><view class="faq-title">常见问题 <text>›</text></view><view>○ 怎么确认预约? <text>›</text></view><view>○ 配送范围有多远? <text>›</text></view><view>○ 可以改时间吗? <text>›</text></view></view>
</block>
</view>