diff --git a/pages/goods/gategory.vue b/pages/goods/gategory.vue index 5b1779a..3192300 100644 --- a/pages/goods/gategory.vue +++ b/pages/goods/gategory.vue @@ -25,7 +25,7 @@ - + 编辑分类 diff --git a/pages/goods/goodsList.vue b/pages/goods/goodsList.vue index 5a6f51f..2e74f54 100644 --- a/pages/goods/goodsList.vue +++ b/pages/goods/goodsList.vue @@ -534,7 +534,7 @@ .uni-searchbar, .uni-searchbar__box { width: 100% !important; - padding: 5px 10px !important + padding: 10rpx 20rpx !important } .up-down { @@ -604,7 +604,7 @@ float: left; position: fixed; top: 29% !important; - padding-top:50px; + padding-top:100rpx; } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 0da2f2d..902374c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -96,7 +96,7 @@ - {{shopData.orderRevenueAndCount.count == undefined ?0:shopData.orderRevenueAndCount.count}} + {{shopData.orderRevenueAndCount == undefined ?0:shopData.orderRevenueAndCount.count}} 今日订单 @@ -104,7 +104,7 @@ - {{shopData.orderRevenueAndCount.amount == undefined ?0:shopData.orderRevenueAndCount.amount}} + {{shopData.orderRevenueAndCount == undefined ?0:shopData.orderRevenueAndCount.amount}} 营业额 diff --git a/pages/shop/addGoods.vue b/pages/shop/addGoods.vue index bb04381..ae56a7f 100644 --- a/pages/shop/addGoods.vue +++ b/pages/shop/addGoods.vue @@ -781,9 +781,9 @@ } .formBox { - padding: 10px 13px; - border-radius: 7px; - box-shadow: 0 1px 10px 2px #e2e2e2; + padding: 20rpx 26rpx; + border-radius: 14rpx; + box-shadow: 0 1px 20rpx 4rpx #e2e2e2; background-color: #fff; overflow: scroll; height: 85%; diff --git a/pages/shop/orderDetail.vue b/pages/shop/orderDetail.vue index 85dcb85..814b681 100644 --- a/pages/shop/orderDetail.vue +++ b/pages/shop/orderDetail.vue @@ -12,57 +12,57 @@ - + {{'#'+data.numberCode}} - 期望送达 + 期望送达 明天 06:30 {{data.status == 0?'待支付':data.status == 2?'待配送员接单':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime == null) || (data.status == 3 && data.deliveryType == 2 && data.userRequireMake == 1)?'待出餐':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime != null)?'待取货':(data.status == 3 && data.deliveryType == 2)?'待消费':data.status == 4?'待送达':data.status == 5?'已完成':data.status == 7?'待同意退款':data.status == 8?'已退款':data.status == 6?'已取消':data.status == 11?'售后中':data.status == 12?'已售后':""}} - - + + {{data.deliveryType == 2?'自取订单':'配送订单'}} - + 配送员:{{data.deliveryInfo.workerName}} - + - + 收货人:{{data.deliveryInfo.receiverName}} - + {{data.deliveryInfo.receiverAddress}} - + - - - 商品 共{{data.goodsNum}}件 + + + 商品 共{{data.goodsNum}}件 - + {{item.productName}} - + {{'x'+ item.quantity}} - + {{'¥'+ item.price}} - + 商品金额 @@ -70,7 +70,7 @@ {{'¥' + data.goodsAmount}} - + 配送费 @@ -78,7 +78,7 @@ {{'¥' + data.deliveryFee}} - + 客户实际支付 @@ -86,7 +86,7 @@ {{'¥'+ data.totalAmount}} - + 平台服务费 @@ -98,24 +98,24 @@ - - + + 订单编号 {{data.id}} - - + + 下单时间 {{data.createTime | formatISOTime}} - - + + 用户账号 @@ -134,7 +134,7 @@ - + 预计收入 @@ -142,7 +142,7 @@ ¥{{(data.yujishouru).toFixed(2)}} - + 打印小票 @@ -347,19 +347,19 @@ bottom: 0; } .btn{ - height: 25px; - width: 65px; - line-height: 25px; + height: 50rpx; + width: 130rpx; + line-height: 50rpx; background: linear-gradient(90deg, #e3ff96, #a6ffea); text-align: center; - border-radius: 7px; + border-radius: 14rpx; font-weight: 700; float: right; - margin-left: 10px; + margin-left: 20rpx; } .group-content{ background: #fff; - width: 300px; + width: 600rpx; height: auto; border-radius: 20rpx; } diff --git a/pages/shop/shopOrderList.vue b/pages/shop/shopOrderList.vue index 6d7d991..6406459 100644 --- a/pages/shop/shopOrderList.vue +++ b/pages/shop/shopOrderList.vue @@ -51,9 +51,9 @@ - + - + 已出餐 @@ -283,13 +283,13 @@ } .btn{ background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); - padding:0 5px; - height: 30px; - border-radius: 7px; - line-height: 30px; + padding:0 10rpx; + height: 60rpx; + border-radius: 14rpx; + line-height: 60rpx; text-align: center; font-weight: 700; - margin-top: 10px; + margin-top: 20rpx; } .title-name { diff --git a/pages/shop/shopSettlementDetail.vue b/pages/shop/shopSettlementDetail.vue index ea5188a..862cabc 100644 --- a/pages/shop/shopSettlementDetail.vue +++ b/pages/shop/shopSettlementDetail.vue @@ -13,7 +13,7 @@ - + 2026-04-09