diff --git a/components/supadb/aksupa.uts b/components/supadb/aksupa.uts
index c107e8b8..3254a1c1 100644
--- a/components/supadb/aksupa.uts
+++ b/components/supadb/aksupa.uts
@@ -364,12 +364,23 @@ export class AkSupaQueryBuilder {
 					}
 				}
 				if (total == 0) {
-					if (typeof res['count'] == 'number') {
-						total = res['count'] as number ?? 0;
+					// 使用 JSON 序列化访问 res 对象
+					const resStr = JSON.stringify(res)
+					const resParsed = JSON.parse(resStr)
+					if (resParsed != null) {
+						const resObj = resParsed as UTSJSONObject
+						const countVal = resObj.getNumber('count')
+						if (countVal != null) {
+							total = countVal
+						} else if (Array.isArray(resdata)) {
+							total = resdata.length
+						} else {
+							total = 0
+						}
 					} else if (Array.isArray(resdata)) {
-						total = resdata.length;
+						total = resdata.length
 					} else {
-						total = 0;
+						total = 0
 					}
 				}
 				if (!hasmore) hasmore = (page * limit) < total;				// 如果是 head 模式，只返回 count 信息
diff --git a/pages/mall/consumer/chat copy.uvue b/pages/mall/consumer/chat copy.uvue
new file mode 100644
index 00000000..62f43c61
--- /dev/null
+++ b/pages/mall/consumer/chat copy.uvue	
@@ -0,0 +1,783 @@
+<!-- pages/mall/consumer/chat.uvue -->
+<template>
+    <view class="chat-page">
+        <!-- 聊天头部 -->
+        <view class="chat-header" :style="{ paddingTop: navPaddingTop }">
+            <view class="header-back" @click="goBack">
+                <text class="back-icon">‹</text>
+            </view>
+            <view class="header-info">
+                <text class="chat-title">{{ headerTitle }}</text>
+                <text class="chat-status">在线</text>
+            </view>
+            <view class="header-actions">
+                <text class="action-icon" @click="showMoreActions">⋮</text>
+            </view>
+        </view>
+        
+        <!-- 聊天内容 -->
+        <scroll-view 
+            scroll-y="true"
+            class="chat-content"
+            :scroll-into-view="scrollToView"
+            :scroll-with-animation="false"
+            :show-scrollbar="false"
+            upper-threshold="100"
+            @scrolltoupper="onScrollToUpper"
+        >
+            <!-- 聊天消息列表 -->
+            <view class="chat-messages">
+                <!-- 系统消息 -->
+                <view class="message-item system">
+                    <text class="system-text">客服 小美 已接入，请描述您的问题</text>
+                </view>
+                
+                <!-- 时间分割线 -->
+                <view class="time-divider">
+                    <text class="time-text">今天 14:30</text>
+                </view>
+                
+                <!-- 消息项 -->
+                <view 
+                    v-for="message in messages" 
+                    :key="message.id"
+                    :class="['message-item', message.type]"
+                    :id="message.viewId"
+                >
+                    <!-- 对方消息 -->
+                    <view v-if="message.type === 'received'" class="message-wrapper">
+                        <image 
+                            class="avatar" 
+                            :src="merchantAvatar" 
+                            mode="aspectFill"
+                        />
+                        <view class="message-content-wrapper">
+                            <text class="sender-name">{{ headerTitle }}</text>
+                            <view class="message-bubble">
+                                <text class="message-text">{{ message.content }}</text>
+                                <text class="message-time">{{ message.time }}</text>
+                            </view>
+                        </view>
+                    </view>
+                    
+                    <!-- 我的消息 -->
+                    <view v-else class="message-wrapper me">
+                        <view class="message-content-wrapper">
+                            <view class="message-bubble me">
+                                <text class="message-text">{{ message.content }}</text>
+                                <text class="message-time">{{ message.time }}</text>
+                            </view>
+                        </view>
+                        <image 
+                            class="avatar me" 
+                            src="/static/default-avatar.png" 
+                            mode="aspectFill"
+                        />
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+        
+        <!-- 聊天输入区 -->
+        <view class="chat-input">
+            <view class="input-tools">
+                <text class="tool-icon" @click="showEmojiPicker">😊</text>
+                <text class="tool-icon" @click="showImagePicker">📷</text>
+                <text class="tool-icon" @click="showMoreTools">➕</text>
+            </view>
+            
+            <view class="input-wrapper">
+                <input 
+                    class="message-input" 
+                    v-model="inputMessage"
+                    placeholder="请输入消息..."
+                    :focus="inputFocus"
+                    @confirm="sendMessage"
+                    confirm-type="send"
+                />
+                <button 
+                    class="send-button" 
+                    :class="{ active: inputMessage.trim() }" 
+                    @click="sendMessage"
+                >
+                    发送
+                </button>
+            </view>
+        </view>
+        
+        <!-- 表情选择器 -->
+        <scroll-view v-if="showEmoji" class="emoji-picker" direction="vertical">
+            <view class="emoji-category">
+                <text 
+                    v-for="emoji in emojiList" 
+                    :key="emoji"
+                    class="emoji-item"
+                    @click="insertEmoji(emoji)"
+                >
+                    {{ emoji }}
+                </text>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted, onUnmounted, nextTick } from 'vue'
+import { supabaseService, type ChatMessage } from '@/utils/supabaseService.uts'
+import supa from '@/components/supadb/aksupainstance.uts'
+import type { AkSupaRealtimeChannel } from '@/components/supadb/aksupa.uts'
+import { getCurrentUser } from '@/utils/store.uts'
+
+type UiChatMessage = {
+	id: string
+	viewId: string
+	type: string
+	content: string
+	time: string
+}
+
+// 响应式数据
+const messages = ref<UiChatMessage[]>([])
+const inputMessage = ref<string>('')
+const inputFocus = ref<boolean>(false)
+const showEmoji = ref<boolean>(false)
+const scrollToView = ref<string>('')
+const currentUserId = ref<string>('')
+const merchantId = ref<string>('') // 商家ID
+const headerTitle = ref<string>('在线客服')
+const merchantAvatar = ref<string>('/static/default-shop.png') // 商家头像
+const navPaddingTop = ref<string>('30px') // 默认值，包含状态栏高度+原有内边距
+const isInitialLoading = ref<boolean>(true)
+let realtimeChannel: AkSupaRealtimeChannel | null = null
+
+// 模拟表情列表
+const emojiList = ['😊', '😂', '🤣', '😍', '😘', '🥰', '😭', '😡', '👍', '👏', '🙏', '🎉', '❤️', '🔥', '⭐']
+
+function scrollToBottom() : void {
+    if (messages.value.length === 0) return
+
+    // 获取最后一条消息的 ID
+    const lastMsg = messages.value[messages.value.length - 1]
+    const targetId = 'msg-' + lastMsg.id
+
+    // 关键点：在 UVue 安卓端，直接连续赋值可能被合并。
+    // 我们先清除 ID，然后在下一帧赋值，确保 scroll-view 监听到变化。
+    scrollToView.value = ''
+
+    // 增加多次尝试，确保在 DOM 彻底完成渲染（包含由于高度计算引起的多次排版）后定位。
+    setTimeout(() => {
+        scrollToView.value = targetId
+        console.log('[scrollToBottom] 发起第一次滚动定位:', targetId)
+        
+        // 二次校准：针对长消息或图片导致的高度变化
+        setTimeout(() => {
+            scrollToView.value = ''
+            setTimeout(() => {
+                scrollToView.value = targetId
+                console.log('[scrollToBottom] 二次校准完成:', targetId)
+            }, 50)
+        }, 100)
+    }, 300)
+}
+
+function getCurrentTime(): string {
+    const now = new Date()
+    const hours = now.getHours().toString().padStart(2, '0')
+    const minutes = now.getMinutes().toString().padStart(2, '0')
+    return `${hours}:${minutes}`
+}
+
+function setupRealtimeSubscription(): void {
+	console.log('开始建立聊天实时订阅...')
+	console.log('当前用户ID:', currentUserId.value, '商家ID:', merchantId.value)
+	
+	realtimeChannel = supa.channel('chat-messages-' + Date.now().toString())
+		.on('postgres_changes', {
+			event: 'INSERT',
+			schema: 'public',
+			table: 'ml_chat_messages'
+		}, (payload: any) => {
+			console.log('=== 收到实时订阅回调 ===')
+			const payloadObj = (payload instanceof UTSJSONObject) ? (payload as UTSJSONObject) : (JSON.parse(JSON.stringify(payload ?? {})) as UTSJSONObject)
+			const newMsgAny = payloadObj.get('new')
+			if (newMsgAny == null) {
+				console.log('newMsgAny 为空，跳过')
+				return
+			}
+			const newMsg = (newMsgAny instanceof UTSJSONObject) ? (newMsgAny as UTSJSONObject) : (JSON.parse(JSON.stringify(newMsgAny)) as UTSJSONObject)
+			console.log('收到新消息:', newMsg)
+
+			const senderId = newMsg.getString('sender_id') ?? ''
+			const receiverId = newMsg.getString('receiver_id') ?? ''
+			const msgId = newMsg.getString('id') ?? ''
+			const content = newMsg.getString('content') ?? ''
+			
+			console.log('=== 消息详情 ===')
+			console.log('消息ID:', msgId)
+			console.log('发送者ID:', senderId)
+			console.log('接收者ID:', receiverId)
+			console.log('当前用户ID:', currentUserId.value)
+			console.log('商家ID:', merchantId.value)
+			console.log('消息内容:', content)
+
+			// 检查消息是否已经在列表中（避免重复）
+			for (let i = 0; i < messages.value.length; i++) {
+				if (messages.value[i].id == msgId) {
+					console.log('消息已存在，跳过')
+					return
+				}
+			}
+
+			// 判断消息类型
+			const isMyMessage = (senderId == currentUserId.value)
+			const isForMe = (receiverId == currentUserId.value)
+			const isRelatedToCurrentChat = (senderId == merchantId.value || receiverId == merchantId.value)
+			
+			console.log('=== 条件判断 ===')
+			console.log('isMyMessage:', isMyMessage)
+			console.log('isForMe:', isForMe)
+			console.log('isRelatedToCurrentChat:', isRelatedToCurrentChat)
+
+			// 如果消息与当前聊天无关，跳过
+			if (!isRelatedToCurrentChat) {
+				console.log('消息与当前聊天无关，跳过')
+				return
+			}
+
+			// 如果是自己发送的消息，或者是发给自己的消息，都显示
+			if (isMyMessage || isForMe) {
+				const createdAt = newMsg.getString('created_at') ?? new Date().toISOString()
+				const date = new Date(createdAt)
+				const timeStr = `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`
+
+				// 生成安全的 viewId
+				const safeViewId = 'msg_' + msgId.replace(/[^a-zA-Z0-9]/g, '_')
+
+				const incomingMsg: UiChatMessage = {
+					id: msgId,
+					viewId: safeViewId,
+					type: isMyMessage ? 'sent' : 'received',
+					content: content,
+					time: timeStr
+				}
+
+				console.log('=== 添加新消息到列表 ===')
+				console.log('消息类型:', incomingMsg.type)
+				console.log('消息内容:', incomingMsg.content)
+				messages.value.push(incomingMsg)
+				scrollToBottom()
+			} else {
+				console.log('条件不满足，不添加消息')
+			}
+		})
+		.subscribe((status: string, err: any | null) => {
+			console.log('订阅状态:', status)
+			if (err != null) {
+				console.log('订阅错误:', err)
+			}
+		})
+}
+
+async function loadChatHistory(): Promise<void> {
+    let rawMsgs : ChatMessage[] = []
+
+    if (merchantId.value != '') {
+        rawMsgs = await supabaseService.getChatMessages(merchantId.value)
+    } else {
+        console.warn("No merchant ID provided for chat")
+        return
+    }
+
+    // 确保时间顺序是升序（旧的在前，新的在后）
+    // Supabase 返回的消息如果是降序，我们需要 reverse 过来显示
+    const sortedRawMsgs = rawMsgs.sort((a, b) => {
+        const timeA = new Date(a.created_at ?? '').getTime()
+        const timeB = new Date(b.created_at ?? '').getTime()
+        return timeA - timeB
+    })
+
+    const uiMessages : UiChatMessage[] = []
+    for (let i = 0; i < sortedRawMsgs.length; i++) {
+        const m = sortedRawMsgs[i]
+        const date = new Date(m.created_at ?? new Date().toISOString())
+        const timeStr = `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`
+
+        const sender = m.sender_id ?? ''
+        const msgType = (currentUserId.value != '' && sender == currentUserId.value) ? 'sent' : 'received'
+        const rawId = (m.id ?? '').toString()
+        const msgId = rawId != '' ? rawId : Date.now().toString() + i.toString()
+        const safeViewId = 'msg_' + msgId.replace(/[^a-zA-Z0-9]/g, '_')
+        
+        const uiMsg : UiChatMessage = {
+            id: msgId,
+            viewId: safeViewId,
+            type: msgType,
+            content: m.content ?? '',
+            time: timeStr
+        }
+        uiMessages.push(uiMsg)
+    }
+    messages.value = uiMessages
+    
+    if (isInitialLoading.value) {
+        // 增加一点初始化延迟，等待 scroll-view 渲染就绪
+        setTimeout(() => {
+            scrollToBottom()
+            isInitialLoading.value = false
+        }, 500)
+    }
+}
+
+function onScrollToUpper(e: any): void {
+    console.log('[onScrollToUpper] 触发加载历史记录')
+}
+
+async function loadMerchantInfo(): Promise<void> {
+	if (merchantId.value == '') return
+	
+	try {
+		const response = await supa
+			.from('ml_shops')
+			.select('shop_logo, shop_name')
+			.eq('merchant_id', merchantId.value)
+			.limit(1)
+			.execute()
+		
+		if (response.error != null) {
+			console.error('[loadMerchantInfo] 获取商家信息失败:', response.error)
+			return
+		}
+		
+		const rawData = response.data
+		if (rawData == null) return
+		
+		const rawList = rawData as any[]
+		if (rawList.length == 0) return
+		
+		const shopData = rawList[0]
+		const shopObj = JSON.parse(JSON.stringify(shopData)) as UTSJSONObject
+		
+		const logo = shopObj.getString('shop_logo')
+		if (logo != null && logo != '') {
+			merchantAvatar.value = logo
+		}
+		
+		const name = shopObj.getString('shop_name')
+		if (name != null && name != '' && headerTitle.value == '在线客服') {
+			headerTitle.value = name
+		}
+	} catch (e) {
+		console.error('[loadMerchantInfo] 获取商家信息异常:', e)
+	}
+}
+
+// 生命周期
+onLoad((options: any) => {
+    // 动态获取状态栏高度
+    const sysInfo = uni.getSystemInfoSync()
+    const statusBarH = sysInfo.statusBarHeight
+    // 状态栏高度 + 10px 原有顶部内边距
+    navPaddingTop.value = (statusBarH + 10) + 'px'
+
+	const optObj = (options instanceof UTSJSONObject) ? (options as UTSJSONObject) : (JSON.parse(JSON.stringify(options ?? {})) as UTSJSONObject)
+	const mid = optObj.getString('merchantId') ?? ''
+	if (mid !== '') {
+		merchantId.value = mid
+	}
+	const mname = optObj.getString('merchantName') ?? ''
+	if (mname !== '') {
+		headerTitle.value = mname
+	}
+})
+
+onMounted(() => {
+	supabaseService.ensureSession().then((uid) => {
+		if (uid != null) {
+			currentUserId.value = uid
+		} else {
+			getCurrentUser().then((user) => {
+				if (user != null) {
+					currentUserId.value = user.id ?? ''
+				}
+			})
+		}
+
+		loadMerchantInfo()
+		loadChatHistory()
+		setupRealtimeSubscription()
+	})
+})
+
+onUnmounted(() => {
+    if (realtimeChannel != null) {
+        supa.removeChannel(realtimeChannel!!)
+    }
+})
+
+const sendMessage = async () => {
+    const content = inputMessage.value.trim()
+    if (content == '') return
+    
+    // 清空输入框
+    inputMessage.value = ''
+    
+    // 发送到 Supabase
+    if (merchantId.value != '') {
+        console.log('[sendMessage] 开始发送消息到:', merchantId.value)
+        const success = await supabaseService.sendMessage(merchantId.value, content)
+        console.log('[sendMessage] 发送结果:', success)
+        if (!success) {
+            uni.showToast({
+                title: '发送失败',
+                icon: 'none'
+            })
+        }
+        // 不需要手动添加消息，等待实时订阅推送
+    }
+}
+
+// 模拟客服回复 (已禁用，改用 Realtime)
+/*
+const simulateCustomerReply = async () => {
+    // ...
+}
+*/
+
+/* 移除不再使用的 simulateCustomerReply 和 addReceivedMessage */
+
+// 插入表情
+function insertEmoji(emoji: string): void {
+    inputMessage.value += emoji
+    inputFocus.value = true
+}
+
+// 显示表情选择器
+function showEmojiPicker(): void {
+    showEmoji.value = !showEmoji.value
+}
+
+// 显示图片选择器
+function showImagePicker(): void {
+    uni.chooseImage({
+        count: 1,
+        success: (res) => {
+            console.log('选择图片:', res.tempFilePaths)
+            // 这里可以处理图片上传
+        }
+    })
+}
+
+// 显示更多工具
+function showMoreTools(): void {
+    uni.showActionSheet({
+        itemList: ['发送位置', '发送文件', '发送语音'],
+        success: (res) => {
+            console.log('选择工具:', res.tapIndex)
+        }
+    })
+}
+
+// 显示更多操作
+function showMoreActions(): void {
+    uni.showActionSheet({
+        itemList: ['投诉客服', '结束对话', '清除记录'],
+        success: (res) => {
+            switch (res.tapIndex) {
+                case 0:
+                    uni.navigateTo({ url: '/pages/mall/consumer/complaint' })
+                    break
+                case 1:
+                    uni.showModal({
+                        title: '确认结束',
+                        content: '确定要结束本次对话吗？',
+                        success: (res) => {
+                            if (res.confirm) {
+                                uni.navigateBack()
+                            }
+                        }
+                    })
+                    break
+                case 2:
+                    uni.showModal({
+                        title: '确认清除',
+                        content: '确定要清除聊天记录吗？',
+                        success: (res) => {
+                            if (res.confirm) {
+                                messages.value = []
+                            }
+                        }
+                    })
+                    break
+            }
+        }
+    })
+}
+
+// 返回
+const goBack = () => {
+    uni.navigateBack()
+}
+</script>
+
+<style>
+.chat-page {
+    width: 100%;
+    height: 100vh;
+    background-color: #f5f5f5;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
+
+/* 聊天头部 */
+.chat-header {
+    background-color: white;
+    padding: 10px 15px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+    flex-shrink: 0;
+}
+
+.header-back {
+    width: 40px;
+}
+
+.back-icon {
+    font-size: 24px;
+    color: #333;
+}
+
+.header-info {
+    flex: 1;
+    text-align: center;
+}
+
+.chat-title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 2px;
+}
+
+.chat-status {
+    font-size: 12px;
+    color: #34c759;
+}
+
+.header-actions .action-icon {
+    font-size: 20px;
+    color: #333;
+    width: 40px;
+    text-align: right;
+}
+
+/* 聊天内容区 */
+.chat-content {
+    flex: 1;
+    height: 0;
+    padding: 10px;
+    padding-bottom: 20px;
+    box-sizing: border-box;
+}
+
+.chat-messages {
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 80px;
+}
+
+/* 系统消息 */
+.message-item.system {
+    text-align: center;
+    margin-bottom: 20px;
+}
+
+.system-text {
+    font-size: 12px;
+    color: #999;
+    background-color: #f0f0f0;
+    padding: 5px 15px;
+    border-radius: 15px;
+
+}
+
+/* 时间分割线 */
+.time-divider {
+    text-align: center;
+    margin: 20px 0;
+}
+
+.time-text {
+    font-size: 12px;
+    color: #999;
+    background-color: #f0f0f0;
+    padding: 3px 10px;
+    border-radius: 10px;
+}
+
+/* 消息项 */
+.message-wrapper {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 15px;
+}
+
+.message-wrapper.me {
+    justify-content: flex-end;
+}
+
+.avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 20px;
+    margin-right: 10px;
+    flex-shrink: 0;
+}
+
+.avatar.me {
+    margin-right: 0;
+    margin-left: 10px;
+    /* order: 2; removed for uni-app-x */
+}
+
+.message-content-wrapper {
+    max-width: 70%;
+    display: flex;
+    flex-direction: column;
+}
+
+.message-bubble {
+    background-color: white;
+    padding: 10px 15px;
+    border-radius: 12px;
+    position: relative;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    align-self: flex-start; /* 关键：根据内容宽度自适应，不撑满 */
+    word-wrap: break-word;
+    word-break: break-all;
+}
+
+.message-bubble.me {
+    background-color: #95ec69;
+    align-self: flex-end; /* 关键：靠右对齐且宽度自适应 */
+    border-top-right-radius: 2px;
+}
+
+.message-bubble:not(.me) {
+    border-top-left-radius: 2px;
+}
+
+.sender-name {
+    font-size: 11px;
+    color: #999;
+    margin-bottom: 2px;
+    align-self: flex-start;
+}
+
+.message-text {
+    font-size: 15px;
+    color: #333;
+    line-height: 1.4;
+    margin-bottom: 5px;
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: pre-wrap;
+}
+
+.message-time {
+    font-size: 11px;
+    color: #999;
+    text-align: right;
+}
+
+/* 聊天输入区 */
+.chat-input {
+    background-color: white;
+    border-top: 1px solid #eee;
+    padding: 10px 15px;
+    padding-bottom: 20px;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    flex-shrink: 0;
+}
+
+.input-tools {
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 10px;
+}
+
+.tool-icon {
+    font-size: 20px;
+    margin-right: 15px;
+    color: #666;
+}
+
+.input-wrapper {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.message-input {
+    flex: 1;
+    background-color: #f5f5f5;
+    border-radius: 20px;
+    padding: 10px 15px;
+    font-size: 15px;
+    margin-right: 10px;
+    min-height: 40px;
+    max-height: 100px;
+}
+
+.send-button {
+    background-color: #ccc;
+    color: white;
+    border: none;
+    border-radius: 20px;
+    padding: 8px 20px;
+    font-size: 14px;
+    min-width: 60px;
+    transition: all 0.3s ease;
+}
+
+.send-button.active {
+    background-color: #ff5000;
+}
+
+/* 表情选择器 */
+.emoji-picker {
+    background-color: white;
+    border-top: 1px solid #eee;
+    padding: 10px;
+    height: 200px;
+    position: fixed;
+    bottom: 80px;
+    left: 0;
+    right: 0;
+    z-index: 99;
+}
+
+.emoji-category {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+.emoji-item {
+    font-size: 24px;
+    padding: 8px;
+    width: 45px;
+    height: 45px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* 响应式适配 removed for strict uv-app-x compliance */
+</style>
diff --git a/pages/mall/consumer/chat.uvue b/pages/mall/consumer/chat.uvue
index 6b551cc5..62f43c61 100644
--- a/pages/mall/consumer/chat.uvue
+++ b/pages/mall/consumer/chat.uvue
@@ -17,10 +17,13 @@
         
         <!-- 聊天内容 -->
         <scroll-view 
-            scroll-y 
+            scroll-y="true"
             class="chat-content"
             :scroll-into-view="scrollToView"
-            scroll-with-animation
+            :scroll-with-animation="false"
+            :show-scrollbar="false"
+            upper-threshold="100"
+            @scrolltoupper="onScrollToUpper"
         >
             <!-- 聊天消息列表 -->
             <view class="chat-messages">
@@ -39,13 +42,13 @@
                     v-for="message in messages" 
                     :key="message.id"
                     :class="['message-item', message.type]"
-                    :id="'msg-' + message.id"
+                    :id="message.viewId"
                 >
                     <!-- 对方消息 -->
                     <view v-if="message.type === 'received'" class="message-wrapper">
                         <image 
                             class="avatar" 
-                            src="/static/icons/shop-default.png" 
+                            :src="merchantAvatar" 
                             mode="aspectFill"
                         />
                         <view class="message-content-wrapper">
@@ -67,7 +70,7 @@
                         </view>
                         <image 
                             class="avatar me" 
-                            src="/static/avatar-default.png" 
+                            src="/static/default-avatar.png" 
                             mode="aspectFill"
                         />
                     </view>
@@ -127,6 +130,7 @@ import { getCurrentUser } from '@/utils/store.uts'
 
 type UiChatMessage = {
 	id: string
+	viewId: string
 	type: string
 	content: string
 	time: string
@@ -141,19 +145,39 @@ const scrollToView = ref<string>('')
 const currentUserId = ref<string>('')
 const merchantId = ref<string>('') // 商家ID
 const headerTitle = ref<string>('在线客服')
+const merchantAvatar = ref<string>('/static/default-shop.png') // 商家头像
 const navPaddingTop = ref<string>('30px') // 默认值，包含状态栏高度+原有内边距
+const isInitialLoading = ref<boolean>(true)
 let realtimeChannel: AkSupaRealtimeChannel | null = null
 
 // 模拟表情列表
 const emojiList = ['😊', '😂', '🤣', '😍', '😘', '🥰', '😭', '😡', '👍', '👏', '🙏', '🎉', '❤️', '🔥', '⭐']
 
-function scrollToBottom(): void {
-    nextTick(() => {
-        if (messages.value.length > 0) {
-            const lastMsgId = messages.value[messages.value.length - 1].id
-            scrollToView.value = 'msg-' + lastMsgId
-        }
-    })
+function scrollToBottom() : void {
+    if (messages.value.length === 0) return
+
+    // 获取最后一条消息的 ID
+    const lastMsg = messages.value[messages.value.length - 1]
+    const targetId = 'msg-' + lastMsg.id
+
+    // 关键点：在 UVue 安卓端，直接连续赋值可能被合并。
+    // 我们先清除 ID，然后在下一帧赋值，确保 scroll-view 监听到变化。
+    scrollToView.value = ''
+
+    // 增加多次尝试，确保在 DOM 彻底完成渲染（包含由于高度计算引起的多次排版）后定位。
+    setTimeout(() => {
+        scrollToView.value = targetId
+        console.log('[scrollToBottom] 发起第一次滚动定位:', targetId)
+        
+        // 二次校准：针对长消息或图片导致的高度变化
+        setTimeout(() => {
+            scrollToView.value = ''
+            setTimeout(() => {
+                scrollToView.value = targetId
+                console.log('[scrollToBottom] 二次校准完成:', targetId)
+            }, 50)
+        }, 100)
+    }, 300)
 }
 
 function getCurrentTime(): string {
@@ -167,14 +191,12 @@ function setupRealtimeSubscription(): void {
 	console.log('开始建立聊天实时订阅...')
 	console.log('当前用户ID:', currentUserId.value, '商家ID:', merchantId.value)
 	
-	const filter = ({
-		event: 'INSERT',
-		schema: 'public',
-		table: 'ml_chat_messages'
-	} as UTSJSONObject)
-
-	realtimeChannel = supa.channel('public:ml_chat_messages')
-		.on('postgres_changes', filter, (payload: any) => {
+	realtimeChannel = supa.channel('chat-messages-' + Date.now().toString())
+		.on('postgres_changes', {
+			event: 'INSERT',
+			schema: 'public',
+			table: 'ml_chat_messages'
+		}, (payload: any) => {
 			console.log('=== 收到实时订阅回调 ===')
 			const payloadObj = (payload instanceof UTSJSONObject) ? (payload as UTSJSONObject) : (JSON.parse(JSON.stringify(payload ?? {})) as UTSJSONObject)
 			const newMsgAny = payloadObj.get('new')
@@ -228,8 +250,12 @@ function setupRealtimeSubscription(): void {
 				const date = new Date(createdAt)
 				const timeStr = `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`
 
+				// 生成安全的 viewId
+				const safeViewId = 'msg_' + msgId.replace(/[^a-zA-Z0-9]/g, '_')
+
 				const incomingMsg: UiChatMessage = {
 					id: msgId,
+					viewId: safeViewId,
 					type: isMyMessage ? 'sent' : 'received',
 					content: content,
 					time: timeStr
@@ -253,40 +279,96 @@ function setupRealtimeSubscription(): void {
 }
 
 async function loadChatHistory(): Promise<void> {
-	let rawMsgs: ChatMessage[] = []
+    let rawMsgs : ChatMessage[] = []
 
-	if (merchantId.value != '') {
-		rawMsgs = await supabaseService.getChatMessages(merchantId.value)
-	} else {
-		console.warn("No merchant ID provided for chat")
-		return
-	}
+    if (merchantId.value != '') {
+        rawMsgs = await supabaseService.getChatMessages(merchantId.value)
+    } else {
+        console.warn("No merchant ID provided for chat")
+        return
+    }
 
-	// 使用 for 循环替代 map
-	const uiMessages: UiChatMessage[] = []
-	for (let i = rawMsgs.length - 1; i >= 0; i--) {
-		const m = rawMsgs[i]
-		const date = new Date(m.created_at ?? new Date().toISOString())
-		const timeStr = `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`
+    // 确保时间顺序是升序（旧的在前，新的在后）
+    // Supabase 返回的消息如果是降序，我们需要 reverse 过来显示
+    const sortedRawMsgs = rawMsgs.sort((a, b) => {
+        const timeA = new Date(a.created_at ?? '').getTime()
+        const timeB = new Date(b.created_at ?? '').getTime()
+        return timeA - timeB
+    })
 
-		const sender = m.sender_id ?? ''
-		const msgType = (currentUserId.value != '' && sender == currentUserId.value) ? 'sent' : 'received'
-		const rawId = (m.id ?? '').toString()
-		const msgId = rawId != '' ? rawId : Date.now().toString() + i.toString()
+    const uiMessages : UiChatMessage[] = []
+    for (let i = 0; i < sortedRawMsgs.length; i++) {
+        const m = sortedRawMsgs[i]
+        const date = new Date(m.created_at ?? new Date().toISOString())
+        const timeStr = `${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`
+
+        const sender = m.sender_id ?? ''
+        const msgType = (currentUserId.value != '' && sender == currentUserId.value) ? 'sent' : 'received'
+        const rawId = (m.id ?? '').toString()
+        const msgId = rawId != '' ? rawId : Date.now().toString() + i.toString()
+        const safeViewId = 'msg_' + msgId.replace(/[^a-zA-Z0-9]/g, '_')
+        
+        const uiMsg : UiChatMessage = {
+            id: msgId,
+            viewId: safeViewId,
+            type: msgType,
+            content: m.content ?? '',
+            time: timeStr
+        }
+        uiMessages.push(uiMsg)
+    }
+    messages.value = uiMessages
+    
+    if (isInitialLoading.value) {
+        // 增加一点初始化延迟，等待 scroll-view 渲染就绪
+        setTimeout(() => {
+            scrollToBottom()
+            isInitialLoading.value = false
+        }, 500)
+    }
+}
+
+function onScrollToUpper(e: any): void {
+    console.log('[onScrollToUpper] 触发加载历史记录')
+}
+
+async function loadMerchantInfo(): Promise<void> {
+	if (merchantId.value == '') return
+	
+	try {
+		const response = await supa
+			.from('ml_shops')
+			.select('shop_logo, shop_name')
+			.eq('merchant_id', merchantId.value)
+			.limit(1)
+			.execute()
 		
-		const uiMsg: UiChatMessage = {
-			id: msgId,
-			type: msgType,
-			content: m.content ?? '',
-			time: timeStr
+		if (response.error != null) {
+			console.error('[loadMerchantInfo] 获取商家信息失败:', response.error)
+			return
 		}
-		uiMessages.push(uiMsg)
+		
+		const rawData = response.data
+		if (rawData == null) return
+		
+		const rawList = rawData as any[]
+		if (rawList.length == 0) return
+		
+		const shopData = rawList[0]
+		const shopObj = JSON.parse(JSON.stringify(shopData)) as UTSJSONObject
+		
+		const logo = shopObj.getString('shop_logo')
+		if (logo != null && logo != '') {
+			merchantAvatar.value = logo
+		}
+		
+		const name = shopObj.getString('shop_name')
+		if (name != null && name != '' && headerTitle.value == '在线客服') {
+			headerTitle.value = name
+		}
+	} catch (e) {
+		console.error('[loadMerchantInfo] 获取商家信息异常:', e)
 	}
-	messages.value = uiMessages
-
-	setTimeout(() => {
-		scrollToBottom()
-	}, 100)
 }
 
 // 生命周期
@@ -320,6 +402,7 @@ onMounted(() => {
 			})
 		}
 
+		loadMerchantInfo()
 		loadChatHistory()
 		setupRealtimeSubscription()
 	})
@@ -340,15 +423,16 @@ const sendMessage = async () => {
     
     // 发送到 Supabase
     if (merchantId.value != '') {
-        // 不使用乐观更新，等待实时订阅推送
-        // 这样可以确保多端同步
+        console.log('[sendMessage] 开始发送消息到:', merchantId.value)
         const success = await supabaseService.sendMessage(merchantId.value, content)
+        console.log('[sendMessage] 发送结果:', success)
         if (!success) {
             uni.showToast({
                 title: '发送失败',
                 icon: 'none'
             })
         }
+        // 不需要手动添加消息，等待实时订阅推送
     }
 }
 
@@ -438,22 +522,23 @@ const goBack = () => {
 <style>
 .chat-page {
     width: 100%;
-    flex: 1;
+    height: 100vh;
     background-color: #f5f5f5;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
 }
 
 /* 聊天头部 */
 .chat-header {
     background-color: white;
     padding: 10px 15px;
-    /* padding-top 由内联样式控制 */
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
     border-bottom: 1px solid #eee;
+    flex-shrink: 0;
 }
 
 .header-back {
@@ -492,8 +577,16 @@ const goBack = () => {
 /* 聊天内容区 */
 .chat-content {
     flex: 1;
-    padding: 15px;
-    padding-bottom: 70px; /* 为输入区留出空间 */
+    height: 0;
+    padding: 10px;
+    padding-bottom: 20px;
+    box-sizing: border-box;
+}
+
+.chat-messages {
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 80px;
 }
 
 /* 系统消息 */
@@ -551,31 +644,37 @@ const goBack = () => {
 }
 
 .message-content-wrapper {
-    /* max-width removed */
-}
-
-.sender-name {
-    font-size: 12px;
-    color: #999;
-    margin-bottom: 5px;
+    max-width: 70%;
+    display: flex;
+    flex-direction: column;
 }
 
 .message-bubble {
     background-color: white;
     padding: 10px 15px;
-    border-radius: 18px;
+    border-radius: 12px;
     position: relative;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-    /* max-width wrap removed */
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    align-self: flex-start; /* 关键：根据内容宽度自适应，不撑满 */
+    word-wrap: break-word;
+    word-break: break-all;
 }
 
 .message-bubble.me {
     background-color: #95ec69;
-    border-bottom-right-radius: 4px;
+    align-self: flex-end; /* 关键：靠右对齐且宽度自适应 */
+    border-top-right-radius: 2px;
 }
 
-.message-bubble-not-me .message-content {
-    border-bottom-left-radius: 4px;
+.message-bubble:not(.me) {
+    border-top-left-radius: 2px;
+}
+
+.sender-name {
+    font-size: 11px;
+    color: #999;
+    margin-bottom: 2px;
+    align-self: flex-start;
 }
 
 .message-text {
@@ -583,6 +682,9 @@ const goBack = () => {
     color: #333;
     line-height: 1.4;
     margin-bottom: 5px;
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: pre-wrap;
 }
 
 .message-time {
@@ -596,11 +698,12 @@ const goBack = () => {
     background-color: white;
     border-top: 1px solid #eee;
     padding: 10px 15px;
+    padding-bottom: 20px;
     position: fixed;
     bottom: 0;
     left: 0;
     right: 0;
-    z-index: 100;
+    flex-shrink: 0;
 }
 
 .input-tools {
@@ -653,9 +756,8 @@ const goBack = () => {
     border-top: 1px solid #eee;
     padding: 10px;
     height: 200px;
-    /* overflow-y removed */
     position: fixed;
-    bottom: 60px;
+    bottom: 80px;
     left: 0;
     right: 0;
     z-index: 99;
diff --git a/pages/mall/consumer/doc/UTS_ANDROID_GUIDE.md b/pages/mall/consumer/doc/UTS_ANDROID_GUIDE.md
index 00feca29..c23957bc 100644
--- a/pages/mall/consumer/doc/UTS_ANDROID_GUIDE.md
+++ b/pages/mall/consumer/doc/UTS_ANDROID_GUIDE.md
@@ -179,7 +179,7 @@
 9. "参数类型不匹配" - 参数类型错误，需要显式类型转换
 
 ================================================================================
-十一、简明速记（100条）
+十一、简明速记（100+条）
 ================================================================================
 
 1.  表单优先用 form 组件
@@ -282,6 +282,11 @@
 98. CSS 伪类选择器 :last-child、:first-child、:nth-child() 不支持，需要移除
 99. Supabase 批量 insert 数组参数类型不匹配，需要改为循环逐条 insert
 100. CSS 中独立的属性（没有选择器）会导致编译错误：Return type mismatch: expected 'Map<String, Map<String, Map<String, Any>>>'
+101. Supabase 查询整数字段用字符串形式：.eq('status', '1') 而非 .eq('status', 1)
+102. Supabase insert 整数字段也用字符串：target_type: '1' 而非 target_type: 1
+103. 数据库返回的字段类型可能不符，需要用 typeof 检查后安全转换
+104. UUID 字段可能返回 Integer，需要安全转换：typeof val === 'number' ? val.toString() : val
+105. 使用辅助函数 safeGetString、safeGetNumber 处理数据库字段
 
 ================================================================================
 十二、构造函数限制
@@ -3355,10 +3360,1176 @@
    - 使用 `Record<string, any>` 或 `any` 保留完整数据结构
    - 在访问嵌套数据时进行类型转换
 
+================================================================================
+一百、Supabase 查询中整数字段处理（重要）
+================================================================================
+
+1. 问题：Supabase 查询时整数字段导致类型转换异常
+   - 错误信息：`java.lang.Integer cannot be cast to java.lang.String`
+   - 原因：UTS Android 中 Supabase 查询的 `.eq()`、`.in()` 等方法对整数字段需要使用字符串形式
+
+2. 解决方案：整数字段使用字符串形式
+   ```typescript
+   // 错误：直接使用数字
+   .eq('target_type', 1)
+   .eq('status', 1)
+   .in('category_id', [1, 2, 3])
+
+   // 正确：使用字符串形式
+   .eq('target_type', '1')
+   .eq('status', '1')
+   .in('category_id', ['1', '2', '3'])
+   ```
+
+3. insert 语句中同样需要使用字符串
+   ```typescript
+   // 错误：直接使用数字
+   .insert({
+       target_type: 1,
+       status: 1
+   })
+
+   // 正确：使用字符串形式
+   .insert({
+       target_type: '1',
+       status: '1'
+   })
+   ```
+
+4. 常见需要处理的整数字段
+   - `target_type` - 收藏类型（1:商品, 2:店铺）
+   - `status` - 各种状态字段
+   - `order_status` - 订单状态
+   - `payment_status` - 支付状态
+   - `shipping_status` - 发货状态
+
+5. 最佳实践
+   - 所有 Supabase 查询中的整数值都使用字符串形式
+   - 使用 UTSJSONObject.set() 设置整数字段时也使用字符串
+   - 从数据库读取的整数值需要安全转换后再使用
+
+================================================================================
+一百零一、数据库字段类型安全转换（重要）
+================================================================================
+
+1. 问题：数据库返回的字段类型可能与预期不符
+   - 错误信息：`java.lang.Integer cannot be cast to java.lang.String`
+   - 原因：UUID 字段可能返回为 Integer，需要安全转换
+
+2. 解决方案：使用类型检查后转换
+   ```typescript
+   // 安全获取字符串类型的 ID
+   const targetIdRaw = itemObj.get('target_id')
+   let targetId = ''
+   if (targetIdRaw != null) {
+       if (typeof targetIdRaw === 'string') {
+           targetId = targetIdRaw as string
+       } else if (typeof targetIdRaw === 'number') {
+           targetId = (targetIdRaw as number).toString()
+       }
+   }
+   ```
+
+3. 通用辅助函数
+   ```typescript
+   // 安全获取字符串值
+   function safeGetString(obj: UTSJSONObject, key: string): string {
+       const val = obj.get(key)
+       if (val == null) return ''
+       if (typeof val === 'string') return val as string
+       if (typeof val === 'number') return (val as number).toString()
+       return ''
+   }
+
+   // 安全获取数值
+   function safeGetNumber(obj: UTSJSONObject, key: string): number {
+       const val = obj.get(key)
+       if (val == null) return 0
+       if (typeof val === 'number') return val as number
+       if (typeof val === 'string') return parseFloat(val as string) ?? 0
+       return 0
+   }
+   ```
+
+4. 最佳实践
+   - 所有从数据库获取的字段都进行类型检查
+   - 不要假设字段类型，使用 typeof 检查
+   - 提供默认值防止空指针异常
+
+================================================================================
+一百零二、JSON.parse() 返回值处理（重要）
+================================================================================
+
+1. 问题：JSON.parse() 返回 Any? 类型
+   - 错误信息：`参数类型不匹配：实际类型为 'Any?'，预期类型为 'Any'`
+   - 原因：JSON.parse() 返回的是可空类型，不能直接传给需要 Any 类型的函数
+
+2. 解决方案：检查 null 后再使用
+   ```typescript
+   // 错误：直接传递 JSON.parse() 结果
+   const parsed = JSON.parse(specs)
+   return formatSpecs(parsed)  // 错误！parsed 是 Any? 类型
+
+   // 正确：先检查 null
+   const parsed = JSON.parse(specs)
+   if (parsed != null) {
+       return formatSpecs(parsed)
+   }
+   return ''
+   ```
+
+3. 完整示例
+   ```typescript
+   const getSpecText = (specs: any): string => {
+       if (specs == null) return ''
+       if (typeof specs === 'string') {
+           if (specs == '') return ''
+           try {
+               const parsed = JSON.parse(specs)
+               if (parsed != null) {
+                   return formatSpecs(parsed)
+               }
+               return specs
+           } catch (e) {
+               return specs
+           }
+       }
+       return formatSpecs(specs)
+   }
+   ```
+
+4. 最佳实践
+   - JSON.parse() 返回值必须检查 null
+   - 使用 try-catch 包裹 JSON.parse() 防止解析异常
+   - 提供默认值或后备方案
+
+================================================================================
+一百零三、响应式对象不能直接转换为 Map/Record（重要）
+================================================================================
+
+1. 问题：ref 对象的值不能直接转换为 Record<string, any>
+   - 错误信息：`AddressTypeReactiveObject cannot be cast to Map`
+   - 原因：Vue 的响应式对象在 UTS Android 中是特殊的代理类型，不能直接转换
+
+2. 错误示例
+   ```typescript
+   const deliveryAddress = ref<AddressType | null>(null)
+   
+   const getFullAddress = (addr: any): string => {
+       if (addr == null) return ''
+       if (typeof addr === 'string') return addr
+       
+       // 错误：响应式对象不能直接转换为 Record
+       const addrObj = addr as Record<string, any>
+       return addrObj['province'] as string  // 运行时错误
+   }
+   
+   // 模板中调用
+   {{ getFullAddress(deliveryAddress as any) }}
+   ```
+
+3. 正确解决方案：使用 JSON.parse(JSON.stringify()) 转换
+   ```typescript
+   const getFullAddress = (addr: any): string => {
+       if (addr == null) return ''
+       if (typeof addr === 'string') return addr
+       
+       try {
+           // 正确：先序列化再解析为 UTSJSONObject
+           const addrObj = JSON.parse(JSON.stringify(addr)) as UTSJSONObject
+           
+           const addressField = addrObj.getString('address')
+           if (addressField != null && addressField != '') return addressField
+           
+           const province = addrObj.getString('province') ?? ''
+           const city = addrObj.getString('city') ?? ''
+           const district = addrObj.getString('district') ?? ''
+           const detail = addrObj.getString('detail') ?? ''
+           return province + city + district + detail
+       } catch (e) {
+           console.error('[getFullAddress] 解析地址失败:', e)
+           return ''
+       }
+   }
+   ```
+
+4. 最佳实践
+   - 响应式对象传递给函数时，必须使用 JSON.parse(JSON.stringify()) 转换
+   - 转换后使用 UTSJSONObject 的 getString()、getNumber() 方法访问属性
+   - 使用 try-catch 包裹防止转换异常
+   - 对于简单场景，可以直接在模板中访问响应式对象的属性
+
+================================================================================
+一百零四、数据库关联查询可能返回 null（重要）
+================================================================================
+
+1. 问题：Supabase 关联查询可能返回 null
+   - 症状：`ml_order_items: null` 即使数据库有关联数据
+   - 原因：
+     1. 关联表中确实没有数据
+     2. 外键关系配置不正确
+     3. 查询语法问题
+
+2. 检查步骤
+   ```typescript
+   // 1. 检查原始数据
+   console.log('[loadOrderDetail] 订单商品数据:', itemsRaw)
+   
+   // 2. 正确处理 null 情况
+   if (itemsRaw != null && Array.isArray(itemsRaw)) {
+       // 处理数据
+   } else {
+       console.warn('[loadOrderDetail] 订单商品数据为空')
+   }
+   ```
+
+3. 确保 Supabase 查询正确
+   ```typescript
+   // 正确的关联查询语法
+   const response = await supa
+       .from('ml_orders')
+       .select(`
+           *,
+           ml_order_items (
+               id,
+               product_id,
+               product_name,
+               price,
+               quantity,
+               image_url,
+               specifications
+           )
+       `)
+       .eq('id', orderId)
+       .limit(1)
+       .execute()
+   ```
+
+4. 最佳实践
+   - 始终检查关联数据是否为 null
+   - 添加日志输出原始数据便于调试
+   - 给用户友好的提示（如"暂无商品数据"）
+
+================================================================================
+一百零五、as UTSJSONObject 不会添加方法（重要）
+================================================================================
+
+1. 问题：直接使用 `as UTSJSONObject` 类型断言不会让对象获得 getString/getNumber 等方法
+   - 错误信息：`UTSJSONObject cannot be cast to io.dcloud.uts.Map`
+   - 原因：类型断言只是编译时行为，不会改变运行时对象的方法
+
+2. 错误示例
+   ```typescript
+   const rawItems = orderData.items as any[]
+   
+   for(let i = 0; i < rawItems.length; i++) {
+       // 错误：直接 as UTSJSONObject 不会添加方法
+       const item = rawItems[i] as UTSJSONObject
+       
+       // 运行时错误：getString is not a function
+       const productId = item.getString('product_id')
+   }
+   ```
+
+3. 正确解决方案：使用 JSON.parse(JSON.stringify()) 进行真正的转换
+   ```typescript
+   const rawItems = orderData.items as any[]
+   
+   for(let i = 0; i < rawItems.length; i++) {
+       // 正确：使用 JSON.parse(JSON.stringify()) 转换
+       const item = JSON.parse(JSON.stringify(rawItems[i])) as UTSJSONObject
+       
+       // 正确工作
+       const productId = item.getString('product_id')
+   }
+   ```
+
+4. 常见场景
+   - 从 Supabase 查询返回的数组元素
+   - 从 API 响应获取的数据
+   - 从页面传递的参数对象
+   - 嵌套在父对象中的子对象
+
+5. 最佳实践
+   - 所有需要调用 getString/getNumber/getArray 方法的地方，必须先用 JSON.parse(JSON.stringify()) 转换
+   - 不要依赖 `as UTSJSONObject` 类型断言来添加方法
+   - 对于复杂对象，统一使用转换函数处理
+
+================================================================================
+一百零六、函数间传递对象需要序列化（重要）
+================================================================================
+
+1. 问题：在函数间传递对象或数组时，可能遇到类型转换错误
+   - 错误信息：`UTSJSONObject cannot be cast to io.dcloud.uts.Map`
+   - 原因：Vue 响应式对象、UTSJSONObject 等特殊类型在传递过程中可能无法正确序列化
+
+2. 错误示例
+   ```typescript
+   // checkout.uvue 中构建商品数组
+   const items: any[] = []
+   for (let j = 0; j < group.items.length; j++) {
+       const item = group.items[j]  // Vue 响应式对象
+       items.push({
+           id: item.id,
+           product_id: item.product_id,
+           // ...
+       })
+   }
+   
+   // 传递给服务层
+   await supabaseService.createOrder({
+       items: items  // 可能包含响应式代理对象
+   })
+   
+   // 服务层处理
+   const rawItems = orderData.items as any[]
+   for(let i = 0; i < rawItems.length; i++) {
+       const item = JSON.parse(JSON.stringify(rawItems[i])) as UTSJSONObject
+       // 仍然可能失败，因为 rawItems[i] 可能是特殊对象
+   }
+   ```
+
+3. 正确解决方案：在传递前完全序列化
+   ```typescript
+   // 在服务层接收参数时，先将整个数组序列化
+   const plainItems: any[] = []
+   for(let k = 0; k < shopItems.length; k++) {
+       const plainItem = JSON.parse(JSON.stringify(shopItems[k]))
+       plainItems.push(plainItem)
+   }
+   
+   // 然后传递给内部函数
+   const orderId = await this.createOrder({
+       items: plainItems  // 现在是普通对象数组
+   })
+   
+   // 在 createOrder 中处理
+   for(let i = 0; i < rawItems.length; i++) {
+       const itemStr = JSON.stringify(rawItems[i])
+       const item = JSON.parse(itemStr) as UTSJSONObject
+       // 现在可以正确使用 getString/getNumber
+   }
+   ```
+
+4. 最佳实践
+   - 在函数边界处，将复杂对象序列化为普通对象
+   - 使用 `JSON.parse(JSON.stringify(obj))` 确保对象是普通 JavaScript 对象
+   - 添加日志输出对象类型便于调试
+   - 对于嵌套对象，每一层都需要序列化
+
+================================================================================
+一百零七、CSS 属性值限制（重要）
+================================================================================
+
+1. 问题：UTS Android 不支持某些 CSS 属性值
+   - `gap` 属性不支持
+   - `calc()` 函数不支持
+   - `font-weight: 800` 等数值不支持（只支持 normal/bold/400/700）
+   - `env()` 和 `constant()` 函数不支持
+
+2. 错误示例
+   ```css
+   /* 错误：gap 不支持 */
+   .container {
+       display: flex;
+       gap: 20px;
+   }
+   
+   /* 错误：calc() 不支持 */
+   .card {
+       width: calc(50% - 10px);
+   }
+   
+   /* 错误：font-weight 数值不支持 */
+   .title {
+       font-weight: 800;
+   }
+   
+   /* 错误：env()/constant() 不支持 */
+   .bottom-bar {
+       padding-bottom: env(safe-area-inset-bottom);
+   }
+   ```
+
+3. 正确解决方案
+   ```css
+   /* 正确：使用 margin 替代 gap */
+   .container {
+       display: flex;
+       flex-wrap: wrap;
+   }
+   .item {
+       margin: 10px;
+   }
+   
+   /* 正确：使用百分比和 margin 替代 calc() */
+   .card {
+       width: 48%;
+       margin: 0 1%;
+   }
+   
+   /* 正确：使用 bold 或 700 */
+   .title {
+       font-weight: bold;
+   }
+   
+   /* 正确：使用固定像素值 */
+   .bottom-bar {
+       padding-bottom: 30px;
+   }
+   ```
+
+4. font-weight 支持的值
+   - `normal` (等同于 400)
+   - `bold` (等同于 700)
+   - `400`
+   - `700`
+
+5. 最佳实践
+   - 避免使用 `gap`，改用 `margin`
+   - 避免使用 `calc()`，改用百分比和 margin 组合
+   - font-weight 只使用 `normal`、`bold`、`400`、`700`
+   - 安全区域适配使用固定像素值（如 30px）
+
+6. 其他不支持的 CSS 属性
+   - `overflow-wrap` 不支持
+   - `cursor` 不支持
+   - `max-width` 不支持百分比值，只支持 `number`|`pixel`
+
+================================================================================
+一百零八、模板中 || 运算符限制（重要）
+================================================================================
+
+1. 问题：模板中使用 `||` 运算符可能导致编译错误
+   - 错误信息：`Conditional statements must use boolean types`
+   - 原因：UTS 模板中 `||` 左边必须是 boolean 类型
+
+2. 错误示例
+   ```html
+   <!-- 错误：|| 左边不是 boolean 类型 -->
+   <text>{{ order.shop_name || '自营店铺' }}</text>
+   <text>{{ item.name || '默认名称' }}</text>
+   ```
+
+3. 正确解决方案：使用三元表达式
+   ```html
+   <!-- 正确：使用三元表达式 -->
+   <text>{{ order.shop_name != null && order.shop_name != '' ? order.shop_name : '自营店铺' }}</text>
+   <text>{{ item.name != null && item.name != '' ? item.name : '默认名称' }}</text>
+   ```
+
+4. 最佳实践
+   - 模板中避免使用 `||` 运算符处理默认值
+   - 使用三元表达式：`condition ? value : default`
+   - 对于字符串，使用 `!= null && != ''` 判断
+
+================================================================================
+一百零九、JSON.stringify 返回 Any? 类型（重要）
+================================================================================
+
+1. 问题：JSON.stringify() 返回 Any? 类型
+   - 错误信息：`参数类型不匹配：实际类型为 'Any?'，预期类型为 'Any'`
+   - 原因：JSON.stringify() 返回可空类型，不能直接使用
+
+2. 错误示例
+   ```typescript
+   const plainItems: any[] = []
+   for(let k = 0; k < shopItems.length; k++) {
+       const plainItem = JSON.parse(JSON.stringify(shopItems[k]))
+       plainItems.push(plainItem)  // 错误！plainItem 是 Any? 类型
+   }
+   ```
+
+3. 正确解决方案：检查 null 后再使用
+   ```typescript
+   const plainItems: any[] = []
+   for(let k = 0; k < shopItems.length; k++) {
+       const plainItemRaw = JSON.parse(JSON.stringify(shopItems[k]))
+       if (plainItemRaw != null) {
+           plainItems.push(plainItemRaw as any)
+       }
+   }
+   ```
+
+4. 最佳实践
+   - JSON.parse() 返回值必须检查 null
+   - 使用 `as any` 或其他具体类型进行类型转换
+
+================================================================================
+一百一十、类型定义必须包含所有字段（重要）
+================================================================================
+
+1. 问题：创建类型实例时缺少必填字段
+   - 错误信息：`No value passed for parameter 'xxx'`
+   - 原因：类型定义中的字段都是必填的，必须提供所有字段值
+
+2. 错误示例
+   ```typescript
+   type OrderItem = {
+       id: string,
+       order_no: string,
+       merchant_id: string,  // 必填字段
+       shop_name: string,    // 必填字段
+       products: OrderProduct[]
+   }
+   
+   // 错误：缺少 merchant_id 和 shop_name
+   typedOrders.push({
+       id: mo['id'] as string,
+       order_no: mo['order_no'] as string,
+       products: mo['products'] as OrderProduct[]
+   })
+   ```
+
+3. 正确解决方案：提供所有必填字段
+   ```typescript
+   typedOrders.push({
+       id: mo['id'] as string,
+       order_no: mo['order_no'] as string,
+       merchant_id: (mo['merchant_id'] ?? '') as string,
+       shop_name: (mo['shop_name'] ?? '自营店铺') as string,
+       products: mo['products'] as OrderProduct[]
+   })
+   ```
+
+4. 最佳实践
+   - 检查类型定义，确认所有字段
+   - 使用 `??` 提供默认值
+   - 对于可能为空的字段，在类型定义中使用 `string | null` 或提供默认值
+
+================================================================================
+一百一十一、UTSJSONObject.get() 返回值需要类型转换（重要）
+================================================================================
+
+1. 问题：UTSJSONObject.get() 返回 Any? 类型，不能直接传给需要具体类型的函数
+   - 错误信息：`UTSJSONObject cannot be cast to io.dcloud.uts.Map`
+   - 原因：get() 返回的是 Any? 类型，需要先转换为具体类型
+
+2. 错误示例
+   ```typescript
+   const item = JSON.parse(itemStr) as UTSJSONObject
+   
+   // 错误：get() 返回 Any?，不能直接传给 set()
+   itemJson.set('product_id', item.get('product_id'))
+   itemJson.set('product_name', item.get('product_name') ?? '')
+   ```
+
+3. 正确解决方案：先转换为具体类型
+   ```typescript
+   const itemParsed = JSON.parse(itemStr)
+   if (itemParsed == null) {
+       console.error('解析失败')
+       continue
+   }
+   const item = itemParsed as UTSJSONObject
+   
+   // 正确：先获取值，再转换类型
+   let pId = item.get('product_id')
+   if (pId == null) {
+       pId = item.get('id')
+   }
+   const productId = (pId ?? '') as string
+   itemJson.set('product_id', productId)
+   
+   const productName = (item.get('product_name') ?? '') as string
+   itemJson.set('product_name', productName)
+   ```
+
+4. 最佳实践
+   - JSON.parse() 返回值先检查 null，再 as UTSJSONObject
+   - get() 返回值使用 `??` 提供默认值，再 `as string` 或其他类型
+   - 对于可选字段，始终提供默认值
+
+================================================================================
+一百一十二、onBackPress 生命周期问题（重要）
+================================================================================
+
+1. 问题：onBackPress 在 <script setup> 中可能导致编译失败
+   - 错误信息：`Failed to fetch dynamically imported module`
+   - 原因：UTS 中 onBackPress 的调用方式可能与标准 Vue 不同
+
+2. 错误示例
+   ```typescript
+   <script setup lang="uts">
+   import { onBackPress } from '@dcloudio/uni-app'
+   
+   // 错误：在 setup 顶层直接调用可能导致问题
+   onBackPress((options) => {
+       // ...
+       return false
+   })
+   </script>
+   ```
+
+3. 解决方案
+   - 移除 onBackPress 钩子，或使用其他方式处理返回事件
+   - 如果需要拦截返回，考虑在页面跳转逻辑中处理
+
+4. 最佳实践
+   - 避免在 <script setup> 中使用 onBackPress
+   - 使用页面跳转参数或状态管理处理导航逻辑
+
+================================================================================
+一百一十三、UTSJSONObject 不能直接用于 Supabase insert（重要）
+================================================================================
+
+1. 问题：UTSJSONObject 不能直接传给 Supabase 的 insert 方法
+   - 错误信息：`UTSJSONObject cannot be cast to io.dcloud.uts.Map`
+   - 原因：Supabase insert 需要普通 JavaScript 对象，不是 UTSJSONObject
+
+2. 错误示例
+   ```typescript
+   const itemJson = new UTSJSONObject()
+   itemJson.set('order_id', orderId)
+   itemJson.set('product_id', productId)
+   // ...
+   
+   // 错误：直接传 UTSJSONObject
+   const response = await supa
+       .from('ml_order_items')
+       .insert(itemJson)  // 错误！
+       .execute()
+   ```
+
+3. 正确解决方案：转换为普通对象
+   ```typescript
+   const itemJson = new UTSJSONObject()
+   itemJson.set('order_id', orderId)
+   itemJson.set('product_id', productId)
+   // ...
+   
+   // 正确：先转换为普通对象
+   const itemObjStr = JSON.stringify(itemJson)
+   const itemObj = JSON.parse(itemObjStr) as Record<string, any>
+   
+   const response = await supa
+       .from('ml_order_items')
+       .insert(itemObj)  // 正确
+       .execute()
+   ```
+
+4. 最佳实践
+   - Supabase insert/update 操作必须使用普通对象
+   - 使用 JSON.stringify + JSON.parse 转换 UTSJSONObject
+   - 转换后使用 `as Record<string, any>` 类型
+   - **重要**：JSON.parse 返回 Any?，必须先检查 null 再转换
+
+5. 完整示例
+   ```typescript
+   // 错误：JSON.parse 返回 Any?，不能直接 as
+   const itemObj = JSON.parse(itemObjStr) as Record<string, any>
+   
+   // 正确：先检查 null
+   const itemObjParsed = JSON.parse(itemObjStr)
+   if (itemObjParsed == null) {
+       console.error('转换失败')
+       continue
+   }
+   const itemObj = itemObjParsed as Record<string, any>
+   ```
+
+================================================================================
+一百一十四、数组元素不能直接 as Record<string, any>（重要）
+================================================================================
+
+1. 问题：从 Supabase 查询返回的数组元素不能直接转换为 Record<string, any>
+   - 错误信息：`UTSJSONObject cannot be cast to io.dcloud.uts.Map`
+   - 原因：数组元素是特殊的 UTS 对象，不能直接类型断言
+
+2. 错误示例
+   ```typescript
+   const queryData = queryResponse.data as any
+   if (Array.isArray(queryData) && queryData.length > 0) {
+       // 错误：不能直接 as Record<string, any>
+       const firstItem = queryData[0] as Record<string, any>
+       const orderId = firstItem['id'] as string
+   }
+   ```
+
+3. 正确解决方案：使用 JSON 序列化转换
+   ```typescript
+   const queryData = queryResponse.data as any
+   if (Array.isArray(queryData) && queryData.length > 0) {
+       const firstItemRaw = queryData[0]
+       
+       // 正确：使用 JSON 序列化转换
+       const firstItemStr = JSON.stringify(firstItemRaw)
+       const firstItemParsed = JSON.parse(firstItemStr)
+       if (firstItemParsed == null) {
+           console.error('解析失败')
+           return null
+       }
+       const firstItem = firstItemParsed as UTSJSONObject
+       const orderId = (firstItem.getString('id') ?? '') as string
+   }
+   ```
+
+4. 最佳实践
+   - 从 Supabase 返回的数组元素必须先序列化再访问
+   - 使用 UTSJSONObject 的 getString/getNumber 方法访问属性
+   - 始终检查 JSON.parse 返回值是否为 null
+
+================================================================================
+一百一十五、currentPage.options 不能直接类型转换（重要）
+================================================================================
+
+1. 问题：currentPage.options 不能直接 as Record<string, any>
+   - 错误信息：`OnLoadOptions cannot be cast to Map`
+   - 原因：页面选项是特殊的 UTS 类型，不能直接转换
+
+2. 错误示例
+   ```typescript
+   import { onMounted } from 'vue'
+   
+   onMounted(() => {
+       const pages = getCurrentPages()
+       const currentPage = pages[pages.length - 1]
+       // 错误：不能直接 as Record<string, any>
+       const options = currentPage.options as Record<string, any>
+       const orderId = options['orderId']
+   })
+   ```
+
+3. 正确解决方案：使用 onLoad 生命周期获取页面参数
+   ```typescript
+   import { onLoad } from '@dcloudio/uni-app'
+   
+   // 正确：使用 onLoad 获取页面参数
+   onLoad((options) => {
+       if (options != null) {
+           const orderIdValue = options['orderId']
+           if (orderIdValue != null) {
+               orderId.value = orderIdValue as string
+           }
+       }
+   })
+   ```
+
+4. 最佳实践
+   - 使用 onLoad 生命周期获取页面参数，而不是 getCurrentPages()
+   - onLoad 的 options 参数可以直接通过 key 访问
+   - 始终检查 options 和参数值是否为 null
+
+================================================================================
+一百一十六、uni.getStorageSync 返回值不能直接类型转换（重要）
+================================================================================
+
+1. 问题：uni.getStorageSync 返回的存储数据不能直接 as Record<string, any>
+   - 错误信息：`UTSJSONObject cannot be cast to io.dcloud.uts.Map`
+   - 原因：存储数据可能是特殊的 UTS 类型，不能直接转换
+
+2. 错误示例
+   ```typescript
+   const userStore = uni.getStorageSync('userInfo')
+   if (userStore != null) {
+       // 错误：不能直接 as Record<string, any>
+       const userObj = userStore as Record<string, any>
+       const id = userObj['id']
+   }
+   ```
+
+3. 正确解决方案：使用 JSON 序列化转换
+   ```typescript
+   const userStore = uni.getStorageSync('userInfo')
+   if (userStore != null) {
+       // 正确：使用 JSON 序列化转换
+       const userStr = JSON.stringify(userStore)
+       const userParsed = JSON.parse(userStr)
+       if (userParsed != null) {
+           const userObj = userParsed as UTSJSONObject
+           const id = userObj.getString('id')
+           if (id != null) {
+               return id
+           }
+       }
+   }
+   ```
+
+4. 最佳实践
+   - uni.getStorageSync 返回值必须先序列化再访问
+   - 使用 UTSJSONObject 的 getString/getNumber 方法访问属性
+   - 始终检查 JSON.parse 返回值是否为 null
+
+================================================================================
+一百一十七、JSON.parse 空字符串会报错（重要）
+================================================================================
+
+1. 问题：JSON.parse 空字符串会抛出异常
+   - 错误信息：`JSON.parse error: input text is empty`
+   - 原因：空字符串不是有效的 JSON
+
+2. 错误示例
+   ```typescript
+   const ordersStr = uni.getStorageSync('orders')
+   if (ordersStr != null) {
+       // 错误：ordersStr 可能是空字符串 ''
+       const parsed = JSON.parse(ordersStr as string)
+   }
+   ```
+
+3. 正确解决方案：检查空字符串
+   ```typescript
+   const ordersStr = uni.getStorageSync('orders')
+   if (ordersStr != null && ordersStr !== '') {
+       const parsed = JSON.parse(ordersStr as string)
+       // ...
+   }
+   ```
+
+4. 最佳实践
+   - JSON.parse 前检查字符串是否为空
+   - 使用 `!= null && !== ''` 双重检查
+   - uni.getStorageSync 可能返回空字符串
+
+================================================================================
+一百一十八、自定义类型不能转换为 Record<string, any>（重要）
+================================================================================
+
+1. 问题：自定义 type 类型不能直接转换为 Record<string, any>
+   - 错误信息：`OrderItem cannot be cast to io.dcloud.uts.Map`
+   - 原因：UTS 中的自定义类型是独立的类，不是 Map
+
+2. 错误示例
+   ```typescript
+   type OrderItem = {
+       id: string,
+       order_no: string,
+       create_time: string
+   }
+   
+   const orders: OrderItem[] = [...]
+   
+   // 错误：尝试将 OrderItem 转换为 Record
+   orders.sort((a: any, b: any) => {
+       const aObj = a as Record<string, any>  // 错误！
+       const bObj = b as Record<string, any>  // 错误！
+       return new Date(aObj['create_time']).getTime() - new Date(bObj['create_time']).getTime()
+   })
+   ```
+
+3. 正确解决方案：直接使用类型属性
+   ```typescript
+   type OrderItem = {
+       id: string,
+       order_no: string,
+       create_time: string
+   }
+   
+   const orders: OrderItem[] = [...]
+   
+   // 正确：直接使用 OrderItem 类型访问属性
+   orders.sort((a: OrderItem, b: OrderItem) => {
+       return new Date(a.create_time).getTime() - new Date(b.create_time).getTime()
+   })
+   ```
+
+4. 最佳实践
+   - 自定义类型数组排序时，直接使用类型声明参数
+   - 不要尝试将自定义类型转换为 Record<string, any>
+   - 使用点号访问属性，而不是方括号
+
+================================================================================
+一百一十九、函数参数类型必须精确匹配（重要）
+================================================================================
+
+1. 问题：函数参数类型必须与传入的类型精确匹配
+   - 错误信息：`参数类型不匹配：实际类型为 'UTSArray<OrderItem>'，预期类型为 'UTSArray<Any>'`
+   - 原因：UTS 是强类型语言，不支持隐式类型转换
+
+2. 错误示例
+   ```typescript
+   type OrderItem = {
+       id: string,
+       status: number
+   }
+   
+   // 错误：参数声明为 any[]
+   const updateTabsCounts = (allOrders: any[]) => {
+       const countPending = allOrders.filter((o: any) => {
+           const item = o as OrderItem  // 多余的转换
+           return item.status === 1
+       }).length
+   }
+   
+   const orders: OrderItem[] = [...]
+   updateTabsCounts(orders)  // 错误！类型不匹配
+   ```
+
+3. 正确解决方案：使用精确的类型声明
+   ```typescript
+   type OrderItem = {
+       id: string,
+       status: number
+   }
+   
+   // 正确：参数声明为 OrderItem[]
+   const updateTabsCounts = (allOrders: OrderItem[]) => {
+       const countPending = allOrders.filter((o: OrderItem) => o.status === 1).length
+   }
+   
+   const orders: OrderItem[] = [...]
+   updateTabsCounts(orders)  // 正确！类型匹配
+   ```
+
+4. 最佳实践
+   - 函数参数类型必须与实际传入类型一致
+   - 避免使用 any[] 作为自定义类型数组的参数
+   - 在 filter/map/sort 等回调中直接使用具体类型
+
+================================================================================
+一百二十、Object.keys() 不支持 UTSJSONObject（重要）
+================================================================================
+
+1. 问题：Object.keys() 不能用于 UTSJSONObject
+   - 错误信息：`找不到名称"keys"`
+   - 原因：UTSJSONObject 有自己的 keys() 方法
+
+2. 错误示例
+   ```typescript
+   const obj = orderParsed as UTSJSONObject
+   // 错误：Object.keys() 不支持 UTSJSONObject
+   const keys = Object.keys(obj)
+   ```
+
+3. 正确解决方案：使用 UTSJSONObject.keys() 方法
+   ```typescript
+   const obj = orderParsed as UTSJSONObject
+   // 正确：使用 UTSJSONObject 的 keys() 方法
+   const keys = obj.keys()
+   
+   for (let i = 0; i < keys.length; i++) {
+       const key = keys[i]
+       const value = obj.get(key)
+       console.log(key, value)
+   }
+   ```
+
+4. 最佳实践
+   - UTSJSONObject 使用 `obj.keys()` 获取键列表
+   - 使用 `obj.get(key)` 获取值
+   - 使用 `obj.getString(key)` / `obj.getNumber(key)` 获取特定类型的值
+
+================================================================================
+一百二十一、Supabase 关联查询语法（重要）
+================================================================================
+
+1. 问题：多行模板字符串可能导致关联查询失败
+   - 现象：关联表数据返回 null
+   - 原因：Supabase JavaScript 客户端处理多行字符串时可能有问题
+
+2. 错误示例
+   ```typescript
+   // 可能失败的多行语法
+   .select(`
+       *,
+       ml_order_items (*)
+   `)
+   ```
+
+3. 正确解决方案：使用单行字符串
+   ```typescript
+   // 正确：单行字符串
+   .select('*, ml_order_items(*)')
+   ```
+
+4. 最佳实践
+   - Supabase 查询使用单行字符串
+   - 关联查询格式：`'*, related_table(*)'`
+   - 多个关联：`'*, table1(*), table2(*)'`
+
+================================================================================
+一百二十二、UTSJSONObject.keys() 方法在 Android 端不可用（重要）
+================================================================================
+
+1. 问题：`UTSJSONObject.keys()` 方法在 Android 端编译失败
+   - 错误信息：`找不到名称"keys"`
+   - 原因：Android 端 UTSJSONObject 可能没有 keys() 方法
+
+2. 错误示例
+   ```typescript
+   const specObj = objParsed as UTSJSONObject
+   // 错误：keys() 方法不可用
+   const keys = specObj.keys()
+   for (let i = 0; i < keys.length; i++) {
+       const key = keys[i]
+       // ...
+   }
+   ```
+
+3. 正确解决方案：直接获取已知字段或使用 JSON 字符串处理
+   ```typescript
+   const specObj = objParsed as UTSJSONObject
+   
+   // 方案一：直接获取已知字段
+   const colorVal = specObj.getString('Color')
+   const sizeVal = specObj.getString('Size')
+   const defaultVal = specObj.getString('默认')
+   
+   // 方案二：使用 JSON 字符串处理
+   const specObjStr = JSON.stringify(specObj)
+   const formatted = specObjStr.replace(/[{}"]/g, '').replace(/:/g, ': ').replace(/,/g, ' | ')
+   ```
+
+4. 最佳实践
+   - 避免使用 `UTSJSONObject.keys()` 方法
+   - 如果知道字段名，直接使用 `getString()` 获取
+   - 如果需要遍历，使用 JSON 字符串处理
+
+================================================================================
+一百二十三、函数声明顺序必须正确（重要）
+================================================================================
+
+1. 问题：使用 `const` 声明的函数在调用前必须已定义
+   - 错误信息：`找不到名称"xxx"`
+   - 原因：`const` 箭头函数在定义前无法被调用
+
+2. 错误示例
+   ```typescript
+   // 错误：formatSpecObj 在定义前被调用
+   const parseSpecText = (specs: any): string => {
+       return formatSpecObj(specs)  // 错误！formatSpecObj 还未定义
+   }
+   
+   const formatSpecObj = (obj: any): string => {
+       return '...'
+   }
+   ```
+
+3. 正确解决方案：使用 `function` 声明或调整顺序
+   ```typescript
+   // 方案一：使用 function 声明（推荐）
+   function formatSpecObj(obj: any): string {
+       return '...'
+   }
+   
+   function parseSpecText(specs: any): string {
+       return formatSpecObj(specs)  // 正确！function 声明会提升
+   }
+   
+   // 方案二：调整定义顺序
+   const formatSpecObj = (obj: any): string => {
+       return '...'
+   }
+   
+   const parseSpecText = (specs: any): string => {
+       return formatSpecObj(specs)  // 正确！formatSpecObj 已定义
+   }
+   ```
+
+4. 最佳实践
+   - 优先使用 `function` 声明，避免顺序问题
+   - 如果使用 `const` 箭头函数，确保定义在被调用之前
+
+================================================================================
+一百二十四、String() 构造函数不支持任意类型（重要）
+================================================================================
+
+1. 问题：`String(value)` 不支持任意类型转换
+   - 错误信息：`None of the following candidates is applicable`
+   - 原因：UTS 中 String() 只接受特定类型
+
+2. 错误示例
+   ```typescript
+   const value: any = obj.get(key)
+   // 错误：String() 不接受 any 类型
+   const str = String(value)
+   ```
+
+3. 正确解决方案：使用类型判断
+   ```typescript
+   const value: any = obj.get(key)
+   let valueStr = ''
+   if (typeof value === 'string') {
+       valueStr = value
+   } else if (typeof value === 'number') {
+       valueStr = value.toString()
+   } else {
+       valueStr = JSON.stringify(value)
+   }
+   ```
+
+4. 最佳实践
+   - 使用 `typeof` 判断类型后再转换
+   - 数字使用 `.toString()` 方法
+   - 对象使用 `JSON.stringify()`
+
+================================================================================
+一百二十五、scroll-view 必须设置确定高度（重要）
+================================================================================
+
+1. 问题：scroll-view 无法滚动
+   - 现象：页面内容超出屏幕但无法向下滚动
+   - 原因：scroll-view 没有确定的高度
+
+2. 错误示例
+   ```css
+   .orders-content {
+       flex: 1;
+   }
+   ```
+
+3. 正确解决方案：添加 height: 0 配合 flex: 1
+   ```css
+   .orders-content {
+       flex: 1;
+       height: 0;  /* 重要：配合 flex: 1 使用 */
+   }
+   ```
+
+4. 最佳实践
+   - scroll-view 必须有确定的高度
+   - 使用 `flex: 1; height: 0;` 组合
+   - 或者直接设置具体高度如 `height: 500px`
+
+================================================================================
+一百二十六、Supabase 多表关联查询（重要）
+================================================================================
+
+1. 问题：需要从关联表获取数据
+   - 场景：订单表需要获取商家店铺名称
+   - 前提：必须在 Supabase 中设置正确的外键关系
+
+2. 外键设置要求
+   - 在 Supabase 控制台设置外键关系
+   - 例如：`ml_orders.merchant_id` -> `ml_merchants.id`
+   - 没有外键关系会导致 400 Bad Request 错误
+
+3. 示例：订单关联商家和订单项
+   ```typescript
+   // 关联查询多个表（需要先设置外键）
+   const response = await supa
+       .from('ml_orders')
+       .select('*, ml_order_items(*), ml_merchants(shop_name)')
+       .eq('user_id', userId)
+       .execute()
+   ```
+
+4. 如果没有外键关系的替代方案
+   ```typescript
+   // 方案一：使用默认值
+   let shopName = '自营店铺'
+   if (merchantId != null && merchantId != '') {
+       shopName = '商家店铺'
+   }
+   
+   // 方案二：单独查询商家表
+   const merchantResponse = await supa
+       .from('ml_merchants')
+       .select('shop_name')
+       .eq('id', merchantId)
+       .single()
+       .execute()
+   ```
+
+5. 最佳实践
+   - 关联查询前确保外键关系已设置
+   - 使用单行字符串格式：`'*, table1(*), table2(field1, field2)'`
+   - 如果关联查询失败，使用替代方案
+
 ================================================================================
 文档结束
 ================================================================================
 
 ---
 
-*最后更新：2026-03-02*
+*最后更新：2026-03-03*
diff --git a/pages/mall/consumer/index copy.uvue b/pages/mall/consumer/index copy.uvue
index ccc90416..c97f8f30 100644
--- a/pages/mall/consumer/index copy.uvue	
+++ b/pages/mall/consumer/index copy.uvue	
@@ -456,8 +456,14 @@ const getBrandIcon = (name: string): string => {
         return '🏢'
     }
     // 常见品牌图标映射（使用数组方式避免 Object.keys 问题）
-    const iconKeys = ['感冒', '发烧', '咳嗽', '消炎', '维生素', '钙片', '胃药', '止痛', '过敏', '皮肤', '眼药水', '口腔', '血压', '血糖', '血脂', '保健', '养生', '减肥', '美容', '母婴', '儿童', '老人', '男性', '女性', '维生素C', '维生素D', '蛋白粉', '鱼油', '蜂胶', '阿胶', '红枣', '枸杞', '菊花', '金银花', '口罩', '消毒液', '体温计', '创可贴', '棉签']
-    const iconValues = ['💊', '🌡️', '😷', '🔬', '💊', '🦴', '🫁', '💉', '🌸', '🧴', '👁️', '🦷', '❤️', '🩸', '💓', '🧬', '🍵', '⚖️', '💅', '👶', '🧒', '👴', '♂️', '♀️', '🍊', '☀️', '🥛', '🐟', '🐝', '🍯', '🫘', '🌿', '🌼', '🌸', '😷', '🧴', '🌡️', '🩹', '🧺']
+    const iconKeys = [
+        '感冒', '发烧', '咳嗽', '消炎', '维生素', '钙片', '胃药', '止痛', '过敏', '皮肤', '眼药水', '口腔', '血压', '血糖', '血脂', '保健', '养生', '减肥', '美容', '母婴', '儿童', '老人', '男性', '女性', '维生素C', '维生素D', '蛋白粉', '鱼油', '蜂胶', '阿胶', '红枣', '枸杞', '菊花', '金银花', '口罩', '消毒液', '体温计', '创可贴', '棉签',
+        '九芝堂', '同仁堂', '云南白药', '东阿阿胶', '太极', '江中', '三九', '华素制药', '汤臣倍健', '白云山', '修正', '葵花', '哈药', '扬子江', '恒瑞', '复星', '辉瑞', '阿斯利康', '罗氏', '默沙东', '赛诺菲', '诺华', '雅培', '雀巢', '蒙牛', '伊利', '海尔', '美的', '飞利浦', '西门子', '松下', '苏泊尔', '九阳', '华为', '小米', '苹果', '三星'
+    ]
+    const iconValues = [
+        '💊', '🌡️', '😷', '🔬', '💊', '🦴', '🫁', '💉', '🌸', '🧴', '👁️', '🦷', '❤️', '🩸', '💓', '🧬', '🍵', '⚖️', '💅', '👶', '🧒', '👴', '♂️', '♀️', '🍊', '☀️', '🥛', '🐟', '🐝', '🍯', '🫘', '🌿', '🌼', '🌸', '😷', '🧴', '🌡️', '🩹', '🧺',
+        '📜', '🏛️', '⛰️', '🍯', '☯️', '🌿', '9️⃣', '💊', '💪', '⛰️', '🩹', '🌻', '🧪', '🚢', '🔬', '⭐', '🧬', '🧪', '🧬', '💊', '🧬', '🔬', '🏥', '🥣', '🐄', '🥛', '🏠', '❄️', '🪒', '⚡', '🔋', '🍳', '🥛', '📱', '🍚', '🍎', '📱'
+    ]
     
     // 尝试精确匹配
     for (let i = 0; i < iconKeys.length; i++) {
diff --git a/pages/mall/consumer/index.uvue b/pages/mall/consumer/index.uvue
index 8d34140a..90c2a683 100644
--- a/pages/mall/consumer/index.uvue
+++ b/pages/mall/consumer/index.uvue
@@ -439,8 +439,14 @@ const getBrandIcon = (name: string): string => {
         return '🏢'
     }
     // 常见品牌图标映射（使用数组方式避免 Object.keys 问题）
-    const iconKeys = ['感冒', '发烧', '咳嗽', '消炎', '维生素', '钙片', '胃药', '止痛', '过敏', '皮肤', '眼药水', '口腔', '血压', '血糖', '血脂', '保健', '养生', '减肥', '美容', '母婴', '儿童', '老人', '男性', '女性', '维生素C', '维生素D', '蛋白粉', '鱼油', '蜂胶', '阿胶', '红枣', '枸杞', '菊花', '金银花', '口罩', '消毒液', '体温计', '创可贴', '棉签']
-    const iconValues = ['💊', '🌡️', '😷', '🔬', '💊', '🦴', '🫁', '💉', '🌸', '🧴', '👁️', '🦷', '❤️', '🩸', '💓', '🧬', '🍵', '⚖️', '💅', '👶', '🧒', '👴', '♂️', '♀️', '🍊', '☀️', '🥛', '🐟', '🐝', '🍯', '🫘', '🌿', '🌼', '🌸', '😷', '🧴', '🌡️', '🩹', '🧺']
+    const iconKeys = [
+        '感冒', '发烧', '咳嗽', '消炎', '维生素', '钙片', '胃药', '止痛', '过敏', '皮肤', '眼药水', '口腔', '血压', '血糖', '血脂', '保健', '养生', '减肥', '美容', '母婴', '儿童', '老人', '男性', '女性', '维生素C', '维生素D', '蛋白粉', '鱼油', '蜂胶', '阿胶', '红枣', '枸杞', '菊花', '金银花', '口罩', '消毒液', '体温计', '创可贴', '棉签',
+        '九芝堂', '同仁堂', '云南白药', '东阿阿胶', '太极', '江中', '三九', '华素制药', '汤臣倍健', '白云山', '修正', '葵花', '哈药', '扬子江', '恒瑞', '复星', '辉瑞', '阿斯利康', '罗氏', '默沙东', '赛诺菲', '诺华', '雅培', '雀巢', '蒙牛', '伊利', '海尔', '美的', '飞利浦', '西门子', '松下', '苏泊尔', '九阳', '华为', '小米', '苹果', '三星'
+    ]
+    const iconValues = [
+        '💊', '🌡️', '😷', '🔬', '💊', '🦴', '🫁', '💉', '🌸', '🧴', '👁️', '🦷', '❤️', '🩸', '💓', '🧬', '🍵', '⚖️', '💅', '👶', '🧒', '👴', '♂️', '♀️', '🍊', '☀️', '🥛', '🐟', '🐝', '🍯', '🫘', '🌿', '🌼', '🌸', '😷', '🧴', '🌡️', '🩹', '🧺',
+        '📜', '🏛️', '⛰️', '🍯', '☯️', '🌿', '9️⃣', '💊', '💪', '⛰️', '🩹', '🌻', '🧪', '🚢', '🔬', '⭐', '🧬', '🧪', '🧬', '💊', '🧬', '🔬', '🏥', '🥣', '🐄', '🥛', '🏠', '❄️', '🪒', '⚡', '🔋', '🍳', '🥛', '📱', '🍚', '🍎', '📱'
+    ]
     
     // 尝试精确匹配
     for (let i = 0; i < iconKeys.length; i++) {
@@ -1384,7 +1390,6 @@ const navigateToReminders = () => uni.navigateTo({ url: '/pages/user/reminders'
 	margin-bottom: 4px;
 	text-align: center;
 	width: 100%;
-	overflow-wrap: break-word;
 }
 
 .card-desc {
@@ -1592,7 +1597,6 @@ const navigateToReminders = () => uni.navigateTo({ url: '/pages/user/reminders'
 .keywords-list {
 	display: flex;
 	flex-wrap: wrap;
-	gap: 12px;
 	margin-top: 15px;
 }
 
@@ -1602,7 +1606,6 @@ const navigateToReminders = () => uni.navigateTo({ url: '/pages/user/reminders'
 	padding: 8px 16px;
 	background: #f5f5f5;
 	border-radius: 20px;
-	cursor: pointer;
 	transition: all 0.2s ease;
 }
 
diff --git a/pages/mall/consumer/logistics.uvue b/pages/mall/consumer/logistics.uvue
index 7c5b43b8..457190bd 100644
--- a/pages/mall/consumer/logistics.uvue
+++ b/pages/mall/consumer/logistics.uvue
@@ -35,50 +35,142 @@
 
 <script setup lang="uts">
 import { ref, onMounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { supabaseService } from '@/utils/supabaseService.uts'
 
 const orderId = ref('')
 const productImage = ref('/static/product1.jpg')
-const logisticsStatus = ref('运输中')
-const courierName = ref('顺丰速运')
-const courierPhone = ref('95338')
-const trackingNo = ref('SF1234567890')
+const logisticsStatus = ref('暂无物流信息')
+const courierName = ref('')
+const courierPhone = ref('')
+const trackingNo = ref('')
 
 type TrackItem = {
-  desc: string
+  desc: string,
   time: string
 }
 
-const trackList = ref<TrackItem[]>([
-  {
-    desc: '【深圳市】快件已到达 深圳南山集散中心',
-    time: '2024-01-26 14:30:00'
-  },
-  {
-    desc: '【广州市】快件已从 广州转运中心 发出，准备发往 深圳南山集散中心',
-    time: '2024-01-26 09:20:00'
-  },
-  {
-    desc: '【广州市】快件已到达 广州转运中心',
-    time: '2024-01-25 22:15:00'
-  },
-  {
-    desc: '【杭州市】商家已发货',
-    time: '2024-01-25 18:00:00'
-  }
-])
+const trackList = ref<TrackItem[]>([])
+
+// 加载物流信息函数 - 必须在 onLoad 之前定义
+const loadLogisticsInfo = async () => {
+    if (orderId.value == '') return
+    
+    try {
+        console.log('[logistics] 开始加载物流信息, orderId:', orderId.value)
+        const order = await supabaseService.getOrderDetail(orderId.value)
+        console.log('[logistics] 获取订单结果:', order != null ? '成功' : '失败')
+        
+        if (order != null) {
+            const orderStr = JSON.stringify(order)
+            console.log('[logistics] 订单JSON:', orderStr)
+            const orderParsed = JSON.parse(orderStr)
+            if (orderParsed == null) {
+                console.error('[logistics] 解析订单数据失败')
+                return
+            }
+            const orderObj = orderParsed as UTSJSONObject
+            
+            // 获取物流信息
+            const trackingNoVal = orderObj.getString('tracking_no')
+            const carrierNameVal = orderObj.getString('carrier_name')
+            const shippingStatus = orderObj.getNumber('shipping_status')
+            
+            console.log('[logistics] tracking_no:', trackingNoVal)
+            console.log('[logistics] carrier_name:', carrierNameVal)
+            console.log('[logistics] shipping_status:', shippingStatus)
+            
+            if (trackingNoVal != null && trackingNoVal != '') {
+                trackingNo.value = trackingNoVal
+            } else {
+                console.log('[logistics] 物流单号为空，订单可能未发货')
+                // 物流单号为空时显示提示
+                trackingNo.value = '暂无物流单号'
+                logisticsStatus.value = '商家未填写物流信息'
+            }
+            
+            if (carrierNameVal != null && carrierNameVal != '') {
+                courierName.value = carrierNameVal
+                // 根据快递公司设置电话
+                if (carrierNameVal.includes('顺丰')) {
+                    courierPhone.value = '95338'
+                } else if (carrierNameVal.includes('中通')) {
+                    courierPhone.value = '95311'
+                } else if (carrierNameVal.includes('圆通')) {
+                    courierPhone.value = '95554'
+                } else if (carrierNameVal.includes('韵达')) {
+                    courierPhone.value = '95546'
+                } else if (carrierNameVal.includes('申通')) {
+                    courierPhone.value = '95543'
+                } else {
+                    courierPhone.value = ''
+                }
+            }
+            
+            // 根据发货状态设置物流状态
+            if (shippingStatus == 2) {
+                logisticsStatus.value = '已签收'
+            } else if (shippingStatus == 1) {
+                logisticsStatus.value = '运输中'
+            } else {
+                logisticsStatus.value = '待发货'
+            }
+            
+            // 获取商品图片
+            const itemsRaw = orderObj.get('ml_order_items')
+            if (itemsRaw != null && Array.isArray(itemsRaw)) {
+                const items = itemsRaw as any[]
+                if (items.length > 0) {
+                    const firstItem = items[0]
+                    const itemStr = JSON.stringify(firstItem)
+                    const itemParsed = JSON.parse(itemStr)
+                    if (itemParsed != null) {
+                        const itemObj = itemParsed as UTSJSONObject
+                        const imgUrl = itemObj.getString('image_url')
+                        if (imgUrl != null && imgUrl != '') {
+                            productImage.value = imgUrl
+                        }
+                    }
+                }
+            }
+            
+            // 构建物流轨迹（如果有发货时间）
+            const shippedAt = orderObj.getString('shipped_at')
+            if (shippedAt != null && shippedAt != '') {
+                const trackItem: TrackItem = {
+                    desc: '商家已发货，等待快递揽收',
+                    time: shippedAt
+                }
+                trackList.value.push(trackItem)
+            }
+            
+            // 如果已签收，添加签收信息
+            const deliveredAt = orderObj.getString('delivered_at')
+            if (deliveredAt != null && deliveredAt != '') {
+                const trackItem: TrackItem = {
+                    desc: '快件已签收',
+                    time: deliveredAt
+                }
+                trackList.value.unshift(trackItem)
+                logisticsStatus.value = '已签收'
+            }
+        }
+    } catch (e) {
+        console.error('加载物流信息失败:', e)
+    }
+}
+
+onLoad((options) => {
+    if (options == null) return
+    const orderIdValue = options['orderId']
+    if (orderIdValue != null) {
+        orderId.value = orderIdValue as string
+        loadLogisticsInfo()
+    }
+})
 
 onMounted(() => {
-  const pages = getCurrentPages()
-  const currentPage = pages[pages.length - 1]
-  const options = currentPage.options
-  if (options != null) {
-    const optionsObj = options as UTSJSONObject
-    const orderIdValue = optionsObj.getString('orderId')
-    if (orderIdValue != null) {
-      orderId.value = orderIdValue
-      // 这里可以根据orderId去请求真实的物流信息
-    }
-  }
+    // 逻辑已移到 onLoad
 })
 </script>
 
diff --git a/pages/mall/consumer/order-detail.uvue b/pages/mall/consumer/order-detail.uvue
index 0fda352b..4baeca54 100644
--- a/pages/mall/consumer/order-detail.uvue
+++ b/pages/mall/consumer/order-detail.uvue
@@ -1,15 +1,17 @@
 <!-- 消费者端 - 订单详情页 -->
 <template>
   <view class="order-detail-page">
-     <scroll-view scroll-y="true" class="scroll-content">
+    <scroll-view scroll-y="true" class="scroll-content">
     <!-- 订单状态 -->
     <view class="order-status" :class="getStatusClass()">
-      <view class="status-icon">
-        <text class="status-emoji">{{ getStatusIcon() }}</text>
-      </view>
-      <view class="status-info">
-        <text class="status-text">{{ getStatusText() }}</text>
-        <text class="status-desc">{{ getStatusDesc() }}</text>
+      <view class="status-content">
+        <view class="status-info">
+          <view class="status-title-row">
+            <text class="status-emoji">{{ getStatusIcon() }}</text>
+            <text class="status-text">{{ getStatusText() }}</text>
+          </view>
+          <text class="status-desc">{{ getStatusDesc() }}</text>
+        </view>
       </view>
     </view>
 
@@ -18,21 +20,31 @@
       <view class="delivery-header">
         <text class="section-title">配送信息</text>
       </view>
-      <view class="delivery-address">
-        <view class="address-icon">📍</view>
-        <view class="address-content">
-            <view class="address-user">
-                <text class="recipient">{{ deliveryAddress?.name ?? '' }}</text>
-                <text class="phone">{{ deliveryAddress?.phone ?? '' }}</text>
-            </view>
-            <text class="address-detail">{{ getFullAddress(deliveryAddress as any) }}</text>
+      <view class="delivery-info-content">
+        <view class="delivery-address">
+          <view class="address-icon">📍</view>
+          <view class="address-content">
+              <view class="address-user">
+                  <text class="recipient">{{ deliveryAddress?.name ?? '' }}</text>
+                  <text class="phone">{{ deliveryAddress?.phone ?? '' }}</text>
+              </view>
+              <text class="address-detail">{{ getFullAddress(deliveryAddress as any) }}</text>
+          </view>
+        </view>
+        <!-- 如果有物流信息显示 -->
+        <view v-if="deliveryInfo != null && deliveryInfo?.tracking_no != ''" class="courier-info">
+          <view class="courier-icon">🚚</view>
+          <view class="courier-content">
+              <text class="courier-label">物流信息</text>
+              <view class="tracking-row">
+                  <text class="carrier-name">{{ deliveryInfo?.carrier_name ?? '快递运单' }}</text>
+                  <text class="tracking-no">{{ deliveryInfo?.tracking_no ?? '' }}</text>
+                  <view class="copy-tag" @click="copyText(deliveryInfo?.tracking_no ?? '')">
+                      <text class="copy-tag-text">复制</text>
+                  </view>
+              </view>
+          </view>
         </view>
-      </view>
-      <!-- 如果有物流信息显示 -->
-      <view v-if="deliveryInfo != null && deliveryInfo?.tracking_no != ''" class="courier-info">
-        <text class="courier-label">物流单号：</text>
-        <text class="courier-value">{{ deliveryInfo?.tracking_no ?? '' }}</text>
-        <text class="copy-btn" @click="copyText(deliveryInfo?.tracking_no ?? '')">复制</text>
       </view>
     </view>
 
@@ -105,29 +117,40 @@
     </view>
     </scroll-view>
 
-    <!-- 底部操作 -->
     <view class="bottom-actions" v-if="order != null">
-      <view class="action-left">
-          <view class="service-btn" @click="contactService">
-              <text class="service-icon">🎧</text>
-              <text>客服</text>
+      <view class="action-bar-wrapper">
+        <view class="action-left" @click="contactService">
+            <view class="service-item">
+                <text class="service-icon">🎧</text>
+                <text class="service-label">客服</text>
+            </view>
+        </view>
+        <view class="action-right">
+          <view v-if="order?.order_status === 1" class="btn-group">
+            <button class="btn" @click="cancelOrder">取消订单</button>
+            <button class="btn primary" @click="payOrder">立即支付</button>
           </view>
-      </view>
-      <view class="action-right">
-        <button v-if="order?.order_status === 1" class="btn primary" @click="payOrder">立即支付</button>
-        <button v-if="order?.order_status === 1" class="btn" @click="cancelOrder">取消订单</button>
-        
-        <button v-if="order?.order_status === 2" class="btn" @click="remindDelivery">提醒发货</button>
-        <button v-if="order?.order_status === 2" class="btn" @click="applyRefund">申请退款</button>
-        
-        <button v-if="order?.order_status === 3" class="btn primary" @click="confirmReceive">确认收货</button>
-        <button v-if="order?.order_status === 3" class="btn" @click="viewLogistics">查看物流</button>
-        
-        <button v-if="order?.order_status === 4" class="btn primary" @click="goToReview">评价</button>
-        <button v-if="order?.order_status === 4" class="btn" @click="rePurchase">再次购买</button>
-        <button v-if="order?.order_status === 4" class="btn" @click="applyAfterSales">申请售后</button>
-        
-        <button v-if="order?.order_status === 5" class="btn" @click="rePurchase">重新购买</button>
+          
+          <view v-if="order?.order_status === 2" class="btn-group">
+            <button class="btn" @click="applyRefund">申请退款</button>
+            <button class="btn primary" @click="remindDelivery">提醒发货</button>
+          </view>
+          
+          <view v-if="order?.order_status === 3" class="btn-group">
+            <button class="btn" @click="viewLogistics">查看物流</button>
+            <button class="btn primary" @click="confirmReceive">确认收货</button>
+          </view>
+          
+          <view v-if="order?.order_status === 4" class="btn-group">
+            <button class="btn" @click="applyAfterSales">申请售后</button>
+            <button class="btn" @click="rePurchase">再次购买</button>
+            <button class="btn primary" @click="goToReview">评价订单</button>
+          </view>
+          
+          <view v-if="order?.order_status === 5" class="btn-group">
+            <button class="btn primary" @click="rePurchase">重新购买</button>
+          </view>
+        </view>
       </view>
     </view>
   </view>
@@ -135,7 +158,7 @@
 
 <script setup lang="uts">
 import { ref, onMounted, computed } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onBackPress } from '@dcloudio/uni-app'
 import { supabaseService } from '@/utils/supabaseService.uts'
 import supa from '@/components/supadb/aksupainstance.uts'
 
@@ -153,7 +176,7 @@ type OrderType = {
 	shipped_at: string,
 	completed_at: string,
 	merchant_id: string,
-	shipping_address: any
+	shipping_address: any | null
 }
 
 type OrderItemType = {
@@ -177,7 +200,8 @@ type AddressType = {
 }
 
 type DeliveryInfoType = {
-	tracking_no: string
+	tracking_no: string,
+	carrier_name: string
 }
 
 const orderId = ref('')
@@ -228,18 +252,70 @@ const getStatusClass = (): string => {
 
 const getFullAddress = (addr: any): string => {
     if (addr == null) return ''
-    // 兼容简单的字符串地址和对象地址
     if (typeof addr === 'string') return addr
-    const addrObj = addr as Record<string, any>
-    if (addrObj['address'] != null) return addrObj['address'] as string
-    return ((addrObj['province'] as string) ?? '') + ((addrObj['city'] as string) ?? '') + ((addrObj['district'] as string) ?? '') + ((addrObj['detail'] as string) ?? (addrObj['address_detail'] as string) ?? '')
+    
+    try {
+        const addrObj = JSON.parse(JSON.stringify(addr)) as UTSJSONObject
+        const addressField = addrObj.getString('address')
+        if (addressField != null && addressField != '') return addressField
+        
+        const province = addrObj.getString('province') ?? ''
+        const city = addrObj.getString('city') ?? ''
+        const district = addrObj.getString('district') ?? ''
+        const detail = addrObj.getString('detail') ?? addrObj.getString('address_detail') ?? ''
+        return province + city + district + detail
+    } catch (e) {
+        console.error('[getFullAddress] 解析地址失败:', e)
+        return ''
+    }
+}
+
+function formatSpecs(specs: any): string {
+    if (specs == null) return ''
+    if (typeof specs === 'string') {
+        if (specs == '') return ''
+        try {
+            const parsed = JSON.parse(specs as string)
+            if (parsed != null) {
+                return formatSpecs(parsed)
+            }
+            return specs as string
+        } catch (e) {
+            return specs as string
+        }
+    }
+    
+    try {
+        const specStr = JSON.stringify(specs)
+        const specObj = JSON.parse(specStr) as UTSJSONObject
+        
+        // 定义常见的键名
+        const keys = ['Color', 'Size', '颜色', '尺寸', '规格', '默认', 'spec', 'color', 'size']
+        const parts : string[] = []
+        
+        // 尝试提取键值
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i]
+            const val = specObj.get(key)
+            if (val != null && val != '') {
+                parts.push(val.toString())
+            }
+        }
+        
+        // 如果提取到了内容
+        if (parts.length > 0) {
+            return parts.join(' | ')
+        }
+        
+        // 如果没有提取到已知键，则进行通用清理
+        return specStr.replace(/[{}"]/g, '').replace(/:/g, ': ').replace(/,/g, ' | ')
+    } catch (e) {
+        return ''
+    }
 }
 
 const getSpecText = (specs: any): string => {
-    if (specs == null) return ''
-    if (typeof specs === 'string') return specs
-    // 简化处理：直接返回字符串形式
-    return JSON.stringify(specs)
+    return formatSpecs(specs)
 }
 
 const formatTime = (iso: string): string => {
@@ -261,16 +337,30 @@ const copyText = (text: string) => {
 }
 
 const loadShopInfo = async (merchantId: string) => {
-    const result = await supa
-        .from('ml_shops')
-        .select('shop_name')
-        .eq('merchant_id', merchantId)
-        .single()
-    const resultObj = result as Record<string, any>
-    const resultData = resultObj['data']
-    if (resultData != null) {
-        const dataObj = resultData as Record<string, any>
-        shopName.value = dataObj['shop_name'] as string
+    try {
+        const result = await supa
+            .from('ml_shops')
+            .select('shop_name')
+            .eq('merchant_id', merchantId)
+            .limit(1)
+            .execute()
+        
+        if (result.error != null) {
+            console.error('[loadShopInfo] 获取店铺信息失败:', result.error)
+            return
+        }
+        
+        const rawData = result.data
+        if (rawData == null) return
+        
+        const rawList = rawData as any[]
+        if (rawList.length == 0) return
+        
+        const shopData = rawList[0]
+        const shopObj = JSON.parse(JSON.stringify(shopData)) as UTSJSONObject
+        shopName.value = (shopObj.getString('shop_name') ?? '店铺') as string
+    } catch (e) {
+        console.error('[loadShopInfo] 获取店铺信息异常:', e)
     }
 }
 
@@ -278,13 +368,30 @@ const loadOrderDetail = async () => {
     uni.showLoading({ title: '加载中' })
     try {
         const data = await supabaseService.getOrderDetail(orderId.value)
+        console.log('[loadOrderDetail] 获取到的数据:', JSON.stringify(data))
+        
         if (data != null) {
-            // 使用 JSON.parse(JSON.stringify()) 转换数据
-            const dataObj = JSON.parse(JSON.stringify(data)) as UTSJSONObject
-            order.value = data as OrderType
+            const dataObj = data as UTSJSONObject
+            
+            order.value = {
+                order_no: (dataObj.get('order_no') ?? '') as string,
+                order_status: (dataObj.get('order_status') ?? 1) as number,
+                total_amount: (dataObj.get('total_amount') ?? 0) as number,
+                product_amount: (dataObj.get('product_amount') ?? 0) as number,
+                shipping_fee: (dataObj.get('shipping_fee') ?? 0) as number,
+                discount_amount: (dataObj.get('discount_amount') ?? 0) as number,
+                payment_method: (dataObj.get('payment_method') ?? '') as string,
+                created_at: (dataObj.get('created_at') ?? '') as string,
+                paid_at: (dataObj.get('paid_at') ?? '') as string,
+                shipped_at: (dataObj.get('shipped_at') ?? '') as string,
+                completed_at: (dataObj.get('completed_at') ?? '') as string,
+                merchant_id: (dataObj.get('merchant_id') ?? '') as string,
+                shipping_address: (dataObj.get('shipping_address') ?? null) as any
+            } as OrderType
             
-            // 解析订单商品
             const itemsRaw = dataObj.get('ml_order_items')
+            console.log('[loadOrderDetail] 订单商品数据:', itemsRaw)
+            
             if (itemsRaw != null && Array.isArray(itemsRaw)) {
                 const items = itemsRaw as any[]
                 orderItems.value = []
@@ -295,27 +402,37 @@ const loadOrderDetail = async () => {
                     const orderItem: OrderItemType = {
                         id: (itemObj.get('id') ?? '') as string,
                         product_id: (itemObj.get('product_id') ?? '') as string,
-                        product_name: (itemObj.get('product_name') ?? '') as string,
+                        product_name: (itemObj.get('product_name') ?? '未知商品') as string,
                         price: (itemObj.get('price') ?? 0) as number,
                         quantity: (itemObj.get('quantity') ?? 1) as number,
                         image_url: (itemObj.get('image_url') ?? '') as string,
-                        specifications: (itemObj.get('specifications') ?? '') as string
+                        specifications: (itemObj.get('specifications') ?? '') as any
                     }
                     orderItems.value.push(orderItem)
                 }
             }
             
-            // 解析收货地址
             const addressRaw = dataObj.get('shipping_address')
+            console.log('[loadOrderDetail] 收货地址数据:', addressRaw)
+            
             if (addressRaw != null) {
-                const addressObj = JSON.parse(JSON.stringify(addressRaw)) as UTSJSONObject
+                let addressObj: UTSJSONObject
+                if (addressRaw instanceof UTSJSONObject) {
+                    addressObj = addressRaw as UTSJSONObject
+                } else if (typeof addressRaw === 'string') {
+                    addressObj = JSON.parse(addressRaw as string) as UTSJSONObject
+                } else {
+                    addressObj = JSON.parse(JSON.stringify(addressRaw)) as UTSJSONObject
+                }
+                
                 const province = (addressObj.get('province') ?? '') as string
                 const city = (addressObj.get('city') ?? '') as string
                 const district = (addressObj.get('district') ?? '') as string
-                const detail = (addressObj.get('detail') ?? '') as string
+                const detail = (addressObj.get('detail') ?? (addressObj.get('address_detail') ?? '')) as string
+                
                 deliveryAddress.value = {
-                    name: (addressObj.get('name') ?? '') as string,
-                    phone: (addressObj.get('phone') ?? '') as string,
+                    name: (addressObj.get('name') ?? (addressObj.get('recipient_name') ?? (addressObj.get('receiver_name') ?? ''))) as string,
+                    phone: (addressObj.get('phone') ?? (addressObj.get('recipient_phone') ?? (addressObj.get('receiver_phone') ?? ''))) as string,
                     province: province,
                     city: city,
                     district: district,
@@ -324,18 +441,27 @@ const loadOrderDetail = async () => {
                 } as AddressType
             }
             
-            // 获取店铺信息
-            const merchantId = dataObj.get('merchant_id') as string
-            if (merchantId != null && merchantId != '') {
+            const merchantId = (dataObj.get('merchant_id') ?? '') as string
+            if (merchantId != '') {
                 loadShopInfo(merchantId)
             }
             
-            console.log('订单详情加载成功，商品数量:', orderItems.value.length)
+            // 加载物流信息
+            const trackingNoVal = dataObj.getString('tracking_no')
+            const carrierNameVal = dataObj.getString('carrier_name')
+            if (trackingNoVal != null && trackingNoVal != '') {
+                deliveryInfo.value = {
+                    tracking_no: trackingNoVal,
+                    carrier_name: carrierNameVal ?? ''
+                } as DeliveryInfoType
+            }
+            
+            console.log('[loadOrderDetail] 订单详情加载成功，商品数量:', orderItems.value.length)
         } else {
             uni.showToast({ title: '订单不存在', icon: 'none' })
         }
     } catch (e) {
-        console.error('加载订单详情失败:', e)
+        console.error('[loadOrderDetail] 加载订单详情失败:', e)
         uni.showToast({ title: '加载失败', icon: 'none' })
     } finally {
         uni.hideLoading()
@@ -344,18 +470,24 @@ const loadOrderDetail = async () => {
 
 // 动作函数
 const contactService = () => {
-    uni.showActionSheet({
-        itemList: ['在线客服', '拨打电话'],
-        success: (res) => {
-            if (res.tapIndex === 1) {
-                // 模拟拨打电话
-                uni.makePhoneCall({ phoneNumber: '400-123-4567' })
-            } else {
-                 uni.showToast({ title: '连接到了商家客服' })
-                 // 这里可以跳转到聊天页面
+    if (order.value != null && order.value?.merchant_id != '') {
+        // 跳转到商家的聊天窗口
+        uni.navigateTo({
+            url: `/pages/mall/consumer/chat?merchantId=${order.value?.merchant_id}&merchantName=${encodeURIComponent(shopName.value)}`
+        })
+    } else {
+        uni.showActionSheet({
+            itemList: ['在线客服', '拨打电话'],
+            success: (res) => {
+                if (res.tapIndex === 1) {
+                    // 模拟拨打电话
+                    uni.makePhoneCall({ phoneNumber: '400-123-4567' })
+                } else {
+                     uni.showToast({ title: '连接到了系统客服' })
+                }
             }
-        }
-    })
+        })
+    }
 }
 
 const payOrder = () => {
@@ -366,14 +498,29 @@ const payOrder = () => {
 }
 
 const doCancelOrder = async () => {
-    const result = await supa.from('ml_orders').update({ order_status: 5 }).eq('id', orderId.value)
-    const resultObj = result as Record<string, any>
-    const resultError = resultObj['error']
-    if(resultError == null) {
-        if (order.value != null) {
-            order.value.order_status = 5
+    try {
+        const updatePayload = new UTSJSONObject()
+        updatePayload.set('order_status', 5)
+        updatePayload.set('updated_at', new Date().toISOString())
+        
+        const result = await supa
+            .from('ml_orders')
+            .update(updatePayload)
+            .eq('id', orderId.value)
+            .execute()
+        
+        if (result.error == null) {
+            if (order.value != null) {
+                order.value.order_status = 5
+            }
+            uni.showToast({ title: '订单已取消' })
+        } else {
+            console.error('[doCancelOrder] 取消订单失败:', result.error)
+            uni.showToast({ title: '取消失败', icon: 'none' })
         }
-        uni.showToast({ title: '订单已取消' })
+    } catch (e) {
+        console.error('[doCancelOrder] 取消订单异常:', e)
+        uni.showToast({ title: '取消失败', icon: 'none' })
     }
 }
 
@@ -389,8 +536,25 @@ const cancelOrder = () => {
     })
 }
 
-const remindDelivery = () => {
-    uni.showToast({ title: '已提醒商家尽快发货' })
+const remindDelivery = async () => {
+    const merchantId = order.value?.merchant_id
+    if (merchantId == null || merchantId == '') {
+        uni.showToast({ title: '商家信息不存在', icon: 'none' })
+        return
+    }
+    
+    const orderNo = order.value?.order_no ?? ''
+    const message = `您好，订单 ${orderNo} 已付款，请尽快安排发货，谢谢！`
+    
+    uni.showLoading({ title: '发送中...' })
+    const success = await supabaseService.sendChatMessage(message, merchantId, 'text')
+    uni.hideLoading()
+    
+    if (success) {
+        uni.showToast({ title: '已提醒商家尽快发货' })
+    } else {
+        uni.showToast({ title: '发送失败，请稍后重试', icon: 'none' })
+    }
 }
 
 const viewLogistics = () => {
@@ -402,15 +566,20 @@ const goToReview = () => {
 }
 
 const doConfirmReceive = async () => {
-    const result = await supabaseService.confirmReceipt(orderId.value)
-    if (result.success) {
-        if (order.value != null) {
-            order.value.order_status = 4
+    try {
+        const result = await supabaseService.confirmReceipt(orderId.value)
+        if (result.success) {
+            if (order.value != null) {
+                order.value.order_status = 4
+            }
+            uni.showToast({ title: '收货成功' })
+            setTimeout(() => goToReview(), 1500)
+        } else {
+            uni.showToast({ title: result.error ?? '失败', icon: 'none' })
         }
-        uni.showToast({ title: '收货成功' })
-        setTimeout(() => goToReview(), 1500)
-    } else {
-        uni.showToast({ title: result.error ?? '失败', icon: 'none' })
+    } catch (e) {
+        console.error('[doConfirmReceive] 确认收货异常:', e)
+        uni.showToast({ title: '操作失败', icon: 'none' })
     }
 }
 
@@ -428,27 +597,56 @@ const confirmReceive = () => {
 
 const rePurchase = async () => {
     uni.showLoading({ title: '处理中' })
-    const orderData = order.value as any
-    const success = await supabaseService.rePurchase(orderData)
-    uni.hideLoading()
-    if (success) {
-        uni.showToast({ title: '已加入购物车' })
-        setTimeout(() => {
-            uni.switchTab({ url: '/pages/mall/consumer/cart' })
-        }, 1000)
-    } else {
+    try {
+        const items = orderItems.value
+        if (items.length == 0) {
+            uni.hideLoading()
+            uni.showToast({ title: '没有可购买的商品', icon: 'none' })
+            return
+        }
+        
+        let successCount = 0
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i]
+            const result = await supabaseService.addToCart(
+                item.product_id,
+                item.quantity,
+                '',
+                order.value?.merchant_id ?? ''
+            )
+            if (result) successCount++
+        }
+        
+        uni.hideLoading()
+        
+        if (successCount > 0) {
+            uni.showToast({ title: '已加入购物车' })
+            setTimeout(() => {
+                uni.switchTab({ url: '/pages/mall/consumer/cart' })
+            }, 1000)
+        } else {
+            uni.showToast({ title: '操作失败', icon: 'none' })
+        }
+    } catch (e) {
+        uni.hideLoading()
+        console.error('[rePurchase] 再次购买异常:', e)
         uni.showToast({ title: '操作失败', icon: 'none' })
     }
 }
 
 const doApplyRefund = async (reason: string) => {
-    const success = await supabaseService.applyRefund(orderId.value, reason)
-    if (success) {
-        if (order.value != null) {
-            order.value.order_status = 6
+    try {
+        const success = await supabaseService.applyRefund(orderId.value, reason)
+        if (success) {
+            if (order.value != null) {
+                order.value.order_status = 6
+            }
+            uni.showToast({ title: '申请已提交' })
+        } else {
+            uni.showToast({ title: '提交失败', icon: 'none' })
         }
-        uni.showToast({ title: '申请已提交' })
-    } else {
+    } catch (e) {
+        console.error('[doApplyRefund] 申请退款异常:', e)
         uni.showToast({ title: '提交失败', icon: 'none' })
     }
 }
@@ -474,14 +672,40 @@ const applyAfterSales = () => {
 
 const goToShop = () => {
     // 跳转到店铺详情
-    // uni.navigateTo({ url: `/pages/mall/shop/index?id=${order.value.merchant_id}` })
-    uni.showToast({ title: '进入店铺: ' + shopName.value })
+    const merchantId = order.value?.merchant_id ?? ''
+    if (merchantId != '') {
+        uni.navigateTo({ 
+            url: `/pages/mall/consumer/shop-detail?id=${merchantId}` 
+        })
+    } else {
+        uni.showToast({ title: '商家信息不存在', icon: 'none' })
+    }
 }
 
 const goToProduct = (pid: string) => {
     uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${pid}` })
 }
 
+// 使用 onBackPress 拦截物理返回键和系统导航栏返回
+onBackPress((_): boolean => {
+    const pages = getCurrentPages()
+    if (pages.length > 1) {
+        // @ts-ignore
+        const prevPage = pages[pages.length - 2]
+        // @ts-ignore
+        const prevRoute: string = prevPage.route ?? ''
+        
+        if (prevRoute.includes('product-detail') || prevRoute.includes('payment')) {
+            uni.redirectTo({ url: '/pages/mall/consumer/orders' })
+            return true
+        }
+    } else {
+        uni.redirectTo({ url: '/pages/mall/consumer/orders' })
+        return true
+    }
+    return false
+})
+
 // 生命周期 - 在所有函数定义之后
 onLoad((options) => {
     const id = options['id']
@@ -519,27 +743,53 @@ onLoad((options) => {
 
 /* 状态栏 */
 .order-status {
-    background: linear-gradient(to right, #ff9000, #ff5000);
-    padding: 20px 25px;
+    background: linear-gradient(135deg, #ff9000, #ff5000);
+    padding: 30px 20px;
     color: white;
     display: flex;
+    flex-direction: column;
+    align-items: center; /* 手机端默认居中 */
+}
+
+.status-content {
+    max-width: 1200px;
+    margin: 0 auto;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center; /* 确保内容居中 */
+    text-align: center; /* 文字居中 */
+}
+
+.status-info {
+    display: flex;
+    flex-direction: column;
     align-items: center;
 }
 
+.status-title-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center; /* 标题行居中 */
+    margin-bottom: 8px;
+}
+
 .status-emoji {
-    font-size: 32px;
-    margin-right: 15px;
+    font-size: 28px;
+    margin-right: 12px;
 }
 
 .status-text {
-    font-size: 18px;
+    font-size: 20px;
     font-weight: bold;
+    letter-spacing: 1px;
 }
 
 .status-desc {
-    font-size: 12px;
-    opacity: 0.9;
-    margin-top: 5px;
+    font-size: 14px;
+    opacity: 0.95;
+    text-align: center;
 }
 
 /* 配送信息 */
@@ -579,49 +829,102 @@ onLoad((options) => {
 }
 
 .courier-info {
-    margin-top: 10px;
-    padding-top: 10px;
-    border-top: 1px solid #eee;
-    font-size: 13px;
+    margin-top: 15px;
+    padding-top: 15px;
+    border-top: 1px solid #f5f5f5;
     display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+}
+
+.courier-icon {
+    font-size: 20px;
+    margin-right: 10px;
+    color: #666;
+}
+
+.courier-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+.courier-label {
+    font-size: 14px;
+    color: #333;
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+
+.tracking-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.carrier-name {
+    font-size: 12px;
+    color: #999;
+    margin-right: 8px;
+}
+
+.tracking-no {
+    font-size: 13px;
+    color: #666;
+    margin-right: 10px;
+    font-family: monospace; /* 适合单号显示 */
+}
+
+.copy-tag {
+    background-color: #fff2f0;
+    border: 1px solid #ffccc7;
+    border-radius: 4px;
+    padding: 1px 8px;
+    display: flex;
+    justify-content: center;
     align-items: center;
 }
 
-.copy-btn {
-    margin-left: 10px;
-    color: #ff5000;
-    font-size: 12px;
-    border: 1px solid #ff5000;
-    padding: 1px 6px;
-    border-radius: 10px;
+.copy-tag-text {
+    color: #ff4d4f;
+    font-size: 11px;
 }
 
 /* 店铺与商品 */
 .shop-header {
     display: flex;
+    flex-direction: row; /* 显式声明横向 */
     align-items: center;
     margin-bottom: 15px;
     padding-bottom: 10px;
     border-bottom: 1px solid #f5f5f5;
+    width: 100%; /* 占满容器 */
 }
 
 .shop-icon {
-    margin-right: 5px;
+    margin-right: 8px;
+    font-size: 16px;
 }
 
 .shop-name {
     font-size: 14px;
     font-weight: bold;
-    flex: 1;
+    flex: 1; /* 自适应占据空间 */
+    color: #333;
 }
 
 .arrow-right {
     color: #999;
+    font-size: 14px;
+    margin-left: auto; /* 确保在最后端 */
 }
 
 .product-item {
     display: flex;
+    flex-direction: row;
     margin-bottom: 15px;
+    align-items: flex-start;
 }
 
 .product-item:last-child {
@@ -629,11 +932,12 @@ onLoad((options) => {
 }
 
 .product-image {
-    width: 80px;
-    height: 80px;
-    border-radius: 6px;
-    margin-right: 10px;
+    width: 90px;
+    height: 90px;
+    border-radius: 8px;
+    margin-right: 12px;
     background-color: #f9f9f9;
+    flex-shrink: 0;
 }
 
 .product-info {
@@ -641,6 +945,7 @@ onLoad((options) => {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
+    min-height: 90px;
 }
 
 .product-name {
@@ -649,7 +954,8 @@ onLoad((options) => {
     color: #333;
     overflow: hidden;
     text-overflow: ellipsis;
-    lines: 2; /* uvue specific */
+    lines: 2;
+    margin-bottom: 4px;
 }
 
 .product-spec {
@@ -664,9 +970,11 @@ onLoad((options) => {
 
 .price-quantity {
     display: flex;
+    flex-direction: row;
     justify-content: space-between;
     align-items: center;
     margin-top: 5px;
+    width: 100%;
 }
 
 .product-price {
@@ -701,11 +1009,21 @@ onLoad((options) => {
 }
 
 /* 费用明细 */
+.cost-detail {
+    display: flex;
+    flex-direction: column;
+    align-items: center; /* 居中显示 */
+    padding: 20px 15px;
+}
+
 .cost-row {
     display: flex;
+    flex-direction: row;
     justify-content: space-between;
-    margin-bottom: 8px;
-    font-size: 13px;
+    margin-bottom: 12px;
+    font-size: 14px;
+    width: 100%;
+    max-width: 400px; /* 控制明细区域宽度，并保持居中感 */
 }
 
 .cost-row.total {
@@ -717,65 +1035,207 @@ onLoad((options) => {
 
 .cost-value.price {
     color: #ff5000;
-    font-size: 18px;
+    font-size: 20px;
     font-weight: bold;
 }
 
 /* 底部按钮 */
 .bottom-actions {
     background-color: #ffffff;
-    padding: 10px 15px;
+    padding: 12px 15px;
+    padding-bottom: 30px;
+    box-shadow: 0 -2px 15px rgba(0,0,0,0.08);
+}
+
+.action-bar-wrapper {
+    max-width: 1200px;
+    margin: 0 auto;
+    width: 100%;
     display: flex;
+    flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    box-shadow: 0 -2px 10px rgba(0,0,0,0.05);
-    padding-bottom: 30px;
 }
 
 .action-left {
-    display: flex;
+    padding: 0;
+    margin-right: 0;
 }
 
-.service-btn {
+.service-item {
     display: flex;
     flex-direction: column;
     align-items: center;
-    font-size: 10px;
-    color: #666;
-    background-color: transparent;
-    line-height: 1.2;
+    justify-content: center;
+    min-width: 50px;
 }
 
 .service-icon {
-    font-size: 18px;
+    font-size: 20px;
     margin-bottom: 2px;
 }
 
+.service-label {
+    font-size: 11px;
+    color: #666;
+}
+
 .action-right {
     display: flex;
+    justify-content: center;
+    align-items: center;
 }
 
-/* Add margin to buttons inside action-right for spacing */
-.action-right .btn {
-    margin-left: 10px;
+.btn-group {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
 }
 
 .btn {
     margin: 0;
-    padding: 0 15px;
-    height: 32px;
-    line-height: 30px;
-    font-size: 13px;
-    border-radius: 16px;
+    margin-left: 12px;
+    padding: 0 18px;
+    height: 36px;
+    line-height: 36px;
+    font-size: 14px;
+    border-radius: 18px;
     background: #ffffff;
-    border: 1px solid #cccccc;
-    color: #666;
+    border: 1px solid #ddd;
+    color: #444;
 }
 
 .btn.primary {
-    border-color: #ff5000;
-    color: #ff5000;
-    background-color: #fff0ec;
+    background: linear-gradient(to right, #ff9000, #ff5000);
+    color: #ffffff;
+    border: none;
+    font-weight: bold;
+    box-shadow: 0 4px 8px rgba(255, 80, 0, 0.2);
+}
+
+/* 响应式适配 */
+@media screen and (min-width: 768px) {
+    .card {
+        width: 1200px;
+        max-width: 1080px;
+        margin: 15px auto;
+        padding: 25px;
+        box-sizing: border-box;
+    }
+    
+    .status-content, .action-bar-wrapper {
+        width: 1200px;
+        max-width: 1080px;
+        margin: 0 auto;
+    }
+
+    /* 优化店铺头部在大屏下的自适应布局 */
+    .shop-header {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        padding: 15px 0;
+        margin-bottom: 20px;
+        border-bottom: 1px solid #f0f0f0;
+        width: 100%;
+    }
+    
+    .shop-icon {
+        font-size: 20px;
+        margin-right: 12px;
+    }
+    
+    .shop-name {
+        font-size: 16px;
+        color: #333;
+        font-weight: bold;
+        flex: 1;
+    }
+    
+    .arrow-right {
+        font-size: 18px;
+        color: #ccc;
+        margin-left: auto; /* 确保箭头始终在最右侧 */
+    }
+
+    /* 费用明细在大屏下的居中对齐 */
+    .cost-detail {
+        display: flex;
+        flex-direction: column;
+        align-items: center; /* 整体板块内容在大屏下也保持水平居中 */
+    }
+    
+    .cost-row {
+        width: 100%;
+        max-width: 500px;
+        margin-bottom: 12px;
+        font-size: 15px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+    }
+    
+    .cost-row.total {
+        width: 100%;
+        max-width: 500px;
+        padding-top: 20px;
+        margin-top: 10px;
+        border-top: 1px solid #eee;
+    }
+
+    .cost-label {
+        font-size: 15px;
+        color: #666;
+    }
+
+    .cost-value.price {
+        font-size: 28px;
+    }
+
+    /* 配送信息平铺优化 */
+    .delivery-info-content {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: flex-start;
+    }
+    
+    .delivery-address {
+        flex: 2;
+    }
+    
+    .courier-info {
+        flex: 1;
+        border-top: none;
+        margin-top: 0;
+        padding-top: 0;
+        justify-content: flex-end;
+    }
+
+    /* 订单信息在大屏下对齐展示 */
+    .order-info {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+    }
+    .order-info .info-row {
+        width: 30%;
+        margin: 0 1.5% 10px 1.5%;
+        border-bottom: 1px solid #f9f9f9;
+        padding-bottom: 8px;
+    }
+    
+    .status-text {
+        font-size: 26px;
+    }
+    
+    .btn {
+        height: 42px;
+        line-height: 42px;
+        padding: 0 30px;
+        font-size: 15px;
+    }
 }
 
 /* 状态样式 */
diff --git a/pages/mall/consumer/orders copy.uvue b/pages/mall/consumer/orders copy.uvue
new file mode 100644
index 00000000..ba8f6b31
--- /dev/null
+++ b/pages/mall/consumer/orders copy.uvue	
@@ -0,0 +1,1358 @@
+<!-- pages/mall/consumer/orders.uvue -->
+<template>
+    <view class="orders-page">
+    <!-- 顶部标题栏 -->
+    <view class="orders-header">
+        <view class="header-search full-width">
+            <input 
+                class="search-input" 
+                type="text" 
+                placeholder="搜索订单号或商品名称"
+                :value="searchKeyword"
+                @input="onSearchInput"
+                @confirm="onSearchConfirm"
+            />
+            <text v-if="searchKeyword" class="search-clear" @click="clearSearch">×</text>
+            <text v-else class="search-icon">🔍</text>
+        </view>
+    </view>
+        
+        <!-- 订单状态筛选 -->
+        <view class="order-tabs">
+            <scroll-view scroll-x class="tab-scroll" :show-scrollbar="false">
+                <view class="tab-container">
+                    <view 
+                        v-for="tab in orderTabs" 
+                        :key="tab.id"
+                        :class="['tab-item', { active: activeTab === tab.id }]"
+                        @click="switchTab(tab.id)"
+                    >
+                        <text class="tab-name">{{ tab.name }}</text>
+                        <text v-if="tab.count > 0" class="tab-count">{{ tab.count }}</text>
+                        <view v-if="activeTab === tab.id" class="active-indicator"></view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+        
+        <!-- 订单列表 -->
+        <scroll-view 
+            scroll-y 
+            class="orders-content"
+            refresher-enabled
+            :refresher-triggered="refreshing"
+            @refresherrefresh="onRefresh"
+            @scrolltolower="loadMore"
+        >
+            <!-- 空状态 -->
+            <view v-if="!loading && orders.length === 0" class="empty-orders">
+                <text class="empty-icon">📦</text>
+                <text class="empty-title">暂无订单</text>
+                <text class="empty-desc">去逛逛，发现心仪的商品</text>
+                <button class="go-shopping-btn" @click="goShopping">去逛逛</button>
+            </view>
+            
+            <!-- 订单列表 -->
+            <view v-else class="order-list">
+                <view 
+                    v-for="order in orders" 
+                    :key="order.id"
+                    class="order-card"
+                    @click="viewOrderDetail(order.id)"
+                >
+                    <!-- 订单头部：显示店铺名称 -->
+                    <view class="order-card-header">
+                        <view class="shop-info">
+                            <text class="shop-icon">🏪</text>
+                            <text class="shop-name">{{ order.shop_name != null && order.shop_name != '' ? order.shop_name : '自营店铺' }}</text>
+                            <text class="arrow-right">›</text>
+                        </view>
+                        <text :class="['order-status', getStatusClass(order.status)]">
+                            {{ getStatusText(order.status) }}
+                        </text>
+                    </view>
+                    
+                    <!-- 订单商品 -->
+                    <view class="order-products">
+                        <view 
+                            v-for="product in order.products" 
+                            :key="product.id"
+                            class="order-product"
+                            @click="navigateToProduct(product)"
+                        >
+                            <image 
+                                class="product-image" 
+                                :src="product.image" 
+                                mode="aspectFill"
+                            />
+                            <view class="product-info">
+                                <view class="product-top-info">
+                                    <text class="product-name">{{ product.name }}</text>
+                                    <text class="product-spec">{{ product.spec }}</text>
+                                </view>
+                                <view class="product-footer">
+                                    <text class="product-price">¥{{ product.price }}</text>
+                                    <text class="product-quantity">x{{ product.quantity }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    
+                    <!-- 订单汇总信息 -->
+                    <view class="order-summary">
+                        <text class="order-time">{{ formatDate(order.create_time) }}</text>
+                        <view class="summary-right">
+                            <text class="summary-label">共{{ order.products.length }}件商品 实付:</text>
+                            <text class="summary-price">¥{{ order.total_amount }}</text>
+                        </view>
+                    </view>
+                    
+                    <!-- 订单操作 -->
+                    <view class="order-actions" @click.stop="">
+                        <view v-if="order.status === 1" class="action-buttons">
+                            <button class="action-btn cancel" @click="cancelOrder(order.id)">取消订单</button>
+                            <button class="action-btn pay" @click="payOrder(order.id)">立即支付</button>
+                        </view>
+                        
+                        <view v-if="order.status === 2" class="action-buttons">
+                            <button class="action-btn remind" @click="remindShipping(order.id)">提醒发货</button>
+                            <button class="action-btn refund" @click.stop="onApplyRefund(order)">申请售后</button>
+                        </view>
+                        
+                        <view v-if="order.status === 3" class="action-buttons">
+                            <button class="action-btn view" @click="viewLogistics(order.id)">查看物流</button>
+                            <button class="action-btn confirm" @click="confirmReceipt(order.id)">确认收货</button>
+                            <button class="action-btn refund" @click.stop="onApplyRefund(order)">申请售后</button>
+                        </view>
+                        
+                        <view v-if="order.status === 4" class="action-buttons">
+                            <button class="action-btn review" @click="goReview(order)">评价</button>
+                            <button class="action-btn refund" @click.stop="onApplyRefund(order)">申请售后</button>
+                            <button class="action-btn repurchase" @click="repurchase(order)">再次购买</button>
+                        </view>
+                        
+                        <view v-if="order.status === 5" class="action-buttons">
+                            <button class="action-btn view" @click="viewOrderDetail(order.id)">查看详情</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 加载更多 -->
+            <view v-if="loadingMore" class="loading-more">
+                <view class="loading-spinner"></view>
+                <text>加载中...</text>
+            </view>
+            
+            <view v-if="!hasMore && orders.length > 0" class="no-more">
+                <text>没有更多订单了</text>
+            </view>
+            
+            <!-- 安全区域 -->
+            <view class="safe-area"></view>
+        </scroll-view>
+        
+        <!-- 底部导航 -->
+        <view class="tabbar-placeholder"></view>
+    </view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted, computed } from 'vue'
+import { onShow, onLoad, onBackPress } from '@dcloudio/uni-app'
+import { supabaseService } from '@/utils/supabaseService.uts'
+
+// 定义标签页类型
+type OrderTabItem = {
+    id: string,
+    name: string,
+    count: number
+}
+
+// 定义订单产品类型
+type OrderProduct = {
+    id: string,
+    name: string,
+    price: number,
+    image: string,
+    spec: string,
+    quantity: number
+}
+
+// 定义订单类型
+type OrderItem = {
+    id: string,
+    order_no: string,
+    status: number,
+    create_time: string,
+    product_amount: number,
+    shipping_fee: number,
+    total_amount: number,
+    merchant_id: string,
+    shop_name: string,
+    products: OrderProduct[]
+}
+
+// 响应式数据
+const orders = ref<OrderItem[]>([])
+const allOrdersList = ref<OrderItem[]>([]) // Store all fetched orders for client-side filtering
+const loading = ref<boolean>(false)
+const loadingMore = ref<boolean>(false)
+const hasMore = ref<boolean>(true)
+const refreshing = ref<boolean>(false)
+const page = ref<number>(1)
+const activeTab = ref<string>('all')
+const searchKeyword = ref<string>('')
+
+// 订单标签页 - 使用 ref 以便整体替换
+const orderTabs = ref<OrderTabItem[]>([
+    { 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 }
+])
+
+// Removed Mock Data
+
+
+// 辅助函数：获取状态码
+const getStatusByTab = (tabId: string): number => {
+    if (tabId == 'pending') return 1
+    if (tabId == 'shipping') return 2
+    if (tabId == 'delivering') return 3
+    if (tabId == 'completed') return 4
+    if (tabId == 'cancelled') return 5
+    return 0
+}
+
+// 格式化规格对象为友好的文本 - 必须在 parseSpecText 之前定义
+function formatSpecObj(obj: any): string {
+    if (obj == null) return ''
+    if (typeof obj !== 'object') {
+        // 非对象类型直接返回字符串形式
+        if (typeof obj === 'string') return obj
+        if (typeof obj === 'number') return obj.toString()
+        return ''
+    }
+    
+    try {
+        const objStr = JSON.stringify(obj)
+        const objParsed = JSON.parse(objStr)
+        if (objParsed == null) return ''
+        
+        const specObj = objParsed as UTSJSONObject
+        
+        // 使用 JSON.stringify 获取所有键
+        const specObjStr = JSON.stringify(specObj)
+        const specObjForKeys = JSON.parse(specObjStr) as UTSJSONObject
+        
+        // 手动提取键值对
+        const parts: string[] = []
+        
+        // 尝试获取已知字段
+        const colorVal = specObjForKeys.getString('Color')
+        if (colorVal != null && colorVal != '') {
+            parts.push('Color: ' + colorVal)
+        }
+        
+        const sizeVal = specObjForKeys.getString('Size')
+        if (sizeVal != null && sizeVal != '') {
+            parts.push('Size: ' + sizeVal)
+        }
+        
+        const defaultVal = specObjForKeys.getString('默认')
+        if (defaultVal != null && defaultVal != '') {
+            parts.push('默认: ' + defaultVal)
+        }
+        
+        // 如果没有匹配到已知字段，尝试直接显示 JSON
+        if (parts.length === 0) {
+            // 尝试遍历对象
+            const objAny = specObjForKeys as any
+            if (objAny != null) {
+                return specObjStr.replace(/[{}"]/g, '').replace(/:/g, ': ').replace(/,/g, ' | ')
+            }
+        }
+        
+        return parts.join(' | ')
+    } catch (e) {
+        return ''
+    }
+}
+
+// 辅助函数：解析规格文本
+function parseSpecText(specs: any): string {
+    if (specs == null) return ''
+    if (typeof specs === 'string') {
+        // 如果是 JSON 字符串，尝试解析
+        if (specs.startsWith('{') || specs.startsWith('[')) {
+            try {
+                const parsed = JSON.parse(specs)
+                if (parsed == null) return specs
+                return formatSpecObj(parsed)
+            } catch (e) {
+                return specs
+            }
+        }
+        return specs
+    }
+    // 对于对象类型，格式化显示
+    return formatSpecObj(specs)
+}
+
+// 辅助函数：更新标签计数
+const updateTabsCounts = (allOrders: OrderItem[]) => {
+    // 计算各状态数量
+    const countAll = allOrders.length
+    const countPending = allOrders.filter((o: OrderItem) => o.status === 1).length
+    const countShipping = allOrders.filter((o: OrderItem) => o.status === 2).length
+    const countDelivering = allOrders.filter((o: OrderItem) => o.status === 3).length
+    const countCompleted = allOrders.filter((o: OrderItem) => o.status === 4).length
+    const countCancelled = allOrders.filter((o: OrderItem) => o.status === 5).length
+    
+    // 更新数组元素
+    orderTabs.value[0].count = countAll
+    orderTabs.value[1].count = countPending
+    orderTabs.value[2].count = countShipping
+    orderTabs.value[3].count = countDelivering
+    orderTabs.value[4].count = countCompleted
+    orderTabs.value[5].count = countCancelled
+}
+
+// 辅助函数：按标签筛选订单
+const filterOrdersByTab = () => {
+    if (activeTab.value === 'all') {
+        orders.value = allOrdersList.value
+    } else {
+        const targetStatus = getStatusByTab(activeTab.value)
+        orders.value = allOrdersList.value.filter((o: OrderItem) => {
+            return o.status === targetStatus
+        })
+    }
+}
+
+// 加载订单数据
+const loadOrders = async () => {
+    loading.value = true
+    
+    try {
+        // Fetch all orders from Supabase (status=0)
+        const fetchedOrders = await supabaseService.getOrders(0)
+        console.log('[loadOrders] 获取到订单数量:', fetchedOrders.length)
+        
+        // Map to View Model
+        const mappedOrders: OrderItem[] = []
+        for (let i = 0; i < fetchedOrders.length; i++) {
+            const order = fetchedOrders[i]
+            // 使用 JSON 序列化转换
+            const orderStr = JSON.stringify(order)
+            const orderParsed = JSON.parse(orderStr)
+            if (orderParsed == null) continue
+            const orderObj = orderParsed as UTSJSONObject
+            
+            const itemsRaw = orderObj.get('ml_order_items')
+            const productsList: OrderProduct[] = []
+            
+            console.log('[loadOrders] 订单商品数据:', itemsRaw)
+            
+            if (itemsRaw != null) {
+                // 先检查是否为数组
+                if (Array.isArray(itemsRaw)) {
+                    const items = itemsRaw as any[]
+                    console.log('[loadOrders] 商品数量:', items.length)
+                    for (let j = 0; j < items.length; j++) {
+                        const item = items[j]
+                        const itemStr = JSON.stringify(item)
+                        const itemParsed = JSON.parse(itemStr)
+                        if (itemParsed == null) continue
+                        const itemObj = itemParsed as UTSJSONObject
+                        
+                        const specRaw = itemObj.get('specifications')
+                        const specText = specRaw != null ? parseSpecText(specRaw) : ''
+                        
+                        const productId = itemObj.getString('product_id')
+                        const productName = itemObj.getString('product_name')
+                        const price = itemObj.getNumber('price')
+                        const imageUrl = itemObj.getString('image_url')
+                        const quantity = itemObj.getNumber('quantity')
+                        
+                        console.log('[loadOrders] 商品:', productName, '图片:', imageUrl, '规格:', specText)
+                        
+                        const productItem: OrderProduct = {
+                            id: productId ?? '',
+                            name: productName ?? '未知商品',
+                            price: price ?? 0,
+                            image: imageUrl ?? '/static/default-product.png',
+                            spec: specText,
+                            quantity: quantity ?? 1
+                        }
+                        productsList.push(productItem)
+                    }
+                }
+            }
+            
+            const orderId = orderObj.getString('id')
+            const orderNo = orderObj.getString('order_no')
+            const orderStatus = orderObj.getNumber('order_status')
+            const createdAt = orderObj.getString('created_at')
+            const productAmount = orderObj.getNumber('product_amount')
+            const shippingFee = orderObj.getNumber('shipping_fee')
+            const totalAmount = orderObj.getNumber('total_amount')
+            const paidAmount = orderObj.getNumber('paid_amount')
+            const merchantId = orderObj.getString('merchant_id')
+            
+            // 从关联查询的 ml_shops 表获取店铺名称
+            let shopName = '自营店铺'
+            const shopsRaw = orderObj.get('ml_shops')
+            if (shopsRaw != null) {
+                const shopStr = JSON.stringify(shopsRaw)
+                const shopParsed = JSON.parse(shopStr)
+                if (shopParsed != null) {
+                    const shopObj = shopParsed as UTSJSONObject
+                    const shopNameFromDb = shopObj.getString('shop_name')
+                    if (shopNameFromDb != null && shopNameFromDb != '') {
+                        shopName = shopNameFromDb
+                    }
+                }
+            } else if (merchantId != null && merchantId != '') {
+                shopName = '商家店铺'
+            }
+            
+            console.log('[loadOrders] 订单号:', orderNo, '店铺:', shopName, '商品数:', productsList.length)
+            
+            // 如果没有商品数据，添加一个占位商品
+            if (productsList.length === 0) {
+                const placeholderProduct: OrderProduct = {
+                    id: 'placeholder',
+                    name: '订单商品',
+                    price: totalAmount ?? paidAmount ?? 0,
+                    image: '/static/default-product.png',
+                    spec: '',
+                    quantity: 1
+                }
+                productsList.push(placeholderProduct)
+            }
+            
+            const mappedOrder: OrderItem = {
+                id: orderId ?? '',
+                order_no: orderNo ?? '',
+                status: orderStatus ?? 1,
+                create_time: createdAt ?? '',
+                product_amount: productAmount ?? 0,
+                shipping_fee: shippingFee ?? 0,
+                total_amount: totalAmount ?? paidAmount ?? 0,
+                merchant_id: merchantId ?? '',
+                shop_name: shopName,
+                products: productsList
+            }
+            mappedOrders.push(mappedOrder)
+        }
+
+        // Sort by created_at desc - 直接使用 OrderItem 类型访问属性
+        mappedOrders.sort((a: OrderItem, b: OrderItem) => {
+            const timeA = new Date(a.create_time).getTime()
+            const timeB = new Date(b.create_time).getTime()
+            return timeB - timeA
+        })
+
+        allOrdersList.value = mappedOrders
+        
+        // Update tab counts
+        updateTabsCounts(mappedOrders)
+        
+        // Apply current tab filter
+        filterOrdersByTab()
+        
+    } catch (err) {
+        console.error('加载订单异常:', err)
+        uni.showToast({ title: '加载订单失败', icon: 'none' })
+    } finally {
+        loading.value = false
+    }
+}
+
+// 生命周期
+onLoad((options) => {
+    if (options == null) return
+    const statusVal = options['status']
+    if (statusVal != null) {
+        const status = statusVal as string
+        if (['all', 'pending', 'shipping', 'delivering', 'completed', 'cancelled'].includes(status)) {
+            activeTab.value = status
+        }
+    }
+    const typeVal = options['type']
+    if (typeVal != null) {
+        const type = typeVal as string
+        if (type === 'pending') activeTab.value = 'pending'
+        else if (type === 'shipped') activeTab.value = 'delivering' // 映射到待收货
+        else if (type === 'review') activeTab.value = 'completed' // 映射到已完成
+        else if (type === 'refund') activeTab.value = 'all' // 申请售后默认显示全部
+    }
+})
+
+onShow(() => {
+    loadOrders()
+})
+
+const formatDate = (isoString: string): string => {
+    if (isoString == '') return ''
+    const date = new Date(isoString)
+    return `${date.getFullYear()}-${(date.getMonth()+1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`
+}
+
+// 辅助函数：获取当前订单数据（必须在 performSearch 之前定义）
+function getCurrentOrderData(): OrderItem[] {
+    return allOrdersList.value
+}
+
+// 搜索执行函数（必须在 onSearchInput 等之前定义）
+const performSearch = () => {
+    const keyword = searchKeyword.value.trim().toLowerCase()
+    if (keyword == '') {
+        loadOrders()
+        return
+    }
+    
+    // 在当前订单数据中搜索
+    const allOrders = getCurrentOrderData()
+    const filtered = allOrders.filter((order: any) => {
+        const orderObj = order as Record<string, any>
+        // 搜索订单号
+        const orderNo = orderObj['order_no'] as string
+        if (orderNo != null && orderNo.toLowerCase().includes(keyword)) {
+            return true
+        }
+        
+        // 搜索商品名称
+        const products = orderObj['products']
+        if (products != null && Array.isArray(products)) {
+            return products.some((product: any) => {
+                const productObj = product as Record<string, any>
+                const name = productObj['name'] as string
+                return name != null && name.toLowerCase().includes(keyword)
+            })
+        }
+        
+        return false
+    })
+    
+    orders.value = filtered
+}
+
+// 搜索相关函数
+const onSearchInput = (e: any) => {
+    const eObj = e as Record<string, any>
+    const detail = eObj['detail'] as Record<string, any>
+    searchKeyword.value = detail['value'] as string
+    performSearch()
+}
+
+const onSearchConfirm = () => {
+    performSearch()
+}
+
+const clearSearch = () => {
+    searchKeyword.value = ''
+    performSearch()
+}
+
+const formatSpec = (specs: any): string => {
+    if (specs == null) return ''
+    if (typeof specs === 'string') return specs
+    if (typeof specs === 'object') {
+        return JSON.stringify(specs)
+    }
+    return ''
+}
+
+// 切换标签
+const switchTab = (tabId: string) => {
+    activeTab.value = tabId
+    filterOrdersByTab()
+}
+
+// 获取状态文本
+const getStatusText = (status: number): string => {
+    if (status == 1) return '待付款'
+    if (status == 2) return '待发货'
+    if (status == 3) return '待收货'
+    if (status == 4) return '已完成'
+    if (status == 5) return '已取消'
+    return '未知状态'
+}
+
+// 获取状态类名
+const getStatusClass = (status: number): string => {
+    if (status == 1) return 'status-pending'
+    if (status == 2) return 'status-shipping'
+    if (status == 3) return 'status-delivering'
+    if (status == 4) return 'status-completed'
+    if (status == 5) return 'status-cancelled'
+    return 'status-unknown'
+}
+
+// 下拉刷新
+const onRefresh = () => {
+    refreshing.value = true
+    setTimeout(() => {
+        loadOrders()
+        refreshing.value = false
+        uni.showToast({
+            title: '刷新成功',
+            icon: 'success'
+        })
+    }, 1000)
+}
+
+// 上拉加载更多
+const loadMore = () => {
+    if (loadingMore.value || !hasMore.value) return
+    
+    // 暂未实现分页，直接返回
+    hasMore.value = false
+}
+
+// 订单操作函数
+const cancelOrder = (orderId: string) => {
+    uni.showModal({
+        title: '确认取消',
+        content: '确定要取消此订单吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // 这里应该是实际的API调用
+                uni.showToast({
+                    title: '订单已取消',
+                    icon: 'success'
+                })
+                
+                // 更新订单状态
+                const index = orders.value.findIndex((o: any) => {
+                    const obj = o as Record<string, any>
+                    return obj['id'] === orderId
+                })
+                if (index !== -1) {
+                    const orderObj = orders.value[index] as Record<string, any>
+                    orderObj['status'] = 5
+                    orders.value = [...orders.value]
+                }
+            }
+        }
+    })
+}
+
+const payOrder = (orderId: string) => {
+    uni.navigateTo({
+        url: `/pages/mall/consumer/payment?orderId=${orderId}`
+    })
+}
+
+const remindShipping = (orderId: string) => {
+    uni.showToast({
+        title: '已提醒卖家发货',
+        icon: 'success'
+    })
+}
+
+const viewLogistics = (orderId: string) => {
+    uni.navigateTo({
+        url: `/pages/mall/consumer/logistics?orderId=${orderId}`
+    })
+}
+
+// goReview 必须在 doConfirmReceipt 之前定义，因为 doConfirmReceipt 会调用它
+const goReview = (order: any) => {
+    const orderObj = order as Record<string, any>
+    const products = orderObj['products'] as any[]
+    const productIds = products.map((p: any) => {
+        const pObj = p as Record<string, any>
+        const pid = pObj['id']
+        return pid != null ? pid as string : ''
+    }).join(',')
+    const orderId = orderObj['id'] as string
+    uni.navigateTo({
+        url: `/pages/mall/consumer/review?orderId=${orderId}&productIds=${productIds}`
+    })
+}
+
+const doConfirmReceipt = async (orderId: string) => {
+    uni.showLoading({ title: '处理中...' })
+    try {
+        const result = await supabaseService.confirmReceipt(orderId)
+        uni.hideLoading()
+        
+        if (result.success) {
+            uni.showToast({
+                title: '收货成功',
+                icon: 'success'
+            })
+            
+            // 更新本地状态
+            const index = orders.value.findIndex((o: any) => {
+                const obj = o as Record<string, any>
+                return obj['id'] === orderId
+            })
+            if (index !== -1) {
+                const orderObj = orders.value[index] as Record<string, any>
+                orderObj['status'] = 4
+                orders.value = [...orders.value]
+            }
+
+            // 跳转到评价页面
+            setTimeout(() => {
+                const order = orders.value.find((o: any) => {
+                    const obj = o as Record<string, any>
+                    return obj['id'] === orderId
+                })
+                if (order != null) {
+                    goReview(order)
+                }
+            }, 1000)
+        } else {
+            uni.showToast({
+                title: result.error ?? '确认收货失败',
+                icon: 'none'
+            })
+        }
+    } catch (e) {
+        uni.hideLoading()
+        uni.showToast({
+            title: '系统异常',
+            icon: 'none'
+        })
+    }
+}
+
+const confirmReceipt = (orderId: string) => {
+    uni.showModal({
+        title: '确认收货',
+        content: '请确认您已收到商品，且商品无误',
+        success: (res) => {
+            if (res.confirm) {
+                doConfirmReceipt(orderId)
+            }
+        }
+    })
+}
+
+const repurchase = (order: any) => {
+    uni.showModal({
+        title: '再次购买',
+        content: '确定要将这些商品加入购物车吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // 这里应该是实际的API调用
+                uni.showToast({
+                    title: '已加入购物车',
+                    icon: 'success'
+                })
+            }
+        }
+    })
+}
+
+const viewOrderDetail = (orderId: string) => {
+    uni.navigateTo({
+        url: `/pages/mall/consumer/order-detail?id=${orderId}`
+    })
+}
+
+const onApplyRefund = (order: any) => {
+    const orderObj = order as Record<string, any>
+    const orderId = orderObj['id']
+    uni.navigateTo({
+        url: `/pages/mall/consumer/apply-refund?orderId=${orderId}`
+    })
+}
+
+// 导航函数
+const navigateToSearch = () => {
+    uni.navigateTo({ url: '/pages/mall/consumer/search' })
+}
+
+const navigateToProduct = (product: any) => {
+    const productObj = product as Record<string, any>
+    const productId = productObj['id']
+    uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${productId}` })
+}
+
+const goShopping = () => {
+    uni.switchTab({ url: '/pages/mall/consumer/index' })
+}
+</script>
+
+<style>
+.orders-page {
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #f5f5f5;
+    position: relative;
+    overflow: hidden;
+}
+
+/* 头部 */
+.orders-header {
+    background-color: white;
+    padding: 15px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-bottom: 1px solid #eee;
+    /* position: sticky; removed */
+    /* top: 0; removed */
+    z-index: 10;
+}
+
+.header-search.full-width {
+    display: flex;
+    align-items: center;
+    position: relative;
+    width: 100%;
+}
+
+.search-input {
+    flex: 1;
+    height: 36px;
+    border: 1px solid #ddd;
+    border-radius: 18px;
+    padding: 0 40px 0 16px;
+    font-size: 14px;
+    background-color: #f5f5f5;
+    color: #333;
+    width: 100%;
+}
+
+.search-input::placeholder {
+    color: #999;
+    font-size: 12px;
+}
+.search-input:focus {
+    border-color: #ff5000;
+    background-color: white;
+}
+
+.search-icon {
+    position: absolute;
+    right: 12px;
+    font-size: 18px;
+    color: #999;
+}
+
+.search-clear {
+    position: absolute;
+    right: 12px;
+    font-size: 20px;
+    color: #999;
+    width: 20px;
+    height: 20px;
+    line-height: 18px;
+    text-align: center;
+    border-radius: 10px; /* fixed 50% */
+    background-color: #ddd;
+    /* cursor: pointer; removed */
+}
+
+/* 标签页 */
+.order-tabs {
+    background-color: #ffffff;
+    border-bottom: 1px solid #e5e5e5;
+    /* position: sticky; removed */
+    /* top: 50px; removed */
+    z-index: 10;
+}
+
+.tab-scroll {
+    width: 100%;
+    white-space: nowrap;
+}
+
+.tab-container {
+    display: flex;
+    flex-direction: row;
+    padding: 0 10px;
+    /* width: max-content; removed */
+    /* min-width: 100%; removed */
+}
+
+.tab-item {
+    /* 移除 flex: 1，改为自适应宽度或固定最小宽度 */
+    padding: 15px 15px; /* 增加水平内边距 */
+    text-align: center;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    white-space: nowrap; /* 防止文字换行 */
+    flex-shrink: 0; /* 防止被压缩 */
+}
+
+.tab-item.active {
+    color: #ff5000;
+    font-weight: bold;
+}
+
+.tab-item.active::after {
+    /* content: ''; removed */
+/*    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 2px;
+    background-color: #ff5000; */
+}
+
+.active-indicator {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 2px;
+    background-color: #ff5000;
+}
+
+.tab-name {
+    font-size: 14px;
+}
+
+.tab-count {
+    margin-left: 4px;
+    background-color: #ff5000;
+    color: white;
+    font-size: 10px;
+    padding: 1px 4px;
+    border-radius: 8px;
+    min-width: 12px;
+    text-align: center;
+}
+
+/* 内容区 */
+.orders-content {
+    flex: 1;
+    height: 0;
+    width: 100%;
+}
+
+/* 空状态 */
+.empty-orders {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 80px 20px;
+}
+
+.empty-icon {
+    font-size: 80px;
+    color: #ddd;
+    margin-bottom: 20px;
+}
+
+.empty-title {
+    font-size: 18px;
+    color: #666;
+    margin-bottom: 10px;
+}
+
+.empty-desc {
+    font-size: 14px;
+    color: #999;
+    margin-bottom: 30px;
+}
+
+.go-shopping-btn {
+    background-color: #ff5000;
+    color: white;
+    border: none;
+    border-radius: 25px;
+    padding: 10px 40px;
+    font-size: 16px;
+}
+
+/* 订单列表 */
+.order-list {
+    padding: 10px;
+}
+
+.order-card {
+    background-color: white;
+    border-radius: 10px;
+    margin-bottom: 10px;
+    overflow: hidden;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+/* 订单头部 */
+.order-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15px;
+    border-bottom: 1px solid #f5f5f5;
+}
+
+.order-no {
+    font-size: 14px;
+    color: #666;
+}
+
+.order-status {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+.status-pending {
+    color: #ff5000;
+}
+
+.status-shipping {
+    color: #ff9500;
+}
+
+.status-delivering {
+    color: #007aff;
+}
+
+.status-completed {
+    color: #34c759;
+}
+
+.status-cancelled {
+    color: #999;
+}
+
+/* 订单商品 */
+.order-products {
+    padding: 15px;
+}
+
+.order-product {
+    display: flex;
+    flex-direction: row; /* 显式声明横向排列 */
+    margin-bottom: 15px;
+    width: 100%;
+}
+
+.order-product:last-child {
+    margin-bottom: 0;
+}
+
+.product-image {
+    width: 80px;
+    height: 80px;
+    border-radius: 8px;
+    margin-right: 12px;
+    flex-shrink: 0; /* 防止图片被压缩 */
+}
+
+.product-info {
+    flex: 1; /* 占据右侧剩余所有空间 */
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 80px; 
+    overflow: hidden; /* 防止文字溢出 */
+}
+
+.product-top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+}
+
+.product-name {
+    font-size: 14px;
+    color: #333;
+    line-height: 1.4;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    lines: 2;
+}
+
+.product-spec {
+    font-size: 12px;
+    color: #999;
+    margin-top: 2px;
+}
+
+.product-footer {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: auto;
+}
+
+.product-price {
+    font-size: 16px;
+    color: #ff5000;
+    font-weight: bold;
+}
+
+.product-quantity {
+    font-size: 13px;
+    color: #999;
+}
+
+/* 订单信息 */
+.order-info {
+    padding: 15px;
+    border-top: 1px solid #f5f5f5;
+    border-bottom: 1px solid #f5f5f5;
+}
+
+.info-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.info-row:last-child {
+    margin-bottom: 0;
+}
+
+.info-row.total {
+    margin-top: 8px;
+    padding-top: 8px;
+    border-top: 1px solid #f5f5f5;
+}
+
+.info-label {
+    font-size: 14px;
+    color: #666;
+}
+
+.info-value {
+    font-size: 14px;
+    color: #333;
+}
+
+.total-price {
+    font-size: 18px;
+    color: #ff5000;
+    font-weight: bold;
+}
+
+/* 订单操作 */
+.order-actions {
+    padding: 15px;
+}
+
+.action-buttons {
+    display: flex;
+    justify-content: flex-end;
+    /* gap: 10px; removed */
+}
+
+.action-btn {
+    padding: 6px 15px;
+    border-radius: 15px;
+    font-size: 13px;
+    border: 1px solid;
+    background-color: transparent; /* fixed background: none */
+    margin-left: 10px; /* alternative to gap */
+}
+
+.action-btn.cancel {
+    color: #666;
+    border-color: #ccc;
+}
+
+.action-btn.pay {
+    color: #ff5000;
+    border-color: #ff5000;
+}
+
+.action-btn.remind {
+    color: #666;
+    border-color: #ccc;
+}
+
+.action-btn.view {
+    color: #666;
+    border-color: #ccc;
+}
+
+.action-btn.confirm {
+    color: #34c759;
+    border-color: #34c759;
+}
+
+.action-btn.review {
+    color: #ff9500;
+    border-color: #ff9500;
+}
+
+.action-btn.repurchase {
+    color: #ff5000;
+    border-color: #ff5000;
+}
+
+/* 加载更多 */
+.loading-more {
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+
+.loading-spinner {
+    width: 24px;
+    height: 24px;
+    border: 2px solid #f0f5ff;
+    border-top-color: #ff5000;
+    border-radius: 12px;
+    margin-bottom: 10px;
+}
+
+.no-more {
+    text-align: center;
+    color: #999;
+    font-size: 13px;
+    padding: 20px 0;
+}
+
+/* 安全区域 */
+.safe-area {
+    height: 20px;
+}
+
+/* 底部导航占位 */
+.tabbar-placeholder {
+    height: 50px;
+    background-color: #f5f5f5;
+}
+
+/* 响应式适配 */
+@media screen and (min-width: 768px) {
+    .order-list {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        padding: 20px;
+        max-width: 1200px;
+        margin: 0 auto;
+    }
+    
+    .order-card {
+        width: 48%;
+        margin: 0 1% 20px 1%;
+        box-shadow: 0 4px 12px rgba(0,0,0,0.05);
+    }
+}
+
+@media screen and (min-width: 1200px) {
+    .order-card {
+        width: 31%;
+        margin: 0 1% 20px 1%;
+    }
+}
+
+/* 订单卡片新样式 */
+.order-card-header {
+    padding: 12px 15px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #f9f9f9;
+}
+
+.shop-info {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.shop-icon {
+    font-size: 16px;
+    margin-right: 6px;
+}
+
+.shop-name {
+    font-size: 14px;
+    font-weight: bold;
+    color: #333;
+    max-width: 150px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    lines: 1;
+}
+
+.arrow-right {
+    font-size: 14px;
+    color: #ccc;
+    margin-left: 4px;
+}
+
+.product-title-row, .product-spec-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.product-title-row {
+    margin-bottom: 4px;
+}
+
+.product-spec-row {
+    margin-top: 2px;
+}
+
+.order-summary {
+    padding: 10px 15px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    border-top: 1px solid #f9f9f9;
+}
+
+.order-time {
+    font-size: 12px;
+    color: #999;
+}
+
+.summary-right {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.summary-label {
+    font-size: 12px;
+    color: #666;
+    margin-right: 5px;
+}
+
+.summary-price {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+}
+
+@media screen and (max-width: 320px) {
+    .tab-item {
+        padding: 0 10px;
+        margin-right: 5px;
+    }
+    
+    .action-btn {
+        padding: 6px 10px;
+        font-size: 12px;
+    }
+}
+
+@media screen and (min-width: 415px) {
+    .order-card {
+        margin-bottom: 15px;
+    }
+}
+</style>
diff --git a/pages/mall/consumer/orders.uvue b/pages/mall/consumer/orders.uvue
index d6781d5a..3e3b2249 100644
--- a/pages/mall/consumer/orders.uvue
+++ b/pages/mall/consumer/orders.uvue
@@ -18,13 +18,20 @@
     </view>
         
         <!-- 订单状态筛选 -->
-        <view class="order-tabs">
-            <scroll-view scroll-x class="tab-scroll" :show-scrollbar="false">
-                <view class="tab-container">
+        <view class="order-tabs-fixed-container">
+            <view 
+                :class="['tab-item-fixed', { active: activeTab === 'all' }]"
+                @click="switchTab('all')"
+            >
+                <text class="tab-name">全部</text>
+                <view v-if="activeTab === 'all'" class="active-indicator"></view>
+            </view>
+            <scroll-view scroll-x="true" class="tab-scroll-mobile" :show-scrollbar="false" :scroll-with-animation="true">
+                <view class="tab-container-mobile">
                     <view 
-                        v-for="tab in orderTabs" 
+                        v-for="tab in orderTabsMobile" 
                         :key="tab.id"
-                        :class="['tab-item', { active: activeTab === tab.id }]"
+                        :class="['tab-item-mobile', { active: activeTab === tab.id }]"
                         @click="switchTab(tab.id)"
                     >
                         <text class="tab-name">{{ tab.name }}</text>
@@ -58,10 +65,15 @@
                     v-for="order in orders" 
                     :key="order.id"
                     class="order-card"
+                    @click="viewOrderDetail(order.id)"
                 >
-                    <!-- 订单头部 -->
-                    <view class="order-header">
-                        <text class="order-no">订单号：{{ order.order_no }}</text>
+                    <!-- 订单头部：显示店铺名称 -->
+                    <view class="order-card-header">
+                        <view class="shop-info">
+                            <text class="shop-icon">🏪</text>
+                            <text class="shop-name">{{ order.shop_name != null && order.shop_name != '' ? order.shop_name : '自营店铺' }}</text>
+                            <text class="arrow-right">›</text>
+                        </view>
                         <text :class="['order-status', getStatusClass(order.status)]">
                             {{ getStatusText(order.status) }}
                         </text>
@@ -81,34 +93,29 @@
                                 mode="aspectFill"
                             />
                             <view class="product-info">
-                                <text class="product-name">{{ product.name }}</text>
-                                <text class="product-spec">{{ product.spec }}</text>
+                                <view class="product-top-info">
+                                    <text class="product-name">{{ product.name }}</text>
+                                    <text class="product-spec">{{ product.spec }}</text>
+                                </view>
                                 <view class="product-footer">
                                     <text class="product-price">¥{{ product.price }}</text>
-                                    <text class="product-quantity">×{{ product.quantity }}</text>
+                                    <text class="product-quantity">x{{ product.quantity }}</text>
                                 </view>
                             </view>
                         </view>
                     </view>
                     
-                    <!-- 订单信息 -->
-                    <view class="order-info">
-                        <view class="info-row">
-                            <text class="info-label">商品合计</text>
-                            <text class="info-value">¥{{ order.product_amount }}</text>
-                        </view>
-                        <view class="info-row">
-                            <text class="info-label">运费</text>
-                            <text class="info-value">¥{{ order.shipping_fee }}</text>
-                        </view>
-                        <view class="info-row total">
-                            <text class="info-label">实付款</text>
-                            <text class="info-value total-price">¥{{ order.total_amount }}</text>
+                    <!-- 订单汇总信息 -->
+                    <view class="order-summary">
+                        <text class="order-time">{{ formatDate(order.create_time) }}</text>
+                        <view class="summary-right">
+                            <text class="summary-label">共{{ order.products.length }}件商品 实付:</text>
+                            <text class="summary-price">¥{{ order.total_amount }}</text>
                         </view>
                     </view>
                     
                     <!-- 订单操作 -->
-                    <view class="order-actions">
+                    <view class="order-actions" @click.stop="">
                         <view v-if="order.status === 1" class="action-buttons">
                             <button class="action-btn cancel" @click="cancelOrder(order.id)">取消订单</button>
                             <button class="action-btn pay" @click="payOrder(order.id)">立即支付</button>
@@ -162,24 +169,6 @@ import { ref, reactive, onMounted, computed } from 'vue'
 import { onShow, onLoad, onBackPress } from '@dcloudio/uni-app'
 import { supabaseService } from '@/utils/supabaseService.uts'
 
-// 拦截返回事件，避免跳回登录页
-onBackPress((options) => {
-    if (options.from === 'navigateBack') {
-        const pages = getCurrentPages()
-        if (pages.length > 1) {
-            const prevPage = pages[pages.length - 2]
-            // 如果上一页是登录页，则重定向到个人中心
-            if (prevPage.route.includes('login')) {
-                uni.redirectTo({
-                    url: '/pages/mall/consumer/profile'
-                })
-                return true
-            }
-        }
-    }
-    return false
-})
-
 // 定义标签页类型
 type OrderTabItem = {
     id: string,
@@ -206,6 +195,8 @@ type OrderItem = {
     product_amount: number,
     shipping_fee: number,
     total_amount: number,
+    merchant_id: string,
+    shop_name: string,
     products: OrderProduct[]
 }
 
@@ -230,7 +221,10 @@ const orderTabs = ref<OrderTabItem[]>([
     { id: 'cancelled', name: '已取消', count: 0 }
 ])
 
-// Removed Mock Data
+// 模拟状态筛选（除去"全部"后的其余标签）
+const orderTabsMobile = computed((): OrderTabItem[] => {
+    return orderTabs.value.filter((tab: OrderTabItem) => tab.id !== 'all')
+})
 
 
 // 辅助函数：获取状态码
@@ -243,59 +237,98 @@ const getStatusByTab = (tabId: string): number => {
     return 0
 }
 
-// 辅助函数：解析规格文本
-const parseSpecText = (specs: any): string => {
-    if (specs == null) return ''
-    if (typeof specs === 'string') return specs
-    // 对于对象类型，尝试转为JSON字符串或简单处理
+// 格式化规格对象为友好的文本 - 必须在 parseSpecText 之前定义
+function formatSpecObj(obj: any): string {
+    if (obj == null) return ''
+    if (typeof obj !== 'object') {
+        // 非对象类型直接返回字符串形式
+        if (typeof obj === 'string') return obj
+        if (typeof obj === 'number') return obj.toString()
+        return ''
+    }
+    
     try {
-        return JSON.stringify(specs)
+        const objStr = JSON.stringify(obj)
+        const objParsed = JSON.parse(objStr)
+        if (objParsed == null) return ''
+        
+        const specObj = objParsed as UTSJSONObject
+        
+        // 使用 JSON.stringify 获取所有键
+        const specObjStr = JSON.stringify(specObj)
+        const specObjForKeys = JSON.parse(specObjStr) as UTSJSONObject
+        
+        // 手动提取键值对
+        const parts: string[] = []
+        
+        // 尝试获取已知字段
+        const colorVal = specObjForKeys.getString('Color')
+        if (colorVal != null && colorVal != '') {
+            parts.push('Color: ' + colorVal)
+        }
+        
+        const sizeVal = specObjForKeys.getString('Size')
+        if (sizeVal != null && sizeVal != '') {
+            parts.push('Size: ' + sizeVal)
+        }
+        
+        const defaultVal = specObjForKeys.getString('默认')
+        if (defaultVal != null && defaultVal != '') {
+            parts.push('默认: ' + defaultVal)
+        }
+        
+        // 如果没有匹配到已知字段，尝试直接显示 JSON
+        if (parts.length === 0) {
+            // 尝试遍历对象
+            const objAny = specObjForKeys as any
+            if (objAny != null) {
+                return specObjStr.replace(/[{}"]/g, '').replace(/:/g, ': ').replace(/,/g, ' | ')
+            }
+        }
+        
+        return parts.join(' | ')
     } catch (e) {
         return ''
     }
 }
 
+// 辅助函数：解析规格文本
+function parseSpecText(specs: any): string {
+    if (specs == null) return ''
+    if (typeof specs === 'string') {
+        // 如果是 JSON 字符串，尝试解析
+        if (specs.startsWith('{') || specs.startsWith('[')) {
+            try {
+                const parsed = JSON.parse(specs)
+                if (parsed == null) return specs
+                return formatSpecObj(parsed)
+            } catch (e) {
+                return specs
+            }
+        }
+        return specs
+    }
+    // 对于对象类型，格式化显示
+    return formatSpecObj(specs)
+}
+
 // 辅助函数：更新标签计数
-const updateTabsCounts = (allOrders: any[]) => {
-    // 直接重新赋值整个数组
-    const tabsData = orderTabs.value
+const updateTabsCounts = (allOrders: OrderItem[]) => {
     // 计算各状态数量
     const countAll = allOrders.length
-    const countPending = allOrders.filter((o: any) => {
-        const obj = o as Record<string, any>
-        return obj['status'] === 1
-    }).length
-    const countShipping = allOrders.filter((o: any) => {
-        const obj = o as Record<string, any>
-        return obj['status'] === 2
-    }).length
-    const countDelivering = allOrders.filter((o: any) => {
-        const obj = o as Record<string, any>
-        return obj['status'] === 3
-    }).length
-    const countCompleted = allOrders.filter((o: any) => {
-        const obj = o as Record<string, any>
-        return obj['status'] === 4
-    }).length
-    const countCancelled = allOrders.filter((o: any) => {
-        const obj = o as Record<string, any>
-        return obj['status'] === 5
-    }).length
+    const countPending = allOrders.filter((o: OrderItem) => o.status === 1).length
+    const countShipping = allOrders.filter((o: OrderItem) => o.status === 2).length
+    const countDelivering = allOrders.filter((o: OrderItem) => o.status === 3).length
+    const countCompleted = allOrders.filter((o: OrderItem) => o.status === 4).length
+    const countCancelled = allOrders.filter((o: OrderItem) => o.status === 5).length
     
     // 更新数组元素
-    const tabsArr = tabsData as any[]
-    const tab0 = tabsArr[0] as Record<string, any>
-    tab0['count'] = countAll
-    const tab1 = tabsArr[1] as Record<string, any>
-    tab1['count'] = countPending
-    const tab2 = tabsArr[2] as Record<string, any>
-    tab2['count'] = countShipping
-    const tab3 = tabsArr[3] as Record<string, any>
-    tab3['count'] = countDelivering
-    const tab4 = tabsArr[4] as Record<string, any>
-    tab4['count'] = countCompleted
-    const tab5 = tabsArr[5] as Record<string, any>
-    tab5['count'] = countCancelled
+    orderTabs.value[0].count = countAll
+    orderTabs.value[1].count = countPending
+    orderTabs.value[2].count = countShipping
+    orderTabs.value[3].count = countDelivering
+    orderTabs.value[4].count = countCompleted
+    orderTabs.value[5].count = countCancelled
 }
 
 // 辅助函数：按标签筛选订单
@@ -317,69 +350,124 @@ const loadOrders = async () => {
     try {
         // Fetch all orders from Supabase (status=0)
         const fetchedOrders = await supabaseService.getOrders(0)
+        console.log('[loadOrders] 获取到订单数量:', fetchedOrders.length)
         
         // Map to View Model
-        const mappedOrders: any[] = []
+        const mappedOrders: OrderItem[] = []
         for (let i = 0; i < fetchedOrders.length; i++) {
             const order = fetchedOrders[i]
-            const orderObj = order as Record<string, any>
-            const items = orderObj['ml_order_items'] as any[]
-            const productsList: any[] = []
+            // 使用 JSON 序列化转换
+            const orderStr = JSON.stringify(order)
+            const orderParsed = JSON.parse(orderStr)
+            if (orderParsed == null) continue
+            const orderObj = orderParsed as UTSJSONObject
             
-            if (items != null) {
-                for (let j = 0; j < items.length; j++) {
-                    const item = items[j]
-                    const itemObj = item as Record<string, any>
-                    const specRaw = itemObj['specifications']
-                    const specText = specRaw != null ? parseSpecText(specRaw) : ''
-                    productsList.push({
-                        id: itemObj['product_id'],
-                        name: itemObj['product_name'],
-                        price: itemObj['price'],
-                        image: itemObj['image_url'] ?? '/static/default-product.png',
-                        spec: specText,
-                        quantity: itemObj['quantity']
-                    })
+            const itemsRaw = orderObj.get('ml_order_items')
+            const productsList: OrderProduct[] = []
+            
+            console.log('[loadOrders] 订单商品数据:', itemsRaw)
+            
+            if (itemsRaw != null) {
+                // 先检查是否为数组
+                if (Array.isArray(itemsRaw)) {
+                    const items = itemsRaw as any[]
+                    console.log('[loadOrders] 商品数量:', items.length)
+                    for (let j = 0; j < items.length; j++) {
+                        const item = items[j]
+                        const itemStr = JSON.stringify(item)
+                        const itemParsed = JSON.parse(itemStr)
+                        if (itemParsed == null) continue
+                        const itemObj = itemParsed as UTSJSONObject
+                        
+                        const specRaw = itemObj.get('specifications')
+                        const specText = specRaw != null ? parseSpecText(specRaw) : ''
+                        
+                        const productId = itemObj.getString('product_id')
+                        const productName = itemObj.getString('product_name')
+                        const price = itemObj.getNumber('price')
+                        const imageUrl = itemObj.getString('image_url')
+                        const quantity = itemObj.getNumber('quantity')
+                        
+                        console.log('[loadOrders] 商品:', productName, '图片:', imageUrl, '规格:', specText)
+                        
+                        const productItem: OrderProduct = {
+                            id: productId ?? '',
+                            name: productName ?? '未知商品',
+                            price: price ?? 0,
+                            image: imageUrl ?? '/static/default-product.png',
+                            spec: specText,
+                            quantity: quantity ?? 1
+                        }
+                        productsList.push(productItem)
+                    }
                 }
             }
             
-            mappedOrders.push({
-                id: orderObj['id'],
-                order_no: orderObj['order_no'],
-                status: orderObj['order_status'],
-                create_time: orderObj['created_at'],
-                product_amount: orderObj['product_amount'] ?? 0,
-                shipping_fee: orderObj['shipping_fee'] ?? 0,
-                total_amount: orderObj['total_amount'] ?? orderObj['paid_amount'] ?? 0,
+            const orderId = orderObj.getString('id')
+            const orderNo = orderObj.getString('order_no')
+            const orderStatus = orderObj.getNumber('order_status')
+            const createdAt = orderObj.getString('created_at')
+            const productAmount = orderObj.getNumber('product_amount')
+            const shippingFee = orderObj.getNumber('shipping_fee')
+            const totalAmount = orderObj.getNumber('total_amount')
+            const paidAmount = orderObj.getNumber('paid_amount')
+            const merchantId = orderObj.getString('merchant_id')
+            
+            // 从关联查询的 ml_shops 表获取店铺名称
+            let shopName = '自营店铺'
+            const shopsRaw = orderObj.get('ml_shops')
+            if (shopsRaw != null) {
+                const shopStr = JSON.stringify(shopsRaw)
+                const shopParsed = JSON.parse(shopStr)
+                if (shopParsed != null) {
+                    const shopObj = shopParsed as UTSJSONObject
+                    const shopNameFromDb = shopObj.getString('shop_name')
+                    if (shopNameFromDb != null && shopNameFromDb != '') {
+                        shopName = shopNameFromDb
+                    }
+                }
+            } else if (merchantId != null && merchantId != '') {
+                shopName = '商家店铺'
+            }
+            
+            console.log('[loadOrders] 订单号:', orderNo, '店铺:', shopName, '商品数:', productsList.length)
+            
+            // 如果没有商品数据，添加一个占位商品
+            if (productsList.length === 0) {
+                const placeholderProduct: OrderProduct = {
+                    id: 'placeholder',
+                    name: '订单商品',
+                    price: totalAmount ?? paidAmount ?? 0,
+                    image: '/static/default-product.png',
+                    spec: '',
+                    quantity: 1
+                }
+                productsList.push(placeholderProduct)
+            }
+            
+            const mappedOrder: OrderItem = {
+                id: orderId ?? '',
+                order_no: orderNo ?? '',
+                status: orderStatus ?? 1,
+                create_time: createdAt ?? '',
+                product_amount: productAmount ?? 0,
+                shipping_fee: shippingFee ?? 0,
+                total_amount: totalAmount ?? paidAmount ?? 0,
+                merchant_id: merchantId ?? '',
+                shop_name: shopName,
                 products: productsList
-            })
+            }
+            mappedOrders.push(mappedOrder)
         }
 
-        // Sort by created_at desc
-        mappedOrders.sort((a: any, b: any) => {
-            const aObj = a as Record<string, any>
-            const bObj = b as Record<string, any>
-            const timeA = new Date(aObj['create_time'] as string).getTime()
-            const timeB = new Date(bObj['create_time'] as string).getTime()
+        // Sort by created_at desc - 直接使用 OrderItem 类型访问属性
+        mappedOrders.sort((a: OrderItem, b: OrderItem) => {
+            const timeA = new Date(a.create_time).getTime()
+            const timeB = new Date(b.create_time).getTime()
             return timeB - timeA
         })
 
-        // 将 mappedOrders 转换为 OrderItem[] 类型
-        const typedOrders: OrderItem[] = []
-        for (let i = 0; i < mappedOrders.length; i++) {
-            const mo = mappedOrders[i] as Record<string, any>
-            typedOrders.push({
-                id: mo['id'] as string,
-                order_no: mo['order_no'] as string,
-                status: mo['status'] as number,
-                create_time: mo['create_time'] as string,
-                product_amount: mo['product_amount'] as number,
-                shipping_fee: mo['shipping_fee'] as number,
-                total_amount: mo['total_amount'] as number,
-                products: mo['products'] as OrderProduct[]
-            })
-        }
-        allOrdersList.value = typedOrders
+        allOrdersList.value = mappedOrders
         
         // Update tab counts
         updateTabsCounts(mappedOrders)
@@ -397,14 +485,17 @@ const loadOrders = async () => {
 
 // 生命周期
 onLoad((options) => {
-    if (options['status'] != null) {
-        const status = options['status'] as string
+    if (options == null) return
+    const statusVal = options['status']
+    if (statusVal != null) {
+        const status = statusVal as string
         if (['all', 'pending', 'shipping', 'delivering', 'completed', 'cancelled'].includes(status)) {
             activeTab.value = status
         }
     }
-    if (options['type'] != null) {
-        const type = options['type'] as string
+    const typeVal = options['type']
+    if (typeVal != null) {
+        const type = typeVal as string
         if (type === 'pending') activeTab.value = 'pending'
         else if (type === 'shipped') activeTab.value = 'delivering' // 映射到待收货
         else if (type === 'review') activeTab.value = 'completed' // 映射到已完成
@@ -500,6 +591,8 @@ const getStatusText = (status: number): string => {
     if (status == 3) return '待收货'
     if (status == 4) return '已完成'
     if (status == 5) return '已取消'
+    if (status == 6) return '退款中'
+    if (status == 7) return '已退款'
     return '未知状态'
 }
 
@@ -510,6 +603,8 @@ const getStatusClass = (status: number): string => {
     if (status == 3) return 'status-delivering'
     if (status == 4) return 'status-completed'
     if (status == 5) return 'status-cancelled'
+    if (status == 6) return 'status-refunding'
+    if (status == 7) return 'status-refunded'
     return 'status-unknown'
 }
 
@@ -705,10 +800,12 @@ const goShopping = () => {
 <style>
 .orders-page {
     width: 100%;
-    flex: 1;
+    height: 100vh;
     display: flex;
     flex-direction: column;
     background-color: #f5f5f5;
+    position: relative;
+    overflow: hidden;
 }
 
 /* 头部 */
@@ -774,62 +871,73 @@ const goShopping = () => {
 }
 
 /* 标签页 */
-.order-tabs {
+.order-tabs-fixed-container {
     background-color: #ffffff;
-    border-bottom: 1px solid #e5e5e5;
-    /* position: sticky; removed */
-    /* top: 50px; removed */
+    border-bottom: 1px solid #f0f0f0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: 100%;
     z-index: 10;
 }
 
-.tab-scroll {
-    width: 100%;
-    white-space: nowrap;
-}
-
-.tab-container {
-    display: flex;
-    flex-direction: row;
-    padding: 0 10px;
-    /* width: max-content; removed */
-    /* min-width: 100%; removed */
-}
-
-.tab-item {
-    /* 移除 flex: 1，改为自适应宽度或固定最小宽度 */
-    padding: 15px 15px; /* 增加水平内边距 */
+.tab-item-fixed {
+    padding: 15px 15px;
     text-align: center;
     position: relative;
     display: flex;
     justify-content: center;
     align-items: center;
-    white-space: nowrap; /* 防止文字换行 */
-    flex-shrink: 0; /* 防止被压缩 */
+    white-space: nowrap;
+    flex-shrink: 0;
+    min-width: 60px;
 }
 
-.tab-item.active {
+.tab-item-fixed.active {
     color: #ff5000;
     font-weight: bold;
 }
 
-.tab-item.active::after {
-    /* content: ''; removed */
-/*    content: '';
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 2px;
-    background-color: #ff5000; */
+.tab-scroll-mobile {
+    flex: 1;
+    white-space: nowrap;
+    /* 移除 width: 0，改用更稳健的安卓适配方式 */
+    display: flex;
+    flex-direction: row;
+}
+
+.tab-container-mobile {
+    display: flex;
+    flex-direction: row;
+    /* 加上这个确保容器能够横向撑开 */
+    flex-wrap: nowrap;
+}
+
+.tab-item-mobile {
+    padding: 15px 15px;
+    text-align: center;
+    position: relative;
+    display: flex;
+    flex-direction: row; /* 显式声明 */
+    justify-content: center;
+    align-items: center;
+    white-space: nowrap;
+    flex-shrink: 0; /* 绝对不能被压缩，否则无法滚动 */
+}
+
+.tab-item-mobile.active {
+    color: #ff5000;
+    font-weight: bold;
 }
 
 .active-indicator {
     position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 2px;
+    bottom: 0px;
+    left: 10px;
+    right: 10px;
+    height: 3px;
     background-color: #ff5000;
+    border-radius: 2px;
 }
 
 .tab-name {
@@ -850,6 +958,8 @@ const goShopping = () => {
 /* 内容区 */
 .orders-content {
     flex: 1;
+    height: 0;
+    width: 100%;
 }
 
 /* 空状态 */
@@ -859,7 +969,6 @@ const goShopping = () => {
     align-items: center;
     justify-content: center;
     padding: 80px 20px;
-    text-align: center;
 }
 
 .empty-icon {
@@ -941,6 +1050,14 @@ const goShopping = () => {
     color: #999;
 }
 
+.status-refunding {
+    color: #ff5000;
+}
+
+.status-refunded {
+    color: #999;
+}
+
 /* 订单商品 */
 .order-products {
     padding: 15px;
@@ -948,7 +1065,9 @@ const goShopping = () => {
 
 .order-product {
     display: flex;
+    flex-direction: row; /* 显式声明横向排列 */
     margin-bottom: 15px;
+    width: 100%;
 }
 
 .order-product:last-child {
@@ -959,30 +1078,46 @@ const goShopping = () => {
     width: 80px;
     height: 80px;
     border-radius: 8px;
-    margin-right: 15px;
+    margin-right: 12px;
+    flex-shrink: 0; /* 防止图片被压缩 */
 }
 
 .product-info {
-    flex: 1;
+    flex: 1; /* 占据右侧剩余所有空间 */
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 80px; 
+    overflow: hidden; /* 防止文字溢出 */
+}
+
+.product-top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
 }
 
 .product-name {
-    font-size: 15px;
+    font-size: 14px;
     color: #333;
-    margin-bottom: 5px;
     line-height: 1.4;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    lines: 2;
 }
 
 .product-spec {
-    font-size: 13px;
+    font-size: 12px;
     color: #999;
-    margin-bottom: 10px;
+    margin-top: 2px;
 }
 
 .product-footer {
     display: flex;
+    flex-direction: row;
     justify-content: space-between;
     align-items: center;
+    margin-top: auto;
 }
 
 .product-price {
@@ -992,8 +1127,8 @@ const goShopping = () => {
 }
 
 .product-quantity {
-    font-size: 14px;
-    color: #666;
+    font-size: 13px;
+    color: #999;
 }
 
 /* 订单信息 */
@@ -1128,6 +1263,114 @@ const goShopping = () => {
 }
 
 /* 响应式适配 */
+@media screen and (min-width: 768px) {
+    .order-list {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        padding: 20px;
+        max-width: 1200px;
+        margin: 0 auto;
+    }
+    
+    .order-card {
+        width: 48%;
+        margin: 0 1% 20px 1%;
+        box-shadow: 0 4px 12px rgba(0,0,0,0.05);
+    }
+}
+
+@media screen and (min-width: 1200px) {
+    .order-card {
+        width: 31%;
+        margin: 0 1% 20px 1%;
+    }
+}
+
+/* 订单卡片新样式 */
+.order-card-header {
+    padding: 12px 15px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #f9f9f9;
+}
+
+.shop-info {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.shop-icon {
+    font-size: 16px;
+    margin-right: 6px;
+}
+
+.shop-name {
+    font-size: 14px;
+    font-weight: bold;
+    color: #333;
+    max-width: 150px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    lines: 1;
+}
+
+.arrow-right {
+    font-size: 14px;
+    color: #ccc;
+    margin-left: 4px;
+}
+
+.product-title-row, .product-spec-row {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.product-title-row {
+    margin-bottom: 4px;
+}
+
+.product-spec-row {
+    margin-top: 2px;
+}
+
+.order-summary {
+    padding: 10px 15px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    border-top: 1px solid #f9f9f9;
+}
+
+.order-time {
+    font-size: 12px;
+    color: #999;
+}
+
+.summary-right {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.summary-label {
+    font-size: 12px;
+    color: #666;
+    margin-right: 5px;
+}
+
+.summary-price {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+}
+
 @media screen and (max-width: 320px) {
     .tab-item {
         padding: 0 10px;
diff --git a/pages/mall/consumer/payment-success.uvue b/pages/mall/consumer/payment-success.uvue
index b434d128..a7f9468a 100644
--- a/pages/mall/consumer/payment-success.uvue
+++ b/pages/mall/consumer/payment-success.uvue
@@ -22,6 +22,7 @@
 
 <script setup lang="uts">
 import { ref, onMounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
 import { supabaseService } from '@/utils/supabaseService.uts'
 
 const orderId = ref('')
@@ -56,12 +57,8 @@ const loadOrderInfo = async () => {
   }
 }
 
-onMounted(() => {
-  const pages = getCurrentPages()
-  const currentPage = pages[pages.length - 1]
-  const options = currentPage.options as Record<string, any>
-  
-  console.log('[payment-success] options:', JSON.stringify(options))
+onLoad((options) => {
+  if (options == null) return
   
   const orderIdValue = options['orderId']
   if (orderIdValue != null) {
@@ -87,6 +84,10 @@ onMounted(() => {
   }
 })
 
+onMounted(() => {
+  // 逻辑已移到 onLoad
+})
+
 const viewOrder = () => {
   uni.navigateTo({
     url: '/pages/mall/consumer/orders'
@@ -182,9 +183,6 @@ const goHome = () => {
   border-radius: 22.5px;
   font-size: 16px;
   font-weight: bold;
-  display: flex;
-  align-items: center;
-  justify-content: center;
   margin-bottom: 15px;
 }
 
diff --git a/pages/mall/consumer/payment.uvue b/pages/mall/consumer/payment.uvue
index 37e350f0..1e101b96 100644
--- a/pages/mall/consumer/payment.uvue
+++ b/pages/mall/consumer/payment.uvue
@@ -204,11 +204,16 @@ const updateOrderInStorage = (targetOrderId: string, status: number) => {
         // 尝试从 'orders' 读取 (checkout页面写入的key)
 		const ordersStr = uni.getStorageSync('orders')
 		let orders: Record<string, any>[] = []
-		if (ordersStr != null) {
+		if (ordersStr != null && ordersStr !== '') {
 			const parsed = JSON.parse(ordersStr as string)
 			if (Array.isArray(parsed)) {
 				for (let i = 0; i < parsed.length; i++) {
-					orders.push(parsed[i] as Record<string, any>)
+                    // 使用 JSON 序列化转换
+                    const itemStr = JSON.stringify(parsed[i])
+                    const itemParsed = JSON.parse(itemStr)
+                    if (itemParsed != null) {
+                        orders.push(itemParsed as Record<string, any>)
+                    }
 				}
 			}
 		}
@@ -230,7 +235,8 @@ const updateOrderInStorage = (targetOrderId: string, status: number) => {
 			uni.setStorageSync('orders', JSON.stringify(orders))
             console.log('订单状态已更新到Storage (orders):', targetOrderId, status)
 		} else {
-            console.warn('在Storage (orders)中未找到订单:', targetOrderId)
+            // 本地缓存中没有订单数据是正常的，数据在数据库中
+            console.log('本地缓存中无订单数据，已忽略:', targetOrderId)
         }
 	} catch (e) {
 		console.error('更新订单状态失败', e)
@@ -291,16 +297,26 @@ const loadOrderInfo = async () => {
 
         const order = await supabaseService.getOrderDetail(orderId.value)
         if (order != null) {
-            const orderObj = order as Record<string, any>
-            orderNo.value = orderObj['order_no'] as string
-            // Only update amount if not passed via options (options is priority for UI flow usually, but DB is source of truth)
-            // But checking consistency is good
-            const totalAmount = orderObj['total_amount']
-            const dbAmount = totalAmount != null ? parseFloat(totalAmount.toString()) : 0
+            // 使用 JSON 序列化转换对象
+            const orderStr = JSON.stringify(order)
+            const orderParsed = JSON.parse(orderStr)
+            if (orderParsed == null) {
+                console.error('订单数据解析失败')
+                return
+            }
+            const orderObj = orderParsed as UTSJSONObject
+            
+            const orderNoVal = orderObj.getString('order_no')
+            if (orderNoVal != null) {
+                orderNo.value = orderNoVal
+            }
+            
+            const totalAmount = orderObj.getNumber('total_amount')
+            const dbAmount = totalAmount ?? 0
             if (dbAmount > 0) {
                  amount.value = dbAmount
             }
-            const items = orderObj['items']
+            const items = orderObj.get('items')
             if (items != null && Array.isArray(items) && items.length > 0) {
                 // Could update product name etc if displayed
             }
@@ -315,43 +331,45 @@ const loadOrderInfo = async () => {
 }
 
 // 生命周期
+onLoad((options) => {
+    if (options != null) {
+        const orderIdValue = options['orderId']
+        if (orderIdValue != null) {
+            orderId.value = orderIdValue as string
+            loadOrderInfo()
+        }
+        
+        const amountValue = options['amount']
+        if (amountValue != null) {
+            amount.value = parseFloat(amountValue.toString())
+        }
+        
+        // 获取传递的价格详情
+        const productAmountValue = options['productAmount']
+        if (productAmountValue != null) {
+            productAmount.value = parseFloat(productAmountValue.toString())
+        }
+        const deliveryFeeValue = options['deliveryFee']
+        if (deliveryFeeValue != null) {
+            deliveryFee.value = parseFloat(deliveryFeeValue.toString())
+        }
+        const discountAmountValue = options['discountAmount']
+        if (discountAmountValue != null) {
+            discountAmount.value = parseFloat(discountAmountValue.toString())
+        }
+        
+        // 如果没有传详情，尝试根据总价估算（兼容旧逻辑，但优先使用传参）
+        if (productAmountValue == null && amount.value > 0) {
+            calculatePriceDetails(amount.value)
+        }
+        
+        loadPaymentMethods()
+        loadUserBalance()
+    }
+})
+
 onMounted(() => {
-	const pages = getCurrentPages()
-	const currentPage = pages[pages.length - 1]
-	const options = currentPage.options as Record<string, any>
-	
-	const orderIdValue = options['orderId']
-	if (orderIdValue != null) {
-		orderId.value = orderIdValue as string
-		loadOrderInfo()
-	}
-	
-	const amountValue = options['amount']
-	if (amountValue != null) {
-		amount.value = parseFloat(amountValue.toString())
-	}
-    
-    // 获取传递的价格详情
-    const productAmountValue = options['productAmount']
-    if (productAmountValue != null) {
-        productAmount.value = parseFloat(productAmountValue.toString())
-    }
-    const deliveryFeeValue = options['deliveryFee']
-    if (deliveryFeeValue != null) {
-        deliveryFee.value = parseFloat(deliveryFeeValue.toString())
-    }
-    const discountAmountValue = options['discountAmount']
-    if (discountAmountValue != null) {
-        discountAmount.value = parseFloat(discountAmountValue.toString())
-    }
-    
-    // 如果没有传详情，尝试根据总价估算（兼容旧逻辑，但优先使用传参）
-    if (productAmountValue == null && amount.value > 0) {
-		calculatePriceDetails(amount.value)
-    }
-	
-	loadPaymentMethods()
-	loadUserBalance()
+    // onMounted 中的逻辑已移到 onLoad 中
 })
 
 // 监听返回操作（包含系统返回键和导航栏返回按钮）
@@ -370,11 +388,16 @@ onBackPress((options) => {
 const getCurrentUserId = (): string => {
 	const userStore = uni.getStorageSync('userInfo')
 	if (userStore != null) {
-		const userObj = userStore as Record<string, any>
-		const id = userObj['id']
-		if (id != null) {
-			return id as string
-		}
+        // 使用 JSON 序列化转换
+        const userStr = JSON.stringify(userStore)
+        const userParsed = JSON.parse(userStr)
+        if (userParsed != null) {
+            const userObj = userParsed as UTSJSONObject
+            const id = userObj.getString('id')
+            if (id != null) {
+                return id
+            }
+        }
 	}
 	return ''
 }
diff --git a/pages/mall/consumer/profile.uvue b/pages/mall/consumer/profile.uvue
index 02a9c0d8..32bfd7fd 100644
--- a/pages/mall/consumer/profile.uvue
+++ b/pages/mall/consumer/profile.uvue
@@ -649,9 +649,13 @@ export default {
       if (itemsRaw == null) return '/static/product1.jpg'
       const items = itemsRaw as any[]
       if (items.length > 0) {
-          const firstItem = items[0] as Record<string, any>
-          const imgUrl = firstItem['image_url'] as string
-          const prodImg = firstItem['product_image'] as string
+          const firstItem = items[0]
+          const itemStr = JSON.stringify(firstItem)
+          const itemParsed = JSON.parse(itemStr)
+          if (itemParsed == null) return '/static/product1.jpg'
+          const itemObj = itemParsed as UTSJSONObject
+          const imgUrl = itemObj.getString('image_url')
+          const prodImg = itemObj.getString('product_image')
           const img = (imgUrl != null && imgUrl !== '') ? imgUrl : prodImg
           if (img != null && img !== '') return img
       }
@@ -663,12 +667,16 @@ export default {
       if (itemsRaw == null) return '精选商品'
       const items = itemsRaw as any[]
       if (items.length > 0) {
-          const firstItem = items[0] as Record<string, any>
-          const pName = firstItem['product_name'] as string
+          const firstItem = items[0]
+          const itemStr = JSON.stringify(firstItem)
+          const itemParsed = JSON.parse(itemStr)
+          if (itemParsed == null) return '精选商品'
+          const itemObj = itemParsed as UTSJSONObject
+          const pName = itemObj.getString('product_name')
           const name = (pName != null && pName !== '') ? pName : '商品'
           
           if (items.length > 1) {
-              return `${name} 等${items.length}件商品`
+              return name + ' 等' + items.length + '件商品'
           }
           return name
       }
diff --git a/pages/user/login.uvue b/pages/user/login.uvue
index e99de29d..f4bf726f 100644
--- a/pages/user/login.uvue
+++ b/pages/user/login.uvue
@@ -284,7 +284,7 @@ const handleLogin = async () => {
     
     uni.showToast({ title: '管理员登录成功', icon: 'success' })
     setTimeout(() => {
-      uni.reLaunch({ url: '/pages/mall/consumer/category' })
+      uni.reLaunch({ url: '/pages/mall/consumer/index' })
     }, 500)
     return
   }
@@ -353,7 +353,7 @@ const handleLogin = async () => {
 
     uni.showToast({ title: '登录成功', icon: 'success' })
     setTimeout(() => {
-      uni.reLaunch({ url: '/pages/mall/consumer/category' })
+      uni.reLaunch({ url: '/pages/mall/consumer/index' })
     }, 500)
   } catch (err) {
     console.error('登录错误:', err)
diff --git a/utils/supabaseService.uts b/utils/supabaseService.uts
index f44e7c61..e16c1a64 100644
--- a/utils/supabaseService.uts
+++ b/utils/supabaseService.uts
@@ -1314,7 +1314,7 @@ class SupabaseService {
         const mappedData: Product[] = []
         const rawData = res2.data as any[]
         for(let i = 0; i < rawData.length; i++) {
-            const item = rawData[i] as UTSJSONObject
+            const item = JSON.parse(JSON.stringify(rawData[i])) as UTSJSONObject
             const images: string[] = []
             
             const mainImageUrl = item.getString('main_image_url')
@@ -1479,7 +1479,7 @@ class SupabaseService {
         const mappedData: Product[] = []
         const rawData = res2.data as any[]
         for(let i = 0; i < rawData.length; i++) {
-            const item = rawData[i] as UTSJSONObject
+            const item = JSON.parse(JSON.stringify(rawData[i])) as UTSJSONObject
             const images: string[] = []
             
             const mainImageUrl = item.getString('main_image_url')
@@ -2745,12 +2745,14 @@ class SupabaseService {
   // 批量删除购物车商品
   async batchDeleteCartItems(cartItemIds: string[]): Promise<boolean> {
     try {
+      console.log('[batchDeleteCartItems] 开始删除, ids:', cartItemIds.length)
       const userId = this.getCurrentUserId()
       if (userId == null) {
         console.error('用户未登录，无法删除购物车商品')
         return false
       }
 
+      console.log('[batchDeleteCartItems] userId:', userId)
       const response = await supa
         .from('ml_shopping_cart')
         .eq('user_id', userId)
@@ -2758,11 +2760,13 @@ class SupabaseService {
         .delete()
         .execute()
 
+      console.log('[batchDeleteCartItems] response.error:', response.error)
       if (response.error != null) {
         console.error('批量删除购物车商品失败:', response.error)
         return false
       }
 
+      console.log('[batchDeleteCartItems] 删除成功')
       return true
     } catch (error) {
       console.error('批量删除购物车商品异常:', error)
@@ -2840,17 +2844,21 @@ class SupabaseService {
           itemObj = JSON.parse(JSON.stringify(item)) as UTSJSONObject
         }
         
-        const addrObj = new UTSJSONObject()
-        addrObj.set('id', itemObj.getString('id') ?? '')
-        addrObj.set('user_id', itemObj.getString('user_id') ?? '')
-        addrObj.set('recipient_name', itemObj.getString('receiver_name') ?? itemObj.getString('recipient_name') ?? '')
-        addrObj.set('phone', itemObj.getString('receiver_phone') ?? itemObj.getString('phone') ?? '')
-        addrObj.set('province', itemObj.getString('province') ?? '')
-        addrObj.set('city', itemObj.getString('city') ?? '')
-        addrObj.set('district', itemObj.getString('district') ?? '')
-        addrObj.set('detail_address', itemObj.getString('address_detail') ?? itemObj.getString('detail_address') ?? '')
-        addrObj.set('is_default', itemObj.getBoolean('is_default') ?? false)
-        result.push(addrObj as UserAddress)
+        const addr: UserAddress = {
+          id: itemObj.getString('id') ?? '',
+          user_id: itemObj.getString('user_id') ?? '',
+          recipient_name: itemObj.getString('receiver_name') ?? itemObj.getString('recipient_name') ?? '',
+          phone: itemObj.getString('receiver_phone') ?? itemObj.getString('phone') ?? '',
+          province: itemObj.getString('province') ?? '',
+          city: itemObj.getString('city') ?? '',
+          district: itemObj.getString('district') ?? '',
+          detail_address: itemObj.getString('address_detail') ?? itemObj.getString('detail_address') ?? '',
+          is_default: itemObj.getBoolean('is_default') ?? false,
+          label: itemObj.getString('label') ?? '',
+          created_at: itemObj.getString('created_at') ?? '',
+          updated_at: itemObj.getString('updated_at') ?? ''
+        }
+        result.push(addr)
       }
       
       console.log('[getAddresses] 返回地址数量:', result.length)
@@ -3168,9 +3176,22 @@ class SupabaseService {
         const queryData = queryResponse.data as any
         let orderId = ''
         
+        console.log('[CreateOrder] queryData 类型:', typeof queryData, '是否数组:', Array.isArray(queryData))
+        
         if (Array.isArray(queryData) && queryData.length > 0) {
-            const firstItem = queryData[0] as Record<string, any>
-            orderId = firstItem['id'] as string
+            console.log('[CreateOrder] queryData 长度:', queryData.length)
+            const firstItemRaw = queryData[0]
+            console.log('[CreateOrder] firstItemRaw 类型:', typeof firstItemRaw)
+            
+            // 将 firstItemRaw 转换为可访问的对象
+            const firstItemStr = JSON.stringify(firstItemRaw)
+            const firstItemParsed = JSON.parse(firstItemStr)
+            if (firstItemParsed == null) {
+                console.error('[CreateOrder] 解析订单数据失败')
+                return null
+            }
+            const firstItem = firstItemParsed as UTSJSONObject
+            orderId = (firstItem.getString('id') ?? '') as string
             console.log('[CreateOrder] 找到新创建的订单, id:', orderId)
         } else {
             console.error('[CreateOrder] 未找到新创建的订单，插入可能失败')
@@ -3180,12 +3201,21 @@ class SupabaseService {
         console.log('[CreateOrder] 订单创建成功, orderId:', orderId)
         
         const orderItems: UTSJSONObject[] = []
+        console.log('[CreateOrder] orderData.items 类型:', typeof orderData.items, '是否数组:', Array.isArray(orderData.items))
         const rawItems = orderData.items as any[]
+        console.log('[CreateOrder] rawItems 长度:', rawItems.length)
         
         for(let i = 0; i < rawItems.length; i++) {
-            let item: UTSJSONObject
+            console.log('[CreateOrder] 处理商品项', i, '类型:', typeof rawItems[i])
             const rawItem = rawItems[i]
-            item = rawItem as UTSJSONObject
+            const itemStr = JSON.stringify(rawItem)
+            console.log('[CreateOrder] 商品项 JSON:', itemStr)
+            const itemParsed = JSON.parse(itemStr)
+            if (itemParsed == null) {
+                console.error('[CreateOrder] 商品项解析失败')
+                continue
+            }
+            const item = itemParsed as UTSJSONObject
 
             const itemJson = new UTSJSONObject()
             
@@ -3193,19 +3223,21 @@ class SupabaseService {
             if (pId == null) {
               pId = item.get('id')
             }
+            const productId = (pId ?? '') as string
             
             itemJson.set('order_id', orderId)
-            itemJson.set('product_id', pId)
+            itemJson.set('product_id', productId)
             
             const skuIdVal = item.get('sku_id')
             if (skuIdVal != null && skuIdVal !== '') {
-                itemJson.set('sku_id', skuIdVal)
+                itemJson.set('sku_id', skuIdVal as string)
             }
             
-            itemJson.set('product_name', item.get('product_name') ?? '')
+            const productName = (item.get('product_name') ?? '') as string
+            itemJson.set('product_name', productName)
             
             const sName = item.get('sku_name')
-            itemJson.set('sku_name', sName ?? '')
+            itemJson.set('sku_name', (sName ?? '') as string)
             
             const specVal = item.get('specifications')
             let skuSnapshot = '{}'
@@ -3221,7 +3253,7 @@ class SupabaseService {
             
             const img1 = item.get('product_image')
             const img2 = item.get('image_url')
-            let imgUrl = (img1 ?? img2 ?? '') as string
+            let imgUrl = ((img1 ?? img2 ?? '') as string)
             while (imgUrl.indexOf('`') >= 0) {
                 imgUrl = imgUrl.replace('`', '')
             }
@@ -3238,15 +3270,31 @@ class SupabaseService {
         }
         
         console.log('[CreateOrder] 插入订单项数量:', orderItems.length)
-        console.log('[CreateOrder] 订单项数据:', JSON.stringify(orderItems))
         
         for (let j: number = 0; j < orderItems.length; j++) {
+            console.log('[CreateOrder] 开始插入订单项', j)
             const itemJson = orderItems[j]
+            // 将 UTSJSONObject 转换为普通对象
+            console.log('[CreateOrder] 序列化订单项...')
+            const itemObjStr = JSON.stringify(itemJson)
+            console.log('[CreateOrder] 订单项 JSON:', itemObjStr)
+            const itemObjParsed = JSON.parse(itemObjStr)
+            console.log('[CreateOrder] itemObjParsed 类型:', typeof itemObjParsed)
+            if (itemObjParsed == null) {
+                console.error('[CreateOrder] 订单项转换失败')
+                continue
+            }
+            
+            // 使用 UTSJSONObject 而不是 Record<string, any>
+            const itemObj = itemObjParsed as UTSJSONObject
+            console.log('[CreateOrder] 执行 insert...')
+            
             const itemsResponse = await supa
                 .from('ml_order_items')
-                .insert(itemJson)
+                .insert(itemObj)
                 .execute()
-                
+            
+            console.log('[CreateOrder] insert 完成, error:', itemsResponse.error)    
             if (itemsResponse.error != null) {
                 console.error('[CreateOrder] 创建订单项失败:', itemsResponse.error)
             }
@@ -3256,7 +3304,10 @@ class SupabaseService {
         
         const cartItemIds: string[] = []
         for(let i = 0; i < rawItems.length; i++) {
-            const item = rawItems[i] as UTSJSONObject
+            const rawItem = rawItems[i]
+            const itemParsed = JSON.parse(JSON.stringify(rawItem))
+            if (itemParsed == null) continue
+            const item = itemParsed as UTSJSONObject
             const iid = item.getString('id')
             if (iid != null && iid.length > 10) {
                 cartItemIds.push(iid)
@@ -3282,14 +3333,14 @@ class SupabaseService {
         
         let grandTotal = 0.0
         for(let k = 0; k < groups.length; k++) {
-             const g = groups[k] as UTSJSONObject
+             const g = JSON.parse(JSON.stringify(groups[k])) as UTSJSONObject
              // 安全获取 items 数组
              const gItemsRaw = g.get('items')
              if (gItemsRaw == null) continue
              const gItems = gItemsRaw as any[]
              
              for(let gi = 0; gi < gItems.length; gi++) {
-                 const it = gItems[gi] as UTSJSONObject
+                 const it = JSON.parse(JSON.stringify(gItems[gi])) as UTSJSONObject
                  const itPrice = it.getNumber('price') ?? 0
                  const itQty = it.getNumber('quantity') ?? 1
                  grandTotal += itPrice * itQty
@@ -3298,14 +3349,14 @@ class SupabaseService {
         
         // 为每个店铺创建一个订单
         for (let i = 0; i < groups.length; i++) {
-            const group = groups[i] as UTSJSONObject
+            const group = JSON.parse(JSON.stringify(groups[i])) as UTSJSONObject
             const shopItemsRaw = group.get('items')
             if (shopItemsRaw == null) continue
             const shopItems = shopItemsRaw as any[]
             
             let productAmount = 0.0
             for(let j = 0; j < shopItems.length; j++) {
-                const sItem = shopItems[j] as UTSJSONObject
+                const sItem = JSON.parse(JSON.stringify(shopItems[j])) as UTSJSONObject
                 const siPrice = sItem.getNumber('price') ?? 0
                 const siQty = sItem.getNumber('quantity') ?? 1
                 productAmount += siPrice * siQty
@@ -3329,6 +3380,16 @@ class SupabaseService {
 
             const finalMerchantId = (mId != null && mId != '') ? mId : (sId ?? '')
             console.log('[createOrdersByShop] 最终使用的 merchant_id:', finalMerchantId)
+            
+            // 将 shopItems 转换为普通对象数组
+            const plainItems: any[] = []
+            for(let k = 0; k < shopItems.length; k++) {
+                const plainItemRaw = JSON.parse(JSON.stringify(shopItems[k]))
+                if (plainItemRaw != null) {
+                    plainItems.push(plainItemRaw as any)
+                }
+            }
+            console.log('[createOrdersByShop] plainItems 数量:', plainItems.length)
 
             const orderId = await this.createOrder({
                 merchant_id: finalMerchantId,
@@ -3336,7 +3397,7 @@ class SupabaseService {
                 shipping_fee: shopShippingFee,
                 total_amount: shopTotal,
                 shipping_address: params.shipping_address,
-                items: shopItems
+                items: plainItems
             })
             
             if (orderId != null) {
@@ -3362,12 +3423,10 @@ class SupabaseService {
              return empty
           }
           
+          // 关联查询店铺表获取店铺名称
           let query = supa
             .from('ml_orders')
-            .select(`
-                *,
-                ml_order_items (*)
-            `)
+            .select('*, ml_order_items(*), ml_shops(shop_name)')
             .eq('user_id', userId)
             .order('created_at', { ascending: false })
             
@@ -3377,6 +3436,11 @@ class SupabaseService {
           
           const response = await query.execute()
           
+          console.log('[getOrders] response.error:', response.error)
+          if (response.data != null && Array.isArray(response.data)) {
+              console.log('[getOrders] 订单数量:', response.data.length)
+          }
+          
           if (response.error != null) {
               console.error('获取订单列表失败:', response.error)
               const empty: any[] = []
@@ -3405,14 +3469,14 @@ class SupabaseService {
           
           const response = await supa
              .from('ml_orders')
-             .select(`
-                 *,
-                 ml_order_items (*)
-             `)
+             .select('*, ml_order_items(*)')
              .eq('id', orderId)
-             .eq('user_id', userId)
+             .eq('user_id', userId!)
              .limit(1)
              .execute()
+          
+          console.log('[getOrderDetail] response.error:', response.error)
+          console.log('[getOrderDetail] response.data:', JSON.stringify(response.data))
              
           if (response.error != null) {
               console.error('[getOrderDetail] 获取订单详情失败:', response.error)
@@ -3433,7 +3497,35 @@ class SupabaseService {
           
           const orderData = rawList[0]
           console.log('[getOrderDetail] 成功获取订单')
-          return orderData
+          
+          const orderObj = JSON.parse(JSON.stringify(orderData)) as UTSJSONObject
+          
+          const result = new UTSJSONObject()
+          result.set('id', orderObj.get('id') ?? '')
+          result.set('order_no', orderObj.get('order_no') ?? '')
+          result.set('order_status', orderObj.get('order_status') ?? 1)
+          result.set('user_id', orderObj.get('user_id') ?? '')
+          result.set('merchant_id', orderObj.get('merchant_id') ?? '')
+          result.set('product_amount', orderObj.get('product_amount') ?? 0)
+          result.set('shipping_fee', orderObj.get('shipping_fee') ?? 0)
+          result.set('total_amount', orderObj.get('total_amount') ?? 0)
+          result.set('paid_amount', orderObj.get('paid_amount') ?? 0)
+          result.set('discount_amount', orderObj.get('discount_amount') ?? 0)
+          result.set('payment_method', orderObj.get('payment_method') ?? '')
+          result.set('payment_status', orderObj.get('payment_status') ?? 1)
+          result.set('shipping_status', orderObj.get('shipping_status') ?? 1)
+          result.set('created_at', orderObj.get('created_at') ?? '')
+          result.set('paid_at', orderObj.get('paid_at') ?? '')
+          result.set('shipped_at', orderObj.get('shipped_at') ?? '')
+          result.set('completed_at', orderObj.get('completed_at') ?? '')
+          result.set('shipping_address', orderObj.get('shipping_address'))
+          result.set('ml_order_items', orderObj.get('ml_order_items'))
+          // 添加物流信息
+          result.set('tracking_no', orderObj.get('tracking_no') ?? '')
+          result.set('carrier_name', orderObj.get('carrier_name') ?? '')
+          result.set('delivered_at', orderObj.get('delivered_at') ?? '')
+          
+          return result
       } catch (e) {
           console.error('[getOrderDetail] 获取订单详情异常:', e)
           return null
@@ -3537,7 +3629,7 @@ class SupabaseService {
       const userId = this.getCurrentUserId()
       if (userId == null) return { success: false, message: '请先登录' }
       
-      const d = data as UTSJSONObject
+      const d = JSON.parse(JSON.stringify(data)) as UTSJSONObject
       const orderId = d.getString('order_id')
       const refundType = d.getNumber('refund_type')
       const refundReason = d.getString('refund_reason')
@@ -3578,7 +3670,7 @@ class SupabaseService {
   async rePurchase(order: any): Promise<boolean> {
       try {
           // 将 order 转换为 UTSJSONObject 以安全访问属性
-          const orderObj = order as UTSJSONObject
+          const orderObj = JSON.parse(JSON.stringify(order)) as UTSJSONObject
           // 尝试获取 ml_order_items 或 items
           let itemsKey = 'ml_order_items'
           let itemsRaw = orderObj.get(itemsKey)
@@ -3597,7 +3689,7 @@ class SupabaseService {
           // 简单的循环添加，实际项目中可以优化为批量插入
           for (let i = 0; i < items.length; i++) {
              // 同样，item 也是 UTSJSONObject 或支持访问的对象
-             const item = items[i] as UTSJSONObject
+             const item = JSON.parse(JSON.stringify(items[i])) as UTSJSONObject
              const productId = item.getString('product_id') 
              const skuId = item.getString('sku_id')
              // 数量可能是数字或字符串
@@ -4157,12 +4249,11 @@ class SupabaseService {
           console.log(`[ToggleFav] Current status: ${exists}`)
           
           if (exists) {
-              // Delete
               const response = await supa
                 .from('ml_user_favorites')
                 .eq('user_id', userId!)
                 .eq('target_id', productId)
-                .eq('target_type', 1)
+                .eq('target_type', '1')
                 .delete()
                 .execute()
                 
@@ -4172,13 +4263,12 @@ class SupabaseService {
               }
               return false // 已取消收藏
           } else {
-              // Add
               const response = await supa
                 .from('ml_user_favorites')
                 .insert({
                     user_id: userId,
                     target_id: productId,
-                    target_type: 1,
+                    target_type: '1',
                     created_at: new Date().toISOString()
                 })
                 .execute()
@@ -4209,7 +4299,7 @@ class SupabaseService {
             .from('ml_user_favorites')
             .select('*')
             .eq('user_id', userId!)
-            .eq('target_type', 1)
+            .eq('target_type', '1')
             .order('created_at', { ascending: false })
             .execute()
             
@@ -4227,12 +4317,22 @@ class SupabaseService {
          const productIds: string[] = []
          for (let i = 0; i < favorites.length; i++) {
              let item: any = favorites[i]
-             let pid = ''
+             let itemObj: UTSJSONObject
              if (item instanceof UTSJSONObject) {
-                 pid = item.getString('target_id') ?? ''
+                 itemObj = item as UTSJSONObject
              } else {
-                 const itemObj = JSON.parse(JSON.stringify(item)) as UTSJSONObject
-                 pid = itemObj.getString('target_id') ?? ''
+                 itemObj = JSON.parse(JSON.stringify(item)) as UTSJSONObject
+             }
+             
+             // target_id 可能是 Integer 或 String 类型，需要安全转换
+             const targetIdRaw = itemObj.get('target_id')
+             let pid = ''
+             if (targetIdRaw != null) {
+                 if (typeof targetIdRaw === 'string') {
+                     pid = targetIdRaw as string
+                 } else if (typeof targetIdRaw === 'number') {
+                     pid = (targetIdRaw as number).toString()
+                 }
              }
              if (pid !== '') productIds.push(pid)
          }
@@ -4274,16 +4374,24 @@ class SupabaseService {
              let newItem: UTSJSONObject
              
              if (item instanceof UTSJSONObject) {
-                 // Deep copy to ensure we have a fresh object to modify
                  newItem = JSON.parse(JSON.stringify(item)) as UTSJSONObject
              } else {
                  newItem = JSON.parse(JSON.stringify(item)) as UTSJSONObject
              }
              
-             let targetId = newItem.getString('target_id')
-             // Careful with null targetId
-             if (targetId != null) {
-                 const product = productMap.get(targetId as string)
+             // target_id 可能是 Integer 或 String 类型，需要安全转换
+             const targetIdRaw = newItem.get('target_id')
+             let targetId = ''
+             if (targetIdRaw != null) {
+                 if (typeof targetIdRaw === 'string') {
+                     targetId = targetIdRaw as string
+                 } else if (typeof targetIdRaw === 'number') {
+                     targetId = (targetIdRaw as number).toString()
+                 }
+             }
+             
+             if (targetId !== '') {
+                 const product = productMap.get(targetId)
                  if (product != null) {
                      newItem.set('ml_products', product)
                      result.push(newItem)
@@ -4689,12 +4797,9 @@ class SupabaseService {
       // 如果没有 view，可能需要改为两个查询或者使用 left join
       const response = await supa
         .from('ml_user_coupons')
-        .select(`
-          *,
-          template:ml_coupon_templates(name, amount, min_spend)
-        `)
+        .select('*, template:ml_coupon_templates(name, amount, min_spend)')
         .eq('user_id', userId!)
-        .eq('status', status)
+        .eq('status', status.toString())
         .order('expire_at', { ascending: true })
         .execute()
 
@@ -4789,9 +4894,9 @@ class SupabaseService {
         .from('ml_user_coupons')
         .select('id', { count: 'exact' })
         .eq('user_id', userId!)
-        .eq('status', 1) // 1: unused
-        .gt('expire_at', new Date().toISOString()) // 未过期
-        .limit(1) // Limit to 1 to reduce data transfer, we only want the count
+        .eq('status', '1')
+        .gt('expire_at', new Date().toISOString())
+        .limit(1)
         .execute()
 
       if (response.error != null) {