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;