feat: 完善预约与订单页面闭环

This commit is contained in:
que01 committed 2026-09-19 11:40:51 +08:00
1 parent a6592066c1
commit e19b6258d7
3 files changed
+22 -4

No files matched your search

+20 -2
View File
@@ -1,2 +1,20 @@
const API=getApp().globalData.apiBaseUrl;
Page({data:{service:{},form:{},serviceId:'',quantity:1,submitting:false},onLoad(q){wx.request({url:API+'/public/services',success:r=>{const service=r.data.find(x=>x.id===q.serviceId)||r.data.find(x=>x.priceAmount!==null)||{};this.setData({service,serviceId:service.id||''})}})},input(e){this.setData({['form.'+e.currentTarget.dataset.key]:e.detail.value})},increase(){if(this.data.quantity<50)this.setData({quantity:this.data.quantity+1})},decrease(){if(this.data.quantity>1)this.setData({quantity:this.data.quantity-1})},submit(){const f=this.data.form;if(!this.data.serviceId){wx.showToast({title:'请先选择服务',icon:'none'});return}if(!f.customerName||!f.wechatId){wx.showToast({title:'请填写称呼和联系方式',icon:'none'});return}this.setData({submitting:true});const send=token=>wx.request({url:API+'/customer/bookings',method:'POST',header:{Authorization:'Bearer '+token},data:{requestType:'package',customerName:f.customerName,wechatId:f.wechatId,contactPreference:'wechat',requestedTime:f.requestedTime,note:f.note,items:[{serviceId:this.data.serviceId,quantity:this.data.quantity}]},success:r=>{this.setData({submitting:false});if(r.statusCode<300){wx.showToast({title:'预约已提交'});setTimeout(()=>wx.navigateTo({url:'/pages/bookings/index'}),500)}else wx.showToast({title:(r.data&&r.data.error&&r.data.error.message)||'提交失败',icon:'none'})},fail:e=>{this.setData({submitting:false});wx.showToast({title:e.errMsg||'网络请求失败',icon:'none'})}});const existing=wx.getStorageSync('customerToken');if(existing){send(existing);return}wx.login({success:l=>wx.request({url:API+'/customer/session/wechat',method:'POST',data:{code:l.code},success:r=>{if(r.statusCode<300){wx.setStorageSync('customerToken',r.data.token);send(r.data.token)}else{this.setData({submitting:false});wx.showToast({title:(r.data&&r.data.error&&r.data.error.message)||'微信登录失败',icon:'none'})}},fail:e=>{this.setData({submitting:false});wx.showToast({title:e.errMsg||'微信登录请求失败',icon:'none'})}}),fail:e=>{this.setData({submitting:false});wx.showToast({title:e.errMsg||'微信登录失败',icon:'none'})}})}});
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 || '' }); } }); },
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 }); },
decrease() { if (this.data.quantity > 1) this.setData({ quantity: this.data.quantity - 1 }); },
submit() {
const form = this.data.form;
if (!this.data.serviceId) return wx.showToast({ title: '请先选择服务', icon: 'none' });
if (!form.customerName || !form.wechatId) return wx.showToast({ title: '请填写称呼和联系方式', icon: 'none' });
if (this.data.fulfillment === 'delivery' && !form.deliveryAddress) return wx.showToast({ title: '请填写配送地址', icon: 'none' });
this.setData({ submitting: true });
const send = (token) => wx.request({ url: API + '/customer/bookings', method: 'POST', header: { Authorization: 'Bearer ' + token }, data: { requestType: 'package', customerName: form.customerName, wechatId: form.wechatId, contactPreference: 'wechat', fulfillmentType: this.data.fulfillment, deliveryAddress: form.deliveryAddress, requestedTime: form.requestedTime, note: form.note, items: [{ serviceId: this.data.serviceId, quantity: this.data.quantity }] }, success: (res) => { this.setData({ submitting: false }); if (res.statusCode < 300) { wx.showToast({ title: '预约已提交' }); setTimeout(() => wx.navigateTo({ url: '/pages/bookings/index' }), 500); } else wx.showToast({ title: res.data?.error?.message || '提交失败', icon: 'none' }); }, fail: (error) => { this.setData({ submitting: false }); wx.showToast({ title: error.errMsg || '网络请求失败', icon: 'none' }); } });
const token = wx.getStorageSync('customerToken');
if (token) return send(token);
wx.login({ success: (login) => wx.request({ url: API + '/customer/session/wechat', method: 'POST', data: { code: login.code }, success: (res) => { if (res.statusCode < 300) { wx.setStorageSync('customerToken', res.data.token); send(res.data.token); } else { this.setData({ submitting: false }); wx.showToast({ title: res.data?.error?.message || '微信登录失败', icon: 'none' }); } }, fail: (error) => { this.setData({ submitting: false }); wx.showToast({ title: error.errMsg || '微信登录请求失败', icon: 'none' }); } }), fail: (error) => { this.setData({ submitting: false }); wx.showToast({ title: error.errMsg || '微信登录失败', icon: 'none' }); } });
},
});
+1 -1
View File
@@ -1 +1 @@
<view class="page"><view class="heading">我的订单</view><view wx:if="{{loading}}" class="state">加载中...</view><view wx:elif="{{!bookings.length}}" class="empty">完成预约后,订单会显示在这里</view><view wx:else><view class="status-banner"><text>待确认</text><text>摊主会尽快联系你</text><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>{{item.items[0].quantity}} 份 · {{item.fulfillmentType || '自取'}} · {{item.requestedTime || '待确认时间'}}</text></view></view><view class="card-foot"><text class="price">{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}</text><text class="status">{{item.status}}</text></view><view class="actions"><button size="mini">联系摊主</button><button wx:if="{{item.status === 'received'}}" size="mini" data-id="{{item.id}}" bindtap="cancel">取消预约</button></view></view></view></view>
<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>
+1 -1
View File
@@ -1 +1 @@
.page{min-height:100vh;padding:24rpx 32rpx;background:#FBF7F1;color:#2B2B2B}.heading{font-size:48rpx;font-weight:700;margin:12rpx 0 32rpx}.status-banner{position:relative;margin-bottom:20rpx;padding:32rpx;background:#F4EBD9;border-radius:16rpx}.status-banner text{display:block;font-size:34rpx}.status-banner text+text{margin-top:10rpx;font-size:27rpx}.check{position:absolute;right:40rpx;top:30rpx;color:#B54A2C;font-size:72rpx!important}.card{margin-bottom:18rpx;padding:20rpx;background:#F4EBD9;border-radius:16rpx}.card-visual{display:flex;gap:20rpx;align-items:center}.dish-placeholder{width:180rpx;height:180rpx;flex:none;border-radius:12rpx;background:#c79555}.name{display:block;font-size:34rpx;font-weight:700;margin-bottom:12rpx}.card-main text+text{font-size:28rpx;line-height:1.5}.card-foot{display:flex;justify-content:space-between;align-items:center;margin-top:24rpx}.status{color:#B54A2C}.price{color:#B54A2C;font-size:38rpx}.actions{display:flex;gap:16rpx;margin-top:20rpx}.actions button{flex:1;border-radius:32rpx}.state,.empty{text-align:center;padding:100rpx 20rpx;color:#7A4A2B}
.page{min-height:100vh;padding:24rpx 32rpx 60rpx;background:#FBF7F1;color:#2B2B2B}.heading-row{display:flex;justify-content:space-between;align-items:center;margin:12rpx 0 32rpx}.heading{font-size:48rpx;font-weight:700}.phone{font-size:48rpx;color:#7A4A2B}.status-banner{position:relative;display:flex;justify-content:space-between;align-items:center;margin-bottom:20rpx;padding:34rpx 32rpx;background:#F4EBD9;border-radius:16rpx}.status-title{display:block;font-size:40rpx;font-weight:700}.status-sub{display:block;margin-top:10rpx;font-size:28rpx}.check{color:#B54A2C;font-size:88rpx;line-height:1}.card{margin-bottom:18rpx;padding:22rpx;background:#F4EBD9;border-radius:16rpx}.card-visual{display:flex;gap:20rpx;align-items:center}.dish-placeholder{width:190rpx;height:190rpx;flex:none;border-radius:12rpx;background:#c79555}.name{display:block;font-size:36rpx;font-weight:700;margin-bottom:14rpx}.summary{font-size:28rpx;line-height:1.6}.card-foot{display:flex;justify-content:space-between;align-items:center;margin-top:24rpx;padding:18rpx 4rpx;border-top:1rpx solid #dfcda9}.status{padding:8rpx 20rpx;border:1rpx solid #B54A2C;border-radius:30rpx;color:#B54A2C}.price{color:#B54A2C;font-size:42rpx}.actions{display:flex;gap:16rpx;margin-top:18rpx}.actions button{flex:1;border-radius:12rpx;font-size:29rpx}.contact{background:#2B2B2B;color:#fff}.cancel{background:#B54A2C;color:#fff}.cancel-note{display:block;margin-top:18rpx;text-align:center;font-size:25rpx}.faq{margin-top:24rpx;padding:28rpx 30rpx;background:#fff;border-radius:16rpx}.faq view{padding:20rpx 0;border-bottom:1rpx solid #eee;font-size:29rpx}.faq view:last-child{border-bottom:0}.faq-title{font-size:36rpx!important;font-weight:700}.faq text{float:right;color:#7A4A2B;font-size:40rpx}.state,.empty{text-align:center;padding:100rpx 20rpx;color:#7A4A2B}