前端各页面对接数据

pages/mall/consumer/orders.uvue

@@ -156,9 +156,11 @@
 <script setup lang="uts">
 import { ref, reactive, onMounted, computed } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
+import { supabaseService } from '@/utils/supabaseService.uts'
 
 // 响应式数据
 const orders = ref<any[]>([])
+const allOrdersList = ref<any[]>([]) // Store all fetched orders for client-side filtering
 const loading = ref<boolean>(false)
 const loadingMore = ref<boolean>(false)
 const hasMore = ref<boolean>(true)
@@ -169,144 +171,16 @@ const searchKeyword = ref<string>('')
 
 // 订单标签页
 const orderTabs = reactive([
-    { id: 'all', name: '全部', count: 12 },
-    { id: 'pending', name: '待付款', count: 2 },
-    { id: 'shipping', name: '待发货', count: 1 },
-    { id: 'delivering', name: '待收货', count: 3 },
-    { id: 'completed', name: '已完成', count: 5 },
-    { id: 'cancelled', name: '已取消', count: 1 }
+    { id: 'all', name: '全部', count: 0 },
+    { id: 'pending', name: '待付款', count: 0 },
+    { id: 'shipping', name: '待发货', count: 0 },
+    { id: 'delivering', name: '待收货', count: 0 },
+    { id: 'completed', name: '已完成', count: 0 },
+    { id: 'cancelled', name: '已取消', count: 0 }
 ])
 
-// Mock 订单数据
-const mockOrders = [
-    {
-        id: '202311230001',
-        order_no: '202311230001',
-        status: 1, // 1:待付款 2:待发货 3:待收货 4:已完成 5:已取消
-        create_time: '2023-11-23 14:30:22',
-        product_amount: 378.00,
-        shipping_fee: 0.00,
-        total_amount: 378.00,
-        products: [
-            {
-                id: '1001',
-                name: '无线蓝牙耳机 降噪版',
-                price: 299.00,
-                image: 'https://picsum.photos/80/80?random=1',
-                spec: '白色',
-                quantity: 1
-            },
-            {
-                id: '1002',
-                name: '耳机保护套',
-                price: 29.00,
-                image: 'https://picsum.photos/80/80?random=2',
-                spec: '黑色',
-                quantity: 1
-            },
-            {
-                id: '1003',
-                name: '数据线',
-                price: 19.00,
-                image: 'https://picsum.photos/80/80?random=3',
-                spec: '1米',
-                quantity: 2
-            }
-        ]
-    },
-    {
-        id: '202311220001',
-        order_no: '202311220001',
-        status: 2,
-        create_time: '2023-11-22 10:15:33',
-        product_amount: 199.00,
-        shipping_fee: 10.00,
-        total_amount: 209.00,
-        products: [
-            {
-                id: '2001',
-                name: '运动T恤 速干面料',
-                price: 79.00,
-                image: 'https://picsum.photos/80/80?random=4',
-                spec: '黑色 L',
-                quantity: 2
-            },
-            {
-                id: '2002',
-                name: '运动短裤',
-                price: 59.00,
-                image: 'https://picsum.photos/80/80?random=5',
-                spec: '黑色 M',
-                quantity: 1
-            }
-        ]
-    },
-    {
-        id: '202311210001',
-        order_no: '202311210001',
-        status: 3,
-        create_time: '2023-11-21 16:45:12',
-        product_amount: 299.00,
-        shipping_fee: 0.00,
-        total_amount: 299.00,
-        products: [
-            {
-                id: '3001',
-                name: '智能手环 心率监测',
-                price: 199.00,
-                image: 'https://picsum.photos/80/80?random=6',
-                spec: '黑色',
-                quantity: 1
-            },
-            {
-                id: '3002',
-                name: '手环腕带',
-                price: 29.00,
-                image: 'https://picsum.photos/80/80?random=7',
-                spec: '蓝色',
-                quantity: 2
-            }
-        ]
-    },
-    {
-        id: '202311200001',
-        order_no: '202311200001',
-        status: 4,
-        create_time: '2023-11-20 09:30:45',
-        product_amount: 99.00,
-        shipping_fee: 0.00,
-        total_amount: 99.00,
-        products: [
-            {
-                id: '4001',
-                name: '保温杯 500ml',
-                price: 49.00,
-                image: 'https://picsum.photos/80/80?random=8',
-                spec: '白色',
-                quantity: 2
-            }
-        ]
-    },
-    {
-        id: '202311190001',
-        order_no: '202311190001',
-        status: 5,
-        create_time: '2023-11-19 14:20:18',
-        product_amount: 599.00,
-        shipping_fee: 0.00,
-        total_amount: 599.00,
-        products: [
-            {
-                id: '5001',
-                name: '蓝牙音箱 便携式',
-                price: 199.00,
-                image: 'https://picsum.photos/80/80?random=9',
-                spec: '黑色',
-                quantity: 3
-            }
-        ]
-    }
-]
+// Removed Mock Data
+
 
 // 计算属性：根据当前标签筛选订单
 const filteredOrders = computed(() => {
@@ -349,90 +223,79 @@ onShow(() => {
 // 加载订单数据
 const loadOrders = async () => {
     loading.value = true
-    const userStore = uni.getStorageSync('userInfo')
-    const userId = userStore?.id
-    
-    if (!userId) {
-        loading.value = false
-        return
-    }
     
     try {
-        // 从本地存储获取订单
-        const ordersStr = uni.getStorageSync('orders')
-        let localOrders: any[] = []
-        if (ordersStr) {
-            localOrders = JSON.parse(ordersStr as string) as any[]
-        }
-
-        // 如果本地存储为空，使用 Mock 数据
-        if (localOrders.length === 0) {
-             localOrders = mockOrders
-             // 可选：将 Mock 数据写入本地存储，以便后续操作生效
-             // uni.setStorageSync('orders', JSON.stringify(mockOrders))
-        }
+        // Fetch all orders from Supabase (status=0)
+        const fetchedOrders = await supabaseService.getOrders(0)
         
-        // 过滤当前用户的订单
-        // const userOrders = localOrders.filter((o: any) => o.user_id === userId)
-        // 暂时显示所有订单用于测试
-        let userOrders = localOrders
-        
-        // 根据标签页过滤
-        let filtered = userOrders
-        const statusMap: Record<string, number> = {
-            'pending': 1,
-            'shipping': 2,
-            'delivering': 3,
-            'completed': 4,
-            'cancelled': 5
-        }
-        
-        if (activeTab.value !== 'all') {
-            const targetStatus = statusMap[activeTab.value]
-            filtered = userOrders.filter((o: any) => o.status === targetStatus)
-        }
-        
-        // 按时间倒序
-        filtered.sort((a: any, b: any) => {
-            const timeA = new Date(a.created_at || a.create_time).getTime()
-            const timeB = new Date(b.created_at || b.create_time).getTime()
-            return timeB - timeA
-        })
-        
-        // 处理数据格式以适配当前页面
-        orders.value = filtered.map((order: any) => ({
+        // Map to View Model
+        const mappedOrders = fetchedOrders.map((order: any) => ({
             id: order.id,
             order_no: order.order_no,
-            status: order.status,
-            create_time: order.created_at || order.create_time,
-            product_amount: order.total_amount,
+            status: order.order_status,
+            create_time: order.created_at,
+            product_amount: order.product_amount || order.actual_amount,
             shipping_fee: order.delivery_fee,
             total_amount: order.actual_amount,
-            products: (order.items || order.products || []).map((item: any) => ({
-                id: item.product_id || item.id,
-                name: item.product_name || item.name,
+            products: (order.ml_order_items || []).map((item: any) => ({
+                id: item.product_id,
+                name: item.product_name,
                 price: item.price,
-                image: item.product_image || item.image || '/static/default-product.png',
-                spec: item.sku_specifications ? formatSpec(item.sku_specifications) : (item.spec || ''),
+                image: item.product_image,
+                spec: item.spec || '',
                 quantity: item.quantity
             }))
         }))
+
+        // Sort by created_at desc
+        mappedOrders.sort((a: any, b: any) => {
+            const timeA = new Date(a.create_time).getTime()
+            const timeB = new Date(b.create_time).getTime()
+            return timeB - timeA
+        })
+
+        allOrdersList.value = mappedOrders
         
-        // 更新统计数据
-        orderTabs[0].count = userOrders.length
-        orderTabs[1].count = userOrders.filter((o: any) => o.status === 1).length
-        orderTabs[2].count = userOrders.filter((o: any) => o.status === 2).length
-        orderTabs[3].count = userOrders.filter((o: any) => o.status === 3).length
-        orderTabs[4].count = userOrders.filter((o: any) => o.status === 4).length
-        orderTabs[5].count = userOrders.filter((o: any) => o.status === 5).length
+        // Update tab counts
+        updateTabsCounts(mappedOrders)
+        
+        // Apply current tab filter
+        filterOrdersByTab()
         
     } catch (err) {
         console.error('加载订单异常:', err)
+        uni.showToast({ title: '加载订单失败', icon: 'none' })
     } finally {
         loading.value = false
     }
 }
 
+const updateTabsCounts = (allOrders: any[]) => {
+    orderTabs[0].count = allOrders.length
+    orderTabs[1].count = allOrders.filter((o: any) => o.status === 1).length
+    orderTabs[2].count = allOrders.filter((o: any) => o.status === 2).length
+    orderTabs[3].count = allOrders.filter((o: any) => o.status === 3).length
+    orderTabs[4].count = allOrders.filter((o: any) => o.status === 4).length
+    orderTabs[5].count = allOrders.filter((o: any) => o.status === 5).length
+}
+
+const filterOrdersByTab = () => {
+    const statusMap: Record<string, number> = {
+        'pending': 1,
+        'shipping': 2,
+        'delivering': 3,
+        'completed': 4,
+        'cancelled': 5
+    }
+    
+    if (activeTab.value === 'all') {
+        orders.value = allOrdersList.value
+    } else {
+        const targetStatus = statusMap[activeTab.value]
+        orders.value = allOrdersList.value.filter((o: any) => o.status === targetStatus)
+    }
+}
+
 const formatDate = (isoString: string): string => {
     if (!isoString) return ''
     const date = new Date(isoString)
@@ -483,9 +346,7 @@ const performSearch = () => {
 }
 
 const getCurrentOrderData = () => {
-    // 这里应该从本地存储或API获取完整订单数据
-    // 暂时返回当前orders.value
-    return orders.value
+    return allOrdersList.value
 }
 
 const formatSpec = (specs: any): string => {
@@ -499,9 +360,7 @@ const formatSpec = (specs: any): string => {
 // 切换标签
 const switchTab = (tabId: string) => {
     activeTab.value = tabId
-    page.value = 1
-    orders.value = []
-    loadOrders()
+    filterOrdersByTab()
 }
 
 // 获取状态文本