fix: 对齐服务分类和订单视觉结构

This commit is contained in:
que01 committed 2026-09-19 10:46:30 +08:00
1 parent 662649a08f
commit 13ead2d426
5 files changed
+5 -5

No files matched your search

+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 wx:for="{{bookings}}" wx:key="id" class="card"><view class="status">{{item.status}}</view><text class="name">{{item.bookingNo}}</text><text>{{item.customerName}}</text><text class="price">{{item.estimatedAmount ? '¥'+item.estimatedAmount/100 : '人工沟通报价'}}</text><button wx:if="{{item.status === 'received'}}" size="mini" data-id="{{item.id}}" bindtap="cancel">取消预约</button></view></view></view>
<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-main"><text class="name">{{item.service.name || '预约服务'}}</text><text>{{item.items[0].quantity}} 份 · {{item.fulfillmentType || '自取'}} · {{item.requestedTime || '待确认时间'}}</text></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>
+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}.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}
+1 -1
View File
@@ -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})}});
+1 -1
View File
@@ -1 +1 @@
<view class="page"><view class="heading"><text>服务列表</text><text class="sub">今日可订</text></view><view wx:if="{{loading}}" class="state">加载中...</view><view wx:else><view wx:for="{{services}}" wx:key="id" class="card" data-id="{{item.id}}" bindtap="book"><view><text class="name">{{item.name}}</text><text class="desc">{{item.description}}</text><text class="price">{{item.priceText || '面议'}}</text></view><button size="mini">{{item.priceAmount ? '预约' : '咨询'}}</button></view></view></view>
<view class="page"><view class="heading"><text>服务列表</text><text class="sub">今日可订</text></view><view class="categories"><view class="category package {{category === 'package' ? 'selected' : ''}}" data-category="package" bindtap="switchCategory"><text>● 普通套餐</text><text>日常家常饭</text></view><view class="category chef {{category === 'private_chef' ? 'selected' : ''}}" data-category="private_chef" bindtap="switchCategory"><text>● 私厨服务</text><text>聚餐定制</text></view></view><view wx:if="{{loading}}" class="state">加载中...</view><view wx:elif="{{!filtered.length}}" class="state">暂无可订服务</view><view wx:else><view wx:for="{{filtered}}" wx:key="id" class="card" data-id="{{item.id}}" bindtap="book"><view><view class="name">{{item.name}}</view><text class="desc">{{item.description}}</text><text class="price">{{item.priceText || '面议'}}</text></view><button size="mini">{{item.priceAmount ? '预约' : '咨询'}}</button></view></view></view>
+1 -1
View File
@@ -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}