consumer模块完成90%，前端完成supabase对接

pages/mall/consumer/category.uvue

@@ -48,7 +48,12 @@
             </scroll-view>
             
             <!-- 右侧商品列表 -->
-            <scroll-view scroll-y class="product-content">
+            <scroll-view 
+                scroll-y 
+                class="product-content"
+                @scrolltolower="loadMore"
+                :lower-threshold="50"
+            >
                 <!-- 分类标题 -->
                 <view class="category-header">
                     <text class="category-title">{{ currentCategoryName }}</text>
@@ -63,30 +68,29 @@
                         class="product-card"
                         @click="navigateToProduct(product)"
                     >
-                        <view class="product-badge" v-if="product.badge">{{ product.badge }}</view>
+                        <view class="product-badge" v-if="product.is_hot">热销</view>
                         <image 
                             class="product-image" 
-                            :src="product.image" 
+                            :src="product.main_image_url" 
                             mode="aspectFill"
                         />
                         <view class="product-info">
                             <text class="product-name">{{ product.name }}</text>
-                            <text class="product-spec">{{ product.specification }}</text>
                             
                             <view class="price-section">
                                 <view class="current-price">
                                     <text class="price-symbol">¥</text>
-                                    <text class="price-value">{{ product.price }}</text>
+                                    <text class="price-value">{{ product.base_price }}</text>
                                 </view>
-                                <text class="original-price" v-if="product.originalPrice > product.price">
-                                    ¥{{ product.originalPrice }}
+                                <text class="original-price" v-if="product.market_price != null && product.market_price! > product.base_price">
+                                    ¥{{ product.market_price }}
                                 </text>
                             </view>
                             
                             <view class="product-meta">
-                                <text class="manufacturer">{{ product.manufacturer }}</text>
+                                <text class="manufacturer">{{ product.brand_name || product.shop_name || '自营' }}</text>
                                 <view class="sales-info">
-                                    <text class="sales-count">已售{{ product.sales }}</text>
+                                    <text class="sales-count">已售{{ product.sale_count }}</text>
                                 </view>
                             </view>
                         </view>
@@ -123,6 +127,8 @@ const activePrimary = ref<string>('')
 const cartCount = ref(3)
 const hasMore = ref(true)
 const hasLoadedFromParams = ref(false) // 标记是否已通过参数加载
+const currentPage = ref(1)
+const loading = ref(false)
 
 // 获取当前分类信息
 const currentCategoryName = ref('')
@@ -166,17 +172,29 @@ const loadCategories = async () => {
 
 // 加载商品数据
 const loadProducts = async () => {
+  if (loading.value) return
+  if (!activePrimary.value) {
+    console.warn('activePrimary为空，无法加载商品')
+    return
+  }
+
+  loading.value = true
   try {
-    if (activePrimary.value) {
-      console.log('开始加载商品，分类ID:', activePrimary.value)
-      const response = await supabaseService.getProductsByCategory(activePrimary.value)
+      console.log('开始加载商品，分类ID:', activePrimary.value, '页码:', currentPage.value)
+      const response = await supabaseService.getProductsByCategory(activePrimary.value, currentPage.value)
       console.log('商品加载结果:', {
         dataCount: response.data.length,
         total: response.total,
-        hasmore: response.hasmore
+        hasmore: response.hasmore,
+        page: currentPage.value
       })
       
-      productList.value = response.data
+      if (currentPage.value === 1) {
+          productList.value = response.data
+      } else {
+          productList.value.push(...response.data)
+      }
+      
       hasMore.value = response.hasmore
       
       // 更新当前分类信息
@@ -184,21 +202,27 @@ const loadProducts = async () => {
       if (category) {
         currentCategoryName.value = category.name
         currentCategoryDesc.value = category.description || ''
-        console.log('当前分类信息:', category.name, '描述:', category.description)
-      } else {
-        console.warn('未找到对应的分类信息，分类ID:', activePrimary.value)
       }
       
-      console.log('商品列表加载完成，数量:', productList.value.length)
-    } else {
-      console.warn('activePrimary为空，无法加载商品')
-    }
+      console.log('商品列表加载完成，当前总数量:', productList.value.length)
   } catch (error) {
     console.error('加载商品数据失败:', error)
-    productList.value = []
+    if (currentPage.value === 1) {
+        productList.value = []
+    }
+  } finally {
+      loading.value = false
   }
 }
 
+// 加载更多
+const loadMore = () => {
+    if (hasMore.value && !loading.value) {
+        currentPage.value++
+        loadProducts()
+    }
+}
+
 // 页面加载时处理参数 - 这是处理分类切换的主要入口
 onLoad((options: any) => {
 	console.log('=== category页面onLoad被调用 ===')
@@ -382,15 +406,15 @@ const selectPrimaryCategory = async (categoryId: string) => {
     
     console.log('准备加载商品数据...')
     
-    // 加载对应商品 - 使用 Supabase 服务
-    const response = await supabaseService.getProductsByCategory(categoryId)
-    productList.value = response.data
-    hasMore.value = response.hasmore
+    // 重置分页并加载
+    currentPage.value = 1
+    hasMore.value = true
+    await loadProducts()
     
     console.log('✅ 加载商品数据成功')
     console.log('分类:', categoryId)
-    console.log('商品数量:', response.data.length)
-    console.log('商品列表:', response.data)
+    console.log('商品数量:', productList.value.length)
+    console.log('商品列表:', productList.value)
     
     // 验证数据是否已正确更新
     console.log('数据更新验证:')
@@ -403,55 +427,42 @@ const selectPrimaryCategory = async (categoryId: string) => {
 }
 
 // 添加到购物车
-const addToCart = (product: any) => {
-    // 获取现有购物车数据
-    const cartData = uni.getStorageSync('cart')
-    let cartItems: any[] = []
-    
-    if (cartData) {
-        try {
-            cartItems = JSON.parse(cartData as string) as any[]
-        } catch (e) {
-            console.error('解析购物车数据失败', e)
+const addToCart = async (product: any) => {
+    uni.showLoading({ title: '添加中...' })
+    try {
+        const success = await supabaseService.addToCart(product.id, 1)
+        if (success) {
+            uni.showToast({
+                title: '已添加到购物车',
+                icon: 'success'
+            })
+            cartCount.value++
+        } else {
+             uni.showToast({
+                title: '添加失败，请先登录',
+                icon: 'none'
+            })
         }
+    } catch (e) {
+        console.error('添加到购物车异常', e)
+        uni.showToast({ title: '操作失败', icon: 'none' })
+    } finally {
+        uni.hideLoading()
     }
-    
-    // 检查商品是否已存在
-    const existingItem = cartItems.find((item: any) => item.id === product.id)
-    
-    if (existingItem) {
-        existingItem.quantity++
-    } else {
-        // 添加新商品
-        cartItems.push({
-            id: product.id,
-            shopId: product.shopId || 'shop_default',
-            shopName: product.shopName || product.manufacturer || '自营店铺',
-            name: product.name,
-            price: product.price,
-            image: product.image,
-            spec: product.specification || '默认规格',
-            quantity: 1,
-            selected: true
-        })
-    }
-    
-    // 保存回存储
-    uni.setStorageSync('cart', JSON.stringify(cartItems))
-    
-    uni.showToast({
-        title: '已添加到购物车',
-        icon: 'success'
-    })
-    cartCount.value++
 }
 
 // 导航函数
 const navigateToSearch = () => uni.navigateTo({ url: '/pages/mall/consumer/search' })
-const navigateToCart = () => uni.navigateTo({ url: '/pages/medicine/cart' })
+const navigateToCart = () => uni.navigateTo({ url: '/pages/mall/consumer/cart' })
 const navigateToProduct = (product: any) => {
+    const id = product.id
+    const price = (product.base_price || 0).toString()
+    const originalPrice = (product.market_price || '').toString()
+    const name = encodeURIComponent(product.name || '')
+    const image = encodeURIComponent(product.main_image_url || '')
+    
     uni.navigateTo({
-        url: `/pages/mall/consumer/product-detail?productId=${product.id}&price=${product.price}&originalPrice=${product.originalPrice || ''}&name=${encodeURIComponent(product.name)}&image=${encodeURIComponent(product.image || '')}`
+        url: `/pages/mall/consumer/product-detail?id=${id}&productId=${id}&price=${price}&originalPrice=${originalPrice}&name=${name}&image=${image}`
     })
 }