From 58359af16d3c360e6eee4c863947d64e77e8a3bf Mon Sep 17 00:00:00 2001
From: yindongqi <yin_dongqi@163.com>
Date: Fri, 11 Apr 2025 15:48:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=A0=8F=E4=BD=8D=E7=BD=AE=E5=92=8C=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E8=B4=B9=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复购物车栏的底部位置，将其从100rpx调整为30rpx，以提高用户体验。同时，将配送费的变量名从`delivery_price`改为`deliveryPrice`，以符合项目命名规范。
---
 pages/components/pages/shop/shop.vue | 2 +-
 pages/menu/menu.vue                  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pages/components/pages/shop/shop.vue b/pages/components/pages/shop/shop.vue
index 55779d7..83c9847 100644
--- a/pages/components/pages/shop/shop.vue
+++ b/pages/components/pages/shop/shop.vue
@@ -40,7 +40,7 @@
 					<view class="info-row" v-if="item.distance > 0">
 						<uv-icon name="car" size="14" color="#666"></uv-icon>
 						<text>配送范围 {{item.distance}}km</text>
-						<text class="delivery-price">配送费 ¥{{item.delivery_price}}</text>
+						<text class="delivery-price">配送费 ¥{{item.deliveryPrice}}</text>
 					</view>
 					<view class="info-row no-delivery" v-else>
 						<uv-icon name="info-circle" size="14" color="#ff5722"></uv-icon>
diff --git a/pages/menu/menu.vue b/pages/menu/menu.vue
index ca5fa56..cb46c52 100644
--- a/pages/menu/menu.vue
+++ b/pages/menu/menu.vue
@@ -1194,11 +1194,7 @@
 
 	.cart-bar {
 		position: fixed;
-<<<<<<< HEAD
-		bottom: 100rpx;
-=======
-		bottom: 100rpx;
->>>>>>> bfc7e10860b0d97c3b1ad8f472c19a36411ccd50
+		bottom: 30rpx;
 		left: 0;
 		width: calc(100% - 80rpx);
 		height: 100rpx;