From 13ead2d426bd99e41fb2de5d7f4e6c6956b59c11 Mon Sep 17 00:00:00 2001 From: que01 Date: Sat, 19 Sep 2026 10:46:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=B9=E9=BD=90=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=92=8C=E8=AE=A2=E5=8D=95=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/miniapp/pages/bookings/index.wxml | 2 +- apps/miniapp/pages/bookings/index.wxss | 2 +- apps/miniapp/pages/services/index.js | 2 +- apps/miniapp/pages/services/index.wxml | 2 +- apps/miniapp/pages/services/index.wxss | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/miniapp/pages/bookings/index.wxml b/apps/miniapp/pages/bookings/index.wxml index acc7604..8d58b6e 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.service.name || '预约服务'}}{{item.items[0].quantity}} 份 · {{item.fulfillmentType || '自取'}} · {{item.requestedTime || '待确认时间'}}{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}{{item.status}} diff --git a/apps/miniapp/pages/bookings/index.wxss b/apps/miniapp/pages/bookings/index.wxss index 856bba7..0866ac6 100644 --- a/apps/miniapp/pages/bookings/index.wxss +++ b/apps/miniapp/pages/bookings/index.wxss @@ -1 +1 @@ -.page{min-height:100vh;padding:24rpx 32rpx;background:#FBF7F1;color:#2B2B2B}.heading{font-size:48rpx;font-weight:700;margin:12rpx 0 32rpx}.card{position:relative;margin-bottom:18rpx;padding:30rpx;background:#F4EBD9;border-radius:32rpx}.name{display:block;font-size:32rpx;font-weight:700;margin-bottom:12rpx}.status{position:absolute;right:28rpx;top:28rpx;color:#B54A2C}.price{display:block;margin-top:18rpx;color:#B54A2C;font-size:34rpx}.state,.empty{text-align:center;padding:100rpx 20rpx;color:#7A4A2B} +.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:30rpx;background:#F4EBD9;border-radius:16rpx}.name{display:block;font-size:34rpx;font-weight:700;margin-bottom:12rpx}.card-main text+text{font-size:28rpx}.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} diff --git a/apps/miniapp/pages/services/index.js b/apps/miniapp/pages/services/index.js index 89a597d..86430bd 100644 --- a/apps/miniapp/pages/services/index.js +++ b/apps/miniapp/pages/services/index.js @@ -1,2 +1,2 @@ const API = 'http://localhost:3001'; -Page({data:{loading:true,services:[]},onLoad(){wx.request({url:API+'/public/services',success:res=>this.setData({services:res.data,loading:false}),fail:()=>this.setData({loading:false})})},book(e){wx.navigateTo({url:'/pages/booking/index?serviceId='+e.currentTarget.dataset.id})}}); +Page({data:{loading:true,services:[],filtered:[],category:'package'},onLoad(){wx.request({url:API+'/public/services',success:res=>this.setData({services:res.data,filtered:res.data.filter(x=>x.priceAmount!==null),loading:false}),fail:()=>this.setData({loading:false})})},switchCategory(e){const category=e.currentTarget.dataset.category;const filtered=category==='package'?this.data.services.filter(x=>x.priceAmount!==null):this.data.services.filter(x=>x.priceAmount===null);this.setData({category,filtered})},book(e){wx.navigateTo({url:'/pages/booking/index?serviceId='+e.currentTarget.dataset.id})}}); diff --git a/apps/miniapp/pages/services/index.wxml b/apps/miniapp/pages/services/index.wxml index e07ba8a..3249522 100644 --- a/apps/miniapp/pages/services/index.wxml +++ b/apps/miniapp/pages/services/index.wxml @@ -1 +1 @@ -服务列表今日可订加载中...{{item.name}}{{item.description}}{{item.priceText || '面议'}} +服务列表今日可订● 普通套餐日常家常饭● 私厨服务聚餐定制加载中...暂无可订服务{{item.name}}{{item.description}}{{item.priceText || '面议'}} diff --git a/apps/miniapp/pages/services/index.wxss b/apps/miniapp/pages/services/index.wxss index dc07f20..1d93eea 100644 --- a/apps/miniapp/pages/services/index.wxss +++ b/apps/miniapp/pages/services/index.wxss @@ -1 +1 @@ -.page{min-height:100vh;padding:24rpx 32rpx;background:#FBF7F1;color:#2B2B2B}.heading{margin:12rpx 0 28rpx}.heading text:first-child{display:block;font-size:48rpx;font-weight:700}.sub{display:block;margin-top:8rpx;font-size:30rpx}.card{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx;padding:30rpx;background:#fff;border-radius:32rpx}.name{display:block;font-size:34rpx;font-weight:700}.desc{display:block;margin:10rpx 0;color:#7A4A2B;font-size:27rpx}.price{display:block;color:#B54A2C;font-size:38rpx}.card button{background:#B54A2C;color:#fff;border-radius:36rpx}.state{text-align:center;padding:80rpx;color:#7A4A2B} +.page{min-height:100vh;padding:24rpx 32rpx;background:#FBF7F1;color:#2B2B2B}.heading{margin:12rpx 0 28rpx}.heading text:first-child{display:block;font-size:48rpx;font-weight:700}.sub{display:block;margin-top:8rpx;font-size:30rpx}.categories{display:flex;gap:16rpx;margin-bottom:28rpx}.category{flex:1;padding:28rpx 22rpx;border-radius:16rpx;font-size:30rpx}.category text{display:block}.category text+text{margin-top:12rpx;font-size:25rpx}.package{background:#B54A2C;color:#fff}.chef{background:#F4EBD9;color:#2B2B2B}.category.selected{box-shadow:0 0 0 4rpx #E8A75F}.card{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx;padding:30rpx;background:#fff;border-radius:16rpx}.name{display:block;font-size:34rpx;font-weight:700}.desc{display:block;margin:10rpx 0;color:#7A4A2B;font-size:27rpx}.price{display:block;color:#B54A2C;font-size:38rpx}.card button{background:#B54A2C;color:#fff;border-radius:36rpx}.state{text-align:center;padding:80rpx;color:#7A4A2B}