From 964ba87e7ea9c6137b1ef12e3819c0446efaf1e3 Mon Sep 17 00:00:00 2001
From: liruiqiang <3151805288@qq.com>
Date: Mon, 25 Aug 2025 14:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=8C=9C=E4=BD=A0=E5=96=9C=E6=AC=A2=E4=B8=8E=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cart/cart2.vue               |  3 ++-
 src/pages/cart/components/CartMain.vue | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/pages/cart/cart2.vue b/src/pages/cart/cart2.vue
index 95fe8b8..532bd5a 100644
--- a/src/pages/cart/cart2.vue
+++ b/src/pages/cart/cart2.vue
@@ -3,7 +3,8 @@ import CartMain from './components/CartMain.vue'
 </script>
 
 <template>
-  <CartMain />
+  <!-- 适配底部安全区 -->
+  <CartMain safe-area-inset-bottom />
 </template>
 
 <style lang="scss">
diff --git a/src/pages/cart/components/CartMain.vue b/src/pages/cart/components/CartMain.vue
index 5e6e019..c84371a 100644
--- a/src/pages/cart/components/CartMain.vue
+++ b/src/pages/cart/components/CartMain.vue
@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-y class="scroll-view">
+  <scroll-view scroll-y class="scroll-view" @scrolltolower="onScrolltolower">
     <!-- 已登录: 显示购物车 -->
     <template v-if="memberStore.profile">
       <!-- 购物车列表 -->
@@ -62,7 +62,10 @@
         </navigator>
       </view>
       <!-- 吸底工具栏 -->
-      <view class="toolbar">
+      <view
+        class="toolbar"
+        :style="{ paddingBottom: safeAreaInsetBottom ? safeAreaInsets?.bottom + 'px' : 0 }"
+      >
         <text @tap="onChangeSelectedAll" class="all" :class="{ checked: isSelectedAll }">全选</text>
         <text class="text">合计:</text>
         <text class="amount">{{ selectedCartListMoney }}</text>
@@ -103,6 +106,7 @@ import { useMemberStore } from '@/stores'
 import type { CartItem } from '@/types/cart'
 import { onShow } from '@dcloudio/uni-app'
 import { computed, ref } from 'vue'
+import { useGuessList } from '@/composables'
 
 // 获取会员Store
 const memberStore = useMemberStore()
@@ -196,6 +200,17 @@ const gotoPayment = () => {
   // 跳转到结算页
   uni.navigateTo({ url: '/pagesOrder/create/create' })
 }
+
+// 猜你喜欢
+const { guessRef, onScrolltolower } = useGuessList()
+
+// 是否适配底部安全区域
+defineProps<{
+  safeAreaInsetBottom?: boolean
+}>()
+
+// 获取屏幕边界到安全区域距离
+const { safeAreaInsets } = uni.getSystemInfoSync()
 </script>
 
 <style lang="scss">