From 2beda85a737e3bf8128e94c0472fab96c54439ad Mon Sep 17 00:00:00 2001 From: que01 Date: Sat, 19 Sep 2026 10:41:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=A2=84=E7=BA=A6=E5=92=8C=E8=AE=A2=E5=8D=95=E9=97=AD?= =?UTF-8?q?=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/miniapp/pages/booking/index.js | 2 +- apps/miniapp/pages/booking/index.wxml | 2 +- apps/miniapp/pages/bookings/index.js | 2 +- apps/miniapp/pages/bookings/index.wxml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/miniapp/pages/booking/index.js b/apps/miniapp/pages/booking/index.js index 87952fc..bbef4f4 100644 --- a/apps/miniapp/pages/booking/index.js +++ b/apps/miniapp/pages/booking/index.js @@ -1,2 +1,2 @@ const API='http://localhost:3001'; -Page({data:{service:{},form:{},serviceId:''},onLoad(q){this.setData({serviceId:q.serviceId||''});wx.request({url:API+'/public/services',success:r=>this.setData({service:r.data.find(x=>x.id===q.serviceId)||{}})})},input(e){this.setData({['form.'+e.currentTarget.dataset.key]:e.detail.value})},submit(){wx.showToast({title:'请先完成微信登录',icon:'none'})}}); +Page({data:{service:{},form:{},serviceId:'',submitting:false},onLoad(q){this.setData({serviceId:q.serviceId||''});wx.request({url:API+'/public/services',success:r=>this.setData({service:r.data.find(x=>x.id===q.serviceId)||{}})})},input(e){this.setData({['form.'+e.currentTarget.dataset.key]:e.detail.value})},submit(){const f=this.data.form;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:1}]},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:'提交失败',icon:'none'})},fail:()=>this.setData({submitting:false})});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=>{wx.setStorageSync('customerToken',r.data.token);send(r.data.token)},fail:()=>{this.setData({submitting:false});wx.showToast({title:'登录失败',icon:'none'})}})})}}); diff --git a/apps/miniapp/pages/booking/index.wxml b/apps/miniapp/pages/booking/index.wxml index ed3cf86..9e38c30 100644 --- a/apps/miniapp/pages/booking/index.wxml +++ b/apps/miniapp/pages/booking/index.wxml @@ -1 +1 @@ -{{service.name || '选择预约服务'}}{{service.priceText || '人工沟通报价'}}提交后由摊主人工确认,确认后再安排制作。 +{{service.name || '选择预约服务'}}{{service.priceText || '人工沟通报价'}}提交后由摊主人工确认,确认后再安排制作。 diff --git a/apps/miniapp/pages/bookings/index.js b/apps/miniapp/pages/bookings/index.js index 8faa4cc..1a7f488 100644 --- a/apps/miniapp/pages/bookings/index.js +++ b/apps/miniapp/pages/bookings/index.js @@ -1,2 +1,2 @@ const API='http://localhost:3001'; -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})})}}); +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')},success:()=>this.load()})}})}}); diff --git a/apps/miniapp/pages/bookings/index.wxml b/apps/miniapp/pages/bookings/index.wxml index d1b261d..acc7604 100644 --- a/apps/miniapp/pages/bookings/index.wxml +++ b/apps/miniapp/pages/bookings/index.wxml @@ -1 +1 @@ -我的订单加载中...完成预约后,订单会显示在这里{{item.status}}{{item.bookingNo}}{{item.customerName}}{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}} +我的订单加载中...完成预约后,订单会显示在这里{{item.status}}{{item.bookingNo}}{{item.customerName}}{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}