diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 00000000..8ae452a8
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,9 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
+    ]
+}
diff --git a/components/supadb/aksupa.uts b/components/supadb/aksupa.uts
index 13c16bcc..c47057f4 100644
--- a/components/supadb/aksupa.uts
+++ b/components/supadb/aksupa.uts
@@ -1042,4 +1042,13 @@ function buildSupabaseFilterQuery(filter : UTSJSONObject | null) : string {
 	return params.join('&');
 }
 
+/**
+ * 创建 Supabase 客户端实例
+ * @param url 项目 URL
+ * @param key 项目匿名密钥 (Anon Key)
+ */
+export function createClient(url : string, key : string) : AkSupa {
+	return new AkSupa(url, key);
+}
+
 export default AkSupa;
\ No newline at end of file
diff --git a/components/supadb/aksupainstance - 副本.uts b/components/supadb/aksupainstance - 副本.uts
new file mode 100644
index 00000000..a47b3f3e
--- /dev/null
+++ b/components/supadb/aksupainstance - 副本.uts	
@@ -0,0 +1,18 @@
+//import AkSupa from './aksupa.uts'
+//import { SUPA_URL, SUPA_KEY } from '@/ak/config.uts'
+
+//const supa = new AkSupa(SUPA_URL, SUPA_KEY)
+
+//const supaReady: Promise<boolean> = (async () => {
+///	try {
+		// await supa.signIn('akoo@163.com', 'Hf2152111')
+//		await supa.signIn('am@163.com', 'kookoo')
+//		return true
+//	} catch (err) {
+//		console.error('Supabase auto sign-in failed', err)
+//		return false
+//	}
+//})()
+
+//export { supaReady }
+//export default supa
\ No newline at end of file
diff --git a/components/supadb/aksupainstance.uts b/components/supadb/aksupainstance.uts
index e0a9a11e..1e8d8d40 100644
--- a/components/supadb/aksupainstance.uts
+++ b/components/supadb/aksupainstance.uts
@@ -1,3 +1,34 @@
+// /components/supadb/aksupainstance.uts
+import { createClient } from './aksupa.uts'
+
+// 创建并导出 Supabase 客户端实例
+const supabaseUrl = 'https://your-project.supabase.co' // 替换为你的 Supabase URL
+const supabaseAnonKey = 'your-anon-key' // 替换为你的匿名密钥
+
+export const supabase = createClient(supabaseUrl, supabaseAnonKey)
+
+// 导出 Supabase 实例就绪状态
+export const isSupabaseReady = true
+
+// 如果有其他需要导出的函数，可以这样导出：
+export function initializeSupabase(url: string, key: string) {
+    return createClient(url, key)
+}
+
+// 检查连接状态的函数
+export function checkConnection() {
+    return new Promise((resolve) => {
+        // 模拟连接检查
+        setTimeout(() => {
+            resolve(true)
+        }, 500)
+    })
+}
+
+// 不再使用 supaready 变量，而是提供函数
+export async function ensureSupabaseReady() {
+    return await checkConnection()
+}
 import AkSupa from './aksupa.uts'
 import { SUPA_URL, SUPA_KEY } from '@/ak/config.uts'
 
diff --git a/main - 副本.uts b/main - 副本.uts
new file mode 100644
index 00000000..234c8c9b
--- /dev/null
+++ b/main - 副本.uts	
@@ -0,0 +1,14 @@
+import { createSSRApp } from 'vue'
+import App from './App.uvue'
+import i18n from '@/uni_modules/i18n/index.uts'
+
+export function createApp() {
+  const app = createSSRApp(App)
+  
+  // 注册 i18n 全局属性，使组件可以使用 $t 方法
+  app.config.globalProperties.$t = (key: string, values?: any, locale?: string): string => {
+    return i18n.global.t(key, values, locale)
+  }
+  
+  return { app }
+}
diff --git a/main.uts b/main.uts
index 0ab5b030..da42848e 100644
--- a/main.uts
+++ b/main.uts
@@ -4,11 +4,15 @@ import App from './App.uvue'
 
 export function createApp() {
   const app = createSSRApp(App)
-
-  // 简化的$t方法
-  app.config.globalProperties.$t = (key: string): string => {
-    return key // 直接返回key，不进行翻译
-  }
-
+  
+  // 注册 i18n 全局属性，使组件可以使用 $t 方法
+	app.config.globalProperties.$t = (key: string, values?: any, locale?: string): string => {
+		if (!i18n.global) {
+			console.error('i18n is not initialized')
+			return key
+		}
+		return i18n.global.t(key, values, locale) || key
+	}
+  
   return { app }
 }
diff --git a/package.json b/package.json
index 34faeaf5..5c2a48a3 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,10 @@
 {
+  "name": "mall",
+  "private": true,
   "dependencies": {
     "echarts": "^6.0.0"
   },
   "devDependencies": {
     "@dcloudio/types": "^3.4.29"
   }
-}
+}
\ No newline at end of file
diff --git a/pages - 副本 (2).json b/pages - 副本 (2).json
new file mode 100644
index 00000000..765ececb
--- /dev/null
+++ b/pages - 副本 (2).json	
@@ -0,0 +1,118 @@
+{
+  "pages": [
+    // 消费者端页面
+    {
+      "path": "pages/mall/consumer/index",
+      "style": {
+        "navigationBarTitleText": "商城首页",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/mall/consumer/category",
+      "style": {
+        "navigationBarTitleText": "商品分类"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/search",
+      "style": {
+        "navigationBarTitleText": "搜索商品",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/product-detail",
+      "style": {
+        "navigationBarTitleText": "商品详情"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/cart",
+      "style": {
+        "navigationBarTitleText": "购物车"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/orders",
+      "style": {
+        "navigationBarTitleText": "我的订单",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/mall/consumer/order-detail",
+      "style": {
+        "navigationBarTitleText": "订单详情"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/address",
+      "style": {
+        "navigationBarTitleText": "收货地址"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/address-edit",
+      "style": {
+        "navigationBarTitleText": "编辑地址"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/coupons",
+      "style": {
+        "navigationBarTitleText": "我的优惠券"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/favorites",
+      "style": {
+        "navigationBarTitleText": "我的收藏"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/profile",
+      "style": {
+        "navigationBarTitleText": "个人中心"
+      }
+    }
+  ],
+  "tabBar": {
+    "color": "#999999",
+    "selectedColor": "#007aff",
+    "backgroundColor": "#ffffff",
+    "borderStyle": "black",
+    "list": [
+      {
+        "pagePath": "pages/mall/consumer/index",
+        "text": "首页",
+        "iconPath": "static/tab-home.png",
+        "selectedIconPath": "static/tab-home-active.png"
+      },
+      {
+        "pagePath": "pages/mall/consumer/category",
+        "text": "分类",
+        "iconPath": "static/tab-category.png",
+        "selectedIconPath": "static/tab-category-active.png"
+      },
+      {
+        "pagePath": "pages/mall/consumer/cart",
+        "text": "购物车",
+        "iconPath": "static/tab-cart.png",
+        "selectedIconPath": "static/tab-cart-active.png"
+      },
+      {
+        "pagePath": "pages/mall/consumer/orders",
+        "text": "订单",
+        "iconPath": "static/tab-order.png",
+        "selectedIconPath": "static/tab-order-active.png"
+      },
+      {
+        "pagePath": "pages/mall/consumer/profile",
+        "text": "我的",
+        "iconPath": "static/tab-profile.png",
+        "selectedIconPath": "static/tab-profile-active.png"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pages - 副本.json b/pages - 副本.json
new file mode 100644
index 00000000..fed5ab00
--- /dev/null
+++ b/pages - 副本.json	
@@ -0,0 +1,213 @@
+{
+  "pages": [
+    {
+      "path": "pages/mall/consumer/index",
+      "style": {
+        "navigationBarTitleText": "商城首页",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/user/boot",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/user/login",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/user/register",
+      "style": {
+        "navigationBarTitleText": "注册"
+      }
+    },
+    {
+      "path": "pages/user/forgot-password",
+      "style": {
+        "navigationBarTitleText": "忘记密码"
+      }
+    },
+    {
+      "path": "pages/user/center",
+      "style": {
+        "navigationBarTitleText": "用户中心"
+      }
+    },
+    {
+      "path": "pages/user/profile",
+      "style": {
+        "navigationBarTitleText": "个人资料"
+      }
+    },
+    {
+      "path": "pages/user/terms",
+      "style": {
+        "navigationBarTitleText": "用户协议与隐私政策"
+      }
+    },
+    {
+      "path": "pages/mall/merchant/index",
+      "style": {
+        "navigationBarTitleText": "商家中心",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/mall/delivery/index",
+      "style": {
+        "navigationBarTitleText": "配送中心",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/mall/admin/index",
+      "style": {
+        "navigationBarTitleText": "管理后台",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/mall/service/index",
+      "style": {
+        "navigationBarTitleText": "客服工作台",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/mall/analytics/index",
+      "style": {
+        "navigationBarTitleText": "数据分析",
+        "navigationStyle": "custom"
+      }
+    }
+  ],
+  "subPackages": [
+    {
+      "root": "pages/mall",
+      "pages": [
+        {
+          "path": "consumer/product-detail",
+          "style": {
+            "navigationBarTitleText": "商品详情"
+          }
+        },
+        {
+          "path": "consumer/order-detail",
+          "style": {
+            "navigationBarTitleText": "订单详情"
+          }
+        },
+        {
+          "path": "consumer/profile",
+          "style": {
+            "navigationBarTitleText": "个人中心"
+          }
+        },
+        {
+          "path": "consumer/subscription/plan-list",
+          "style": {
+            "navigationBarTitleText": "软件订阅"
+          }
+        },
+        {
+          "path": "consumer/subscription/plan-detail",
+          "style": {
+            "navigationBarTitleText": "订阅详情"
+          }
+        },
+        {
+          "path": "consumer/subscription/subscribe-checkout",
+          "style": {
+            "navigationBarTitleText": "确认订阅"
+          }
+        },
+        {
+          "path": "consumer/subscription/my-subscriptions",
+          "style": {
+            "navigationBarTitleText": "我的订阅"
+          }
+        },
+        {
+          "path": "admin/subscription/plan-management",
+          "style": {
+            "navigationBarTitleText": "订阅方案管理"
+          }
+        },
+        {
+          "path": "admin/subscription/user-subscriptions",
+          "style": {
+            "navigationBarTitleText": "用户订阅管理"
+          }
+        },
+        {
+          "path": "nfc/security/index",
+          "style": {
+            "navigationBarTitleText": "安保工作台",
+            "enablePullDownRefresh": true,
+            "backgroundColor": "#f8f9fa"
+          }
+        }
+      ]
+    }
+  ],
+  "tabBar": {
+    "custom": true,
+    "color": "#7A7E83",
+    "selectedColor": "#3cc51f",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/mall/consumer/index",
+        "iconPath": "static/tab-home.png",
+        "selectedIconPath": "static/tab-home-current.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/mall/consumer/category",
+        "iconPath": "static/tab-category.png",
+        "selectedIconPath": "static/tab-category-current.png",
+        "text": "分类"
+      },
+      {
+        "pagePath": "pages/mall/consumer/cart",
+        "iconPath": "static/tab-cart.png",
+        "selectedIconPath": "static/tab-cart-current.png",
+        "text": "购物车"
+      },
+      {
+        "pagePath": "pages/mall/consumer/profile",
+        "iconPath": "static/tab-profile.png",
+        "selectedIconPath": "static/tab-profile-current.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "mall",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#F8F8F8"
+  },
+  "condition": {
+    "current": 0,
+    "list": [
+      {
+        "name": "消费者端首页",
+        "path": "pages/mall/consumer/index"
+      },
+      {
+        "name": "启动页（登录态判断）",
+        "path": "pages/user/boot"
+      },
+      {
+        "name": "登录页",
+        "path": "pages/user/login"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6abc7efb..09aa09e6 100644
--- a/pages.json
+++ b/pages.json
@@ -1,66 +1,130 @@
 {
   "pages": [
     {
-      "path": "pages/mall/consumer/index",
+			"path": "pages/mall/consumer/index",
       "style": {
-        "navigationBarTitleText": "商城首页",
+        "navigationBarTitleText": "首页",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+			"path": "pages/mall/consumer/settings",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
+		{
+			"path": "pages/mall/consumer/wallet",
+			"style": {
+				"navigationBarTitleText": "我的钱包"
+			}
+		},
+		{
+			"path": "pages/user/login",
+			"style": {
+				"navigationBarTitleText": "用户登录",
+				"navigationStyle": "custom"
+			}
+		},
+    {
+      "path": "pages/mall/consumer/category",
+      "style": {
+        "navigationBarTitleText": "分类"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/messages",
+      "style": {
+        "navigationBarTitleText": "消息",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/mall/consumer/cart",
+      "style": {
+        "navigationBarTitleText": "购物车"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/profile",
+      "style": {
+        "navigationBarTitleText": "我的"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/search",
+      "style": {
+        "navigationBarTitleText": "搜索",
         "navigationStyle": "custom"
       }
     },
     {
-      "path": "pages/user/boot",
+      "path": "pages/mall/consumer/product-detail",
       "style": {
-        "navigationBarTitleText": ""
+        "navigationBarTitleText": "商品详情"
       }
     },
     {
-      "path": "pages/user/login",
+      "path": "pages/mall/consumer/shop-detail",
       "style": {
-        "navigationBarTitleText": "登录"
+        "navigationBarTitleText": "店铺详情"
       }
     },
     {
-      "path": "pages/user/register",
+      "path": "pages/mall/consumer/coupons",
       "style": {
-        "navigationBarTitleText": "注册"
+        "navigationBarTitleText": "我的优惠券"
       }
     },
     {
-      "path": "pages/user/forgot-password",
+      "path": "pages/mall/consumer/favorites",
       "style": {
-        "navigationBarTitleText": "忘记密码"
+        "navigationBarTitleText": "我的收藏"
       }
     },
     {
-      "path": "pages/user/center",
+      "path": "pages/mall/consumer/footprint",
       "style": {
-        "navigationBarTitleText": "用户中心"
+        "navigationBarTitleText": "我的足迹"
       }
     },
     {
-      "path": "pages/user/profile",
+      "path": "pages/mall/consumer/address-list",
       "style": {
-        "navigationBarTitleText": "个人资料"
+        "navigationBarTitleText": "收货地址"
       }
     },
     {
-      "path": "pages/user/terms",
+      "path": "pages/mall/consumer/address-edit",
       "style": {
-        "navigationBarTitleText": "用户协议与隐私政策"
+        "navigationBarTitleText": "编辑地址"
       }
     },
     {
-      "path": "pages/mall/merchant/index",
+      "path": "pages/mall/consumer/checkout",
       "style": {
-        "navigationBarTitleText": "商家中心",
+        "navigationBarTitleText": "确认订单"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/payment",
+      "style": {
+        "navigationBarTitleText": "收银台"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/payment-success",
+      "style": {
+        "navigationBarTitleText": "支付成功",
         "navigationStyle": "custom"
       }
     },
     {
-      "path": "pages/mall/delivery/index",
+      "path": "pages/mall/consumer/orders",
       "style": {
-        "navigationBarTitleText": "配送中心",
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "我的订单",
+        "enablePullDownRefresh": true
       }
     },
 	{
@@ -162,150 +226,85 @@
       }
     },
     {
-      "path": "pages/mall/admin/index",
+      "path": "pages/mall/consumer/order-detail",
       "style": {
-        "navigationBarTitleText": "管理后台",
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "订单详情"
       }
     },
     {
-      "path": "pages/mall/service/index",
+      "path": "pages/mall/consumer/logistics",
       "style": {
-        "navigationBarTitleText": "客服工作台",
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "物流详情"
       }
     },
     {
-      "path": "pages/mall/analytics/index",
+      "path": "pages/mall/consumer/review",
       "style": {
-        "navigationBarTitleText": "数据分析",
+        "navigationBarTitleText": "评价晒单"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/refund",
+      "style": {
+        "navigationBarTitleText": "退款/售后"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/apply-refund",
+      "style": {
+        "navigationBarTitleText": "申请售后"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/refund-review",
+      "style": {
+        "navigationBarTitleText": "服务评价"
+      }
+    },
+    {
+      "path": "pages/mall/consumer/chat",
+      "style": {
+        "navigationBarTitleText": "客服聊天",
         "navigationStyle": "custom"
       }
     }
   ],
-  "subPackages": [
-    {
-      "root": "pages/mall",
-      "pages": [
-        {
-          "path": "consumer/product-detail",
-          "style": {
-            "navigationBarTitleText": "商品详情"
-          }
-        },
-        {
-          "path": "consumer/order-detail",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          }
-        },
-        {
-          "path": "consumer/profile",
-          "style": {
-            "navigationBarTitleText": "个人中心"
-          }
-        },
-        {
-          "path": "consumer/subscription/plan-list",
-          "style": {
-            "navigationBarTitleText": "软件订阅"
-          }
-        },
-        {
-          "path": "consumer/subscription/plan-detail",
-          "style": {
-            "navigationBarTitleText": "订阅详情"
-          }
-        },
-        {
-          "path": "consumer/subscription/subscribe-checkout",
-          "style": {
-            "navigationBarTitleText": "确认订阅"
-          }
-        },
-        {
-          "path": "consumer/subscription/my-subscriptions",
-          "style": {
-            "navigationBarTitleText": "我的订阅"
-          }
-        },
-        {
-          "path": "admin/subscription/plan-management",
-          "style": {
-            "navigationBarTitleText": "订阅方案管理"
-          }
-        },
-        {
-          "path": "admin/subscription/user-subscriptions",
-          "style": {
-            "navigationBarTitleText": "用户订阅管理"
-          }
-        },
-        {
-          "path": "nfc/security/index",
-          "style": {
-            "navigationBarTitleText": "安保工作台",
-            "enablePullDownRefresh": true,
-            "backgroundColor": "#f8f9fa"
-          }
-        }
-      ]
-    }
-  ],
   "tabBar": {
-    "custom": true,
-    "color": "#7A7E83",
-    "selectedColor": "#3cc51f",
-    "borderStyle": "black",
+    "color": "#999999",
+    "selectedColor": "#ff5000",
     "backgroundColor": "#ffffff",
+    "borderStyle": "black",
     "list": [
       {
         "pagePath": "pages/mall/consumer/index",
-        "iconPath": "static/tab-home.png",
-        "selectedIconPath": "static/tab-home-current.png",
-        "text": "首页"
+        "text": "首页",
+        "iconPath": "static/tabbar/home.png",
+        "selectedIconPath": "static/tabbar/home-active.png"
       },
       {
         "pagePath": "pages/mall/consumer/category",
-        "iconPath": "static/tab-category.png",
-        "selectedIconPath": "static/tab-category-current.png",
-        "text": "分类"
+        "text": "分类",
+        "iconPath": "static/tabbar/category.png",
+        "selectedIconPath": "static/tabbar/category-active.png"
+      },
+      {
+        "pagePath": "pages/mall/consumer/messages",
+        "text": "消息",
+        "iconPath": "static/tabbar/messages.png",
+        "selectedIconPath": "static/tabbar/messages-active.png"
       },
       {
         "pagePath": "pages/mall/consumer/cart",
-        "iconPath": "static/tab-cart.png",
-        "selectedIconPath": "static/tab-cart-current.png",
-        "text": "购物车"
+        "text": "购物车",
+        "iconPath": "static/tabbar/cart.png",
+        "selectedIconPath": "static/tabbar/cart-active.png"
       },
       {
         "pagePath": "pages/mall/consumer/profile",
-        "iconPath": "static/tab-profile.png",
-        "selectedIconPath": "static/tab-profile-current.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "mall",
-    "navigationBarBackgroundColor": "#FFFFFF",
-    "backgroundColor": "#F8F8F8"
-  },
-  "condition": {
-    "current": 0,
-    "list": [
-      {
-        "name": "消费者端首页",
-        "path": "pages/mall/consumer/index"
-      },
-      {
-        "name": "启动页（登录态判断）",
-        "path": "pages/user/boot"
-      },
-      {
-        "name": "登录页",
-        "path": "pages/user/login"
+        "text": "我的",
+        "iconPath": "static/tabbar/profile.png",
+        "selectedIconPath": "static/tabbar/profile-active.png"
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/pages/mall/consumer/address-edit.uvue b/pages/mall/consumer/address-edit.uvue
new file mode 100644
index 00000000..18ee45d0
--- /dev/null
+++ b/pages/mall/consumer/address-edit.uvue
@@ -0,0 +1,360 @@
+<template>
+  <view class="address-edit-page">
+    <view class="form-group">
+      <view class="form-item">
+        <text class="label">收货人</text>
+        <input class="input" v-model="formData.name" placeholder="请填写收货人姓名" />
+      </view>
+      <view class="form-item">
+        <text class="label">手机号码</text>
+        <input class="input" v-model="formData.phone" type="number" maxlength="11" placeholder="请填写手机号码" />
+      </view>
+      <view class="form-item">
+        <text class="label">所在地区</text>
+        <input class="input" v-model="regionString" placeholder="省市区县、乡镇等" />
+      </view>
+      <view class="form-item">
+        <text class="label">详细地址</text>
+        <input class="input" v-model="formData.detail" placeholder="街道、楼牌号等" />
+      </view>
+    </view>
+    
+    <view class="form-group">
+      <view class="form-item">
+        <text class="label">智能填写</text>
+        <textarea class="smart-textarea" v-model="smartInput" placeholder="粘贴姓名+电话+地址，自动识别填充" @input="parseSmartInput" maxlength="200"></textarea>
+        <text class="smart-tip">示例：张三 13800138000 北京市朝阳区三里屯SOHO A座</text>
+      </view>
+      <view class="form-item">
+        <text class="label">标签</text>
+        <view class="tags-container">
+          <text 
+            v-for="tag in tags" 
+            :key="tag" 
+            class="tag-item"
+            :class="{ active: formData.label === tag }"
+            @click="selectTag(tag)"
+          >{{ tag }}</text>
+        </view>
+      </view>
+      <view class="form-item switch-item">
+        <text class="label">设为默认收货地址</text>
+        <switch :checked="formData.isDefault" color="#ff5000" @change="onSwitchChange" />
+      </view>
+    </view>
+    
+    <view class="footer-btn">
+      <button class="save-btn" @click="saveAddress">保存</button>
+      <button v-if="isEdit" class="delete-btn" @click="deleteAddress">删除收货地址</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+
+type Address = {
+  id: string
+  name: string
+  phone: string
+  province: string
+  city: string
+  district: string
+  detail: string
+  isDefault: boolean
+  label?: string
+}
+
+const isEdit = ref(false)
+const addressId = ref('')
+const regionString = ref('')
+const tags = ['家', '公司', '学校']
+const smartInput = ref('')
+
+const formData = reactive({
+  name: '',
+  phone: '',
+  detail: '',
+  isDefault: false,
+  label: ''
+} as {
+    name: string
+    phone: string
+    detail: string
+    isDefault: boolean
+    label: string
+})
+
+onLoad((options) => {
+  if (options['id']) {
+    isEdit.value = true
+    addressId.value = options['id'] as string
+    loadAddress(addressId.value)
+  }
+})
+
+const loadAddress = (id: string) => {
+  const storedAddresses = uni.getStorageSync('addresses')
+  if (storedAddresses) {
+    const addresses = JSON.parse(storedAddresses as string) as Address[]
+    const address = addresses.find(item => item.id === id)
+    if (address) {
+      formData.name = address.name
+      formData.phone = address.phone
+      formData.detail = address.detail
+      formData.isDefault = address.isDefault
+      formData.label = address.label || ''
+      regionString.value = `${address.province} ${address.city} ${address.district}`.trim()
+    }
+  }
+}
+
+const selectTag = (tag: string) => {
+  if (formData.label === tag) {
+    formData.label = ''
+  } else {
+    formData.label = tag
+  }
+}
+
+const onSwitchChange = (e: UniSwitchChangeEvent) => {
+  formData.isDefault = e.detail.value
+}
+
+const saveAddress = () => {
+  if (!formData.name) {
+    uni.showToast({ title: '请填写收货人', icon: 'none' })
+    return
+  }
+  if (!formData.phone) {
+    uni.showToast({ title: '请填写手机号码', icon: 'none' })
+    return
+  }
+  if (!regionString.value) {
+    uni.showToast({ title: '请填写所在地区', icon: 'none' })
+    return
+  }
+  if (!formData.detail) {
+    uni.showToast({ title: '请填写详细地址', icon: 'none' })
+    return
+  }
+  
+  // 简单解析地区（这里简化处理，实际应使用选择器）
+  const regions = regionString.value.split(' ')
+  const province = regions[0] || ''
+  const city = regions[1] || ''
+  const district = regions.slice(2).join(' ') || ''
+
+  const storedAddresses = uni.getStorageSync('addresses')
+  let addresses: Address[] = []
+  if (storedAddresses) {
+    try {
+      addresses = JSON.parse(storedAddresses as string) as Address[]
+    } catch (e) {
+      addresses = []
+    }
+  }
+  
+  // 如果设为默认，取消其他默认
+  if (formData.isDefault) {
+    addresses.forEach(item => {
+      item.isDefault = false
+    })
+  }
+  
+  if (isEdit.value) {
+    const index = addresses.findIndex(item => item.id === addressId.value)
+    if (index !== -1) {
+      addresses[index] = {
+        ...addresses[index],
+        name: formData.name,
+        phone: formData.phone,
+        province: province,
+        city: city,
+        district: district,
+        detail: formData.detail,
+        isDefault: formData.isDefault,
+        label: formData.label
+      }
+    }
+  } else {
+    const newAddress: Address = {
+      id: `addr_${Date.now()}`,
+      name: formData.name,
+      phone: formData.phone,
+      province: province,
+      city: city,
+      district: district,
+      detail: formData.detail,
+      isDefault: formData.isDefault,
+      label: formData.label
+    }
+    // 如果是第一个地址，自动设为默认
+    if (addresses.length === 0) {
+      newAddress.isDefault = true
+    }
+    addresses.push(newAddress)
+  }
+  
+  uni.setStorageSync('addresses', JSON.stringify(addresses))
+  
+  uni.showToast({
+    title: '保存成功',
+    icon: 'success'
+  })
+  
+  setTimeout(() => {
+    uni.navigateBack()
+  }, 1500)
+}
+
+const parseSmartInput = () => {
+  const input = smartInput.value.trim()
+  if (!input) return
+  
+  // 提取手机号
+  const phoneRegex = /(1[3-9]\d{9})/
+  const phoneMatch = input.match(phoneRegex)
+  if (phoneMatch) {
+    formData.phone = phoneMatch[0]
+  }
+  
+  // 提取姓名（取第一个2-4位中文）
+  const nameRegex = /([\u4e00-\u9fa5]{2,4})/
+  const nameMatch = input.match(nameRegex)
+  if (nameMatch) {
+    formData.name = nameMatch[0]
+  }
+  
+  // 去掉姓名和电话后剩余作为地址
+  let addrText = input
+  if (formData.name) addrText = addrText.replace(formData.name, '')
+  if (formData.phone) addrText = addrText.replace(formData.phone, '')
+  addrText = addrText.replace(/[，,;；\s]+/g, ' ').trim()
+  
+  // 解析省市区
+  const pattern1 = /^(.*?省)?(.*?市)?(.*?[区县])?(.*)$/
+  const m = addrText.match(pattern1)
+  if (m) {
+    const [, province, city, district, detail] = m
+    regionString.value = `${(province||'').trim()} ${(city||'').trim()} ${(district||'').trim()}`.trim()
+    formData.detail = (detail||'').trim()
+  } else {
+    formData.detail = addrText
+  }
+}
+const deleteAddress = () => {
+  uni.showModal({
+    title: '提示',
+    content: '确定要删除该地址吗？',
+    success: (res) => {
+      if (res.confirm) {
+        const storedAddresses = uni.getStorageSync('addresses')
+        if (storedAddresses) {
+          let addresses = JSON.parse(storedAddresses as string) as Address[]
+          addresses = addresses.filter(item => item.id !== addressId.value)
+          uni.setStorageSync('addresses', JSON.stringify(addresses))
+          
+          uni.showToast({
+            title: '删除成功',
+            icon: 'success'
+          })
+          
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1500)
+        }
+      }
+    }
+  })
+}
+</script>
+
+<style>
+.address-edit-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding-top: 15px;
+}
+
+.form-group {
+  background-color: white;
+  margin-bottom: 15px;
+  padding: 0 15px;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #f5f5f5;
+  padding: 15px 0;
+}
+
+.form-item:last-child {
+  border-bottom: none;
+}
+
+.label {
+  width: 80px;
+  font-size: 15px;
+  color: #333;
+}
+
+.input {
+  flex: 1;
+  font-size: 15px;
+  color: #333;
+}
+
+.switch-item {
+  justify-content: space-between;
+}
+
+.tags-container {
+  flex: 1;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.tag-item {
+  font-size: 12px;
+  color: #666;
+  border: 1px solid #ddd;
+  padding: 4px 12px;
+  border-radius: 15px;
+  margin-right: 10px;
+}
+
+.tag-item.active {
+  background-color: #ff5000;
+  color: white;
+  border-color: #ff5000;
+}
+
+.footer-btn {
+  margin-top: 30px;
+  padding: 0 15px;
+}
+
+.save-btn {
+  background-color: #ff5000;
+  color: white;
+  border-radius: 25px;
+  font-size: 16px;
+  height: 44px;
+  line-height: 44px;
+  border: none;
+  margin-bottom: 15px;
+}
+
+.delete-btn {
+  background-color: white;
+  color: #333;
+  border-radius: 25px;
+  font-size: 16px;
+  height: 44px;
+  line-height: 44px;
+  border: 1px solid #ddd;
+}
+</style>
diff --git a/pages/mall/consumer/address-list.uvue b/pages/mall/consumer/address-list.uvue
new file mode 100644
index 00000000..67c6133d
--- /dev/null
+++ b/pages/mall/consumer/address-list.uvue
@@ -0,0 +1,307 @@
+<template>
+  <view class="address-list-page">
+    <view class="address-list">
+      <view v-if="addresses.length === 0" class="empty-state">
+        <text class="empty-icon">📍</text>
+        <text class="empty-text">暂无收货地址</text>
+      </view>
+      
+      <view v-else v-for="(item, index) in addresses" :key="item.id" class="address-item" @click="selectAddress(item)">
+        <view class="item-content">
+          <view class="item-header">
+            <text class="user-name">{{ item.name }}</text>
+            <text class="user-phone">{{ item.phone }}</text>
+            <text v-if="item.isDefault" class="default-tag">默认</text>
+            <text v-if="item.label" class="label-tag">{{ item.label }}</text>
+          </view>
+          <text class="address-text">{{ getFullAddress(item) }}</text>
+        </view>
+        <view class="item-actions">
+            <view class="action-item" @click.stop="editAddress(item.id)">
+                <text class="action-icon">📝</text>
+            </view>
+            <view class="action-item" @click.stop="deleteAddress(item.id)">
+                <text class="action-icon">�️</text>
+            </view>
+        </view>
+      </view>
+    </view>
+    
+    <view class="footer-btn">
+      <button class="add-btn" @click="addAddress">新建收货地址</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+
+type Address = {
+  id: string
+  name: string
+  phone: string
+  province: string
+  city: string
+  district: string
+  detail: string
+  isDefault: boolean
+  label?: string
+}
+
+const addresses = ref<Address[]>([])
+const selectionMode = ref<boolean>(false)
+let openerEventChannel: any = null
+
+onShow(() => {
+  loadAddresses()
+})
+
+onMounted(() => {
+  try {
+    const ec = uni.getOpenerEventChannel()
+    openerEventChannel = ec
+    ec?.on('setSelectMode', (data: any) => {
+      if (data && typeof data.selectMode === 'boolean') {
+        selectionMode.value = data.selectMode
+      }
+    })
+  } catch (e) {
+    // ignore
+  }
+})
+
+const loadAddresses = () => {
+  const storedAddresses = uni.getStorageSync('addresses')
+  if (storedAddresses) {
+    try {
+      addresses.value = JSON.parse(storedAddresses as string) as Address[]
+    } catch (e) {
+      console.error('Failed to parse addresses', e)
+      addresses.value = []
+    }
+  } else {
+    // 初始Mock数据
+    addresses.value = [
+      {
+        id: 'addr_001',
+        name: '张三',
+        phone: '13800138000',
+        province: '北京市',
+        city: '北京市',
+        district: '朝阳区',
+        detail: '三里屯SOHO A座',
+        isDefault: true,
+        label: '公司'
+      }
+    ]
+    uni.setStorageSync('addresses', JSON.stringify(addresses.value))
+  }
+}
+
+const getFullAddress = (item: Address): string => {
+  return `${item.province}${item.city}${item.district} ${item.detail}`
+}
+
+const addAddress = () => {
+  uni.navigateTo({
+    url: '/pages/mall/consumer/address-edit'
+  })
+}
+
+// 删除地址
+const deleteAddress = (id: string) => {
+    uni.showModal({
+        title: '提示',
+        content: '确定要删除该地址吗？',
+        success: (res) => {
+            if (res.confirm) {
+                const index = addresses.value.findIndex(addr => addr.id === id)
+                if (index !== -1) {
+                    addresses.value.splice(index, 1)
+                    uni.setStorageSync('addresses', JSON.stringify(addresses.value))
+                    uni.showToast({
+                        title: '删除成功',
+                        icon: 'success'
+                    })
+                }
+            }
+        }
+    })
+}
+
+const editAddress = (id: string) => {
+  uni.navigateTo({
+    url: `/pages/mall/consumer/address-edit?id=${id}`
+  })
+}
+
+const selectAddress = (item: Address) => {
+  if (selectionMode.value && openerEventChannel) {
+    openerEventChannel.emit('addressSelected', {
+      id: item.id,
+      recipient_name: item.name,
+      phone: item.phone,
+      province: item.province,
+      city: item.city,
+      district: item.district,
+      detail: item.detail,
+      is_default: item.isDefault
+    })
+    uni.navigateBack()
+  } else {
+    editAddress(item.id)
+  }
+}
+</script>
+
+<style>
+/* 响应式布局优化 */
+@media screen and (min-width: 768px) {
+  .address-list {
+    max-width: 800px;
+    margin: 0 auto;
+  }
+  
+  .address-list-page {
+    background-color: #f5f5f5;
+  }
+  
+  .footer-btn {
+    max-width: 800px;
+    margin: 0 auto;
+    left: 50%;
+    transform: translateX(-50%);
+    box-shadow: 0 -2px 10px rgba(0,0,0,0.05);
+  }
+}
+
+.address-list-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding-bottom: 80px;
+}
+
+.address-list {
+  padding: 15px;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding-top: 100px;
+}
+
+.empty-icon {
+  font-size: 60px;
+  margin-bottom: 20px;
+}
+
+.empty-text {
+  color: #999;
+  font-size: 16px;
+}
+
+.address-item {
+  background-color: white;
+  border-radius: 10px;
+  padding: 15px;
+  margin-bottom: 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.item-content {
+  flex: 1;
+  margin-right: 15px;
+}
+
+.item-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+  flex-wrap: wrap;
+}
+
+.user-name {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-right: 10px;
+}
+
+.user-phone {
+  font-size: 14px;
+  color: #666;
+  margin-right: 10px;
+}
+
+.default-tag {
+  background-color: #ff5000;
+  color: white;
+  font-size: 10px;
+  padding: 2px 6px;
+  border-radius: 4px;
+  margin-right: 5px;
+}
+
+.label-tag {
+  background-color: #e0f2f1;
+  color: #00796b;
+  font-size: 10px;
+  padding: 2px 6px;
+  border-radius: 4px;
+}
+
+.address-text {
+  font-size: 14px;
+  color: #333;
+  line-height: 1.4;
+}
+
+.item-actions {
+  padding: 10px;
+  border-left: 1px solid #f0f0f0;
+  display: flex;
+  flex-direction: column; /* 竖向排列图标 */
+  justify-content: center;
+  align-items: center;
+  gap: 15px;
+}
+
+.action-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 5px;
+}
+
+.action-icon {
+  font-size: 20px;
+  color: #999;
+}
+
+.footer-btn {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: white;
+  padding: 10px 15px;
+  padding-bottom: calc(10px + env(safe-area-inset-bottom));
+  box-shadow: 0 -2px 10px rgba(0,0,0,0.05);
+}
+
+.add-btn {
+  background-color: #ff5000;
+  color: white;
+  border-radius: 25px;
+  font-size: 16px;
+  height: 44px;
+  line-height: 44px;
+  border: none;
+}
+</style>
diff --git a/pages/mall/consumer/address.uvue b/pages/mall/consumer/address.uvue
new file mode 100644
index 00000000..9b6b4af1
--- /dev/null
+++ b/pages/mall/consumer/address.uvue
@@ -0,0 +1,918 @@
+<!-- 地址管理页面 -->
+<template>
+	<view class="address-page">
+		<!-- 顶部栏 -->
+		<view class="address-header">
+			<view class="header-title">
+				<text class="title-text">收货地址</text>
+			</view>
+		</view>
+
+		<!-- 地址列表 -->
+		<scroll-view class="address-list" scroll-y>
+			<!-- 地址为空 -->
+			<view v-if="addressList.length === 0" class="empty-address">
+				<text class="empty-icon">📍</text>
+				<text class="empty-text">暂无收货地址</text>
+				<text class="empty-subtext">点击下方按钮添加地址</text>
+			</view>
+
+			<!-- 地址项 -->
+			<view v-for="address in addressList" :key="address.id" class="address-item">
+				<view class="address-info" @click="selectAddress(address)">
+					<view class="address-header-row">
+						<text class="address-name">{{ address.recipient_name }}</text>
+						<text class="address-phone">{{ address.phone }}</text>
+						<view v-if="address.is_default" class="default-tag">
+							<text class="tag-text">默认</text>
+						</view>
+					</view>
+					<view class="address-detail">
+						<text class="detail-text">{{ getFullAddress(address) }}</text>
+					</view>
+				</view>
+				<view class="address-actions">
+					<view class="action-item" @click="editAddress(address)">
+						<text class="action-icon">✏️</text>
+						<text class="action-text">编辑</text>
+					</view>
+					<view class="action-item" @click="deleteAddress(address)">
+						<text class="action-icon">🗑️</text>
+						<text class="action-text">删除</text>
+					</view>
+					<view v-if="!address.is_default" class="action-item" @click="setDefaultAddress(address)">
+						<text class="action-icon">⭐</text>
+						<text class="action-text">设为默认</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 从选择页面返回时的提示 -->
+			<view v-if="fromSelect && addressList.length > 0" class="select-tip">
+				<text class="tip-text">请选择收货地址</text>
+				<text class="tip-subtext">或点击下方添加新地址</text>
+			</view>
+		</scroll-view>
+
+		<!-- 添加地址按钮 -->
+		<view class="add-address-btn" @click="showNewAddressForm = true">
+			<text class="btn-icon">+</text>
+			<text class="btn-text">添加新地址</text>
+		</view>
+
+		<!-- 新建地址表单弹窗 -->
+		<view v-if="showNewAddressForm" class="address-form-mask" @click="cancelNewAddress">
+			<view class="address-form-popup" @click.stop>
+				<view class="form-header">
+					<text class="form-title">新建收货地址</text>
+					<text class="form-close" @click="cancelNewAddress">×</text>
+				</view>
+				
+				<scroll-view class="form-content" scroll-y>
+					<view class="form-item">
+						<text class="form-label">收货人</text>
+						<input class="form-input" v-model="newAddress.recipient_name" 
+									 placeholder="请输入收货人姓名" />
+					</view>
+					
+					<view class="form-item">
+						<text class="form-label">手机号</text>
+						<input class="form-input" v-model="newAddress.phone" 
+									 placeholder="请输入手机号码" type="number" />
+					</view>
+					
+					<!-- 地址智能填写 -->
+					<view class="form-item">
+						<text class="form-label">智能填写地址</text>
+						<textarea class="form-textarea smart-address-input" 
+											v-model="smartAddressInput" 
+											placeholder="请输入完整地址，系统将自动识别省市区和详细地址"
+											@blur="parseSmartAddress"
+											maxlength="200" />
+						<text class="smart-tip">例如：北京市朝阳区三里屯SOHO A座</text>
+					</view>
+					
+					<view class="form-item">
+						<text class="form-label">所在地区</text>
+						<view class="region-inputs">
+							<input class="form-input region-input" v-model="newAddress.province" 
+										 placeholder="省" readonly />
+							<input class="form-input region-input" v-model="newAddress.city" 
+										 placeholder="市" readonly />
+							<input class="form-input region-input" v-model="newAddress.district" 
+										 placeholder="区/县" readonly />
+						</view>
+					</view>
+					
+					<view class="form-item">
+						<text class="form-label">详细地址</text>
+						<textarea class="form-textarea" v-model="newAddress.detail" 
+											placeholder="街道、小区、楼栋、门牌号等" 
+											maxlength="100" />
+					</view>
+					
+					<view class="form-item checkbox-item">
+						<view class="checkbox-wrapper" @click="newAddress.is_default = !newAddress.is_default">
+							<view :class="['checkbox', { checked: newAddress.is_default }]">
+								<text v-if="newAddress.is_default" class="checkbox-check">✓</text>
+							</view>
+							<text class="checkbox-label">设为默认地址</text>
+						</view>
+					</view>
+				</scroll-view>
+				
+				<view class="form-buttons">
+					<button class="form-cancel-btn" @click="cancelNewAddress">取消</button>
+					<button class="form-submit-btn" @click="saveNewAddress">保存</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+type AddressType = {
+	id: string
+	user_id: string
+	recipient_name: string
+	phone: string
+	province: string
+	city: string
+	district: string
+	detail: string
+	postal_code: string | null
+	is_default: boolean
+	created_at: string
+}
+
+const addressList = ref<Array<AddressType>>([])
+const fromSelect = ref<boolean>(false)
+const selectCallback = ref<any>(null)
+const showNewAddressForm = ref<boolean>(false)
+const newAddress = ref<any>({
+	recipient_name: '',
+	phone: '',
+	province: '',
+	city: '',
+	district: '',
+	detail: '',
+	is_default: false
+})
+const smartAddressInput = ref<string>('')
+
+// 生命周期
+onMounted(() => {
+	const eventChannel = uni.getEventChannel()
+	if (eventChannel) {
+		eventChannel.on('fromSelect', (data: any) => {
+			fromSelect.value = data.fromSelect || false
+			selectCallback.value = data.callback
+		})
+	}
+	
+	loadAddresses()
+	
+	// 监听地址更新事件（从checkout页面或其他页面）
+	uni.$on('addressUpdated', (updatedAddressList: any) => {
+		addressList.value = updatedAddressList
+	})
+})
+
+// 组件卸载时移除事件监听
+onUnmounted(() => {
+	uni.$off('addressUpdated')
+})
+
+// 加载地址列表
+const loadAddresses = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) {
+		uni.showToast({
+			title: '请先登录',
+			icon: 'none'
+		})
+		uni.navigateTo({
+			url: '/pages/user/login'
+		})
+		return
+	}
+
+	try {
+		const { data, error } = await supa
+			.from('user_addresses')
+			.select('*')
+			.eq('user_id', userId)
+			.order('is_default', { ascending: false })
+			.order('created_at', { ascending: false })
+
+		if (error !== null) {
+			console.error('加载地址失败:', error)
+			return
+		}
+
+		addressList.value = data ?? []
+	} catch (err) {
+		console.error('加载地址异常:', err)
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string | null => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || null
+}
+
+// 获取完整地址
+const getFullAddress = (address: AddressType): string => {
+	return `${address.province}${address.city}${address.district}${address.detail}`
+}
+
+// 选择地址
+const selectAddress = (address: AddressType) => {
+	if (fromSelect.value && selectCallback.value) {
+		// 返回选择的地址
+		selectCallback.value(address)
+		uni.navigateBack()
+	}
+}
+
+// 编辑地址
+const editAddress = (address: AddressType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/address-edit?id=${address.id}`
+	})
+}
+
+// 删除地址
+const deleteAddress = (address: AddressType) => {
+	uni.showModal({
+		title: '删除地址',
+		content: '确定要删除这个收货地址吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					// 如果是默认地址，删除前检查是否还有其他地址
+					if (address.is_default && addressList.value.length > 1) {
+						uni.showModal({
+							title: '提示',
+							content: '删除默认地址后，系统会自动设置第一个地址为默认地址',
+							success: async (confirmRes) => {
+								if (confirmRes.confirm) {
+									await performDelete(address)
+								}
+							}
+						})
+					} else {
+						await performDelete(address)
+					}
+				} catch (err) {
+					console.error('删除地址异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 执行删除
+const performDelete = async (address: AddressType) => {
+	try {
+		const { error } = await supa
+			.from('user_addresses')
+			.delete()
+			.eq('id', address.id)
+
+		if (error !== null) {
+			console.error('删除地址失败:', error)
+			uni.showToast({
+				title: '删除失败',
+				icon: 'none'
+			})
+			return
+		}
+
+		// 从列表中移除
+		const index = addressList.value.findIndex(item => item.id === address.id)
+		if (index !== -1) {
+			addressList.value.splice(index, 1)
+		}
+
+		// 如果是默认地址被删除，设置第一个地址为默认
+		if (address.is_default && addressList.value.length > 0) {
+			const newDefault = addressList.value[0]
+			await setAsDefault(newDefault)
+		}
+
+		uni.showToast({
+			title: '删除成功',
+			icon: 'success'
+		})
+	} catch (err) {
+		console.error('执行删除异常:', err)
+	}
+}
+
+// 设为默认地址
+const setDefaultAddress = async (address: AddressType) => {
+	try {
+		const userId = getCurrentUserId()
+		if (!userId) return
+
+		// 1. 取消当前所有默认地址
+		const { error: updateError } = await supa
+			.from('user_addresses')
+			.update({ is_default: false })
+			.eq('user_id', userId)
+			.eq('is_default', true)
+
+		if (updateError !== null) {
+			console.error('取消默认地址失败:', updateError)
+			return
+		}
+
+		// 2. 设置新的默认地址
+		const { error: setError } = await supa
+			.from('user_addresses')
+			.update({ is_default: true })
+			.eq('id', address.id)
+
+		if (setError !== null) {
+			console.error('设置默认地址失败:', setError)
+			return
+		}
+
+		// 更新本地数据
+		addressList.value.forEach(item => {
+			item.is_default = item.id === address.id
+		})
+
+		uni.showToast({
+			title: '已设为默认地址',
+			icon: 'success'
+		})
+	} catch (err) {
+		console.error('设置默认地址异常:', err)
+	}
+}
+
+// 设置地址为默认（内部方法）
+const setAsDefault = async (address: AddressType) => {
+	try {
+		const { error } = await supa
+			.from('user_addresses')
+			.update({ is_default: true })
+			.eq('id', address.id)
+
+		if (error !== null) {
+			console.error('设置默认地址失败:', error)
+			return
+		}
+
+		address.is_default = true
+	} catch (err) {
+		console.error('设置默认地址异常:', err)
+	}
+}
+
+// 解析智能地址
+const parseSmartAddress = () => {
+	const input = smartAddressInput.value.trim()
+	if (!input) return
+	
+	// 重置表单
+	newAddress.value.recipient_name = ''
+	newAddress.value.phone = ''
+	newAddress.value.province = ''
+	newAddress.value.city = ''
+	newAddress.value.district = ''
+	newAddress.value.detail = ''
+	
+	// 尝试匹配手机号码（11位数字）
+	const phoneRegex = /(1[3-9]\d{9})/g
+	const phoneMatches = input.match(phoneRegex)
+	if (phoneMatches && phoneMatches.length > 0) {
+		newAddress.value.phone = phoneMatches[0]
+	}
+	
+	// 尝试匹配收件人姓名（中文姓名，2-4个汉字）
+	const nameRegex = /([\u4e00-\u9fa5]{2,4})/g
+	const nameMatches = input.match(nameRegex)
+	if (nameMatches && nameMatches.length > 0) {
+		// 取第一个匹配的中文姓名作为收件人
+		newAddress.value.recipient_name = nameMatches[0]
+	}
+	
+	// 提取地址部分（移除姓名和手机号）
+	let addressText = input
+	if (newAddress.value.recipient_name) {
+		addressText = addressText.replace(newAddress.value.recipient_name, '')
+	}
+	if (newAddress.value.phone) {
+		addressText = addressText.replace(newAddress.value.phone, '')
+	}
+	
+	// 清理地址文本（移除多余的空格和标点）
+	addressText = addressText.replace(/[，,;；\s]+/g, ' ').trim()
+	
+	// 地址解析逻辑
+	const patterns = [
+		// 匹配格式：省市区详细地址
+		/^(.*?省)?(.*?市)?(.*?[区县])?(.*)$/,
+		// 匹配格式：省市详细地址
+		/^(.*?省)?(.*?市)?(.*)$/
+	]
+	
+	for (const pattern of patterns) {
+		const match = addressText.match(pattern)
+		if (match) {
+			const [, province, city, district, detail] = match
+			
+			if (province) newAddress.value.province = province.replace('省', '').trim()
+			if (city) newAddress.value.city = city.replace('市', '').trim()
+			if (district) newAddress.value.district = district.trim()
+			if (detail) newAddress.value.detail = detail.trim()
+			
+			// 如果详细地址为空，但还有剩余内容，则作为详细地址
+			if (!newAddress.value.detail && district && detail) {
+				newAddress.value.detail = detail.trim()
+			}
+			
+			break
+		}
+	}
+	
+	// 如果没有匹配到模式，尝试简单分割
+	if (!newAddress.value.province && !newAddress.value.city && !newAddress.value.district) {
+		// 尝试按常见分隔符分割
+		const parts = addressText.split(/[省市县区]/)
+		if (parts.length >= 2) {
+			newAddress.value.province = parts[0] || ''
+			newAddress.value.city = parts[1] || ''
+			newAddress.value.detail = parts.slice(2).join('').trim() || addressText
+		} else {
+			newAddress.value.detail = addressText
+		}
+	}
+	
+	// 如果地址部分为空，但还有剩余文本，则作为详细地址
+	if (!newAddress.value.detail && addressText.trim()) {
+		newAddress.value.detail = addressText.trim()
+	}
+}
+
+// 保存新地址
+const saveNewAddress = async () => {
+	// 验证表单
+	if (!newAddress.value.recipient_name || !newAddress.value.phone || !newAddress.value.detail) {
+		uni.showToast({
+			title: '请填写完整信息',
+			icon: 'none'
+		})
+		return
+	}
+
+	const userId = getCurrentUserId()
+	if (!userId) {
+		uni.showToast({
+			title: '请先登录',
+			icon: 'none'
+		})
+		return
+	}
+
+	try {
+		const { data, error } = await supa
+			.from('user_addresses')
+			.insert({
+				user_id: userId,
+				recipient_name: newAddress.value.recipient_name,
+				phone: newAddress.value.phone,
+				province: newAddress.value.province,
+				city: newAddress.value.city,
+				district: newAddress.value.district,
+				detail: newAddress.value.detail,
+				is_default: newAddress.value.is_default,
+				created_at: new Date().toISOString()
+			})
+			.select()
+			.single()
+
+		if (error !== null) {
+			console.error('保存地址失败:', error)
+			uni.showToast({
+				title: '保存失败',
+				icon: 'none'
+			})
+			return
+		}
+
+		// 如果是默认地址，取消其他默认地址
+		if (newAddress.value.is_default) {
+			addressList.value.forEach(addr => {
+				addr.is_default = false
+			})
+			
+			// 更新数据库中的其他地址
+			await supa
+				.from('user_addresses')
+				.update({ is_default: false })
+				.eq('user_id', userId)
+				.neq('id', data.id)
+		}
+
+		// 添加到列表
+		addressList.value.unshift(data)
+		
+		// 发布地址更新事件，让checkout页面也能获取到
+		uni.$emit('addressUpdated', addressList.value)
+		
+		// 重置表单
+		resetNewAddressForm()
+		
+		uni.showToast({
+			title: '地址保存成功',
+			icon: 'success'
+		})
+		
+	} catch (err) {
+		console.error('保存地址异常:', err)
+		uni.showToast({
+			title: '保存失败',
+			icon: 'none'
+		})
+	}
+}
+
+// 重置新建地址表单
+const resetNewAddressForm = () => {
+	showNewAddressForm.value = false
+	newAddress.value = {
+		recipient_name: '',
+		phone: '',
+		province: '',
+		city: '',
+		district: '',
+		detail: '',
+		is_default: false
+	}
+	smartAddressInput.value = ''
+}
+
+// 取消新建地址
+const cancelNewAddress = () => {
+	resetNewAddressForm()
+}
+</script>
+
+<style scoped>
+.address-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.address-header {
+	background-color: #ffffff;
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.header-title {
+	text-align: center;
+}
+
+.title-text {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.address-list {
+	flex: 1;
+	padding: 10px;
+}
+
+.empty-address {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80px 20px;
+	background-color: #ffffff;
+	border-radius: 8px;
+}
+
+.empty-icon {
+	font-size: 80px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+}
+
+.address-item {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+	border-radius: 8px;
+	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.address-info {
+	margin-bottom: 15px;
+	padding-bottom: 15px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.address-header-row {
+	display: flex;
+	align-items: center;
+	margin-bottom: 10px;
+}
+
+.address-name {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-right: 15px;
+}
+
+.address-phone {
+	font-size: 14px;
+	color: #666666;
+	margin-right: 10px;
+}
+
+.default-tag {
+	background-color: #ff4757;
+	padding: 2px 8px;
+	border-radius: 10px;
+}
+
+.tag-text {
+	color: #ffffff;
+	font-size: 12px;
+}
+
+.address-detail {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.5;
+}
+
+.detail-text {
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.address-actions {
+	display: flex;
+	justify-content: flex-end;
+	gap: 20px;
+}
+
+.action-item {
+	display: flex;
+	align-items: center;
+}
+
+.action-icon {
+	font-size: 16px;
+	margin-right: 5px;
+}
+
+.action-text {
+	font-size: 14px;
+	color: #666666;
+}
+
+.select-tip {
+	background-color: #ffffff;
+	padding: 20px;
+	border-radius: 8px;
+	margin-bottom: 10px;
+	text-align: center;
+}
+
+.tip-text {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 5px;
+	display: block;
+}
+
+.tip-subtext {
+	font-size: 14px;
+	color: #999999;
+	display: block;
+}
+
+.add-address-btn {
+	background-color: #007aff;
+	margin: 10px;
+	padding: 15px;
+	border-radius: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.btn-icon {
+	color: #ffffff;
+	font-size: 24px;
+	margin-right: 10px;
+}
+
+.btn-text {
+	color: #ffffff;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+/* 新建地址表单弹窗样式 */
+.address-form-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 1001;
+}
+
+.address-form-popup {
+	background-color: #ffffff;
+	width: 90%;
+	max-width: 500px;
+	max-height: 80vh;
+	border-radius: 12px;
+	display: flex;
+	flex-direction: column;
+}
+
+.form-header {
+	padding: 20px 15px;
+	border-bottom: 1px solid #e5e5e5;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.form-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.form-close {
+	font-size: 24px;
+	color: #999999;
+	padding: 5px;
+}
+
+.form-content {
+	flex: 1;
+	padding: 15px;
+	max-height: 50vh;
+}
+
+.form-item {
+	margin-bottom: 20px;
+}
+
+.form-item:last-child {
+	margin-bottom: 0;
+}
+
+.form-label {
+	font-size: 14px;
+	color: #333333;
+	margin-bottom: 8px;
+	display: block;
+}
+
+.form-input {
+	width: 100%;
+	padding: 12px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	font-size: 14px;
+	color: #333333;
+	box-sizing: border-box;
+}
+
+.form-input[readonly] {
+	background-color: #f9f9f9;
+	color: #666666;
+}
+
+.region-inputs {
+	display: flex;
+	gap: 10px;
+}
+
+.region-input {
+	flex: 1;
+}
+
+.form-textarea {
+	width: 100%;
+	min-height: 80px;
+	padding: 12px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	font-size: 14px;
+	color: #333333;
+	box-sizing: border-box;
+}
+
+.smart-address-input {
+	min-height: 60px;
+}
+
+.smart-tip {
+	font-size: 12px;
+	color: #999999;
+	margin-top: 5px;
+	display: block;
+}
+
+.checkbox-item {
+	margin-top: 20px;
+}
+
+.checkbox-wrapper {
+	display: flex;
+	align-items: center;
+}
+
+.checkbox {
+	width: 20px;
+	height: 20px;
+	border: 1px solid #e5e5e5;
+	border-radius: 4px;
+	margin-right: 10px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.checkbox.checked {
+	background-color: #007aff;
+	border-color: #007aff;
+}
+
+.checkbox-check {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+.checkbox-label {
+	font-size: 14px;
+	color: #333333;
+}
+
+.form-buttons {
+	display: flex;
+	padding: 15px;
+	border-top: 1px solid #e5e5e5;
+	gap: 10px;
+}
+
+.form-cancel-btn {
+	flex: 1;
+	background-color: #f5f5f5;
+	color: #333333;
+	padding: 12px;
+	border-radius: 8px;
+	font-size: 16px;
+	border: none;
+}
+
+.form-submit-btn {
+	flex: 1;
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 12px;
+	border-radius: 8px;
+	font-size: 16px;
+	border: none;
+}
+</style>
diff --git a/pages/mall/consumer/apply-refund.uvue b/pages/mall/consumer/apply-refund.uvue
new file mode 100644
index 00000000..af3c2306
--- /dev/null
+++ b/pages/mall/consumer/apply-refund.uvue
@@ -0,0 +1,293 @@
+<template>
+  <view class="apply-refund-page">
+    <view class="section">
+      <view class="section-title">退款类型</view>
+      <radio-group @change="handleTypeChange" class="type-group">
+        <label class="type-item">
+          <radio value="1" :checked="refundType === 1" color="#ff4444" />
+          <text>仅退款</text>
+        </label>
+        <label class="type-item">
+          <radio value="2" :checked="refundType === 2" color="#ff4444" />
+          <text>退货退款</text>
+        </label>
+      </radio-group>
+    </view>
+
+    <view class="section">
+      <view class="section-title">退款原因</view>
+      <picker @change="handleReasonChange" :range="reasonList" class="picker">
+        <view class="picker-content">
+          <text v-if="refundReason">{{ refundReason }}</text>
+          <text v-else class="placeholder">请选择退款原因</text>
+          <text class="arrow">></text>
+        </view>
+      </picker>
+    </view>
+
+    <view class="section">
+      <view class="section-title">退款金额</view>
+      <view class="amount-input-wrap">
+        <text class="currency">¥</text>
+        <input 
+          type="digit" 
+          v-model="refundAmount" 
+          class="amount-input" 
+          :placeholder="`最多可退 ¥${maxAmount}`"
+        />
+      </view>
+      <text class="amount-tip">最多可退 ¥{{ maxAmount }}，含发货邮费 ¥{{ deliveryFee }}</text>
+    </view>
+
+    <view class="section">
+      <view class="section-title">退款说明</view>
+      <textarea 
+        v-model="description" 
+        class="desc-input" 
+        placeholder="选填：补充详细的退款说明，有助于商家快速处理"
+        maxlength="200"
+      />
+    </view>
+
+    <view class="submit-bar">
+      <button class="submit-btn" @click="submitRefund" :loading="submitting">提交申请</button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+// import supa from '@/components/supadb/aksupainstance.uts'
+
+const orderId = ref('')
+const orderItemId = ref('') // Optional, if refunding specific item
+const refundType = ref(1) // 1: Only Refund, 2: Return & Refund
+const refundReason = ref('')
+const refundAmount = ref('')
+const description = ref('')
+const maxAmount = ref(0)
+const deliveryFee = ref(0)
+const submitting = ref(false)
+
+const reasonList = [
+  '多拍/错拍/不想要',
+  '快递一直未送达',
+  '未按约定时间发货',
+  '快递无记录',
+  '空包裹/少货/错发',
+  '质量问题',
+  '其他'
+]
+
+onMounted(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  const options = currentPage.options as any
+  
+  if (options.orderId) {
+    orderId.value = options.orderId
+    loadOrderInfo()
+  }
+})
+
+const loadOrderInfo = async () => {
+  try {
+    const { data, error } = await supa
+      .from('orders')
+      .select('actual_amount, delivery_fee')
+      .eq('id', orderId.value)
+      .single()
+      
+    if (error == null && data != null) {
+      maxAmount.value = data['actual_amount'] as number
+      deliveryFee.value = data['delivery_fee'] as number
+      refundAmount.value = maxAmount.value.toString()
+    }
+  } catch (err) {
+    console.error('加载订单信息失败', err)
+  }
+}
+
+const handleTypeChange = (e: any) => {
+  refundType.value = parseInt(e.detail.value)
+}
+
+const handleReasonChange = (e: any) => {
+  const index = e.detail.value as number
+  refundReason.value = reasonList[index]
+}
+
+const submitRefund = async () => {
+  if (!refundReason.value) {
+    uni.showToast({ title: '请选择退款原因', icon: 'none' })
+    return
+  }
+  
+  const amount = parseFloat(refundAmount.value)
+  if (isNaN(amount) || amount <= 0 || amount > maxAmount.value) {
+    uni.showToast({ title: '请输入有效的退款金额', icon: 'none' })
+    return
+  }
+  
+  submitting.value = true
+  
+  try {
+    const userStore = uni.getStorageSync('userInfo')
+    const userId = userStore?.id
+    
+    // 1. Create Refund Record
+    /* const { data, error } = await supa
+      .from('refunds')
+      .insert({
+        user_id: userId,
+        order_id: orderId.value,
+        refund_no: 'REF' + Date.now(),
+        refund_type: refundType.value,
+        refund_reason: refundReason.value,
+        refund_amount: amount,
+        description: description.value,
+        status: 1, // 待处理
+        status_history: [{
+          status: 1,
+          remark: '用户提交申请',
+          created_at: new Date().toISOString()
+        }]
+      })
+      
+    if (error != null) throw error */
+    
+    // MOCK SUBMIT
+    await new Promise(resolve => setTimeout(resolve, 1000))
+    
+    // 2. Update Order Status (Optional, e.g. to "After-sales")
+    // Assuming status 6 is "After-sales/Refund"
+    /*
+    await supa
+      .from('orders')
+      .update({ status: 6 })
+      .eq('id', orderId.value)
+    */
+    
+    uni.showToast({ title: '提交成功', icon: 'success' })
+    
+    setTimeout(() => {
+      uni.redirectTo({
+        url: '/pages/mall/consumer/refund'
+      })
+    }, 1500)
+    
+  } catch (err) {
+    console.error('提交退款失败', err)
+    uni.showToast({ title: '提交失败，请重试', icon: 'none' })
+  } finally {
+    submitting.value = false
+  }
+}
+</script>
+
+<style scoped>
+.apply-refund-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding: 15px;
+  padding-bottom: 80px;
+}
+
+.section {
+  background-color: #ffffff;
+  border-radius: 8px;
+  padding: 15px;
+  margin-bottom: 15px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 15px;
+}
+
+.type-group {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+}
+
+.type-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+}
+
+.picker-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 14px;
+  color: #333;
+}
+
+.placeholder {
+  color: #999;
+}
+
+.arrow {
+  color: #ccc;
+}
+
+.amount-input-wrap {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+}
+
+.currency {
+  font-size: 24px;
+  font-weight: bold;
+  color: #333;
+  margin-right: 10px;
+}
+
+.amount-input {
+  flex: 1;
+  font-size: 24px;
+  font-weight: bold;
+  height: 40px;
+}
+
+.amount-tip {
+  font-size: 12px;
+  color: #999;
+}
+
+.desc-input {
+  width: 100%;
+  height: 100px;
+  font-size: 14px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.submit-bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #ffffff;
+  padding: 15px;
+  box-shadow: 0 -2px 10px rgba(0,0,0,0.05);
+}
+
+.submit-btn {
+  background-color: #ff4444;
+  color: #ffffff;
+  border-radius: 22px;
+  font-size: 16px;
+  font-weight: bold;
+}
+</style>
diff --git a/pages/mall/consumer/cart - 副本.uvue b/pages/mall/consumer/cart - 副本.uvue
new file mode 100644
index 00000000..999dcb1d
--- /dev/null
+++ b/pages/mall/consumer/cart - 副本.uvue	
@@ -0,0 +1,810 @@
+<!-- 购物车页面 -->
+<template>
+	<view class="cart-page">
+		<!-- 顶部栏 -->
+		<view class="cart-header">
+			<view class="header-title">
+				<text class="title-text">购物车</text>
+			</view>
+			<view v-if="selectedCount > 0" class="edit-btn" @click="toggleEditMode">
+				<text class="edit-text">{{ isEditMode ? '完成' : '编辑' }}</text>
+			</view>
+		</view>
+
+		<!-- 购物车为空 -->
+		<view v-if="cartItems.length === 0" class="empty-cart">
+			<text class="empty-icon">🛒</text>
+			<text class="empty-text">购物车还是空的</text>
+			<text class="empty-subtext">快去挑选心仪的商品吧</text>
+			<button class="go-shopping-btn" @click="goShopping">去逛逛</button>
+		</view>
+
+		<!-- 购物车列表 -->
+		<scroll-view v-else direction="vertical" class="cart-content">
+			<!-- 商品列表 -->
+			<view v-for="(item, index) in cartItems" :key="item.id" class="cart-item">
+				<view class="item-selector" @click="toggleSelectItem(item)">
+					<view :class="['select-icon', { selected: item.selected }]">
+						<text v-if="item.selected" class="icon-text">✓</text>
+					</view>
+				</view>
+
+				<image class="item-image" :src="item.product_image || '/static/default-product.png'" />
+
+				<view class="item-info">
+					<text class="item-name">{{ item.product_name }}</text>
+					<text v-if="item.sku_specifications" class="item-spec">{{ getSpecText(item.sku_specifications) }}</text>
+					<view class="item-price-row">
+						<text class="item-price">¥{{ item.price }}</text>
+						<view class="quantity-control">
+							<view class="quantity-btn minus" @click="decreaseQuantity(item)">-</view>
+							<text class="quantity-text">{{ item.quantity }}</text>
+							<view class="quantity-btn plus" @click="increaseQuantity(item)">+</view>
+						</view>
+					</view>
+				</view>
+
+				<view v-if="isEditMode" class="delete-btn" @click="removeItem(item, index)">
+					<text class="delete-text">删除</text>
+				</view>
+			</view>
+
+			<!-- 推荐商品 -->
+			<view v-if="recommendProducts.length > 0" class="recommend-section">
+				<view class="section-header">
+					<text class="section-title">猜你喜欢</text>
+				</view>
+				<view class="recommend-grid">
+					<view v-for="product in recommendProducts" :key="product.id" class="recommend-item" @click="viewProduct(product)">
+						<image class="recommend-image" :src="getProductFirstImage(product)" />
+						<text class="recommend-name">{{ product.name }}</text>
+						<text class="recommend-price">¥{{ product.price }}</text>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!-- 底部结算栏 -->
+		<view v-if="cartItems.length > 0" class="bottom-bar">
+			<view class="select-all" @click="toggleSelectAll">
+				<view :class="['all-select-icon', { selected: isAllSelected }]">
+					<text v-if="isAllSelected" class="icon-text">✓</text>
+				</view>
+				<text class="select-all-text">全选</text>
+			</view>
+
+			<view v-if="!isEditMode" class="settlement-info">
+				<view class="total-price">
+					<text class="total-label">合计：</text>
+					<text class="total-value">¥{{ totalPrice.toFixed(2) }}</text>
+				</view>
+				<text class="total-desc">已选{{ selectedCount }}件</text>
+			</view>
+
+			<view v-if="isEditMode" class="edit-actions">
+				<view class="delete-all-btn" @click="removeSelected">
+					<text class="delete-all-text">删除({{ selectedCount }})</text>
+				</view>
+			</view>
+
+			<view v-else class="settle-btn" :class="{ disabled: selectedCount === 0 }" @click="goToCheckout">
+				<text class="settle-text">去结算</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, computed, onMounted } from 'vue'
+import type { ProductType } from '@/types/mall-types.uts'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+type CartItemType = {
+	id: string
+	user_id: string
+	product_id: string
+	sku_id: string
+	product_name: string
+	product_image: string
+	sku_specifications: any
+	price: number
+	quantity: number
+	selected: boolean
+}
+
+const cartItems = ref<Array<CartItemType>>([])
+const recommendProducts = ref<Array<ProductType>>([])
+const isEditMode = ref<boolean>(false)
+const isLoading = ref<boolean>(false)
+
+// 计算属性
+const selectedCount = computed(() => {
+	return cartItems.value.filter(item => item.selected).length
+})
+
+const totalPrice = computed(() => {
+	return cartItems.value
+		.filter(item => item.selected)
+		.reduce((total, item) => total + (item.price * item.quantity), 0)
+})
+
+const isAllSelected = computed(() => {
+	return cartItems.value.length > 0 && cartItems.value.every(item => item.selected)
+})
+
+// 生命周期
+onMounted(() => {
+	loadCartItems()
+	loadRecommendProducts()
+})
+
+// 加载购物车商品
+const loadCartItems = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) {
+		uni.showToast({
+			title: '请先登录',
+			icon: 'none'
+		})
+		uni.navigateTo({
+			url: '/pages/user/login'
+		})
+		return
+	}
+
+	try {
+		const { data, error } = await supa
+			.from('shopping_cart')
+			.select(`
+				id,
+				user_id,
+				product_id,
+				sku_id,
+				quantity,
+				products (
+					name,
+					price,
+					images
+				),
+				product_skus (
+					specifications,
+					price as sku_price
+				)
+			`)
+			.eq('user_id', userId)
+
+		if (error !== null) {
+			console.error('加载购物车失败:', error)
+			return
+		}
+
+		const items: CartItemType[] = []
+		const cartData = data ?? []
+		
+		for (let i = 0; i < cartData.length; i++) {
+			const item = cartData[i]
+			const product = item.products as any
+			const sku = item.product_skus as any
+			
+			items.push({
+				id: item.id,
+				user_id: item.user_id,
+				product_id: item.product_id,
+				sku_id: item.sku_id,
+				product_name: product?.name || '未知商品',
+				product_image: product?.images?.[0] || '/static/default-product.png',
+				sku_specifications: sku?.specifications,
+				price: sku?.sku_price || product?.price || 0,
+				quantity: item.quantity,
+				selected: false
+			})
+		}
+		
+		cartItems.value = items
+	} catch (err) {
+		console.error('加载购物车异常:', err)
+	}
+}
+
+// 加载推荐商品
+const loadRecommendProducts = async () => {
+	try {
+		const { data, error } = await supa
+			.from('products')
+			.select('*')
+			.eq('status', 1)
+			.order('sales', { ascending: false })
+			.limit(6)
+
+		if (error !== null) {
+			console.error('加载推荐商品失败:', error)
+			return
+		}
+
+		recommendProducts.value = data ?? []
+	} catch (err) {
+		console.error('加载推荐商品异常:', err)
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string | null => {
+	// 这里应该从全局状态或storage中获取
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || null
+}
+
+// 获取商品第一张图片
+const getProductFirstImage = (product: ProductType): string => {
+	return product.images?.[0] || '/static/default-product.png'
+}
+
+// 获取规格文本
+const getSpecText = (specs: any): string => {
+	if (!specs) return ''
+	if (typeof specs === 'object') {
+		return Object.keys(specs)
+			.map(key => `${key}: ${specs[key]}`)
+			.join('; ')
+	}
+	return String(specs)
+}
+
+// 切换编辑模式
+const toggleEditMode = () => {
+	isEditMode.value = !isEditMode.value
+}
+
+// 切换商品选择
+const toggleSelectItem = (item: CartItemType) => {
+	item.selected = !item.selected
+	cartItems.value = [...cartItems.value]
+}
+
+// 全选/取消全选
+const toggleSelectAll = () => {
+	const newSelectedState = !isAllSelected.value
+	cartItems.value.forEach(item => {
+		item.selected = newSelectedState
+	})
+	cartItems.value = [...cartItems.value]
+}
+
+// 增加数量
+const increaseQuantity = async (item: CartItemType) => {
+	if (isLoading.value) return
+	
+	isLoading.value = true
+	try {
+		const newQuantity = item.quantity + 1
+		
+		const { error } = await supa
+			.from('shopping_cart')
+			.update({ quantity: newQuantity })
+			.eq('id', item.id)
+
+		if (error !== null) {
+			console.error('更新数量失败:', error)
+			uni.showToast({
+				title: '更新失败',
+				icon: 'none'
+			})
+			return
+		}
+
+		item.quantity = newQuantity
+		cartItems.value = [...cartItems.value]
+	} catch (err) {
+		console.error('更新数量异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 减少数量
+const decreaseQuantity = async (item: CartItemType) => {
+	if (item.quantity <= 1) {
+		removeItem(item, cartItems.value.indexOf(item))
+		return
+	}
+
+	if (isLoading.value) return
+	
+	isLoading.value = true
+	try {
+		const newQuantity = item.quantity - 1
+		
+		const { error } = await supa
+			.from('shopping_cart')
+			.update({ quantity: newQuantity })
+			.eq('id', item.id)
+
+		if (error !== null) {
+			console.error('更新数量失败:', error)
+			uni.showToast({
+				title: '更新失败',
+				icon: 'none'
+			})
+			return
+		}
+
+		item.quantity = newQuantity
+		cartItems.value = [...cartItems.value]
+	} catch (err) {
+		console.error('更新数量异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 移除单个商品
+const removeItem = async (item: CartItemType, index: number) => {
+	uni.showModal({
+		title: '确认删除',
+		content: '确定要删除这个商品吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					const { error } = await supa
+						.from('shopping_cart')
+						.delete()
+						.eq('id', item.id)
+
+					if (error !== null) {
+						console.error('删除商品失败:', error)
+						uni.showToast({
+							title: '删除失败',
+							icon: 'none'
+						})
+						return
+					}
+
+					cartItems.value.splice(index, 1)
+					cartItems.value = [...cartItems.value]
+					
+					uni.showToast({
+						title: '删除成功',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('删除商品异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 移除选中商品
+const removeSelected = () => {
+	const selectedItems = cartItems.value.filter(item => item.selected)
+	if (selectedItems.length === 0) {
+		uni.showToast({
+			title: '请选择要删除的商品',
+			icon: 'none'
+		})
+		return
+	}
+
+	uni.showModal({
+		title: '批量删除',
+		content: `确定要删除选中的${selectedItems.length}件商品吗？`,
+		success: async (res) => {
+			if (res.confirm) {
+				const deletePromises = selectedItems.map(item =>
+					supa
+						.from('shopping_cart')
+						.delete()
+						.eq('id', item.id)
+				)
+
+				try {
+					await Promise.all(deletePromises)
+					cartItems.value = cartItems.value.filter(item => !item.selected)
+					
+					uni.showToast({
+						title: '删除成功',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('批量删除异常:', err)
+					uni.showToast({
+						title: '删除失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 查看商品详情
+const viewProduct = (product: ProductType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/product-detail?id=${product.id}`
+	})
+}
+
+// 去逛逛
+const goShopping = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+
+// 去结算
+const goToCheckout = () => {
+	if (selectedCount.value === 0) {
+		uni.showToast({
+			title: '请选择要结算的商品',
+			icon: 'none'
+		})
+		return
+	}
+
+	const selectedItems = cartItems.value.filter(item => item.selected)
+	const productIds = selectedItems.map(item => ({
+		product_id: item.product_id,
+		sku_id: item.sku_id,
+		quantity: item.quantity
+	}))
+
+	uni.navigateTo({
+		url: '/pages/mall/consumer/checkout',
+		success: (res) => {
+			res.eventChannel.emit('acceptData', {
+				selectedItems: productIds,
+				totalAmount: totalPrice.value
+			})
+		}
+	})
+}
+</script>
+
+<style scoped>
+.cart-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.cart-header {
+	background-color: #ffffff;
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.header-title {
+	flex: 1;
+}
+
+.title-text {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.edit-btn {
+	padding: 5px 10px;
+}
+
+.edit-text {
+	color: #007aff;
+	font-size: 14px;
+}
+
+.empty-cart {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 50px 20px;
+}
+
+.empty-icon {
+	font-size: 80px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+	margin-bottom: 30px;
+}
+
+.go-shopping-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 10px 40px;
+	border-radius: 25px;
+	font-size: 14px;
+	border: none;
+}
+
+.cart-content {
+	flex: 1;
+}
+
+.cart-item {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	position: relative;
+}
+
+.item-selector {
+	margin-right: 10px;
+}
+
+.select-icon {
+	width: 20px;
+	height: 20px;
+	border: 1px solid #cccccc;
+	border-radius: 10px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.select-icon.selected {
+	background-color: #007aff;
+	border-color: #007aff;
+}
+
+.icon-text {
+	color: #ffffff;
+	font-size: 12px;
+}
+
+.item-image {
+	width: 80px;
+	height: 80px;
+	border-radius: 5px;
+	margin-right: 10px;
+}
+
+.item-info {
+	flex: 1;
+	min-height: 80px;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.item-name {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+}
+
+.item-spec {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 10px;
+}
+
+.item-price-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.item-price {
+	font-size: 16px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.quantity-control {
+	display: flex;
+	align-items: center;
+	border: 1px solid #e5e5e5;
+	border-radius: 15px;
+	overflow: hidden;
+}
+
+.quantity-btn {
+	width: 30px;
+	height: 30px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 16px;
+	color: #666666;
+	background-color: #f8f8f8;
+}
+
+.quantity-btn.minus {
+	border-right: 1px solid #e5e5e5;
+}
+
+.quantity-btn.plus {
+	border-left: 1px solid #e5e5e5;
+}
+
+.quantity-text {
+	width: 40px;
+	text-align: center;
+	font-size: 14px;
+	color: #333333;
+}
+
+.delete-btn {
+	position: absolute;
+	right: 15px;
+	bottom: 15px;
+	padding: 5px 10px;
+	background-color: #ff4757;
+	border-radius: 12px;
+}
+
+.delete-text {
+	color: #ffffff;
+	font-size: 12px;
+}
+
+.recommend-section {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 15px;
+}
+
+.section-header {
+	margin-bottom: 15px;
+}
+
+.section-title {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.recommend-grid {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+}
+
+.recommend-item {
+	width: 48%;
+	margin-bottom: 15px;
+}
+
+.recommend-image {
+	width: 100%;
+	height: 120px;
+	border-radius: 5px;
+	margin-bottom: 8px;
+}
+
+.recommend-name {
+	font-size: 13px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.recommend-price {
+	font-size: 14px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.bottom-bar {
+	background-color: #ffffff;
+	border-top: 1px solid #e5e5e5;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.select-all {
+	display: flex;
+	align-items: center;
+}
+
+.all-select-icon {
+	width: 20px;
+	height: 20px;
+	border: 1px solid #cccccc;
+	border-radius: 10px;
+	margin-right: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.all-select-icon.selected {
+	background-color: #007aff;
+	border-color: #007aff;
+}
+
+.select-all-text {
+	font-size: 14px;
+	color: #333333;
+}
+
+.settlement-info {
+	flex: 1;
+	margin-left: 20px;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+}
+
+.total-price {
+	display: flex;
+	align-items: baseline;
+	margin-bottom: 5px;
+}
+
+.total-label {
+	font-size: 14px;
+	color: #333333;
+}
+
+.total-value {
+	font-size: 18px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.total-desc {
+	font-size: 12px;
+	color: #999999;
+}
+
+.edit-actions {
+	flex: 1;
+	margin-left: 20px;
+	display: flex;
+	justify-content: flex-end;
+}
+
+.delete-all-btn {
+	background-color: #ff4757;
+	padding: 8px 20px;
+	border-radius: 15px;
+}
+
+.delete-all-text {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+.settle-btn {
+	background-color: #007aff;
+	padding: 10px 30px;
+	border-radius: 20px;
+	margin-left: 20px;
+}
+
+.settle-btn.disabled {
+	background-color: #cccccc;
+	opacity: 0.6;
+}
+
+.settle-text {
+	color: #ffffff;
+	font-size: 14px;
+	font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/cart.uvue b/pages/mall/consumer/cart.uvue
new file mode 100644
index 00000000..69346032
--- /dev/null
+++ b/pages/mall/consumer/cart.uvue
@@ -0,0 +1,1141 @@
+<!-- pages/mall/consumer/cart.uvue -->
+<template>
+	<view class="cart-page">
+		<!-- 智能顶部导航栏 - 与消息页保持一致 -->
+		<view class="smart-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-container">
+				<text class="nav-title">购物车</text>
+				<view class="nav-actions">
+					<view class="action-btn" @click="toggleManageMode">
+						<text class="action-icon">{{ isManageMode ? '✓' : '⚙️' }}</text>
+						<text class="action-text">{{ isManageMode ? '完成' : '管理' }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 导航栏占位符 - 已移除 -->
+		<!-- <view class="navbar-placeholder" :style="{ height: (statusBarHeight + 44) + 'px' }"></view> -->
+		
+		<!-- 购物车内容 -->
+		<scroll-view scroll-y class="cart-content" :style="{ paddingTop: (statusBarHeight + 10) + 'px' }">
+			<!-- 空购物车 -->
+			<view v-if="!loading && cartItems.length === 0" class="empty-cart">
+				<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="cart-list">
+				<view 
+					v-for="group in cartGroups" 
+					:key="group.shopId"
+					class="shop-group"
+				>
+					<!-- 店铺头部 -->
+					<view class="shop-header">
+						<view class="shop-select" @click="toggleShopSelect(group.shopId)">
+							<text v-if="isShopSelected(group.shopId)" class="selected-icon">✓</text>
+							<text v-else class="unselected-icon"></text>
+						</view>
+						<text class="shop-icon">🏪</text>
+						<text class="shop-name">{{ group.shopName }}</text>
+						<text class="shop-arrow">></text>
+					</view>
+					
+					<!-- 店铺商品 -->
+					<view 
+						v-for="item in group.items" 
+						:key="item.id"
+						class="cart-item"
+					>
+						<view class="item-select" @click="toggleSelect(item.id)">
+							<text v-if="item.selected" class="selected-icon">✓</text>
+							<text v-else class="unselected-icon"></text>
+						</view>
+						
+						<image 
+							class="item-image" 
+							:src="item.image" 
+							mode="aspectFill"
+							@click="navigateToProduct(item)"
+						/>
+						
+						<view class="item-info">
+							<view class="info-top">
+								<text class="item-name">{{ item.name }}</text>
+								<text class="item-spec">{{ item.spec }}</text>
+							</view>
+							
+							<view class="item-footer">
+								<text class="item-price">¥{{ item.price }}</text>
+								<view class="quantity-control">
+									<text class="quantity-btn" @click="decreaseQuantity(item.id)">-</text>
+									<text class="quantity-value">{{ item.quantity }}</text>
+									<text class="quantity-btn" @click="increaseQuantity(item.id)">+</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 推荐商品 -->
+			<view v-if="recommendProducts.length > 0" class="recommend-section">
+				<view class="section-header">
+					<text class="section-title">猜你喜欢</text>
+				</view>
+				<view class="recommend-list">
+					<view 
+						v-for="product in recommendProducts" 
+						:key="product.id"
+						class="recommend-item"
+						@click="navigateToProduct(product)"
+					>
+						<image 
+							class="recommend-image" 
+							:src="product.image" 
+							mode="aspectFill"
+						/>
+						<text class="recommend-name">{{ product.name }}</text>
+						<view class="recommend-bottom">
+							<text class="recommend-price">¥{{ product.price }}</text>
+							<view class="recommend-add-btn" @click.stop="addToCart(product)">
+								<text class="recommend-add-icon">+</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+		<!-- 底部结算栏 -->
+		<view v-if="cartItems.length > 0" class="cart-footer">
+			<view class="footer-content">
+				<view class="footer-left">
+					<view class="select-all" @click="toggleSelectAll">
+						<text v-if="allSelected" class="selected-icon">✓</text>
+						<text v-else class="unselected-icon"></text>
+						<text class="select-all-text">全选</text>
+					</view>
+				</view>
+				
+				<view class="footer-right">
+					<view v-if="!isManageMode" class="total-info">
+						<text class="total-text">合计:</text>
+						<text class="total-price">¥{{ totalPrice }}</text>
+					</view>
+                    <!-- 结算按钮：即使在管理模式下，如果用户想结算也可以（或者在管理模式下隐藏结算，只显示删除） -->
+                    <!-- 需求：加购商品前面的按钮时；cart购物车页面顶部的管理点击能对加购商品进行批量删除 -->
+					<button v-if="!isManageMode" class="checkout-btn" @click="goToCheckout">
+						去结算({{ selectedCount }})
+					</button>
+					<button v-else class="delete-btn" @click="deleteSelectedItems">
+						删除({{ selectedCount }})
+					</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, computed, onMounted } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+
+// 响应式数据
+const cartItems = ref<any[]>([])
+const recommendProducts = ref<any[]>([])
+const loading = ref<boolean>(false)
+const statusBarHeight = ref(0)
+const isManageMode = ref(false)
+
+const mockRecommendProducts = [
+	{
+		id: 'rec_001',
+		shopId: 'shop_rec_1',
+		shopName: '潮流运动旗舰店',
+		name: '运动保温杯',
+		price: 59,
+		image: 'https://picsum.photos/100/100?random=11',
+        specification: '颜色：星空黑 | 容量：500ml | 材质：304不锈钢',
+		specDetails: {
+			color: '星空黑',
+			capacity: '500ml',
+			material: '304不锈钢'
+		}
+	},
+	{
+		id: 'rec_002',
+		shopId: 'shop_rec_2',
+		shopName: '智能家居生活馆',
+		name: '声波电动牙刷',
+		price: 129,
+		image: 'https://picsum.photos/100/100?random=12',
+        specification: '颜色：珍珠白 | 刷头：敏感型×2 | 续航：30天',
+		specDetails: {
+			color: '珍珠白',
+			brushHead: '敏感型×2',
+			batteryLife: '30天'
+		}
+	},
+	{
+		id: 'rec_003',
+		shopId: 'shop_rec_3',
+		shopName: '健康防护专家店',
+		name: '医用护理口罩',
+		price: 29.9,
+		image: 'https://picsum.photos/100/100?random=13',
+        specification: '规格：三层防护 | 数量：50只独立装 | 执行标准：YY0469',
+		specDetails: {
+			layers: '三层防护',
+			quantity: '50只',
+			standard: 'YY0469'
+		}
+	},
+	{
+		id: 'rec_004',
+		shopId: 'shop_rec_4',
+		shopName: '户外运动装备店',
+		name: '专业护膝',
+		price: 45,
+		image: 'https://picsum.photos/100/100?random=14',
+        specification: '尺码：L码 | 材质：记忆棉+弹力布 | 适用：篮球/跑步',
+		specDetails: {
+			size: 'L码',
+			material: '记忆棉+弹力布',
+			suitableFor: '篮球/跑步'
+		}
+	}
+]
+
+// 计算属性
+const cartGroups = computed(() => {
+	const groups = new Map<string, any>()
+	cartItems.value.forEach(item => {
+		if (!groups.has(item.shopId)) {
+			groups.set(item.shopId, {
+				shopId: item.shopId,
+				shopName: item.shopName,
+				items: [] as any[]
+			})
+		}
+		const group = groups.get(item.shopId)
+		if (group) {
+			group.items.push(item)
+		}
+	})
+	return Array.from(groups.values())
+})
+
+const allSelected = computed(() => {
+	return cartItems.value.length > 0 && cartItems.value.every(item => item.selected)
+})
+
+const selectedCount = computed(() => {
+	return cartItems.value.filter(item => item.selected).reduce((sum, item) => sum + item.quantity, 0)
+})
+
+const totalPrice = computed(() => {
+	return cartItems.value
+		.filter(item => item.selected)
+		.reduce((sum, item) => sum + item.price * item.quantity, 0)
+		.toFixed(2)
+})
+
+const toggleManageMode = () => {
+	isManageMode.value = !isManageMode.value
+}
+
+// 初始化页面数据
+const initPage = () => {
+	const systemInfo = uni.getSystemInfoSync()
+	statusBarHeight.value = systemInfo.statusBarHeight || 0
+}
+
+// 生命周期
+onMounted(() => {
+	initPage()
+})
+
+onShow(() => {
+    loadCartData()
+})
+
+// 加载数据
+const loadCartData = () => {
+	loading.value = true
+	
+	// 从本地存储加载购物车数据
+	const cartData = uni.getStorageSync('cart')
+	if (cartData) {
+		try {
+			cartItems.value = JSON.parse(cartData as string) as any[]
+		} catch (e) {
+			console.error('解析购物车数据失败', e)
+			cartItems.value = []
+		}
+	} else {
+		// 如果本地没有数据，使用Mock数据（可选，或者直接为空）
+		// 为了演示效果，这里可以保留一部分Mock数据，或者初始化为空
+		// cartItems.value = [...mockCartItems]
+		cartItems.value = [] 
+	}
+	
+	setTimeout(() => {
+		// 模拟推荐商品加载
+		recommendProducts.value = [...mockRecommendProducts]
+		loading.value = false
+	}, 500)
+}
+
+// 监听购物车数据变化并保存到本地存储
+const saveCartData = () => {
+	uni.setStorageSync('cart', JSON.stringify(cartItems.value))
+}
+
+// 商品操作 - 增加保存逻辑
+const toggleSelect = (itemId: string) => {
+	const index = cartItems.value.findIndex(item => item.id === itemId)
+	if (index !== -1) {
+		cartItems.value[index].selected = !cartItems.value[index].selected
+		cartItems.value = [...cartItems.value] // 触发响应式更新
+		saveCartData()
+	}
+}
+
+const toggleShopSelect = (shopId: string) => {
+	const group = cartGroups.value.find((g: any) => g.shopId === shopId)
+	if (!group) return
+	
+	// 检查当前是否全选
+	const isAllShopSelected = (group.items as any[]).every((item: any) => item.selected)
+	const newState = !isAllShopSelected
+	
+	// 更新该店铺下所有商品的状态
+	cartItems.value.forEach(item => {
+		if (item.shopId === shopId) {
+			item.selected = newState
+		}
+	})
+	cartItems.value = [...cartItems.value]
+	saveCartData()
+}
+
+const toggleSelectAll = () => {
+	const newSelectedState = !allSelected.value
+	cartItems.value = cartItems.value.map(item => ({
+		...item,
+		selected: newSelectedState
+	}))
+	saveCartData()
+}
+
+const increaseQuantity = (itemId: string) => {
+	const index = cartItems.value.findIndex(item => item.id === itemId)
+	if (index !== -1) {
+		cartItems.value[index].quantity++
+		cartItems.value = [...cartItems.value]
+		saveCartData()
+	}
+}
+
+const decreaseQuantity = (itemId: string) => {
+	const index = cartItems.value.findIndex(item => item.id === itemId)
+	if (index !== -1) {
+		if (cartItems.value[index].quantity > 1) {
+			cartItems.value[index].quantity--
+			cartItems.value = [...cartItems.value]
+			saveCartData()
+		} else {
+			// 数量为1时，询问是否删除
+			uni.showModal({
+				title: '提示',
+				content: '确定要从购物车移除该商品吗？',
+				success: (res) => {
+					if (res.confirm) {
+						cartItems.value.splice(index, 1)
+						cartItems.value = [...cartItems.value]
+						saveCartData()
+						
+						uni.showToast({
+							title: '已移除',
+							icon: 'none'
+						})
+					}
+				}
+			})
+		}
+	}
+}
+
+// 删除商品 - 增加保存逻辑
+const deleteSelectedItems = () => {
+	if (selectedCount.value === 0) {
+		uni.showToast({
+			title: '请选择要删除的商品',
+			icon: 'none'
+		})
+		return
+	}
+	
+	uni.showModal({
+		title: '提示',
+		content: `确定要删除选中的 ${selectedCount.value} 件商品吗？`,
+		success: (res) => {
+			if (res.confirm) {
+				cartItems.value = cartItems.value.filter(item => !item.selected)
+				saveCartData()
+				
+				// 如果购物车删空了，退出管理模式
+				if (cartItems.value.length === 0) {
+					isManageMode.value = false
+				}
+				uni.showToast({
+					title: '删除成功',
+					icon: 'success'
+				})
+			}
+		}
+	})
+}
+
+const addToCart = (product: any) => {
+	// 获取现有购物车数据
+	const cartData = uni.getStorageSync('cart')
+	let currentItems: any[] = []
+	
+	if (cartData) {
+		try {
+			currentItems = JSON.parse(cartData as string) as any[]
+		} catch (e) {
+			console.error('解析购物车数据失败', e)
+		}
+	}
+	
+	// 检查商品是否已存在
+	const existingItem = currentItems.find((item: any) => item.id === product.id)
+	
+	if (existingItem) {
+		existingItem.quantity++
+	} else {
+		// 添加新商品
+		currentItems.push({
+			id: product.id,
+			shopId: product.shopId || 'shop_recommend',
+			shopName: product.shopName || '推荐好物',
+			name: product.name,
+			price: product.price,
+			image: product.image,
+			spec: product.specification || '默认规格', // 优先使用商品自带的规格
+			quantity: 1,
+			selected: true
+		})
+	}
+	
+	// 保存回存储
+	uni.setStorageSync('cart', JSON.stringify(currentItems))
+	
+	uni.showToast({
+		title: '已添加到购物车',
+		icon: 'success'
+	})
+	
+	// 立即刷新当前列表
+	loadCartData()
+}
+
+// 导航函数
+const goShopping = () => {
+	uni.switchTab({ url: '/pages/mall/consumer/index' })
+}
+
+const navigateToProduct = (product: any) => {
+	uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${product.id}` })
+}
+
+const goToCheckout = () => {
+	if (selectedCount.value === 0) {
+		uni.showToast({
+			title: '请选择商品',
+			icon: 'none'
+		})
+		return
+	}
+	
+	// 获取选中的商品
+	const selectedItems = cartItems.value
+		.filter(item => item.selected)
+		.map(item => ({
+			id: item.id,
+			product_id: item.id, // 使用商品ID作为product_id
+			sku_id: item.id, // 使用商品ID作为sku_id
+			product_name: item.name,
+			product_image: item.image,
+			sku_specifications: item.spec,
+			price: item.price,
+			quantity: item.quantity
+		}))
+	
+	// 跳转到结算页面并传递数据
+	uni.navigateTo({
+		url: '/pages/mall/consumer/checkout',
+		success: (res) => {
+			// 通过eventChannel传递数据
+			res.eventChannel.emit('acceptData', {
+				selectedItems: selectedItems
+			})
+		}
+	})
+}
+</script>
+
+<style>
+.cart-page {
+	width: 100%;
+	height: 100vh;
+	background-color: #f5f5f5;
+	display: flex;
+	flex-direction: column;
+}
+
+/* 智能导航栏 */
+.smart-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+	z-index: 1000;
+	box-shadow: 0 2px 12px rgba(76, 175, 80, 0.15);
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+}
+
+.nav-container {
+	padding: 0 16px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	width: 100%;
+	max-width: 1400px;
+	margin: 0 auto;
+	height: 44px; /* 统一高度 44px */
+}
+
+.nav-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: white;
+}
+
+.nav-actions {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+
+.action-btn {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	background: rgba(255, 255, 255, 0.2);
+	padding: 4px 12px;
+	border-radius: 20px;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.action-btn:hover {
+	background: rgba(255, 255, 255, 0.3);
+}
+
+.action-icon {
+	font-size: 14px;
+	margin-right: 4px;
+	color: white;
+}
+
+.action-text {
+	font-size: 12px;
+	color: white;
+	font-weight: 500;
+}
+
+/* 导航栏占位符 */
+.navbar-placeholder {
+	width: 100%;
+	flex-shrink: 0;
+}
+
+/* 内容区 */
+.cart-content {
+	flex: 1;
+	height: 0; /* 配合 flex: 1 实现自适应滚动 */
+	padding-bottom: 60px; /* 为底部结算栏留出空间 */
+}
+
+/* 空购物车 */
+.empty-cart {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 60px 20px;
+	text-align: center;
+}
+
+.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;
+}
+
+/* 购物车商品列表 */
+.cart-list {
+	background-color: transparent; /* 背景透明，因为每个店铺有自己的卡片 */
+	margin: 10px;
+	border-radius: 0;
+	overflow: visible;
+}
+
+.shop-group {
+	background-color: white;
+	border-radius: 12px;
+	margin-bottom: 12px;
+	overflow: hidden;
+}
+
+.shop-header {
+	display: flex;
+	flex-direction: row; /* 强制横向排列 */
+	align-items: center;
+	justify-content: flex-start; /* 靠左对齐 */
+	padding: 12px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.shop-select {
+	width: 24px;
+	height: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 8px;
+	flex-shrink: 0; /* 防止被压缩 */
+}
+
+.shop-icon {
+	font-size: 16px;
+	margin-right: 6px;
+	flex-shrink: 0;
+}
+
+.shop-name {
+	font-size: 14px;
+	font-weight: 600;
+	color: #333;
+	margin-right: 4px;
+	/* 自适应宽度，但不超过剩余空间 */
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.shop-arrow {
+	font-size: 12px;
+	color: #999;
+	flex-shrink: 0;
+}
+
+.cart-item {
+	display: flex;
+	flex-direction: row; /* 显式横向排列 */
+	padding: 12px; /* 减小内边距 */
+	border-bottom: 1px solid #f5f5f5;
+	align-items: center;
+	height: 100px; /* 固定高度节省空间 */
+}
+
+.cart-item:last-child {
+	border-bottom: none;
+}
+
+.item-select {
+	width: 30px; /* 减小选择框区域 */
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 5px;
+}
+
+.selected-icon {
+	width: 18px;
+	height: 18px;
+	background-color: #ff5000;
+	color: white;
+	border-radius: 50%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 10px;
+}
+
+.unselected-icon {
+	width: 18px;
+	height: 18px;
+	border: 1px solid #ddd;
+	border-radius: 50%;
+}
+
+.item-image {
+	width: 70px; /* 减小图片尺寸 */
+	height: 70px;
+	border-radius: 6px;
+	margin-right: 10px;
+	flex-shrink: 0;
+}
+
+.item-info {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	height: 70px; /* 与图片高度一致 */
+	overflow: hidden;
+}
+
+.info-top {
+	display: flex;
+	flex-direction: column;
+}
+
+.item-name {
+	font-size: 14px; /* 稍微减小字体 */
+	color: #333;
+	margin-bottom: 2px;
+	display: -webkit-box;
+	-webkit-line-clamp: 1; /* 单行显示 */
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+	font-weight: 500;
+}
+
+.item-spec {
+	font-size: 12px;
+	color: #999;
+	margin-bottom: auto; /* 自动占据中间空间 */
+}
+
+.item-footer {
+	display: flex;
+	flex-direction: row; /* 显式设置横向排列 */
+	justify-content: space-between;
+	align-items: center;
+	width: 100%; /* 确保占满宽度 */
+}
+
+.item-price {
+	font-size: 16px;
+	color: #ff5000;
+	font-weight: bold;
+}
+
+.quantity-control {
+	display: flex;
+	flex-direction: row; /* 显式设置横向排列 */
+	align-items: center;
+	background-color: #f5f5f5;
+	border-radius: 12px;
+	overflow: hidden;
+	height: 24px;
+}
+
+.quantity-btn {
+	width: 24px;
+	height: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 14px;
+	color: #666;
+}
+
+.quantity-value {
+	width: 30px;
+	text-align: center;
+	font-size: 13px;
+	line-height: 24px;
+}
+
+/* 推荐商品 */
+.recommend-section {
+	margin: 20px 10px;
+	background-color: white;
+	border-radius: 10px;
+	padding: 15px;
+}
+
+.section-header {
+	margin-bottom: 15px;
+}
+
+.section-title {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333;
+}
+
+.recommend-list {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr); /* 手机端默认双列 */
+	gap: 12px;
+}
+
+.recommend-item {
+	display: flex;
+	flex-direction: column;
+	background: #fff;
+	border-radius: 8px;
+	overflow: hidden;
+}
+
+.recommend-image {
+	width: 100%;
+	aspect-ratio: 1; /* 保持正方形比例 */
+	height: auto; /* 自动高度 */
+	object-fit: cover;
+	border-radius: 8px;
+	margin-bottom: 8px;
+	background: #f5f5f5;
+}
+
+	.recommend-name {
+		font-size: 13px;
+		color: #333;
+		margin-bottom: 5px;
+		line-height: 1.4;
+		height: 36px;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+.recommend-bottom {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding-right: 8px;
+	}
+
+	.recommend-price {
+		font-size: 15px;
+		color: #ff5000;
+		font-weight: bold;
+	}
+	
+	.recommend-add-btn {
+		width: 24px;
+		height: 24px;
+		background-color: #ff5000;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.recommend-add-icon {
+		color: white;
+		font-size: 16px;
+		line-height: 1;
+		font-weight: bold;
+	}
+
+	/* 响应式布局优化 */
+@media screen and (min-width: 768px) {
+	.cart-list, 
+	.recommend-section {
+		margin: 20px auto;
+		max-width: 95%;
+	}
+
+	.recommend-list {
+		grid-template-columns: repeat(4, 1fr); /* 平板显示4列 */
+		gap: 16px;
+	}
+}
+
+@media screen and (min-width: 1024px) {
+	/* 桌面端整体布局调整 */
+	.cart-content {
+		padding: 20px 40px;
+		background-color: #f5f5f5;
+	}
+
+	.cart-list, 
+	.recommend-section {
+		margin: 20px auto;
+		max-width: 1200px; /* 限制最大宽度 */
+	}
+
+	/* 店铺分组在桌面端显示为网格布局 */
+	.shop-group {
+		display: block;
+		background: transparent;
+		box-shadow: none;
+		border-radius: 0;
+		overflow: visible;
+	}
+
+	.shop-header {
+		background: white;
+		border-radius: 12px;
+		margin-bottom: 12px;
+		padding: 16px 24px;
+	}
+
+	/* 购物车商品列表转为列表布局 */
+	.cart-item {
+		background: white;
+		border-radius: 0;
+		padding: 15px 30px;
+		height: 80px; /* 固定高度 */
+		border-bottom: 1px solid #eee;
+		box-shadow: none;
+		display: flex;
+		flex-direction: row; /* 显式设置横向排列 */
+		align-items: center; /* 垂直居中 */
+		width: 100%;
+	}
+    
+    .cart-item:hover {
+        background-color: #f9f9f9;
+        transform: none;
+        box-shadow: none;
+    }
+
+	.item-image {
+		width: 50px;
+		height: 50px;
+		margin-right: 20px;
+		flex-shrink: 0;
+	}
+
+	.item-info {
+		flex: 1;
+        height: 100%;
+		display: flex;
+		flex-direction: row; /* 信息区域横向排列 */
+		align-items: center;
+        justify-content: space-between;
+        overflow: visible;
+	}
+    
+    .info-top {
+        flex: 1;
+		display: flex;
+        flex-direction: row; /* 名称和规格横向排列 */
+        align-items: center;
+        margin-right: 20px;
+		height: 100%;
+    }
+
+	.item-name {
+		font-size: 14px;
+        width: 250px; /* 固定名称宽度 */
+        margin-right: 20px;
+		/* 限制行数 */
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+        margin-bottom: 0;
+	}
+    
+    .item-spec {
+        width: 150px;
+        margin-bottom: 0;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+    }
+    
+    .item-footer {
+        width: auto;
+		display: flex;
+		flex-direction: row;
+        justify-content: flex-end;
+		align-items: center;
+        gap: 40px;
+		height: 100%;
+    }
+    
+    .item-price {
+        width: 100px;
+        text-align: right;
+		margin-bottom: 0;
+    }
+    
+    .quantity-control {
+        margin-left: 0;
+		display: flex;
+		flex-direction: row;
+    }
+
+	/* 推荐商品优化 */
+	.recommend-list {
+		grid-template-columns: repeat(5, 1fr); /* 桌面端显示5列 */
+		gap: 20px;
+	}
+    
+    .recommend-image {
+        height: 200px; /* 强制高度 */
+    }
+	
+	/* 底部结算栏优化 */
+	.cart-footer {
+		padding: 0 40px;
+		max-width: 100%;
+		margin: 0 auto;
+		box-shadow: 0 -2px 10px rgba(0,0,0,0.05);
+	}
+	
+	.footer-content {
+		max-width: 1200px;
+		margin: 0 auto;
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+}
+
+@media screen and (min-width: 1400px) {
+	.cart-list, 
+	.recommend-section {
+		max-width: 1400px;
+	}
+
+	/* 大屏下购物车商品显示3列 - 移除，保持单列列表 */
+	/* .cart-list .shop-group > view:not(.shop-header) {
+		grid-template-columns: repeat(3, 1fr);
+	} */
+
+	.recommend-list {
+		grid-template-columns: repeat(6, 1fr); /* 大屏幕显示6列 */
+	}
+	
+	.footer-content {
+		max-width: 1400px;
+	}
+}
+
+/* 底部结算栏 */
+.cart-footer {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 60px;
+	background-color: white;
+	border-top: 1px solid #eee;
+	display: flex;
+	align-items: center;
+	justify-content: center; /* 居中内容 */
+	padding: 0 15px;
+	z-index: 900;
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+.footer-content {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.footer-left {
+	display: flex;
+	align-items: center;
+}
+
+.select-all {
+	display: flex;
+	align-items: center;
+}
+
+.select-all-text {
+	margin-left: 8px;
+	font-size: 14px;
+	color: #333;
+}
+
+.footer-right {
+	display: flex;
+	align-items: center;
+}
+
+.total-info {
+	margin-right: 15px;
+	text-align: right;
+}
+
+.total-text {
+	font-size: 14px;
+	color: #333;
+	margin-right: 5px;
+}
+
+.total-price {
+	font-size: 18px;
+	color: #ff5000;
+	font-weight: bold;
+}
+
+.checkout-btn {
+	background-color: #ff5000;
+	color: white;
+	border: none;
+	border-radius: 25px;
+	padding: 8px 20px;
+	font-size: 14px;
+}
+
+.delete-btn {
+	background-color: #ff3b30; /* 红色删除按钮 */
+	color: white;
+	border: none;
+	border-radius: 25px;
+	padding: 8px 25px;
+	font-size: 14px;
+}
+</style>
diff --git a/pages/mall/consumer/category - 副本.uvue b/pages/mall/consumer/category - 副本.uvue
new file mode 100644
index 00000000..d217ab27
--- /dev/null
+++ b/pages/mall/consumer/category - 副本.uvue	
@@ -0,0 +1,131 @@
+<!-- 只替换 <style> 部分，其他保持不变 -->
+<style>
+/* ...（前面的样式如 .category-page, .search-bar 等保持不变）... */
+
+/* 分类内容区 —— 关键修复 */
+.category-content {
+    display: flex;
+    margin-top: 60px;
+    padding: 0 16px;
+    max-width: 1400px;
+    margin: 60px auto 0 auto; /* 更安全的居中 */
+    width: 100%;
+    gap: 20px;
+    min-height: calc(100vh - 60px); /* 避免内容太短时布局塌陷 */
+}
+
+/* 左侧一级分类 */
+.primary-category {
+    width: 120px;
+    background: white;
+    border-radius: 12px;
+    padding: 12px 0;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    flex-shrink: 0;
+    height: fit-content; /* 防止拉伸 */
+    max-height: calc(100vh - 80px); /* 避免溢出屏幕 */
+    overflow-y: auto;
+}
+
+/* 右侧商品区域 —— 必须 flex: 1 才能占满剩余空间 */
+.product-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-width: 0; /* 防止 flex 子项溢出 */
+    background: #f8fafc; /* 与背景一致，或可设为 white */
+    padding: 16px 0;
+    border-radius: 12px;
+}
+
+/* 商品网格容器需要滚动时也能正常工作 */
+.product-content > * {
+    flex-shrink: 0; /* 防止 header/grid 被压缩 */
+}
+
+/* ===== 响应式：小屏手机 (小于等于 414px) ===== */
+@media screen and (max-width: 414px) {
+    .category-content {
+        flex-direction: column;
+        padding: 0 12px;
+        margin-top: 55px; /* 匹配搜索栏高度 */
+    }
+
+    .primary-category {
+        width: 100%;
+        display: flex;
+        flex-wrap: wrap;
+        padding: 8px;
+        height: auto;
+        max-height: none;
+        overflow: visible;
+    }
+
+    .primary-item {
+        width: calc(25% - 8px);
+        margin: 4px;
+        padding: 10px 8px;
+        text-align: center;
+    }
+
+    .primary-icon {
+        margin-right: 0;
+        margin-bottom: 4px;
+        font-size: 16px;
+    }
+
+    .primary-name {
+        font-size: 12px;
+    }
+
+    .product-grid {
+        grid-template-columns: 1fr;
+        gap: 16px;
+    }
+
+    .search-container {
+        padding: 0 12px;
+        height: 55px;
+    }
+
+    .search-box {
+        padding: 8px 16px;
+    }
+
+    .category-header {
+        padding: 0;
+    }
+}
+
+/* 中屏及以上保持网格列数变化，但布局仍是左右 */
+@media screen and (min-width: 415px) {
+    .product-grid {
+        display: grid;
+        gap: 20px;
+    }
+}
+
+@media screen and (min-width: 415px) and (max-width: 768px) {
+    .product-grid {
+        grid-template-columns: repeat(2, 1fr);
+    }
+}
+
+@media screen and (min-width: 769px) and (max-width: 1024px) {
+    .product-grid {
+        grid-template-columns: repeat(3, 1fr);
+    }
+}
+
+@media screen and (min-width: 1025px) {
+    .product-grid {
+        grid-template-columns: repeat(4, 1fr);
+    }
+}
+
+@media screen and (min-width: 1400px) {
+    .product-grid {
+        grid-template-columns: repeat(5, 1fr);
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/category.uvue b/pages/mall/consumer/category.uvue
new file mode 100644
index 00000000..5c02cd56
--- /dev/null
+++ b/pages/mall/consumer/category.uvue
@@ -0,0 +1,1419 @@
+<template>
+    <view class="category-page">
+        <!-- 顶部搜索栏 -->
+        <view class="search-bar" :style="{ paddingTop: statusBarHeight + 'px' }">
+            <view class="search-container">
+                <view class="search-box" @click="navigateToSearch" :style="{ height: '30px' }">
+                    <!-- 模拟输入框 -->
+                    <text class="search-placeholder">请输入药品名称、症状或品牌</text>
+                    
+                    <!-- 扫码图标 -->
+                    <view class="nav-icon-btn" @click.stop="onScan">
+                        <text class="nav-icon">🔳</text>
+                    </view>
+
+                    <!-- 相机图标 -->
+                    <view class="nav-camera-btn" @click.stop="onCamera">
+                        <text class="nav-camera-icon">📷</text>
+                    </view>
+                    
+                    <!-- 搜索按钮 -->
+                    <view class="nav-inner-search-btn" :style="{ height: '22px' }">
+                        <text class="nav-inner-search-text">搜索</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 分类内容区 -->
+        <view 
+            class="category-content"
+            :style="{ 
+                marginTop: (statusBarHeight + headerHeight + 10) + 'px',
+                height: `calc(100vh - ${statusBarHeight + headerHeight + 10}px)`
+            }"
+        >
+            <!-- 左侧一级分类 -->
+            <scroll-view scroll-y class="primary-category">
+                <view 
+                    v-for="item in primaryCategories" 
+                    :key="item.id"
+                    :class="['primary-item', { active: activePrimary === item.id }]"
+                    @click="selectPrimaryCategory(item.id)"
+                    :style="{ backgroundColor: activePrimary === item.id ? item.color : 'transparent' }"
+                >
+                    <text class="primary-icon">{{ item.icon }}</text>
+                    <text class="primary-name">{{ item.name }}</text>
+                </view>
+            </scroll-view>
+            
+            <!-- 右侧商品列表 -->
+            <scroll-view scroll-y class="product-content">
+                <!-- 分类标题 -->
+                <view class="category-header">
+                    <text class="category-title">{{ currentCategoryName }}</text>
+                    <text class="category-desc">{{ currentCategoryDesc }}</text>
+                </view>
+                
+                <!-- 商品网格 -->
+                <view v-if="productList.length > 0" class="product-grid">
+                    <view 
+                        v-for="product in productList" 
+                        :key="product.id"
+                        class="product-card"
+                        @click="navigateToProduct(product)"
+                    >
+                        <view class="product-badge" v-if="product.badge">{{ product.badge }}</view>
+                        <image 
+                            class="product-image" 
+                            :src="product.image" 
+                            mode="aspectFill"
+                        />
+                        <view class="product-info">
+                            <text class="product-name">{{ product.name }}</text>
+                            <text class="product-spec">{{ product.specification }}</text>
+                            
+                            <view class="price-section">
+                                <view class="current-price">
+                                    <text class="price-symbol">¥</text>
+                                    <text class="price-value">{{ product.price }}</text>
+                                </view>
+                                <text class="original-price" v-if="product.originalPrice > product.price">
+                                    ¥{{ product.originalPrice }}
+                                </text>
+                            </view>
+                            
+                            <view class="product-meta">
+                                <text class="manufacturer">{{ product.manufacturer }}</text>
+                                <view class="sales-info">
+                                    <text class="sales-count">已售{{ product.sales }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                
+                <!-- 空状态 -->
+                <view v-else class="empty-state">
+                    <text class="empty-icon">💊</text>
+                    <text class="empty-text">暂无相关药品</text>
+                    <text class="empty-desc">该分类下暂无商品，敬请期待</text>
+                </view>
+                
+                <!-- 加载更多提示 -->
+                <view v-if="hasMore" class="load-more">
+                    <text class="load-text">上拉加载更多</text>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+
+// 响应式数据
+const statusBarHeight = ref(0)
+const headerHeight = ref(44) // 默认头部高度
+const primaryCategories = ref<any[]>([])
+const productList = ref<any[]>([])
+const activePrimary = ref<string>('cold')
+const cartCount = ref(3)
+const hasMore = ref(true)
+
+// 获取当前分类信息
+const currentCategoryName = ref('感冒发烧')
+const currentCategoryDesc = ref('解热镇痛')
+
+// 页面参数
+const pageParams = ref<any>({})
+
+// 医药分类数据（与主页一致）
+const medicineCategories = [
+    { id: 'cold', name: '感冒发烧', icon: '🤧', desc: '解热镇痛', color: '#2196F3' },
+    { id: 'stomach', name: '肠胃用药', icon: '🤢', desc: '消化系统', color: '#4CAF50' },
+    { id: 'pain', name: '止痛消炎', icon: '💊', desc: '镇痛消炎', color: '#F44336' },
+    { id: 'skin', name: '皮肤用药', icon: '🤕', desc: '皮肤护理', color: '#9C27B0' },
+    { id: 'vitamin', name: '维生素', icon: '🍊', desc: '营养补充', color: '#FF9800' },
+    { id: 'chronic', name: '慢性病', icon: '🫀', desc: '长期管理', color: '#795548' },
+    { id: 'child', name: '儿童用药', icon: '👶', desc: '儿童专用', color: '#00BCD4' },
+    { id: 'external', name: '外用药品', icon: '🧴', desc: '外用制剂', color: '#8BC34A' },
+    { id: 'device', name: '医疗器械', icon: '🩺', desc: '医疗设备', color: '#607D8B' },
+    { id: 'health', name: '健康食品', icon: '🥗', desc: '保健食品', color: '#FFC107' }
+]
+
+// Mock 商品数据 - 使用本地图片避免网络请求
+const mockProducts = {
+    cold: [
+        {
+            id: 'cold1',
+            shopId: 'shop_001',
+            shopName: '修正药业官方旗舰店',
+            name: '布洛芬缓释胶囊',
+            specification: '0.3g*24粒',
+            price: 18.5,
+            originalPrice: 25.8,
+            image: '/static/images/default-product.png',
+            manufacturer: '修正药业',
+            sales: 2560,
+            badge: '热销'
+        },
+        {
+            id: 'cold2',
+            shopId: 'shop_002',
+            shopName: '白云山大药房',
+            name: '板蓝根颗粒',
+            specification: '10g*20袋',
+            price: 22.8,
+            originalPrice: 29.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '白云山',
+            sales: 1890,
+            badge: '推荐'
+        },
+        {
+            id: 'cold3',
+            shopId: 'shop_003',
+            shopName: '以岭药业自营店',
+            name: '连花清瘟胶囊',
+            specification: '0.35g*36粒',
+            price: 42.8,
+            originalPrice: 48.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '以岭药业',
+            sales: 3200,
+            badge: '爆款'
+        },
+        {
+            id: 'cold4',
+            shopId: 'shop_004',
+            shopName: '强生制药旗舰店',
+            name: '对乙酰氨基酚片',
+            specification: '0.5g*12片',
+            price: 8.9,
+            originalPrice: 12.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '强生制药',
+            sales: 1420,
+            badge: '特价'
+        },
+        {
+            id: 'cold5',
+            shopId: 'shop_005',
+            shopName: '同仁堂大药房',
+            name: '感冒清热颗粒',
+            specification: '3g*10袋',
+            price: 16.5,
+            originalPrice: 19.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '同仁堂',
+            sales: 980,
+            badge: '新品'
+        },
+        {
+            id: 'cold6',
+            shopId: 'shop_006',
+            shopName: '三九医药旗舰店',
+            name: '复方氨酚烷胺片',
+            specification: '10片/盒',
+            price: 12.8,
+            originalPrice: 15.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '三九医药',
+            sales: 1650,
+            badge: '家庭装'
+        }
+    ],
+    
+    stomach: [
+        {
+            id: 'stomach1',
+            shopId: 'shop_006',
+            shopName: '三九医药旗舰店',
+            name: '胃康灵胶囊',
+            specification: '0.4g*24粒',
+            price: 32.8,
+            originalPrice: 38.5,
+            image: '/static/images/default-product.png',
+            manufacturer: '三九医药',
+            sales: 890,
+            badge: '热销'
+        },
+        {
+            id: 'stomach2',
+            shopId: 'shop_007',
+            shopName: '阿斯利康医药',
+            name: '奥美拉唑肠溶胶囊',
+            specification: '20mg*14粒',
+            price: 28.5,
+            originalPrice: 35.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '阿斯利康',
+            sales: 1250,
+            badge: '处方药'
+        },
+        {
+            id: 'stomach3',
+            shopId: 'shop_008',
+            shopName: '江中制药旗舰店',
+            name: '健胃消食片',
+            specification: '0.8g*32片',
+            price: 15.9,
+            originalPrice: 19.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '江中制药',
+            sales: 2100,
+            badge: '推荐'
+        },
+        {
+            id: 'stomach4',
+            shopId: 'shop_009',
+            shopName: '益普生大药房',
+            name: '蒙脱石散',
+            specification: '3g*10袋',
+            price: 18.6,
+            originalPrice: 22.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '益普生',
+            sales: 1780,
+            badge: '止泻'
+        },
+        {
+            id: 'stomach5',
+            shopId: 'shop_010',
+            shopName: '西安杨森旗舰店',
+            name: '多潘立酮片',
+            specification: '10mg*30片',
+            price: 22.8,
+            originalPrice: 26.5,
+            image: '/static/images/default-product.png',
+            manufacturer: '西安杨森',
+            sales: 950,
+            badge: '促消化'
+        },
+        {
+            id: 'stomach6',
+            shopId: 'shop_011',
+            shopName: '拜耳医药自营店',
+            name: '铝碳酸镁咀嚼片',
+            specification: '0.5g*20片',
+            price: 25.9,
+            originalPrice: 29.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '拜耳',
+            sales: 1320,
+            badge: '护胃'
+        }
+    ],
+    
+    pain: [
+        {
+            id: 'pain1',
+            shopId: 'shop_012',
+            shopName: '华北制药旗舰店',
+            name: '阿莫西林胶囊',
+            specification: '0.25g*24粒',
+            price: 28.5,
+            originalPrice: 35.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '华北制药',
+            sales: 1560,
+            badge: '处方药'
+        },
+        {
+            id: 'pain2',
+            shopId: 'shop_013',
+            shopName: '诺华制药旗舰店',
+            name: '双氯芬酸钠缓释片',
+            specification: '75mg*10片',
+            price: 19.8,
+            originalPrice: 24.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '诺华制药',
+            sales: 1280,
+            badge: '止痛'
+        },
+        {
+            id: 'pain3',
+            shopId: 'shop_014',
+            shopName: '云南白药旗舰店',
+            name: '云南白药胶囊',
+            specification: '0.25g*32粒',
+            price: 35.9,
+            originalPrice: 42.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '云南白药',
+            sales: 2350,
+            badge: '经典'
+        },
+        {
+            id: 'pain4',
+            shopId: 'shop_015',
+            shopName: '辉瑞医药旗舰店',
+            name: '塞来昔布胶囊',
+            specification: '0.2g*10粒',
+            price: 48.6,
+            originalPrice: 55.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '辉瑞',
+            sales: 890,
+            badge: '抗炎'
+        },
+        {
+            id: 'pain5',
+            shopId: 'shop_016',
+            shopName: '中美史克大药房',
+            name: '布洛芬片',
+            specification: '0.1g*24片',
+            price: 12.5,
+            originalPrice: 15.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '中美史克',
+            sales: 1680,
+            badge: '经济装'
+        },
+        {
+            id: 'pain6',
+            shopId: 'shop_002',
+            shopName: '白云山大药房',
+            name: '头孢克肟胶囊',
+            specification: '0.1g*6粒',
+            price: 32.8,
+            originalPrice: 38.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '广州白云山',
+            sales: 1120,
+            badge: '抗生素'
+        }
+    ]
+}
+
+// 补充其他分类的默认数据（简化版）
+const generateDefaultProducts = (categoryId: string) => {
+    const baseProducts = [
+        { name: '通用药品1', price: 25.8, manufacturer: '知名药企', sales: 1200 },
+        { name: '通用药品2', price: 18.5, manufacturer: '知名药企', sales: 950 },
+        { name: '通用药品3', price: 32.0, manufacturer: '知名药企', sales: 1450 },
+        { name: '通用药品4', price: 22.8, manufacturer: '知名药企', sales: 880 },
+        { name: '通用药品5', price: 28.9, manufacturer: '知名药企', sales: 1100 },
+        { name: '通用药品6', price: 19.9, manufacturer: '知名药企', sales: 920 }
+    ]
+    
+    return baseProducts.map((product, index) => ({
+        id: `${categoryId}${index + 1}`,
+        shopId: `shop_default_${categoryId}_${index}`, // 确保不同分类店铺ID不同
+        shopName: '平台自营大药房',
+        ...product,
+        specification: '规格待定',
+        originalPrice: product.price * 1.2,
+        image: '/static/images/default-product.png',
+        badge: index === 0 ? '热销' : index === 1 ? '推荐' : ''
+    }))
+}
+
+// 生命周期
+onMounted(() => {
+    initPage()
+    
+    console.log('=== category页面onMounted被调用 ===')
+    
+    // 在onMounted中只初始化页面，不处理分类参数
+    // 分类参数的处理交给onLoad函数，因为onLoad在页面加载时执行
+    console.log('onMounted中不处理分类参数，等待onLoad处理')
+    
+    // 注意：这里不再默认选择分类，让onLoad函数处理分类选择
+    // 如果onLoad没有设置分类，则保持默认状态
+})
+
+// 页面加载时处理参数 - 这是处理分类切换的主要入口
+onLoad((options: any) => {
+	console.log('=== category页面onLoad被调用 ===')
+	console.log('页面加载时间:', Date.now())
+	console.log('传入的options参数:', options)
+	console.log('当前活动分类:', activePrimary.value)
+	
+	let categoryId = ''
+	let categoryName = ''
+	
+	// 首先检查传入的options参数
+	if (options && options.categoryId) {
+		categoryId = options.categoryId
+		categoryName = options.name || ''
+		console.log('✅ onLoad中找到分类参数:', categoryId, categoryName)
+	}
+	
+	// 如果options中没有，尝试从getCurrentPages()获取
+	if (!categoryId) {
+		const pages = getCurrentPages()
+		if (pages.length > 0) {
+			const currentPage = pages[pages.length - 1]
+			const pageOptions = currentPage.options || {}
+			console.log('从getCurrentPages()获取参数:', pageOptions)
+			
+			if (pageOptions.categoryId) {
+				categoryId = pageOptions.categoryId
+				categoryName = pageOptions.name || ''
+				console.log('✅ 从getCurrentPages()找到分类参数:', categoryId, categoryName)
+			}
+		}
+	}
+	
+	// 如果有找到分类ID，则选中对应的分类
+	if (categoryId) {
+		console.log('✅ 准备选中分类:', categoryId)
+		console.log('分类名称:', categoryName || '未指定')
+		
+		// 检查是否需要更新分类
+		if (activePrimary.value !== categoryId) {
+			console.log('当前分类:', activePrimary.value, '与目标分类:', categoryId, '不同，需要更新')
+			console.log('准备调用selectPrimaryCategory函数...')
+			selectPrimaryCategory(categoryId)
+		} else {
+			console.log('当前分类已经是目标分类，但可能用户想要刷新页面')
+			console.log('当前分类:', activePrimary.value, '目标分类:', categoryId)
+			// 即使分类相同，也重新加载数据，确保数据是最新的
+			// 添加一个小的延迟，确保页面完全显示后再更新数据
+			setTimeout(() => {
+				selectPrimaryCategory(categoryId)
+			}, 100)
+		}
+	} else {
+		console.log('⚠️ onLoad中未找到分类参数，使用默认分类')
+		// 默认选中第一个分类
+		const defaultCategory = 'cold'
+		console.log('默认分类:', defaultCategory)
+		
+		// 无论如何都重新加载一次默认分类的数据
+		setTimeout(() => {
+			selectPrimaryCategory(defaultCategory)
+		}, 100)
+	}
+	
+	console.log('=== category页面onLoad执行完成 ===')
+})
+
+// 页面显示时也检查参数，确保从其他页面返回时能正确显示
+onShow(() => {
+	console.log('=== category页面onShow被调用 ===')
+	console.log('页面显示时间:', Date.now())
+	console.log('当前活动分类:', activePrimary.value)
+	
+	// 在onShow中，我们也需要检查是否有新的参数
+	// 因为当从主页再次点击分类跳转过来时，可能不会触发onLoad
+	// 而是触发onShow
+	
+	// 获取当前页面实例和参数
+	const pages = getCurrentPages()
+	if (pages.length > 0) {
+		const currentPage = pages[pages.length - 1]
+		const pageOptions = currentPage.options || {}
+		console.log('onShow中获取参数:', pageOptions)
+		
+		// 检查是否有分类参数
+		if (pageOptions.categoryId) {
+			const categoryId = pageOptions.categoryId
+			const categoryName = pageOptions.name || ''
+			
+			console.log('✅ onShow中找到分类参数:', categoryId, categoryName)
+			console.log('URL中的时间戳参数:', pageOptions.timestamp)
+			console.log('URL中的随机参数:', pageOptions.random)
+			
+			// 检查是否需要更新分类
+			if (activePrimary.value !== categoryId) {
+				console.log('当前分类:', activePrimary.value, '与目标分类:', categoryId, '不同，需要更新')
+				console.log('准备调用selectPrimaryCategory函数...')
+				selectPrimaryCategory(categoryId)
+			} else {
+				console.log('当前分类已经是目标分类，但可能用户想要刷新页面')
+				console.log('当前分类:', activePrimary.value, '目标分类:', categoryId)
+				// 即使分类相同，也重新加载数据，确保数据是最新的
+				// 添加一个小的延迟，确保页面完全显示后再更新数据
+				setTimeout(() => {
+					selectPrimaryCategory(categoryId)
+				}, 100)
+			}
+		} else {
+			console.log('⚠️ onShow中未找到分类参数')
+			console.log('尝试从URL中解析参数...')
+			
+			// 尝试从当前页面的URL中解析参数
+			const currentUrl = currentPage.route || ''
+			console.log('当前页面路由:', currentUrl)
+			
+			// 如果URL中有查询参数，尝试解析
+			if (currentPage.$page && currentPage.$page.fullPath) {
+				const fullPath = currentPage.$page.fullPath
+				console.log('完整路径:', fullPath)
+				
+				// 尝试解析查询参数
+				const queryIndex = fullPath.indexOf('?')
+				if (queryIndex > -1) {
+					const queryString = fullPath.substring(queryIndex + 1)
+					console.log('查询字符串:', queryString)
+					
+					// 简单解析查询参数
+					const params = new URLSearchParams(queryString)
+					const urlCategoryId = params.get('categoryId')
+					if (urlCategoryId) {
+						console.log('✅ 从URL解析到分类参数:', urlCategoryId)
+						selectPrimaryCategory(urlCategoryId)
+					}
+				}
+			}
+		}
+	}
+	
+	console.log('=== category页面onShow执行完成 ===')
+})
+
+// 初始化页面
+const initPage = () => {
+    const systemInfo = uni.getSystemInfoSync()
+    statusBarHeight.value = systemInfo.statusBarHeight || 0
+    
+    // 保持与主页一致的固定高度计算，不进行动态调整
+    // 这样在移动端会与主页的视觉体验保持一致（主页占位符固定为44px）
+    headerHeight.value = 10
+    
+    // 获取页面参数
+    const pages = getCurrentPages()
+    if (pages.length > 0) {
+        const currentPage = pages[pages.length - 1]
+        pageParams.value = currentPage.options || {}
+    }
+    
+    // 加载分类数据
+    primaryCategories.value = medicineCategories
+}
+
+// 选择一级分类
+const selectPrimaryCategory = (categoryId: string) => {
+    console.log('=== selectPrimaryCategory函数开始执行 ===')
+    console.log('传入的categoryId:', categoryId)
+    console.log('当前时间:', Date.now())
+    
+    // 验证categoryId是否有效
+    if (!categoryId) {
+        console.error('categoryId为空，使用默认分类')
+        categoryId = 'cold'
+    }
+    
+    console.log('验证后的categoryId:', categoryId)
+    console.log('当前activePrimary的值:', activePrimary.value)
+    
+    // 更新活动分类
+    activePrimary.value = categoryId
+    console.log('更新后的activePrimary:', activePrimary.value)
+    
+    // 更新当前分类信息
+    const category = medicineCategories.find(cat => cat.id === categoryId)
+    if (category) {
+        currentCategoryName.value = category.name
+        currentCategoryDesc.value = category.desc
+        console.log('✅ 找到分类:', category.name, '描述:', category.desc)
+    } else {
+        console.error('❌ 未找到分类ID:', categoryId, '，使用默认分类')
+        // 如果找不到对应的分类，使用第一个分类
+        if (medicineCategories.length > 0) {
+            const firstCategory = medicineCategories[0]
+            currentCategoryName.value = firstCategory.name
+            currentCategoryDesc.value = firstCategory.desc
+            activePrimary.value = firstCategory.id
+            categoryId = firstCategory.id
+            console.log('使用默认分类:', firstCategory.name)
+        }
+    }
+    
+    console.log('准备加载商品数据...')
+    
+    // 加载对应商品
+    if (mockProducts[categoryId]) {
+        productList.value = mockProducts[categoryId]
+        console.log('✅ 加载mock商品数据成功')
+        console.log('分类:', categoryId)
+        console.log('商品数量:', mockProducts[categoryId].length)
+        console.log('商品列表:', mockProducts[categoryId])
+    } else {
+        productList.value = generateDefaultProducts(categoryId)
+        console.log('✅ 加载默认商品数据成功')
+        console.log('分类:', categoryId)
+        console.log('商品数量:', productList.value.length)
+        console.log('商品列表:', productList.value)
+    }
+    
+    hasMore.value = true
+    
+    // 验证数据是否已正确更新
+    console.log('数据更新验证:')
+    console.log('activePrimary:', activePrimary.value)
+    console.log('currentCategoryName:', currentCategoryName.value)
+    console.log('currentCategoryDesc:', currentCategoryDesc.value)
+    console.log('productList长度:', productList.value.length)
+    
+    console.log('=== selectPrimaryCategory函数执行完成 ===')
+}
+
+// 添加到购物车
+const addToCart = (product: any) => {
+    // 获取现有购物车数据
+    const cartData = uni.getStorageSync('cart')
+    let cartItems: any[] = []
+    
+    if (cartData) {
+        try {
+            cartItems = JSON.parse(cartData as string) as any[]
+        } catch (e) {
+            console.error('解析购物车数据失败', e)
+        }
+    }
+    
+    // 检查商品是否已存在
+    const existingItem = cartItems.find((item: any) => item.id === product.id)
+    
+    if (existingItem) {
+        existingItem.quantity++
+    } else {
+        // 添加新商品
+        cartItems.push({
+            id: product.id,
+            shopId: product.shopId || 'shop_default',
+            shopName: product.shopName || product.manufacturer || '自营店铺',
+            name: product.name,
+            price: product.price,
+            image: product.image,
+            spec: product.specification || '默认规格',
+            quantity: 1,
+            selected: true
+        })
+    }
+    
+    // 保存回存储
+    uni.setStorageSync('cart', JSON.stringify(cartItems))
+    
+    uni.showToast({
+        title: '已添加到购物车',
+        icon: 'success'
+    })
+    cartCount.value++
+}
+
+// 导航函数
+const navigateToSearch = () => uni.navigateTo({ url: '/pages/mall/consumer/search' })
+const navigateToCart = () => uni.navigateTo({ url: '/pages/medicine/cart' })
+const navigateToProduct = (product: any) => {
+    uni.navigateTo({
+        url: `/pages/mall/consumer/product-detail?productId=${product.id}&price=${product.price}&originalPrice=${product.originalPrice || ''}`
+    })
+}
+
+// 相机功能
+const onCamera = () => {
+    uni.chooseImage({
+        count: 1,
+        sourceType: ['camera'],
+        success: (res) => {
+            console.log('相机拍摄成功:', res.tempFilePaths[0])
+            uni.showToast({
+                title: '已拍摄，正在识别...',
+                icon: 'loading'
+            })
+            // 这里可以添加后续的识别逻辑
+            setTimeout(() => {
+                 uni.showToast({
+                    title: '识别成功',
+                    icon: 'success'
+                })
+            }, 1000)
+        },
+        fail: (err) => {
+            console.error('相机调用失败:', err)
+        }
+    })
+}
+
+// 扫码功能
+const onScan = () => {
+    uni.scanCode({
+        success: (res) => {
+            console.log('扫码成功:', res)
+            uni.showToast({
+                title: '扫码成功: ' + res.result,
+                icon: 'none'
+            })
+        },
+        fail: (err) => {
+            console.error('扫码失败:', err)
+        }
+    })
+}
+</script>
+
+<style>
+.category-page {
+    width: 100%;
+    min-height: 100vh;
+    background-color: #f8fafc;
+    display: flex;
+    flex-direction: column;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', sans-serif;
+}
+/* 搜索栏 */
+.search-bar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+    z-index: 1000;
+    box-shadow: 0 2px 12px rgba(76, 175, 80, 0.15);
+}
+
+/* 搜索栏 */
+/* 导航栏搜索框容器内边距调整 */
+.search-container {
+    height: 44px; /* 调整为与消息页一致的高度 */
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    max-width: 1400px;
+    margin: 0 auto;
+    width: 100%;
+}
+
+/* 搜索框 hover 效果 */
+.search-box:hover {
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+/* 导航栏搜索框容器内边距调整 */
+.search-box {
+    flex: 1;
+    max-width: 600px;
+    background: #f0f0f0;
+    border-radius: 20px;
+    padding: 0 4px 0 12px;
+    display: flex;
+    flex-direction: row; /* UVUE 显式设置 row */
+    align-items: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    width: 100%;
+    height: 32px; /* 减小高度，与顶部高度44px适配，略小于顶部高度 */
+}
+
+.search-placeholder {
+    font-size: 14px;
+    color: #999;
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.nav-inner-search-text {
+    font-size: 12px; /* 字体稍微变小 */
+    color: #ffffff;
+    font-weight: 500;
+}
+
+.icon {
+    font-size: 22px;
+    color: white;
+}
+
+.nav-icon-btn {
+    padding: 4px 8px 4px 4px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    border-right: 1px solid #ddd;
+    margin-right: 8px;
+}
+
+.nav-icon {
+    font-size: 18px;
+}
+
+.nav-camera-btn {
+    padding: 4px 8px 4px 4px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    border-right-width: 1px;
+    border-right-style: solid;
+    border-right-color: #ddd;
+    border-right: 1px solid #ddd; /* 修复UVUE样式 */
+    margin-right: 8px;
+}
+
+.nav-camera-icon {
+    font-size: 20px;
+}
+
+/* 搜索按钮高度微调 */
+.nav-inner-search-btn {
+    padding: 0 12px; /* 减小内边距 */
+    background-color: #87CEEB; /* 天空蓝 */
+    border-radius: 16px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    height: 24px; /* 随搜索框高度减小而减小 */
+}
+
+.cart-badge {
+    position: absolute;
+    top: -5px;
+    right: -5px;
+    background: #FF5722;
+    color: white;
+    font-size: 10px;
+    min-width: 18px;
+    height: 18px;
+    border-radius: 9px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 4px;
+    border: 2px solid #4CAF50;
+}
+
+/* 分类内容区 */
+.category-content {
+    display: flex;
+    flex-direction: row; /* 强制水平排列 */
+    /* margin-top: 44px; 已通过 style 动态绑定 */
+    padding: 0 16px;
+    max-width: 1400px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 100%;
+    gap: 20px;
+    /* height: calc(100vh - 44px); 已通过 style 动态绑定 */
+    overflow: hidden; /* 防止整体滚动 */
+}
+
+/* 左侧一级分类 */
+.primary-category {
+    width: 120px;
+    height: 100%; /* 占满父容器高度 */
+    background: white;
+    border-radius: 12px;
+    padding: 12px 0;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    flex-shrink: 0;
+    overflow-y: auto; /* 允许内部滚动 */
+}
+
+.primary-item {
+    display: flex;
+    flex-direction: column; /* 图标和文字垂直排列 */
+    align-items: center;
+    justify-content: center;
+    padding: 12px 8px;
+    margin: 4px 8px;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    color: #666;
+    text-align: center;
+}
+
+.primary-item:hover {
+    transform: translateY(-2px); /* 悬停时向上浮动 */
+}
+
+.primary-item.active {
+    color: white !important;
+    font-weight: bold;
+}
+
+.primary-icon {
+    font-size: 24px;
+    margin-bottom: 6px;
+    margin-right: 0; /* 移除右边距 */
+    text-align: center;
+    display: block;
+}
+
+.primary-name {
+    font-size: 13px;
+    line-height: 1.4;
+    display: block;
+}
+
+/* 右侧内容区 */
+.product-content {
+    flex: 1;
+    height: 100%; /* 占满父容器高度 */
+    padding: 0; /* 移除内边距，交给内部元素 */
+    overflow-y: auto; /* 允许内部滚动 */
+}
+
+.category-header {
+    margin-bottom: 16px;
+    padding: 16px 8px 0 8px;
+    position: sticky;
+    top: 0;
+    background-color: #f8fafc;
+    z-index: 10;
+}
+
+.category-title {
+    font-size: 20px;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 4px;
+}
+
+.category-desc {
+    font-size: 14px;
+    color: #666;
+}
+
+/* 商品网格 */
+.product-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+    gap: 20px;
+}
+
+.product-card {
+    background: white;
+    border-radius: 12px;
+    overflow: hidden;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    border: 1px solid #e0e0e0;
+    position: relative;
+}
+
+.product-card:hover {
+    transform: translateY(-4px);
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-badge {
+    position: absolute;
+    top: 12px;
+    left: 12px;
+    background: #FF5722;
+    color: white;
+    font-size: 11px;
+    padding: 4px 12px;
+    border-radius: 12px;
+    font-weight: 600;
+    z-index: 2;
+}
+
+.product-image {
+    width: 100%;
+    height: 160px;
+    object-fit: cover;
+    background: white;
+}
+
+.product-info {
+    padding: 16px;
+}
+
+.product-name {
+    font-size: 15px;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 4px;
+    display: block;
+    line-height: 1.4;
+}
+
+.product-spec {
+    font-size: 13px;
+    color: #666;
+    margin-bottom: 12px;
+    display: block;
+}
+
+.price-section {
+    display: flex;
+    align-items: baseline;
+    gap: 8px;
+    margin-bottom: 12px;
+}
+
+.current-price {
+    display: flex;
+    align-items: baseline;
+}
+
+.price-symbol {
+    font-size: 14px;
+    color: #FF5722;
+}
+
+.price-value {
+    font-size: 20px;
+    font-weight: bold;
+    color: #FF5722;
+    margin-left: 2px;
+}
+
+.original-price {
+    font-size: 13px;
+    color: #999;
+    text-decoration: line-through;
+}
+
+.product-meta {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+    margin-bottom: 12px;
+}
+
+.manufacturer {
+    color: #666;
+}
+
+.sales-count {
+    color: #999;
+}
+
+.product-action {
+    margin-top: 12px;
+}
+
+.cart-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+    background: #4CAF50;
+    color: white;
+    padding: 8px 12px;
+    border-radius: 8px;
+    font-size: 13px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.cart-btn:hover {
+    background: #388E3C;
+}
+
+.cart-icon {
+    font-size: 14px;
+}
+
+/* 空状态 */
+.empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 60px 20px;
+    text-align: center;
+}
+
+.empty-icon {
+    font-size: 60px;
+    color: #4CAF50;
+    margin-bottom: 15px;
+}
+
+.empty-text {
+    font-size: 18px;
+    color: #333;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+.empty-desc {
+    font-size: 14px;
+    color: #666;
+}
+
+/* 加载更多 */
+.load-more {
+    text-align: center;
+    padding: 20px 0;
+    color: #999;
+    font-size: 14px;
+}
+
+.load-text {
+    display: inline-block;
+    padding: 8px 16px;
+    background: #f5f5f5;
+    border-radius: 20px;
+}
+
+/* ===== 响应式设计 ===== */
+
+/* 小屏手机 (小于414px) */
+@media screen and (max-width: 414px) {
+    .category-content {
+        /* flex-direction: column; 移除这一行，保持 row 布局 */
+        padding: 0 8px;
+        gap: 10px;
+    }
+    
+    .primary-category {
+        width: 80px; /* 减小宽度 */
+        /* display: flex; 移除flex布局，保持默认 */
+        /* flex-wrap: wrap; 移除换行 */
+        padding: 8px 0;
+    }
+    
+    .primary-item {
+        /* width: calc(25% - 8px); 移除百分比宽度 */
+        width: auto; /* 恢复自动宽度 */
+        margin: 4px;
+        padding: 8px 4px;
+        /* text-align: center; 已经在通用样式中设置 */
+    }
+    
+    .primary-icon {
+        margin-right: 0;
+        margin-bottom: 4px;
+        font-size: 20px;
+    }
+    
+    .primary-name {
+        font-size: 11px;
+    }
+    
+    .product-grid {
+        grid-template-columns: repeat(2, 1fr); /* 改为双列显示 */
+        gap: 8px;
+        padding: 0 4px 20px 4px; /* 增加底部内边距 */
+    }
+    
+    /* 手机端商品卡片极简模式 - 仿照主页样式 */
+    .product-spec,
+    .manufacturer,
+    .original-price,
+    .sales-info,
+    .product-badge { /* 分类页也隐藏角标，保持整洁 */
+        display: none;
+    }
+    
+    .product-info {
+        padding: 6px;
+    }
+    
+    .product-image {
+        height: 100px; /* 由于分类页右侧空间更窄，图片高度设得更小一点 */
+    }
+    
+    .product-name {
+        font-size: 12px;
+        height: 32px;
+        line-height: 1.3;
+        margin-bottom: 2px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+    }
+    
+    .price-section {
+        margin-bottom: 0;
+        margin-top: 4px;
+        justify-content: space-between;
+        width: 100%;
+    }
+    
+    .price-symbol {
+        font-size: 10px;
+    }
+    
+    .price-value {
+        font-size: 14px;
+    }
+    
+    .product-meta {
+        display: none; /* 隐藏整个元数据行 */
+    }
+    
+    .search-container {
+        padding: 0 12px;
+        height: 55px;
+    }
+    
+    .search-box {
+        padding: 8px 16px;
+    }
+    
+    .category-header {
+        padding: 12px 4px 0 4px;
+    }
+}
+
+/* 中屏手机/小平板 (415px-768px) */
+@media screen and (min-width: 415px) and (max-width: 768px) {
+    .product-grid {
+        grid-template-columns: repeat(2, 1fr);
+        gap: 16px;
+    }
+}
+
+/* 平板设备 (769px-1024px) */
+@media screen and (min-width: 769px) and (max-width: 1024px) {
+    .product-grid {
+        grid-template-columns: repeat(3, 1fr);
+        gap: 20px;
+    }
+}
+
+/* 桌面端 (1025px以上) */
+@media screen and (min-width: 1025px) {
+    .category-content {
+        gap: 30px;
+        padding: 0 24px;
+    }
+    
+    .primary-category {
+        width: 160px;
+        padding: 16px 0;
+    }
+    
+    .primary-item {
+        padding: 16px 20px;
+        margin: 6px 12px;
+        border-radius: 10px;
+    }
+    
+    .primary-icon {
+        font-size: 20px;
+        min-width: 28px;
+    }
+    
+    .primary-name {
+        font-size: 15px;
+    }
+    
+    .product-content {
+        padding: 20px 0;
+    }
+    
+    .category-header {
+        margin-bottom: 24px;
+        padding: 0 12px;
+    }
+    
+    .category-title {
+        font-size: 24px;
+    }
+    
+    .category-desc {
+        font-size: 15px;
+    }
+    
+    .product-grid {
+        grid-template-columns: repeat(4, 1fr);
+        gap: 24px;
+    }
+    
+    .product-card {
+        border-radius: 14px;
+    }
+    
+    .product-info {
+        padding: 20px;
+    }
+    
+    .product-name {
+        font-size: 16px;
+    }
+    
+    .product-spec {
+        font-size: 14px;
+    }
+    
+    .price-value {
+        font-size: 22px;
+    }
+}
+
+/* 大桌面端 (1400px以上) */
+@media screen and (min-width: 1400px) {
+    .category-content {
+        max-width: 1600px;
+        gap: 40px;
+        padding: 0 32px;
+    }
+    
+    .primary-category {
+        width: 200px;
+        padding: 20px 0;
+    }
+    
+    .primary-item {
+        padding: 18px 24px;
+        margin: 8px 16px;
+        border-radius: 12px;
+    }
+    
+    .primary-icon {
+        font-size: 22px;
+        min-width: 32px;
+    }
+    
+    .primary-name {
+        font-size: 16px;
+    }
+    
+    .product-content {
+        padding: 24px 0;
+    }
+    
+    .category-header {
+        margin-bottom: 28px;
+        padding: 0 16px;
+    }
+    
+    .category-title {
+        font-size: 26px;
+    }
+    
+    .category-desc {
+        font-size: 16px;
+    }
+    
+    .product-grid {
+        grid-template-columns: repeat(5, 1fr);
+        gap: 28px;
+    }
+    
+    .product-card {
+        border-radius: 16px;
+    }
+    
+    .product-image {
+        height: 180px;
+    }
+    
+    .product-info {
+        padding: 24px;
+    }
+    
+    .product-name {
+        font-size: 17px;
+    }
+    
+    .product-spec {
+        font-size: 15px;
+    }
+    
+    .price-value {
+        font-size: 24px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/categorygood.uvue b/pages/mall/consumer/categorygood.uvue
new file mode 100644
index 00000000..b46448fc
--- /dev/null
+++ b/pages/mall/consumer/categorygood.uvue
@@ -0,0 +1,1159 @@
+<!-- pages/mall/consumer/category.uvue -->
+<template>
+    <view class="category-page">
+        <!-- 顶部搜索栏 -->
+        <view class="search-bar" :style="{ paddingTop: statusBarHeight + 'px' }">
+            <view class="search-container">
+                <view class="search-box" @click="navigateToSearch">
+                    <text class="search-icon">🔍</text>
+                    <text class="search-placeholder">症状/药品/品牌智能搜索</text>
+                </view>
+            </view>
+        </view>
+        
+        <!-- 分类内容区 -->
+        <view class="category-content">
+            <!-- 左侧一级分类 -->
+            <scroll-view scroll-y class="primary-category">
+                <view 
+                    v-for="item in primaryCategories" 
+                    :key="item.id"
+                    :class="['primary-item', { active: activePrimary === item.id }]"
+                    @click="selectPrimaryCategory(item.id)"
+                    :style="{ backgroundColor: activePrimary === item.id ? item.color : 'transparent' }"
+                >
+                    <text class="primary-icon">{{ item.icon }}</text>
+                    <text class="primary-name">{{ item.name }}</text>
+                </view>
+            </scroll-view>
+            
+            <!-- 右侧商品列表 -->
+            <scroll-view scroll-y class="product-content">
+                <!-- 分类标题 -->
+                <view class="category-header">
+                    <text class="category-title">{{ currentCategoryName }}</text>
+                    <text class="category-desc">{{ currentCategoryDesc }}</text>
+                </view>
+                
+                <!-- 商品网格 -->
+                <view v-if="productList.length > 0" class="product-grid">
+                    <view 
+                        v-for="product in productList" 
+                        :key="product.id"
+                        class="product-card"
+                        @click="navigateToProduct(product)"
+                    >
+                        <view class="product-badge" v-if="product.badge">{{ product.badge }}</view>
+                        <image 
+                            class="product-image" 
+                            :src="product.image" 
+                            mode="aspectFill"
+                        />
+                        <view class="product-info">
+                            <text class="product-name">{{ product.name }}</text>
+                            <text class="product-spec">{{ product.specification }}</text>
+                            
+                            <view class="price-section">
+                                <view class="current-price">
+                                    <text class="price-symbol">¥</text>
+                                    <text class="price-value">{{ product.price }}</text>
+                                </view>
+                                <text class="original-price" v-if="product.originalPrice > product.price">
+                                    ¥{{ product.originalPrice }}
+                                </text>
+                            </view>
+                            
+                            <view class="product-meta">
+                                <text class="manufacturer">{{ product.manufacturer }}</text>
+                                <view class="sales-info">
+                                    <text class="sales-count">已售{{ product.sales }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                
+                <!-- 空状态 -->
+                <view v-else class="empty-state">
+                    <text class="empty-icon">💊</text>
+                    <text class="empty-text">暂无相关药品</text>
+                    <text class="empty-desc">该分类下暂无商品，敬请期待</text>
+                </view>
+                
+                <!-- 加载更多提示 -->
+                <view v-if="hasMore" class="load-more">
+                    <text class="load-text">上拉加载更多</text>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+
+// 响应式数据
+const statusBarHeight = ref(0)
+const primaryCategories = ref<any[]>([])
+const productList = ref<any[]>([])
+const activePrimary = ref<string>('cold')
+const cartCount = ref(3)
+const hasMore = ref(true)
+
+// 获取当前分类信息
+const currentCategoryName = ref('感冒发烧')
+const currentCategoryDesc = ref('解热镇痛')
+
+// 页面参数
+const pageParams = ref<any>({})
+
+// 医药分类数据（与主页一致）
+const medicineCategories = [
+    { id: 'cold', name: '感冒发烧', icon: '🤧', desc: '解热镇痛', color: '#2196F3' },
+    { id: 'stomach', name: '肠胃用药', icon: '🤢', desc: '消化系统', color: '#4CAF50' },
+    { id: 'pain', name: '止痛消炎', icon: '💊', desc: '镇痛消炎', color: '#F44336' },
+    { id: 'skin', name: '皮肤用药', icon: '🤕', desc: '皮肤护理', color: '#9C27B0' },
+    { id: 'vitamin', name: '维生素', icon: '🍊', desc: '营养补充', color: '#FF9800' },
+    { id: 'chronic', name: '慢性病', icon: '🫀', desc: '长期管理', color: '#795548' },
+    { id: 'child', name: '儿童用药', icon: '👶', desc: '儿童专用', color: '#00BCD4' },
+    { id: 'external', name: '外用药品', icon: '🧴', desc: '外用制剂', color: '#8BC34A' },
+    { id: 'device', name: '医疗器械', icon: '🩺', desc: '医疗设备', color: '#607D8B' },
+    { id: 'health', name: '健康食品', icon: '🥗', desc: '保健食品', color: '#FFC107' }
+]
+
+// Mock 商品数据 - 使用本地图片避免网络请求
+const mockProducts = {
+    cold: [
+        {
+            id: 'cold1',
+            name: '布洛芬缓释胶囊',
+            specification: '0.3g*24粒',
+            price: 18.5,
+            originalPrice: 25.8,
+            image: '/static/images/default-product.png',
+            manufacturer: '修正药业',
+            sales: 2560,
+            badge: '热销'
+        },
+        {
+            id: 'cold2',
+            name: '板蓝根颗粒',
+            specification: '10g*20袋',
+            price: 22.8,
+            originalPrice: 29.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '白云山',
+            sales: 1890,
+            badge: '推荐'
+        },
+        {
+            id: 'cold3',
+            name: '连花清瘟胶囊',
+            specification: '0.35g*36粒',
+            price: 42.8,
+            originalPrice: 48.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '以岭药业',
+            sales: 3200,
+            badge: '爆款'
+        },
+        {
+            id: 'cold4',
+            name: '对乙酰氨基酚片',
+            specification: '0.5g*12片',
+            price: 8.9,
+            originalPrice: 12.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '强生制药',
+            sales: 1420,
+            badge: '特价'
+        },
+        {
+            id: 'cold5',
+            name: '感冒清热颗粒',
+            specification: '3g*10袋',
+            price: 16.5,
+            originalPrice: 19.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '同仁堂',
+            sales: 980,
+            badge: '新品'
+        },
+        {
+            id: 'cold6',
+            name: '复方氨酚烷胺片',
+            specification: '10片/盒',
+            price: 12.8,
+            originalPrice: 15.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '三九医药',
+            sales: 1650,
+            badge: '家庭装'
+        }
+    ],
+    
+    stomach: [
+        {
+            id: 'stomach1',
+            name: '胃康灵胶囊',
+            specification: '0.4g*24粒',
+            price: 32.8,
+            originalPrice: 38.5,
+            image: '/static/images/default-product.png',
+            manufacturer: '三九医药',
+            sales: 890,
+            badge: '热销'
+        },
+        {
+            id: 'stomach2',
+            name: '奥美拉唑肠溶胶囊',
+            specification: '20mg*14粒',
+            price: 28.5,
+            originalPrice: 35.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '阿斯利康',
+            sales: 1250,
+            badge: '处方药'
+        },
+        {
+            id: 'stomach3',
+            name: '健胃消食片',
+            specification: '0.8g*32片',
+            price: 15.9,
+            originalPrice: 19.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '江中制药',
+            sales: 2100,
+            badge: '推荐'
+        },
+        {
+            id: 'stomach4',
+            name: '蒙脱石散',
+            specification: '3g*10袋',
+            price: 18.6,
+            originalPrice: 22.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '益普生',
+            sales: 1780,
+            badge: '止泻'
+        },
+        {
+            id: 'stomach5',
+            name: '多潘立酮片',
+            specification: '10mg*30片',
+            price: 22.8,
+            originalPrice: 26.5,
+            image: '/static/images/default-product.png',
+            manufacturer: '西安杨森',
+            sales: 950,
+            badge: '促消化'
+        },
+        {
+            id: 'stomach6',
+            name: '铝碳酸镁咀嚼片',
+            specification: '0.5g*20片',
+            price: 25.9,
+            originalPrice: 29.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '拜耳',
+            sales: 1320,
+            badge: '护胃'
+        }
+    ],
+    
+    pain: [
+        {
+            id: 'pain1',
+            name: '阿莫西林胶囊',
+            specification: '0.25g*24粒',
+            price: 28.5,
+            originalPrice: 35.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '华北制药',
+            sales: 1560,
+            badge: '处方药'
+        },
+        {
+            id: 'pain2',
+            name: '双氯芬酸钠缓释片',
+            specification: '75mg*10片',
+            price: 19.8,
+            originalPrice: 24.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '诺华制药',
+            sales: 1280,
+            badge: '止痛'
+        },
+        {
+            id: 'pain3',
+            name: '云南白药胶囊',
+            specification: '0.25g*32粒',
+            price: 35.9,
+            originalPrice: 42.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '云南白药',
+            sales: 2350,
+            badge: '经典'
+        },
+        {
+            id: 'pain4',
+            name: '塞来昔布胶囊',
+            specification: '0.2g*10粒',
+            price: 48.6,
+            originalPrice: 55.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '辉瑞',
+            sales: 890,
+            badge: '抗炎'
+        },
+        {
+            id: 'pain5',
+            name: '布洛芬片',
+            specification: '0.1g*24片',
+            price: 12.5,
+            originalPrice: 15.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '中美史克',
+            sales: 1680,
+            badge: '经济装'
+        },
+        {
+            id: 'pain6',
+            name: '头孢克肟胶囊',
+            specification: '0.1g*6粒',
+            price: 32.8,
+            originalPrice: 38.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '广州白云山',
+            sales: 1120,
+            badge: '抗生素'
+        }
+    ]
+}
+
+// 补充其他分类的默认数据（简化版）
+const generateDefaultProducts = (categoryId: string) => {
+    const baseProducts = [
+        { name: '通用药品1', price: 25.8, manufacturer: '知名药企', sales: 1200 },
+        { name: '通用药品2', price: 18.5, manufacturer: '知名药企', sales: 950 },
+        { name: '通用药品3', price: 32.0, manufacturer: '知名药企', sales: 1450 },
+        { name: '通用药品4', price: 22.8, manufacturer: '知名药企', sales: 880 },
+        { name: '通用药品5', price: 28.9, manufacturer: '知名药企', sales: 1100 },
+        { name: '通用药品6', price: 19.9, manufacturer: '知名药企', sales: 920 }
+    ]
+    
+    return baseProducts.map((product, index) => ({
+        id: `${categoryId}${index + 1}`,
+        ...product,
+        specification: '规格待定',
+        originalPrice: product.price * 1.2,
+        image: '/static/images/default-product.png',
+        badge: index === 0 ? '热销' : index === 1 ? '推荐' : ''
+    }))
+}
+
+// 生命周期
+onMounted(() => {
+    initPage()
+    
+    console.log('=== category页面onMounted被调用 ===')
+    
+    // 在onMounted中只初始化页面，不处理分类参数
+    // 分类参数的处理交给onLoad函数，因为onLoad在页面加载时执行
+    console.log('onMounted中不处理分类参数，等待onLoad处理')
+    
+    // 注意：这里不再默认选择分类，让onLoad函数处理分类选择
+    // 如果onLoad没有设置分类，则保持默认状态
+})
+
+// 页面加载时处理参数 - 这是处理分类切换的主要入口
+onLoad((options: any) => {
+	console.log('=== category页面onLoad被调用 ===')
+	console.log('页面加载时间:', Date.now())
+	console.log('传入的options参数:', options)
+	console.log('当前活动分类:', activePrimary.value)
+	
+	let categoryId = ''
+	let categoryName = ''
+	
+	// 首先检查传入的options参数
+	if (options && options.categoryId) {
+		categoryId = options.categoryId
+		categoryName = options.name || ''
+		console.log('✅ onLoad中找到分类参数:', categoryId, categoryName)
+	}
+	
+	// 如果options中没有，尝试从getCurrentPages()获取
+	if (!categoryId) {
+		const pages = getCurrentPages()
+		if (pages.length > 0) {
+			const currentPage = pages[pages.length - 1]
+			const pageOptions = currentPage.options || {}
+			console.log('从getCurrentPages()获取参数:', pageOptions)
+			
+			if (pageOptions.categoryId) {
+				categoryId = pageOptions.categoryId
+				categoryName = pageOptions.name || ''
+				console.log('✅ 从getCurrentPages()找到分类参数:', categoryId, categoryName)
+			}
+		}
+	}
+	
+	// 如果有找到分类ID，则选中对应的分类
+	if (categoryId) {
+		console.log('✅ 准备选中分类:', categoryId)
+		console.log('分类名称:', categoryName || '未指定')
+		
+		// 检查是否需要更新分类
+		if (activePrimary.value !== categoryId) {
+			console.log('当前分类:', activePrimary.value, '与目标分类:', categoryId, '不同，需要更新')
+			console.log('准备调用selectPrimaryCategory函数...')
+			selectPrimaryCategory(categoryId)
+		} else {
+			console.log('当前分类已经是目标分类，但可能用户想要刷新页面')
+			console.log('当前分类:', activePrimary.value, '目标分类:', categoryId)
+			// 即使分类相同，也重新加载数据，确保数据是最新的
+			// 添加一个小的延迟，确保页面完全显示后再更新数据
+			setTimeout(() => {
+				selectPrimaryCategory(categoryId)
+			}, 100)
+		}
+	} else {
+		console.log('⚠️ onLoad中未找到分类参数')
+		console.log('保持当前分类显示:', activePrimary.value)
+	}
+	
+	console.log('=== category页面onLoad执行完成 ===')
+})
+
+// 页面显示时也检查参数，确保从其他页面返回时能正确显示
+onShow(() => {
+	console.log('=== category页面onShow被调用 ===')
+	console.log('页面显示时间:', Date.now())
+	console.log('当前活动分类:', activePrimary.value)
+	
+	// 在onShow中，我们也需要检查是否有新的参数
+	// 因为当从主页再次点击分类跳转过来时，可能不会触发onLoad
+	// 而是触发onShow
+	
+	// 获取当前页面实例和参数
+	const pages = getCurrentPages()
+	if (pages.length > 0) {
+		const currentPage = pages[pages.length - 1]
+		const pageOptions = currentPage.options || {}
+		console.log('onShow中获取参数:', pageOptions)
+		
+		// 检查是否有分类参数
+		if (pageOptions.categoryId) {
+			const categoryId = pageOptions.categoryId
+			const categoryName = pageOptions.name || ''
+			
+			console.log('✅ onShow中找到分类参数:', categoryId, categoryName)
+			console.log('URL中的时间戳参数:', pageOptions.timestamp)
+			console.log('URL中的随机参数:', pageOptions.random)
+			
+			// 检查是否需要更新分类
+			if (activePrimary.value !== categoryId) {
+				console.log('当前分类:', activePrimary.value, '与目标分类:', categoryId, '不同，需要更新')
+				console.log('准备调用selectPrimaryCategory函数...')
+				selectPrimaryCategory(categoryId)
+			} else {
+				console.log('当前分类已经是目标分类，但可能用户想要刷新页面')
+				console.log('当前分类:', activePrimary.value, '目标分类:', categoryId)
+				// 即使分类相同，也重新加载数据，确保数据是最新的
+				// 添加一个小的延迟，确保页面完全显示后再更新数据
+				setTimeout(() => {
+					selectPrimaryCategory(categoryId)
+				}, 100)
+			}
+		} else {
+			console.log('⚠️ onShow中未找到分类参数')
+			console.log('尝试从URL中解析参数...')
+			
+			// 尝试从当前页面的URL中解析参数
+			const currentUrl = currentPage.route || ''
+			console.log('当前页面路由:', currentUrl)
+			
+			// 如果URL中有查询参数，尝试解析
+			if (currentPage.$page && currentPage.$page.fullPath) {
+				const fullPath = currentPage.$page.fullPath
+				console.log('完整路径:', fullPath)
+				
+				// 尝试解析查询参数
+				const queryIndex = fullPath.indexOf('?')
+				if (queryIndex > -1) {
+					const queryString = fullPath.substring(queryIndex + 1)
+					console.log('查询字符串:', queryString)
+					
+					// 简单解析查询参数
+					const params = new URLSearchParams(queryString)
+					const urlCategoryId = params.get('categoryId')
+					if (urlCategoryId) {
+						console.log('✅ 从URL解析到分类参数:', urlCategoryId)
+						selectPrimaryCategory(urlCategoryId)
+					}
+				}
+			}
+		}
+	}
+	
+	console.log('=== category页面onShow执行完成 ===')
+})
+
+// 初始化页面
+const initPage = () => {
+    const systemInfo = uni.getSystemInfoSync()
+    statusBarHeight.value = systemInfo.statusBarHeight || 0
+    
+    // 获取页面参数
+    const pages = getCurrentPages()
+    if (pages.length > 0) {
+        const currentPage = pages[pages.length - 1]
+        pageParams.value = currentPage.options || {}
+    }
+    
+    // 加载分类数据
+    primaryCategories.value = medicineCategories
+}
+
+// 选择一级分类
+const selectPrimaryCategory = (categoryId: string) => {
+    console.log('=== selectPrimaryCategory函数开始执行 ===')
+    console.log('传入的categoryId:', categoryId)
+    console.log('当前时间:', Date.now())
+    
+    // 验证categoryId是否有效
+    if (!categoryId) {
+        console.error('categoryId为空，使用默认分类')
+        categoryId = 'cold'
+    }
+    
+    console.log('验证后的categoryId:', categoryId)
+    console.log('当前activePrimary的值:', activePrimary.value)
+    
+    // 更新活动分类
+    activePrimary.value = categoryId
+    console.log('更新后的activePrimary:', activePrimary.value)
+    
+    // 更新当前分类信息
+    const category = medicineCategories.find(cat => cat.id === categoryId)
+    if (category) {
+        currentCategoryName.value = category.name
+        currentCategoryDesc.value = category.desc
+        console.log('✅ 找到分类:', category.name, '描述:', category.desc)
+    } else {
+        console.error('❌ 未找到分类ID:', categoryId, '，使用默认分类')
+        // 如果找不到对应的分类，使用第一个分类
+        if (medicineCategories.length > 0) {
+            const firstCategory = medicineCategories[0]
+            currentCategoryName.value = firstCategory.name
+            currentCategoryDesc.value = firstCategory.desc
+            activePrimary.value = firstCategory.id
+            categoryId = firstCategory.id
+            console.log('使用默认分类:', firstCategory.name)
+        }
+    }
+    
+    console.log('准备加载商品数据...')
+    
+    // 加载对应商品
+    if (mockProducts[categoryId]) {
+        productList.value = mockProducts[categoryId]
+        console.log('✅ 加载mock商品数据成功')
+        console.log('分类:', categoryId)
+        console.log('商品数量:', mockProducts[categoryId].length)
+        console.log('商品列表:', mockProducts[categoryId])
+    } else {
+        productList.value = generateDefaultProducts(categoryId)
+        console.log('✅ 加载默认商品数据成功')
+        console.log('分类:', categoryId)
+        console.log('商品数量:', productList.value.length)
+        console.log('商品列表:', productList.value)
+    }
+    
+    hasMore.value = true
+    
+    // 验证数据是否已正确更新
+    console.log('数据更新验证:')
+    console.log('activePrimary:', activePrimary.value)
+    console.log('currentCategoryName:', currentCategoryName.value)
+    console.log('currentCategoryDesc:', currentCategoryDesc.value)
+    console.log('productList长度:', productList.value.length)
+    
+    console.log('=== selectPrimaryCategory函数执行完成 ===')
+}
+
+// 添加到购物车
+const addToCart = (product: any) => {
+    uni.showToast({
+        title: '已添加到购物车',
+        icon: 'success'
+    })
+    cartCount.value++
+}
+
+// 导航函数
+const navigateToSearch = () => uni.navigateTo({ url: '/pages/medicine/search' })
+const navigateToCart = () => uni.navigateTo({ url: '/pages/medicine/cart' })
+const navigateToProduct = (product: any) => {
+    uni.navigateTo({
+        url: `/pages/medicine/detail?id=${product.id}`
+    })
+}
+</script>
+
+<style>
+.category-page {
+    width: 100%;
+    min-height: 100vh;
+    background-color: #f8fafc;
+    display: flex;
+    flex-direction: column;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', sans-serif;
+}
+
+/* 搜索栏 */
+.search-bar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+    z-index: 1000;
+    box-shadow: 0 2px 12px rgba(76, 175, 80, 0.15);
+}
+
+.search-container {
+    height: 60px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    max-width: 1400px;
+    margin: 0 auto;
+    width: 100%;
+}
+
+.search-box {
+    flex: 1;
+    max-width: 600px;
+    background: rgba(255, 255, 255, 0.95);
+    border-radius: 25px;
+    padding: 10px 20px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    border: 2px solid transparent;
+}
+
+.search-box:hover {
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
+    border-color: rgba(255, 255, 255, 0.3);
+}
+
+.search-icon {
+    font-size: 18px;
+    color: #4CAF50;
+    margin-right: 12px;
+}
+
+.search-placeholder {
+    font-size: 15px;
+    color: #666;
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.icon {
+    font-size: 22px;
+    color: white;
+}
+
+.cart-badge {
+    position: absolute;
+    top: -5px;
+    right: -5px;
+    background: #FF5722;
+    color: white;
+    font-size: 10px;
+    min-width: 18px;
+    height: 18px;
+    border-radius: 9px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 4px;
+    border: 2px solid #4CAF50;
+}
+
+/* 分类内容区 */
+.category-content {
+    display: flex;
+    margin-top: 60px;
+    padding: 0 16px;
+    max-width: 1400px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 100%;
+    gap: 20px;
+}
+
+/* 左侧一级分类 */
+.primary-category {
+    width: 120px;
+    background: white;
+    border-radius: 12px;
+    padding: 12px 0;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+    flex-shrink: 0;
+}
+
+.primary-item {
+    display: flex;
+    align-items: center;
+    padding: 12px 16px;
+    margin: 4px 8px;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    color: #666;
+}
+
+.primary-item:hover {
+    transform: translateX(2px);
+}
+
+.primary-item.active {
+    color: white !important;
+    font-weight: bold;
+}
+
+.primary-icon {
+    font-size: 18px;
+    margin-right: 8px;
+    min-width: 24px;
+    text-align: center;
+}
+
+.primary-name {
+    font-size: 14px;
+    line-height: 1.4;
+}
+
+/* 右侧内容区 */
+.product-content {
+    flex: 1;
+    padding: 16px 0;
+}
+
+.category-header {
+    margin-bottom: 20px;
+    padding: 0 8px;
+}
+
+.category-title {
+    font-size: 20px;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 4px;
+}
+
+.category-desc {
+    font-size: 14px;
+    color: #666;
+}
+
+/* 商品网格 */
+.product-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+    gap: 20px;
+}
+
+.product-card {
+    background: white;
+    border-radius: 12px;
+    overflow: hidden;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    border: 1px solid #e0e0e0;
+    position: relative;
+}
+
+.product-card:hover {
+    transform: translateY(-4px);
+    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-badge {
+    position: absolute;
+    top: 12px;
+    left: 12px;
+    background: #FF5722;
+    color: white;
+    font-size: 11px;
+    padding: 4px 12px;
+    border-radius: 12px;
+    font-weight: 600;
+    z-index: 2;
+}
+
+.product-image {
+    width: 100%;
+    height: 160px;
+    object-fit: cover;
+    background: white;
+}
+
+.product-info {
+    padding: 16px;
+}
+
+.product-name {
+    font-size: 15px;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 4px;
+    display: block;
+    line-height: 1.4;
+}
+
+.product-spec {
+    font-size: 13px;
+    color: #666;
+    margin-bottom: 12px;
+    display: block;
+}
+
+.price-section {
+    display: flex;
+    align-items: baseline;
+    gap: 8px;
+    margin-bottom: 12px;
+}
+
+.current-price {
+    display: flex;
+    align-items: baseline;
+}
+
+.price-symbol {
+    font-size: 14px;
+    color: #FF5722;
+}
+
+.price-value {
+    font-size: 20px;
+    font-weight: bold;
+    color: #FF5722;
+    margin-left: 2px;
+}
+
+.original-price {
+    font-size: 13px;
+    color: #999;
+    text-decoration: line-through;
+}
+
+.product-meta {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+    margin-bottom: 12px;
+}
+
+.manufacturer {
+    color: #666;
+}
+
+.sales-count {
+    color: #999;
+}
+
+.product-action {
+    margin-top: 12px;
+}
+
+.cart-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+    background: #4CAF50;
+    color: white;
+    padding: 8px 12px;
+    border-radius: 8px;
+    font-size: 13px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.cart-btn:hover {
+    background: #388E3C;
+}
+
+.cart-icon {
+    font-size: 14px;
+}
+
+/* 空状态 */
+.empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 60px 20px;
+    text-align: center;
+}
+
+.empty-icon {
+    font-size: 60px;
+    color: #4CAF50;
+    margin-bottom: 15px;
+}
+
+.empty-text {
+    font-size: 18px;
+    color: #333;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+.empty-desc {
+    font-size: 14px;
+    color: #666;
+}
+
+/* 加载更多 */
+.load-more {
+    text-align: center;
+    padding: 20px 0;
+    color: #999;
+    font-size: 14px;
+}
+
+.load-text {
+    display: inline-block;
+    padding: 8px 16px;
+    background: #f5f5f5;
+    border-radius: 20px;
+}
+
+/* ===== 响应式设计 ===== */
+
+/* 小屏手机 (小于414px) */
+@media screen and (max-width: 414px) {
+    .category-content {
+        flex-direction: column;
+        padding: 0 12px;
+    }
+    
+    .primary-category {
+        width: 100%;
+        display: flex;
+        flex-wrap: wrap;
+        padding: 8px;
+    }
+    
+    .primary-item {
+        width: calc(25% - 8px);
+        margin: 4px;
+        padding: 10px 8px;
+        text-align: center;
+    }
+    
+    .primary-icon {
+        margin-right: 0;
+        margin-bottom: 4px;
+        font-size: 16px;
+    }
+    
+    .primary-name {
+        font-size: 12px;
+    }
+    
+    .product-grid {
+        grid-template-columns: 1fr;
+        gap: 16px;
+    }
+    
+    .search-container {
+        padding: 0 12px;
+        height: 55px;
+    }
+    
+    .search-box {
+        padding: 8px 16px;
+    }
+    
+    .category-header {
+        padding: 0;
+    }
+}
+
+/* 中屏手机/小平板 (415px-768px) */
+@media screen and (min-width: 415px) and (max-width: 768px) {
+    .product-grid {
+        grid-template-columns: repeat(2, 1fr);
+        gap: 16px;
+    }
+}
+
+/* 平板设备 (769px-1024px) */
+@media screen and (min-width: 769px) and (max-width: 1024px) {
+    .product-grid {
+        grid-template-columns: repeat(3, 1fr);
+        gap: 20px;
+    }
+}
+
+/* 桌面端 (1025px以上) */
+@media screen and (min-width: 1025px) {
+    .category-content {
+        gap: 30px;
+        padding: 0 24px;
+    }
+    
+    .primary-category {
+        width: 160px;
+        padding: 16px 0;
+    }
+    
+    .primary-item {
+        padding: 16px 20px;
+        margin: 6px 12px;
+        border-radius: 10px;
+    }
+    
+    .primary-icon {
+        font-size: 20px;
+        min-width: 28px;
+    }
+    
+    .primary-name {
+        font-size: 15px;
+    }
+    
+    .product-content {
+        padding: 20px 0;
+    }
+    
+    .category-header {
+        margin-bottom: 24px;
+        padding: 0 12px;
+    }
+    
+    .category-title {
+        font-size: 24px;
+    }
+    
+    .category-desc {
+        font-size: 15px;
+    }
+    
+    .product-grid {
+        grid-template-columns: repeat(4, 1fr);
+        gap: 24px;
+    }
+    
+    .product-card {
+        border-radius: 14px;
+    }
+    
+    .product-info {
+        padding: 20px;
+    }
+    
+    .product-name {
+        font-size: 16px;
+    }
+    
+    .product-spec {
+        font-size: 14px;
+    }
+    
+    .price-value {
+        font-size: 22px;
+    }
+}
+
+/* 大桌面端 (1400px以上) */
+@media screen and (min-width: 1400px) {
+    .category-content {
+        max-width: 1600px;
+        gap: 40px;
+        padding: 0 32px;
+    }
+    
+    .primary-category {
+        width: 200px;
+        padding: 20px 0;
+    }
+    
+    .primary-item {
+        padding: 18px 24px;
+        margin: 8px 16px;
+        border-radius: 12px;
+    }
+    
+    .primary-icon {
+        font-size: 22px;
+        min-width: 32px;
+    }
+    
+    .primary-name {
+        font-size: 16px;
+    }
+    
+    .product-content {
+        padding: 24px 0;
+    }
+    
+    .category-header {
+        margin-bottom: 28px;
+        padding: 0 16px;
+    }
+    
+    .category-title {
+        font-size: 26px;
+    }
+    
+    .category-desc {
+        font-size: 16px;
+    }
+    
+    .product-grid {
+        grid-template-columns: repeat(5, 1fr);
+        gap: 28px;
+    }
+    
+    .product-card {
+        border-radius: 16px;
+    }
+    
+    .product-image {
+        height: 180px;
+    }
+    
+    .product-info {
+        padding: 24px;
+    }
+    
+    .product-name {
+        font-size: 17px;
+    }
+    
+    .product-spec {
+        font-size: 15px;
+    }
+    
+    .price-value {
+        font-size: 24px;
+    }
+}
+</style>
diff --git a/pages/mall/consumer/chat.uvue b/pages/mall/consumer/chat.uvue
new file mode 100644
index 00000000..16c2fafc
--- /dev/null
+++ b/pages/mall/consumer/chat.uvue
@@ -0,0 +1,593 @@
+<!-- pages/mall/consumer/chat.uvue -->
+<template>
+    <view class="chat-page">
+        <!-- 聊天头部 -->
+        <view class="chat-header">
+            <view class="header-back" @click="goBack">
+                <text class="back-icon">‹</text>
+            </view>
+            <view class="header-info">
+                <text class="chat-title">在线客服</text>
+                <text class="chat-status">在线</text>
+            </view>
+            <view class="header-actions">
+                <text class="action-icon" @click="showMoreActions">⋮</text>
+            </view>
+        </view>
+        
+        <!-- 聊天内容 -->
+        <scroll-view 
+            scroll-y 
+            class="chat-content"
+            :scroll-into-view="scrollToView"
+            scroll-with-animation
+        >
+            <!-- 聊天消息列表 -->
+            <view class="chat-messages">
+                <!-- 系统消息 -->
+                <view class="message-item system">
+                    <text class="system-text">客服 小美 已接入，请描述您的问题</text>
+                </view>
+                
+                <!-- 时间分割线 -->
+                <view class="time-divider">
+                    <text>今天 14:30</text>
+                </view>
+                
+                <!-- 消息项 -->
+                <view 
+                    v-for="message in messages" 
+                    :key="message.id"
+                    :class="['message-item', message.type]"
+                    :id="'msg-' + message.id"
+                >
+                    <!-- 对方消息 -->
+                    <view v-if="message.type === 'received'" class="message-wrapper">
+                        <image 
+                            class="avatar" 
+                            src="https://picsum.photos/40/40?random=1" 
+                            mode="aspectFill"
+                        />
+                        <view class="message-content-wrapper">
+                            <text class="sender-name">客服小美</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="https://picsum.photos/40/40?random=2" 
+                            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>
+        
+        <!-- 表情选择器 -->
+        <view v-if="showEmoji" class="emoji-picker">
+            <view class="emoji-category">
+                <text 
+                    v-for="emoji in emojiList" 
+                    :key="emoji"
+                    class="emoji-item"
+                    @click="insertEmoji(emoji)"
+                >
+                    {{ emoji }}
+                </text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted, nextTick } from 'vue'
+
+// 响应式数据
+const messages = ref<any[]>([])
+const inputMessage = ref<string>('')
+const inputFocus = ref<boolean>(false)
+const showEmoji = ref<boolean>(false)
+const scrollToView = ref<string>('')
+
+// 模拟表情列表
+const emojiList = ['😊', '😂', '🤣', '😍', '😘', '🥰', '😭', '😡', '👍', '👏', '🙏', '🎉', '❤️', '🔥', '⭐']
+
+// Mock 聊天记录
+const mockMessages = [
+    {
+        id: 1,
+        type: 'received',
+        content: '您好，欢迎咨询！有什么可以帮助您的吗？',
+        time: '14:30'
+    },
+    {
+        id: 2,
+        type: 'sent',
+        content: '你好，我昨天下的订单一直没有发货',
+        time: '14:31'
+    },
+    {
+        id: 3,
+        type: 'received',
+        content: '请问您的订单号是多少？我帮您查询一下',
+        time: '14:32'
+    },
+    {
+        id: 4,
+        type: 'sent',
+        content: '订单号是202311230001',
+        time: '14:33'
+    },
+    {
+        id: 5,
+        type: 'received',
+        content: '正在为您查询订单状态...',
+        time: '14:34'
+    }
+]
+
+// 生命周期
+onMounted(() => {
+    loadChatHistory()
+    
+    // 模拟客服自动回复
+    setTimeout(() => {
+        addReceivedMessage('查询到您的订单正在打包中，预计今天下午发货')
+    }, 3000)
+})
+
+// 加载聊天记录
+const loadChatHistory = () => {
+    messages.value = [...mockMessages]
+    
+    // 滚动到底部
+    setTimeout(() => {
+        scrollToBottom()
+    }, 100)
+}
+
+// 发送消息
+const sendMessage = () => {
+    const content = inputMessage.value.trim()
+    if (!content) return
+    
+    // 添加发送的消息
+    const newMessage = {
+        id: Date.now(),
+        type: 'sent',
+        content: content,
+        time: getCurrentTime()
+    }
+    
+    messages.value.push(newMessage)
+    inputMessage.value = ''
+    
+    // 滚动到底部
+    scrollToBottom()
+    
+    // 模拟客服回复（2秒后）
+    setTimeout(() => {
+        simulateCustomerReply()
+    }, 2000)
+}
+
+// 模拟客服回复
+const simulateCustomerReply = () => {
+    const replies = [
+        '好的，已为您记录',
+        '这个问题需要进一步核实',
+        '我明白了，马上为您处理',
+        '请稍等，正在为您查询',
+        '感谢您的反馈'
+    ]
+    
+    const randomReply = replies[Math.floor(Math.random() * replies.length)]
+    addReceivedMessage(randomReply)
+}
+
+// 添加接收的消息
+const addReceivedMessage = (content: string) => {
+    const newMessage = {
+        id: Date.now(),
+        type: 'received',
+        content: content,
+        time: getCurrentTime()
+    }
+    
+    messages.value.push(newMessage)
+    scrollToBottom()
+}
+
+// 滚动到底部
+const scrollToBottom = () => {
+    nextTick(() => {
+        if (messages.value.length > 0) {
+            const lastMsgId = messages.value[messages.value.length - 1].id
+            scrollToView.value = 'msg-' + lastMsgId
+        }
+    })
+}
+
+// 获取当前时间
+const 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}`
+}
+
+// 插入表情
+const insertEmoji = (emoji: string) => {
+    inputMessage.value += emoji
+    inputFocus.value = true
+}
+
+// 显示表情选择器
+const showEmojiPicker = () => {
+    showEmoji.value = !showEmoji.value
+}
+
+// 显示图片选择器
+const showImagePicker = () => {
+    uni.chooseImage({
+        count: 1,
+        success: (res) => {
+            console.log('选择图片:', res.tempFilePaths)
+            // 这里可以处理图片上传
+        }
+    })
+}
+
+// 显示更多工具
+const showMoreTools = () => {
+    uni.showActionSheet({
+        itemList: ['发送位置', '发送文件', '发送语音'],
+        success: (res) => {
+            console.log('选择工具:', res.tapIndex)
+        }
+    })
+}
+
+// 显示更多操作
+const showMoreActions = () => {
+    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;
+}
+
+/* 聊天头部 */
+.chat-header {
+    background-color: white;
+    padding: 10px 15px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+}
+
+.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;
+    display: block;
+    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;
+    padding: 15px;
+    padding-bottom: 70px; /* 为输入区留出空间 */
+}
+
+/* 系统消息 */
+.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;
+    display: inline-block;
+}
+
+/* 时间分割线 */
+.time-divider {
+    text-align: center;
+    margin: 20px 0;
+}
+
+.time-divider text {
+    font-size: 12px;
+    color: #999;
+    background-color: #f0f0f0;
+    padding: 3px 10px;
+    border-radius: 10px;
+}
+
+/* 消息项 */
+.message-wrapper {
+    display: flex;
+    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;
+}
+
+.message-content-wrapper {
+    max-width: 70%;
+}
+
+.sender-name {
+    font-size: 12px;
+    color: #999;
+    margin-bottom: 5px;
+    display: block;
+}
+
+.message-bubble {
+    background-color: white;
+    padding: 10px 15px;
+    border-radius: 18px;
+    position: relative;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    max-width: 100%;
+    word-wrap: break-word;
+}
+
+.message-bubble.me {
+    background-color: #95ec69;
+    border-bottom-right-radius: 4px;
+}
+
+.message-bubble:not(.me) {
+    border-bottom-left-radius: 4px;
+}
+
+.message-text {
+    font-size: 15px;
+    color: #333;
+    line-height: 1.4;
+    display: block;
+    margin-bottom: 5px;
+}
+
+.message-time {
+    font-size: 11px;
+    color: #999;
+    display: block;
+    text-align: right;
+}
+
+/* 聊天输入区 */
+.chat-input {
+    background-color: white;
+    border-top: 1px solid #eee;
+    padding: 10px 15px;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 100;
+}
+
+.input-tools {
+    display: flex;
+    margin-bottom: 10px;
+}
+
+.tool-icon {
+    font-size: 20px;
+    margin-right: 15px;
+    color: #666;
+}
+
+.input-wrapper {
+    display: flex;
+    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;
+    max-height: 200px;
+    overflow-y: auto;
+    position: fixed;
+    bottom: 60px;
+    left: 0;
+    right: 0;
+    z-index: 99;
+}
+
+.emoji-category {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.emoji-item {
+    font-size: 24px;
+    padding: 8px;
+    width: 45px;
+    height: 45px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* 响应式适配 */
+@media screen and (max-width: 320px) {
+    .message-content-wrapper {
+        max-width: 65%;
+    }
+    
+    .message-text {
+        font-size: 14px;
+    }
+}
+
+@media screen and (min-width: 415px) {
+    .message-content-wrapper {
+        max-width: 75%;
+    }
+    
+    .chat-input {
+        padding: 15px 20px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/checkout.uvue b/pages/mall/consumer/checkout.uvue
new file mode 100644
index 00000000..57f3d413
--- /dev/null
+++ b/pages/mall/consumer/checkout.uvue
@@ -0,0 +1,1716 @@
+<!-- 结算页面 -->
+<template>
+	<view class="checkout-page">
+		<scroll-view class="checkout-content" scroll-y>
+			<!-- 收货地址 -->
+			<view class="address-section" @click="selectAddress">
+				<view v-if="selectedAddress" class="address-info">
+					<view class="address-header">
+						<text class="recipient">{{ selectedAddress.recipient_name }}</text>
+						<text class="phone">{{ selectedAddress.phone }}</text>
+						<view v-if="selectedAddress.is_default" class="default-tag">
+							<text class="tag-text">默认</text>
+						</view>
+					</view>
+					<text class="address-detail">{{ getFullAddress(selectedAddress) }}</text>
+				</view>
+				<view v-else class="no-address">
+					<text class="no-address-text">请选择收货地址</text>
+					<text class="no-address-arrow">›</text>
+				</view>
+			</view>
+
+			<!-- 商品列表 -->
+			<view class="products-section">
+				<!-- 调试信息 -->
+				<view v-if="checkoutItems.length > 0" class="debug-info">
+					<text class="debug-text">调试：共{{ checkoutItems.length }}件商品，总价计算：{{ totalAmount }}</text>
+				</view>
+				<view v-if="checkoutItems.length > 0">
+					<view v-for="item in checkoutItems" :key="item.id" class="product-item">
+						<image class="product-image" :src="item.product_image" />
+						<view class="product-info">
+							<text class="product-name">{{ item.product_name }}</text>
+							<text v-if="item.sku_specifications" class="product-spec">{{ getSpecText(item.sku_specifications) }}</text>
+							<view class="product-bottom">
+								<text class="product-price">¥{{ item.price }}</text>
+								<text class="product-quantity">×{{ item.quantity }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-else class="no-products">
+					<text class="no-products-text">暂无商品信息</text>
+				</view>
+			</view>
+
+			<!-- 配送方式 -->
+			<view class="delivery-section">
+				<text class="section-title">配送方式</text>
+				<view class="delivery-options">
+					<view v-for="option in deliveryOptions" 
+								:key="option.id" 
+								:class="['delivery-option', { selected: selectedDelivery === option.id }]"
+								@click="selectDelivery(option)">
+						<text class="option-name">{{ option.name }}</text>
+						<text class="option-price">¥{{ option.price }}</text>
+						<text v-if="selectedDelivery === option.id" class="option-selected">✓</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 优惠券 -->
+			<view class="coupon-section" @click="selectCoupon">
+				<text class="section-title">优惠券</text>
+				<view class="coupon-info">
+					<text v-if="selectedCoupon" class="coupon-selected">{{ selectedCoupon.template?.name || '优惠券' }}</text>
+					<text v-else class="coupon-placeholder">选择优惠券</text>
+					<text class="coupon-arrow">›</text>
+				</view>
+			</view>
+
+			<!-- 买家留言 -->
+			<view class="remark-section">
+				<text class="section-title">买家留言</text>
+				<textarea class="remark-input" 
+									v-model="remark" 
+									placeholder="选填，请先和商家协商一致"
+									maxlength="100" />
+			</view>
+
+			<!-- 价格明细 -->
+			<view class="price-section">
+				<text class="section-title">价格明细</text>
+				<view class="price-detail">
+					<view class="price-row">
+						<text class="price-label">商品总价</text>
+						<text class="price-value">¥{{ totalAmount.toFixed(2) }}</text>
+					</view>
+					<view class="price-row">
+						<text class="price-label">运费</text>
+						<text class="price-value">+¥{{ deliveryFee.toFixed(2) }}</text>
+					</view>
+					<view v-if="discountAmount > 0" class="price-row">
+						<text class="price-label">优惠减免</text>
+						<text class="price-value discount">-¥{{ discountAmount.toFixed(2) }}</text>
+					</view>
+					<view class="price-row total">
+						<text class="price-label">应付金额</text>
+						<text class="price-value total-price">¥{{ actualAmount.toFixed(2) }}</text>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!-- 底部结算栏 -->
+		<view class="bottom-bar">
+			<view class="price-summary">
+				<text class="summary-label">合计:</text>
+				<text class="summary-price">¥{{ actualAmount.toFixed(2) }}</text>
+			</view>
+			<button class="submit-btn" @click="submitOrder">提交订单</button>
+		</view>
+
+		<!-- 地址选择弹窗 -->
+		<view v-if="showAddressPopup" class="address-popup-mask" @click="showAddressPopup = false">
+			<view class="address-popup" @click.stop>
+				<view class="popup-header">
+					<text class="popup-title">选择收货地址</text>
+					<text class="popup-close" @click="showAddressPopup = false">×</text>
+				</view>
+				
+				<scroll-view class="address-list-container" scroll-y>
+					<!-- 地址列表 -->
+					<view v-if="addressList.length > 0">
+						<view v-for="address in addressList" :key="address.id" 
+									class="popup-address-item" @click="handleSelectAddress(address)">
+							<view class="popup-address-header">
+								<text class="popup-address-name">{{ address.recipient_name }}</text>
+								<text class="popup-address-phone">{{ address.phone }}</text>
+								<view v-if="address.is_default" class="popup-default-tag">
+									<text class="popup-tag-text">默认</text>
+								</view>
+							</view>
+							<text class="popup-address-detail">{{ getFullAddress(address) }}</text>
+							<view v-if="selectedAddress && selectedAddress.id === address.id" class="popup-selected-indicator">
+								<text>✓</text>
+							</view>
+						</view>
+					</view>
+					
+					<!-- 空状态 -->
+					<view v-else class="popup-empty-address">
+						<text class="popup-empty-icon">📍</text>
+						<text class="popup-empty-text">暂无收货地址</text>
+					</view>
+				</scroll-view>
+				
+				<!-- 新建地址按钮 -->
+				<view class="popup-add-address-btn" @click="handleAddNewAddress">
+					<text class="popup-btn-icon">+</text>
+					<text class="popup-btn-text">新建收货地址</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 新建地址表单弹窗 -->
+		<view v-if="showNewAddressForm" class="address-form-mask" @click="cancelNewAddress">
+			<view class="address-form-popup" @click.stop>
+				<view class="form-header">
+					<text class="form-title">新建收货地址</text>
+					<text class="form-close" @click="cancelNewAddress">×</text>
+				</view>
+				
+				<scroll-view class="form-content" scroll-y>
+					<view class="form-item">
+						<text class="form-label">收货人</text>
+						<input class="form-input" v-model="newAddress.recipient_name" 
+									 placeholder="请输入收货人姓名" />
+					</view>
+					
+					<view class="form-item">
+						<text class="form-label">手机号</text>
+						<input class="form-input" v-model="newAddress.phone" 
+									 placeholder="请输入手机号码" type="number" />
+					</view>
+					
+					<view class="form-item">
+					<text class="form-label">智能填写地址</text>
+					<textarea class="form-textarea smart-address-input" 
+										v-model="smartAddressInput" 
+										placeholder="粘贴如：北京市朝阳区三里屯SOHO A座 张三 13800138000"
+										@input="parseSmartAddress"
+										maxlength="200" />
+					<text class="smart-tip">自动识别：地址+姓名+电话（支持粘贴文本）</text>
+				</view>
+					
+					<view class="form-item">
+						<text class="form-label">所在地区</text>
+						<view class="region-inputs">
+							<input class="form-input region-input" v-model="newAddress.province" 
+										 placeholder="省" readonly />
+							<input class="form-input region-input" v-model="newAddress.city" 
+										 placeholder="市" readonly />
+							<input class="form-input region-input" v-model="newAddress.district" 
+										 placeholder="区/县" readonly />
+						</view>
+					</view>
+					
+					<view class="form-item">
+						<text class="form-label">详细地址</text>
+						<textarea class="form-textarea" v-model="newAddress.detail" 
+											placeholder="街道、小区、楼栋、门牌号等" 
+											maxlength="100" />
+					</view>
+					
+					<view class="form-item checkbox-item">
+						<view class="checkbox-wrapper" @click="newAddress.is_default = !newAddress.is_default">
+							<view :class="['checkbox', { checked: newAddress.is_default }]">
+								<text v-if="newAddress.is_default" class="checkbox-check">✓</text>
+							</view>
+							<text class="checkbox-label">设为默认地址</text>
+						</view>
+					</view>
+				</scroll-view>
+				
+				<view class="form-buttons">
+					<button class="form-cancel-btn" @click="cancelNewAddress">取消</button>
+					<button class="form-submit-btn" @click="saveNewAddress">保存</button>
+				</view>
+			</view>
+		</view>
+		<!-- 确认保存弹窗 -->
+		<view v-if="showSaveConfirm" class="confirm-popup-mask">
+			<view class="confirm-popup">
+				<view class="confirm-header">
+					<text class="confirm-title">保存地址</text>
+				</view>
+				<view class="confirm-content">
+					<text class="confirm-message">是否保存该地址用于下次使用？</text>
+				</view>
+				<view class="confirm-buttons">
+					<button class="confirm-btn cancel" @click="handleSaveConfirm(false)">仅本次</button>
+					<button class="confirm-btn confirm" @click="handleSaveConfirm(true)">保存</button>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, computed, watch, onUnmounted, getCurrentInstance } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+
+type CheckoutItemType = {
+	id: string
+	product_id: string
+	sku_id: string
+	product_name: string
+	product_image: string
+	sku_specifications: any
+	price: number
+	quantity: number
+}
+
+type DeliveryOptionType = {
+	id: string
+	name: string
+	price: number
+	description: string
+}
+
+type UserCouponType = {
+	id: string
+	template: {
+		name: string
+		discount_value: number
+		min_order_amount: number
+	} | null
+}
+
+const checkoutItems = ref<Array<CheckoutItemType>>([])
+const selectedAddress = ref<any>(null)
+const deliveryOptions = ref<Array<DeliveryOptionType>>([
+	{ id: 'standard', name: '快递配送', price: 8.00, description: '1-3天送达' },
+	{ id: 'express', name: '加急配送', price: 15.00, description: '当天送达' }
+])
+const selectedDelivery = ref<string>('standard')
+const selectedCoupon = ref<UserCouponType | null>(null)
+const remark = ref<string>('')
+const showAddressPopup = ref<boolean>(false)
+const addressList = ref<Array<any>>([])
+const newAddress = ref<any>({
+	recipient_name: '',
+	phone: '',
+	province: '',
+	city: '',
+	district: '',
+	detail: '',
+	is_default: false
+})
+const showNewAddressForm = ref<boolean>(false)
+const showSaveConfirm = ref<boolean>(false)
+const smartAddressInput = ref<string>('')
+
+// 计算属性 - 修复价格同步问题
+const totalAmount = computed(() => {
+	console.log('计算商品总价，checkoutItems:', checkoutItems.value)
+	if (!checkoutItems.value || checkoutItems.value.length === 0) {
+		console.log('商品列表为空，返回0')
+		return 0
+	}
+	
+	// 确保每个商品的价格和数量都是数字类型，并计算总和
+	const total = checkoutItems.value.reduce((sum, item) => {
+		// 确保item存在且包含必要的属性
+		if (!item) return sum
+		
+		// 将价格转换为数字（确保是数字类型）
+		let price = 0
+		if (item.price !== undefined && item.price !== null) {
+			price = typeof item.price === 'string' ? parseFloat(item.price) : Number(item.price)
+		}
+		
+		// 将数量转换为数字
+		let quantity = 0
+		if (item.quantity !== undefined && item.quantity !== null) {
+			quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
+		}
+		
+		// 验证转换后的数字是否有效
+		if (isNaN(price) || isNaN(quantity) || price <= 0 || quantity <= 0) {
+			console.warn('商品价格或数量无效:', item, 'price:', price, 'quantity:', quantity)
+			return sum
+		}
+		
+		const itemTotal = price * quantity
+		console.log(`商品 ${item.product_name}，单价: ${price}，数量: ${quantity}，小计: ${itemTotal}`)
+		return sum + itemTotal
+	}, 0)
+	
+	console.log('商品总价计算结果:', total)
+	return total
+})
+
+const deliveryFee = computed(() => {
+	const option = deliveryOptions.value.find(opt => opt.id === selectedDelivery.value)
+	return option?.price || 0
+})
+
+const discountAmount = computed(() => {
+	if (!selectedCoupon.value || !selectedCoupon.value.template) return 0
+	
+	const coupon = selectedCoupon.value.template
+	// 确保使用计算后的商品总价进行比较
+	if (totalAmount.value < coupon.min_order_amount) return 0
+	
+	// 简单处理：假设都是满减券
+	return coupon.discount_value
+})
+
+const actualAmount = computed(() => {
+	// 确保所有值都是数字类型
+	const total = typeof totalAmount.value === 'number' ? totalAmount.value : 0
+	const delivery = typeof deliveryFee.value === 'number' ? deliveryFee.value : 0
+	const discount = typeof discountAmount.value === 'number' ? discountAmount.value : 0
+	
+	// 正确计算：商品总价 + 运费 - 优惠减免
+	let amount = total + delivery - discount
+	
+	// 金额必须大于等于0
+	return amount > 0 ? amount : 0
+})
+
+// 监听checkoutItems变化 - 调试用
+watch(checkoutItems, (newItems) => {
+	console.log('checkoutItems变化了:', newItems)
+	console.log('商品总价计算:', totalAmount.value)
+}, { deep: true })
+
+// 页面加载时监听eventChannel
+onLoad(() => {
+	// 优先检查Storage中是否有"立即购买"的数据
+	const checkoutType = uni.getStorageSync('checkout_type')
+	if (checkoutType === 'buy_now') {
+		console.log('检测到立即购买模式，从Storage加载数据')
+		const itemsStr = uni.getStorageSync('checkout_items')
+		if (itemsStr) {
+			try {
+				const items = JSON.parse(itemsStr as string)
+				console.log('从Storage加载的商品数据:', items)
+				processCheckoutItems(items)
+				
+				// 清除Storage，避免污染下次进入（刷新页面时可能需要保留？暂时不清除，或者在离开页面时清除）
+				// uni.removeStorageSync('checkout_type')
+				// uni.removeStorageSync('checkout_items')
+				loadDefaultAddress()
+				return // 成功加载，直接返回
+			} catch (e) {
+				console.error('解析立即购买数据失败', e)
+			}
+		}
+	}
+
+	// 从上一页获取数据
+	const eventChannel = uni.getEventChannel ? uni.getEventChannel() : null
+	if (eventChannel) {
+		eventChannel.on('acceptData', (data: any) => {
+			console.log('接收到商品数据:', data)
+			let items = data.selectedItems || []
+			processCheckoutItems(items)
+			loadDefaultAddress()
+		})
+	} else {
+		// 如果没有eventChannel，尝试从本地存储加载（例如从购物车进入）
+		loadFromLocalStorage()
+	}
+})
+
+// 处理商品数据清洗
+const processCheckoutItems = (items: any[]) => {
+	// 数据清洗：确保价格和数量是数字类型
+	if (items && items.length > 0) {
+		items = items.map((item: any) => {
+			// 确保价格是数字
+			let price = item.price
+			if (price !== undefined && price !== null) {
+				price = typeof price === 'string' ? parseFloat(price) : Number(item.price)
+				if (isNaN(price)) price = 0
+			} else {
+				price = 0
+			}
+			
+			// 确保数量是数字
+			let quantity = item.quantity
+			if (quantity !== undefined && quantity !== null) {
+				quantity = typeof quantity === 'string' ? parseInt(quantity) : Number(item.quantity)
+				if (isNaN(quantity) || quantity < 1) quantity = 1
+			} else {
+				quantity = 1
+			}
+			
+			return {
+				...item,
+				price: Number(price.toFixed(2)), // 保留两位小数
+				quantity: quantity
+			}
+		})
+	}
+	checkoutItems.value = items
+	// 调试：打印每个商品的价格
+	if (checkoutItems.value && checkoutItems.value.length > 0) {
+		console.log('清洗后商品价格明细：')
+		checkoutItems.value.forEach((item: any, index: number) => {
+			console.log(`商品${index}:`, item.product_name, '价格:', item.price, '类型:', typeof item.price, '数量:', item.quantity)
+		})
+	}
+}
+
+// 生命周期
+onMounted(() => {
+	// 监听地址更新事件
+	uni.$on('addressUpdated', (updatedAddressList: any) => {
+		addressList.value = updatedAddressList
+		
+		// 如果当前没有选中地址，尝试选择默认地址
+		if (!selectedAddress.value && addressList.value.length > 0) {
+			const defaultAddress = addressList.value.find(addr => addr.is_default)
+			if (defaultAddress) {
+				selectedAddress.value = defaultAddress
+			}
+		}
+	})
+})
+
+// 组件卸载时移除事件监听
+onUnmounted(() => {
+	uni.$off('addressUpdated')
+})
+
+// 从本地存储加载结算数据（例如从购物车进入）
+const loadFromLocalStorage = () => {
+	// 尝试从本地存储获取购物车选中的商品
+	const cartData = uni.getStorageSync('cart')
+	if (cartData) {
+		try {
+			const cartItems = JSON.parse(cartData as string) as any[]
+			// 筛选选中的商品
+			const selectedCartItems = cartItems.filter(item => item.selected === true)
+			if (selectedCartItems.length > 0) {
+				// 转换为CheckoutItemType格式
+				const convertedItems: CheckoutItemType[] = selectedCartItems.map(item => ({
+					id: item.id,
+					product_id: item.productId,
+					sku_id: item.id, // 购物车中item.id就是SKU ID
+					product_name: item.name,
+					product_image: item.image,
+					sku_specifications: item.spec ? { spec: item.spec } : {},
+					price: item.price,
+					quantity: item.quantity
+				}))
+				checkoutItems.value = convertedItems
+			}
+		} catch (e) {
+			console.error('解析购物车数据失败:', e)
+		}
+	}
+	loadDefaultAddress()
+}
+
+// 加载结算数据（兼容旧版本，现在主要在onLoad中处理）
+const loadCheckoutData = () => {
+	// 为了兼容性保留，但主要逻辑已在onLoad中实现
+	loadFromLocalStorage()
+}
+
+// 加载默认地址
+const loadDefaultAddress = async () => {
+	// 从本地存储加载地址数据
+	const storedAddresses = uni.getStorageSync('addresses')
+	if (storedAddresses) {
+		try {
+			const addresses = JSON.parse(storedAddresses as string) as any[]
+			if (addresses && addresses.length > 0) {
+				// 查找默认地址
+				const defaultAddress = addresses.find((addr: any) => addr.isDefault === true)
+				if (defaultAddress) {
+					// 转换地址格式以匹配selectedAddress的结构
+					selectedAddress.value = {
+						id: defaultAddress.id,
+						recipient_name: defaultAddress.name,
+						phone: defaultAddress.phone,
+						province: defaultAddress.province,
+						city: defaultAddress.city,
+						district: defaultAddress.district,
+						detail: defaultAddress.detail,
+						is_default: defaultAddress.isDefault
+					}
+				} else {
+					// 如果没有默认地址，使用第一个地址
+					const firstAddress = addresses[0]
+					selectedAddress.value = {
+						id: firstAddress.id,
+						recipient_name: firstAddress.name,
+						phone: firstAddress.phone,
+						province: firstAddress.province,
+						city: firstAddress.city,
+						district: firstAddress.district,
+						detail: firstAddress.detail,
+						is_default: firstAddress.isDefault
+					}
+				}
+			}
+		} catch (err) {
+			console.error('解析地址数据失败:', err)
+		}
+	} else {
+        // 如果没有地址数据，尝试使用Mock数据初始化（为了演示效果）
+        const mockAddress = {
+            id: 'addr_mock_default',
+            name: '测试用户',
+            phone: '13800138000',
+            province: '北京市',
+            city: '北京市',
+            district: '朝阳区',
+            detail: '三里屯SOHO A座',
+            isDefault: true
+        }
+        uni.setStorageSync('addresses', JSON.stringify([mockAddress]))
+        selectedAddress.value = {
+            id: mockAddress.id,
+            recipient_name: mockAddress.name,
+            phone: mockAddress.phone,
+            province: mockAddress.province,
+            city: mockAddress.city,
+            district: mockAddress.district,
+            detail: mockAddress.detail,
+            is_default: mockAddress.isDefault
+        }
+    }
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || ''
+}
+
+// 获取完整地址
+const getFullAddress = (address: any): string => {
+	return `${address.province}${address.city}${address.district}${address.detail}`
+}
+
+// 加载地址列表
+const loadAddressList = async () => {
+	// 从本地存储加载地址数据
+	const storedAddresses = uni.getStorageSync('addresses')
+	if (storedAddresses) {
+		try {
+			const addresses = JSON.parse(storedAddresses as string) as any[]
+			if (addresses && addresses.length > 0) {
+				// 转换地址格式以匹配addressList的结构
+				addressList.value = addresses.map((addr: any) => ({
+					id: addr.id,
+					recipient_name: addr.name,
+					phone: addr.phone,
+					province: addr.province,
+					city: addr.city,
+					district: addr.district,
+					detail: addr.detail,
+					is_default: addr.isDefault
+				}))
+			} else {
+				addressList.value = []
+			}
+		} catch (err) {
+			console.error('解析地址数据失败:', err)
+			addressList.value = []
+		}
+	} else {
+		addressList.value = []
+	}
+}
+
+// 选择地址
+const handleSelectAddress = (address: any) => {
+	selectedAddress.value = address
+	showAddressPopup.value = false
+}
+
+// 新建地址
+const handleAddNewAddress = () => {
+	showNewAddressForm.value = true
+}
+
+// 保存新地址
+const saveNewAddress = async () => {
+	// 验证表单
+	if (!newAddress.value.recipient_name || !newAddress.value.phone || !newAddress.value.detail) {
+		uni.showToast({
+			title: '请填写完整信息',
+			icon: 'none'
+		})
+		return
+	}
+
+	const userId = getCurrentUserId()
+	// if (!userId) return // 允许未登录用户保存地址用于演示
+
+	// 触发保存确认弹窗
+	showSaveConfirm.value = true
+}
+
+// 处理保存确认
+const handleSaveConfirm = async (save: boolean) => {
+	showSaveConfirm.value = false
+	
+	const newAddressData = {
+		id: `addr_${Date.now()}`,
+		name: newAddress.value.recipient_name,
+		phone: newAddress.value.phone,
+		province: newAddress.value.province,
+		city: newAddress.value.city,
+		district: newAddress.value.district,
+		detail: newAddress.value.detail,
+		isDefault: newAddress.value.is_default,
+		label: '' 
+	}
+		
+		if (save) {
+			// 从本地存储加载现有地址
+			const storedAddresses = uni.getStorageSync('addresses')
+			let addresses: any[] = []
+			if (storedAddresses) {
+				try {
+					addresses = JSON.parse(storedAddresses as string) as any[]
+				} catch (e) {
+					console.error('解析地址数据失败:', e)
+					addresses = []
+				}
+			}
+			
+			// 如果是默认地址，取消其他默认地址
+			if (newAddressData.isDefault) {
+				addresses.forEach(addr => {
+					addr.isDefault = false
+				})
+			}
+			
+			// 如果是第一个地址且未设置默认，则自动设为默认
+			if (addresses.length === 0 && !newAddressData.isDefault) {
+				newAddressData.isDefault = true
+			}
+			
+			// 添加到地址列表
+			addresses.unshift(newAddressData)
+			
+			// 保存到本地存储
+			uni.setStorageSync('addresses', JSON.stringify(addresses))
+			
+			// 发布地址更新事件，让address-list页面也能获取到
+			uni.$emit('addressUpdated', addresses.map((addr) => ({
+				id: addr.id,
+				recipient_name: addr.name,
+				phone: addr.phone,
+				province: addr.province,
+				city: addr.city,
+				district: addr.district,
+				detail: addr.detail,
+				is_default: addr.isDefault
+			})))
+		}
+		
+		// 转换为checkout页面格式并添加到当前地址列表
+		const checkoutFormatAddress = {
+			id: newAddressData.id,
+			recipient_name: newAddressData.name,
+			phone: newAddressData.phone,
+			province: newAddressData.province,
+			city: newAddressData.city,
+			district: newAddressData.district,
+			detail: newAddressData.detail,
+			is_default: newAddressData.isDefault
+		}
+		
+		// 如果是默认地址，取消其他默认地址
+		if (checkoutFormatAddress.is_default) {
+			addressList.value.forEach(addr => {
+				addr.is_default = false
+			})
+		}
+		
+		// 添加到当前地址列表
+		addressList.value.unshift(checkoutFormatAddress)
+		
+		// 如果选择了保存，address-list 已通过事件收到更新；未保存则不影响地址簿
+		
+		// 如果保存的是默认地址，或者当前没有选中地址，则选中这个新地址
+		if (checkoutFormatAddress.is_default || !selectedAddress.value) {
+			selectedAddress.value = checkoutFormatAddress
+		}
+		
+		// 重置表单
+		newAddress.value = {
+			recipient_name: '',
+			phone: '',
+			province: '',
+			city: '',
+			district: '',
+			detail: '',
+			is_default: false
+		}
+		smartAddressInput.value = ''
+		
+		showNewAddressForm.value = false
+		
+		uni.showToast({
+			title: '地址保存成功',
+			icon: 'success'
+		})
+}
+
+// 解析智能地址
+const parseSmartAddress = () => {
+	const input = smartAddressInput.value.trim()
+	if (!input) return
+	
+	// 重置表单
+	newAddress.value.recipient_name = ''
+	newAddress.value.phone = ''
+	newAddress.value.province = ''
+	newAddress.value.city = ''
+	newAddress.value.district = ''
+	newAddress.value.detail = ''
+	
+	// 尝试匹配手机号码（11位数字）
+	const phoneRegex = /(1[3-9]\d{9})/g
+	const phoneMatches = input.match(phoneRegex)
+	if (phoneMatches && phoneMatches.length > 0) {
+		newAddress.value.phone = phoneMatches[0]
+	}
+	
+	// 尝试匹配收件人姓名（中文姓名，2-4个汉字）
+	const nameRegex = /([\u4e00-\u9fa5]{2,4})/g
+	const nameMatches = input.match(nameRegex)
+	if (nameMatches && nameMatches.length > 0) {
+		// 取第一个匹配的中文姓名作为收件人
+		newAddress.value.recipient_name = nameMatches[0]
+	}
+	
+	// 提取地址部分（移除姓名和手机号）
+	let addressText = input
+	if (newAddress.value.recipient_name) {
+		addressText = addressText.replace(newAddress.value.recipient_name, '')
+	}
+	if (newAddress.value.phone) {
+		addressText = addressText.replace(newAddress.value.phone, '')
+	}
+	
+	// 清理地址文本（移除多余的空格和标点）
+	addressText = addressText.replace(/[，,;；\s]+/g, ' ').trim()
+	
+	// 地址解析逻辑
+	const patterns = [
+		// 匹配格式：省市区详细地址
+		/^(.*?省)?(.*?市)?(.*?[区县])?(.*)$/,
+		// 匹配格式：省市详细地址
+		/^(.*?省)?(.*?市)?(.*)$/
+	]
+	
+	for (const pattern of patterns) {
+		const match = addressText.match(pattern)
+		if (match) {
+			const [, province, city, district, detail] = match
+			
+			if (province) newAddress.value.province = province.replace('省', '').trim()
+			if (city) newAddress.value.city = city.replace('市', '').trim()
+			if (district) newAddress.value.district = district.trim()
+			if (detail) newAddress.value.detail = detail.trim()
+			
+			// 如果详细地址为空，但还有剩余内容，则作为详细地址
+			if (!newAddress.value.detail && district && detail) {
+				newAddress.value.detail = detail.trim()
+			}
+			
+			break
+		}
+	}
+	
+	// 如果没有匹配到模式，尝试简单分割
+	if (!newAddress.value.province && !newAddress.value.city && !newAddress.value.district) {
+		// 尝试按常见分隔符分割
+		const parts = addressText.split(/[省市县区]/)
+		if (parts.length >= 2) {
+			newAddress.value.province = parts[0] || ''
+			newAddress.value.city = parts[1] || ''
+			newAddress.value.detail = parts.slice(2).join('').trim() || addressText
+		} else {
+			newAddress.value.detail = addressText
+		}
+	}
+	
+	// 如果地址部分为空，但还有剩余文本，则作为详细地址
+	if (!newAddress.value.detail && addressText.trim()) {
+		newAddress.value.detail = addressText.trim()
+	}
+}
+
+// 取消新建地址
+const cancelNewAddress = () => {
+	showNewAddressForm.value = false
+	newAddress.value = {
+		recipient_name: '',
+		phone: '',
+		province: '',
+		city: '',
+		district: '',
+		detail: '',
+		is_default: false
+	}
+	smartAddressInput.value = ''
+}
+
+// 获取规格文本
+const getSpecText = (specs: any): string => {
+	if (!specs) return ''
+	if (typeof specs === 'object') {
+		return Object.keys(specs)
+			.map(key => `${key}: ${specs[key]}`)
+			.join('; ')
+	}
+	return String(specs)
+}
+
+// 选择地址
+const selectAddress = () => {
+	showAddressPopup.value = true
+	loadAddressList()
+}
+
+// 选择配送方式
+const selectDelivery = (option: DeliveryOptionType) => {
+	selectedDelivery.value = option.id
+}
+
+// 选择优惠券
+const selectCoupon = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/coupons',
+		success: (res) => {
+			res.eventChannel.emit('setSelectMode', { selectMode: true })
+		}
+	})
+	
+	// 监听优惠券选择
+	uni.$on('couponSelected', (coupon: any) => {
+		selectedCoupon.value = coupon
+		uni.$off('couponSelected')
+	})
+}
+
+// 提交订单
+const submitOrder = async () => {
+	if (!selectedAddress.value) {
+		uni.showToast({
+			title: '请选择收货地址',
+			icon: 'none'
+		})
+		return
+	}
+
+    // MOCK ORDER SUBMISSION
+    // 模拟创建成功
+    try {
+        const mockOrderId = `order_${Date.now()}`
+        
+        // 创建订单对象
+        const newOrder = {
+            id: mockOrderId,
+            order_no: generateOrderNo(),
+            user_id: getCurrentUserId() || 'user_001',
+            merchant_id: checkoutItems.value[0]?.product_id || 'merchant_001', // 简化处理，取第一个商品的merchant
+            status: 1, // 待支付
+            total_amount: totalAmount.value,
+            discount_amount: discountAmount.value,
+            delivery_fee: deliveryFee.value,
+            actual_amount: actualAmount.value,
+            payment_method: 0,
+            payment_status: 0,
+            delivery_address: selectedAddress.value,
+            items: checkoutItems.value,
+            created_at: new Date().toISOString()
+        }
+
+        // 保存到本地存储
+        const storedOrders = uni.getStorageSync('orders')
+        let orders: any[] = []
+        if (storedOrders) {
+            try {
+                orders = JSON.parse(storedOrders as string) as any[]
+            } catch (e) {
+                console.error('解析订单数据失败', e)
+            }
+        }
+        orders.unshift(newOrder)
+        uni.setStorageSync('orders', JSON.stringify(orders))
+
+        uni.showLoading({ title: '提交中...' })
+        await new Promise(resolve => setTimeout(resolve, 500))
+        uni.hideLoading()
+        
+        // 携带价格详情跳转
+        uni.navigateTo({
+			url: `/pages/mall/consumer/payment?orderId=${mockOrderId}&amount=${actualAmount.value}&productAmount=${totalAmount.value}&deliveryFee=${deliveryFee.value}&discountAmount=${discountAmount.value}`
+		})
+    } catch (err) {
+		console.error('创建订单失败:', err)
+		uni.showToast({
+			title: '订单创建失败',
+			icon: 'none'
+		})
+	}
+}
+
+// 生成订单号
+const generateOrderNo = (): string => {
+	const date = new Date()
+	const year = date.getFullYear()
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	const random = Math.random().toString().slice(2, 8)
+	return `ORD${year}${month}${day}${random}`
+}
+
+// 清空购物车
+const clearShoppingCart = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	const productIds = checkoutItems.value.map(item => item.product_id)
+	
+	try {
+		/* const { error } = await supa
+			.from('shopping_cart')
+			.delete()
+			.eq('user_id', userId)
+			.in('product_id', productIds)
+
+		if (error !== null) {
+			console.error('清空购物车失败:', error)
+		} */
+	} catch (err) {
+		console.error('清空购物车异常:', err)
+	}
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+.checkout-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+/* 删除未使用的顶部栏样式 */
+.checkout-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.checkout-content {
+	flex: 1;
+}
+
+.address-section {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 20px 15px;
+	display: flex;
+	align-items: center;
+}
+
+.address-info {
+	flex: 1;
+}
+
+.address-header {
+	display: flex;
+	align-items: center;
+	margin-bottom: 10px;
+}
+
+.recipient {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-right: 15px;
+}
+
+.phone {
+	font-size: 14px;
+	color: #666666;
+	margin-right: 10px;
+}
+
+.default-tag {
+	background-color: #ff4757;
+	padding: 2px 8px;
+	border-radius: 10px;
+}
+
+.tag-text {
+	color: #ffffff;
+	font-size: 12px;
+}
+
+.address-detail {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+}
+
+.no-address {
+	flex: 1;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.no-address-text {
+	font-size: 16px;
+	color: #999999;
+}
+
+.no-address-arrow {
+	color: #999999;
+	font-size: 18px;
+}
+
+.products-section {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 0 15px;
+}
+
+.debug-info {
+	background-color: #f8f9fa;
+	padding: 10px 15px;
+	border-bottom: 1px solid #e5e5e5;
+	margin-bottom: 10px;
+}
+
+.debug-text {
+	font-size: 12px;
+	color: #666;
+	display: block;
+	text-align: center;
+}
+
+.product-item {
+	display: flex;
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.product-item:last-child {
+	border-bottom: none;
+}
+
+.product-image {
+	width: 80px;
+	height: 80px;
+	border-radius: 5px;
+	margin-right: 15px;
+}
+
+.product-info {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.product-name {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.product-spec {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 10px;
+}
+
+.product-bottom {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.product-price {
+	font-size: 16px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.product-quantity {
+	font-size: 14px;
+	color: #666666;
+}
+
+.delivery-section,
+.coupon-section,
+.remark-section,
+.price-section {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+}
+
+.section-title {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.delivery-options {
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+}
+
+.delivery-option {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 15px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+}
+
+.delivery-option.selected {
+	border-color: #007aff;
+	background-color: #f0f8ff;
+}
+
+.option-name {
+	font-size: 14px;
+	color: #333333;
+}
+
+.option-price {
+	font-size: 14px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.option-selected {
+	color: #007aff;
+	font-size: 16px;
+}
+
+.coupon-info {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 15px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+}
+
+.coupon-selected {
+	font-size: 14px;
+	color: #007aff;
+}
+
+.coupon-placeholder {
+	font-size: 14px;
+	color: #999999;
+}
+
+.coupon-arrow {
+	color: #999999;
+	font-size: 16px;
+}
+
+.remark-input {
+	width: 100%;
+	min-height: 40px;
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	font-size: 14px;
+	color: #333333;
+}
+
+.price-detail {
+	padding: 15px;
+	background-color: #f8f9fa;
+	border-radius: 8px;
+}
+
+.price-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 8px 0;
+}
+
+.price-row.total {
+	border-top: 1px solid #e5e5e5;
+	margin-top: 8px;
+	padding-top: 15px;
+}
+
+.price-label {
+	font-size: 14px;
+	color: #666666;
+}
+
+.price-value {
+	font-size: 14px;
+	color: #333333;
+}
+
+.price-value.discount {
+	color: #4caf50;
+}
+
+.price-value.total-price {
+	font-size: 18px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.bottom-bar {
+	background-color: #ffffff;
+	padding: 15px;
+	border-top: 1px solid #e5e5e5;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.price-summary {
+	display: flex;
+	align-items: baseline;
+}
+
+.summary-label {
+	font-size: 14px;
+	color: #333333;
+	margin-right: 5px;
+}
+
+.summary-price {
+	font-size: 20px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.submit-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 0 40px;
+	height: 45px;
+	border-radius: 22.5px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+}
+
+/* 地址选择弹窗样式 */
+.address-popup-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: flex-end;
+	justify-content: center;
+	z-index: 9998;
+}
+
+.address-popup {
+	background-color: #ffffff;
+	width: 100%;
+	max-height: 70vh;
+	border-radius: 20px 20px 0 0;
+	display: flex;
+	flex-direction: column;
+}
+
+.popup-header {
+	padding: 20px 15px;
+	border-bottom: 1px solid #e5e5e5;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.popup-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.popup-close {
+	font-size: 24px;
+	color: #999999;
+	padding: 5px;
+}
+
+.address-list-container {
+	flex: 1;
+	padding: 15px;
+	max-height: 50vh;
+}
+
+.popup-address-item {
+	padding: 15px;
+	margin-bottom: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	position: relative;
+}
+
+.popup-address-item:last-child {
+	margin-bottom: 0;
+}
+
+.popup-address-header {
+	display: flex;
+	align-items: center;
+	margin-bottom: 10px;
+}
+
+.popup-address-name {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-right: 15px;
+}
+
+.popup-address-phone {
+	font-size: 14px;
+	color: #666666;
+	margin-right: 10px;
+}
+
+.popup-default-tag {
+	background-color: #ff4757;
+	padding: 2px 8px;
+	border-radius: 10px;
+}
+
+.popup-tag-text {
+	color: #ffffff;
+	font-size: 12px;
+}
+
+.popup-address-detail {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+	display: block;
+}
+
+.popup-selected-indicator {
+	position: absolute;
+	top: 15px;
+	right: 15px;
+	color: #007aff;
+	font-size: 16px;
+}
+
+.popup-empty-address {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 40px 20px;
+}
+
+.popup-empty-icon {
+	font-size: 60px;
+	margin-bottom: 15px;
+}
+
+.popup-empty-text {
+	font-size: 16px;
+	color: #999999;
+}
+
+.popup-add-address-btn {
+	background-color: #007aff;
+	margin: 15px;
+	padding: 15px;
+	border-radius: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.popup-btn-icon {
+	color: #ffffff;
+	font-size: 20px;
+	margin-right: 10px;
+}
+
+.popup-btn-text {
+	color: #ffffff;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+/* 新建地址表单弹窗样式 */
+.address-form-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 9999;
+}
+
+.address-form-popup {
+	background-color: #ffffff;
+	width: 90%;
+	max-width: 500px;
+	max-height: 80vh;
+	border-radius: 12px;
+	display: flex;
+	flex-direction: column;
+}
+
+.form-header {
+	padding: 20px 15px;
+	border-bottom: 1px solid #e5e5e5;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.form-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.form-close {
+	font-size: 24px;
+	color: #999999;
+	padding: 5px;
+}
+
+.form-content {
+	flex: 1;
+	padding: 15px;
+	max-height: 50vh;
+}
+
+.form-item {
+	margin-bottom: 20px;
+}
+
+.form-item:last-child {
+	margin-bottom: 0;
+}
+
+.form-label {
+	font-size: 14px;
+	color: #333333;
+	margin-bottom: 8px;
+	display: block;
+}
+
+.form-input {
+	width: 100%;
+	padding: 12px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	font-size: 14px;
+	color: #333333;
+	box-sizing: border-box;
+}
+
+.form-input[readonly] {
+	background-color: #f9f9f9;
+	color: #666666;
+}
+
+.region-inputs {
+	display: flex;
+	gap: 10px;
+}
+
+.region-input {
+	flex: 1;
+}
+
+.form-textarea {
+	width: 100%;
+	min-height: 80px;
+	padding: 12px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	font-size: 14px;
+	color: #333333;
+	box-sizing: border-box;
+}
+
+.smart-address-input {
+	min-height: 60px;
+}
+
+.smart-tip {
+	font-size: 12px;
+	color: #999999;
+	margin-top: 5px;
+	display: block;
+}
+
+.checkbox-item {
+	margin-top: 20px;
+}
+
+.checkbox-wrapper {
+	display: flex;
+	align-items: center;
+}
+
+.checkbox {
+	width: 20px;
+	height: 20px;
+	border: 1px solid #e5e5e5;
+	border-radius: 4px;
+	margin-right: 10px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.checkbox.checked {
+	background-color: #007aff;
+	border-color: #007aff;
+}
+
+.checkbox-check {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+.checkbox-label {
+	font-size: 14px;
+	color: #333333;
+}
+
+.form-buttons {
+	display: flex;
+	padding: 15px;
+	border-top: 1px solid #e5e5e5;
+	gap: 10px;
+}
+
+.form-cancel-btn {
+	flex: 1;
+	background-color: #f5f5f5;
+	color: #333333;
+	padding: 12px;
+	border-radius: 8px;
+	font-size: 16px;
+	border: none;
+}
+
+.form-submit-btn {
+	flex: 1;
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 12px;
+	border-radius: 8px;
+	font-size: 16px;
+	border: none;
+}
+/* 确认弹窗样式 */
+.confirm-popup-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 10002;
+}
+
+.confirm-popup {
+	background-color: #ffffff;
+	width: 80%;
+	max-width: 320px;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.confirm-header {
+	padding: 20px 0 10px;
+	text-align: center;
+}
+
+.confirm-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.confirm-content {
+	padding: 0 20px 20px;
+	text-align: center;
+}
+
+.confirm-message {
+	font-size: 16px;
+	color: #666666;
+}
+
+.confirm-buttons {
+	display: flex;
+	border-top: 1px solid #e5e5e5;
+}
+
+.confirm-btn {
+	flex: 1;
+	height: 50px;
+	line-height: 50px;
+	text-align: center;
+	font-size: 16px;
+	background-color: #ffffff;
+	border: none;
+	border-radius: 0;
+}
+
+.confirm-btn::after {
+	border: none;
+}
+
+.confirm-btn.cancel {
+	color: #666666;
+	border-right: 1px solid #e5e5e5;
+}
+
+.confirm-btn.confirm {
+	color: #007aff;
+	font-weight: bold;
+}
+</style>
diff --git a/pages/mall/consumer/coupons.uvue b/pages/mall/consumer/coupons.uvue
new file mode 100644
index 00000000..9cc7db87
--- /dev/null
+++ b/pages/mall/consumer/coupons.uvue
@@ -0,0 +1,149 @@
+<template>
+  <view class="coupons-page">
+    <view class="coupon-list">
+      <view v-if="coupons.length === 0" class="empty-state">
+        <text class="empty-icon">🎫</text>
+        <text class="empty-text">暂无优惠券</text>
+      </view>
+      
+      <view v-else v-for="(coupon, index) in coupons" :key="index" class="coupon-item">
+        <view class="coupon-left">
+          <text class="coupon-amount">{{ coupon.amount }}</text>
+          <text class="coupon-type">优惠券</text>
+        </view>
+        <view class="coupon-right">
+          <text class="coupon-title">{{ coupon.title }}</text>
+          <text class="coupon-expiry">有效期至: {{ coupon.expiry }}</text>
+          <button class="use-btn" @click="useCoupon(coupon)">去使用</button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+
+type Coupon = {
+  title: string
+  amount: string
+  expiry: string
+  id: string
+}
+
+const coupons = ref<Coupon[]>([])
+
+onMounted(() => {
+  loadCoupons()
+})
+
+const loadCoupons = () => {
+  // 从本地存储获取已领取的优惠券详情
+  // 假设存储格式为 JSON 字符串数组
+  const storedCoupons = uni.getStorageSync('myCoupons')
+  if (storedCoupons) {
+    try {
+      coupons.value = JSON.parse(storedCoupons as string) as Coupon[]
+    } catch (e) {
+      console.error('Failed to parse coupons', e)
+      coupons.value = []
+    }
+  } else {
+    // 默认空或者是mock一些基础数据如果需要
+    coupons.value = []
+  }
+}
+
+const useCoupon = (coupon: Coupon) => {
+  uni.switchTab({
+    url: '/pages/mall/consumer/index'
+  })
+}
+</script>
+
+<style>
+.coupons-page {
+  padding: 15px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding-top: 100px;
+}
+
+.empty-icon {
+  font-size: 60px;
+  margin-bottom: 20px;
+}
+
+.empty-text {
+  font-size: 16px;
+  color: #999;
+}
+
+.coupon-item {
+  display: flex;
+  background-color: white;
+  border-radius: 8px;
+  margin-bottom: 15px;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+}
+
+.coupon-left {
+  width: 100px;
+  background: linear-gradient(135deg, #FF9800, #FF5722);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: white;
+  padding: 15px;
+}
+
+.coupon-amount {
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.coupon-type {
+  font-size: 12px;
+  margin-top: 5px;
+}
+
+.coupon-right {
+  flex: 1;
+  padding: 15px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+.coupon-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.coupon-expiry {
+  font-size: 12px;
+  color: #999;
+  margin-bottom: 10px;
+}
+
+.use-btn {
+  align-self: flex-end;
+  font-size: 12px;
+  background-color: #FF5722;
+  color: white;
+  padding: 4px 12px;
+  border-radius: 15px;
+  line-height: 1.5;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/favorites.uvue b/pages/mall/consumer/favorites.uvue
new file mode 100644
index 00000000..693a201a
--- /dev/null
+++ b/pages/mall/consumer/favorites.uvue
@@ -0,0 +1,269 @@
+<template>
+  <view class="favorites-page">
+    <view class="product-grid">
+      <view v-if="favorites.length === 0" class="empty-state">
+        <text class="empty-icon">❤️</text>
+        <text class="empty-text">暂无收藏商品</text>
+        <button class="go-shopping-btn" @click="goShopping">去逛逛</button>
+      </view>
+      
+      <view v-else v-for="(product, index) in favorites" :key="index" class="product-item" @click="goToDetail(product.id)">
+        <image :src="product.image" class="product-image" mode="aspectFill" />
+        <view class="product-info">
+          <text class="product-name">{{ product.name }}</text>
+          <text class="product-price">¥{{ product.price }}</text>
+          <view class="product-footer">
+            <text class="product-sales">已售 {{ product.sales }}</text>
+            <view class="action-btns">
+              <view class="cart-btn" @click.stop="addToCart(product)">
+                <text class="cart-icon">🛒</text>
+              </view>
+              <view class="remove-btn" @click.stop="removeFavorite(product.id)">
+                <text class="remove-icon">🗑️</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+
+type Product = {
+  id: string
+  name: string
+  price: number
+  image: string
+  sales: number
+  shopId?: string
+  shopName?: string
+}
+
+const favorites = ref<Product[]>([])
+
+onMounted(() => {
+  loadFavorites()
+})
+
+const addToCart = (product: Product) => {
+  // 获取现有购物车数据
+  const cartData = uni.getStorageSync('cart')
+  let cartItems: any[] = []
+  
+  if (cartData) {
+    try {
+      cartItems = JSON.parse(cartData as string) as any[]
+    } catch (e) {
+      console.error('解析购物车数据失败', e)
+    }
+  }
+  
+  // 检查商品是否已存在
+  const existingItem = cartItems.find((item: any) => item.id === product.id)
+  
+  if (existingItem) {
+    existingItem.quantity++
+  } else {
+    // 添加新商品
+    cartItems.push({
+      id: product.id,
+      shopId: product.shopId || 'shop_favorite_default',
+      shopName: product.shopName || '收藏店铺',
+      name: product.name,
+      price: product.price,
+      image: product.image,
+      spec: '默认规格',
+      quantity: 1,
+      selected: true
+    })
+  }
+  
+  // 保存回存储
+  uni.setStorageSync('cart', JSON.stringify(cartItems))
+  
+  uni.showToast({
+    title: '已添加到购物车',
+    icon: 'success'
+  })
+}
+
+const loadFavorites = () => {
+  // 从本地存储获取收藏列表
+  const storedFavorites = uni.getStorageSync('favorites')
+  if (storedFavorites) {
+    try {
+      favorites.value = JSON.parse(storedFavorites as string) as Product[]
+    } catch (e) {
+      console.error('Failed to parse favorites', e)
+      favorites.value = []
+    }
+  } else {
+    favorites.value = []
+  }
+}
+
+const goShopping = () => {
+  uni.switchTab({
+    url: '/pages/mall/consumer/index'
+  })
+}
+
+const goToDetail = (product: Product) => {
+  uni.navigateTo({
+    url: `/pages/mall/consumer/product-detail?productId=${product.id}&price=${product.price}&originalPrice=${product.original_price || ''}`
+  })
+}
+
+const removeFavorite = (id: string) => {
+  uni.showModal({
+    title: '取消收藏',
+    content: '确定要取消收藏该商品吗？',
+    success: (res) => {
+      if (res.confirm) {
+        const index = favorites.value.findIndex(item => item.id === id)
+        if (index !== -1) {
+          favorites.value.splice(index, 1)
+          uni.setStorageSync('favorites', JSON.stringify(favorites.value))
+          uni.showToast({
+            title: '已取消收藏',
+            icon: 'none'
+          })
+        }
+      }
+    }
+  })
+}
+</script>
+
+<style>
+.favorites-page {
+  padding: 15px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.product-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.empty-state {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding-top: 100px;
+}
+
+.empty-icon {
+  font-size: 60px;
+  margin-bottom: 20px;
+  color: #ddd;
+}
+
+.empty-text {
+  font-size: 16px;
+  color: #999;
+  margin-bottom: 20px;
+}
+
+.go-shopping-btn {
+  background-color: #ff5000;
+  color: white;
+  padding: 8px 24px;
+  border-radius: 20px;
+  font-size: 14px;
+  border: none;
+}
+
+.product-item {
+  width: calc(50% - 8px);
+  background-color: white;
+  border-radius: 8px;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.product-image {
+  width: 100%;
+  height: 170px;
+  background-color: #f5f5f5;
+}
+
+.product-info {
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+.product-name {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 6px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  height: 40px;
+  line-height: 20px;
+}
+
+.product-price {
+  font-size: 16px;
+  color: #ff5000;
+  font-weight: bold;
+  margin-bottom: 6px;
+}
+
+.product-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: auto;
+}
+
+.product-sales {
+  font-size: 12px;
+  color: #999;
+}
+
+.action-btns {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 8px;
+}
+
+.cart-btn, .remove-btn {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.cart-btn {
+  background-color: #ff5000;
+}
+
+.cart-icon {
+  font-size: 14px;
+  color: white;
+}
+
+.remove-btn {
+  background-color: #f0f0f0;
+}
+
+.remove-icon {
+  font-size: 14px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/footprint.uvue b/pages/mall/consumer/footprint.uvue
new file mode 100644
index 00000000..b1ee3627
--- /dev/null
+++ b/pages/mall/consumer/footprint.uvue
@@ -0,0 +1,580 @@
+<!-- 足迹页面 -->
+<template>
+	<view class="footprint-page">
+		<!-- 顶部栏 -->
+		<view class="footprint-header">
+			<view class="header-title">
+				<text class="title-text">我的足迹</text>
+			</view>
+			<view v-if="footprints.length > 0" class="header-actions">
+				<text class="action-btn" @click="toggleEditMode">{{ isEditMode ? '完成' : '编辑' }}</text>
+				<text class="action-btn" @click="clearAll">清空</text>
+			</view>
+		</view>
+
+		<!-- 日期分组 -->
+		<scroll-view class="footprint-content" scroll-y @scrolltolower="loadMore">
+			<!-- 空状态 -->
+			<view v-if="footprints.length === 0 && !isLoading" class="empty-footprints">
+				<text class="empty-icon">👣</text>
+				<text class="empty-text">暂无浏览记录</text>
+				<text class="empty-subtext">快去浏览喜欢的商品吧</text>
+				<button class="go-shopping-btn" @click="goShopping">去逛逛</button>
+			</view>
+
+			<!-- 按日期分组 -->
+			<view v-for="(group, date) in groupedFootprints" :key="date" class="date-group">
+				<view class="group-header">
+					<text class="group-date">{{ formatGroupDate(date) }}</text>
+					<text v-if="isEditMode" class="group-select" @click="toggleGroupSelect(date)">
+						{{ isGroupSelected(date) ? '取消全选' : '全选' }}
+					</text>
+				</view>
+				
+				<view class="group-items">
+					<view v-for="item in group" :key="item.id" class="footprint-item">
+						<view v-if="isEditMode" class="item-selector" @click="toggleSelect(item)">
+							<view :class="['select-icon', { selected: item.selected }]">
+								<text v-if="item.selected" class="icon-text">✓</text>
+							</view>
+						</view>
+						<view class="item-content" @click="viewProduct(item)">
+							<image class="product-image" :src="item.image" />
+							<view class="product-info">
+								<text class="product-name">{{ item.name }}</text>
+								<view class="product-price-row">
+									<text class="current-price">¥{{ item.price }}</text>
+									<text v-if="item.original_price && item.original_price > item.price" 
+												class="original-price">¥{{ item.original_price }}</text>
+								</view>
+								<view class="product-meta">
+									<text class="sales-text">已售{{ item.sales }}</text>
+									<text class="time-text">{{ formatTime(item.viewTime) }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 加载更多 -->
+			<view v-if="isLoading" class="loading-more">
+				<text class="loading-text">加载中...</text>
+			</view>
+			<view v-if="!hasMore && footprints.length > 0" class="no-more">
+				<text class="no-more-text">没有更多了</text>
+			</view>
+		</scroll-view>
+
+		<!-- 编辑操作栏 -->
+		<view v-if="isEditMode && footprints.length > 0" class="edit-bar">
+			<view class="select-all" @click="toggleSelectAll">
+				<view :class="['all-select-icon', { selected: isAllSelected }]">
+					<text v-if="isAllSelected" class="icon-text">✓</text>
+				</view>
+				<text class="select-all-text">全选</text>
+			</view>
+			<view class="delete-btn" @click="deleteSelected">
+				<text class="delete-text">删除({{ selectedCount }})</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, computed } from 'vue'
+
+type FootprintType = {
+	id: string
+	name: string
+	price: number
+	original_price?: number
+	image: string
+	sales: number
+	shopId: string
+	shopName: string
+	viewTime: number
+	selected?: boolean
+}
+
+const footprints = ref<Array<FootprintType>>([])
+const isEditMode = ref<boolean>(false)
+const isLoading = ref<boolean>(false)
+const hasMore = ref<boolean>(false)
+
+// 计算属性
+const selectedCount = computed(() => {
+	return footprints.value.filter(item => item.selected).length
+})
+
+const isAllSelected = computed(() => {
+	return footprints.value.length > 0 && footprints.value.every(item => item.selected)
+})
+
+const groupedFootprints = computed(() => {
+	const groups: Record<string, FootprintType[]> = {}
+	
+	footprints.value.forEach(item => {
+		const date = new Date(item.viewTime).toDateString()
+		if (!groups[date]) {
+			groups[date] = []
+		}
+		groups[date].push(item)
+	})
+	
+	return groups
+})
+
+// 生命周期
+onMounted(() => {
+	loadFootprints()
+})
+
+// 加载足迹数据
+const loadFootprints = (loadMore: boolean = false) => {
+	isLoading.value = true
+	
+	// 从本地存储获取足迹数据
+	const storedFootprints = uni.getStorageSync('footprints')
+	if (storedFootprints) {
+		try {
+			const data = JSON.parse(storedFootprints as string) as any[]
+			footprints.value = data.map(item => ({
+				...item,
+				selected: false
+			}))
+		} catch (e) {
+			console.error('Failed to parse footprints', e)
+			footprints.value = []
+		}
+	} else {
+		footprints.value = []
+	}
+	
+	isLoading.value = false
+	hasMore.value = false // 本地存储一次性加载完
+}
+
+// 格式化日期分组
+const formatGroupDate = (dateStr: string): string => {
+	const date = new Date(dateStr)
+	const today = new Date()
+	const yesterday = new Date(today)
+	yesterday.setDate(yesterday.getDate() - 1)
+	
+	if (date.toDateString() === today.toDateString()) {
+		return '今天'
+	} else if (date.toDateString() === yesterday.toDateString()) {
+		return '昨天'
+	} else {
+		const month = date.getMonth() + 1
+		const day = date.getDate()
+		return `${month}月${day}日`
+	}
+}
+
+// 格式化时间
+const formatTime = (timestamp: number): string => {
+	const date = new Date(timestamp)
+	const hours = date.getHours().toString().padStart(2, '0')
+	const minutes = date.getMinutes().toString().padStart(2, '0')
+	return `${hours}:${minutes}`
+}
+
+// 切换编辑模式
+const toggleEditMode = () => {
+	isEditMode.value = !isEditMode.value
+	// 重置选择状态
+	footprints.value.forEach(item => {
+		item.selected = false
+	})
+}
+
+// 清空所有足迹
+const clearAll = () => {
+	if (footprints.value.length === 0) return
+
+	uni.showModal({
+		title: '清空足迹',
+		content: '确定要清空所有浏览记录吗？',
+		success: (res) => {
+			if (res.confirm) {
+				footprints.value = []
+				uni.removeStorageSync('footprints')
+				
+				uni.showToast({
+					title: '已清空',
+					icon: 'success'
+				})
+			}
+		}
+	})
+}
+
+// 切换选择状态
+const toggleSelect = (item: FootprintType) => {
+	item.selected = !item.selected
+	footprints.value = [...footprints.value]
+}
+
+// 切换分组全选
+const toggleGroupSelect = (dateStr: string) => {
+	const group = groupedFootprints.value[dateStr]
+	if (!group) return
+	
+	const isAllSelected = group.every(item => item.selected)
+	const newSelectedState = !isAllSelected
+	
+	group.forEach(item => {
+		item.selected = newSelectedState
+	})
+	
+	footprints.value = [...footprints.value]
+}
+
+// 检查组是否全选
+const isGroupSelected = (dateStr: string): boolean => {
+	const group = groupedFootprints.value[dateStr]
+	if (!group || group.length === 0) return false
+	return group.every(item => item.selected)
+}
+
+// 全选/取消全选
+const toggleSelectAll = () => {
+	const newSelectedState = !isAllSelected.value
+	footprints.value.forEach(item => {
+		item.selected = newSelectedState
+	})
+	footprints.value = [...footprints.value]
+}
+
+// 删除选中项
+const deleteSelected = () => {
+	const selectedItems = footprints.value.filter(item => item.selected)
+	if (selectedItems.length === 0) {
+		uni.showToast({
+			title: '请选择要删除的记录',
+			icon: 'none'
+		})
+		return
+	}
+
+	uni.showModal({
+		title: '确认删除',
+		content: `确定要删除选中的${selectedItems.length}条记录吗？`,
+		success: (res) => {
+			if (res.confirm) {
+				// 从列表中移除
+				footprints.value = footprints.value.filter(item => !item.selected)
+				
+				// 保存回本地存储
+				const dataToSave = footprints.value.map(item => {
+					const { selected, ...rest } = item
+					return rest
+				})
+				uni.setStorageSync('footprints', JSON.stringify(dataToSave))
+				
+				uni.showToast({
+					title: '删除成功',
+					icon: 'success'
+				})
+				
+				// 如果删完了，退出编辑模式
+				if (footprints.value.length === 0) {
+					isEditMode.value = false
+				}
+			}
+		}
+	})
+}
+
+// 查看商品
+const viewProduct = (item: FootprintType) => {
+	if (isEditMode.value) return
+	
+	uni.navigateTo({
+		url: `/pages/mall/consumer/product-detail?productId=${item.id}&price=${item.price}&originalPrice=${item.original_price || ''}`
+	})
+}
+
+// 加载更多
+const loadMore = () => {
+	// 本地存储模式下暂不需要加载更多逻辑
+}
+
+// 去逛逛
+const goShopping = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+</script>
+
+<style scoped>
+.footprint-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.footprint-header {
+	background-color: #ffffff;
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.header-title {
+	flex: 1;
+}
+
+.title-text {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.header-actions {
+	display: flex;
+	gap: 20px;
+}
+
+.action-btn {
+	color: #007aff;
+	font-size: 14px;
+	padding: 5px;
+}
+
+.footprint-content {
+	flex: 1;
+}
+
+.empty-footprints {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80px 20px;
+	background-color: #ffffff;
+}
+
+.empty-icon {
+	font-size: 80px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+	margin-bottom: 30px;
+}
+
+.go-shopping-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 10px 40px;
+	border-radius: 25px;
+	font-size: 14px;
+	border: none;
+}
+
+.date-group {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 0 15px;
+}
+
+.group-header {
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.group-date {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.group-select {
+	color: #007aff;
+	font-size: 14px;
+}
+
+.group-items {
+	padding: 10px 0;
+}
+
+.footprint-item {
+	display: flex;
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.footprint-item:last-child {
+	border-bottom: none;
+}
+
+.item-selector {
+	width: 50px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.select-icon {
+	width: 20px;
+	height: 20px;
+	border: 1px solid #cccccc;
+	border-radius: 10px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.select-icon.selected {
+	background-color: #007aff;
+	border-color: #007aff;
+}
+
+.icon-text {
+	color: #ffffff;
+	font-size: 12px;
+}
+
+.item-content {
+	flex: 1;
+	display: flex;
+}
+
+.product-image {
+	width: 80px;
+	height: 80px;
+	border-radius: 5px;
+	margin-right: 15px;
+}
+
+.product-info {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.product-name {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 10px;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.product-price-row {
+	display: flex;
+	align-items: baseline;
+	margin-bottom: 10px;
+}
+
+.current-price {
+	font-size: 16px;
+	color: #ff4757;
+	font-weight: bold;
+	margin-right: 10px;
+}
+
+.original-price {
+	font-size: 12px;
+	color: #999999;
+	text-decoration: line-through;
+}
+
+.product-meta {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.sales-text {
+	font-size: 12px;
+	color: #999999;
+}
+
+.time-text {
+	font-size: 12px;
+	color: #666666;
+}
+
+.loading-more,
+.no-more {
+	padding: 20px;
+	text-align: center;
+	background-color: #ffffff;
+}
+
+.loading-text,
+.no-more-text {
+	color: #999999;
+	font-size: 14px;
+}
+
+.edit-bar {
+	background-color: #ffffff;
+	border-top: 1px solid #e5e5e5;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.select-all {
+	display: flex;
+	align-items: center;
+}
+
+.all-select-icon {
+	width: 20px;
+	height: 20px;
+	border: 1px solid #cccccc;
+	border-radius: 10px;
+	margin-right: 10px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.all-select-icon.selected {
+	background-color: #007aff;
+	border-color: #007aff;
+}
+
+.select-all-text {
+	font-size: 14px;
+	color: #333333;
+}
+
+.delete-btn {
+	background-color: #ff4757;
+	padding: 10px 20px;
+	border-radius: 15px;
+}
+
+.delete-text {
+	color: #ffffff;
+	font-size: 14px;
+	font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/index - 副本.uvue b/pages/mall/consumer/index - 副本.uvue
new file mode 100644
index 00000000..93d69e90
--- /dev/null
+++ b/pages/mall/consumer/index - 副本.uvue	
@@ -0,0 +1,1923 @@
+<!-- pages/mall/consumer/index.uvue -->
+<template>
+	<view class="medic-home">
+		<!-- 智能顶部导航栏 -->
+		<view class="smart-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-container">
+				<!-- 品牌标识区域 -->
+				<view class="brand-section">
+					<view class="brand-info">
+						<text class="brand-name">康乐医药商城</text>
+						<text class="brand-tag">官方认证·正品保障</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主内容区 -->
+		<scroll-view 
+			scroll-y 
+			class="main-scroll"
+			:style="{ height: scrollHeight + 'px' }"
+			refresher-enabled
+			:refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh"
+			@scrolltolower="loadMore"
+		>
+			<!-- 智能健康卡片 -->
+			<view class="smart-health-card">
+				<view class="health-content">
+					<view class="health-header">
+						<text class="health-title">智能健康助手</text>
+						<text class="health-subtitle">根据您的健康数据推荐</text>
+					</view>
+					<view class="health-tips">
+						<text class="tip-item">💡 按时用药提醒</text>
+						<text class="tip-item">📋 健康记录跟踪</text>
+						<text class="tip-item">🩺 在线问诊咨询</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 智能分类网格 - 完全响应式 -->
+			<view class="smart-categories">
+				<view class="section-header">
+					<text class="section-title">智能分类</text>
+					<text class="section-desc">快速定位所需药品</text>
+				</view>
+				<view class="category-grid">
+					<view 
+						v-for="category in categories" 
+						:key="category.id"
+						class="category-card"
+						@click="switchCategory(category)"
+						:style="{ '--card-color': category.color }"
+					>
+						<view class="card-icon">
+							<text>{{ category.icon }}</text>
+						</view>
+						<text class="card-name">{{ category.name }}</text>
+						<text class="card-desc">{{ category.desc }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 智能搜索入口 -->
+			<view class="smart-search" @click="navigateToSearch">
+				<view class="search-input">
+					<text class="search-icon">🔍</text>
+					<text class="search-placeholder">症状/药品/品牌智能搜索</text>
+					<view class="search-tools">
+						<text class="tool-item">语音</text>
+						<text class="tool-item">拍照</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 健康资讯轮播 -->
+			<view class="health-news">
+				<view class="news-header">
+					<text class="news-title">健康资讯</text>
+					<text class="news-more" @click="navigateToNews">更多 ></text>
+				</view>
+				<swiper 
+					class="news-swiper"
+					:autoplay="true"
+					:interval="4000"
+					:duration="500"
+					:circular="true"
+					:indicator-dots="true"
+					indicator-color="rgba(255,255,255,0.3)"
+					indicator-active-color="#4CAF50"
+				>
+					<swiper-item 
+						v-for="news in healthNews" 
+						:key="news.id"
+						class="news-item"
+					>
+						<view class="news-content" @click="viewNewsDetail(news)">
+							<image 
+								class="news-image" 
+								:src="news.image" 
+								mode="aspectFill"
+							/>
+							<view class="news-overlay">
+								<text class="news-tag">{{ news.tag }}</text>
+								<text class="news-caption">{{ news.title }}</text>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+
+			<!-- 智能服务入口 -->
+			<view class="smart-services">
+				<view class="services-grid">
+					<view class="service-card" @click="navigateToConsultation">
+						<view class="service-icon" style="background: #2196F3;">
+							<text>👨‍⚕️</text>
+						</view>
+						<text class="service-name">在线问诊</text>
+						<text class="service-desc">三甲医生在线</text>
+					</view>
+					<view class="service-card" @click="navigateToPrescription">
+						<view class="service-icon" style="background: #4CAF50;">
+							<text>📋</text>
+						</view>
+						<text class="service-name">电子处方</text>
+						<text class="service-desc">医生开方购药</text>
+					</view>
+					<view class="service-card" @click="navigateToOTC">
+						<view class="service-icon" style="background: #FF9800;">
+							<text>💊</text>
+						</view>
+						<text class="service-name">非处方药</text>
+						<text class="service-desc">安全自主选购</text>
+					</view>
+					<view class="service-card" @click="navigateToHealthTools">
+						<view class="service-icon" style="background: #9C27B0;">
+							<text>🩺</text>
+						</view>
+						<text class="service-name">健康工具</text>
+						<text class="service-desc">健康管理助手</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 热销药品专区 -->
+			<view class="hot-products">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">🔥</text>
+						<text class="section-title">热销药品</text>
+					</view>
+					<view class="sort-tabs">
+						<text 
+							v-for="tab in sortTabs" 
+							:key="tab.id"
+							:class="['sort-tab', { active: activeSort === tab.id }]"
+							@click="switchSort(tab.id)"
+						>
+							{{ tab.name }}
+						</text>
+					</view>
+				</view>
+				
+				<view class="products-grid">
+					<view 
+						v-for="product in hotProducts" 
+						:key="product.id"
+						class="product-card"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-badge" v-if="product.badge">{{ product.badge }}</view>
+						<image 
+							class="product-image" 
+							:src="product.image" 
+							mode="aspectFill"
+						/>
+						<view class="product-info">
+							<text class="product-name">{{ product.name }}</text>
+							<text class="product-spec">{{ product.specification }}</text>
+							
+							<view class="price-section">
+								<view class="current-price">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<text class="original-price" v-if="product.originalPrice > product.price">
+									¥{{ product.originalPrice }}
+								</text>
+							</view>
+							
+							<view class="product-meta">
+								<text class="manufacturer">{{ product.manufacturer }}</text>
+								<view class="sales-info">
+									<text class="sales-count">已售{{ product.sales }}</text>
+								</view>
+							</view>
+							
+							<view class="product-action">
+								<view class="cart-btn" @click.stop="addToCart(product)">
+									<text class="cart-icon">+</text>
+									<text class="cart-text">加入购物车</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 家庭常备药 -->
+			<view class="family-medicine">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">🏠</text>
+						<text class="section-title">家庭常备药</text>
+					</view>
+					<text class="section-subtitle">守护全家健康</text>
+				</view>
+				
+				<view class="family-grid">
+					<view 
+						v-for="item in familyItems" 
+						:key="item.id"
+						class="family-item"
+						@click="navigateToCategory(item.categoryId)"
+					>
+						<view class="family-icon" :style="{ backgroundColor: item.color }">
+							<text>{{ item.icon }}</text>
+						</view>
+						<text class="family-name">{{ item.name }}</text>
+						<text class="family-desc">{{ item.desc }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 智能推荐 -->
+			<view class="smart-recommend">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">✨</text>
+						<text class="section-title">智能推荐</text>
+					</view>
+					<view class="recommend-filters">
+						<text 
+							v-for="filter in recommendFilters" 
+							:key="filter.id"
+							:class="['filter-item', { active: activeFilter === filter.id }]"
+							@click="switchFilter(filter.id)"
+						>
+							{{ filter.name }}
+						</text>
+					</view>
+				</view>
+				
+				<view class="recommend-grid">
+					<view 
+						v-for="product in recommendedProducts" 
+						:key="product.id"
+						class="recommend-product"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-image-container">
+							<image 
+								class="product-image" 
+								:src="product.image" 
+								mode="aspectFill"
+							/>
+							<view class="product-tags">
+								<text v-if="product.tag" class="product-tag">{{ product.tag }}</text>
+								<text v-if="product.featured" class="featured-tag">{{ product.featured }}</text>
+							</view>
+						</view>
+						
+						<view class="product-details">
+							<text class="product-title">{{ product.name }}</text>
+							<text class="product-specification">{{ product.specification }}</text>
+							
+							<view class="product-rating">
+								<view class="rating-stars">
+									<text class="star-icon">⭐</text>
+									<text class="rating-value">{{ product.rating }}</text>
+								</view>
+								<text class="reviews-count">{{ product.reviews }}条评价</text>
+							</view>
+							
+							<view class="price-section">
+								<view class="current-price">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<text class="original-price" v-if="product.originalPrice > product.price">
+									¥{{ product.originalPrice }}
+								</text>
+							</view>
+							
+							<view class="product-actions">
+								<view class="add-to-cart" @click.stop="addToCart(product)">
+									<text class="cart-icon">🛒</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 加载状态 -->
+				<view v-if="loading" class="loading-state">
+					<view class="loading-spinner"></view>
+					<text class="loading-text">加载中...</text>
+				</view>
+				
+				<view v-if="!hasMore && recommendedProducts.length > 0" class="no-more">
+					<text class="no-more-text">--- 已加载全部内容 ---</text>
+				</view>
+			</view>
+
+			<!-- 健康提醒 -->
+			<view class="health-reminder">
+				<view class="reminder-content">
+					<text class="reminder-icon">⏰</text>
+					<view class="reminder-text">
+						<text class="reminder-title">健康提醒</text>
+						<text class="reminder-desc">您有1个待用药提醒，点击查看详情</text>
+					</view>
+					<view class="reminder-action" @click="navigateToReminders">
+						<text class="action-text">查看</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 底部安全区域 -->
+			<view class="safe-area"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
+
+// 响应式数据
+const statusBarHeight = ref(0)
+const scrollHeight = ref(0)
+const refreshing = ref(false)
+const loading = ref(false)
+const hasMore = ref(true)
+const cartCount = ref(3)
+const activeSort = ref('sales')
+const activeFilter = ref('recommend')
+const currentPage = ref(1)
+
+// 用户信息
+const userInfo = reactive({
+	name: '张先生',
+	avatar: 'https://picsum.photos/100/100?random=avatar'
+})
+
+// 分类数据
+const categories = [
+	{ id: 'cold', name: '感冒发烧', icon: '🤧', desc: '解热镇痛', color: '#2196F3' },
+	{ id: 'stomach', name: '肠胃用药', icon: '🤢', desc: '消化系统', color: '#4CAF50' },
+	{ id: 'pain', name: '止痛消炎', icon: '💊', desc: '镇痛消炎', color: '#F44336' },
+	{ id: 'skin', name: '皮肤用药', icon: '🤕', desc: '皮肤护理', color: '#9C27B0' },
+	{ id: 'vitamin', name: '维生素', icon: '🍊', desc: '营养补充', color: '#FF9800' },
+	{ id: 'chronic', name: '慢性病', icon: '🫀', desc: '长期管理', color: '#795548' },
+	{ id: 'child', name: '儿童用药', icon: '👶', desc: '儿童专用', color: '#00BCD4' },
+	{ id: 'external', name: '外用药品', icon: '🧴', desc: '外用制剂', color: '#8BC34A' },
+	{ id: 'device', name: '医疗器械', icon: '🩺', desc: '医疗设备', color: '#607D8B' },
+	{ id: 'health', name: '健康食品', icon: '🥗', desc: '保健食品', color: '#FFC107' }
+]
+
+// 排序标签
+const sortTabs = [
+	{ id: 'sales', name: '销量' },
+	{ id: 'price', name: '价格' },
+	{ id: 'new', name: '新品' },
+	{ id: 'recommend', name: '推荐' }
+]
+
+// 推荐筛选器
+const recommendFilters = [
+	{ id: 'recommend', name: '智能推荐' },
+	{ id: 'hot', name: '热门商品' },
+	{ id: 'discount', name: '限时优惠' },
+	{ id: 'quality', name: '品质优选' }
+]
+
+// 健康资讯
+const healthNews = [
+	{
+		id: 'news1',
+		title: '秋季流感预防指南，科学防护健康过冬',
+		tag: '健康科普',
+		image: 'https://picsum.photos/800/400?random=health1'
+	},
+	{
+		id: 'news2',
+		title: '家庭常备药清单，为家人健康保驾护航',
+		tag: '家庭用药',
+		image: 'https://picsum.photos/800/400?random=health2'
+	},
+	{
+		id: 'news3',
+		title: '慢性病科学管理，提高生活质量',
+		tag: '健康管理',
+		image: 'https://picsum.photos/800/400?random=health3'
+	}
+]
+
+// 热销药品
+const hotProducts = [
+	{
+		id: 'hot1',
+		name: '布洛芬缓释胶囊',
+		specification: '0.3g*24粒',
+		price: 18.5,
+		originalPrice: 25.8,
+		image: 'https://picsum.photos/300/300?random=medicine1',
+		manufacturer: '修正药业',
+		sales: 2560,
+		badge: '热销'
+	},
+	{
+		id: 'hot2',
+		name: '板蓝根颗粒',
+		specification: '10g*20袋',
+		price: 22.8,
+		originalPrice: 29.9,
+		image: 'https://picsum.photos/300/300?random=medicine2',
+		manufacturer: '白云山',
+		sales: 1890,
+		badge: '推荐'
+	},
+	{
+		id: 'hot3',
+		name: '维生素C片',
+		specification: '100mg*100片',
+		price: 15.9,
+		originalPrice: 19.9,
+		image: 'https://picsum.photos/300/300?random=medicine3',
+		manufacturer: '养生堂',
+		sales: 1420,
+		badge: '特价'
+	},
+	{
+		id: 'hot4',
+		name: '胃康灵胶囊',
+		specification: '0.4g*24粒',
+		price: 32.8,
+		originalPrice: 38.5,
+		image: 'https://picsum.photos/300/300?random=medicine4',
+		manufacturer: '三九医药',
+		sales: 890,
+		badge: '新品'
+	}
+]
+
+// 家庭常备药
+const familyItems = [
+	{
+		id: 'family1',
+		name: '创可贴',
+		desc: '伤口护理',
+		icon: '🩹',
+		color: '#FF5722',
+		categoryId: 'external'
+	},
+	{
+		id: 'family2',
+		name: '体温计',
+		desc: '健康监测',
+		icon: '🌡️',
+		color: '#2196F3',
+		categoryId: 'device'
+	},
+	{
+		id: 'family3',
+		name: '消毒酒精',
+		desc: '环境消毒',
+		icon: '🧪',
+		color: '#4CAF50',
+		categoryId: 'external'
+	},
+	{
+		id: 'family4',
+		name: '口罩',
+		desc: '日常防护',
+		icon: '😷',
+		color: '#607D8B',
+		categoryId: 'device'
+	},
+	{
+		id: 'family5',
+		name: '退热贴',
+		desc: '物理降温',
+		icon: '🧊',
+		color: '#00BCD4',
+		categoryId: 'cold'
+	},
+	{
+		id: 'family6',
+		name: '棉签纱布',
+		desc: '伤口处理',
+		icon: '🩹',
+		color: '#FF9800',
+		categoryId: 'external'
+	}
+]
+
+// 推荐商品
+const recommendedProducts = [
+	{
+		id: 'rec1',
+		name: '阿莫西林胶囊',
+		specification: '0.25g*24粒',
+		price: 28.5,
+		originalPrice: 35.0,
+		image: 'https://picsum.photos/350/350?random=rec1',
+		rating: 4.8,
+		reviews: 156,
+		tag: '处方药',
+		featured: '医生推荐'
+	},
+	{
+		id: 'rec2',
+		name: '连花清瘟胶囊',
+		specification: '0.35g*36粒',
+		price: 42.8,
+		originalPrice: 48.0,
+		image: 'https://picsum.photos/350/350?random=rec2',
+		rating: 4.9,
+		reviews: 289,
+		tag: '中成药',
+		featured: '热销爆款'
+	},
+	{
+		id: 'rec3',
+		name: '盐酸氨溴索口服液',
+		specification: '100ml',
+		price: 35.9,
+		originalPrice: 42.0,
+		image: 'https://picsum.photos/350/350?random=rec3',
+		rating: 4.7,
+		reviews: 132,
+		tag: '止咳化痰',
+		featured: '家庭必备'
+	},
+	{
+		id: 'rec4',
+		name: '氯雷他定片',
+		specification: '10mg*6片',
+		price: 18.6,
+		originalPrice: 22.0,
+		image: 'https://picsum.photos/350/350?random=rec4',
+		rating: 4.6,
+		reviews: 98,
+		tag: '抗过敏',
+		featured: '季节必备'
+	}
+]
+
+// 生命周期
+onMounted(() => {
+	initPage()
+})
+
+onUnmounted(() => {
+	// 清理工作
+})
+
+// 初始化页面
+const initPage = () => {
+	const systemInfo = uni.getSystemInfoSync()
+	statusBarHeight.value = systemInfo.statusBarHeight || 0
+	
+	// 计算滚动区域高度
+	const windowHeight = systemInfo.windowHeight
+	const navbarHeight = 60
+	scrollHeight.value = windowHeight - statusBarHeight.value - navbarHeight
+}
+
+// 切换分类
+const switchCategory = (category: any) => {
+	uni.navigateTo({
+		url: `/pages/medicine/category?id=${category.id}&name=${category.name}`
+	})
+}
+
+// 切换排序
+const switchSort = (sortId: string) => {
+	activeSort.value = sortId
+	// 这里可以添加排序逻辑
+}
+
+// 切换筛选器
+const switchFilter = (filterId: string) => {
+	activeFilter.value = filterId
+	// 这里可以添加筛选逻辑
+}
+
+// 查看新闻详情
+const viewNewsDetail = (news: any) => {
+	uni.navigateTo({
+		url: `/pages/news/detail?id=${news.id}`
+	})
+}
+
+// 下拉刷新
+const onRefresh = () => {
+	refreshing.value = true
+	setTimeout(() => {
+		refreshing.value = false
+		uni.showToast({
+			title: '刷新成功',
+			icon: 'success'
+		})
+	}, 1500)
+}
+
+// 加载更多
+const loadMore = () => {
+	if (loading.value || !hasMore.value) return
+	
+	loading.value = true
+	setTimeout(() => {
+		// 模拟加载更多数据
+		const newProducts = [...recommendedProducts].map((item, index) => ({
+			...item,
+			id: `new${index}`,
+			price: Math.floor(item.price * 0.9 + Math.random() * 10)
+		}))
+		
+		// 实际项目中应该合并数据
+		loading.value = false
+		hasMore.value = recommendedProducts.length < 20
+		
+		uni.showToast({
+			title: '加载完成',
+			icon: 'success'
+		})
+	}, 2000)
+}
+
+// 添加到购物车
+const addToCart = (product: any) => {
+	uni.showToast({
+		title: '已添加到购物车',
+		icon: 'success'
+	})
+	cartCount.value++
+}
+
+// 显示用户菜单
+const showUserMenu = () => {
+	uni.showActionSheet({
+		itemList: ['个人中心', '我的订单', '用药提醒', '我的收藏', '设置'],
+		success: (res) => {
+			const pages = [
+				'/pages/user/profile',
+				'/pages/user/orders',
+				'/pages/user/reminders',
+				'/pages/user/favorites',
+				'/pages/user/settings'
+			]
+			if (pages[res.tapIndex]) {
+				uni.navigateTo({ url: pages[res.tapIndex] })
+			}
+		}
+	})
+}
+
+// 导航函数
+const navigateToSearch = () => uni.navigateTo({ url: '/pages/medicine/search' })
+const navigateToCart = () => uni.navigateTo({ url: '/pages/medicine/cart' })
+const navigateToNews = () => uni.navigateTo({ url: '/pages/news/list' })
+const navigateToProduct = (product: any) => {
+	uni.navigateTo({
+		url: `/pages/medicine/detail?id=${product.id}`
+	})
+}
+const navigateToCategory = (categoryId: string) => {
+	uni.navigateTo({
+		url: `/pages/medicine/category?id=${categoryId}`
+	})
+}
+const navigateToConsultation = () => uni.navigateTo({ url: '/pages/medicine/consultation' })
+const navigateToPrescription = () => uni.navigateTo({ url: '/pages/medicine/prescription' })
+const navigateToOTC = () => uni.navigateTo({ url: '/pages/medicine/otc' })
+const navigateToHealthTools = () => uni.navigateTo({ url: '/pages/medicine/tools' })
+const navigateToReminders = () => uni.navigateTo({ url: '/pages/user/reminders' })
+</script>
+
+<style>
+/* 全局重置 */
+.medic-home * {
+	box-sizing: border-box;
+	margin: 0;
+	padding: 0;
+}
+
+.medic-home {
+	width: 100%;
+	min-height: 100vh;
+	background: #f8fafc;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', sans-serif;
+	line-height: 1.5;
+}
+
+/* 智能导航栏 */
+.smart-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+	z-index: 1000;
+	box-shadow: 0 2px 20px rgba(76, 175, 80, 0.15);
+}
+
+.nav-container {
+	height: 60px;
+	padding: 0 16px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	max-width: 1400px;
+	margin: 0 auto;
+	width: 100%;
+}
+
+/* 品牌区域 */
+.brand-section {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+}
+
+
+.brand-info {
+	display: flex;
+	flex-direction: column;
+}
+
+.brand-name {
+	font-size: 18px;
+	font-weight: bold;
+	color: white;
+	letter-spacing: 0.5px;
+}
+
+.brand-tag {
+	font-size: 11px;
+	color: rgba(255, 255, 255, 0.9);
+	margin-top: 2px;
+}
+
+/* 主滚动区域 */
+.main-scroll {
+	margin-top: 60px;
+	padding: 16px;
+	max-width: 1400px;
+	margin-left: auto;
+	margin-right: auto;
+	width: 100%;
+}
+
+/* 智能健康卡片 */
+.smart-health-card {
+	background: linear-gradient(135deg, #2196F3 0%, #1976D2 100%);
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	color: white;
+}
+
+.health-content {
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+}
+
+.health-header {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.health-title {
+	font-size: 20px;
+	font-weight: bold;
+}
+
+.health-subtitle {
+	font-size: 14px;
+	opacity: 0.9;
+}
+
+.health-tips {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 12px;
+	margin-top: 8px;
+}
+
+.tip-item {
+	font-size: 13px;
+	padding: 6px 12px;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 20px;
+	backdrop-filter: blur(10px);
+}
+
+/* 智能分类网格 */
+.smart-categories {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.section-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 20px;
+}
+
+.section-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.section-desc {
+	font-size: 14px;
+	color: #666;
+}
+
+/* 分类网格布局 */
+.category-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+	gap: 16px;
+}
+
+.category-card {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 16px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid transparent;
+}
+
+.category-card:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	border-color: var(--card-color, #4CAF50);
+}
+
+.card-icon {
+	width: 56px;
+	height: 56px;
+	border-radius: 28px;
+	background: var(--card-color, #4CAF50);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.card-icon text {
+	font-size: 24px;
+	color: white;
+}
+
+.card-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	text-align: center;
+}
+
+.card-desc {
+	font-size: 12px;
+	color: #666;
+	text-align: center;
+}
+
+/* 智能搜索 */
+.smart-search {
+	margin-bottom: 20px;
+}
+
+.search-input {
+	background: white;
+	border-radius: 12px;
+	padding: 16px 20px;
+	display: flex;
+	align-items: center;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.search-input:hover {
+	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+}
+
+.search-icon {
+	font-size: 20px;
+	color: #4CAF50;
+	margin-right: 12px;
+}
+
+.search-placeholder {
+	font-size: 15px;
+	color: #999;
+	flex: 1;
+}
+
+.search-tools {
+	display: flex;
+	gap: 12px;
+}
+
+.tool-item {
+	font-size: 12px;
+	color: #4CAF50;
+	padding: 4px 12px;
+	background: rgba(76, 175, 80, 0.1);
+	border-radius: 15px;
+}
+
+/* 健康资讯 */
+.health-news {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.news-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 16px;
+}
+
+.news-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.news-more {
+	font-size: 14px;
+	color: #4CAF50;
+	cursor: pointer;
+}
+
+.news-swiper {
+	height: 200px;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.news-content {
+	position: relative;
+	height: 100%;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.news-image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.news-overlay {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(to top, rgba(0, 0, 0, 0.8), transparent);
+	padding: 20px;
+	color: white;
+}
+
+.news-tag {
+	display: inline-block;
+	background: #4CAF50;
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-size: 12px;
+	font-weight: 500;
+	margin-bottom: 8px;
+}
+
+.news-caption {
+	font-size: 16px;
+	font-weight: 600;
+	display: block;
+	line-height: 1.4;
+}
+
+/* 智能服务 */
+.smart-services {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.services-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+	gap: 20px;
+}
+
+.service-card {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 20px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.service-card:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.service-icon {
+	width: 60px;
+	height: 60px;
+	border-radius: 30px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.service-icon text {
+	font-size: 28px;
+	color: white;
+}
+
+.service-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+}
+
+.service-desc {
+	font-size: 12px;
+	color: #666;
+}
+
+/* 热销药品 */
+.hot-products {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.title-section {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.section-icon {
+	font-size: 20px;
+	color: #4CAF50;
+}
+
+.sort-tabs {
+	display: flex;
+	gap: 12px;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.sort-tab {
+	font-size: 13px;
+	color: #666;
+	padding: 6px 16px;
+	border-radius: 20px;
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.2s ease;
+	white-space: nowrap;
+}
+
+.sort-tab.active {
+	background: #4CAF50;
+	color: white;
+	border-color: #4CAF50;
+}
+
+.sort-tab:hover {
+	background: #f5f5f5;
+}
+
+.sort-tab.active:hover {
+	background: #388E3C;
+}
+
+/* 产品网格 */
+.products-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+	gap: 20px;
+	margin-top: 20px;
+}
+
+.product-card {
+	background: #f8f9fa;
+	border-radius: 12px;
+	overflow: hidden;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid #e0e0e0;
+	position: relative;
+}
+
+.product-card:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-badge {
+	position: absolute;
+	top: 12px;
+	left: 12px;
+	background: #FF5722;
+	color: white;
+	font-size: 11px;
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-weight: 600;
+	z-index: 2;
+}
+
+.product-image {
+	width: 100%;
+	height: 160px;
+	object-fit: cover;
+	background: white;
+}
+
+.product-info {
+	padding: 16px;
+}
+
+.product-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	display: block;
+	line-height: 1.4;
+}
+
+.product-spec {
+	font-size: 13px;
+	color: #666;
+	margin-bottom: 12px;
+	display: block;
+}
+
+.price-section {
+	display: flex;
+	align-items: baseline;
+	gap: 8px;
+	margin-bottom: 12px;
+}
+
+.current-price {
+	display: flex;
+	align-items: baseline;
+}
+
+.price-symbol {
+	font-size: 14px;
+	color: #FF5722;
+}
+
+.price-value {
+	font-size: 20px;
+	font-weight: bold;
+	color: #FF5722;
+	margin-left: 2px;
+}
+
+.original-price {
+	font-size: 13px;
+	color: #999;
+	text-decoration: line-through;
+}
+
+.product-meta {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	font-size: 12px;
+	margin-bottom: 12px;
+}
+
+.manufacturer {
+	color: #666;
+}
+
+.sales-count {
+	color: #999;
+}
+
+.product-action {
+	margin-top: 12px;
+}
+
+.cart-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+	background: #4CAF50;
+	color: white;
+	padding: 8px 12px;
+	border-radius: 8px;
+	font-size: 13px;
+	font-weight: 500;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.cart-btn:hover {
+	background: #388E3C;
+}
+
+.cart-icon {
+	font-size: 14px;
+}
+
+.cart-text {
+	font-size: 13px;
+}
+
+/* 家庭常备药 */
+.family-medicine {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.section-subtitle {
+	font-size: 14px;
+	color: #666;
+	margin-left: 12px;
+}
+
+.family-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
+	gap: 16px;
+	margin-top: 20px;
+}
+
+.family-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 16px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.family-item:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.family-icon {
+	width: 48px;
+	height: 48px;
+	border-radius: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.family-icon text {
+	font-size: 20px;
+	color: white;
+}
+
+.family-name {
+	font-size: 14px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+}
+
+.family-desc {
+	font-size: 12px;
+	color: #666;
+}
+
+/* 智能推荐 */
+.smart-recommend {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.recommend-filters {
+	display: flex;
+	gap: 12px;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.filter-item {
+	font-size: 13px;
+	color: #666;
+	padding: 6px 16px;
+	border-radius: 20px;
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.2s ease;
+	white-space: nowrap;
+}
+
+.filter-item.active {
+	background: #4CAF50;
+	color: white;
+	border-color: #4CAF50;
+}
+
+.filter-item:hover {
+	background: #f5f5f5;
+}
+
+.filter-item.active:hover {
+	background: #388E3C;
+}
+
+.recommend-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+	gap: 20px;
+	margin-top: 20px;
+}
+
+.recommend-product {
+	background: #f8f9fa;
+	border-radius: 12px;
+	overflow: hidden;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid #e0e0e0;
+}
+
+.recommend-product:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-image-container {
+	position: relative;
+	height: 180px;
+}
+
+.product-image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	background: white;
+}
+
+.product-tags {
+	position: absolute;
+	top: 12px;
+	left: 12px;
+	display: flex;
+	gap: 8px;
+}
+
+.product-tag, .featured-tag {
+	padding: 4px 10px;
+	border-radius: 10px;
+	font-size: 11px;
+	font-weight: 600;
+	color: white;
+}
+
+.product-tag {
+	background: rgba(76, 175, 80, 0.9);
+}
+
+.featured-tag {
+	background: rgba(255, 87, 34, 0.9);
+}
+
+.product-details {
+	padding: 16px;
+}
+
+.product-title {
+	font-size: 16px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	display: block;
+	line-height: 1.4;
+}
+
+.product-specification {
+	font-size: 13px;
+	color: #666;
+	margin-bottom: 12px;
+	display: block;
+}
+
+.product-rating {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-bottom: 12px;
+	font-size: 13px;
+}
+
+.rating-stars {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.star-icon {
+	font-size: 14px;
+	color: #FFC107;
+}
+
+.rating-value {
+	font-weight: 600;
+	color: #333;
+}
+
+.reviews-count {
+	color: #666;
+}
+
+.product-actions {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 12px;
+}
+
+.add-to-cart {
+	width: 36px;
+	height: 36px;
+	border-radius: 18px;
+	background: #4CAF50;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.add-to-cart:hover {
+	background: #388E3C;
+	transform: scale(1.1);
+}
+
+.cart-icon {
+	font-size: 16px;
+	color: white;
+}
+
+/* 健康提醒 */
+.health-reminder {
+	background: linear-gradient(135deg, #FF9800 0%, #F57C00 100%);
+	border-radius: 16px;
+	padding: 16px 20px;
+	margin-bottom: 20px;
+	color: white;
+}
+
+.reminder-content {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+}
+
+.reminder-icon {
+	font-size: 24px;
+}
+
+.reminder-text {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.reminder-title {
+	font-size: 15px;
+	font-weight: 600;
+}
+
+.reminder-desc {
+	font-size: 13px;
+	opacity: 0.9;
+}
+
+.reminder-action {
+	padding: 6px 16px;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 20px;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.reminder-action:hover {
+	background: rgba(255, 255, 255, 0.3);
+}
+
+.action-text {
+	font-size: 13px;
+	font-weight: 500;
+}
+
+/* 加载状态 */
+.loading-state {
+	padding: 40px 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.loading-spinner {
+	width: 32px;
+	height: 32px;
+	border: 3px solid #f0f0f0;
+	border-top-color: #4CAF50;
+	border-radius: 50%;
+	animation: spin 1s linear infinite;
+	margin-bottom: 12px;
+}
+
+@keyframes spin {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+	font-size: 14px;
+	color: #666;
+}
+
+.no-more {
+	padding: 30px 0;
+	text-align: center;
+	border-top: 1px solid #f0f0f0;
+	margin-top: 10px;
+}
+
+.no-more-text {
+	font-size: 13px;
+	color: #999;
+}
+
+/* 安全区域 */
+.safe-area {
+	height: 20px;
+	width: 100%;
+}
+
+/* ===== 响应式设计 ===== */
+
+/* 超小屏手机 (小于360px) */
+@media screen and (max-width: 360px) {
+	.nav-container {
+		padding: 0 12px;
+	}
+	
+	.brand-name {
+		font-size: 16px;
+	}
+	
+	.brand-tag {
+		font-size: 10px;
+	}
+	
+	.smart-features {
+		gap: 12px;
+	}
+	
+	.feature-label {
+		display: none;
+	}
+	
+	.main-scroll {
+		padding: 12px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 12px;
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: 1fr;
+	}
+	
+	.recommend-grid {
+		grid-template-columns: 1fr;
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.news-swiper {
+		height: 160px;
+	}
+	
+	.news-caption {
+		font-size: 14px;
+	}
+}
+
+/* 小屏手机 (361px-414px) */
+@media screen and (min-width: 361px) and (max-width: 414px) {
+	.category-grid {
+		grid-template-columns: repeat(3, 1fr);
+		gap: 12px;
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 16px;
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: 1fr;
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 180px;
+	}
+}
+
+/* 中屏手机 (415px-480px) */
+@media screen and (min-width: 415px) and (max-width: 480px) {
+	.category-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 200px;
+	}
+}
+
+/* 大屏手机/小平板 (481px-768px) */
+@media screen and (min-width: 481px) and (max-width: 768px) {
+	.nav-container {
+		padding: 0 20px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 220px;
+	}
+}
+
+/* 平板设备 (769px-1024px) */
+@media screen and (min-width: 769px) and (max-width: 1024px) {
+	.nav-container {
+		padding: 0 24px;
+		max-width: 100%;
+	}
+	
+	.main-scroll {
+		max-width: 100%;
+		padding: 20px 24px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 240px;
+	}
+}
+
+/* 桌面端 (1025px以上) */
+@media screen and (min-width: 1025px) {
+	.nav-container {
+		padding: 0 32px;
+	}
+	
+	.main-scroll {
+		padding: 24px 32px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 260px;
+	}
+}
+
+/* 大桌面端 (1400px以上) */
+@media screen and (min-width: 1400px) {
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+		gap: 24px;
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(5, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+}
+
+/* 暗黑模式适配 */
+@media (prefers-color-scheme: dark) {
+	.medic-home {
+		background: #121212;
+	}
+	
+	.smart-categories,
+	.health-news,
+	.smart-services,
+	.hot-products,
+	.family-medicine,
+	.smart-recommend {
+		background: #1e1e1e;
+		border-color: #333;
+	}
+	
+	.search-input {
+		background: #1e1e1e;
+		border-color: #333;
+	}
+	
+	.category-card,
+	.service-card,
+	.product-card,
+	.family-item,
+	.recommend-product {
+		background: #2d2d2d;
+		border-color: #444;
+	}
+	
+	.section-title,
+	.card-name,
+	.service-name,
+	.product-name,
+	.family-name,
+	.product-title {
+		color: #fff;
+	}
+	
+	.section-desc,
+	.card-desc,
+	.service-desc,
+	.product-spec,
+	.product-specification,
+	.family-desc {
+		color: #aaa;
+	}
+	
+	.search-placeholder {
+		color: #888;
+	}
+	
+	.sort-tab,
+	.filter-item {
+		background: #333;
+		border-color: #444;
+		color: #ccc;
+	}
+	
+	.sort-tab.active,
+	.filter-item.active {
+		background: #4CAF50;
+		color: white;
+	}
+	
+	.sort-tab:hover,
+	.filter-item:hover {
+		background: #444;
+	}
+	
+	.sort-tab.active:hover,
+	.filter-item.active:hover {
+		background: #388E3C;
+	}
+	
+	.tool-item {
+		background: rgba(76, 175, 80, 0.2);
+		color: #4CAF50;
+	}
+	
+	.manufacturer,
+	.sales-count,
+	.reviews-count,
+	.original-price {
+		color: #888;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/index.uvue b/pages/mall/consumer/index.uvue
index ffb7c89d..8c6c10a6 100644
--- a/pages/mall/consumer/index.uvue
+++ b/pages/mall/consumer/index.uvue
@@ -1,850 +1,2242 @@
+<!-- pages/mall/consumer/index.uvue -->
 <template>
-	<view class="consumer-home">
-		<!-- 顶部搜索栏 -->
-		<view class="header">
+	<view class="medic-home">
+		<!-- 智能顶部导航栏 - 添加滚动隐藏效果 -->
+		<view 
+			class="smart-navbar" 
+			:style="{ 
+				paddingTop: statusBarHeight + 'px',
+				transform: showNavbar ? 'translateY(0)' : 'translateY(-100%)'
+			}"
+		>
 			<view class="search-container">
-				<view class="search-box" @click="navigateToSearch">
-					<text class="search-icon">🔍</text>
-					<text class="search-placeholder">搜索商品</text>
-				</view>
-				<view class="cart-icon" @click="navigateToCart">
-					<text class="icon">🛒</text>
-					<text v-if="cartCount > 0" class="badge">{{ cartCount }}</text>
+				<view class="search-box" @click="navigateToSearch" :style="{ height: '30px' }">
+					<!-- 模拟输入框 -->
+					<text class="search-placeholder">请输入药品名称、症状或品牌</text>
+					
+					<!-- 扫码图标 -->
+					<view class="nav-icon-btn" @click.stop="onScan">
+						<text class="nav-icon">🔳</text>
+					</view>
+
+					<!-- 相机图标 -->
+					<view class="nav-camera-btn" @click.stop="onCamera">
+						<text class="nav-camera-icon">📷</text>
+					</view>
+					
+					<!-- 搜索按钮 -->
+					<view class="nav-inner-search-btn" :style="{ height: '22px' }">
+						<text class="nav-inner-search-text">搜索</text>
+					</view>
 				</view>
 			</view>
 		</view>
 
-		<scroll-view direction="vertical" class="main-content">
-			<!-- 轮播图 -->
-			<swiper class="banner-swiper" :autoplay="true" :interval="3000" :duration="500">
-				<swiper-item v-for="(banner, index) in bannerList" :key="index">
-					<image class="banner-image" :src="banner.image_url" mode="aspectFill" @click="handleBannerClick(banner)" />
-				</swiper-item>
-			</swiper>
-
-			<!-- 分类导航 -->
-			<view class="category-section">
-				<text class="section-title">商品分类</text>
-				<view class="category-grid">
-					<view v-for="(category, index) in categoryList" :key="category.id" class="category-item" @click="navigateToCategory(category)">
-						<image class="category-icon" :src="category.icon_url || '/static/default-category.png'" mode="aspectFit" />
-						<text class="category-name">{{ category.name }}</text>
+		<!-- 导航栏占位符 - 移除，改为使用 margin-top -->
+		<!-- <view class="navbar-placeholder" :style="{ height: (statusBarHeight + 44) + 'px' }"></view> -->
+		
+		<!-- 主内容区 -->
+		<scroll-view 
+			scroll-y 
+			class="main-scroll"
+			:style="{ height: scrollHeight + 'px' }"
+			refresher-enabled
+			:refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh"
+			@scrolltolower="loadMore"
+			@scroll="handleScroll"
+		>
+			<!-- 智能健康卡片 -->
+			<view class="smart-health-card" :style="{ marginTop: (statusBarHeight + 44 + 10) + 'px' }">
+				<view class="health-content">
+					<view class="health-header">
+						<text class="health-title">智能健康助手</text>
+						<text class="health-subtitle">根据您的健康数据推荐</text>
+					</view>
+					<view class="health-tips">
+						<text class="tip-item">💡 按时用药提醒</text>
+						<text class="tip-item">📋 健康记录跟踪</text>
+						<text class="tip-item">🩺 在线问诊咨询</text>
 					</view>
 				</view>
 			</view>
 
-			<!-- 优惠券中心 -->
-			<view class="coupon-section">
+			<!-- 智能分类网格 - 完全响应式 -->
+			<view class="smart-categories">
 				<view class="section-header">
-					<text class="section-title">优惠券</text>
-					<text class="more-btn" @click="navigateToCoupons">更多 ›</text>
+					<text class="section-title">智能分类</text>
+					<text class="section-desc">快速定位所需药品</text>
 				</view>
-				<scroll-view direction="horizontal" class="coupon-scroll">
-					<view class="coupon-list">
-						<view v-for="(coupon, index) in couponList" :key="coupon.id" class="coupon-item" @click="receiveCoupon(coupon)">
-							<view class="coupon-left">
-								<text class="coupon-value">￥{{ coupon.discount_value }}</text>
-								<text class="coupon-condition">满{{ coupon.min_order_amount }}可用</text>
-							</view>
-							<view class="coupon-right">
-								<text class="coupon-name">{{ coupon.name }}</text>
-								<text class="coupon-expire">{{ formatExpireTime(coupon.end_time) }}</text>
-								<view class="receive-btn">
-									<text class="btn-text">立即领取</text>
-								</view>
-							</view>
+				<view class="category-grid">
+					<view 
+						v-for="category in categories" 
+						:key="category.id"
+						class="category-card"
+						@click="switchCategory(category)"
+						:style="{ '--card-color': category.color }"
+					>
+						<view class="card-icon">
+							<text>{{ category.icon }}</text>
 						</view>
+						<text class="card-name">{{ category.name }}</text>
+						<text class="card-desc">{{ category.desc }}</text>
 					</view>
-				</scroll-view>
+				</view>
 			</view>
 
-			<!-- 商品推荐 -->
-			<view class="product-section">
-				<text class="section-title">为你推荐</text>
-				<!-- #ifdef APP -->
-				<waterfall :column-count="2" :column-gap="10" :row-gap="10" class="product-waterfall">
-					<view v-for="(product, index) in productList" :key="product.id" class="product-card" @click="navigateToProduct(product)">
-						<image class="product-image" :src="getProductFirstImage(product)" mode="aspectFill" @error="handleImageError" />
-						<view class="product-info">
-							<text class="product-name">{{ product.name }}</text>
-							<view class="price-row">
-								<text class="current-price">￥{{ product.price }}</text>
-								<text v-if="product.original_price !== null && product.original_price > product.price" class="original-price">￥{{ product.original_price }}</text>
-							</view>
-							<view class="sales-row">
-								<text class="sales-text">已售{{ product.sales }}件</text>
-								<view class="add-cart-btn" @click.stop="addToCart(product)">
-									<text class="add-text">+</text>
-								</view>
+			<!-- 健康资讯轮播 -->
+			<view class="health-news">
+				<view class="news-header">
+					<text class="news-title">健康资讯</text>
+					<text class="news-more" @click="navigateToNews">更多 ></text>
+				</view>
+				<swiper 
+					class="news-swiper"
+					:autoplay="true"
+					:interval="4000"
+					:duration="500"
+					:circular="true"
+					:indicator-dots="true"
+					indicator-color="rgba(255,255,255,0.3)"
+					indicator-active-color="#4CAF50"
+				>
+					<swiper-item 
+						v-for="news in healthNews" 
+						:key="news.id"
+						class="news-item"
+					>
+						<view class="news-content" @click="viewNewsDetail(news)">
+							<image 
+								class="news-image" 
+								:src="news.image" 
+								mode="aspectFill"
+							/>
+							<view class="news-overlay">
+								<text class="news-tag">{{ news.tag }}</text>
+								<text class="news-caption">{{ news.title }}</text>
 							</view>
 						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+
+			<!-- 智能服务入口 -->
+			<view class="smart-services">
+				<view class="services-grid">
+					<view class="service-card" @click="navigateToConsultation">
+						<view class="service-icon" style="background: #2196F3;">
+							<text>👨‍⚕️</text>
+						</view>
+						<text class="service-name">在线问诊</text>
+						<text class="service-desc">三甲医生在线</text>
 					</view>
-				</waterfall>
-				<!-- #endif -->
-				<!-- #ifndef APP -->
-				<view class="product-grid">
-					<view v-for="(product, index) in productList" :key="product.id" class="product-card" @click="navigateToProduct(product)">
-						<image class="product-image" :src="getProductFirstImage(product)" mode="aspectFill" @error="handleImageError" />
+					<view class="service-card" @click="navigateToPrescription">
+						<view class="service-icon" style="background: #4CAF50;">
+							<text>📋</text>
+						</view>
+						<text class="service-name">电子处方</text>
+						<text class="service-desc">医生开方购药</text>
+					</view>
+					<view class="service-card" @click="navigateToOTC">
+						<view class="service-icon" style="background: #FF9800;">
+							<text>💊</text>
+						</view>
+						<text class="service-name">非处方药</text>
+						<text class="service-desc">安全自主选购</text>
+					</view>
+					<view class="service-card" @click="navigateToHealthTools">
+						<view class="service-icon" style="background: #9C27B0;">
+							<text>🩺</text>
+						</view>
+						<text class="service-name">健康工具</text>
+						<text class="service-desc">健康管理助手</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 热销药品专区 -->
+			<view class="hot-products">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">🔥</text>
+						<text class="section-title">热销药品</text>
+					</view>
+					<view class="sort-tabs">
+						<text 
+							v-for="tab in sortTabs" 
+							:key="tab.id"
+							:class="['sort-tab', { active: activeSort === tab.id }]"
+							@click="switchSort(tab.id)"
+						>
+							{{ tab.name }}
+						</text>
+					</view>
+				</view>
+				
+				<view class="products-grid">
+					<view 
+						v-for="product in hotProducts" 
+						:key="product.id"
+						class="product-card"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-badge" v-if="product.badge">{{ product.badge }}</view>
+						<image 
+							class="product-image" 
+							:src="product.image" 
+							mode="aspectFill"
+						/>
 						<view class="product-info">
 							<text class="product-name">{{ product.name }}</text>
-							<view class="price-row">
-								<text class="current-price">￥{{ product.price }}</text>
-								<text v-if="product.original_price !== null && product.original_price > product.price" class="original-price">￥{{ product.original_price }}</text>
+							<text class="product-spec">{{ product.specification }}</text>
+							
+							<view class="price-section">
+								<view class="current-price">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<text class="original-price" v-if="product.originalPrice > product.price">
+									¥{{ product.originalPrice }}
+								</text>
 							</view>
-							<view class="sales-row">
-								<text class="sales-text">已售{{ product.sales }}件</text>
-								<view class="add-cart-btn" @click.stop="addToCart(product)">
-									<text class="add-text">+</text>
+							
+							<view class="product-meta">
+								<text class="manufacturer">{{ product.manufacturer }}</text>
+								<view class="sales-info">
+									<text class="sales-count">已售{{ product.sales }}</text>
+								</view>
+							</view>
+							
+							<view class="product-action">
+								<view class="cart-btn" @click.stop="addToCart(product)">
+									<text class="cart-icon">+</text>
+									<text class="cart-text">加入购物车</text>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<!-- #endif -->
 			</view>
 
-			<!-- 加载更多 -->
-			<view v-if="isLoading" class="loading-container">
-				<text class="loading-text">加载中...</text>
+			<!-- 家庭常备药 -->
+			<view class="family-medicine">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">🏠</text>
+						<text class="section-title">家庭常备药</text>
+					</view>
+					<text class="section-subtitle">守护全家健康</text>
+				</view>
+				
+				<view class="family-grid">
+					<view 
+						v-for="item in familyItems" 
+						:key="item.id"
+						class="family-item"
+						@click="navigateToCategory(item)"
+					>
+						<view class="family-icon" :style="{ backgroundColor: item.color }">
+							<text>{{ item.icon }}</text>
+						</view>
+						<text class="family-name">{{ item.name }}</text>
+						<text class="family-desc">{{ item.desc }}</text>
+					</view>
+				</view>
 			</view>
+
+			<!-- 智能推荐 -->
+			<view class="smart-recommend">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">✨</text>
+						<text class="section-title">智能推荐</text>
+					</view>
+					<view class="recommend-filters">
+						<text 
+							v-for="filter in recommendFilters" 
+							:key="filter.id"
+							:class="['filter-item', { active: activeFilter === filter.id }]"
+							@click="switchFilter(filter.id)"
+						>
+							{{ filter.name }}
+						</text>
+					</view>
+				</view>
+				
+				<view class="recommend-grid">
+					<view 
+						v-for="product in recommendedProducts" 
+						:key="product.id"
+						class="recommend-product"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-image-container">
+							<image 
+								class="product-image" 
+								:src="product.image" 
+								mode="aspectFill"
+							/>
+							<view class="product-tags">
+								<text v-if="product.tag" class="product-tag">{{ product.tag }}</text>
+								<text v-if="product.featured" class="featured-tag">{{ product.featured }}</text>
+							</view>
+						</view>
+						
+						<view class="product-details">
+							<text class="product-title">{{ product.name }}</text>
+							<text class="product-specification">{{ product.specification }}</text>
+							
+							<view class="product-rating">
+								<view class="rating-stars">
+									<text class="star-icon">⭐</text>
+									<text class="rating-value">{{ product.rating }}</text>
+								</view>
+								<text class="reviews-count">{{ product.reviews }}条评价</text>
+							</view>
+							
+							<view class="price-section">
+								<view class="current-price">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<text class="original-price" v-if="product.originalPrice > product.price">
+									¥{{ product.originalPrice }}
+								</text>
+							</view>
+							
+							<view class="product-actions">
+								<view class="add-to-cart" @click.stop="addToCart(product)">
+									<text class="cart-icon">🛒</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 加载状态 -->
+				<view v-if="loading" class="loading-state">
+					<view class="loading-spinner"></view>
+					<text class="loading-text">加载中...</text>
+				</view>
+				
+				<view v-if="!hasMore && recommendedProducts.length > 0" class="no-more">
+					<text class="no-more-text">--- 已加载全部内容 ---</text>
+				</view>
+			</view>
+
+			<!-- 健康提醒 -->
+			<view class="health-reminder">
+				<view class="reminder-content">
+					<text class="reminder-icon">⏰</text>
+					<view class="reminder-text">
+						<text class="reminder-title">健康提醒</text>
+						<text class="reminder-desc">您有1个待用药提醒，点击查看详情</text>
+					</view>
+					<view class="reminder-action" @click="navigateToReminders">
+						<text class="action-text">查看</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 底部安全区域 -->
+			<view class="safe-area"></view>
 		</scroll-view>
-
-		<!-- 底部导航 -->
-		<view class="bottom-navigation">
-			<view class="nav-item active">
-				<text class="nav-icon">🏠</text>
-				<text class="nav-text">首页</text>
-			</view>
-			<view class="nav-item" @click="navigateToCategory()">
-				<text class="nav-icon">📂</text>
-				<text class="nav-text">分类</text>
-			</view>
-			<view class="nav-item" @click="navigateToCart">
-				<text class="nav-icon">🛒</text>
-				<text class="nav-text">购物车</text>
-			</view>
-			<view class="nav-item" @click="navigateToProfile">
-				<text class="nav-icon">👤</text>
-				<text class="nav-text">我的</text>
-			</view>
-		</view>
 	</view>
 </template>
 
 <script setup lang="uts">
-import { ref, onMounted } from 'vue'
-import type { ProductType, CouponTemplateType } from '@/types/mall-types.uts'
-import supa from '@/components/supadb/aksupainstance.uts'
+import { ref, reactive, onMounted } from 'vue'
 
-// 数据定义
-const bannerList = ref<Array<any>>([])
-const categoryList = ref<Array<any>>([])
-const couponList = ref<Array<CouponTemplateType>>([])
-const productList = ref<Array<ProductType>>([])
-const cartCount = ref<number>(0)
-const isLoading = ref<boolean>(false)
-const page = ref<number>(1)
-const pageSize = ref<number>(20)
-const hasMore = ref<boolean>(true)
+// 响应式数据
+const statusBarHeight = ref(0)
+const scrollHeight = ref(0)
+const refreshing = ref(false)
+const loading = ref(false)
+const hasMore = ref(true)
+const activeSort = ref('sales')
+const activeFilter = ref('recommend')
+const currentPage = ref(1)
 
-// 页面加载
+// 数据源
+const allProducts = ref<any[]>([])
+const hotProducts = ref<any[]>([])
+const recommendedProducts = ref<any[]>([])
+
+// 屏幕尺寸检测
+const isMobile = ref(false)
+
+// 导航栏显示控制
+const showNavbar = ref(true)
+const lastScrollTop = ref(0)
+const scrollThreshold = 30 // 降低滚动阈值，使其更灵敏
+const scrollingUp = ref(false)
+
+// 分类数据
+const categories = [
+	{ id: 'cold', name: '感冒发烧', icon: '🤧', desc: '解热镇痛', color: '#2196F3' },
+	{ id: 'stomach', name: '肠胃用药', icon: '🤢', desc: '消化系统', color: '#4CAF50' },
+	{ id: 'pain', name: '止痛消炎', icon: '💊', desc: '镇痛消炎', color: '#F44336' },
+	{ id: 'skin', name: '皮肤用药', icon: '🤕', desc: '皮肤护理', color: '#9C27B0' },
+	{ id: 'vitamin', name: '维生素', icon: '🍊', desc: '营养补充', color: '#FF9800' },
+	{ id: 'chronic', name: '慢性病', icon: '🫀', desc: '长期管理', color: '#795548' },
+	{ id: 'child', name: '儿童用药', icon: '👶', desc: '儿童专用', color: '#00BCD4' },
+	{ id: 'external', name: '外用药品', icon: '🧴', desc: '外用制剂', color: '#8BC34A' },
+	{ id: 'device', name: '医疗器械', icon: '🩺', desc: '医疗设备', color: '#607D8B' },
+	{ id: 'health', name: '健康食品', icon: '🥗', desc: '保健食品', color: '#FFC107' }
+]
+
+// 排序标签
+const sortTabs = [
+	{ id: 'sales', name: '销量' },
+	{ id: 'price', name: '价格' },
+	{ id: 'new', name: '新品' },
+	{ id: 'recommend', name: '推荐' }
+]
+
+// 推荐筛选器
+const recommendFilters = [
+	{ id: 'recommend', name: '智能推荐' },
+	{ id: 'hot', name: '热门商品' },
+	{ id: 'discount', name: '限时优惠' },
+	{ id: 'quality', name: '品质优选' }
+]
+
+// 健康资讯
+const healthNews = [
+	{
+		id: 'news1',
+		title: '秋季流感预防指南，科学防护健康过冬',
+		tag: '健康科普',
+		image: 'https://picsum.photos/800/400?random=health1'
+	},
+	{
+		id: 'news2',
+		title: '家庭常备药清单，为家人健康保驾护航',
+		tag: '家庭用药',
+		image: 'https://picsum.photos/800/400?random=health2'
+	},
+	{
+		id: 'news3',
+		title: '慢性病科学管理，提高生活质量',
+		tag: '健康管理',
+		image: 'https://picsum.photos/800/400?random=health3'
+	}
+]
+
+// 初始化数据
+const initData = () => {
+	const manufacturers = ['修正药业', '白云山', '养生堂', '三九医药', '同仁堂', '云南白药', '拜耳', '辉瑞']
+	const names = ['布洛芬', '板蓝根', '维生素C', '胃康灵', '阿莫西林', '连花清瘟', '氨溴索', '氯雷他定', '感冒灵', '健胃消食片', '阿司匹林', '蒙脱石散']
+	const tags = ['处方药', '中成药', '止咳化痰', '抗过敏', '感冒发烧', '肠胃用药', '消炎镇痛']
+	const featureds = ['医生推荐', '热销爆款', '家庭必备', '季节必备', '店长推荐']
+
+	const products = [] as any[]
+	for (let i = 0; i < 50; i++) {
+		const nameIdx = Math.floor(Math.random() * names.length)
+		const name = names[nameIdx]
+		const price = parseFloat((10 + Math.random() * 100).toFixed(1))
+		const originalPrice = parseFloat((price * (1.1 + Math.random() * 0.5)).toFixed(1))
+		const sales = Math.floor(Math.random() * 5000)
+		
+		// 随机店铺ID，避免全部是同一家
+		const randomShopSuffix = Math.floor(Math.random() * 20) + 1
+		
+		products.push({
+			id: `prod_${i}`,
+			shopId: `shop_${randomShopSuffix}`,
+			shopName: manufacturers[Math.floor(Math.random() * manufacturers.length)] + '官方旗舰店',
+			name: name + (Math.random() > 0.5 ? '胶囊' : '颗粒'),
+			specification: Math.random() > 0.5 ? '0.3g*24粒' : '10g*10袋',
+			price: price,
+			originalPrice: originalPrice,
+			image: '/static/images/default-product.png',
+			manufacturer: manufacturers[Math.floor(Math.random() * manufacturers.length)],
+			sales: sales,
+			rating: (3.5 + Math.random() * 1.5).toFixed(1),
+			reviews: Math.floor(Math.random() * 500),
+			tag: tags[Math.floor(Math.random() * tags.length)],
+			featured: Math.random() > 0.7 ? featureds[Math.floor(Math.random() * featureds.length)] : '',
+			badge: sales > 3000 ? '热销' : (price < 20 ? '特价' : (Math.random() > 0.8 ? '新品' : '')),
+			// Attributes for filtering
+			isNew: Math.random() > 0.8,
+			isRecommend: Math.random() > 0.6,
+			isHot: sales > 2000,
+			isDiscount: (originalPrice - price) > 15,
+			isQuality: price > 60
+		})
+	}
+	allProducts.value = products
+	
+	filterHotProducts()
+	filterRecommendedProducts()
+}
+
+// 筛选热销商品
+const filterHotProducts = () => {
+	let list = [...allProducts.value]
+	
+	if (activeSort.value === 'sales') {
+		list.sort((a, b) => b.sales - a.sales)
+	} else if (activeSort.value === 'price') {
+		list.sort((a, b) => a.price - b.price)
+	} else if (activeSort.value === 'new') {
+		list = list.filter(p => p.isNew)
+	} else if (activeSort.value === 'recommend') {
+		list = list.filter(p => p.isRecommend)
+	}
+	
+	// 如果筛选后数量不足4个，补足
+	if (list.length < 4) {
+		const remaining = allProducts.value.filter(p => !list.includes(p))
+		list = [...list, ...remaining]
+	}
+	
+	hotProducts.value = list.slice(0, 4)
+}
+
+// 筛选推荐商品
+const filterRecommendedProducts = () => {
+	let list = [...allProducts.value]
+	
+	if (activeFilter.value === 'hot') {
+		list = list.filter(p => p.isHot)
+	} else if (activeFilter.value === 'discount') {
+		list = list.filter(p => p.isDiscount)
+	} else if (activeFilter.value === 'quality') {
+		list = list.filter(p => p.isQuality)
+	} else {
+		// 默认随机排序
+		list.sort(() => Math.random() - 0.5)
+	}
+	
+	// 如果筛选后数量不足4个，补足
+	if (list.length < 4) {
+		const remaining = allProducts.value.filter(p => !list.includes(p))
+		list = [...list, ...remaining]
+	}
+	
+	recommendedProducts.value = list.slice(0, 4)
+}
+
+// 家庭常备药
+const familyItems = [
+	{
+		id: 'family1',
+		name: '创可贴',
+		desc: '伤口护理',
+		icon: '🩹',
+		color: '#FF5722',
+		categoryId: 'external'
+	},
+	{
+		id: 'family2',
+		name: '体温计',
+		desc: '健康监测',
+		icon: '🌡️',
+		color: '#2196F3',
+		categoryId: 'device'
+	},
+	{
+		id: 'family3',
+		name: '消毒酒精',
+		desc: '环境消毒',
+		icon: '🧪',
+		color: '#4CAF50',
+		categoryId: 'external'
+	},
+	{
+		id: 'family4',
+		name: '口罩',
+		desc: '日常防护',
+		icon: '😷',
+		color: '#607D8B',
+		categoryId: 'device'
+	},
+	{
+		id: 'family5',
+		name: '退热贴',
+		desc: '物理降温',
+		icon: '🧊',
+		color: '#00BCD4',
+		categoryId: 'cold'
+	},
+	{
+		id: 'family6',
+		name: '棉签纱布',
+		desc: '伤口处理',
+		icon: '🩹',
+		color: '#FF9800',
+		categoryId: 'external'
+	}
+]
+
+// 生命周期
 onMounted(() => {
-	loadBanners()
-	loadCategories()
-	loadCoupons()
-	loadProducts()
-	loadCartCount()
+	initPage()
+	initData()
 })
 
-// 加载轮播图
-const loadBanners = async () => {
-	try {
-		const { data, error } = await supa
-			.from('mall_banners')
-			.select('*')
-			.eq('status', 1)
-			.order('sort_order', { ascending: true })
-			.limit(5)
+// 页面显示时重置状态
+onShow(() => {
+	console.log('=== index页面onShow被调用 ===')
+	console.log('主页重新显示，重置页面状态')
+	
+	// 重置导航栏显示状态
+	showNavbar.value = true
+	lastScrollTop.value = 0
+	
+	// 重置滚动位置到顶部
+	// 注意：这里不能直接操作scroll-view的滚动位置
+	// 但可以重置一些页面状态
+	
+	// 注意：这里不再清除selectedCategory
+	// 让分类页面在成功读取后自行清除
+	// 这样可以确保分类页面能正确读取到传递的数据
+	
+	console.log('=== index页面onShow执行完成 ===')
+})
 
-		if (error !== null) {
-			console.error('加载轮播图失败:', error)
-			bannerList.value = []
-			return
+// 初始化页面
+const initPage = () => {
+	const systemInfo = uni.getSystemInfoSync()
+	statusBarHeight.value = systemInfo.statusBarHeight || 0
+	
+	// 计算滚动区域高度 - 使用整个窗口高度
+	const windowHeight = systemInfo.windowHeight
+	scrollHeight.value = windowHeight
+	
+	// 检测屏幕尺寸
+	const screenWidth = systemInfo.screenWidth || systemInfo.windowWidth
+	isMobile.value = screenWidth < 768 // 小于768px为小屏幕
+}
+
+// 处理滚动事件
+const handleScroll = (event: any) => {
+	const scrollTop = event.detail.scrollTop
+	const currentTime = Date.now()
+	
+	// 判断滚动方向
+	if (scrollTop > lastScrollTop.value) {
+		// 向下滚动
+		scrollingUp.value = false
+		// 向下滚动超过阈值时隐藏导航栏
+		if (scrollTop > scrollThreshold && showNavbar.value) {
+			showNavbar.value = false
 		}
-
-		bannerList.value = data ?? []
-	} catch (err) {
-		console.error('加载轮播图异常:', err)
-		bannerList.value = []
-	}
-}
-
-// 加载分类
-const loadCategories = async () => {
-	try {
-		// 查询所有活跃分类，然后在前端过滤出顶级分类（parent_id 为 null）
-		// 这样可以避免 UTS 中 .is(null) 的类型问题
-		const { data, error } = await supa
-			.from('categories')
-			.select('*')
-			.eq('is_active', true)
-			.order('sort_order', { ascending: true })
-
-		if (error !== null) {
-			console.error('加载分类失败:', error)
-			categoryList.value = []
-			return
+	} else if (scrollTop < lastScrollTop.value) {
+		// 向上滚动
+		scrollingUp.value = true
+		// 向上滚动时显示导航栏
+		if (!showNavbar.value) {
+			showNavbar.value = true
 		}
-
-		// 过滤出顶级分类（parent_id 为 null 或 undefined）
-		const topCategories = (data ?? []).filter((item: any) => {
-			return item.parent_id === null || item.parent_id === undefined || item.parent_id === ''
-		}).slice(0, 8)  // 限制为前8个
-
-		categoryList.value = topCategories
-	} catch (err) {
-		console.error('加载分类异常:', err)
-		// 如果查询失败，使用空数组避免页面崩溃
-		categoryList.value = []
 	}
+	
+	// 滚动到顶部时强制显示导航栏
+	if (scrollTop <= 10) {
+		showNavbar.value = true
+	}
+	
+	lastScrollTop.value = scrollTop
+	
+	// 调试信息（开发时可启用）
+	// console.log(`Scroll: ${scrollTop}, ShowNavbar: ${showNavbar.value}, ScrollingUp: ${scrollingUp.value}`)
 }
 
-// 加载优惠券
-const loadCoupons = async () => {
-	try {
-		const now = new Date().toISOString()
-		// 查询当前时间在有效期内的优惠券：start_time <= now <= end_time
-		const { data, error } = await supa
-			.from('coupon_templates')
-			.select('*')
-			.eq('status', 1)
-			.lte('start_time', now)  // 开始时间 <= 当前时间
-			.gte('end_time', now)    // 结束时间 >= 当前时间
-			.limit(5)
+// 重置导航栏显示状态（例如点击回到顶部时）
+const resetNavbar = () => {
+	showNavbar.value = true
+	lastScrollTop.value = 0
+}
 
-		if (error !== null) {
-			console.error('加载优惠券失败:', error)
-			couponList.value = []
-			return
+// 切换分类 - 跳转到分类页面并传递分类ID
+const switchCategory = (category: any) => {
+	console.log('=== switchCategory函数开始执行 ===')
+	console.log('分类ID:', category.id, '分类名称:', category.name)
+	
+	// 清除可能存在的旧数据
+	uni.removeStorageSync('selectedCategory')
+	
+	// 生成唯一的时间戳和随机参数，确保每次跳转都是新的页面
+	const timestamp = Date.now()
+	const randomParam = Math.random().toString(36).substring(2, 8)
+	
+	// 构建带参数的URL，直接通过URL传递分类信息
+	const url = `/pages/mall/consumer/category?categoryId=${category.id}&name=${encodeURIComponent(category.name)}&timestamp=${timestamp}&random=${randomParam}`
+	
+	console.log('跳转URL:', url)
+	console.log('分类ID参数:', category.id)
+	console.log('时间戳:', timestamp)
+	console.log('随机参数:', randomParam)
+	
+	// 使用uni.reLaunch跳转到分类页面，关闭所有页面并打开新页面
+	// 这样可以确保每次跳转都是全新的页面实例，避免页面缓存问题
+	// 虽然这会关闭当前主页，但可以确保分类页面总是重新加载
+	uni.reLaunch({
+		url: url,
+		success: () => {
+			console.log('✅ 使用reLaunch跳转到分类页面成功')
+			console.log('=== switchCategory函数执行完成 ===')
+		},
+		fail: (err) => {
+			console.error('❌ 跳转到分类页面失败:', err)
+			console.log('=== switchCategory函数执行完成 ===')
 		}
-
-		couponList.value = data ?? []
-	} catch (err) {
-		console.error('加载优惠券异常:', err)
-		couponList.value = []
-	}
+	})
 }
 
-// 加载商品
-const loadProducts = async (loadMore: boolean = false) => {
-	if (isLoading.value || (!hasMore.value && loadMore)) {
-		return
-	}
-
-	isLoading.value = true
-
-	try {
-		const currentPage = loadMore ? page.value + 1 : 1
-		const { data, error } = await supa
-			.from('products')
-			.select('*')
-			.eq('status', 1)
-			.order('created_at', { ascending: false })
-			.range((currentPage - 1) * pageSize.value, currentPage * pageSize.value - 1)
-
-		if (error !== null) {
-			console.error('加载商品失败:', error)
-			if (!loadMore) {
-				productList.value = []
-			}
-			isLoading.value = false
-			return
-		}
-
-		const newProducts = data ?? []
-		
-		if (loadMore) {
-			for (let i: Int = 0; i < newProducts.length; i++) {
-				productList.value.push(newProducts[i])
-			}
-			page.value = currentPage
-		} else {
-			productList.value = newProducts
-			page.value = 1
-		}
-
-		hasMore.value = newProducts.length === pageSize.value
-	} catch (err) {
-		console.error('加载商品异常:', err)
-		if (!loadMore) {
-			productList.value = []
-		}
-	} finally {
-		isLoading.value = false
-	}
+// 切换排序
+const switchSort = (sortId: string) => {
+	activeSort.value = sortId
+	filterHotProducts()
 }
 
-// 加载购物车数量
-const loadCartCount = async () => {
-	try {
-		// 这里应该从用户登录状态获取user_id
-		const userId = getCurrentUserId()
-		if (userId === null) {
-			return
-		}
-
-		const { data, error } = await supa
-			.from('shopping_cart')
-			.select('quantity')
-			.eq('user_id', userId)
-
-		if (error !== null) {
-			console.error('加载购物车数量失败:', error)
-			return
-		}
-
-		let total = 0
-		const cartItems = data ?? []
-		for (let i: Int = 0; i < cartItems.length; i++) {
-			total += cartItems[i].quantity
-		}
-		cartCount.value = total
-	} catch (err) {
-		console.error('加载购物车数量异常:', err)
-	}
+// 切换筛选器
+const switchFilter = (filterId: string) => {
+	activeFilter.value = filterId
+	filterRecommendedProducts()
 }
 
-// 获取当前用户ID (临时实现)
-const getCurrentUserId = (): string | null => {
-	// 这里应该从全局状态或storage中获取
-	return null
+// 查看新闻详情
+const viewNewsDetail = (news: any) => {
+	uni.navigateTo({
+		url: `/pages/news/detail?id=${news.id}`
+	})
 }
 
-// 获取商品第一张图片
-const getProductFirstImage = (product: ProductType): string => {
-	if (product.images.length > 0) {
-		return product.images[0]
-	}
-	return '/static/default-product.png'
-}
-
-// 格式化过期时间
-const formatExpireTime = (endTime: string): string => {
-	const date = new Date(endTime)
-	const month = (date.getMonth() + 1).toString().padStart(2, '0')
-	const day = date.getDate().toString().padStart(2, '0')
-	return `${month}.${day}到期`
-}
-
-// 图片加载错误处理
-const handleImageError = (event: UniImageErrorEvent) => {
-	const target = event.target as UniImageElement
-	if (target !== null) {
-		target.src = '/static/default-product.png'
-	}
-}
-
-// 轮播图点击
-const handleBannerClick = (banner: any) => {
-	if (banner.link_url !== null && banner.link_url !== '') {
-		// 处理轮播图跳转
-		console.log('点击轮播图:', banner.link_url)
-	}
-}
-
-// 领取优惠券
-const receiveCoupon = async (coupon: CouponTemplateType) => {
-	const userId = getCurrentUserId()
-	if (userId === null) {
+// 下拉刷新
+const onRefresh = () => {
+	refreshing.value = true
+	setTimeout(() => {
+		refreshing.value = false
 		uni.showToast({
-			title: '请先登录',
-			icon: 'none'
-		})
-		return
-	}
-
-	try {
-		// 检查是否已领取
-		const { data: existingCoupons, error: checkError } = await supa
-			.from('user_coupons')
-			.select('id')
-			.eq('user_id', userId)
-			.eq('template_id', coupon.id)
-
-		if (checkError !== null) {
-			console.error('检查优惠券失败:', checkError)
-			return
-		}
-
-		if (existingCoupons !== null && existingCoupons.length >= coupon.per_user_limit) {
-			uni.showToast({
-				title: '已达领取上限',
-				icon: 'none'
-			})
-			return
-		}
-
-		// 生成优惠券码
-		const couponCode = generateCouponCode()
-		const expireAt = coupon.end_time
-
-		const { error: insertError } = await supa
-			.from('user_coupons')
-			.insert({
-				user_id: userId,
-				template_id: coupon.id,
-				coupon_code: couponCode,
-				expire_at: expireAt
-			})
-
-		if (insertError !== null) {
-			console.error('领取优惠券失败:', insertError)
-			uni.showToast({
-				title: '领取失败',
-				icon: 'none'
-			})
-			return
-		}
-
-		uni.showToast({
-			title: '领取成功',
+			title: '刷新成功',
 			icon: 'success'
 		})
-	} catch (err) {
-		console.error('领取优惠券异常:', err)
-		uni.showToast({
-			title: '领取失败',
-			icon: 'none'
-		})
-	}
+	}, 1500)
 }
 
-// 生成优惠券码
-const generateCouponCode = (): string => {
-	const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-	let result = ''
-	for (let i: Int = 0; i < 12; i++) {
-		result += chars.charAt(Math.floor(Math.random() * chars.length))
-	}
-	return result
+// 加载更多
+const loadMore = () => {
+	if (loading.value || !hasMore.value) return
+	
+	loading.value = true
+	setTimeout(() => {
+		// 模拟加载更多数据
+		const newProducts = [...recommendedProducts].map((item, index) => ({
+			...item,
+			id: `new${index}`,
+			price: Math.floor(item.price * 0.9 + Math.random() * 10)
+		}))
+		
+		// 实际项目中应该合并数据
+		loading.value = false
+		hasMore.value = recommendedProducts.length < 20
+		
+		uni.showToast({
+			title: '加载完成',
+			icon: 'success'
+		})
+	}, 2000)
 }
 
 // 添加到购物车
-const addToCart = async (product: ProductType) => {
-	const userId = getCurrentUserId()
-	if (userId === null) {
-		uni.showToast({
-			title: '请先登录',
-			icon: 'none'
-		})
-		return
-	}
-
-	// 这里简化处理，直接添加商品（实际应该选择SKU）
-	try {
-		const { error } = await supa
-			.from('shopping_cart')
-			.upsert({
-				user_id: userId,
-				product_id: product.id,
-				quantity: 1
-			})
-
-		if (error !== null) {
-			console.error('添加购物车失败:', error)
-			uni.showToast({
-				title: '添加失败',
-				icon: 'none'
-			})
-			return
+const addToCart = (product: any) => {
+	// 获取现有购物车数据
+	const cartData = uni.getStorageSync('cart')
+	let cartItems: any[] = []
+	
+	if (cartData) {
+		try {
+			cartItems = JSON.parse(cartData as string) as any[]
+		} catch (e) {
+			console.error('解析购物车数据失败', e)
 		}
-
-		cartCount.value++
-		uni.showToast({
-			title: '已添加到购物车',
-			icon: 'success'
-		})
-	} catch (err) {
-		console.error('添加购物车异常:', err)
 	}
-}
-
-// 导航方法
-const navigateToSearch = () => {
-	uni.navigateTo({
-		url: '/pages/mall/consumer/search'
+	
+	// 检查商品是否已存在
+	const existingItem = cartItems.find((item: any) => item.id === product.id)
+	
+	if (existingItem) {
+		existingItem.quantity++
+	} else {
+		// 添加新商品
+		cartItems.push({
+			id: product.id,
+			shopId: product.shopId || 'shop_default',
+			shopName: product.shopName || product.manufacturer || '自营店铺',
+			name: product.name,
+			price: product.price,
+			image: product.image,
+			spec: product.specification || '默认规格',
+			quantity: 1,
+			selected: true
+		})
+	}
+	
+	// 保存回存储
+	uni.setStorageSync('cart', JSON.stringify(cartItems))
+	
+	uni.showToast({
+		title: '已添加到购物车',
+		icon: 'success'
 	})
 }
 
-const navigateToCart = () => {
+// 导航函数
+const navigateToSearch = () => uni.navigateTo({ url: '/pages/mall/consumer/search' })
+const navigateToNews = () => uni.navigateTo({ url: '/pages/news/list' })
+const navigateToProduct = (product: any) => {
 	uni.navigateTo({
-		url: '/pages/mall/consumer/cart'
+		url: `/pages/mall/consumer/product-detail?productId=${product.id}&price=${product.price}&originalPrice=${product.originalPrice || ''}`
 	})
 }
-
-const navigateToCategory = (category?: any) => {
-	const url = category !== null ? 
-		`/pages/mall/consumer/category?id=${category.id}` : 
-		'/pages/mall/consumer/category'
+const navigateToCategory = (item: any) => {
 	uni.navigateTo({
-		url: url
-	})
-}
-
-const navigateToProduct = (product: ProductType) => {
-	uni.navigateTo({
-		url: `/pages/mall/consumer/product-detail?id=${product.id}`
-	})
-}
-
-const navigateToCoupons = () => {
-	uni.navigateTo({
-		url: '/pages/mall/consumer/coupons'
-	})
-}
-
-const navigateToProfile = () => {
-	uni.navigateTo({
-		url: '/pages/mall/consumer/profile'
+		url: `/pages/mall/consumer/search?keyword=${encodeURIComponent(item.name)}&type=family`
 	})
 }
+const navigateToConsultation = () => uni.navigateTo({ url: '/pages/medicine/consultation' })
+const navigateToPrescription = () => uni.navigateTo({ url: '/pages/medicine/prescription' })
+const navigateToOTC = () => uni.navigateTo({ url: '/pages/medicine/otc' })
+const navigateToHealthTools = () => uni.navigateTo({ url: '/pages/medicine/tools' })
+const navigateToReminders = () => uni.navigateTo({ url: '/pages/user/reminders' })
 </script>
 
-<style scoped>
-.consumer-home {
+<style>
+/* 全局重置 */
+.medic-home * {
+	box-sizing: border-box;
+	margin: 0;
+	padding: 0;
+}
+
+.medic-home {
+	width: 100%;
+	min-height: 100vh;
+	background: #f8fafc;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', sans-serif;
+	line-height: 1.5;
 	display: flex;
 	flex-direction: column;
-	height: 100vh;
-	background-color: #f5f5f5;
 }
 
-.header {
-	background-color: #ffffff;
-	padding: 10px 15px;
-	border-bottom: 1px solid #e5e5e5;
+/* 智能导航栏 - 重新设计布局 */
+.smart-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+	z-index: 1000;
+	box-shadow: 0 2px 12px rgba(76, 175, 80, 0.15); /* 调整为与分类页一致 */
+	transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+	will-change: transform, opacity;
+	pointer-events: auto; /* 确保导航栏可以交互 */
+	backface-visibility: hidden; /* 改善动画性能 */
+	-webkit-backface-visibility: hidden;
 }
 
+/* 导航栏搜索框容器内边距调整 */
 .search-container {
+	height: 44px; /* 调整为与消息页一致的高度 */
+	padding: 0 16px;
 	display: flex;
+	flex-direction: row; /* 显式设置 flex-direction: row */
 	align-items: center;
 	justify-content: space-between;
+	max-width: 1400px;
+	margin: 0 auto;
+	width: 100%;
 }
 
+/* 搜索框 hover 效果 */
+.search-box:hover {
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+/* 导航栏搜索框容器内边距调整 */
 .search-box {
 	flex: 1;
-	display: flex;
-	align-items: center;
-	background-color: #f8f8f8;
+	max-width: 600px;
+	background: #f0f0f0;
 	border-radius: 20px;
-	padding: 8px 15px;
-	margin-right: 15px;
-}
-
-.search-icon {
-	color: #999999;
-	margin-right: 8px;
+	padding: 0 4px 0 12px;
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	align-items: center;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	width: 100%;
+	height: 32px; /* 减小高度，与顶部高度44px适配，略小于顶部高度 */
 }
 
 .search-placeholder {
-	color: #999999;
 	font-size: 14px;
-}
-
-.cart-icon {
-	position: relative;
-	padding: 5px;
-}
-
-.icon {
-	font-size: 24px;
-}
-
-.badge {
-	position: absolute;
-	top: -2px;
-	right: -2px;
-	background-color: #ff4757;
-	color: #ffffff;
-	font-size: 10px;
-	padding: 2px 6px;
-	border-radius: 10px;
-	min-width: 16px;
-	text-align: center;
-}
-
-.main-content {
+	color: #999;
 	flex: 1;
-}
-
-.banner-swiper {
-	height: 180px;
-	margin: 10px 15px;
-	border-radius: 8px;
+	white-space: nowrap;
 	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
-.banner-image {
-	width: 100%;
-	height: 100%;
-}
-
-.category-section {
-	background-color: #ffffff;
-	margin: 10px 15px;
-	border-radius: 8px;
-	padding: 15px;
-}
-
-.section-title {
-	font-size: 16px;
-	font-weight: bold;
-	color: #333333;
-	margin-bottom: 15px;
-}
-
-.category-grid {
+.nav-icon-btn {
+	padding: 4px 8px 4px 4px;
 	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	border-right: 1px solid #ddd;
+	margin-right: 8px;
 }
 
-.category-item {
-	width: 60px;
+.nav-icon {
+	font-size: 18px;
+}
+
+/* 搜索按钮高度微调 */
+.nav-inner-search-btn {
+	padding: 0 12px; /* 减小内边距 */
+	background-color: #87CEEB; /* 天空蓝 */
+	border-radius: 16px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	height: 24px; /* 随搜索框高度减小而减小 */
+}
+
+.nav-inner-search-text {
+	font-size: 12px; /* 字体稍微变小 */
+	color: #ffffff;
+	font-weight: 500;
+}
+
+/* 导航栏占位符 */
+.navbar-placeholder {
+	width: 100%;
+	flex-shrink: 0;
+}
+
+.nav-camera-btn {
+	padding: 4px 8px 4px 4px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-right-color: #ddd;
+	border-right: 1px solid #ddd; /* 修复UVUE样式 */
+	margin-right: 8px;
+}
+
+.nav-camera-icon {
+	font-size: 20px;
+}
+
+/* 主内容区域 */
+.main-scroll {
+	flex: 1;
+	padding: 0 16px 16px;
+	max-width: 1400px;
+	margin-left: auto;
+	margin-right: auto;
+	width: 100%;
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch; /* 改善iOS滚动体验 */
+}
+
+/* 智能健康卡片 */
+.smart-health-card {
+	background: linear-gradient(135deg, #2196F3 0%, #1976D2 100%);
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	/* margin-top 由 style 动态控制 */
+	color: white;
+}
+
+.health-content {
 	display: flex;
 	flex-direction: column;
-	align-items: center;
-	margin-bottom: 15px;
+	gap: 12px;
 }
 
-.category-icon {
-	width: 40px;
-	height: 40px;
+.health-header {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.health-title {
+	font-size: 20px;
+	font-weight: bold;
+}
+
+.health-subtitle {
+	font-size: 14px;
+	opacity: 0.9;
+}
+
+.health-tips {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 12px;
+	margin-top: 8px;
+}
+
+.tip-item {
+	font-size: 13px;
+	padding: 6px 12px;
+	background: rgba(255, 255, 255, 0.2);
 	border-radius: 20px;
-	margin-bottom: 5px;
+	backdrop-filter: blur(10px);
 }
 
-.category-name {
-	font-size: 12px;
-	color: #666666;
-	text-align: center;
-}
-
-.coupon-section {
-	background-color: #ffffff;
-	margin: 10px 15px;
-	border-radius: 8px;
-	padding: 15px;
+/* 智能分类网格 */
+.smart-categories {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
 }
 
 .section-header {
 	display: flex;
 	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 15px;
+	align-items: flex-start;
+	margin-bottom: 20px;
 }
 
-.more-btn {
-	color: #007aff;
+.section-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.section-desc {
 	font-size: 14px;
+	color: #666;
 }
 
-.coupon-scroll {
+/* 分类网格布局 */
+.category-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+	gap: 16px;
+}
+
+.category-card {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 16px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid transparent;
+}
+
+.category-card:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	border-color: var(--card-color, #4CAF50);
+}
+
+.card-icon {
+	width: 56px;
+	height: 56px;
+	border-radius: 28px;
+	background: var(--card-color, #4CAF50);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.card-icon text {
+	font-size: 24px;
+	color: white;
+}
+
+.card-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	text-align: center;
+}
+
+.card-desc {
+	font-size: 12px;
+	color: #666;
+	text-align: center;
+}
+
+/* 健康资讯 */
+.health-news {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.news-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 16px;
+}
+
+.news-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.news-more {
+	font-size: 14px;
+	color: #4CAF50;
+	cursor: pointer;
+}
+
+.news-swiper {
+	height: 200px;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.news-content {
+	position: relative;
+	height: 100%;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.news-image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.news-overlay {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(to top, rgba(0, 0, 0, 0.8), transparent);
+	padding: 20px;
+	color: white;
+}
+
+.news-tag {
+	display: inline-block;
+	background: #4CAF50;
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-size: 12px;
+	font-weight: 500;
+	margin-bottom: 8px;
+}
+
+.news-caption {
+	font-size: 16px;
+	font-weight: 600;
+	display: block;
+	line-height: 1.4;
+}
+
+/* 智能服务 */
+.smart-services {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.services-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+	gap: 20px;
+}
+
+.service-card {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 20px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.service-card:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.service-icon {
+	width: 60px;
+	height: 60px;
+	border-radius: 30px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.service-icon text {
+	font-size: 28px;
+	color: white;
+}
+
+.service-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+}
+
+.service-desc {
+	font-size: 12px;
+	color: #666;
+}
+
+/* 热销药品 */
+.hot-products {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.section-header {
+	display: flex;
+	flex-direction: column; /* 标题和筛选器垂直排列 */
+	align-items: flex-start;
+	margin-bottom: 20px;
 	width: 100%;
 }
 
-.coupon-list {
+.title-section {
 	display: flex;
-	flex-direction: row;
+	align-items: center;
+	gap: 8px;
+	width: 100%;
 }
 
-.coupon-item {
-	display: flex;
-	width: 280px;
-	height: 80px;
-	background: linear-gradient(135deg, #ff6b6b, #ffa726);
-	border-radius: 8px;
-	margin-right: 10px;
-	overflow: hidden;
+.section-icon {
+	font-size: 20px;
+	color: #4CAF50;
 }
 
-.coupon-left {
-	width: 80px;
+.sort-tabs {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	gap: 8px;
+	align-items: center;
+	flex-wrap: wrap; /* 允许换行，实现自适应 */
+	justify-content: flex-start;
+	width: 100%;
+	margin-top: 12px;
+}
+
+.sort-tab {
+	font-size: 13px;
+	color: #666;
+	padding: 8px 12px; /* 增加左右内边距 */
+	border-radius: 20px;
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.2s ease;
+	white-space: nowrap;
+	flex: 1; /* 均分宽度 */
+	min-width: 70px; /* 设置最小宽度防止过窄 */
+	text-align: center;
 	display: flex;
-	flex-direction: column;
 	justify-content: center;
 	align-items: center;
-	background-color: rgba(255, 255, 255, 0.2);
 }
 
-.coupon-value {
-	color: #ffffff;
-	font-size: 18px;
-	font-weight: bold;
+.sort-tab.active {
+	background: #4CAF50;
+	color: white;
+	border-color: #4CAF50;
 }
 
-.coupon-condition {
-	color: #ffffff;
-	font-size: 10px;
-	margin-top: 2px;
+.sort-tab:hover {
+	background: #f5f5f5;
 }
 
-.coupon-right {
-	flex: 1;
-	padding: 10px;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
+.sort-tab.active:hover {
+	background: #388E3C;
 }
 
-.coupon-name {
-	color: #ffffff;
-	font-size: 14px;
-	font-weight: bold;
-}
-
-.coupon-expire {
-	color: #ffffff;
-	font-size: 10px;
-	opacity: 0.8;
-}
-
-.receive-btn {
-	align-self: flex-end;
-	background-color: #ffffff;
-	border-radius: 12px;
-	padding: 4px 12px;
-}
-
-.btn-text {
-	color: #ff6b6b;
-	font-size: 12px;
-}
-
-.product-section {
-	background-color: #ffffff;
-	margin: 10px 15px;
-	border-radius: 8px;
-	padding: 15px;
-}
-
-.product-waterfall {
-	margin-top: 10px;
-}
-
-.product-grid {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
-	margin-top: 10px;
+/* 产品网格 */
+.products-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+	gap: 20px;
+	margin-top: 20px;
 }
 
 .product-card {
-	width: 48%;
-	background-color: #ffffff;
-	border-radius: 8px;
+	background: #f8f9fa;
+	border-radius: 12px;
 	overflow: hidden;
-	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-	margin-bottom: 10px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid #e0e0e0;
+	position: relative;
+}
+
+.product-card:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-badge {
+	position: absolute;
+	top: 12px;
+	left: 12px;
+	background: #FF5722;
+	color: white;
+	font-size: 11px;
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-weight: 600;
+	z-index: 2;
 }
 
 .product-image {
 	width: 100%;
-	height: 120px;
+	height: 160px;
+	object-fit: cover;
+	background: white;
 }
 
 .product-info {
-	padding: 10px;
+	padding: 16px;
 }
 
 .product-name {
-	font-size: 14px;
-	color: #333333;
-	margin-bottom: 8px;
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	display: block;
 	line-height: 1.4;
 }
 
-.price-row {
+.product-spec {
+	font-size: 13px;
+	color: #666;
+	margin-bottom: 12px;
+	display: block;
+}
+
+.price-section {
 	display: flex;
 	align-items: baseline;
-	margin-bottom: 8px;
+	gap: 8px;
+	margin-bottom: 12px;
 }
 
 .current-price {
-	color: #ff4757;
-	font-size: 16px;
+	display: flex;
+	align-items: baseline;
+}
+
+.price-symbol {
+	font-size: 14px;
+	color: #FF5722;
+}
+
+.price-value {
+	font-size: 20px;
 	font-weight: bold;
+	color: #FF5722;
+	margin-left: 2px;
 }
 
 .original-price {
-	color: #999999;
-	font-size: 12px;
+	font-size: 13px;
+	color: #999;
 	text-decoration: line-through;
-	margin-left: 5px;
 }
 
-.sales-row {
+.product-meta {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-}
-
-.sales-text {
-	color: #999999;
 	font-size: 12px;
+	margin-bottom: 12px;
 }
 
-.add-cart-btn {
-	width: 24px;
-	height: 24px;
-	background-color: #007aff;
-	border-radius: 12px;
+.manufacturer {
+	color: #666;
+}
+
+.sales-count {
+	color: #999;
+}
+
+.product-action {
+	margin-top: 12px;
+}
+
+.cart-btn {
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	gap: 6px;
+	background: #4CAF50;
+	color: white;
+	padding: 8px 12px;
+	border-radius: 8px;
+	font-size: 13px;
+	font-weight: 500;
+	cursor: pointer;
+	transition: all 0.2s ease;
 }
 
-.add-text {
-	color: #ffffff;
-	font-size: 16px;
-	font-weight: bold;
+.cart-btn:hover {
+	background: #388E3C;
 }
 
-.loading-container {
-	padding: 20px;
-	display: flex;
-	justify-content: center;
-}
-
-.loading-text {
-	color: #999999;
+.cart-icon {
 	font-size: 14px;
 }
 
-.bottom-navigation {
-	display: flex;
-	background-color: #ffffff;
-	border-top: 1px solid #e5e5e5;
-	padding: 8px 0;
+.cart-text {
+	font-size: 13px;
 }
 
-.nav-item {
-	flex: 1;
+/* 家庭常备药 */
+.family-medicine {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.section-subtitle {
+	font-size: 14px;
+	color: #666;
+	margin-left: 12px;
+}
+
+.family-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
+	gap: 16px;
+	margin-top: 20px;
+}
+
+.family-item {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	padding: 5px;
+	padding: 16px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
 }
 
-.nav-item.active {
-	color: #007aff;
+.family-item:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
 
-.nav-icon {
+.family-icon {
+	width: 48px;
+	height: 48px;
+	border-radius: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.family-icon text {
 	font-size: 20px;
-	margin-bottom: 2px;
+	color: white;
 }
 
-.nav-text {
-	font-size: 10px;
+.family-name {
+	font-size: 14px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+}
+
+.family-desc {
+	font-size: 12px;
+	color: #666;
+}
+
+/* 智能推荐 */
+.smart-recommend {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.recommend-filters {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	gap: 8px;
+	align-items: center;
+	flex-wrap: wrap; /* 允许换行，实现自适应 */
+	justify-content: flex-start;
+	width: 100%;
+	margin-top: 12px;
+}
+
+.filter-item {
+	font-size: 13px;
+	color: #666;
+	padding: 8px 12px; /* 增加左右内边距 */
+	border-radius: 20px;
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.2s ease;
+	white-space: nowrap;
+	flex: 1; /* 均分宽度 */
+	min-width: 80px; /* 设置最小宽度防止过窄 */
+	text-align: center;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.filter-item.active {
+	background: #4CAF50;
+	color: white;
+	border-color: #4CAF50;
+}
+
+.filter-item:hover {
+	background: #f5f5f5;
+}
+
+.filter-item.active:hover {
+	background: #388E3C;
+}
+
+.recommend-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+	gap: 20px;
+	margin-top: 20px;
+}
+
+.recommend-product {
+	background: #f8f9fa;
+	border-radius: 12px;
+	overflow: hidden;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid #e0e0e0;
+}
+
+.recommend-product:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-image-container {
+	position: relative;
+	height: 180px;
+}
+
+.product-image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	background: white;
+}
+
+.product-tags {
+	position: absolute;
+	top: 12px;
+	left: 12px;
+	display: flex;
+	gap: 8px;
+}
+
+.product-tag, .featured-tag {
+	padding: 4px 10px;
+	border-radius: 10px;
+	font-size: 11px;
+	font-weight: 600;
+	color: white;
+}
+
+.product-tag {
+	background: rgba(76, 175, 80, 0.9);
+}
+
+.featured-tag {
+	background: rgba(255, 87, 34, 0.9);
+}
+
+.product-details {
+	padding: 16px;
+}
+
+.product-title {
+	font-size: 16px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	display: block;
+	line-height: 1.4;
+}
+
+.product-specification {
+	font-size: 13px;
+	color: #666;
+	margin-bottom: 12px;
+	display: block;
+}
+
+.product-rating {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-bottom: 12px;
+	font-size: 13px;
+}
+
+.rating-stars {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.star-icon {
+	font-size: 14px;
+	color: #FFC107;
+}
+
+.rating-value {
+	font-weight: 600;
+	color: #333;
+}
+
+.reviews-count {
+	color: #666;
+}
+
+.product-actions {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 12px;
+}
+
+.add-to-cart {
+	width: 36px;
+	height: 36px;
+	border-radius: 18px;
+	background: #4CAF50;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.add-to-cart:hover {
+	background: #388E3C;
+	transform: scale(1.1);
+}
+
+.cart-icon {
+	font-size: 16px;
+	color: white;
+}
+
+/* 健康提醒 */
+.health-reminder {
+	background: linear-gradient(135deg, #FF9800 0%, #F57C00 100%);
+	border-radius: 16px;
+	padding: 16px 20px;
+	margin-bottom: 20px;
+	color: white;
+}
+
+.reminder-content {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+}
+
+.reminder-icon {
+	font-size: 24px;
+}
+
+.reminder-text {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.reminder-title {
+	font-size: 15px;
+	font-weight: 600;
+}
+
+.reminder-desc {
+	font-size: 13px;
+	opacity: 0.9;
+}
+
+.reminder-action {
+	padding: 6px 16px;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 20px;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.reminder-action:hover {
+	background: rgba(255, 255, 255, 0.3);
+}
+
+.action-text {
+	font-size: 13px;
+	font-weight: 500;
+}
+
+/* 加载状态 */
+.loading-state {
+	padding: 40px 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.loading-spinner {
+	width: 32px;
+	height: 32px;
+	border: 3px solid #f0f0f0;
+	border-top-color: #4CAF50;
+	border-radius: 50%;
+	animation: spin 1s linear infinite;
+	margin-bottom: 12px;
+}
+
+@keyframes spin {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+	font-size: 14px;
+	color: #666;
+}
+
+.no-more {
+	padding: 30px 0;
+	text-align: center;
+	border-top: 1px solid #f0f0f0;
+	margin-top: 10px;
+}
+
+.no-more-text {
+	font-size: 13px;
+	color: #999;
+}
+
+/* 安全区域 */
+.safe-area {
+	height: 20px;
+	width: 100%;
+}
+
+/* ===== 响应式设计 ===== */
+
+/* 小屏手机 (小于414px) */
+@media screen and (max-width: 414px) {
+	.search-container {
+		padding: 0 12px;
+		height: 44px; /* 恢复为44px，与PC和分类页逻辑保持一致 */
+	}
+	
+	.search-box {
+		padding: 8px 16px; /* 与分类页保持一致 */
+		max-width: 100%;
+		margin: 0;
+	}
+	
+	.main-scroll {
+		padding: 0 12px 12px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr); /* 调整为一行5个，正好两行 */
+		gap: 8px;
+		padding: 0 4px;
+	}
+	
+	.category-card {
+		padding: 8px 0;
+		background: transparent; /* 移除卡片背景 */
+		box-shadow: none; /* 移除阴影 */
+		border: none; /* 移除边框 */
+	}
+	
+	.category-card:hover {
+		transform: none; /* 移动端移除悬停效果 */
+		box-shadow: none;
+	}
+	
+	.card-icon {
+		width: 44px; /* 减小图标尺寸 */
+		height: 44px;
+		border-radius: 22px;
+		margin-bottom: 6px;
+	}
+	
+	.card-icon text {
+		font-size: 20px;
+	}
+	
+	.card-name {
+		font-size: 11px; /* 减小文字大小 */
+		font-weight: normal;
+		color: #333;
+	}
+	
+	.card-desc {
+		display: none; /* 手机端隐藏描述文字，保持界面整洁 */
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr); /* 服务入口也调整为一行4个 */
+		gap: 8px;
+	}
+	
+	.service-card {
+		padding: 10px 4px;
+		background: #f8f9fa; /* 保持淡色背景 */
+	}
+	
+	.service-icon {
+		width: 40px;
+		height: 40px;
+		border-radius: 20px;
+		margin-bottom: 8px;
+	}
+	
+	.service-icon text {
+		font-size: 20px;
+	}
+	
+	.service-name {
+		font-size: 11px;
+	}
+	
+	.service-desc {
+		display: none; /* 隐藏描述 */
+	}
+	
+	.products-grid,
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr); /* 手机端调整为双列显示 */
+		gap: 8px; /* 减小间距 */
+	}
+
+	.product-info,
+	.product-details {
+		padding: 8px; /* 减小内边距 */
+	}
+
+	.product-name,
+	.product-title {
+		font-size: 13px; /* 调整字体大小 */
+		height: 36px; /* 限制高度，防止参差不齐 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.product-image,
+	.product-image-container {
+		height: 140px; /* 稍微减小图片高度适配双列 */
+	}
+
+	/* 手机端商品卡片极简模式（热销 & 推荐） */
+	.hot-products .product-spec,
+	.hot-products .manufacturer,
+	.hot-products .original-price,
+	.hot-products .cart-text,
+	.hot-products .sales-info,
+	.hot-products .product-action, /* 隐藏热销区加购按钮 */
+	.smart-recommend .product-specification,
+	.smart-recommend .product-rating,
+	.smart-recommend .original-price,
+	.smart-recommend .product-actions /* 隐藏推荐区加购按钮 */
+	{
+		display: none;
+	}
+	
+	.hot-products .product-info,
+	.smart-recommend .product-details {
+		padding: 6px; /* 极小内边距 */
+	}
+	
+	.hot-products .product-image,
+	.hot-products .product-image-container,
+	.smart-recommend .product-image,
+	.smart-recommend .product-image-container {
+		height: 110px; /* 进一步减小图片高度 */
+	}
+	
+	.hot-products .product-name,
+	.smart-recommend .product-title {
+		margin-bottom: 2px;
+		font-size: 12px;
+		line-height: 1.3;
+		height: 32px; /* 限制2行高度 */
+	}
+	
+	.hot-products .price-section,
+	.smart-recommend .price-section {
+		margin-bottom: 0;
+		margin-top: 4px;
+	}
+	
+	.hot-products .price-symbol,
+	.smart-recommend .price-symbol {
+		font-size: 10px;
+		color: #FF5722;
+	}
+	
+	.hot-products .price-value,
+	.smart-recommend .price-value {
+		font-size: 14px; /* 字体变小 */
+		font-weight: 600;
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(4, 1fr); /* 家庭常备药也调整为一行4个 */
+		gap: 8px;
+	}
+	
+	.family-item {
+		padding: 8px 4px;
+		background: #f8f9fa;
+	}
+	
+	.family-icon {
+		width: 36px;
+		height: 36px;
+		border-radius: 18px;
+		margin-bottom: 6px;
+	}
+	
+	.family-icon text {
+		font-size: 18px;
+	}
+	
+	.family-name {
+		font-size: 11px;
+	}
+	
+	.family-desc {
+		display: none;
+	}
+	
+	.news-swiper {
+		height: 160px;
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		gap: 8px;
+		justify-content: flex-start; /* 保持左对齐 */
+		overflow-x: auto; /* 允许横向滚动 */
+		flex-wrap: nowrap; /* 禁止换行 */
+		padding-bottom: 4px; /* 滚动条空间 */
+	}
+	
+	.sort-tab,
+	.filter-item {
+		padding: 5px 12px;
+		font-size: 12px;
+		flex-shrink: 0; /* 防止被压缩 */
+		min-width: auto;
+		flex: 0 0 auto; /* 取消均分 */
+	}
+	
+	.section-header {
+		flex-direction: column;
+		align-items: stretch;
+		gap: 12px;
+	}
+	
+	.title-section {
+		justify-content: center;
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		width: 100%;
+	}
+}
+
+/* 中屏手机/小平板 (415px-768px) */
+@media screen and (min-width: 415px) and (max-width: 768px) {
+	.search-container {
+		padding: 0 16px;
+		height: 44px;
+	}
+	
+	.main-scroll {
+		/* 移除 margin-top */
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 20px;
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		gap: 10px;
+		justify-content: flex-start;
+	}
+	
+	.sort-tab,
+	.filter-item {
+		padding: 6px 14px;
+		font-size: 12px;
+		flex-grow: 0;
+	}
+	
+	.section-header {
+		flex-direction: column;
+		align-items: stretch;
+		gap: 12px;
+	}
+	
+	.title-section {
+		justify-content: center;
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		width: 100%;
+		justify-content: center;
+	}
+}
+
+/* 平板设备 (769px-1024px) */
+@media screen and (min-width: 769px) and (max-width: 1024px) {
+	.search-container {
+		padding: 0 24px;
+		max-width: 100%;
+		height: 44px;
+	}
+	
+	.nav-search-tools .nav-tool-item {
+		display: none;
+	}
+	
+	.main-scroll {
+		max-width: 100%;
+		padding: 0 24px 20px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 240px;
+	}
+}
+
+/* 桌面端 (1025px以上) */
+@media screen and (min-width: 1025px) {
+	.search-container {
+		padding: 0 32px;
+		height: 44px;
+	}
+	
+	.main-scroll {
+		max-width: 100%;
+		padding: 0 32px 24px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(6, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 260px;
+	}
+}
+
+/* 大桌面端 (1400px以上) */
+@media screen and (min-width: 1400px) {
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+		gap: 24px;
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+}
+
+/* 暗黑模式适配 */
+@media (prefers-color-scheme: dark) {
+	.medic-home {
+		background: #121212;
+	}
+	
+	.smart-categories,
+	.health-news,
+	.smart-services,
+	.hot-products,
+	.family-medicine,
+	.smart-recommend {
+		background: #1e1e1e;
+		border-color: #333;
+	}
+	
+	.nav-search-box {
+		background: rgba(30, 30, 30, 0.95);
+		border-color: #444;
+	}
+	
+	.category-card,
+	.service-card,
+	.product-card,
+	.family-item,
+	.recommend-product {
+		background: #2d2d2d;
+		border-color: #444;
+	}
+	
+	.section-title,
+	.card-name,
+	.service-name,
+	.product-name,
+	.family-name,
+	.product-title,
+	.section-desc,
+	.card-desc,
+	.service-desc,
+	.product-spec,
+	.product-specification,
+	.family-desc {
+		color: #aaa;
+	}
+	
+	.sort-tab,
+	.filter-item {
+		background: #333;
+		border-color: #444;
+		color: #ccc;
+	}
+	
+	.sort-tab.active,
+	.filter-item.active {
+		background: #4CAF50;
+		color: white;
+	}
+	
+	.sort-tab:hover,
+	.filter-item:hover {
+		background: #444;
+	}
+	
+	.sort-tab.active:hover,
+	.filter-item.active:hover {
+		background: #388E3C;
+	}
+	
+	.nav-tool-item {
+		background: rgba(76, 175, 80, 0.2);
+		color: #4CAF50;
+	}
+	
+	.manufacturer,
+	.sales-count,
+	.reviews-count,
+	.original-price {
+		color: #888;
+	}
 }
 </style>
diff --git a/pages/mall/consumer/indexback.uvue b/pages/mall/consumer/indexback.uvue
new file mode 100644
index 00000000..f0cffee0
--- /dev/null
+++ b/pages/mall/consumer/indexback.uvue
@@ -0,0 +1,1540 @@
+<!-- pages/mall/consumer/index.uvue -->
+<template>
+	<view class="consumer-home">
+		<!-- 自定义顶部导航栏（简化版） -->
+		<view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-content">
+				<view class="location" @click="showCityPicker">
+					<text class="location-icon">📍</text>
+					<text class="location-text">{{ currentCity }}</text>
+					<text class="location-arrow">▼</text>
+				</view>
+				
+				<view class="nav-icons">
+					<view class="icon-item" @click="navigateToMessages">
+						<text class="icon">💬</text>
+						<text v-if="unreadMessageCount > 0" class="message-badge">{{ unreadMessageCount }}</text>
+					</view>
+					<view class="icon-item" @click="navigateToCart">
+						<text class="icon">🛒</text>
+						<text v-if="cartCount > 0" class="cart-badge">{{ cartCount }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主内容区 -->
+		<scroll-view 
+			scroll-y 
+			class="main-content"
+			:style="{ height: scrollViewHeight + 'px' }"
+			refresher-enabled
+			:refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh"
+			@scrolltolower="loadMore"
+			:show-scrollbar="false"
+		>
+			<!-- 商品分类区域 - 修复横向滚动 -->
+			<view class="category-section">
+				<scroll-view 
+					scroll-x 
+					class="category-scroll" 
+					:show-scrollbar="false"
+					:scroll-left="scrollLeft"
+					@scroll="onScroll"
+				>
+					<view class="category-container">
+						<view 
+							v-for="(category, index) in categoryList" 
+							:key="category.id"
+							:class="['category-item', { active: activeCategory === category.id }]"
+							@click="switchCategory(category.id, index)"
+						>
+							<view class="category-icon-wrapper">
+								<text class="category-icon">{{ category.icon }}</text>
+							</view>
+							<text class="category-name">{{ category.name }}</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<!-- 搜索栏 -->
+			<view class="search-section" @click="navigateToSearch">
+				<view class="search-container">
+					<view class="search-box">
+						<text class="search-icon">🔍</text>
+						<text class="search-placeholder">搜索商品/品牌/店铺</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 轮播图 -->
+			<view class="banner-section">
+				<swiper 
+					class="banner-swiper" 
+					:autoplay="true" 
+					:interval="4000" 
+					:duration="500"
+					:circular="true"
+					:indicator-dots="true"
+					indicator-color="rgba(255,255,255,0.6)"
+					indicator-active-color="#ff5000"
+				>
+					<swiper-item v-for="(banner, index) in bannerList" :key="banner.id">
+						<image 
+							class="banner-image" 
+							:src="banner.image_url" 
+							mode="aspectFill"
+						/>
+					</swiper-item>
+				</swiper>
+			</view>
+
+			<!-- 快捷入口 -->
+			<view class="quick-actions">
+				<view class="action-item" @click="navigateToFlashSale">
+					<view class="action-icon flash">⚡</view>
+					<text class="action-text">限时秒杀</text>
+				</view>
+				<view class="action-item" @click="navigateToCoupons">
+					<view class="action-icon coupon">🎫</view>
+					<text class="action-text">领券中心</text>
+				</view>
+				<view class="action-item" @click="navigateToDailyDeals">
+					<view class="action-icon daily">🔥</view>
+					<text class="action-text">每日特价</text>
+				</view>
+				<view class="action-item" @click="navigateToBrand">
+					<view class="action-icon brand">🏷️</view>
+					<text class="action-text">品牌特卖</text>
+				</view>
+			</view>
+
+			<!-- 限时秒杀 -->
+			<view class="flash-sale-section">
+				<view class="section-header">
+					
+				</view>
+				
+				<!-- 限时秒杀商品网格 -->
+				<view class="flash-grid">
+					<view 
+						v-for="(product, index) in flashSaleProducts" 
+						:key="index"
+						class="flash-product"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-image-wrapper">
+							<image 
+								class="product-image" 
+								:src="product.image" 
+								mode="aspectFill"
+							/>
+							<view v-if="product.tag" class="product-tag">{{ product.tag }}</view>
+						</view>
+						<view class="price-info">
+							<text class="flash-price">¥{{ product.price }}</text>
+							<text class="original-price">¥{{ product.original_price }}</text>
+							<view class="progress-container">
+								<view class="progress-bar">
+									<view class="progress-inner" :style="{ width: product.soldPercent + '%' }"></view>
+								</view>
+								<text class="sold-text">已抢{{ product.soldPercent }}%</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 为你推荐 - 瀑布流布局 -->
+			<view class="recommend-section">
+				<view class="section-header">
+					<view class="title-with-icon">
+						<text class="recommend-icon">❤️</text>
+						<text class="section-title">为你推荐</text>
+					</view>
+				</view>
+				
+				<!-- 瀑布流容器 -->
+				<view class="waterfall-container">
+					<!-- 左列 -->
+					<view class="waterfall-column left-column">
+						<view 
+							v-for="(product, index) in leftColumnProducts" 
+							:key="product.id"
+							class="product-card"
+							@click="navigateToProduct(product)"
+						>
+							<view class="product-image-wrapper">
+								<image 
+									class="product-image" 
+									:src="product.image" 
+									mode="widthFix"
+									lazy-load="true"
+								/>
+								<view v-if="product.tag" class="product-tag">{{ product.tag }}</view>
+							</view>
+							<view class="product-info">
+								<text class="product-title">{{ product.name }}</text>
+								<view class="price-section">
+									<view class="current-price">
+										<text class="price-symbol">¥</text>
+										<text class="price-value">{{ product.price }}</text>
+									</view>
+									<text v-if="product.original_price > product.price" class="original-price">
+										¥{{ product.original_price }}
+									</text>
+								</view>
+								<view class="product-meta">
+									<text class="sales-count">{{ product.sales }}人已买</text>
+									<view class="shop-info" v-if="product.shop">
+										<text class="shop-name">{{ product.shop }}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<!-- 右列 -->
+					<view class="waterfall-column right-column">
+						<view 
+							v-for="(product, index) in rightColumnProducts" 
+							:key="product.id"
+							class="product-card"
+							@click="navigateToProduct(product)"
+						>
+							<view class="product-image-wrapper">
+								<image 
+									class="product-image" 
+									:src="product.image" 
+									mode="widthFix"
+									lazy-load="true"
+								/>
+								<view v-if="product.tag" class="product-tag">{{ product.tag }}</view>
+							</view>
+							<view class="product-info">
+								<text class="product-title">{{ product.name }}</text>
+								<view class="price-section">
+									<view class="current-price">
+										<text class="price-symbol">¥</text>
+										<text class="price-value">{{ product.price }}</text>
+									</view>
+									<text v-if="product.original_price > product.price" class="original-price">
+										¥{{ product.original_price }}
+									</text>
+								</view>
+								<view class="product-meta">
+									<text class="sales-count">{{ product.sales }}人已买</text>
+									<view class="shop-info" v-if="product.shop">
+										<text class="shop-name">{{ product.shop }}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 加载状态 -->
+				<view v-if="loading" class="loading-container">
+					<view class="loading-spinner"></view>
+					<text class="loading-text">加载中...</text>
+				</view>
+				
+				<view v-if="!hasMore && productList.length > 0" class="no-more">
+					<text>--- 我是有底线的 ---</text>
+				</view>
+			</view>
+			
+			<!-- 底部安全区域 -->
+			<view class="safe-area"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted, onUnmounted, computed } from 'vue'
+
+// 响应式数据
+const bannerList = ref<any[]>([])
+const categoryList = ref<any[]>([])
+const productList = ref<any[]>([])
+const flashSaleProducts = ref<any[]>([])
+const currentCity = ref<string>('北京市')
+const refreshing = ref<boolean>(false)
+const loading = ref<boolean>(false)
+const hasMore = ref<boolean>(true)
+const page = ref<number>(1)
+const activeCategory = ref<string>('1')
+const activeSort = ref<string>('recommend')
+const statusBarHeight = ref<number>(0)
+const scrollViewHeight = ref<number>(0)
+const scrollLeft = ref<number>(0)
+const cartCount = ref<number>(0)
+const unreadMessageCount = ref<number>(3)
+
+// 倒计时数据
+const countdown = reactive({
+	hours: '02',
+	minutes: '30',
+	seconds: '15'
+})
+
+// 排序选项
+const sortOptions = [
+	{ id: 'recommend', name: '推荐' },
+	{ id: 'new', name: '新品' },
+	{ id: 'hot', name: '热销' },
+	{ id: 'priceAsc', name: '价格↑' },
+	{ id: 'priceDesc', name: '价格↓' }
+]
+
+// 计算瀑布流列数据
+const leftColumnProducts = computed(() => {
+	return productList.value.filter((_, index) => index % 2 === 0)
+})
+
+const rightColumnProducts = computed(() => {
+	return productList.value.filter((_, index) => index % 2 === 1)
+})
+
+// Mock 数据
+const mockData = {
+	banners: [
+		{
+			id: '1',
+			title: '双11狂欢购',
+			image_url: 'https://picsum.photos/750/350?random=1'
+		},
+		{
+			id: '2',
+			title: '品牌品质日',
+			image_url: 'https://picsum.photos/750/350?random=2'
+		},
+		{
+			id: '3',
+			title: '新人专享礼',
+			image_url: 'https://picsum.photos/750/350?random=3'
+		}
+	],
+	
+	categories: [
+		{ id: '1', name: '推荐', icon: '⭐' },
+		{ id: '2', name: '女装', icon: '👗' },
+		{ id: '3', name: '男装', icon: '👔' },
+		{ id: '4', name: '鞋靴', icon: '👠' },
+		{ id: '5', name: '箱包', icon: '👜' },
+		{ id: '6', name: '美妆', icon: '💄' },
+		{ id: '7', name: '数码', icon: '📱' },
+		{ id: '8', name: '家电', icon: '📺' },
+		{ id: '9', name: '家居', icon: '🏠' },
+		{ id: '10', name: '母婴', icon: '👶' },
+		{ id: '11', name: '食品', icon: '🍎' },
+		{ id: '12', name: '运动', icon: '⚽' },
+		{ id: '13', name: '汽车', icon: '🚗' },
+		{ id: '14', name: '百货', icon: '🛒' },
+		{ id: '15', name: '图书', icon: '📚' },
+		{ id: '16', name: '玩具', icon: '🧸' },
+		{ id: '17', name: '珠宝', icon: '💎' },
+		{ id: '18', name: '手表', icon: '⌚' },
+		{ id: '19', name: '宠物', icon: '🐶' },
+		{ id: '20', name: '文具', icon: '✏️' }
+	],
+	
+	flashSaleProducts: [
+		{
+			id: '1001',
+			name: '无线蓝牙耳机',
+			price: 299,
+			original_price: 599,
+			image: 'https://picsum.photos/200/200?random=1',
+			sales: 150,
+			soldPercent: 75,
+			tag: '秒杀'
+		},
+		{
+			id: '1002',
+			name: '运动T恤',
+			price: 79,
+			original_price: 159,
+			image: 'https://picsum.photos/200/200?random=2',
+			sales: 200,
+			soldPercent: 80,
+			tag: '爆款'
+		},
+		{
+			id: '1003',
+			name: '智能手环',
+			price: 199,
+			original_price: 299,
+			image: 'https://picsum.photos/200/200?random=3',
+			sales: 180,
+			soldPercent: 60,
+			tag: '新品'
+		},
+		{
+			id: '1004',
+			name: '电动牙刷',
+			price: 89,
+			original_price: 159,
+			image: 'https://picsum.photos/200/200?random=4',
+			sales: 250,
+			soldPercent: 90,
+			tag: '热卖'
+		},
+		{
+			id: '1005',
+			name: '保温杯',
+			price: 49,
+			original_price: 99,
+			image: 'https://picsum.photos/200/200?random=5',
+			sales: 300,
+			soldPercent: 85,
+			tag: '秒杀'
+		},
+		{
+			id: '1006',
+			name: '智能手表',
+			price: 399,
+			original_price: 599,
+			image: 'https://picsum.photos/200/200?random=6',
+			sales: 180,
+			soldPercent: 70,
+			tag: '爆款'
+		},
+		{
+			id: '1007',
+			name: '运动鞋',
+			price: 199,
+			original_price: 299,
+			image: 'https://picsum.photos/200/200?random=7',
+			sales: 220,
+			soldPercent: 80,
+			tag: '热卖'
+		},
+		{
+			id: '1008',
+			name: '保温饭盒',
+			price: 89,
+			original_price: 129,
+			image: 'https://picsum.photos/200/200?random=8',
+			sales: 190,
+			soldPercent: 75,
+			tag: '新品'
+		}
+	],
+	
+	products: [
+		{
+			id: '2001',
+			name: '智能手机 5G全网通 大内存',
+			price: 3999,
+			original_price: 4999,
+			image: 'https://picsum.photos/300/400?random=6',
+			sales: 500,
+			shop: '官方旗舰店',
+			tag: '官方'
+		},
+		{
+			id: '2002',
+			name: '笔记本电脑 轻薄本 学生办公',
+			price: 5999,
+			original_price: 6999,
+			image: 'https://picsum.photos/300/300?random=7',
+			sales: 300,
+			shop: '品牌专卖店',
+			tag: '折扣'
+		},
+		{
+			id: '2003',
+			name: '运动鞋 透气舒适跑步鞋',
+			price: 299,
+			original_price: 499,
+			image: 'https://picsum.photos/300/500?random=8',
+			sales: 800,
+			shop: '运动专营店'
+		},
+		{
+			id: '2004',
+			name: '电饭煲 智能预约多功能',
+			price: 399,
+			original_price: 599,
+			image: 'https://picsum.photos/300/350?random=9',
+			sales: 450,
+			shop: '家电旗舰店',
+			tag: '热卖'
+		},
+		{
+			id: '2005',
+			name: '护肤品套装 保湿补水',
+			price: 299,
+			original_price: 399,
+			image: 'https://picsum.photos/300/450?random=10',
+			sales: 600,
+			shop: '美妆官方店'
+		},
+		{
+			id: '2006',
+			name: '儿童玩具积木益智',
+			price: 199,
+			original_price: 299,
+			image: 'https://picsum.photos/300/320?random=11',
+			sales: 350,
+			shop: '母婴专营店',
+			tag: '新品'
+		},
+		{
+			id: '2007',
+			name: '智能手表 心率监测',
+			price: 899,
+			original_price: 1299,
+			image: 'https://picsum.photos/300/380?random=12',
+			sales: 280,
+			shop: '数码旗舰店'
+		},
+		{
+			id: '2008',
+			name: '羽绒服 冬季保暖',
+			price: 499,
+			original_price: 899,
+			image: 'https://picsum.photos/300/420?random=13',
+			sales: 420,
+			shop: '服装旗舰店',
+			tag: '爆款'
+		}
+	]
+}
+
+// 生命周期
+onMounted(() => {
+	// 获取状态栏高度
+	const systemInfo = uni.getSystemInfoSync()
+	statusBarHeight.value = systemInfo.statusBarHeight || 0
+	
+	// 计算滚动区域高度
+	const windowHeight = systemInfo.windowHeight
+	const tabBarHeight = 50 // 假设tabBar高度为50px
+	scrollViewHeight.value = windowHeight - statusBarHeight.value - tabBarHeight
+	
+	// 加载数据
+	loadMockData()
+	setupCountdown()
+	
+	// 模拟获取购物车数量和未读消息数
+	cartCount.value = Math.floor(Math.random() * 5) + 1
+})
+
+onUnmounted(() => {
+	// 清理定时器
+	if (countdownTimer.value !== null) {
+		clearInterval(countdownTimer.value)
+	}
+})
+
+// 加载Mock数据
+const loadMockData = () => {
+    bannerList.value = mockData.banners || []
+    categoryList.value = mockData.categories || []
+    flashSaleProducts.value = mockData.flashSaleProducts || []
+    productList.value = mockData.products || []
+}
+
+// 倒计时定时器
+const countdownTimer = ref<any>(null)
+const setupCountdown = () => {
+	countdownTimer.value = setInterval(() => {
+		let hours = parseInt(countdown.hours)
+		let minutes = parseInt(countdown.minutes)
+		let seconds = parseInt(countdown.seconds)
+		
+		seconds--
+		if (seconds < 0) {
+			seconds = 59
+			minutes--
+			if (minutes < 0) {
+				minutes = 59
+				hours--
+				if (hours < 0) {
+					// 重置倒计时
+					hours = 2
+					minutes = 30
+					seconds = 15
+				}
+			}
+		}
+		
+		countdown.hours = hours.toString().padStart(2, '0')
+		countdown.minutes = minutes.toString().padStart(2, '0')
+		countdown.seconds = seconds.toString().padStart(2, '0')
+	}, 1000)
+}
+
+// 事件处理函数
+const showCityPicker = () => {
+	uni.showActionSheet({
+		itemList: ['北京市', '上海市', '广州市', '深圳市', '其他城市'],
+		success: (res) => {
+			const cities = ['北京市', '上海市', '广州市', '深圳市', '其他城市']
+			currentCity.value = cities[res.tapIndex]
+		}
+	})
+}
+
+// 切换商品分类
+const switchCategory = (categoryId: string, index: number) => {
+	activeCategory.value = categoryId
+	
+	// 这里可以添加根据分类筛选商品的逻辑
+	console.log('切换到分类:', categoryId)
+	
+	// 滚动到选中的分类
+	const itemWidth = 80 // 每个分类项的宽度（包括margin）
+	scrollLeft.value = index * itemWidth
+}
+
+const switchSort = (sortId: string) => {
+	activeSort.value = sortId
+	// 这里可以添加根据排序方式筛选商品的逻辑
+}
+
+// 滚动事件
+const onScroll = (e: any) => {
+	scrollLeft.value = e.detail.scrollLeft
+}
+
+// 下拉刷新
+const onRefresh = () => {
+	refreshing.value = true
+	setTimeout(() => {
+		loadMockData()
+		refreshing.value = false
+		uni.showToast({
+			title: '刷新成功',
+			icon: 'success'
+		})
+	}, 1000)
+}
+
+// 上拉加载更多
+const loadMore = () => {
+	if (!loading.value && hasMore.value) {
+		loading.value = true
+		setTimeout(() => {
+			// 模拟加载更多数据
+			const newProducts = [...mockData.products].map((item, index) => ({
+				...item,
+				id: `300${index}`,
+				price: item.price + Math.floor(Math.random() * 100)
+			}))
+			productList.value = [...productList.value, ...newProducts]
+			loading.value = false
+			hasMore.value = productList.value.length < 20 // 假设最多显示20个商品
+		}, 1500)
+	}
+}
+
+// 导航函数 - 修改消息为跳转到消息tab页
+const navigateToSearch = () => uni.navigateTo({ url: '/pages/mall/consumer/search' })
+const navigateToCategory = (category?: any) => {
+	if (category) {
+		uni.navigateTo({ url: `/pages/mall/consumer/category?id=${category.id}&name=${category.name}` })
+	} else {
+		uni.switchTab({ url: '/pages/mall/consumer/category' })
+	}
+}
+const navigateToProduct = (product: any) => {
+	uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${product.id}` })
+}
+const navigateToCoupons = () => uni.navigateTo({ url: '/pages/mall/consumer/coupons' })
+const navigateToMessages = () => uni.switchTab({ url: '/pages/mall/consumer/messages' })
+const navigateToFlashSale = () => uni.navigateTo({ url: '/pages/mall/consumer/flash-sale' })
+const navigateToBrand = () => uni.navigateTo({ url: '/pages/mall/consumer/brand' })
+const navigateToCart = () => uni.switchTab({ url: '/pages/mall/consumer/cart' })
+const navigateToDailyDeals = () => uni.navigateTo({ url: '/pages/mall/consumer/daily-deals' })
+const navigateToGroupBuy = () => uni.navigateTo({ url: '/pages/mall/consumer/group-buy' })
+</script>
+
+<style>
+/* 重置默认样式 - 确保不受全局样式影响 */
+.consumer-home * {
+	box-sizing: border-box;
+	margin: 0;
+	padding: 0;
+}
+
+.consumer-home {
+	width: 100%;
+	min-height: 100vh;
+	background: #f5f5f5;
+	display: flex;
+	flex-direction: column;
+	position: relative;
+}
+
+/* 自定义导航栏 - 简化版 */
+.custom-navbar {
+	background: #ff5000;
+	width: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 1000;
+}
+
+.nav-content {
+	height: 44px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 15px;
+	color: white;
+}
+
+.location {
+	display: flex;
+	align-items: center;
+	flex-shrink: 0;
+	padding: 5px 10px;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 15px;
+}
+
+.location-icon {
+	font-size: 14px;
+	margin-right: 4px;
+}
+
+.location-text {
+	font-size: 14px;
+	font-weight: bold;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 60px;
+}
+
+.location-arrow {
+	font-size: 10px;
+	margin-left: 4px;
+	color: rgba(255, 255, 255, 0.8);
+}
+
+.nav-icons {
+	display: flex;
+	align-items: center;
+	gap: 15px;
+}
+
+.icon-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 30px;
+	height: 30px;
+	position: relative;
+}
+
+.icon {
+	font-size: 20px;
+}
+
+.message-badge, .cart-badge {
+	position: absolute;
+	top: -5px;
+	right: -5px;
+	background: #ff3b30;
+	color: white;
+	font-size: 10px;
+	width: 16px;
+	height: 16px;
+	border-radius: 50%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+/* 主内容区 */
+.main-content {
+	background: #f5f5f5;
+	margin-top: 44px;
+	width: 100%;
+}
+
+/* 商品分类区域 - 修复横向滚动 */
+.category-section {
+	background: white;
+	width: 100%;
+	padding: 15px 0;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+	margin-bottom: 5px;
+	position: relative;
+	overflow: hidden;
+}
+
+/* 商品分类横向滚动区域 */
+.category-scroll {
+	white-space: nowrap;
+	width: 100%;
+	overflow-x: auto;
+	-webkit-overflow-scrolling: touch;
+	height: 90px;
+}
+
+.category-container {
+	display: flex;
+	flex-direction: row;
+	padding: 10px 15px;
+}
+
+.category-item {
+	flex-shrink: 0;
+	margin-right: 15px;
+	width: 70px;
+	height: 70px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	transition: all 0.3s ease;
+	position: relative;
+}
+
+.category-item.active .category-icon-wrapper {
+	background: #ff5000;
+	transform: scale(1.1);
+	box-shadow: 0 4px 12px rgba(255, 80, 0, 0.3);
+}
+
+.category-item.active .category-icon {
+	color: white;
+}
+
+.category-item.active .category-name {
+	color: #ff5000;
+	font-weight: bold;
+}
+
+/* 添加活动指示器 */
+.category-item.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 50%;
+	transform: translateX(-50%);
+	width: 20px;
+	height: 3px;
+	background: #ff5000;
+	border-radius: 2px;
+}
+
+.category-icon-wrapper {
+	width: 48px;
+	height: 48px;
+	border-radius: 24px;
+	background: linear-gradient(135deg, #f5f5f5, #e8e8e8);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 6px;
+	transition: all 0.3s ease;
+}
+
+.category-icon {
+	font-size: 24px;
+	color: #666;
+	transition: all 0.3s ease;
+}
+
+.category-name {
+	font-size: 12px;
+	color: #333;
+	text-align: center;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 100%;
+	line-height: 1.2;
+	transition: all 0.3s ease;
+}
+
+/* 搜索栏 */
+.search-section {
+	background: white;
+	padding: 12px 15px;
+	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.search-container {
+	width: 100%;
+}
+
+.search-box {
+	background: #f5f5f5;
+	border-radius: 25px;
+	padding: 12px 20px;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 45px;
+	border: 1px solid #eee;
+}
+
+.search-icon {
+	color: #999;
+	margin-right: 10px;
+	font-size: 18px;
+}
+
+.search-placeholder {
+	color: #999;
+	font-size: 15px;
+	flex: 1;
+}
+
+/* 轮播图区域 */
+.banner-section {
+	background: white;
+	width: 100%;
+	overflow: hidden;
+	margin-top: 5px;
+}
+
+.banner-swiper {
+	height: 200px;
+	width: 100%;
+}
+
+.banner-image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+/* 快捷入口 - 横向排列 */
+.quick-actions {
+	background: white;
+	padding: 20px 0;
+	margin: 10px;
+	border-radius: 12px;
+	display: flex;
+	flex-direction: row;
+	justify-content: space-around;
+	align-items: center;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	width: calc(100% - 20px);
+}
+
+.action-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	width: 20%;
+	flex-shrink: 0;
+}
+
+.action-icon {
+	width: 48px;
+	height: 48px;
+	border-radius: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 22px;
+	margin-bottom: 8px;
+}
+
+.action-icon.flash {
+	background: linear-gradient(135deg, #ff3b30, #ff9500);
+	color: white;
+}
+
+.action-icon.coupon {
+	background: linear-gradient(135deg, #34c759, #30d158);
+	color: white;
+}
+
+.action-icon.daily {
+	background: linear-gradient(135deg, #ff9500, #ffcc00);
+	color: white;
+}
+
+.action-icon.brand {
+	background: linear-gradient(135deg, #af52de, #ff2d55);
+	color: white;
+}
+
+.action-icon.group {
+	background: linear-gradient(135deg, #007aff, #5856d6);
+	color: white;
+}
+
+.action-text {
+	font-size: 13px;
+	color: #333;
+	font-weight: 500;
+	text-align: center;
+	width: 100%;
+}
+
+/* 限时秒杀 - 新版横向布局 */
+.flash-sale-section {
+	background: linear-gradient(135deg, #fff0e8, #ffece6);
+	margin: 10px;
+	border-radius: 12px;
+	padding: 18px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	border: 1px solid #ffddd1;
+	width: calc(100% - 20px);
+}
+
+/* 限时秒杀头部 - 横向排列 */
+.section-header {
+	margin-bottom: 18px;
+	width: 100%;
+}
+
+.header-content {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 15px;
+}
+
+.title-with-icon {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	flex-shrink: 0;
+}
+
+.flash-icon, .recommend-icon {
+	color: #ff5000;
+	font-size: 20px;
+}
+
+.section-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #ff5000;
+	white-space: nowrap;
+}
+
+/* 倒计时样式调整 - 横向排列 */
+.countdown-wrapper {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	background: #ff5000;
+	padding: 6px 12px;
+	border-radius: 6px;
+	white-space: nowrap;
+	flex-shrink: 0;
+}
+
+.countdown-label {
+	font-size: 13px;
+	color: white;
+	font-weight: 500;
+}
+
+.time-box {
+	display: flex;
+	align-items: center;
+	gap: 3px;
+}
+
+.time {
+	background: white;
+	color: #ff5000;
+	padding: 4px 8px;
+	border-radius: 4px;
+	font-size: 14px;
+	min-width: 26px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.colon {
+	color: white;
+	font-size: 14px;
+	font-weight: bold;
+}
+
+.more-link {
+	display: flex;
+	align-items: center;
+	color: #999;
+	font-size: 14px;
+	white-space: nowrap;
+	flex-shrink: 0;
+}
+
+.more-link .arrow {
+	margin-left: 5px;
+	font-size: 18px;
+}
+
+/* 限时秒杀商品网格布局 */
+.flash-grid {
+	display: grid;
+	grid-template-columns: repeat(4, 1fr);
+	gap: 12px;
+	width: 100%;
+}
+
+.flash-product {
+	background: white;
+	border-radius: 10px;
+	overflow: hidden;
+	border: 1px solid #ffddd1;
+	box-shadow: 0 3px 10px rgba(255, 80, 0, 0.12);
+	transition: transform 0.2s ease, box-shadow 0.2s ease;
+}
+
+.flash-product:active {
+	transform: scale(0.98);
+	box-shadow: 0 2px 8px rgba(255, 80, 0, 0.2);
+}
+
+.product-image-wrapper {
+	position: relative;
+	width: 100%;
+	height: 0;
+	padding-bottom: 100%; /* 保持正方形 */
+	overflow: hidden;
+}
+
+.product-image {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.product-tag {
+	position: absolute;
+	top: 8px;
+	left: 8px;
+	background: #ff5000;
+	color: white;
+	font-size: 11px;
+	padding: 3px 10px;
+	border-radius: 12px;
+	font-weight: bold;
+	z-index: 1;
+}
+
+.price-info {
+	padding: 12px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.flash-price {
+	color: #ff5000;
+	font-size: 18px;
+	font-weight: bold;
+	text-align: center;
+	width: 100%;
+}
+
+.original-price {
+	color: #999;
+	font-size: 13px;
+	text-decoration: line-through;
+	margin: 6px 0;
+	text-align: center;
+	width: 100%;
+}
+
+.progress-container {
+	width: 100%;
+	margin-top: 8px;
+}
+
+.progress-bar {
+	width: 100%;
+	height: 8px;
+	background: #ffece6;
+	border-radius: 4px;
+	overflow: hidden;
+}
+
+.progress-inner {
+	height: 100%;
+	background: linear-gradient(90deg, #ff9500, #ff5000);
+	border-radius: 4px;
+}
+
+.sold-text {
+	font-size: 11px;
+	color: #ff5000;
+	text-align: center;
+	width: 100%;
+	margin-top: 4px;
+}
+
+/* 为你推荐 - 瀑布流布局 */
+.recommend-section {
+	background: white;
+	margin: 10px;
+	border-radius: 12px;
+	padding: 18px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	width: calc(100% - 20px);
+}
+
+/* 为你推荐头部 */
+.recommend-section .section-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 18px;
+}
+
+/* 排序选项 - 横向排列 */
+.sort-options {
+	display: flex;
+	gap: 15px;
+	align-items: center;
+	flex-wrap: nowrap;
+	overflow-x: auto;
+	padding-bottom: 5px;
+}
+
+.sort-option {
+	font-size: 14px;
+	color: #666;
+	padding: 5px 0;
+	position: relative;
+	white-space: nowrap;
+	flex-shrink: 0;
+}
+
+.sort-option.active {
+	color: #ff5000;
+	font-weight: bold;
+}
+
+.sort-option.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 2px;
+	background: #ff5000;
+	border-radius: 1px;
+}
+
+/* 瀑布流布局 */
+.waterfall-container {
+	display: flex;
+	justify-content: space-between;
+	gap: 12px;
+	width: 100%;
+	margin-top: 18px;
+}
+
+.waterfall-column {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+}
+
+.left-column {
+	margin-right: 6px;
+}
+
+.right-column {
+	margin-left: 6px;
+}
+
+.product-card {
+	background: white;
+	border-radius: 10px;
+	overflow: hidden;
+	box-shadow: 0 3px 12px rgba(0, 0, 0, 0.08);
+	width: 100%;
+}
+
+.product-image-wrapper {
+	position: relative;
+	width: 100%;
+	background: #f8f8f8;
+}
+
+.product-image {
+	width: 100%;
+	display: block;
+}
+
+.product-info {
+	padding: 15px;
+}
+
+.product-title {
+	font-size: 15px;
+	color: #333;
+	line-height: 1.4;
+	height: 42px;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	margin-bottom: 12px;
+	font-weight: 500;
+}
+
+.price-section {
+	display: flex;
+	align-items: baseline;
+	margin-bottom: 10px;
+}
+
+.current-price {
+	color: #ff5000;
+}
+
+.price-symbol {
+	font-size: 13px;
+}
+
+.price-value {
+	font-size: 20px;
+	font-weight: bold;
+}
+
+.original-price {
+	color: #999;
+	font-size: 13px;
+	text-decoration: line-through;
+	margin-left: 10px;
+}
+
+.product-meta {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	font-size: 13px;
+}
+
+.sales-count {
+	color: #999;
+}
+
+.shop-info {
+	display: flex;
+	align-items: center;
+}
+
+.shop-name {
+	color: #666;
+}
+
+/* 加载状态 */
+.loading-container {
+	padding: 30px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+}
+
+.loading-spinner {
+	width: 30px;
+	height: 30px;
+	border: 3px solid #f0f5ff;
+	border-top-color: #ff5000;
+	border-radius: 50%;
+	animation: spin 1s linear infinite;
+	margin-bottom: 10px;
+}
+
+@keyframes spin {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+	color: #999;
+	font-size: 14px;
+}
+
+.no-more {
+	text-align: center;
+	color: #999;
+	font-size: 13px;
+	padding: 30px 0;
+	border-top: 1px solid #f0f0f0;
+	margin-top: 10px;
+	width: 100%;
+}
+
+/* 安全区域 */
+.safe-area {
+	height: 20px;
+	width: 100%;
+}
+
+/* 为分类项添加点击反馈 */
+.category-item:active {
+	opacity: 0.7;
+	transform: scale(0.98);
+}
+
+/* 确保分类图标在点击时有更好的视觉效果 */
+.category-icon-wrapper:active {
+	transform: scale(0.95);
+}
+
+/* 响应式适配 */
+@media screen and (max-width: 320px) {
+	.category-item {
+		width: 65px;
+		margin-right: 12px;
+	}
+	
+	.flash-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 10px;
+	}
+	
+	/* 限时秒杀头部适配小屏幕 */
+	.header-content {
+		flex-wrap: wrap;
+		gap: 10px;
+	}
+	
+	.countdown-wrapper {
+		order: 3;
+		width: 100%;
+		justify-content: center;
+		margin-top: 5px;
+	}
+	
+	.more-link {
+		order: 2;
+	}
+	
+	.sort-options {
+		gap: 12px;
+		font-size: 13px;
+	}
+}
+
+@media screen and (min-width: 321px) and (max-width: 375px) {
+	.category-item {
+		width: 68px;
+		margin-right: 14px;
+	}
+	
+	.flash-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 12px;
+	}
+	
+	.header-content {
+		flex-wrap: wrap;
+		gap: 10px;
+	}
+	
+	.countdown-wrapper {
+		order: 3;
+		width: 100%;
+		justify-content: center;
+		margin-top: 5px;
+	}
+	
+	.more-link {
+		order: 2;
+	}
+	
+	.sort-options {
+		gap: 15px;
+		font-size: 14px;
+	}
+}
+
+@media screen and (min-width: 376px) and (max-width: 414px) {
+	.category-item {
+		width: 72px;
+		margin-right: 15px;
+	}
+	
+	.flash-grid {
+		grid-template-columns: repeat(3, 1fr);
+		gap: 12px;
+	}
+	
+	.header-content {
+		flex-wrap: nowrap;
+		gap: 15px;
+	}
+	
+	.countdown-wrapper {
+		order: unset;
+		width: auto;
+		justify-content: flex-start;
+		margin-top: 0;
+	}
+	
+	.more-link {
+		order: unset;
+	}
+	
+	.sort-options {
+		gap: 18px;
+		font-size: 14px;
+	}
+}
+
+@media screen and (min-width: 415px) {
+	.category-item {
+		width: 75px;
+		margin-right: 18px;
+	}
+	
+	.flash-grid {
+		grid-template-columns: repeat(4, 1fr);
+		gap: 15px;
+	}
+	
+	.header-content {
+		flex-wrap: nowrap;
+		gap: 20px;
+	}
+	
+	.sort-options {
+		gap: 20px;
+		font-size: 14px;
+	}
+}
+
+/* 针对平板设备的适配 */
+@media screen and (min-width: 768px) {
+	.flash-grid {
+		grid-template-columns: repeat(5, 1fr);
+		gap: 16px;
+	}
+	
+	.flash-product {
+		border-radius: 12px;
+	}
+	
+	.product-image-wrapper {
+		padding-bottom: 100%;
+	}
+	
+	.sort-options {
+		gap: 25px;
+		font-size: 15px;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/indexgood.uvue b/pages/mall/consumer/indexgood.uvue
new file mode 100644
index 00000000..f780dd9d
--- /dev/null
+++ b/pages/mall/consumer/indexgood.uvue
@@ -0,0 +1,2113 @@
+<!-- pages/mall/consumer/index.uvue -->
+<template>
+	<view class="medic-home">
+		<!-- 智能顶部导航栏 - 添加滚动隐藏效果 -->
+		<view 
+			class="smart-navbar" 
+			:style="{ 
+				paddingTop: statusBarHeight + 'px',
+				transform: showNavbar ? 'translateY(0)' : 'translateY(-100%)',
+				opacity: showNavbar ? 1 : 0
+			}"
+		>
+			<view class="nav-container">
+				<!-- 品牌标识区域 - 响应式显示 -->
+				<view class="brand-section">
+					<!-- 品牌标识 - 在电脑端和平板端显示，小屏幕隐藏 -->
+					<view class="brand-logo-area" :class="{ 'hidden-on-mobile': isMobile }">
+						<view class="brand-info">
+							<text class="brand-name">康乐医药商城</text>
+							<text class="brand-tag">官方认证·正品保障</text>
+						</view>
+					</view>
+					
+					<!-- 导航栏内搜索框 - 自适应平铺 -->
+					<view class="nav-search-container">
+						<view class="nav-search" @click="navigateToSearch">
+							<view class="nav-search-box">
+								<text class="nav-search-icon">🔍</text>
+								<!-- 小屏幕只显示搜索图标，隐藏搜索工具 -->
+								<view class="nav-search-tools" :class="{ 'hidden-on-mobile': isMobile }">
+									<text class="nav-tool-item">语音</text>
+									<text class="nav-tool-item">拍照</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 导航栏占位符 - 确保内容正确布局 -->
+		<view class="navbar-placeholder" :style="{ height: (statusBarHeight + 100) + 'px' }"></view>
+		
+		<!-- 主内容区 -->
+		<scroll-view 
+			scroll-y 
+			class="main-scroll"
+			:style="{ height: scrollHeight + 'px' }"
+			refresher-enabled
+			:refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh"
+			@scrolltolower="loadMore"
+			@scroll="handleScroll"
+		>
+			<!-- 智能健康卡片 -->
+			<view class="smart-health-card">
+				<view class="health-content">
+					<view class="health-header">
+						<text class="health-title">智能健康助手</text>
+						<text class="health-subtitle">根据您的健康数据推荐</text>
+					</view>
+					<view class="health-tips">
+						<text class="tip-item">💡 按时用药提醒</text>
+						<text class="tip-item">📋 健康记录跟踪</text>
+						<text class="tip-item">🩺 在线问诊咨询</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 智能分类网格 - 完全响应式 -->
+			<view class="smart-categories">
+				<view class="section-header">
+					<text class="section-title">智能分类</text>
+					<text class="section-desc">快速定位所需药品</text>
+				</view>
+				<view class="category-grid">
+					<view 
+						v-for="category in categories" 
+						:key="category.id"
+						class="category-card"
+						@click="switchCategory(category)"
+						:style="{ '--card-color': category.color }"
+					>
+						<view class="card-icon">
+							<text>{{ category.icon }}</text>
+						</view>
+						<text class="card-name">{{ category.name }}</text>
+						<text class="card-desc">{{ category.desc }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 健康资讯轮播 -->
+			<view class="health-news">
+				<view class="news-header">
+					<text class="news-title">健康资讯</text>
+					<text class="news-more" @click="navigateToNews">更多 ></text>
+				</view>
+				<swiper 
+					class="news-swiper"
+					:autoplay="true"
+					:interval="4000"
+					:duration="500"
+					:circular="true"
+					:indicator-dots="true"
+					indicator-color="rgba(255,255,255,0.3)"
+					indicator-active-color="#4CAF50"
+				>
+					<swiper-item 
+						v-for="news in healthNews" 
+						:key="news.id"
+						class="news-item"
+					>
+						<view class="news-content" @click="viewNewsDetail(news)">
+							<image 
+								class="news-image" 
+								:src="news.image" 
+								mode="aspectFill"
+							/>
+							<view class="news-overlay">
+								<text class="news-tag">{{ news.tag }}</text>
+								<text class="news-caption">{{ news.title }}</text>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+
+			<!-- 智能服务入口 -->
+			<view class="smart-services">
+				<view class="services-grid">
+					<view class="service-card" @click="navigateToConsultation">
+						<view class="service-icon" style="background: #2196F3;">
+							<text>👨‍⚕️</text>
+						</view>
+						<text class="service-name">在线问诊</text>
+						<text class="service-desc">三甲医生在线</text>
+					</view>
+					<view class="service-card" @click="navigateToPrescription">
+						<view class="service-icon" style="background: #4CAF50;">
+							<text>📋</text>
+						</view>
+						<text class="service-name">电子处方</text>
+						<text class="service-desc">医生开方购药</text>
+					</view>
+					<view class="service-card" @click="navigateToOTC">
+						<view class="service-icon" style="background: #FF9800;">
+							<text>💊</text>
+						</view>
+						<text class="service-name">非处方药</text>
+						<text class="service-desc">安全自主选购</text>
+					</view>
+					<view class="service-card" @click="navigateToHealthTools">
+						<view class="service-icon" style="background: #9C27B0;">
+							<text>🩺</text>
+						</view>
+						<text class="service-name">健康工具</text>
+						<text class="service-desc">健康管理助手</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 热销药品专区 -->
+			<view class="hot-products">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">🔥</text>
+						<text class="section-title">热销药品</text>
+					</view>
+					<view class="sort-tabs">
+						<text 
+							v-for="tab in sortTabs" 
+							:key="tab.id"
+							:class="['sort-tab', { active: activeSort === tab.id }]"
+							@click="switchSort(tab.id)"
+						>
+							{{ tab.name }}
+						</text>
+					</view>
+				</view>
+				
+				<view class="products-grid">
+					<view 
+						v-for="product in hotProducts" 
+						:key="product.id"
+						class="product-card"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-badge" v-if="product.badge">{{ product.badge }}</view>
+						<image 
+							class="product-image" 
+							:src="product.image" 
+							mode="aspectFill"
+						/>
+						<view class="product-info">
+							<text class="product-name">{{ product.name }}</text>
+							<text class="product-spec">{{ product.specification }}</text>
+							
+							<view class="price-section">
+								<view class="current-price">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<text class="original-price" v-if="product.originalPrice > product.price">
+									¥{{ product.originalPrice }}
+								</text>
+							</view>
+							
+							<view class="product-meta">
+								<text class="manufacturer">{{ product.manufacturer }}</text>
+								<view class="sales-info">
+									<text class="sales-count">已售{{ product.sales }}</text>
+								</view>
+							</view>
+							
+							<view class="product-action">
+								<view class="cart-btn" @click.stop="addToCart(product)">
+									<text class="cart-icon">+</text>
+									<text class="cart-text">加入购物车</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 家庭常备药 -->
+			<view class="family-medicine">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">🏠</text>
+						<text class="section-title">家庭常备药</text>
+					</view>
+					<text class="section-subtitle">守护全家健康</text>
+				</view>
+				
+				<view class="family-grid">
+					<view 
+						v-for="item in familyItems" 
+						:key="item.id"
+						class="family-item"
+						@click="navigateToCategory(item.categoryId)"
+					>
+						<view class="family-icon" :style="{ backgroundColor: item.color }">
+							<text>{{ item.icon }}</text>
+						</view>
+						<text class="family-name">{{ item.name }}</text>
+						<text class="family-desc">{{ item.desc }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 智能推荐 -->
+			<view class="smart-recommend">
+				<view class="section-header">
+					<view class="title-section">
+						<text class="section-icon">✨</text>
+						<text class="section-title">智能推荐</text>
+					</view>
+					<view class="recommend-filters">
+						<text 
+							v-for="filter in recommendFilters" 
+							:key="filter.id"
+							:class="['filter-item', { active: activeFilter === filter.id }]"
+							@click="switchFilter(filter.id)"
+						>
+							{{ filter.name }}
+						</text>
+					</view>
+				</view>
+				
+				<view class="recommend-grid">
+					<view 
+						v-for="product in recommendedProducts" 
+						:key="product.id"
+						class="recommend-product"
+						@click="navigateToProduct(product)"
+					>
+						<view class="product-image-container">
+							<image 
+								class="product-image" 
+								:src="product.image" 
+								mode="aspectFill"
+							/>
+							<view class="product-tags">
+								<text v-if="product.tag" class="product-tag">{{ product.tag }}</text>
+								<text v-if="product.featured" class="featured-tag">{{ product.featured }}</text>
+							</view>
+						</view>
+						
+						<view class="product-details">
+							<text class="product-title">{{ product.name }}</text>
+							<text class="product-specification">{{ product.specification }}</text>
+							
+							<view class="product-rating">
+								<view class="rating-stars">
+									<text class="star-icon">⭐</text>
+									<text class="rating-value">{{ product.rating }}</text>
+								</view>
+								<text class="reviews-count">{{ product.reviews }}条评价</text>
+							</view>
+							
+							<view class="price-section">
+								<view class="current-price">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<text class="original-price" v-if="product.originalPrice > product.price">
+									¥{{ product.originalPrice }}
+								</text>
+							</view>
+							
+							<view class="product-actions">
+								<view class="add-to-cart" @click.stop="addToCart(product)">
+									<text class="cart-icon">🛒</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 加载状态 -->
+				<view v-if="loading" class="loading-state">
+					<view class="loading-spinner"></view>
+					<text class="loading-text">加载中...</text>
+				</view>
+				
+				<view v-if="!hasMore && recommendedProducts.length > 0" class="no-more">
+					<text class="no-more-text">--- 已加载全部内容 ---</text>
+				</view>
+			</view>
+
+			<!-- 健康提醒 -->
+			<view class="health-reminder">
+				<view class="reminder-content">
+					<text class="reminder-icon">⏰</text>
+					<view class="reminder-text">
+						<text class="reminder-title">健康提醒</text>
+						<text class="reminder-desc">您有1个待用药提醒，点击查看详情</text>
+					</view>
+					<view class="reminder-action" @click="navigateToReminders">
+						<text class="action-text">查看</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 底部安全区域 -->
+			<view class="safe-area"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted } from 'vue'
+
+// 响应式数据
+const statusBarHeight = ref(0)
+const scrollHeight = ref(0)
+const refreshing = ref(false)
+const loading = ref(false)
+const hasMore = ref(true)
+const activeSort = ref('sales')
+const activeFilter = ref('recommend')
+const currentPage = ref(1)
+
+// 屏幕尺寸检测
+const isMobile = ref(false)
+
+// 导航栏显示控制
+const showNavbar = ref(true)
+const lastScrollTop = ref(0)
+const scrollThreshold = 30 // 降低滚动阈值，使其更灵敏
+const scrollingUp = ref(false)
+
+// 分类数据
+const categories = [
+	{ id: 'cold', name: '感冒发烧', icon: '🤧', desc: '解热镇痛', color: '#2196F3' },
+	{ id: 'stomach', name: '肠胃用药', icon: '🤢', desc: '消化系统', color: '#4CAF50' },
+	{ id: 'pain', name: '止痛消炎', icon: '💊', desc: '镇痛消炎', color: '#F44336' },
+	{ id: 'skin', name: '皮肤用药', icon: '🤕', desc: '皮肤护理', color: '#9C27B0' },
+	{ id: 'vitamin', name: '维生素', icon: '🍊', desc: '营养补充', color: '#FF9800' },
+	{ id: 'chronic', name: '慢性病', icon: '🫀', desc: '长期管理', color: '#795548' },
+	{ id: 'child', name: '儿童用药', icon: '👶', desc: '儿童专用', color: '#00BCD4' },
+	{ id: 'external', name: '外用药品', icon: '🧴', desc: '外用制剂', color: '#8BC34A' },
+	{ id: 'device', name: '医疗器械', icon: '🩺', desc: '医疗设备', color: '#607D8B' },
+	{ id: 'health', name: '健康食品', icon: '🥗', desc: '保健食品', color: '#FFC107' }
+]
+
+// 排序标签
+const sortTabs = [
+	{ id: 'sales', name: '销量' },
+	{ id: 'price', name: '价格' },
+	{ id: 'new', name: '新品' },
+	{ id: 'recommend', name: '推荐' }
+]
+
+// 推荐筛选器
+const recommendFilters = [
+	{ id: 'recommend', name: '智能推荐' },
+	{ id: 'hot', name: '热门商品' },
+	{ id: 'discount', name: '限时优惠' },
+	{ id: 'quality', name: '品质优选' }
+]
+
+// 健康资讯
+const healthNews = [
+	{
+		id: 'news1',
+		title: '秋季流感预防指南，科学防护健康过冬',
+		tag: '健康科普',
+		image: 'https://picsum.photos/800/400?random=health1'
+	},
+	{
+		id: 'news2',
+		title: '家庭常备药清单，为家人健康保驾护航',
+		tag: '家庭用药',
+		image: 'https://picsum.photos/800/400?random=health2'
+	},
+	{
+		id: 'news3',
+		title: '慢性病科学管理，提高生活质量',
+		tag: '健康管理',
+		image: 'https://picsum.photos/800/400?random=health3'
+	}
+]
+
+// 热销药品
+const hotProducts = [
+	{
+		id: 'hot1',
+		name: '布洛芬缓释胶囊',
+		specification: '0.3g*24粒',
+		price: 18.5,
+		originalPrice: 25.8,
+		image: 'https://picsum.photos/300/300?random=medicine1',
+		manufacturer: '修正药业',
+		sales: 2560,
+		badge: '热销'
+	},
+	{
+		id: 'hot2',
+		name: '板蓝根颗粒',
+		specification: '10g*20袋',
+		price: 22.8,
+		originalPrice: 29.9,
+		image: 'https://picsum.photos/300/300?random=medicine2',
+		manufacturer: '白云山',
+		sales: 1890,
+		badge: '推荐'
+	},
+	{
+		id: 'hot3',
+		name: '维生素C片',
+		specification: '100mg*100片',
+		price: 15.9,
+		originalPrice: 19.9,
+		image: 'https://picsum.photos/300/300?random=medicine3',
+		manufacturer: '养生堂',
+		sales: 1420,
+		badge: '特价'
+	},
+	{
+		id: 'hot4',
+		name: '胃康灵胶囊',
+		specification: '0.4g*24粒',
+		price: 32.8,
+		originalPrice: 38.5,
+		image: 'https://picsum.photos/300/300?random=medicine4',
+		manufacturer: '三九医药',
+		sales: 890,
+		badge: '新品'
+	}
+]
+
+// 家庭常备药
+const familyItems = [
+	{
+		id: 'family1',
+		name: '创可贴',
+		desc: '伤口护理',
+		icon: '🩹',
+		color: '#FF5722',
+		categoryId: 'external'
+	},
+	{
+		id: 'family2',
+		name: '体温计',
+		desc: '健康监测',
+		icon: '🌡️',
+		color: '#2196F3',
+		categoryId: 'device'
+	},
+	{
+		id: 'family3',
+		name: '消毒酒精',
+		desc: '环境消毒',
+		icon: '🧪',
+		color: '#4CAF50',
+		categoryId: 'external'
+	},
+	{
+		id: 'family4',
+		name: '口罩',
+		desc: '日常防护',
+		icon: '😷',
+		color: '#607D8B',
+		categoryId: 'device'
+	},
+	{
+		id: 'family5',
+		name: '退热贴',
+		desc: '物理降温',
+		icon: '🧊',
+		color: '#00BCD4',
+		categoryId: 'cold'
+	},
+	{
+		id: 'family6',
+		name: '棉签纱布',
+		desc: '伤口处理',
+		icon: '🩹',
+		color: '#FF9800',
+		categoryId: 'external'
+	}
+]
+
+// 推荐商品
+const recommendedProducts = [
+	{
+		id: 'rec1',
+		name: '阿莫西林胶囊',
+		specification: '0.25g*24粒',
+		price: 28.5,
+		originalPrice: 35.0,
+		image: 'https://picsum.photos/350/350?random=rec1',
+		rating: 4.8,
+		reviews: 156,
+		tag: '处方药',
+		featured: '医生推荐'
+	},
+	{
+		id: 'rec2',
+		name: '连花清瘟胶囊',
+		specification: '0.35g*36粒',
+		price: 42.8,
+		originalPrice: 48.0,
+		image: 'https://picsum.photos/350/350?random=rec2',
+		rating: 4.9,
+		reviews: 289,
+		tag: '中成药',
+		featured: '热销爆款'
+	},
+	{
+		id: 'rec3',
+		name: '盐酸氨溴索口服液',
+		specification: '100ml',
+		price: 35.9,
+		originalPrice: 42.0,
+		image: 'https://picsum.photos/350/350?random=rec3',
+		rating: 4.7,
+		reviews: 132,
+		tag: '止咳化痰',
+		featured: '家庭必备'
+	},
+	{
+		id: 'rec4',
+		name: '氯雷他定片',
+		specification: '10mg*6片',
+		price: 18.6,
+		originalPrice: 22.0,
+		image: 'https://picsum.photos/350/350?random=rec4',
+		rating: 4.6,
+		reviews: 98,
+		tag: '抗过敏',
+		featured: '季节必备'
+	}
+]
+
+// 生命周期
+onMounted(() => {
+	initPage()
+})
+
+// 页面显示时重置状态
+onShow(() => {
+	console.log('=== index页面onShow被调用 ===')
+	console.log('主页重新显示，重置页面状态')
+	
+	// 重置导航栏显示状态
+	showNavbar.value = true
+	lastScrollTop.value = 0
+	
+	// 重置滚动位置到顶部
+	// 注意：这里不能直接操作scroll-view的滚动位置
+	// 但可以重置一些页面状态
+	
+	// 注意：这里不再清除selectedCategory
+	// 让分类页面在成功读取后自行清除
+	// 这样可以确保分类页面能正确读取到传递的数据
+	
+	console.log('=== index页面onShow执行完成 ===')
+})
+
+// 初始化页面
+const initPage = () => {
+	const systemInfo = uni.getSystemInfoSync()
+	statusBarHeight.value = systemInfo.statusBarHeight || 0
+	
+	// 计算滚动区域高度 - 使用整个窗口高度
+	const windowHeight = systemInfo.windowHeight
+	scrollHeight.value = windowHeight
+	
+	// 检测屏幕尺寸
+	const screenWidth = systemInfo.screenWidth || systemInfo.windowWidth
+	isMobile.value = screenWidth < 768 // 小于768px为小屏幕
+}
+
+// 处理滚动事件
+const handleScroll = (event: any) => {
+	const scrollTop = event.detail.scrollTop
+	const currentTime = Date.now()
+	
+	// 判断滚动方向
+	if (scrollTop > lastScrollTop.value) {
+		// 向下滚动
+		scrollingUp.value = false
+		// 向下滚动超过阈值时隐藏导航栏
+		if (scrollTop > scrollThreshold && showNavbar.value) {
+			showNavbar.value = false
+		}
+	} else if (scrollTop < lastScrollTop.value) {
+		// 向上滚动
+		scrollingUp.value = true
+		// 向上滚动时显示导航栏
+		if (!showNavbar.value) {
+			showNavbar.value = true
+		}
+	}
+	
+	// 滚动到顶部时强制显示导航栏
+	if (scrollTop <= 10) {
+		showNavbar.value = true
+	}
+	
+	lastScrollTop.value = scrollTop
+	
+	// 调试信息（开发时可启用）
+	// console.log(`Scroll: ${scrollTop}, ShowNavbar: ${showNavbar.value}, ScrollingUp: ${scrollingUp.value}`)
+}
+
+// 重置导航栏显示状态（例如点击回到顶部时）
+const resetNavbar = () => {
+	showNavbar.value = true
+	lastScrollTop.value = 0
+}
+
+// 切换分类 - 跳转到分类页面并传递分类ID
+const switchCategory = (category: any) => {
+	console.log('=== switchCategory函数开始执行 ===')
+	console.log('分类ID:', category.id, '分类名称:', category.name)
+	
+	// 清除可能存在的旧数据
+	uni.removeStorageSync('selectedCategory')
+	
+	// 生成唯一的时间戳和随机参数，确保每次跳转都是新的页面
+	const timestamp = Date.now()
+	const randomParam = Math.random().toString(36).substring(2, 8)
+	
+	// 构建带参数的URL，直接通过URL传递分类信息
+	const url = `/pages/mall/consumer/category?categoryId=${category.id}&name=${encodeURIComponent(category.name)}&timestamp=${timestamp}&random=${randomParam}`
+	
+	console.log('跳转URL:', url)
+	console.log('分类ID参数:', category.id)
+	console.log('时间戳:', timestamp)
+	console.log('随机参数:', randomParam)
+	
+	// 使用uni.reLaunch跳转到分类页面，关闭所有页面并打开新页面
+	// 这样可以确保每次跳转都是全新的页面实例，避免页面缓存问题
+	// 虽然这会关闭当前主页，但可以确保分类页面总是重新加载
+	uni.reLaunch({
+		url: url,
+		success: () => {
+			console.log('✅ 使用reLaunch跳转到分类页面成功')
+			console.log('=== switchCategory函数执行完成 ===')
+		},
+		fail: (err) => {
+			console.error('❌ 跳转到分类页面失败:', err)
+			console.log('=== switchCategory函数执行完成 ===')
+		}
+	})
+}
+
+// 切换排序
+const switchSort = (sortId: string) => {
+	activeSort.value = sortId
+	// 这里可以添加排序逻辑
+}
+
+// 切换筛选器
+const switchFilter = (filterId: string) => {
+	activeFilter.value = filterId
+	// 这里可以添加筛选逻辑
+}
+
+// 查看新闻详情
+const viewNewsDetail = (news: any) => {
+	uni.navigateTo({
+		url: `/pages/news/detail?id=${news.id}`
+	})
+}
+
+// 下拉刷新
+const onRefresh = () => {
+	refreshing.value = true
+	setTimeout(() => {
+		refreshing.value = false
+		uni.showToast({
+			title: '刷新成功',
+			icon: 'success'
+		})
+	}, 1500)
+}
+
+// 加载更多
+const loadMore = () => {
+	if (loading.value || !hasMore.value) return
+	
+	loading.value = true
+	setTimeout(() => {
+		// 模拟加载更多数据
+		const newProducts = [...recommendedProducts].map((item, index) => ({
+			...item,
+			id: `new${index}`,
+			price: Math.floor(item.price * 0.9 + Math.random() * 10)
+		}))
+		
+		// 实际项目中应该合并数据
+		loading.value = false
+		hasMore.value = recommendedProducts.length < 20
+		
+		uni.showToast({
+			title: '加载完成',
+			icon: 'success'
+		})
+	}, 2000)
+}
+
+// 添加到购物车
+const addToCart = (product: any) => {
+	uni.showToast({
+		title: '已添加到购物车',
+		icon: 'success'
+	})
+}
+
+// 导航函数
+const navigateToSearch = () => uni.navigateTo({ url: '/pages/mall/consumer/search' })
+const navigateToNews = () => uni.navigateTo({ url: '/pages/news/list' })
+const navigateToProduct = (product: any) => {
+	uni.navigateTo({
+		url: `/pages/medicine/detail?id=${product.id}`
+	})
+}
+const navigateToCategory = (categoryId: string) => {
+	uni.navigateTo({
+		url: `/pages/medicine/category?id=${categoryId}`
+	})
+}
+const navigateToConsultation = () => uni.navigateTo({ url: '/pages/medicine/consultation' })
+const navigateToPrescription = () => uni.navigateTo({ url: '/pages/medicine/prescription' })
+const navigateToOTC = () => uni.navigateTo({ url: '/pages/medicine/otc' })
+const navigateToHealthTools = () => uni.navigateTo({ url: '/pages/medicine/tools' })
+const navigateToReminders = () => uni.navigateTo({ url: '/pages/user/reminders' })
+</script>
+
+<style>
+/* 全局重置 */
+.medic-home * {
+	box-sizing: border-box;
+	margin: 0;
+	padding: 0;
+}
+
+.medic-home {
+	width: 100%;
+	min-height: 100vh;
+	background: #f8fafc;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', sans-serif;
+	line-height: 1.5;
+	display: flex;
+	flex-direction: column;
+}
+
+/* 智能导航栏 - 重新设计布局 */
+.smart-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+	z-index: 1000;
+	box-shadow: 0 2px 20px rgba(76, 175, 80, 0.15);
+	transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+	will-change: transform, opacity;
+	pointer-events: auto; /* 确保导航栏可以交互 */
+	backface-visibility: hidden; /* 改善动画性能 */
+	-webkit-backface-visibility: hidden;
+}
+
+.nav-container {
+	height: 100px; /* 增加导航栏高度 */
+	padding: 0 16px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	max-width: 1400px;
+	margin: 0 auto;
+	width: 100%;
+}
+
+/* 品牌区域 - 重新设计为自适应平铺 */
+.brand-section {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	gap: 20px;
+	flex-wrap: wrap;
+	justify-content: space-between;
+}
+
+/* 品牌标识区域 - 自适应平铺 */
+.brand-logo-area {
+	flex-shrink: 1;
+	min-width: 120px;
+	max-width: 200px;
+	display: flex;
+	align-items: center;
+	flex-grow: 0;
+}
+
+/* 小屏幕隐藏品牌标识 */
+.brand-logo-area.hidden-on-mobile {
+	display: none;
+}
+
+/* 小屏幕隐藏搜索工具 */
+.nav-search-tools.hidden-on-mobile {
+	display: none;
+}
+
+.brand-info {
+	display: flex;
+	flex-direction: column;
+}
+
+.brand-name {
+	font-size: 18px;
+	font-weight: bold;
+	color: white;
+	letter-spacing: 0.5px;
+}
+
+.brand-tag {
+	font-size: 11px;
+	color: rgba(255, 255, 255, 0.9);
+	margin-top: 2px;
+}
+
+/* 导航栏搜索框容器 - 自适应平铺 */
+.nav-search-container {
+	flex: 1;
+	min-width: 0; /* 允许缩小 */
+	max-width: 100%; /* 确保在小屏幕上不会溢出 */
+	flex-grow: 1;
+}
+
+.nav-search {
+	width: 100%;
+}
+
+.nav-search-box {
+	background: rgba(255, 255, 255, 0.95);
+	border-radius: 25px;
+	padding: 12px 20px;
+	display: flex;
+	align-items: center;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 2px solid transparent;
+	width: 100%;
+}
+
+.nav-search-box:hover {
+	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.15);
+	border-color: rgba(255, 255, 255, 0.3);
+}
+
+.nav-search-icon {
+	font-size: 18px;
+	color: #4CAF50;
+	margin-right: 12px;
+	flex-shrink: 0;
+}
+
+.nav-search-tools {
+	display: flex;
+	gap: 8px;
+	margin-left: 12px;
+	flex-shrink: 0;
+}
+
+.nav-tool-item {
+	font-size: 12px;
+	color: #4CAF50;
+	padding: 4px 10px;
+	background: rgba(76, 175, 80, 0.1);
+	border-radius: 12px;
+	white-space: nowrap;
+}
+
+/* 导航栏占位符 */
+.navbar-placeholder {
+	width: 100%;
+	flex-shrink: 0;
+}
+
+/* 主内容区域 */
+.main-scroll {
+	flex: 1;
+	padding: 16px;
+	max-width: 1400px;
+	margin-left: auto;
+	margin-right: auto;
+	width: 100%;
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch; /* 改善iOS滚动体验 */
+}
+
+/* 智能健康卡片 */
+.smart-health-card {
+	background: linear-gradient(135deg, #2196F3 0%, #1976D2 100%);
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	color: white;
+}
+
+.health-content {
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+}
+
+.health-header {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.health-title {
+	font-size: 20px;
+	font-weight: bold;
+}
+
+.health-subtitle {
+	font-size: 14px;
+	opacity: 0.9;
+}
+
+.health-tips {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 12px;
+	margin-top: 8px;
+}
+
+.tip-item {
+	font-size: 13px;
+	padding: 6px 12px;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 20px;
+	backdrop-filter: blur(10px);
+}
+
+/* 智能分类网格 */
+.smart-categories {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.section-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 20px;
+}
+
+.section-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.section-desc {
+	font-size: 14px;
+	color: #666;
+}
+
+/* 分类网格布局 */
+.category-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
+	gap: 16px;
+}
+
+.category-card {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 16px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid transparent;
+}
+
+.category-card:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+	border-color: var(--card-color, #4CAF50);
+}
+
+.card-icon {
+	width: 56px;
+	height: 56px;
+	border-radius: 28px;
+	background: var(--card-color, #4CAF50);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.card-icon text {
+	font-size: 24px;
+	color: white;
+}
+
+.card-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	text-align: center;
+}
+
+.card-desc {
+	font-size: 12px;
+	color: #666;
+	text-align: center;
+}
+
+/* 健康资讯 */
+.health-news {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.news-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 16px;
+}
+
+.news-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.news-more {
+	font-size: 14px;
+	color: #4CAF50;
+	cursor: pointer;
+}
+
+.news-swiper {
+	height: 200px;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.news-content {
+	position: relative;
+	height: 100%;
+	border-radius: 12px;
+	overflow: hidden;
+}
+
+.news-image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.news-overlay {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(to top, rgba(0, 0, 0, 0.8), transparent);
+	padding: 20px;
+	color: white;
+}
+
+.news-tag {
+	display: inline-block;
+	background: #4CAF50;
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-size: 12px;
+	font-weight: 500;
+	margin-bottom: 8px;
+}
+
+.news-caption {
+	font-size: 16px;
+	font-weight: 600;
+	display: block;
+	line-height: 1.4;
+}
+
+/* 智能服务 */
+.smart-services {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.services-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+	gap: 20px;
+}
+
+.service-card {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 20px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.service-card:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.service-icon {
+	width: 60px;
+	height: 60px;
+	border-radius: 30px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.service-icon text {
+	font-size: 28px;
+	color: white;
+}
+
+.service-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+}
+
+.service-desc {
+	font-size: 12px;
+	color: #666;
+}
+
+/* 热销药品 */
+.hot-products {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.title-section {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.section-icon {
+	font-size: 20px;
+	color: #4CAF50;
+}
+
+.sort-tabs {
+	display: flex;
+	gap: 12px;
+	align-items: center;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+}
+
+.sort-tab {
+	font-size: 13px;
+	color: #666;
+	padding: 6px 16px;
+	border-radius: 20px;
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.2s ease;
+	white-space: nowrap;
+	flex-shrink: 0;
+	flex-grow: 0;
+}
+
+.sort-tab.active {
+	background: #4CAF50;
+	color: white;
+	border-color: #4CAF50;
+}
+
+.sort-tab:hover {
+	background: #f5f5f5;
+}
+
+.sort-tab.active:hover {
+	background: #388E3C;
+}
+
+/* 产品网格 */
+.products-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+	gap: 20px;
+	margin-top: 20px;
+}
+
+.product-card {
+	background: #f8f9fa;
+	border-radius: 12px;
+	overflow: hidden;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid #e0e0e0;
+	position: relative;
+}
+
+.product-card:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-badge {
+	position: absolute;
+	top: 12px;
+	left: 12px;
+	background: #FF5722;
+	color: white;
+	font-size: 11px;
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-weight: 600;
+	z-index: 2;
+}
+
+.product-image {
+	width: 100%;
+	height: 160px;
+	object-fit: cover;
+	background: white;
+}
+
+.product-info {
+	padding: 16px;
+}
+
+.product-name {
+	font-size: 15px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	display: block;
+	line-height: 1.4;
+}
+
+.product-spec {
+	font-size: 13px;
+	color: #666;
+	margin-bottom: 12px;
+	display: block;
+}
+
+.price-section {
+	display: flex;
+	align-items: baseline;
+	gap: 8px;
+	margin-bottom: 12px;
+}
+
+.current-price {
+	display: flex;
+	align-items: baseline;
+}
+
+.price-symbol {
+	font-size: 14px;
+	color: #FF5722;
+}
+
+.price-value {
+	font-size: 20px;
+	font-weight: bold;
+	color: #FF5722;
+	margin-left: 2px;
+}
+
+.original-price {
+	font-size: 13px;
+	color: #999;
+	text-decoration: line-through;
+}
+
+.product-meta {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	font-size: 12px;
+	margin-bottom: 12px;
+}
+
+.manufacturer {
+	color: #666;
+}
+
+.sales-count {
+	color: #999;
+}
+
+.product-action {
+	margin-top: 12px;
+}
+
+.cart-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+	background: #4CAF50;
+	color: white;
+	padding: 8px 12px;
+	border-radius: 8px;
+	font-size: 13px;
+	font-weight: 500;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.cart-btn:hover {
+	background: #388E3C;
+}
+
+.cart-icon {
+	font-size: 14px;
+}
+
+.cart-text {
+	font-size: 13px;
+}
+
+/* 家庭常备药 */
+.family-medicine {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.section-subtitle {
+	font-size: 14px;
+	color: #666;
+	margin-left: 12px;
+}
+
+.family-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
+	gap: 16px;
+	margin-top: 20px;
+}
+
+.family-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 16px;
+	background: #f8f9fa;
+	border-radius: 12px;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.family-item:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.family-icon {
+	width: 48px;
+	height: 48px;
+	border-radius: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 12px;
+}
+
+.family-icon text {
+	font-size: 20px;
+	color: white;
+}
+
+.family-name {
+	font-size: 14px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+}
+
+.family-desc {
+	font-size: 12px;
+	color: #666;
+}
+
+/* 智能推荐 */
+.smart-recommend {
+	background: white;
+	border-radius: 16px;
+	padding: 20px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.recommend-filters {
+	display: flex;
+	gap: 12px;
+	align-items: center;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+}
+
+.filter-item {
+	font-size: 13px;
+	color: #666;
+	padding: 6px 16px;
+	border-radius: 20px;
+	border: 1px solid #e0e0e0;
+	cursor: pointer;
+	transition: all 0.2s ease;
+	white-space: nowrap;
+	flex-shrink: 0;
+	flex-grow: 0;
+}
+
+.filter-item.active {
+	background: #4CAF50;
+	color: white;
+	border-color: #4CAF50;
+}
+
+.filter-item:hover {
+	background: #f5f5f5;
+}
+
+.filter-item.active:hover {
+	background: #388E3C;
+}
+
+.recommend-grid {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+	gap: 20px;
+	margin-top: 20px;
+}
+
+.recommend-product {
+	background: #f8f9fa;
+	border-radius: 12px;
+	overflow: hidden;
+	cursor: pointer;
+	transition: all 0.3s ease;
+	border: 1px solid #e0e0e0;
+}
+
+.recommend-product:hover {
+	transform: translateY(-4px);
+	box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+}
+
+.product-image-container {
+	position: relative;
+	height: 180px;
+}
+
+.product-image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	background: white;
+}
+
+.product-tags {
+	position: absolute;
+	top: 12px;
+	left: 12px;
+	display: flex;
+	gap: 8px;
+}
+
+.product-tag, .featured-tag {
+	padding: 4px 10px;
+	border-radius: 10px;
+	font-size: 11px;
+	font-weight: 600;
+	color: white;
+}
+
+.product-tag {
+	background: rgba(76, 175, 80, 0.9);
+}
+
+.featured-tag {
+	background: rgba(255, 87, 34, 0.9);
+}
+
+.product-details {
+	padding: 16px;
+}
+
+.product-title {
+	font-size: 16px;
+	font-weight: 600;
+	color: #333;
+	margin-bottom: 4px;
+	display: block;
+	line-height: 1.4;
+}
+
+.product-specification {
+	font-size: 13px;
+	color: #666;
+	margin-bottom: 12px;
+	display: block;
+}
+
+.product-rating {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-bottom: 12px;
+	font-size: 13px;
+}
+
+.rating-stars {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.star-icon {
+	font-size: 14px;
+	color: #FFC107;
+}
+
+.rating-value {
+	font-weight: 600;
+	color: #333;
+}
+
+.reviews-count {
+	color: #666;
+}
+
+.product-actions {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 12px;
+}
+
+.add-to-cart {
+	width: 36px;
+	height: 36px;
+	border-radius: 18px;
+	background: #4CAF50;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.add-to-cart:hover {
+	background: #388E3C;
+	transform: scale(1.1);
+}
+
+.cart-icon {
+	font-size: 16px;
+	color: white;
+}
+
+/* 健康提醒 */
+.health-reminder {
+	background: linear-gradient(135deg, #FF9800 0%, #F57C00 100%);
+	border-radius: 16px;
+	padding: 16px 20px;
+	margin-bottom: 20px;
+	color: white;
+}
+
+.reminder-content {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+}
+
+.reminder-icon {
+	font-size: 24px;
+}
+
+.reminder-text {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.reminder-title {
+	font-size: 15px;
+	font-weight: 600;
+}
+
+.reminder-desc {
+	font-size: 13px;
+	opacity: 0.9;
+}
+
+.reminder-action {
+	padding: 6px 16px;
+	background: rgba(255, 255, 255, 0.2);
+	border-radius: 20px;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.reminder-action:hover {
+	background: rgba(255, 255, 255, 0.3);
+}
+
+.action-text {
+	font-size: 13px;
+	font-weight: 500;
+}
+
+/* 加载状态 */
+.loading-state {
+	padding: 40px 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.loading-spinner {
+	width: 32px;
+	height: 32px;
+	border: 3px solid #f0f0f0;
+	border-top-color: #4CAF50;
+	border-radius: 50%;
+	animation: spin 1s linear infinite;
+	margin-bottom: 12px;
+}
+
+@keyframes spin {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+	font-size: 14px;
+	color: #666;
+}
+
+.no-more {
+	padding: 30px 0;
+	text-align: center;
+	border-top: 1px solid #f0f0f0;
+	margin-top: 10px;
+}
+
+.no-more-text {
+	font-size: 13px;
+	color: #999;
+}
+
+/* 安全区域 */
+.safe-area {
+	height: 20px;
+	width: 100%;
+}
+
+/* ===== 响应式设计 ===== */
+
+/* 小屏手机 (小于414px) */
+@media screen and (max-width: 414px) {
+	.nav-container {
+		padding: 0 12px;
+		height: 90px;
+	}
+	
+	.brand-section {
+		flex-direction: column;
+		align-items: stretch;
+		gap: 12px;
+		justify-content: flex-start;
+	}
+	
+	.brand-logo-area {
+		min-width: auto;
+		max-width: 100%;
+		flex-shrink: 0;
+		width: 100%;
+		justify-content: center;
+	}
+	
+	.brand-info {
+		align-items: center;
+		text-align: center;
+	}
+	
+	.brand-name {
+		font-size: 16px;
+	}
+	
+	.brand-tag {
+		font-size: 10px;
+	}
+	
+	.nav-search-container {
+		flex: 1;
+		width: 100%;
+		flex-grow: 1;
+	}
+	
+	.nav-search-box {
+		padding: 10px 16px;
+	}
+	
+	.nav-search-tools {
+		display: none;
+	}
+	
+	.main-scroll {
+		padding: 12px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 12px;
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 16px;
+	}
+	
+	.products-grid {
+		grid-template-columns: 1fr;
+	}
+	
+	.recommend-grid {
+		grid-template-columns: 1fr;
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.news-swiper {
+		height: 160px;
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		gap: 8px;
+		justify-content: center;
+	}
+	
+	.sort-tab,
+	.filter-item {
+		padding: 5px 12px;
+		font-size: 12px;
+		flex-grow: 1;
+		text-align: center;
+		min-width: 60px;
+	}
+	
+	.section-header {
+		flex-direction: column;
+		align-items: stretch;
+		gap: 12px;
+	}
+	
+	.title-section {
+		justify-content: center;
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		width: 100%;
+	}
+}
+
+/* 中屏手机/小平板 (415px-768px) */
+@media screen and (min-width: 415px) and (max-width: 768px) {
+	.nav-container {
+		padding: 0 16px;
+		height: 95px;
+	}
+	
+	.brand-section {
+		flex-direction: row;
+		align-items: center;
+		gap: 15px;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+	}
+	
+	.brand-logo-area {
+		min-width: 140px;
+		max-width: 160px;
+		flex-shrink: 1;
+		flex-grow: 0;
+	}
+	
+	.brand-name {
+		font-size: 17px;
+	}
+	
+	.nav-search-container {
+		flex: 1;
+		min-width: 0;
+		flex-grow: 1;
+	}
+	
+	.nav-search-tools {
+		display: none;
+	}
+	
+	.main-scroll {
+		/* 移除 margin-top */
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(2, 1fr);
+		gap: 20px;
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		gap: 10px;
+		justify-content: flex-start;
+	}
+	
+	.sort-tab,
+	.filter-item {
+		padding: 6px 14px;
+		font-size: 12px;
+		flex-grow: 0;
+	}
+	
+	.section-header {
+		flex-direction: column;
+		align-items: stretch;
+		gap: 12px;
+	}
+	
+	.title-section {
+		justify-content: center;
+	}
+	
+	.sort-tabs,
+	.recommend-filters {
+		width: 100%;
+		justify-content: center;
+	}
+}
+
+/* 平板设备 (769px-1024px) */
+@media screen and (min-width: 769px) and (max-width: 1024px) {
+	.nav-container {
+		padding: 0 24px;
+		max-width: 100%;
+		height: 100px;
+	}
+	
+	.nav-search-tools .nav-tool-item {
+		display: none;
+	}
+	
+	.main-scroll {
+		max-width: 100%;
+		padding: 20px 24px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(2, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 240px;
+	}
+}
+
+/* 桌面端 (1025px以上) */
+@media screen and (min-width: 1025px) {
+	.nav-container {
+		padding: 0 32px;
+		height: 100px;
+	}
+	
+	.main-scroll {
+		padding: 24px 32px;
+	}
+	
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+	}
+	
+	.services-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.family-grid {
+		grid-template-columns: repeat(3, 1fr);
+	}
+	
+	.news-swiper {
+		height: 260px;
+	}
+}
+
+/* 大桌面端 (1400px以上) */
+@media screen and (min-width: 1400px) {
+	.category-grid {
+		grid-template-columns: repeat(5, 1fr);
+		gap: 24px;
+	}
+	
+	.products-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	.recommend-grid {
+		grid-template-columns: repeat(4, 1fr);
+	}
+}
+
+/* 暗黑模式适配 */
+@media (prefers-color-scheme: dark) {
+	.medic-home {
+		background: #121212;
+	}
+	
+	.smart-categories,
+	.health-news,
+	.smart-services,
+	.hot-products,
+	.family-medicine,
+	.smart-recommend {
+		background: #1e1e1e;
+		border-color: #333;
+	}
+	
+	.nav-search-box {
+		background: rgba(30, 30, 30, 0.95);
+		border-color: #444;
+	}
+	
+	.category-card,
+	.service-card,
+	.product-card,
+	.family-item,
+	.recommend-product {
+		background: #2d2d2d;
+		border-color: #444;
+	}
+	
+	.section-title,
+	.card-name,
+	.service-name,
+	.product-name,
+	.family-name,
+	.product-title,
+	.section-desc,
+	.card-desc,
+	.service-desc,
+	.product-spec,
+	.product-specification,
+	.family-desc {
+		color: #aaa;
+	}
+	
+	.sort-tab,
+	.filter-item {
+		background: #333;
+		border-color: #444;
+		color: #ccc;
+	}
+	
+	.sort-tab.active,
+	.filter-item.active {
+		background: #4CAF50;
+		color: white;
+	}
+	
+	.sort-tab:hover,
+	.filter-item:hover {
+		background: #444;
+	}
+	
+	.sort-tab.active:hover,
+	.filter-item.active:hover {
+		background: #388E3C;
+	}
+	
+	.nav-tool-item {
+		background: rgba(76, 175, 80, 0.2);
+		color: #4CAF50;
+	}
+	
+	.manufacturer,
+	.sales-count,
+	.reviews-count,
+	.original-price {
+		color: #888;
+	}
+}
+</style>
diff --git a/pages/mall/consumer/logistics.uvue b/pages/mall/consumer/logistics.uvue
new file mode 100644
index 00000000..0710effd
--- /dev/null
+++ b/pages/mall/consumer/logistics.uvue
@@ -0,0 +1,204 @@
+<template>
+  <view class="logistics-page">
+    <view class="logistics-header">
+      <view class="product-info">
+        <image class="product-image" :src="productImage" mode="aspectFill"></image>
+        <view class="info-right">
+          <text class="status-text">{{ logisticsStatus }}</text>
+          <text class="courier-name">{{ courierName }}: {{ trackingNo }}</text>
+          <text class="phone-text">官方电话: {{ courierPhone }}</text>
+        </view>
+      </view>
+    </view>
+
+    <view class="logistics-body">
+      <view class="track-list">
+        <view 
+          v-for="(item, index) in trackList" 
+          :key="index" 
+          class="track-item"
+          :class="{ first: index === 0 }"
+        >
+          <view class="node-icon">
+            <view class="dot"></view>
+            <view class="line" v-if="index !== trackList.length - 1"></view>
+          </view>
+          <view class="node-content">
+            <text class="track-desc">{{ item.desc }}</text>
+            <text class="track-time">{{ item.time }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+
+const orderId = ref('')
+const productImage = ref('/static/product1.jpg')
+const logisticsStatus = ref('运输中')
+const courierName = ref('顺丰速运')
+const courierPhone = ref('95338')
+const trackingNo = ref('SF1234567890')
+
+type TrackItem = {
+  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'
+  }
+])
+
+onMounted(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  const options = currentPage.options as any
+  if (options.orderId) {
+    orderId.value = options.orderId
+    // 这里可以根据orderId去请求真实的物流信息
+  }
+})
+</script>
+
+<style scoped>
+.logistics-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding-bottom: 20px;
+}
+
+.logistics-header {
+  background-color: #fff;
+  padding: 15px;
+  margin-bottom: 10px;
+}
+
+.product-info {
+  display: flex;
+  align-items: center;
+}
+
+.product-image {
+  width: 60px;
+  height: 60px;
+  border-radius: 4px;
+  margin-right: 15px;
+  background-color: #eee;
+}
+
+.info-right {
+  display: flex;
+  flex-direction: column;
+}
+
+.status-text {
+  font-size: 16px;
+  color: #ff5000;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
+.courier-name {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 2px;
+}
+
+.phone-text {
+  font-size: 12px;
+  color: #999;
+}
+
+.logistics-body {
+  background-color: #fff;
+  padding: 20px 15px;
+}
+
+.track-list {
+  display: flex;
+  flex-direction: column;
+}
+
+.track-item {
+  display: flex;
+  position: relative;
+  padding-bottom: 25px;
+}
+
+.track-item:last-child {
+  padding-bottom: 0;
+}
+
+.node-icon {
+  width: 20px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-right: 15px;
+}
+
+.dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: #ccc;
+  margin-top: 6px;
+  z-index: 1;
+}
+
+.first .dot {
+  background-color: #ff5000;
+  width: 12px;
+  height: 12px;
+  margin-top: 4px;
+  box-shadow: 0 0 0 4px rgba(255, 80, 0, 0.2);
+}
+
+.line {
+  width: 1px;
+  background-color: #eee;
+  flex: 1;
+  margin-top: 2px;
+}
+
+.node-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.track-desc {
+  font-size: 14px;
+  color: #333;
+  line-height: 1.5;
+  margin-bottom: 5px;
+}
+
+.first .track-desc {
+  color: #ff5000;
+  font-weight: bold;
+}
+
+.track-time {
+  font-size: 12px;
+  color: #999;
+}
+</style>
diff --git a/pages/mall/consumer/messages - 副本.uvue b/pages/mall/consumer/messages - 副本.uvue
new file mode 100644
index 00000000..a5e69b8b
--- /dev/null
+++ b/pages/mall/consumer/messages - 副本.uvue	
@@ -0,0 +1,634 @@
+<!-- pages/mall/consumer/messages.uvue -->
+<template>
+    <view class="messages-page">
+        <!-- 顶部标题栏 -->
+        <view class="messages-header">
+            <text class="header-title">消息</text>
+            <view class="header-actions">
+                <text class="action-icon" @click="clearAllUnread">📝</text>
+            </view>
+        </view>
+        
+        <!-- 消息分类标签 -->
+        <view class="message-tabs">
+            <view 
+                v-for="tab in messageTabs" 
+                :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.unread > 0" class="tab-badge">{{ tab.unread }}</text>
+            </view>
+        </view>
+        
+        <!-- 消息列表 -->
+        <scroll-view 
+            scroll-y 
+            class="messages-content"
+            refresher-enabled
+            :refresher-triggered="refreshing"
+            @refresherrefresh="onRefresh"
+        >
+            <!-- 系统通知 -->
+            <view v-if="activeTab === 'system'" class="message-section">
+                <view 
+                    v-for="message in systemMessages" 
+                    :key="message.id"
+                    :class="['message-item', { unread: !message.read }]"
+                    @click="viewSystemMessage(message)"
+                >
+                    <view class="message-icon-wrapper">
+                        <text class="message-icon">📢</text>
+                    </view>
+                    <view class="message-content">
+                        <view class="message-header">
+                            <text class="message-title">{{ message.title }}</text>
+                            <text class="message-time">{{ message.time }}</text>
+                        </view>
+                        <text class="message-preview">{{ message.content }}</text>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 订单消息 -->
+            <view v-if="activeTab === 'order'" class="message-section">
+                <view 
+                    v-for="message in orderMessages" 
+                    :key="message.id"
+                    :class="['message-item', { unread: !message.read }]"
+                    @click="viewOrderMessage(message)"
+                >
+                    <view class="message-icon-wrapper">
+                        <text class="message-icon">📦</text>
+                    </view>
+                    <view class="message-content">
+                        <view class="message-header">
+                            <text class="message-title">{{ message.title }}</text>
+                            <text class="message-time">{{ message.time }}</text>
+                        </view>
+                        <text class="message-preview">{{ message.content }}</text>
+                        <text class="order-info" v-if="message.order_no">订单号: {{ message.order_no }}</text>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 客服消息 -->
+            <view v-if="activeTab === 'service'" class="message-section">
+                <view 
+                    v-for="message in serviceMessages" 
+                    :key="message.id"
+                    :class="['message-item', { unread: !message.read }]"
+                    @click="startCustomerService(message)"
+                >
+                    <view class="message-icon-wrapper">
+                        <image 
+                            v-if="message.avatar" 
+                            class="message-avatar" 
+                            :src="message.avatar" 
+                            mode="aspectFill"
+                        />
+                        <text v-else class="message-icon">💁</text>
+                    </view>
+                    <view class="message-content">
+                        <view class="message-header">
+                            <text class="message-title">{{ message.title }}</text>
+                            <text class="message-time">{{ message.time }}</text>
+                        </view>
+                        <text class="message-preview">{{ message.content }}</text>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 优惠活动 -->
+            <view v-if="activeTab === 'promo'" class="message-section">
+                <view 
+                    v-for="message in promoMessages" 
+                    :key="message.id"
+                    :class="['message-item', { unread: !message.read }]"
+                    @click="viewPromoMessage(message)"
+                >
+                    <view class="message-icon-wrapper">
+                        <text class="message-icon">🎁</text>
+                    </view>
+                    <view class="message-content">
+                        <view class="message-header">
+                            <text class="message-title">{{ message.title }}</text>
+                            <text class="message-time">{{ message.time }}</text>
+                        </view>
+                        <text class="message-preview">{{ message.content }}</text>
+                        <view v-if="message.coupon" class="coupon-tag">
+                            <text class="coupon-text">{{ message.coupon }}优惠券</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 空状态 -->
+            <view v-if="!loading && currentMessages.length === 0" class="empty-messages">
+                <text class="empty-icon">💬</text>
+                <text class="empty-title">暂无消息</text>
+                <text class="empty-desc">暂时没有新消息</text>
+            </view>
+        </scroll-view>
+        
+        <!-- 底部固定按钮 -->
+        <view class="floating-action">
+            <button class="action-button" @click="contactCustomerService">
+                <text class="button-icon">💁</text>
+                <text class="button-text">联系客服</text>
+            </button>
+        </view>
+    </view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, computed, onMounted } from 'vue'
+
+// 响应式数据
+const activeTab = ref<string>('system')
+const refreshing = ref<boolean>(false)
+const loading = ref<boolean>(false)
+const unreadCount = ref<number>(5)
+
+// 消息分类标签
+const messageTabs = reactive([
+    { id: 'system', name: '系统通知', unread: 3 },
+    { id: 'order', name: '订单消息', unread: 2 },
+    { id: 'service', name: '客服消息', unread: 0 },
+    { id: 'promo', name: '优惠活动', unread: 1 }
+])
+
+// Mock 系统通知数据
+const systemMessages = reactive([
+    {
+        id: 'sys001',
+        title: '系统维护通知',
+        content: '平台将于今晚23:00-01:00进行系统维护，届时部分功能可能无法使用。',
+        time: '2023-11-23 15:30',
+        read: false,
+        type: 'system'
+    },
+    {
+        id: 'sys002',
+        title: '隐私政策更新',
+        content: '我们已更新隐私政策，请查阅相关条款。',
+        time: '2023-11-22 10:15',
+        read: true,
+        type: 'system'
+    },
+    {
+        id: 'sys003',
+        title: '账户安全提醒',
+        content: '检测到您的账户在异地登录，如果不是您本人操作，请及时修改密码。',
+        time: '2023-11-21 18:45',
+        read: false,
+        type: 'system'
+    }
+])
+
+// Mock 订单消息数据
+const orderMessages = reactive([
+    {
+        id: 'order001',
+        title: '订单发货通知',
+        content: '您的订单202311230001已发货，点击查看物流信息。',
+        time: '2023-11-23 14:20',
+        read: false,
+        type: 'order',
+        order_no: '202311230001'
+    },
+    {
+        id: 'order002',
+        title: '订单支付成功',
+        content: '您的订单202311220001支付成功，商家正在备货中。',
+        time: '2023-11-22 09:30',
+        read: false,
+        type: 'order',
+        order_no: '202311220001'
+    },
+    {
+        id: 'order003',
+        title: '订单确认收货',
+        content: '您的订单202311210001已完成，期待您的评价。',
+        time: '2023-11-21 16:15',
+        read: true,
+        type: 'order',
+        order_no: '202311210001'
+    }
+])
+
+// Mock 客服消息数据
+const serviceMessages = reactive([
+    {
+        id: 'service001',
+        title: '在线客服',
+        content: '您好，有什么可以帮助您的吗？',
+        time: '2023-11-23 10:05',
+        read: true,
+        type: 'service',
+        avatar: 'https://picsum.photos/50/50?random=1'
+    },
+    {
+        id: 'service002',
+        title: '售后客服',
+        content: '关于您申请的退款，已处理完成。',
+        time: '2023-11-22 15:20',
+        read: true,
+        type: 'service',
+        avatar: 'https://picsum.photos/50/50?random=2'
+    }
+])
+
+// Mock 优惠活动数据
+const promoMessages = reactive([
+    {
+        id: 'promo001',
+        title: '新人专享券',
+        content: '您有一张新人专享优惠券已到账，有效期3天。',
+        time: '2023-11-23 08:00',
+        read: false,
+        type: 'promo',
+        coupon: '50元'
+    },
+    {
+        id: 'promo002',
+        title: '双11大促',
+        content: '双11狂欢购物节，全场满300减50。',
+        time: '2023-11-22 12:30',
+        read: true,
+        type: 'promo',
+        coupon: '满300减50'
+    }
+])
+
+// 计算当前显示的消息
+const currentMessages = computed(() => {
+    switch (activeTab.value) {
+        case 'system': return systemMessages
+        case 'order': return orderMessages
+        case 'service': return serviceMessages
+        case 'promo': return promoMessages
+        default: return []
+    }
+})
+
+// 生命周期
+onMounted(() => {
+    loadMessages()
+})
+
+// 加载消息
+const loadMessages = () => {
+    loading.value = true
+    setTimeout(() => {
+        // 这里应该调用API获取消息数据
+        loading.value = false
+    }, 800)
+}
+
+// 切换标签
+const switchTab = (tabId: string) => {
+    activeTab.value = tabId
+}
+
+// 查看系统消息
+const viewSystemMessage = (message: any) => {
+    message.read = true
+    uni.navigateTo({
+        url: `/pages/mall/consumer/message-detail?id=${message.id}&type=system`
+    })
+}
+
+// 查看订单消息
+const viewOrderMessage = (message: any) => {
+    message.read = true
+    uni.navigateTo({
+        url: `/pages/mall/consumer/order-detail?id=${message.order_no}`
+    })
+}
+
+// 联系客服
+const startCustomerService = (message: any) => {
+    uni.navigateTo({
+        url: '/pages/mall/consumer/chat'
+    })
+}
+
+// 查看优惠活动
+const viewPromoMessage = (message: any) => {
+    message.read = true
+    uni.navigateTo({
+        url: `/pages/mall/consumer/coupons`
+    })
+}
+
+// 联系客服
+const contactCustomerService = () => {
+    uni.navigateTo({
+        url: '/pages/mall/consumer/chat'
+    })
+}
+
+// 清除所有未读
+const clearAllUnread = () => {
+    uni.showModal({
+        title: '确认操作',
+        content: '确定要标记所有消息为已读吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // 标记所有消息为已读
+                systemMessages.forEach(msg => msg.read = true)
+                orderMessages.forEach(msg => msg.read = true)
+                serviceMessages.forEach(msg => msg.read = true)
+                promoMessages.forEach(msg => msg.read = true)
+                
+                // 更新标签未读数
+                messageTabs.forEach(tab => tab.unread = 0)
+                
+                uni.showToast({
+                    title: '已标记所有消息为已读',
+                    icon: 'success'
+                })
+            }
+        }
+    })
+}
+
+// 下拉刷新
+const onRefresh = () => {
+    refreshing.value = true
+    setTimeout(() => {
+        loadMessages()
+        refreshing.value = false
+        uni.showToast({
+            title: '刷新成功',
+            icon: 'success'
+        })
+    }, 1000)
+}
+</script>
+
+<style>
+.messages-page {
+    width: 100%;
+    height: 100vh;
+    background-color: #f5f5f5;
+    display: flex;
+    flex-direction: column;
+}
+
+/* 头部 */
+.messages-header {
+    background-color: white;
+    padding: 15px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+}
+
+.header-title {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333;
+}
+
+.header-actions .action-icon {
+    font-size: 20px;
+    color: #666;
+}
+
+/* 消息分类标签 */
+.message-tabs {
+    background-color: white;
+    display: flex;
+    padding: 0 15px;
+    border-bottom: 1px solid #eee;
+}
+
+.tab-item {
+    flex: 1;
+    padding: 15px 5px;
+    text-align: center;
+    position: relative;
+    border-bottom: 2px solid transparent;
+}
+
+.tab-item.active {
+    color: #ff5000;
+    border-bottom-color: #ff5000;
+    font-weight: bold;
+}
+
+.tab-name {
+    font-size: 14px;
+}
+
+.tab-badge {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    background-color: #ff5000;
+    color: white;
+    font-size: 10px;
+    padding: 2px 6px;
+    border-radius: 10px;
+    min-width: 16px;
+    text-align: center;
+}
+
+/* 消息内容区 */
+.messages-content {
+    flex: 1;
+    padding-bottom: 80px; /* 为底部按钮留出空间 */
+}
+
+/* 消息项 */
+.message-section {
+    padding: 10px;
+}
+
+.message-item {
+    background-color: white;
+    border-radius: 10px;
+    padding: 15px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: flex-start;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.message-item.unread {
+    background-color: #fff8f6;
+    border-left: 3px solid #ff5000;
+}
+
+.message-icon-wrapper {
+    width: 50px;
+    height: 50px;
+    border-radius: 25px;
+    background-color: #f5f5f5;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 15px;
+    flex-shrink: 0;
+}
+
+.message-icon {
+    font-size: 24px;
+}
+
+.message-avatar {
+    width: 50px;
+    height: 50px;
+    border-radius: 25px;
+}
+
+.message-content {
+    flex: 1;
+}
+
+.message-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    margin-bottom: 8px;
+}
+
+.message-title {
+    font-size: 16px;
+    color: #333;
+    font-weight: bold;
+    flex: 1;
+    margin-right: 10px;
+}
+
+.message-time {
+    font-size: 12px;
+    color: #999;
+    white-space: nowrap;
+}
+
+.message-preview {
+    font-size: 14px;
+    color: #666;
+    line-height: 1.4;
+    margin-bottom: 8px;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+}
+
+.order-info {
+    font-size: 12px;
+    color: #ff5000;
+    background-color: #fff0e8;
+    padding: 3px 8px;
+    border-radius: 4px;
+    display: inline-block;
+}
+
+.coupon-tag {
+    display: inline-block;
+    background-color: #ff5000;
+    color: white;
+    font-size: 12px;
+    padding: 4px 10px;
+    border-radius: 12px;
+    margin-top: 5px;
+}
+
+.coupon-text {
+    font-size: 12px;
+}
+
+/* 空状态 */
+.empty-messages {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 80px 20px;
+    text-align: center;
+}
+
+.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;
+}
+
+/* 底部浮动按钮 */
+.floating-action {
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    z-index: 100;
+}
+
+.action-button {
+    background: linear-gradient(135deg, #ff5000, #ff9500);
+    color: white;
+    border: none;
+    border-radius: 25px;
+    padding: 12px 20px;
+    display: flex;
+    align-items: center;
+    box-shadow: 0 4px 12px rgba(255, 80, 0, 0.3);
+}
+
+.button-icon {
+    font-size: 18px;
+    margin-right: 8px;
+}
+
+.button-text {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+/* 响应式适配 */
+@media screen and (max-width: 320px) {
+    .tab-name {
+        font-size: 12px;
+    }
+    
+    .message-title {
+        font-size: 14px;
+    }
+    
+    .message-preview {
+        font-size: 13px;
+    }
+}
+
+@media screen and (min-width: 415px) {
+    .message-item {
+        padding: 20px;
+    }
+    
+    .message-icon-wrapper {
+        width: 60px;
+        height: 60px;
+        border-radius: 30px;
+    }
+    
+    .message-icon {
+        font-size: 28px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/messages.uvue b/pages/mall/consumer/messages.uvue
new file mode 100644
index 00000000..78a44cc8
--- /dev/null
+++ b/pages/mall/consumer/messages.uvue
@@ -0,0 +1,1330 @@
+<template>
+	<view class="messages-page">
+		<!-- 智能顶部导航栏 - 与主页保持一致 -->
+		<view class="smart-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-container">
+				<text class="nav-title">消息中心</text>
+				<view class="nav-actions">
+					<view class="action-btn" @click="clearAllUnread">
+						<text class="action-icon">🧹</text>
+						<text class="action-text">一键已读</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 导航栏占位符 -->
+		<view class="navbar-placeholder" :style="{ height: (statusBarHeight + 10) + 'px' }"></view>
+		
+		<!-- 消息分类标签 - 固定在顶部，方便随时切换 -->
+		<view class="tabs-container">
+			<view class="message-tabs">
+				<view 
+					v-for="tab in messageTabs" 
+					: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.unread > 0" class="tab-badge">{{ tab.unread > 99 ? '99+' : tab.unread }}</text>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 消息列表内容区 -->
+		<scroll-view 
+			scroll-y 
+			class="messages-content"
+			refresher-enabled
+			:refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh"
+			:scroll-top="scrollTop"
+		>
+
+			<!-- 客服消息 -->
+			<view v-if="activeTab === 'service'" class="message-section">
+				<!-- 在线客服卡片 -->
+				<view class="customer-service-info">
+					<view class="service-header">
+						<text class="service-title">康乐医药在线客服</text>
+						<text class="service-status online">在线</text>
+					</view>
+					<text class="service-desc">专业医药顾问在线解答，服务时间 9:00-22:00</text>
+					
+					<view class="service-categories">
+						<view class="category-item" @click="startQuickService('用药咨询')">
+							<text class="category-icon">💊</text>
+							<text class="category-name">用药咨询</text>
+						</view>
+						<view class="category-item" @click="startQuickService('处方咨询')">
+							<text class="category-icon">📋</text>
+							<text class="category-name">处方咨询</text>
+						</view>
+						<view class="category-item" @click="startQuickService('副作用咨询')">
+							<text class="category-icon">⚠️</text>
+							<text class="category-name">副作用咨询</text>
+						</view>
+						<view class="category-item" @click="startQuickService('药品配送')">
+							<text class="category-icon">🚚</text>
+							<text class="category-name">药品配送</text>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 客服消息列表 -->
+				<view 
+					v-for="message in serviceMessages" 
+					:key="message.id"
+					:class="['message-item', { unread: !message.read, active: message.active }]"
+					@click="startChatWithService(message)"
+				>
+					<view class="message-icon-wrapper">
+						<image 
+							v-if="message.avatar" 
+							class="message-avatar" 
+							:src="message.avatar" 
+							mode="aspectFill"
+						/>
+						<view v-else class="message-icon-default" :style="{ backgroundColor: message.color }">
+							<text>{{ message.icon }}</text>
+						</view>
+						<view v-if="message.online" class="online-dot"></view>
+					</view>
+					<view class="message-content">
+						<view class="message-header">
+							<view class="message-title-wrapper">
+								<text class="message-title">{{ message.title }}</text>
+								<text v-if="message.role" class="message-role">{{ message.role }}</text>
+							</view>
+							<view class="message-header-right">
+								<text class="message-time">{{ message.time }}</text>
+								<text v-if="message.unreadCount > 0" class="message-unread-count">{{ message.unreadCount }}</text>
+							</view>
+						</view>
+						<view class="message-preview-wrapper">
+							<text class="message-preview">{{ message.content }}</text>
+							<text v-if="message.lastMessage" class="last-message">{{ message.lastMessage }}</text>
+						</view>
+						<view v-if="message.tags" class="message-tags">
+							<text v-for="tag in message.tags" :key="tag" class="message-tag">{{ tag }}</text>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 客服系统提示 -->
+				<view class="service-tips">
+					<text class="tip-icon">💡</text>
+					<text class="tip-text">温馨提示：请勿相信任何要求转账、付款的信息，谨防诈骗</text>
+				</view>
+			</view>
+			
+			<!-- 系统通知 -->
+			<view v-if="activeTab === 'system'" class="message-section">
+				<view 
+					v-for="message in systemMessages" 
+					:key="message.id"
+					:class="['message-item', { unread: !message.read }]"
+					@click="viewSystemMessage(message)"
+				>
+					<view class="message-icon-wrapper">
+						<text class="message-icon">📢</text>
+					</view>
+					<view class="message-content">
+						<view class="message-header">
+							<text class="message-title">{{ message.title }}</text>
+							<text class="message-time">{{ message.time }}</text>
+						</view>
+						<text class="message-preview">{{ message.content }}</text>
+						<view v-if="message.important" class="important-tag">重要</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 订单消息 -->
+			<view v-if="activeTab === 'order'" class="message-section">
+				<view 
+					v-for="message in orderMessages" 
+					:key="message.id"
+					:class="['message-item', { unread: !message.read }]"
+					@click="viewOrderMessage(message)"
+				>
+					<view class="message-icon-wrapper">
+						<text class="message-icon">📦</text>
+					</view>
+					<view class="message-content">
+						<view class="message-header">
+							<text class="message-title">{{ message.title }}</text>
+							<text class="message-time">{{ message.time }}</text>
+						</view>
+						<text class="message-preview">{{ message.content }}</text>
+						<text class="order-info" v-if="message.order_no">订单号: {{ message.order_no }}</text>
+						<view v-if="message.status" class="order-status" :class="message.status">
+							{{ message.statusText }}
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 优惠活动 -->
+			<view v-if="activeTab === 'promo'" class="message-section">
+				<view 
+					v-for="message in promoMessages" 
+					:key="message.id"
+					:class="['message-item', { unread: !message.read }]"
+					@click="viewPromoMessage(message)"
+				>
+					<view class="message-icon-wrapper">
+						<text class="message-icon">🎁</text>
+					</view>
+					<view class="message-content">
+						<view class="message-header">
+							<text class="message-title">{{ message.title }}</text>
+							<text class="message-time">{{ message.time }}</text>
+						</view>
+						<text class="message-preview">{{ message.content }}</text>
+						<view v-if="message.coupon" class="coupon-info" @click.stop="claimCoupon(message)">
+							<text class="coupon-text">{{ message.coupon }}优惠券</text>
+							<text class="coupon-expiry">有效期至 {{ message.expiry }}</text>
+							<text class="coupon-action">{{ message.claimed ? '已领取' : '点击领取' }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 空状态 -->
+			<view v-if="!loading && currentMessages.length === 0 && activeTab !== 'service'" class="empty-messages">
+				<text class="empty-icon">💬</text>
+				<text class="empty-title">暂无消息</text>
+				<text class="empty-desc">暂时没有新消息</text>
+			</view>
+			
+			<!-- 底部安全区域 -->
+			<view class="safe-area"></view>
+		</scroll-view>
+		
+		<!-- 底部固定按钮 -->
+		<view class="floating-action">
+			<button class="action-button" @click="startNewChat">
+				<text class="button-icon">✏️</text>
+				<text class="button-text">新建聊天</text>
+			</button>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, computed, onMounted } from 'vue'
+
+// 响应式数据
+const activeTab = ref<string>('service')
+const refreshing = ref<boolean>(false)
+const loading = ref<boolean>(false)
+const unreadCount = ref<number>(12)
+const statusBarHeight = ref(0)
+const scrollTop = ref(0)
+
+// 初始化页面布局数据
+const initPage = () => {
+	const systemInfo = uni.getSystemInfoSync()
+	statusBarHeight.value = systemInfo.statusBarHeight || 0
+	
+	// 计算滚动区域高度：屏幕高度 - 状态栏 - 导航栏(44) - 标签栏(42)
+	const windowHeight = systemInfo.windowHeight
+	scrollHeight.value = windowHeight - statusBarHeight.value - 44 - 42
+}
+
+// 消息分类标签
+const messageTabs = reactive([
+	{ id: 'service', name: '客服消息', unread: 5 },
+	{ id: 'system', name: '系统通知', unread: 3 },
+	{ id: 'order', name: '订单消息', unread: 2 },
+	{ id: 'promo', name: '优惠活动', unread: 2 }
+])
+
+// Mock 客服消息数据
+const serviceMessages = reactive([
+	{
+		id: 'service001',
+		title: '康乐医药在线客服',
+		role: '官方客服',
+		content: '您好，我是康乐医药在线客服，有什么可以帮助您的吗？',
+		lastMessage: '请问有什么药品需要咨询？',
+		time: '刚刚',
+		read: false,
+		type: 'service',
+		avatar: 'https://picsum.photos/50/50?random=service1',
+		online: true,
+		unreadCount: 3,
+		tags: ['在线', '专业药师'],
+		icon: '👨‍⚕️',
+		color: '#4CAF50'
+	},
+	{
+		id: 'service002',
+		title: '处方药咨询',
+		role: '药师',
+		content: '关于您的处方药咨询，我们已经收到，请提供处方照片。',
+		lastMessage: '已收到您的处方，正在审核中...',
+		time: '10:30',
+		read: true,
+		type: 'service',
+		avatar: 'https://picsum.photos/50/50?random=service2',
+		online: true,
+		unreadCount: 0,
+		tags: ['处方药', '审核'],
+		icon: '💊',
+		color: '#2196F3'
+	},
+	{
+		id: 'service003',
+		title: '药品配送服务',
+		role: '配送客服',
+		content: '您的订单预计今天下午送达，请保持电话畅通。',
+		lastMessage: '配送员正在路上，预计30分钟内送达',
+		time: '09:45',
+		read: false,
+		type: 'service',
+		avatar: 'https://picsum.photos/50/50?random=service3',
+		online: true,
+		unreadCount: 1,
+		tags: ['配送中', '今日达'],
+		icon: '🚚',
+		color: '#FF9800'
+	},
+	{
+		id: 'service004',
+		title: '用药指导',
+		role: '临床药师',
+		content: '关于您咨询的药品服用方法，建议饭后半小时服用。',
+		lastMessage: '记得按时服药，如有不适及时联系',
+		time: '昨天',
+		read: true,
+		type: 'service',
+		avatar: 'https://picsum.photos/50/50?random=service4',
+		online: false,
+		unreadCount: 0,
+		tags: ['用药指导', '专业'],
+		icon: '📋',
+		color: '#9C27B0'
+	},
+	{
+		id: 'service005',
+		title: '售后服务中心',
+		role: '售后专员',
+		content: '您申请的药品退换货已受理，我们会尽快处理。',
+		lastMessage: '退款将在3-5个工作日内退回原账户',
+		time: '前天',
+		read: false,
+		type: 'service',
+		avatar: 'https://picsum.photos/50/50?random=service5',
+		online: true,
+		unreadCount: 2,
+		tags: ['售后', '退换货'],
+		icon: '🔄',
+		color: '#F44336'
+	}
+])
+
+// Mock 系统通知数据
+const systemMessages = reactive([
+	{
+		id: 'sys001',
+		title: '系统维护通知',
+		content: '平台将于今晚23:00-01:00进行系统维护，届时部分功能可能无法使用。',
+		time: '2023-11-23 15:30',
+		read: false,
+		type: 'system',
+		important: true
+	},
+	{
+		id: 'sys002',
+		title: '隐私政策更新',
+		content: '我们已更新隐私政策，请查阅相关条款。',
+		time: '2023-11-22 10:15',
+		read: true,
+		type: 'system',
+		important: false
+	},
+	{
+		id: 'sys003',
+		title: '账户安全提醒',
+		content: '检测到您的账户在异地登录，如果不是您本人操作，请及时修改密码。',
+		time: '2023-11-21 18:45',
+		read: false,
+		type: 'system',
+		important: true
+	}
+])
+
+// Mock 订单消息数据
+const orderMessages = reactive([
+	{
+		id: 'order001',
+		title: '订单发货通知',
+		content: '您的订单202311230001已发货，点击查看物流信息。',
+		time: '2023-11-23 14:20',
+		read: false,
+		type: 'order',
+		order_no: '202311230001',
+		status: 'shipping',
+		statusText: '配送中'
+	},
+	{
+		id: 'order002',
+		title: '订单支付成功',
+		content: '您的订单202311220001支付成功，商家正在备货中。',
+		time: '2023-11-22 09:30',
+		read: false,
+		type: 'order',
+		order_no: '202311220001',
+		status: 'processing',
+		statusText: '处理中'
+	},
+	{
+		id: 'order003',
+		title: '订单确认收货',
+		content: '您的订单202311210001已完成，期待您的评价。',
+		time: '2023-11-21 16:15',
+		read: true,
+		type: 'order',
+		order_no: '202311210001',
+		status: 'completed',
+		statusText: '已完成'
+	}
+])
+
+// Mock 优惠活动数据
+const promoMessages = reactive([
+	{
+		id: 'promo001',
+		title: '新人专享券',
+		content: '您有一张新人专享优惠券已到账，有效期3天。',
+		time: '2023-11-23 08:00',
+		read: false,
+		type: 'promo',
+		coupon: '50元',
+		expiry: '2023-11-26',
+		claimed: false
+	},
+	{
+		id: 'promo002',
+		title: '双11大促',
+		content: '双11狂欢购物节，全场满300减50。',
+		time: '2023-11-22 12:30',
+		read: true,
+		type: 'promo',
+		coupon: '满300减50',
+		expiry: '2023-11-30',
+		claimed: false
+	}
+])
+
+// 计算当前显示的消息
+const currentMessages = computed(() => {
+	switch (activeTab.value) {
+		case 'system': return systemMessages
+		case 'order': return orderMessages
+		case 'service': return serviceMessages
+		case 'promo': return promoMessages
+		default: return []
+	}
+})
+
+// 生命周期
+onMounted(() => {
+	initPage()
+	loadMessages()
+})
+
+// 加载消息
+const loadMessages = () => {
+	loading.value = true
+	setTimeout(() => {
+		// 模拟加载消息数据
+		updateUnreadCount()
+		loading.value = false
+	}, 800)
+}
+
+// 更新未读数量
+const updateUnreadCount = () => {
+	let totalUnread = 0
+	
+	const serviceUnread = serviceMessages.filter(msg => !msg.read).length
+	messageTabs[0].unread = serviceUnread
+	totalUnread += serviceUnread
+	
+	const systemUnread = systemMessages.filter(msg => !msg.read).length
+	messageTabs[1].unread = systemUnread
+	totalUnread += systemUnread
+	
+	const orderUnread = orderMessages.filter(msg => !msg.read).length
+	messageTabs[2].unread = orderUnread
+	totalUnread += orderUnread
+	
+	const promoUnread = promoMessages.filter(msg => !msg.read).length
+	messageTabs[3].unread = promoUnread
+	totalUnread += promoUnread
+	
+	unreadCount.value = totalUnread
+}
+
+// 切换标签
+const switchTab = (tabId: string) => {
+	activeTab.value = tabId
+	// 切换标签时回到顶部，使用微小变化触发滚动更新
+	scrollTop.value = scrollTop.value === 0 ? 0.01 : 0
+}
+
+// 开始与客服聊天
+const startChatWithService = (message: any) => {
+	message.read = true
+	message.unreadCount = 0
+	updateUnreadCount()
+	
+	uni.navigateTo({
+		url: `/pages/mall/consumer/chat?id=${message.id}&name=${encodeURIComponent(message.title)}&role=${encodeURIComponent(message.role)}`
+	})
+}
+
+// 快速开始服务
+const startQuickService = (category: string) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/chat?category=${encodeURIComponent(category)}`
+	})
+}
+
+// 新建聊天
+const startNewChat = () => {
+	uni.showActionSheet({
+		itemList: ['用药咨询', '处方咨询', '副作用咨询', '药品配送', '其他问题'],
+		success: (res) => {
+			const categories = ['用药咨询', '处方咨询', '副作用咨询', '药品配送', '其他问题']
+			const category = categories[res.tapIndex]
+			startQuickService(category)
+		}
+	})
+}
+
+// 查看系统消息
+const viewSystemMessage = (message: any) => {
+	message.read = true
+	updateUnreadCount()
+	uni.navigateTo({
+		url: `/pages/mall/consumer/message-detail?id=${message.id}&type=system`
+	})
+}
+
+// 查看订单消息
+const viewOrderMessage = (message: any) => {
+	message.read = true
+	updateUnreadCount()
+	uni.navigateTo({
+		url: `/pages/mall/consumer/order-detail?id=${message.order_no}`
+	})
+}
+
+// 查看优惠活动
+const viewPromoMessage = (message: any) => {
+	message.read = true
+	updateUnreadCount()
+	uni.navigateTo({
+		url: `/pages/mall/consumer/coupons`
+	})
+}
+
+// 领取优惠券
+const claimCoupon = (message: any) => {
+	if (message.claimed) {
+		uni.showToast({
+			title: '您已领取该优惠券',
+			icon: 'none'
+		})
+		return
+	}
+	
+	message.claimed = true
+	// 保存领取状态到本地存储，供个人页读取
+	const claimedCouponsCount = uni.getStorageSync('claimedCoupons') || 0
+	uni.setStorageSync('claimedCoupons', (claimedCouponsCount as number) + 1)
+	
+	// 保存详细的优惠券信息到 myCoupons 列表
+	const myCoupons = uni.getStorageSync('myCoupons')
+	let couponsList: any[] = []
+	if (myCoupons) {
+		try {
+			couponsList = JSON.parse(myCoupons as string) as any[]
+		} catch (e) {
+			console.error('Failed to parse myCoupons', e)
+		}
+	}
+	
+	couponsList.push({
+		title: message.title,
+		amount: message.coupon,
+		expiry: message.expiry,
+		id: message.id
+	})
+	uni.setStorageSync('myCoupons', JSON.stringify(couponsList))
+	
+	uni.showToast({
+		title: '领取成功',
+		icon: 'success'
+	})
+}
+
+// 清除所有未读
+const clearAllUnread = () => {
+	uni.showModal({
+		title: '确认操作',
+		content: '确定要标记所有消息为已读吗？',
+		success: (res) => {
+			if (res.confirm) {
+				serviceMessages.forEach(msg => {
+					msg.read = true
+					msg.unreadCount = 0
+				})
+				systemMessages.forEach(msg => msg.read = true)
+				orderMessages.forEach(msg => msg.read = true)
+				promoMessages.forEach(msg => msg.read = true)
+				
+				messageTabs.forEach(tab => tab.unread = 0)
+				unreadCount.value = 0
+				
+				uni.showToast({
+					title: '已标记所有消息为已读',
+					icon: 'success'
+				})
+			}
+		}
+	})
+}
+
+// 下拉刷新
+const onRefresh = () => {
+	refreshing.value = true
+	setTimeout(() => {
+		loadMessages()
+		refreshing.value = false
+		uni.showToast({
+			title: '刷新成功',
+			icon: 'success'
+		})
+	}, 1000)
+}
+</script>
+
+<style>
+/* 页面结构优化 - 避免双滚动条 */
+.messages-page {
+	width: 100%;
+	height: 100vh;
+	background-color: #f8fafc;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden; /* 关键：防止body滚动 */
+}
+
+/* 智能导航栏 */
+.smart-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+	z-index: 1000;
+	box-shadow: 0 2px 12px rgba(76, 175, 80, 0.15);
+	/* height: 50px; 移除固定高度，由内容决定 */
+	display: flex;
+	flex-direction: row; /* 显式设置行方向 */
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0; /* 防止被压缩 */
+}
+
+.nav-container {
+	padding: 0 16px;
+	display: flex;
+	flex-direction: row; /* 关键修复：UVUE默认是column，必须显式设置为row才能横向排列 */
+	align-items: center;
+	justify-content: space-between;
+	width: 100%;
+	max-width: 1400px;
+	margin: 0 auto;
+	height: 44px; /* 调整为标准高度 44px */
+}
+
+.nav-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: white;
+	flex: 1; /* 自适应宽度 */
+}
+
+.nav-actions {
+	display: flex;
+	flex-direction: row; /* 显式设置行方向 */
+	align-items: center;
+}
+
+.action-btn {
+	display: flex;
+	flex-direction: row; /* 显式设置行方向 */
+	align-items: center;
+	background: rgba(255, 255, 255, 0.2);
+	padding: 4px 12px;
+	border-radius: 20px;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+
+.action-btn:hover {
+	background: rgba(255, 255, 255, 0.3);
+}
+
+.action-icon {
+	font-size: 14px;
+	margin-right: 4px;
+}
+
+.action-text {
+	font-size: 12px;
+	color: white;
+	font-weight: 500;
+}
+
+/* 导航栏占位符 */
+.navbar-placeholder {
+	width: 100%;
+	flex-shrink: 0;
+}
+
+/* 消息分类标签容器 */
+.tabs-container {
+	background: white;
+	padding: 0 10px;
+	border-bottom: 1px solid #e0e0e0;
+	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+	z-index: 900;
+	height: 42px; /* 减小高度，更紧凑 */
+	flex-shrink: 0;
+}
+
+.message-tabs {
+	display: flex;
+	flex-direction: row; /* 横向排列 */
+	height: 100%;
+	/* overflow-x: auto; 移除自动滚动，改为自适应宽度 */
+	max-width: 1400px;
+	margin: 0 auto;
+	gap: 4px; /* 减小间距 */
+	justify-content: space-between; /* 均匀分布 */
+}
+
+.message-tabs::-webkit-scrollbar {
+	display: none;
+}
+
+.tab-item {
+	padding: 0 4px;
+	display: flex; /* 改为 flex 布局 */
+	flex-direction: row; /* 关键：横向排列 文字和数字 */
+	align-items: center; /* 垂直居中 */
+	justify-content: center;
+	position: relative;
+	height: 100%;
+	border-bottom: 3px solid transparent;
+	transition: all 0.3s ease;
+	white-space: nowrap; /* 防止换行 */
+	flex: 1; /* 关键：均分宽度，消除滚动条 */
+	min-width: 0; /* 允许压缩 */
+}
+
+.tab-item.active {
+	color: #4CAF50;
+	border-bottom-color: #4CAF50;
+	font-weight: bold;
+}
+
+.tab-name {
+	font-size: 14px; /* 微调字体大小适配小屏 */
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* 徽标样式优化 - 放在文字右边 */
+.tab-badge {
+	background-color: #FF5722;
+	color: white;
+	font-size: 10px;
+	padding: 1px 5px;
+	border-radius: 10px;
+	min-width: 16px;
+	text-align: center;
+	font-weight: bold;
+	margin-left: 4px; /* 距离文字的间距 */
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 16px;
+}
+
+/* 消息内容区 */
+.messages-content {
+	flex: 1; /* 关键：自适应剩余高度 */
+	height: 0; /* 关键：强制flex item计算高度 */
+	width: 100%;
+	max-width: 1400px;
+	margin: 0 auto;
+	padding-bottom: 20px;
+}
+
+/* 客服信息区域 */
+.customer-service-info {
+	background: white;
+	border-radius: 12px;
+	padding: 20px;
+	margin: 15px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.service-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 10px;
+}
+
+.service-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+}
+
+.service-status {
+	font-size: 12px;
+	padding: 4px 10px;
+	border-radius: 12px;
+	font-weight: 500;
+}
+
+.service-status.online {
+	background: #E8F5E9;
+	color: #4CAF50;
+}
+
+.service-desc {
+	font-size: 14px;
+	color: #666;
+	line-height: 1.5;
+	margin-bottom: 20px;
+}
+
+.service-categories {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr);
+	gap: 12px;
+}
+
+.category-item {
+	background: #f8f9fa;
+	border-radius: 10px;
+	padding: 15px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	cursor: pointer;
+	transition: all 0.3s ease;
+}
+
+.category-item:hover {
+	background: #e8f5e9;
+	transform: translateY(-2px);
+	box-shadow: 0 4px 8px rgba(76, 175, 80, 0.2);
+}
+
+.category-icon {
+	font-size: 24px;
+	margin-bottom: 8px;
+}
+
+.category-name {
+	font-size: 13px;
+	color: #333;
+	font-weight: 500;
+}
+
+/* 消息项 */
+.message-section {
+	padding: 10px;
+}
+
+.message-item {
+	background-color: white;
+	border-radius: 12px;
+	padding: 15px;
+	margin-bottom: 10px;
+	display: flex;
+	align-items: flex-start;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+	transition: all 0.3s ease;
+	cursor: pointer;
+}
+
+.message-item:hover {
+	transform: translateY(-2px);
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+}
+
+.message-item.unread {
+	background-color: #f0f9f0;
+	border-left: 3px solid #4CAF50;
+}
+
+.message-item.active {
+	border: 1px solid #4CAF50;
+}
+
+.message-icon-wrapper {
+	width: 50px;
+	height: 50px;
+	border-radius: 25px;
+	background-color: #f5f5f5;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 15px;
+	flex-shrink: 0;
+	position: relative;
+}
+
+.message-icon-default {
+	width: 100%;
+	height: 100%;
+	border-radius: 25px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.message-icon-default text {
+	font-size: 24px;
+	color: white;
+}
+
+.message-avatar {
+	width: 100%;
+	height: 100%;
+	border-radius: 25px;
+}
+
+.online-dot {
+	position: absolute;
+	bottom: 2px;
+	right: 2px;
+	width: 12px;
+	height: 12px;
+	background-color: #4CAF50;
+	border-radius: 6px;
+	border: 2px solid white;
+}
+
+.message-content {
+	flex: 1;
+	min-width: 0;
+}
+
+.message-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 8px;
+}
+
+.message-title-wrapper {
+	flex: 1;
+	min-width: 0;
+	margin-right: 10px;
+}
+
+.message-title {
+	font-size: 16px;
+	color: #333;
+	font-weight: bold;
+	display: block;
+	margin-bottom: 4px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.message-role {
+	font-size: 12px;
+	color: #4CAF50;
+	background: #E8F5E9;
+	padding: 2px 8px;
+	border-radius: 10px;
+	display: inline-block;
+}
+
+.message-header-right {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+	gap: 4px;
+}
+
+.message-time {
+	font-size: 12px;
+	color: #999;
+	white-space: nowrap;
+}
+
+.message-unread-count {
+	font-size: 11px;
+	color: white;
+	background: #FF5722;
+	padding: 2px 6px;
+	border-radius: 10px;
+	min-width: 18px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.message-preview-wrapper {
+	margin-bottom: 8px;
+}
+
+.message-preview {
+	font-size: 14px;
+	color: #666;
+	line-height: 1.4;
+	margin-bottom: 4px;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+}
+
+.last-message {
+	font-size: 13px;
+	color: #999;
+	display: block;
+}
+
+.message-tags {
+	display: flex;
+	gap: 6px;
+	flex-wrap: wrap;
+}
+
+.message-tag {
+	font-size: 11px;
+	color: #666;
+	background: #f0f0f0;
+	padding: 3px 8px;
+	border-radius: 10px;
+}
+
+.order-info {
+	font-size: 12px;
+	color: #4CAF50;
+	background-color: #E8F5E9;
+	padding: 4px 10px;
+	border-radius: 4px;
+	display: inline-block;
+	margin-top: 8px;
+}
+
+.order-status {
+	display: inline-block;
+	font-size: 12px;
+	padding: 4px 10px;
+	border-radius: 12px;
+	margin-top: 8px;
+	margin-left: 8px;
+}
+
+.order-status.shipping {
+	background: #E3F2FD;
+	color: #2196F3;
+}
+
+.order-status.processing {
+	background: #FFF3E0;
+	color: #FF9800;
+}
+
+.order-status.completed {
+	background: #E8F5E9;
+	color: #4CAF50;
+}
+
+.important-tag {
+	display: inline-block;
+	background-color: #FF5722;
+	color: white;
+	font-size: 11px;
+	padding: 3px 8px;
+	border-radius: 10px;
+	margin-top: 8px;
+}
+
+.coupon-info {
+	background: linear-gradient(135deg, #FF9800, #FF5722);
+	border-radius: 8px;
+	padding: 10px;
+	margin-top: 8px;
+	color: white;
+}
+
+.coupon-text {
+	font-size: 14px;
+	font-weight: bold;
+	display: block;
+	margin-bottom: 4px;
+}
+
+.coupon-expiry {
+	font-size: 12px;
+	opacity: 0.9;
+}
+
+.coupon-action {
+	font-size: 12px;
+	color: #fff;
+	background-color: rgba(255, 255, 255, 0.2);
+	padding: 2px 8px;
+	border-radius: 10px;
+	margin-top: 4px;
+	align-self: flex-start;
+}
+
+/* 客服系统提示 */
+.service-tips {
+	background: #FFF3E0;
+	border-radius: 10px;
+	padding: 15px;
+	margin: 15px;
+	display: flex;
+	align-items: flex-start;
+	gap: 10px;
+}
+
+.tip-icon {
+	font-size: 18px;
+	color: #FF9800;
+	flex-shrink: 0;
+	margin-top: 2px;
+}
+
+.tip-text {
+	font-size: 13px;
+	color: #666;
+	line-height: 1.5;
+}
+
+/* 空状态 */
+.empty-messages {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80px 20px;
+	text-align: center;
+}
+
+.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;
+}
+
+/* 底部浮动按钮 */
+.floating-action {
+	position: fixed;
+	bottom: 20px;
+	right: 20px;
+	z-index: 100;
+}
+
+.action-button {
+	background: linear-gradient(135deg, #4CAF50, #2E7D32);
+	color: white;
+	border: none;
+	border-radius: 25px;
+	padding: 12px 20px;
+	display: flex;
+	align-items: center;
+	box-shadow: 0 4px 12px rgba(76, 175, 80, 0.3);
+	font-weight: 500;
+}
+
+.button-icon {
+	font-size: 18px;
+	margin-right: 8px;
+}
+
+.button-text {
+	font-size: 14px;
+	font-weight: bold;
+}
+
+.safe-area {
+	height: 80px;
+}
+
+/* 响应式适配 */
+@media screen and (max-width: 320px) {
+	.tab-name {
+		font-size: 13px;
+	}
+	
+	.service-categories {
+		grid-template-columns: 1fr;
+	}
+}
+
+@media screen and (min-width: 415px) {
+	.message-item {
+		padding: 20px;
+	}
+	
+	.message-icon-wrapper {
+		width: 60px;
+		height: 60px;
+		border-radius: 30px;
+	}
+	
+	.message-icon-default text {
+		font-size: 28px;
+	}
+	
+	.customer-service-info {
+		padding: 25px;
+	}
+	
+	.service-categories {
+		grid-template-columns: repeat(4, 1fr);
+	}
+	
+	/* 平板和桌面端优化标签栏显示 */
+	.message-tabs {
+		justify-content: flex-start; /* 左对齐 */
+	}
+	
+	.tab-item {
+		padding: 0 24px; /* 增加点击区域 */
+	}
+}
+
+/* 平板设备 */
+@media screen and (min-width: 768px) {
+	.smart-navbar {
+		padding: 0 30px;
+	}
+	
+	.tabs-container {
+		padding: 0 30px;
+	}
+	
+	.message-section {
+		padding: 20px 30px;
+	}
+	
+	.customer-service-info {
+		margin: 20px 30px;
+	}
+	
+	.service-tips {
+		margin: 20px 30px;
+	}
+}
+
+/* 暗黑模式适配 */
+@media (prefers-color-scheme: dark) {
+	.messages-page {
+		background-color: #121212;
+	}
+	
+	.smart-navbar {
+		background: linear-gradient(135deg, #2E7D32 0%, #1B5E20 100%);
+	}
+	
+	.tabs-container {
+		background-color: #1e1e1e;
+		border-bottom-color: #333;
+	}
+	
+	.tab-item.active {
+		color: #4CAF50;
+	}
+	
+	.customer-service-info,
+	.message-item,
+	.service-tips {
+		background-color: #1e1e1e;
+	}
+	
+	.message-item.unread {
+		background-color: #2d2d2d;
+	}
+	
+	.category-item {
+		background: #2d2d2d;
+	}
+	
+	.category-name {
+		color: #fff;
+	}
+	
+	.service-title,
+	.message-title {
+		color: #fff;
+	}
+	
+	.service-desc,
+	.message-preview,
+	.last-message,
+	.tip-text {
+		color: #aaa;
+	}
+	
+	.message-icon-wrapper {
+		background-color: #2d2d2d;
+	}
+	
+	.order-info {
+		background-color: #1b5e20;
+		color: #a5d6a7;
+	}
+	
+	.coupon-info {
+		background: linear-gradient(135deg, #ff8f00, #ef6c00);
+	}
+	
+	.message-tag {
+		background: #333;
+		color: #ccc;
+	}
+	
+	.action-btn {
+		background: rgba(255, 255, 255, 0.1);
+	}
+	
+	.action-btn:hover {
+		background: rgba(255, 255, 255, 0.2);
+	}
+}
+</style>
diff --git a/pages/mall/consumer/order-detail.uvue b/pages/mall/consumer/order-detail.uvue
index 8ca5c3e8..945c717a 100644
--- a/pages/mall/consumer/order-detail.uvue
+++ b/pages/mall/consumer/order-detail.uvue
@@ -91,6 +91,7 @@
       <button v-if="order.status === 2" class="remind-btn" @click="remindDelivery">提醒发货</button>
       <button v-if="order.status === 3" class="confirm-btn" @click="confirmReceive">确认收货</button>
       <button v-if="order.status === 4" class="review-btn" @click="goToReview">评价商品</button>
+      <button v-if="order.status >= 2 && order.status <= 4" class="refund-btn" @click="applyRefund">申请售后</button>
       <button v-if="order.status <= 2" class="cancel-btn" @click="cancelOrder">取消订单</button>
       <button class="service-btn" @click="contactService">联系客服</button>
     </view>
@@ -141,82 +142,83 @@ export default {
     }
   },
   onLoad(options: any) {
-    const orderId = options.orderId as string
+    const orderId = options.id || options.orderId as string
     if (orderId) {
       this.loadOrderDetail(orderId)
     }
   },
   methods: {
     loadOrderDetail(orderId: string) {
-      // 模拟加载订单详情数据
-      this.order = {
-        id: orderId,
-        order_no: 'ORD202401150001',
-        user_id: 'user_001',
-        merchant_id: 'merchant_001',
-        status: 3, // 1:待支付 2:待发货 3:待收货 4:已完成 5:已取消
-        total_amount: 299.98,
-        discount_amount: 30.00,
-        delivery_fee: 8.00,
-        actual_amount: 277.98,
-        payment_method: 1, // 1:微信支付 2:支付宝 3:余额
-        payment_status: 1,
-        delivery_address: {
-          name: '张三',
-          phone: '13800138000',
-          detail: '北京市朝阳区某某街道某某小区1号楼101室'
-        },
-        created_at: '2024-01-15 14:30:00'
+      // 尝试从本地存储加载订单
+      const ordersStr = uni.getStorageSync('orders')
+      let localOrder: any = null
+      
+      if (ordersStr) {
+          const orders = JSON.parse(ordersStr as string) as any[]
+          localOrder = orders.find((o: any) => o.id === orderId)
       }
-      
-      this.orderItems = [
-        {
-          id: 'item_001',
-          order_id: orderId,
-          product_id: 'product_001',
-          sku_id: 'sku_001',
-          product_name: '精选好物商品',
-          sku_specifications: { color: '红色', size: 'M' },
-          price: 199.99,
-          quantity: 1,
-          total_amount: 199.99,
-          product_image: '/static/product1.jpg'
-        },
-        {
-          id: 'item_002',
-          order_id: orderId,
-          product_id: 'product_002',
-          sku_id: 'sku_002',
-          product_name: '优质配件',
-          sku_specifications: { type: '标准版' },
-          price: 99.99,
-          quantity: 1,
-          total_amount: 99.99,
-          product_image: '/static/product2.jpg'
-        }
-      ]
-      
-      this.merchant = {
-        id: 'merchant_001',
-        user_id: 'user_001',
-        shop_name: '优质好店',
-        shop_logo: '/static/shop-logo.png',
-        shop_banner: '/static/shop-banner.png',
-        shop_description: '专注品质生活',
-        contact_name: '店主小王',
-        contact_phone: '13800138000',
-        shop_status: 1,
-        rating: 4.8,
-        total_sales: 15680,
-        created_at: '2023-06-01'
-      }
-      
-      if (this.order.status >= 3) {
-        this.deliveryInfo = {
-          courier_name: '李师傅',
-          courier_phone: '13900139000',
-          tracking_no: 'YT123456789'
-        }
+
+      if (localOrder) {
+          // 使用本地存储的数据
+          this.order = localOrder
+          
+          // 处理商品项
+          if (localOrder.items) {
+              this.orderItems = localOrder.items.map((item: any) => {
+                  return {
+                      ...item,
+                      product_image: item.product_image || item.image || '/static/default-product.png',
+                      product_name: item.product_name || item.name,
+                      sku_specifications: item.sku_specifications || item.specifications
+                  }
+              })
+          }
+          
+          // 处理商家信息（模拟，因为本地订单可能没有完整的商家信息）
+          this.merchant = {
+            id: localOrder.merchant_id || 'merchant_001',
+            user_id: 'user_001',
+            shop_name: localOrder.shopName || '优质好店',
+            shop_logo: '/static/shop-logo.png',
+            shop_banner: '/static/shop-banner.png',
+            shop_description: '专注品质生活',
+            contact_name: '店主小王',
+            contact_phone: '13800138000',
+            shop_status: 1,
+            rating: 4.8,
+            total_sales: 15680,
+            created_at: '2023-06-01'
+          }
+          
+          if (this.order.status >= 3) {
+            this.deliveryInfo = {
+              courier_name: '李师傅',
+              courier_phone: '13900139000',
+              tracking_no: 'YT123456789'
+            }
+          }
+      } else {
+          // 回退到模拟数据
+          this.order = {
+            id: orderId,
+            order_no: 'ORD202401150001',
+            user_id: 'user_001',
+            merchant_id: 'merchant_001',
+            status: 3, // 1:待支付 2:待发货 3:待收货 4:已完成 5:已取消
+            total_amount: 299.98,
+            discount_amount: 30.00,
+            delivery_fee: 8.00,
+            actual_amount: 277.98,
+            payment_method: 1, // 1:微信支付 2:支付宝 3:余额
+            payment_status: 1,
+            delivery_address: {
+              name: '张三',
+              phone: '13800138000',
+              detail: '北京市朝阳区某某街道某某小区1号楼101室'
+            },
+            created_at: '2024-01-15 14:30:00'
+          }
+          // ... (原有模拟数据逻辑保留)
       }
     },
     
@@ -310,6 +312,12 @@ export default {
       })
     },
     
+    applyRefund() {
+      uni.navigateTo({
+        url: `/pages/mall/consumer/apply-refund?orderId=${this.order.id}`
+      })
+    },
+
     cancelOrder() {
       uni.showModal({
         title: '取消订单',
@@ -578,6 +586,12 @@ export default {
   color: #fff;
 }
 
+.refund-btn {
+  background-color: #ffffff;
+  color: #666;
+  border: 1px solid #ccc;
+}
+
 .cancel-btn {
   background-color: #f5f5f5;
   color: #666;
diff --git a/pages/mall/consumer/orders.uvue b/pages/mall/consumer/orders.uvue
new file mode 100644
index 00000000..36c89911
--- /dev/null
+++ b/pages/mall/consumer/orders.uvue
@@ -0,0 +1,1094 @@
+<!-- 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>
+                </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"
+                >
+                    <!-- 订单头部 -->
+                    <view class="order-header">
+                        <text class="order-no">订单号：{{ order.order_no }}</text>
+                        <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">
+                                <text class="product-name">{{ product.name }}</text>
+                                <text class="product-spec">{{ product.spec }}</text>
+                                <view class="product-footer">
+                                    <text class="product-price">¥{{ product.price }}</text>
+                                    <text class="product-quantity">×{{ 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>
+                    </view>
+                    
+                    <!-- 订单操作 -->
+                    <view class="order-actions">
+                        <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>
+                        </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>
+                        </view>
+                        
+                        <view v-if="order.status === 4" class="action-buttons">
+                            <button class="action-btn review" @click="goReview(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 } from '@dcloudio/uni-app'
+// // import supa from '@/components/supadb/aksupainstance.uts'
+
+// 响应式数据
+const orders = ref<any[]>([])
+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>('')
+
+// 订单标签页
+const orderTabs = reactive([
+    { id: 'all', name: '全部', count: 12 },
+    { id: 'pending', name: '待付款', count: 2 },
+    { id: 'shipping', name: '待发货', count: 1 },
+    { id: 'delivering', name: '待收货', count: 3 },
+    { id: 'completed', name: '已完成', count: 5 },
+    { id: 'cancelled', name: '已取消', count: 1 }
+])
+
+// Mock 订单数据
+const mockOrders = [
+    {
+        id: '202311230001',
+        order_no: '202311230001',
+        status: 1, // 1:待付款 2:待发货 3:待收货 4:已完成 5:已取消
+        create_time: '2023-11-23 14:30:22',
+        product_amount: 378.00,
+        shipping_fee: 0.00,
+        total_amount: 378.00,
+        products: [
+            {
+                id: '1001',
+                name: '无线蓝牙耳机 降噪版',
+                price: 299.00,
+                image: 'https://picsum.photos/80/80?random=1',
+                spec: '白色',
+                quantity: 1
+            },
+            {
+                id: '1002',
+                name: '耳机保护套',
+                price: 29.00,
+                image: 'https://picsum.photos/80/80?random=2',
+                spec: '黑色',
+                quantity: 1
+            },
+            {
+                id: '1003',
+                name: '数据线',
+                price: 19.00,
+                image: 'https://picsum.photos/80/80?random=3',
+                spec: '1米',
+                quantity: 2
+            }
+        ]
+    },
+    {
+        id: '202311220001',
+        order_no: '202311220001',
+        status: 2,
+        create_time: '2023-11-22 10:15:33',
+        product_amount: 199.00,
+        shipping_fee: 10.00,
+        total_amount: 209.00,
+        products: [
+            {
+                id: '2001',
+                name: '运动T恤 速干面料',
+                price: 79.00,
+                image: 'https://picsum.photos/80/80?random=4',
+                spec: '黑色 L',
+                quantity: 2
+            },
+            {
+                id: '2002',
+                name: '运动短裤',
+                price: 59.00,
+                image: 'https://picsum.photos/80/80?random=5',
+                spec: '黑色 M',
+                quantity: 1
+            }
+        ]
+    },
+    {
+        id: '202311210001',
+        order_no: '202311210001',
+        status: 3,
+        create_time: '2023-11-21 16:45:12',
+        product_amount: 299.00,
+        shipping_fee: 0.00,
+        total_amount: 299.00,
+        products: [
+            {
+                id: '3001',
+                name: '智能手环 心率监测',
+                price: 199.00,
+                image: 'https://picsum.photos/80/80?random=6',
+                spec: '黑色',
+                quantity: 1
+            },
+            {
+                id: '3002',
+                name: '手环腕带',
+                price: 29.00,
+                image: 'https://picsum.photos/80/80?random=7',
+                spec: '蓝色',
+                quantity: 2
+            }
+        ]
+    },
+    {
+        id: '202311200001',
+        order_no: '202311200001',
+        status: 4,
+        create_time: '2023-11-20 09:30:45',
+        product_amount: 99.00,
+        shipping_fee: 0.00,
+        total_amount: 99.00,
+        products: [
+            {
+                id: '4001',
+                name: '保温杯 500ml',
+                price: 49.00,
+                image: 'https://picsum.photos/80/80?random=8',
+                spec: '白色',
+                quantity: 2
+            }
+        ]
+    },
+    {
+        id: '202311190001',
+        order_no: '202311190001',
+        status: 5,
+        create_time: '2023-11-19 14:20:18',
+        product_amount: 599.00,
+        shipping_fee: 0.00,
+        total_amount: 599.00,
+        products: [
+            {
+                id: '5001',
+                name: '蓝牙音箱 便携式',
+                price: 199.00,
+                image: 'https://picsum.photos/80/80?random=9',
+                spec: '黑色',
+                quantity: 3
+            }
+        ]
+    }
+]
+
+// 计算属性：根据当前标签筛选订单
+const filteredOrders = computed(() => {
+    if (activeTab.value === 'all') {
+        return orders.value
+    }
+    
+    const statusMap: Record<string, number> = {
+        'pending': 1,
+        'shipping': 2,
+        'delivering': 3,
+        'completed': 4,
+        'cancelled': 5
+    }
+    
+    const targetStatus = statusMap[activeTab.value]
+    return orders.value.filter(order => order.status === targetStatus)
+})
+
+// 生命周期
+onLoad((options) => {
+    if (options['status']) {
+        const status = options['status'] as string
+        if (['all', 'pending', 'shipping', 'delivering', 'completed', 'cancelled'].includes(status)) {
+            activeTab.value = status
+        }
+    }
+    if (options['type']) {
+        const type = options['type'] as string
+        if (type === 'pending') activeTab.value = 'pending'
+        else if (type === 'shipped') activeTab.value = 'delivering' // 映射到待收货
+        else if (type === 'review') activeTab.value = 'completed' // 映射到已完成
+    }
+})
+
+onShow(() => {
+    loadOrders()
+})
+
+// 加载订单数据
+const loadOrders = async () => {
+    loading.value = true
+    const userStore = uni.getStorageSync('userInfo')
+    const userId = userStore?.id
+    
+    if (!userId) {
+        loading.value = false
+        return
+    }
+    
+    try {
+        // 从本地存储获取订单
+        const ordersStr = uni.getStorageSync('orders')
+        let localOrders: any[] = []
+        if (ordersStr) {
+            localOrders = JSON.parse(ordersStr as string) as any[]
+        }
+        
+        // 过滤当前用户的订单
+        // const userOrders = localOrders.filter((o: any) => o.user_id === userId)
+        // 暂时显示所有订单用于测试
+        let userOrders = localOrders
+        
+        // 根据标签页过滤
+        let filtered = userOrders
+        const statusMap: Record<string, number> = {
+            'pending': 1,
+            'shipping': 2,
+            'delivering': 3,
+            'completed': 4,
+            'cancelled': 5
+        }
+        
+        if (activeTab.value !== 'all') {
+            const targetStatus = statusMap[activeTab.value]
+            filtered = userOrders.filter((o: any) => o.status === targetStatus)
+        }
+        
+        // 按时间倒序
+        filtered.sort((a: any, b: any) => {
+            const timeA = new Date(a.created_at || a.create_time).getTime()
+            const timeB = new Date(b.created_at || b.create_time).getTime()
+            return timeB - timeA
+        })
+        
+        // 处理数据格式以适配当前页面
+        orders.value = filtered.map((order: any) => ({
+            id: order.id,
+            order_no: order.order_no,
+            status: order.status,
+            create_time: order.created_at || order.create_time,
+            product_amount: order.total_amount,
+            shipping_fee: order.delivery_fee,
+            total_amount: order.actual_amount,
+            products: (order.items || order.products || []).map((item: any) => ({
+                id: item.product_id || item.id,
+                name: item.product_name || item.name,
+                price: item.price,
+                image: item.product_image || item.image || '/static/default-product.png',
+                spec: item.sku_specifications ? formatSpec(item.sku_specifications) : (item.spec || ''),
+                quantity: item.quantity
+            }))
+        }))
+        
+        // 更新统计数据
+        orderTabs[0].count = userOrders.length
+        orderTabs[1].count = userOrders.filter((o: any) => o.status === 1).length
+        orderTabs[2].count = userOrders.filter((o: any) => o.status === 2).length
+        orderTabs[3].count = userOrders.filter((o: any) => o.status === 3).length
+        orderTabs[4].count = userOrders.filter((o: any) => o.status === 4).length
+        orderTabs[5].count = userOrders.filter((o: any) => o.status === 5).length
+        
+    } catch (err) {
+        console.error('加载订单异常:', err)
+    } finally {
+        loading.value = false
+    }
+}
+
+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')}`
+}
+
+// 搜索相关函数
+const onSearchInput = (e: any) => {
+    searchKeyword.value = e.detail.value
+    performSearch()
+}
+
+const onSearchConfirm = () => {
+    performSearch()
+}
+
+const clearSearch = () => {
+    searchKeyword.value = ''
+    performSearch()
+}
+
+const performSearch = () => {
+    const keyword = searchKeyword.value.trim().toLowerCase()
+    if (!keyword) {
+        loadOrders()
+        return
+    }
+    
+    // 在当前订单数据中搜索
+    const allOrders = getCurrentOrderData() // 这里需要获取完整的订单数据
+    const filtered = allOrders.filter((order: any) => {
+        // 搜索订单号
+        if (order.order_no && order.order_no.toLowerCase().includes(keyword)) {
+            return true
+        }
+        
+        // 搜索商品名称
+        if (order.products && Array.isArray(order.products)) {
+            return order.products.some((product: any) => {
+                return product.name && product.name.toLowerCase().includes(keyword)
+            })
+        }
+        
+        return false
+    })
+    
+    orders.value = filtered
+}
+
+const getCurrentOrderData = () => {
+    // 这里应该从本地存储或API获取完整订单数据
+    // 暂时返回当前orders.value
+    return orders.value
+}
+
+const formatSpec = (specs: any): string => {
+    if (!specs) return ''
+    if (typeof specs === 'object') {
+        return Object.keys(specs).map(key => `${key}:${specs[key]}`).join(' ')
+    }
+    return String(specs)
+}
+
+// 切换标签
+const switchTab = (tabId: string) => {
+    activeTab.value = tabId
+    page.value = 1
+    orders.value = []
+    loadOrders()
+}
+
+// 获取状态文本
+const getStatusText = (status: number): string => {
+    const statusMap: Record<number, string> = {
+        1: '待付款',
+        2: '待发货',
+        3: '待收货',
+        4: '已完成',
+        5: '已取消'
+    }
+    return statusMap[status] || '未知状态'
+}
+
+// 获取状态类名
+const getStatusClass = (status: number): string => {
+    const classMap: Record<number, string> = {
+        1: 'status-pending',
+        2: 'status-shipping',
+        3: 'status-delivering',
+        4: 'status-completed',
+        5: 'status-cancelled'
+    }
+    return classMap[status] || '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(order => order.id === orderId)
+                if (index !== -1) {
+                    orders.value[index].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}`
+    })
+}
+
+const confirmReceipt = (orderId: string) => {
+    uni.showModal({
+        title: '确认收货',
+        content: '请确认您已收到商品，且商品无误',
+        success: (res) => {
+            if (res.confirm) {
+                // 这里应该是实际的API调用
+                uni.showToast({
+                    title: '收货成功',
+                    icon: 'success'
+                })
+                
+                // 更新订单状态
+                const index = orders.value.findIndex(order => order.id === orderId)
+                if (index !== -1) {
+                    orders.value[index].status = 4
+                    orders.value = [...orders.value]
+                }
+            }
+        }
+    })
+}
+
+const goReview = (order: any) => {
+    const productIds = order.products.map((p: any) => p.id).join(',')
+    uni.navigateTo({
+        url: `/pages/mall/consumer/review?orderId=${order.id}&productIds=${productIds}`
+    })
+}
+
+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 navigateToSearch = () => {
+    uni.navigateTo({ url: '/pages/mall/consumer/search' })
+}
+
+const navigateToProduct = (product: any) => {
+    uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${product.id}` })
+}
+
+const goShopping = () => {
+    uni.switchTab({ url: '/pages/mall/consumer/index' })
+}
+</script>
+
+<style>
+.orders-page {
+    width: 100%;
+    min-height: 100vh;
+    background-color: #f5f5f5;
+}
+
+/* 头部 */
+.orders-header {
+    background-color: white;
+    padding: 15px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-bottom: 1px solid #eee;
+    position: sticky;
+    top: 0;
+    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 {
+    outline: none;
+    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: 50%;
+    background-color: #ddd;
+    cursor: pointer;
+}
+
+/* 标签页 */
+.order-tabs {
+    background-color: #ffffff;
+    border-bottom: 1px solid #e5e5e5;
+    position: sticky;
+    top: 50px;
+    z-index: 10;
+}
+
+.tab-scroll {
+    width: 100%;
+    white-space: nowrap;
+}
+
+.tab-container {
+    display: flex;
+    flex-direction: row;
+    padding: 0 10px;
+    min-width: 100%;
+}
+
+.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: '';
+    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 {
+    height: calc(100vh - 100px);
+}
+
+/* 空状态 */
+.empty-orders {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 80px 20px;
+    text-align: center;
+}
+
+.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;
+    margin-bottom: 15px;
+}
+
+.order-product:last-child {
+    margin-bottom: 0;
+}
+
+.product-image {
+    width: 80px;
+    height: 80px;
+    border-radius: 8px;
+    margin-right: 15px;
+}
+
+.product-info {
+    flex: 1;
+}
+
+.product-name {
+    font-size: 15px;
+    color: #333;
+    margin-bottom: 5px;
+    display: block;
+    line-height: 1.4;
+}
+
+.product-spec {
+    font-size: 13px;
+    color: #999;
+    margin-bottom: 10px;
+    display: block;
+}
+
+.product-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.product-price {
+    font-size: 16px;
+    color: #ff5000;
+    font-weight: bold;
+}
+
+.product-quantity {
+    font-size: 14px;
+    color: #666;
+}
+
+/* 订单信息 */
+.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;
+}
+
+.action-btn {
+    padding: 6px 15px;
+    border-radius: 15px;
+    font-size: 13px;
+    border: 1px solid;
+    background: none;
+}
+
+.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: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 10px;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
+.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 (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/ordersgood.uvue b/pages/mall/consumer/ordersgood.uvue
new file mode 100644
index 00000000..ffa1f520
--- /dev/null
+++ b/pages/mall/consumer/ordersgood.uvue
@@ -0,0 +1,996 @@
+<!-- pages/mall/consumer/orders.uvue -->
+<template>
+    <view class="orders-page">
+        <!-- 顶部标题栏 -->
+        <view class="orders-header">
+            <text class="header-title">我的订单</text>
+            <view class="header-actions">
+                <text class="search-icon" @click="navigateToSearch">🔍</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>
+                </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"
+                >
+                    <!-- 订单头部 -->
+                    <view class="order-header">
+                        <text class="order-no">订单号：{{ order.order_no }}</text>
+                        <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">
+                                <text class="product-name">{{ product.name }}</text>
+                                <text class="product-spec">{{ product.spec }}</text>
+                                <view class="product-footer">
+                                    <text class="product-price">¥{{ product.price }}</text>
+                                    <text class="product-quantity">×{{ 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>
+                    </view>
+                    
+                    <!-- 订单操作 -->
+                    <view class="order-actions">
+                        <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>
+                        </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>
+                        </view>
+                        
+                        <view v-if="order.status === 4" class="action-buttons">
+                            <button class="action-btn review" @click="goReview(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 } from '@dcloudio/uni-app'
+// // import supa from '@/components/supadb/aksupainstance.uts'
+
+// 响应式数据
+const orders = ref<any[]>([])
+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 orderTabs = reactive([
+    { id: 'all', name: '全部', count: 12 },
+    { id: 'pending', name: '待付款', count: 2 },
+    { id: 'shipping', name: '待发货', count: 1 },
+    { id: 'delivering', name: '待收货', count: 3 },
+    { id: 'completed', name: '已完成', count: 5 },
+    { id: 'cancelled', name: '已取消', count: 1 }
+])
+
+// Mock 订单数据
+const mockOrders = [
+    {
+        id: '202311230001',
+        order_no: '202311230001',
+        status: 1, // 1:待付款 2:待发货 3:待收货 4:已完成 5:已取消
+        create_time: '2023-11-23 14:30:22',
+        product_amount: 378.00,
+        shipping_fee: 0.00,
+        total_amount: 378.00,
+        products: [
+            {
+                id: '1001',
+                name: '无线蓝牙耳机 降噪版',
+                price: 299.00,
+                image: 'https://picsum.photos/80/80?random=1',
+                spec: '白色',
+                quantity: 1
+            },
+            {
+                id: '1002',
+                name: '耳机保护套',
+                price: 29.00,
+                image: 'https://picsum.photos/80/80?random=2',
+                spec: '黑色',
+                quantity: 1
+            },
+            {
+                id: '1003',
+                name: '数据线',
+                price: 19.00,
+                image: 'https://picsum.photos/80/80?random=3',
+                spec: '1米',
+                quantity: 2
+            }
+        ]
+    },
+    {
+        id: '202311220001',
+        order_no: '202311220001',
+        status: 2,
+        create_time: '2023-11-22 10:15:33',
+        product_amount: 199.00,
+        shipping_fee: 10.00,
+        total_amount: 209.00,
+        products: [
+            {
+                id: '2001',
+                name: '运动T恤 速干面料',
+                price: 79.00,
+                image: 'https://picsum.photos/80/80?random=4',
+                spec: '黑色 L',
+                quantity: 2
+            },
+            {
+                id: '2002',
+                name: '运动短裤',
+                price: 59.00,
+                image: 'https://picsum.photos/80/80?random=5',
+                spec: '黑色 M',
+                quantity: 1
+            }
+        ]
+    },
+    {
+        id: '202311210001',
+        order_no: '202311210001',
+        status: 3,
+        create_time: '2023-11-21 16:45:12',
+        product_amount: 299.00,
+        shipping_fee: 0.00,
+        total_amount: 299.00,
+        products: [
+            {
+                id: '3001',
+                name: '智能手环 心率监测',
+                price: 199.00,
+                image: 'https://picsum.photos/80/80?random=6',
+                spec: '黑色',
+                quantity: 1
+            },
+            {
+                id: '3002',
+                name: '手环腕带',
+                price: 29.00,
+                image: 'https://picsum.photos/80/80?random=7',
+                spec: '蓝色',
+                quantity: 2
+            }
+        ]
+    },
+    {
+        id: '202311200001',
+        order_no: '202311200001',
+        status: 4,
+        create_time: '2023-11-20 09:30:45',
+        product_amount: 99.00,
+        shipping_fee: 0.00,
+        total_amount: 99.00,
+        products: [
+            {
+                id: '4001',
+                name: '保温杯 500ml',
+                price: 49.00,
+                image: 'https://picsum.photos/80/80?random=8',
+                spec: '白色',
+                quantity: 2
+            }
+        ]
+    },
+    {
+        id: '202311190001',
+        order_no: '202311190001',
+        status: 5,
+        create_time: '2023-11-19 14:20:18',
+        product_amount: 599.00,
+        shipping_fee: 0.00,
+        total_amount: 599.00,
+        products: [
+            {
+                id: '5001',
+                name: '蓝牙音箱 便携式',
+                price: 199.00,
+                image: 'https://picsum.photos/80/80?random=9',
+                spec: '黑色',
+                quantity: 3
+            }
+        ]
+    }
+]
+
+// 计算属性：根据当前标签筛选订单
+const filteredOrders = computed(() => {
+    if (activeTab.value === 'all') {
+        return orders.value
+    }
+    
+    const statusMap: Record<string, number> = {
+        'pending': 1,
+        'shipping': 2,
+        'delivering': 3,
+        'completed': 4,
+        'cancelled': 5
+    }
+    
+    const targetStatus = statusMap[activeTab.value]
+    return orders.value.filter(order => order.status === targetStatus)
+})
+
+// 生命周期
+onLoad((options) => {
+    if (options['status']) {
+        const status = options['status'] as string
+        if (['all', 'pending', 'shipping', 'delivering', 'completed', 'cancelled'].includes(status)) {
+            activeTab.value = status
+        }
+    }
+    if (options['type']) {
+        const type = options['type'] as string
+        if (type === 'pending') activeTab.value = 'pending'
+        else if (type === 'shipped') activeTab.value = 'delivering' // 映射到待收货
+        else if (type === 'review') activeTab.value = 'completed' // 映射到已完成
+    }
+})
+
+onShow(() => {
+    loadOrders()
+})
+
+// 加载订单数据
+const loadOrders = async () => {
+    loading.value = true
+    const userStore = uni.getStorageSync('userInfo')
+    const userId = userStore?.id
+    
+    if (!userId) {
+        loading.value = false
+        return
+    }
+    
+    try {
+        // 从本地存储获取订单
+        const ordersStr = uni.getStorageSync('orders')
+        let localOrders: any[] = []
+        if (ordersStr) {
+            localOrders = JSON.parse(ordersStr as string) as any[]
+        }
+        
+        // 过滤当前用户的订单
+        // const userOrders = localOrders.filter((o: any) => o.user_id === userId)
+        // 暂时显示所有订单用于测试
+        let userOrders = localOrders
+        
+        // 根据标签页过滤
+        let filtered = userOrders
+        const statusMap: Record<string, number> = {
+            'pending': 1,
+            'shipping': 2,
+            'delivering': 3,
+            'completed': 4,
+            'cancelled': 5
+        }
+        
+        if (activeTab.value !== 'all') {
+            const targetStatus = statusMap[activeTab.value]
+            filtered = userOrders.filter((o: any) => o.status === targetStatus)
+        }
+        
+        // 按时间倒序
+        filtered.sort((a: any, b: any) => {
+            const timeA = new Date(a.created_at || a.create_time).getTime()
+            const timeB = new Date(b.created_at || b.create_time).getTime()
+            return timeB - timeA
+        })
+        
+        // 处理数据格式以适配当前页面
+        orders.value = filtered.map((order: any) => ({
+            id: order.id,
+            order_no: order.order_no,
+            status: order.status,
+            create_time: order.created_at || order.create_time,
+            product_amount: order.total_amount,
+            shipping_fee: order.delivery_fee,
+            total_amount: order.actual_amount,
+            products: (order.items || order.products || []).map((item: any) => ({
+                id: item.product_id || item.id,
+                name: item.product_name || item.name,
+                price: item.price,
+                image: item.product_image || item.image || '/static/default-product.png',
+                spec: item.sku_specifications ? formatSpec(item.sku_specifications) : (item.spec || ''),
+                quantity: item.quantity
+            }))
+        }))
+        
+        // 更新统计数据
+        orderTabs[0].count = userOrders.length
+        orderTabs[1].count = userOrders.filter((o: any) => o.status === 1).length
+        orderTabs[2].count = userOrders.filter((o: any) => o.status === 2).length
+        orderTabs[3].count = userOrders.filter((o: any) => o.status === 3).length
+        orderTabs[4].count = userOrders.filter((o: any) => o.status === 4).length
+        orderTabs[5].count = userOrders.filter((o: any) => o.status === 5).length
+        
+    } catch (err) {
+        console.error('加载订单异常:', err)
+    } finally {
+        loading.value = false
+    }
+}
+
+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')}`
+}
+
+const formatSpec = (specs: any): string => {
+    if (!specs) return ''
+    if (typeof specs === 'object') {
+        return Object.keys(specs).map(key => `${key}:${specs[key]}`).join(' ')
+    }
+    return String(specs)
+}
+
+// 切换标签
+const switchTab = (tabId: string) => {
+    activeTab.value = tabId
+    page.value = 1
+    orders.value = []
+    loadOrders()
+}
+
+// 获取状态文本
+const getStatusText = (status: number): string => {
+    const statusMap: Record<number, string> = {
+        1: '待付款',
+        2: '待发货',
+        3: '待收货',
+        4: '已完成',
+        5: '已取消'
+    }
+    return statusMap[status] || '未知状态'
+}
+
+// 获取状态类名
+const getStatusClass = (status: number): string => {
+    const classMap: Record<number, string> = {
+        1: 'status-pending',
+        2: 'status-shipping',
+        3: 'status-delivering',
+        4: 'status-completed',
+        5: 'status-cancelled'
+    }
+    return classMap[status] || '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(order => order.id === orderId)
+                if (index !== -1) {
+                    orders.value[index].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}`
+    })
+}
+
+const confirmReceipt = (orderId: string) => {
+    uni.showModal({
+        title: '确认收货',
+        content: '请确认您已收到商品，且商品无误',
+        success: (res) => {
+            if (res.confirm) {
+                // 这里应该是实际的API调用
+                uni.showToast({
+                    title: '收货成功',
+                    icon: 'success'
+                })
+                
+                // 更新订单状态
+                const index = orders.value.findIndex(order => order.id === orderId)
+                if (index !== -1) {
+                    orders.value[index].status = 4
+                    orders.value = [...orders.value]
+                }
+            }
+        }
+    })
+}
+
+const goReview = (order: any) => {
+    const productIds = order.products.map((p: any) => p.id).join(',')
+    uni.navigateTo({
+        url: `/pages/mall/consumer/review?orderId=${order.id}&productIds=${productIds}`
+    })
+}
+
+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 navigateToSearch = () => {
+    uni.navigateTo({ url: '/pages/mall/consumer/search' })
+}
+
+const navigateToProduct = (product: any) => {
+    uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${product.id}` })
+}
+
+const goShopping = () => {
+    uni.switchTab({ url: '/pages/mall/consumer/index' })
+}
+</script>
+
+<style>
+.orders-page {
+    width: 100%;
+    min-height: 100vh;
+    background-color: #f5f5f5;
+}
+
+/* 头部 */
+.orders-header {
+    background-color: white;
+    padding: 15px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+}
+
+.header-title {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333;
+}
+
+.header-actions .search-icon {
+    font-size: 20px;
+    color: #666;
+}
+
+/* 标签页 */
+.order-tabs {
+    background-color: #ffffff;
+    border-bottom: 1px solid #e5e5e5;
+    position: sticky;
+    top: 50px;
+    z-index: 10;
+}
+
+.tab-scroll {
+    width: 100%;
+    white-space: nowrap;
+}
+
+.tab-container {
+    display: flex;
+    flex-direction: row;
+    padding: 0 10px;
+    min-width: 100%;
+}
+
+.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: '';
+    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 {
+    height: calc(100vh - 100px);
+}
+
+/* 空状态 */
+.empty-orders {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 80px 20px;
+    text-align: center;
+}
+
+.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;
+    margin-bottom: 15px;
+}
+
+.order-product:last-child {
+    margin-bottom: 0;
+}
+
+.product-image {
+    width: 80px;
+    height: 80px;
+    border-radius: 8px;
+    margin-right: 15px;
+}
+
+.product-info {
+    flex: 1;
+}
+
+.product-name {
+    font-size: 15px;
+    color: #333;
+    margin-bottom: 5px;
+    display: block;
+    line-height: 1.4;
+}
+
+.product-spec {
+    font-size: 13px;
+    color: #999;
+    margin-bottom: 10px;
+    display: block;
+}
+
+.product-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.product-price {
+    font-size: 16px;
+    color: #ff5000;
+    font-weight: bold;
+}
+
+.product-quantity {
+    font-size: 14px;
+    color: #666;
+}
+
+/* 订单信息 */
+.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;
+}
+
+.action-btn {
+    padding: 6px 15px;
+    border-radius: 15px;
+    font-size: 13px;
+    border: 1px solid;
+    background: none;
+}
+
+.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: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 10px;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
+.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 (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>
\ No newline at end of file
diff --git a/pages/mall/consumer/orderss.uvue b/pages/mall/consumer/orderss.uvue
new file mode 100644
index 00000000..9bf2a0ee
--- /dev/null
+++ b/pages/mall/consumer/orderss.uvue
@@ -0,0 +1,1050 @@
+<!-- 订单列表页面 -->
+<template>
+	<view class="orders-page">
+		<!-- 顶部栏 -->
+		<!-- <view class="orders-header" @click="goBackToHome">
+			<view class="header-left">
+				<text class="header-title">我的订单</text>
+			</view>
+			<view class="header-right">
+				<text class="search-icon" @click.stop="navigateToSearch">🔍</text>
+			</view>
+		</view> -->
+
+		<!-- 订单状态标签页 -->
+		<view class="order-tabs">
+			<view :class="['order-tab', { active: activeTab === 'all' }]" @click="changeTab('all')">
+				<text class="tab-text">全部</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'pending' }]" @click="changeTab('pending')">
+				<text class="tab-text">待支付</text>
+				<text v-if="tabBadges.pending > 0" class="tab-badge">{{ tabBadges.pending }}</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'shipping' }]" @click="changeTab('shipping')">
+				<text class="tab-text">待发货</text>
+				<text v-if="tabBadges.shipping > 0" class="tab-badge">{{ tabBadges.shipping }}</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'receiving' }]" @click="changeTab('receiving')">
+				<text class="tab-text">待收货</text>
+				<text v-if="tabBadges.receiving > 0" class="tab-badge">{{ tabBadges.receiving }}</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'review' }]" @click="changeTab('review')">
+				<text class="tab-text">待评价</text>
+				<text v-if="tabBadges.review > 0" class="tab-badge">{{ tabBadges.review }}</text>
+			</view>
+		</view>
+
+		<!-- 订单列表 -->
+		<scroll-view class="orders-list" scroll-y @scrolltolower="loadMore">
+			<!-- 订单为空 -->
+			<view v-if="orders.length === 0 && !isLoading" class="empty-orders">
+				<text class="empty-icon">📦</text>
+				<text class="empty-text">暂无订单</text>
+				<text class="empty-subtext">去逛逛吧，有惊喜在等你</text>
+				<button class="go-shopping-btn" @click="goShopping">去逛逛</button>
+			</view>
+
+			<!-- 订单项 -->
+			<view v-for="order in orders" :key="order.id" class="order-item">
+				<!-- 订单头部 -->
+				<view class="order-header">
+					<text class="order-no">订单号: {{ order.order_no }}</text>
+					<text :class="['order-status', getStatusClass(order.status)]">
+						{{ getStatusText(order.status) }}
+					</text>
+				</view>
+
+				<!-- 订单商品 -->
+				<view class="order-products" @click="viewOrderDetail(order)">
+					<view v-for="(item, index) in order.items" :key="index" class="product-item">
+						<image class="product-image" :src="item.product_image || '/static/default-product.png'" />
+						<view class="product-info">
+							<text class="product-name">{{ item.product_name }}</text>
+							<text v-if="item.sku_specifications" class="product-spec">
+								{{ getSpecText(item.sku_specifications) }}
+							</text>
+							<view class="product-price-row">
+								<text class="product-price">¥{{ item.price }}</text>
+								<text class="product-quantity">×{{ item.quantity }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 订单信息 -->
+				<view class="order-info">
+					<text class="order-time">{{ formatTime(order.created_at) }}</text>
+					<view class="order-total">
+						共{{ getTotalQuantity(order.items) }}件商品 合计:
+						<text class="total-amount">¥{{ order.actual_amount }}</text>
+					</view>
+				</view>
+
+				<!-- 订单操作 -->
+				<view class="order-actions">
+					<button v-if="order.status === 1" 
+									class="action-btn pay" 
+									@click="payOrder(order)">
+						立即支付
+					</button>
+					<button v-if="order.status === 1" 
+									class="action-btn cancel" 
+									@click="cancelOrder(order)">
+						取消订单
+					</button>
+					<button v-if="order.status === 2" 
+									class="action-btn remind" 
+									@click="remindShipment(order)">
+						提醒发货
+					</button>
+					<button v-if="order.status === 3" 
+									class="action-btn confirm" 
+									@click="confirmReceipt(order)">
+						确认收货
+					</button>
+					<button v-if="order.status === 4" 
+									class="action-btn review" 
+									@click="goToReview(order)">
+						评价
+					</button>
+					<button v-if="order.status === 4 || order.status === 5" 
+									class="action-btn delete" 
+									@click="deleteOrder(order)">
+						删除订单
+					</button>
+					<button v-if="order.status === 4" 
+									class="action-btn rebuy" 
+									@click="reBuy(order)">
+						再次购买
+					</button>
+					<button class="action-btn service" @click="contactService(order)">
+						联系客服
+					</button>
+				</view>
+			</view>
+
+			<!-- 加载更多 -->
+			<view v-if="isLoading" class="loading-more">
+				<text class="loading-text">加载中...</text>
+			</view>
+			<view v-if="!hasMore && orders.length > 0" class="no-more">
+				<text class="no-more-text">没有更多订单了</text>
+			</view>
+		</scroll-view>
+
+		<!-- 底部导航 -->
+		<view class="bottom-navigation">
+			<view class="nav-item" @click="goToHome">
+				<text class="nav-icon">🏠</text>
+				<text class="nav-text">首页</text>
+			</view>
+			<view class="nav-item" @click="goToCategory">
+				<text class="nav-icon">📂</text>
+				<text class="nav-text">分类</text>
+			</view>
+			<view class="nav-item active">
+				<text class="nav-icon">📦</text>
+				<text class="nav-text">订单</text>
+			</view>
+			<view class="nav-item" @click="goToProfile">
+				<text class="nav-icon">👤</text>
+				<text class="nav-text">我的</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, watch } from 'vue'
+import { onShow, onBackPress } from '@dcloudio/uni-app'
+import type { OrderType } from '@/types/mall-types.uts'
+// import supa from '@/components/supadb/aksupainstance.uts'
+
+type OrderItemType = {
+	id: string
+	product_id: string
+	product_name: string
+	product_image: string
+	sku_specifications: any
+	price: number
+	quantity: number
+}
+
+type FullOrderType = OrderType & {
+	items: Array<OrderItemType>
+}
+
+type TabBadgesType = {
+	pending: number
+	shipping: number
+	receiving: number
+	review: number
+}
+
+const activeTab = ref<string>('all')
+const orders = ref<Array<FullOrderType>>([])
+const tabBadges = ref<TabBadgesType>({
+	pending: 0,
+	shipping: 0,
+	receiving: 0,
+	review: 0
+})
+const isLoading = ref<boolean>(false)
+const currentPage = ref<number>(1)
+const pageSize = ref<number>(10)
+const hasMore = ref<boolean>(true)
+
+// 监听标签页变化
+watch(activeTab, () => {
+	loadOrders()
+})
+
+// 生命周期
+onMounted(() => {
+	loadOrderCounts()
+	loadOrders()
+})
+
+// 加载订单数量统计
+const loadOrderCounts = async () => {
+	const userId = getCurrentUserId() || 'user_001'
+	if (!userId) return
+
+	try {
+        // 从本地存储获取订单
+        const ordersStr = uni.getStorageSync('orders')
+        let localOrders: any[] = []
+        if (ordersStr) {
+            localOrders = JSON.parse(ordersStr as string) as any[]
+        }
+        
+        // 过滤当前用户的订单
+        const userOrders = localOrders.filter((o: any) => o.user_id === userId)
+
+		// 待支付
+		const pendingCount = userOrders.filter((o: any) => o.status === 1).length
+        tabBadges.value.pending = pendingCount
+
+		// 待发货
+		const shippingCount = userOrders.filter((o: any) => o.status === 2).length
+        tabBadges.value.shipping = shippingCount
+
+		// 待收货
+		const receivingCount = userOrders.filter((o: any) => o.status === 3).length
+        tabBadges.value.receiving = receivingCount
+
+		// 待评价
+		const reviewCount = userOrders.filter((o: any) => o.status === 4).length
+        tabBadges.value.review = reviewCount
+
+	} catch (err) {
+		console.error('加载订单统计异常:', err)
+	}
+}
+
+// 加载订单列表
+const loadOrders = async (loadMore: boolean = false) => {
+	const userId = getCurrentUserId() || 'user_001' // 默认用户ID
+	if (!userId) {
+		// uni.showToast({
+		// 	title: '请先登录',
+		// 	icon: 'none'
+		// })
+		// uni.navigateTo({
+		// 	url: '/pages/user/login'
+		// })
+        // 模拟已登录，用于测试
+        // return
+	}
+
+	if (isLoading.value || (!hasMore.value && loadMore)) {
+		return
+	}
+
+	isLoading.value = true
+
+	try {
+        const page = loadMore ? currentPage.value + 1 : 1
+		// 从本地存储获取订单
+        const ordersStr = uni.getStorageSync('orders')
+        let localOrders: any[] = []
+        if (ordersStr) {
+            localOrders = JSON.parse(ordersStr as string) as any[]
+        }
+        
+        // 过滤当前用户的订单
+        const userOrders = localOrders.filter((o: any) => o.user_id === userId)
+
+		// 根据标签页过滤
+        let filteredOrders = userOrders
+		switch (activeTab.value) {
+			case 'pending':
+				filteredOrders = userOrders.filter((o: any) => o.status === 1)
+				break
+			case 'shipping':
+				filteredOrders = userOrders.filter((o: any) => o.status === 2)
+				break
+			case 'receiving':
+				filteredOrders = userOrders.filter((o: any) => o.status === 3)
+				break
+			case 'review':
+				filteredOrders = userOrders.filter((o: any) => o.status === 4)
+				break
+		}
+        
+        // 按时间倒序
+        filteredOrders.sort((a: any, b: any) => {
+            return new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
+        })
+
+		// 分页 (模拟)
+        const total = filteredOrders.length
+        const start = (page - 1) * pageSize.value
+        const end = start + pageSize.value
+        const pagedOrders = filteredOrders.slice(start, end)
+		
+		// 处理订单数据，补充商品图片等信息
+		const processedOrders = await processOrderData(pagedOrders)
+
+		if (loadMore) {
+			for (let i = 0; i < processedOrders.length; i++) {
+				orders.value.push(processedOrders[i])
+			}
+			currentPage.value = page
+		} else {
+			orders.value = processedOrders
+			currentPage.value = 1
+		}
+
+		hasMore.value = end < total
+	} catch (err) {
+		console.error('加载订单异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 处理订单数据
+const processOrderData = async (orders: any[]): Promise<FullOrderType[]> => {
+	const processed: FullOrderType[] = []
+	
+	for (let i = 0; i < orders.length; i++) {
+		const order = orders[i]
+		const orderItems = order.items || [] // 这里的 items 已经在 checkout 存入时有了
+		
+		// 为每个商品项加载图片
+		// const itemsWithImages = await Promise.all(
+		// 	orderItems.map(async (item: any) => {
+		// 		const productImage = await getProductImage(item.product_id)
+		// 		return {
+		// 			...item,
+		// 			product_image: productImage
+		// 		}
+		// 	})
+		// )
+        // 本地存储的 items 应该已经有 image 字段了，如果没有，再尝试获取
+        const itemsWithImages = orderItems.map((item: any) => {
+             return {
+                 ...item,
+                 product_image: item.product_image || item.image || '/static/default-product.png',
+                 product_name: item.product_name || item.name // 兼容不同字段名
+             }
+        })
+
+		processed.push({
+			...order,
+			items: itemsWithImages
+		})
+	}
+
+	return processed
+}
+
+// 获取商品图片
+const getProductImage = async (productId: string): Promise<string> => {
+	try {
+		const { data, error } = await supa
+			.from('products')
+			.select('images')
+			.eq('id', productId)
+			.single()
+
+		if (error !== null) {
+			console.error('获取商品图片失败:', error)
+			return '/static/default-product.png'
+		}
+
+		return data?.images?.[0] || '/static/default-product.png'
+	} catch (err) {
+		console.error('获取商品图片异常:', err)
+		return '/static/default-product.png'
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string | null => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || null
+}
+
+// 获取状态文本
+const getStatusText = (status: number): string => {
+	const statusMap: Record<number, string> = {
+		1: '待支付',
+		2: '待发货',
+		3: '待收货',
+		4: '已完成',
+		5: '已取消'
+	}
+	return statusMap[status] || '未知状态'
+}
+
+// 获取状态样式类
+const getStatusClass = (status: number): string => {
+	const classMap: Record<number, string> = {
+		1: 'status-pending',
+		2: 'status-shipping',
+		3: 'status-receiving',
+		4: 'status-completed',
+		5: 'status-cancelled'
+	}
+	return classMap[status] || 'status-unknown'
+}
+
+// 获取规格文本
+const getSpecText = (specs: any): string => {
+	if (!specs) return ''
+	if (typeof specs === 'object') {
+		return Object.keys(specs)
+			.map(key => `${key}: ${specs[key]}`)
+			.join('; ')
+	}
+	return String(specs)
+}
+
+// 格式化时间
+const formatTime = (timeStr: string): string => {
+	const date = new Date(timeStr)
+	const year = date.getFullYear()
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	const hour = date.getHours().toString().padStart(2, '0')
+	const minute = date.getMinutes().toString().padStart(2, '0')
+	return `${year}-${month}-${day} ${hour}:${minute}`
+}
+
+// 计算商品总数
+const getTotalQuantity = (items: OrderItemType[]): number => {
+	return items.reduce((total, item) => total + item.quantity, 0)
+}
+
+// 返回主页
+const goBackToHome = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+
+// 导航到搜索页面
+const navigateToSearch = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/search'
+	})
+}
+
+// 监听手机返回键
+onBackPress(() => {
+	goBackToHome()
+	return true // 阻止默认返回行为
+})
+
+// 标签页切换
+const changeTab = (tab: string) => {
+	activeTab.value = tab
+}
+
+// 加载更多
+const loadMore = () => {
+	if (hasMore.value && !isLoading.value) {
+		loadOrders(true)
+	}
+}
+
+// 查看订单详情
+const viewOrderDetail = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/order-detail?id=${order.id}`
+	})
+}
+
+// 支付订单
+const payOrder = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/payment?orderId=${order.id}&amount=${order.actual_amount}`
+	})
+}
+
+// 取消订单
+const cancelOrder = async (order: FullOrderType) => {
+	uni.showModal({
+		title: '取消订单',
+		content: '确定要取消这个订单吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					const { error } = await supa
+						.from('orders')
+						.update({ status: 5 })
+						.eq('id', order.id)
+
+					if (error !== null) {
+						console.error('取消订单失败:', error)
+						uni.showToast({
+							title: '取消失败',
+							icon: 'none'
+						})
+						return
+					}
+
+					order.status = 5
+					loadOrderCounts() // 重新加载统计
+					
+					uni.showToast({
+						title: '订单已取消',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('取消订单异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 提醒发货
+const remindShipment = (order: FullOrderType) => {
+	uni.showToast({
+		title: '已提醒商家发货',
+		icon: 'success'
+	})
+}
+
+// 确认收货
+const confirmReceipt = async (order: FullOrderType) => {
+	uni.showModal({
+		title: '确认收货',
+		content: '确认已收到商品吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					const { error } = await supa
+						.from('orders')
+						.update({ status: 4 })
+						.eq('id', order.id)
+
+					if (error !== null) {
+						console.error('确认收货失败:', error)
+						uni.showToast({
+							title: '确认失败',
+							icon: 'none'
+						})
+						return
+					}
+
+					order.status = 4
+					loadOrderCounts() // 重新加载统计
+					
+					uni.showToast({
+						title: '确认收货成功',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('确认收货异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 去评价
+const goToReview = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/review?orderId=${order.id}`
+	})
+}
+
+// 删除订单
+const deleteOrder = async (order: FullOrderType) => {
+	uni.showModal({
+		title: '删除订单',
+		content: '确定要删除这个订单吗？删除后将无法恢复',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					const { error } = await supa
+						.from('orders')
+						.delete()
+						.eq('id', order.id)
+
+					if (error !== null) {
+						console.error('删除订单失败:', error)
+						uni.showToast({
+							title: '删除失败',
+							icon: 'none'
+						})
+						return
+					}
+
+					const index = orders.value.findIndex(o => o.id === order.id)
+					if (index !== -1) {
+						orders.value.splice(index, 1)
+						orders.value = [...orders.value]
+					}
+					
+					uni.showToast({
+						title: '删除成功',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('删除订单异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 再次购买
+const reBuy = async (order: FullOrderType) => {
+	// 将订单商品加入购物车
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+		const addPromises = order.items.map(item =>
+			supa
+				.from('shopping_cart')
+				.upsert({
+					user_id: userId,
+					product_id: item.product_id,
+					sku_id: null, // 这里需要获取SKU ID
+					quantity: item.quantity
+				})
+		)
+
+		await Promise.all(addPromises)
+		
+		uni.showToast({
+			title: '已加入购物车',
+			icon: 'success'
+		})
+	} catch (err) {
+		console.error('再次购买异常:', err)
+		uni.showToast({
+			title: '操作失败',
+			icon: 'none'
+		})
+	}
+}
+
+// 联系客服
+const contactService = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/service/chat?orderId=${order.id}`
+	})
+}
+
+// 去逛逛
+const goShopping = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+
+// 导航方法
+const goToHome = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+
+const goToCategory = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/category'
+	})
+}
+
+const goToProfile = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/profile'
+	})
+}
+</script>
+
+<style scoped>
+.orders-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.orders-header {
+	background-color: #ffffff;
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	cursor: pointer;
+}
+
+.header-left {
+	flex: 1;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.header-right {
+	display: flex;
+	align-items: center;
+}
+
+.search-icon {
+	font-size: 20px;
+	color: #333333;
+	padding: 5px;
+}
+
+.order-tabs {
+	background-color: #ffffff;
+	display: flex;
+    flex-direction: row;
+	border-bottom: 1px solid #e5e5e5;
+    justify-content: space-between;
+}
+
+.order-tab {
+	flex: 1;
+	padding: 15px 0;
+	text-align: center;
+	position: relative;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.order-tab.active {
+	color: #007aff;
+	border-bottom: 2px solid #007aff;
+}
+
+.tab-text {
+	font-size: 14px;
+	color: #666666;
+}
+
+.order-tab.active .tab-text {
+	color: #007aff;
+	font-weight: bold;
+}
+
+.tab-badge {
+	position: absolute;
+	top: 8px;
+	right: 5px;
+	background-color: #ff4757;
+	color: #ffffff;
+	font-size: 10px;
+	padding: 2px 5px;
+	border-radius: 8px;
+	min-width: 16px;
+	text-align: center;
+}
+
+.orders-list {
+	flex: 1;
+}
+
+.empty-orders {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80px 20px;
+	background-color: #ffffff;
+}
+
+.empty-icon {
+	font-size: 80px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+	margin-bottom: 30px;
+}
+
+.go-shopping-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 10px 40px;
+	border-radius: 25px;
+	font-size: 14px;
+	border: none;
+}
+
+.order-item {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+}
+
+.order-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.order-no {
+	font-size: 14px;
+	color: #333333;
+}
+
+.order-status {
+	font-size: 14px;
+	padding: 4px 10px;
+	border-radius: 12px;
+}
+
+.status-pending {
+	background-color: #ffa726;
+	color: #ffffff;
+}
+
+.status-shipping {
+	background-color: #2196f3;
+	color: #ffffff;
+}
+
+.status-receiving {
+	background-color: #9c27b0;
+	color: #ffffff;
+}
+
+.status-completed {
+	background-color: #4caf50;
+	color: #ffffff;
+}
+
+.status-cancelled {
+	background-color: #9e9e9e;
+	color: #ffffff;
+}
+
+.order-products {
+	margin-bottom: 15px;
+}
+
+.product-item {
+	display: flex;
+	margin-bottom: 10px;
+}
+
+.product-item:last-child {
+	margin-bottom: 0;
+}
+
+.product-image {
+	width: 60px;
+	height: 60px;
+	border-radius: 5px;
+	margin-right: 10px;
+}
+
+.product-info {
+	flex: 1;
+}
+
+.product-name {
+	font-size: 13px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.product-spec {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 5px;
+}
+
+.product-price-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.product-price {
+	font-size: 14px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.product-quantity {
+	font-size: 12px;
+	color: #666666;
+}
+
+.order-info {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	padding-top: 10px;
+	border-top: 1px solid #f5f5f5;
+}
+
+.order-time {
+	font-size: 12px;
+	color: #999999;
+}
+
+.order-total {
+	font-size: 14px;
+	color: #333333;
+}
+
+.total-amount {
+	font-size: 16px;
+	color: #ff4757;
+	font-weight: bold;
+	margin-left: 5px;
+}
+
+.order-actions {
+	display: flex;
+	justify-content: flex-end;
+	gap: 10px;
+	flex-wrap: wrap;
+}
+
+.action-btn {
+	padding: 8px 15px;
+	border-radius: 15px;
+	font-size: 12px;
+	border: 1px solid;
+	background-color: #ffffff;
+}
+
+.action-btn.pay {
+	border-color: #ff4757;
+	color: #ff4757;
+}
+
+.action-btn.cancel {
+	border-color: #666666;
+	color: #666666;
+}
+
+.action-btn.remind {
+	border-color: #2196f3;
+	color: #2196f3;
+}
+
+.action-btn.confirm {
+	border-color: #4caf50;
+	color: #4caf50;
+}
+
+.action-btn.review {
+	border-color: #ffa726;
+	color: #ffa726;
+}
+
+.action-btn.delete {
+	border-color: #9e9e9e;
+	color: #9e9e9e;
+}
+
+.action-btn.rebuy {
+	border-color: #007aff;
+	color: #007aff;
+}
+
+.action-btn.service {
+	border-color: #9c27b0;
+	color: #9c27b0;
+}
+
+.loading-more,
+.no-more {
+	padding: 20px;
+	text-align: center;
+	background-color: #ffffff;
+}
+
+.loading-text,
+.no-more-text {
+	color: #999999;
+	font-size: 14px;
+}
+
+/* 底部导航栏 */
+.bottom-navigation {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 50px;
+    background: #ffffff;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f0f0f0;
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+    z-index: 100;
+}
+
+.nav-item {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+}
+
+.nav-icon {
+    font-size: 24px;
+    margin-bottom: 2px;
+}
+
+.nav-text {
+    font-size: 10px;
+    color: #999;
+}
+
+.nav-item.active .nav-text {
+    color: #4CAF50;
+    font-weight: 500;
+}
+</style>
diff --git a/pages/mall/consumer/ordersx.uvue b/pages/mall/consumer/ordersx.uvue
new file mode 100644
index 00000000..48a43200
--- /dev/null
+++ b/pages/mall/consumer/ordersx.uvue
@@ -0,0 +1,1046 @@
+<!-- 订单列表页面 -->
+<template>
+	<view class="orders-page">
+		<!-- 顶部栏 -->
+		<!-- <view class="orders-header">
+			<view class="header-title">
+				<text class="title-text">我的订单</text>
+			</view>
+		</view> -->
+
+		<!-- 订单状态标签页 -->
+		<view class="order-tabs">
+			<view :class="['order-tab', { active: activeTab === 'all' }]" @click="changeTab('all')">
+				<text class="tab-text">全部</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'pending' }]" @click="changeTab('pending')">
+				<text class="tab-text">待支付</text>
+				<text v-if="tabBadges.pending > 0" class="tab-badge">{{ tabBadges.pending }}</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'shipping' }]" @click="changeTab('shipping')">
+				<text class="tab-text">待发货</text>
+				<text v-if="tabBadges.shipping > 0" class="tab-badge">{{ tabBadges.shipping }}</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'receiving' }]" @click="changeTab('receiving')">
+				<text class="tab-text">待收货</text>
+				<text v-if="tabBadges.receiving > 0" class="tab-badge">{{ tabBadges.receiving }}</text>
+			</view>
+			<view :class="['order-tab', { active: activeTab === 'review' }]" @click="changeTab('review')">
+				<text class="tab-text">待评价</text>
+				<text v-if="tabBadges.review > 0" class="tab-badge">{{ tabBadges.review }}</text>
+			</view>
+		</view>
+
+		<!-- 订单列表 -->
+		<scroll-view class="orders-list" scroll-y @scrolltolower="loadMore">
+			<!-- 订单为空 -->
+			<view v-if="orders.length === 0 && !isLoading" class="empty-orders">
+				<text class="empty-icon">📦</text>
+				<text class="empty-text">暂无订单</text>
+				<text class="empty-subtext">去逛逛吧，有惊喜在等你</text>
+				<button class="go-shopping-btn" @click="goShopping">去逛逛</button>
+			</view>
+
+			<!-- 订单项 -->
+			<view v-for="order in orders" :key="order.id" class="order-item">
+				<!-- 订单头部 -->
+				<view class="order-header">
+					<text class="order-no">订单号: {{ order.order_no }}</text>
+					<text :class="['order-status', getStatusClass(order.status)]">
+						{{ getStatusText(order.status) }}
+					</text>
+				</view>
+
+				<!-- 订单商品 -->
+				<view class="order-products" @click="viewOrderDetail(order)">
+					<view v-for="(item, index) in order.items" :key="index" class="product-item">
+						<image class="product-image" :src="item.product_image || '/static/default-product.png'" />
+						<view class="product-info">
+							<text class="product-name">{{ item.product_name }}</text>
+							<text v-if="item.sku_specifications" class="product-spec">
+								{{ getSpecText(item.sku_specifications) }}
+							</text>
+							<view class="product-price-row">
+								<text class="product-price">¥{{ item.price }}</text>
+								<text class="product-quantity">×{{ item.quantity }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 订单信息 -->
+				<view class="order-info">
+					<text class="order-time">{{ formatTime(order.created_at) }}</text>
+					<view class="order-total">
+						共{{ getTotalQuantity(order.items) }}件商品 合计:
+						<text class="total-amount">¥{{ order.actual_amount }}</text>
+					</view>
+				</view>
+
+				<!-- 订单操作 -->
+				<view class="order-actions">
+					<button v-if="order.status === 1" 
+									class="action-btn pay" 
+									@click="payOrder(order)">
+						立即支付
+					</button>
+					<button v-if="order.status === 1" 
+									class="action-btn cancel" 
+									@click="cancelOrder(order)">
+						取消订单
+					</button>
+					<button v-if="order.status === 2" 
+									class="action-btn remind" 
+									@click="remindShipment(order)">
+						提醒发货
+					</button>
+					<button v-if="order.status === 3" 
+									class="action-btn confirm" 
+									@click="confirmReceipt(order)">
+						确认收货
+					</button>
+					<button v-if="order.status === 4" 
+									class="action-btn review" 
+									@click="goToReview(order)">
+						评价
+					</button>
+					<button v-if="order.status === 4 || order.status === 5" 
+									class="action-btn delete" 
+									@click="deleteOrder(order)">
+						删除订单
+					</button>
+					<button v-if="order.status === 4" 
+									class="action-btn rebuy" 
+									@click="reBuy(order)">
+						再次购买
+					</button>
+					<button class="action-btn service" @click="contactService(order)">
+						联系客服
+					</button>
+				</view>
+			</view>
+
+			<!-- 加载更多 -->
+			<view v-if="isLoading" class="loading-more">
+				<text class="loading-text">加载中...</text>
+			</view>
+			<view v-if="!hasMore && orders.length > 0" class="no-more">
+				<text class="no-more-text">没有更多订单了</text>
+			</view>
+		</scroll-view>
+
+		<!-- 底部导航 -->
+		<view class="bottom-navigation">
+			<view class="nav-item" @click="goToHome">
+				<text class="nav-icon">🏠</text>
+				<text class="nav-text">首页</text>
+			</view>
+			<view class="nav-item" @click="goToCategory">
+				<text class="nav-icon">📂</text>
+				<text class="nav-text">分类</text>
+			</view>
+			<view class="nav-item active">
+				<text class="nav-icon">📦</text>
+				<text class="nav-text">订单</text>
+			</view>
+			<view class="nav-item" @click="goToProfile">
+				<text class="nav-icon">👤</text>
+				<text class="nav-text">我的</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, watch } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import type { OrderType } from '@/types/mall-types.uts'
+// import supa from '@/components/supadb/aksupainstance.uts'
+
+type OrderItemType = {
+	id: string
+	product_id: string
+	product_name: string
+	product_image: string
+	sku_specifications: any
+	price: number
+	quantity: number
+}
+
+type FullOrderType = OrderType & {
+	items: Array<OrderItemType>
+}
+
+type TabBadgesType = {
+	pending: number
+	shipping: number
+	receiving: number
+	review: number
+}
+
+const activeTab = ref<string>('all')
+const orders = ref<Array<FullOrderType>>([])
+const tabBadges = ref<TabBadgesType>({
+	pending: 0,
+	shipping: 0,
+	receiving: 0,
+	review: 0
+})
+const isLoading = ref<boolean>(false)
+const currentPage = ref<number>(1)
+const pageSize = ref<number>(10)
+const hasMore = ref<boolean>(true)
+
+// 监听标签页变化
+watch(activeTab, () => {
+	loadOrders()
+})
+
+// 生命周期
+onMounted(() => {
+	loadOrderCounts()
+	loadOrders()
+})
+
+onShow(() => {
+    // 每次显示页面时重新加载数据，确保状态同步
+    loadOrderCounts()
+    loadOrders()
+})
+
+// 加载订单数量统计
+const loadOrderCounts = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+        // 从本地存储获取订单
+        const ordersStr = uni.getStorageSync('orders')
+        let localOrders: any[] = []
+        if (ordersStr) {
+            localOrders = JSON.parse(ordersStr as string) as any[]
+        }
+        
+        // 过滤当前用户的订单
+        const userOrders = localOrders.filter((o: any) => o.user_id === userId)
+
+		// 待支付
+		const pendingCount = userOrders.filter((o: any) => o.status === 1).length
+        tabBadges.value.pending = pendingCount
+
+		// 待发货
+		const shippingCount = userOrders.filter((o: any) => o.status === 2).length
+        tabBadges.value.shipping = shippingCount
+
+		// 待收货
+		const receivingCount = userOrders.filter((o: any) => o.status === 3).length
+        tabBadges.value.receiving = receivingCount
+
+		// 待评价
+		const reviewCount = userOrders.filter((o: any) => o.status === 4).length
+        tabBadges.value.review = reviewCount
+
+	} catch (err) {
+		console.error('加载订单统计异常:', err)
+	}
+}
+
+// 加载订单列表
+const loadOrders = async (loadMore: boolean = false) => {
+	const userId = getCurrentUserId()
+	if (!userId) {
+		// uni.showToast({
+		// 	title: '请先登录',
+		// 	icon: 'none'
+		// })
+		// uni.navigateTo({
+		// 	url: '/pages/user/login'
+		// })
+        // 模拟已登录，用于测试
+        // return
+	}
+
+	if (isLoading.value || (!hasMore.value && loadMore)) {
+		return
+	}
+
+	isLoading.value = true
+
+	try {
+		// 从本地存储获取订单
+        const ordersStr = uni.getStorageSync('orders')
+        let localOrders: any[] = []
+        if (ordersStr) {
+            localOrders = JSON.parse(ordersStr as string) as any[]
+        }
+        
+        // 过滤当前用户的订单
+        // const userOrders = localOrders.filter((o: any) => o.user_id === userId)
+        // 暂时显示所有订单用于测试
+        let userOrders = localOrders
+
+		// 根据标签页过滤
+		switch (activeTab.value) {
+			case 'pending':
+				userOrders = userOrders.filter((o: any) => o.status === 1)
+				break
+			case 'shipping':
+				userOrders = userOrders.filter((o: any) => o.status === 2)
+				break
+			case 'receiving':
+				userOrders = userOrders.filter((o: any) => o.status === 3)
+				break
+			case 'review':
+				userOrders = userOrders.filter((o: any) => o.status === 4)
+				break
+		}
+        
+        // 按时间倒序
+        userOrders.sort((a: any, b: any) => {
+            return new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
+        })
+
+		// 分页 (模拟)
+        const total = userOrders.length
+        const start = (currentPage.value - 1) * pageSize.value
+        const end = start + pageSize.value
+        const pagedOrders = userOrders.slice(start, end)
+		
+		// 处理订单数据，补充商品图片等信息
+		const processedOrders = await processOrderData(pagedOrders)
+
+		if (loadMore) {
+			for (let i = 0; i < processedOrders.length; i++) {
+				orders.value.push(processedOrders[i])
+			}
+            // currentPage.value++ // 不需要加，因为外面传进来的是 loadMore=true，但这里是模拟分页，逻辑有点不一样
+		} else {
+			orders.value = processedOrders
+			// currentPage.value = 1
+		}
+
+		hasMore.value = end < total
+	} catch (err) {
+		console.error('加载订单异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 处理订单数据
+const processOrderData = async (orders: any[]): Promise<FullOrderType[]> => {
+	const processed: FullOrderType[] = []
+	
+	for (let i = 0; i < orders.length; i++) {
+		const order = orders[i]
+		const orderItems = order.items || [] // 这里的 items 已经在 checkout 存入时有了
+		
+		// 为每个商品项加载图片
+		// const itemsWithImages = await Promise.all(
+		// 	orderItems.map(async (item: any) => {
+		// 		const productImage = await getProductImage(item.product_id)
+		// 		return {
+		// 			...item,
+		// 			product_image: productImage
+		// 		}
+		// 	})
+		// )
+        // 本地存储的 items 应该已经有 image 字段了，如果没有，再尝试获取
+        const itemsWithImages = orderItems.map((item: any) => {
+             return {
+                 ...item,
+                 product_image: item.product_image || item.image || '/static/default-product.png',
+                 product_name: item.product_name || item.name // 兼容不同字段名
+             }
+        })
+
+		processed.push({
+			...order,
+			items: itemsWithImages
+		})
+	}
+
+	return processed
+}
+
+// 获取商品图片
+const getProductImage = async (productId: string): Promise<string> => {
+	try {
+        /*
+		const { data, error } = await supa
+			.from('products')
+			.select('images')
+			.eq('id', productId)
+			.single()
+
+		if (error !== null) {
+			console.error('获取商品图片失败:', error)
+			return '/static/default-product.png'
+		}
+
+		return data?.images?.[0] || '/static/default-product.png'
+        */
+       return '/static/default-product.png'
+	} catch (err) {
+		console.error('获取商品图片异常:', err)
+		return '/static/default-product.png'
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string | null => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || null
+}
+
+// 获取状态文本
+const getStatusText = (status: number): string => {
+	const statusMap: Record<number, string> = {
+		1: '待支付',
+		2: '待发货',
+		3: '待收货',
+		4: '已完成',
+		5: '已取消'
+	}
+	return statusMap[status] || '未知状态'
+}
+
+// 获取状态样式类
+const getStatusClass = (status: number): string => {
+	const classMap: Record<number, string> = {
+		1: 'status-pending',
+		2: 'status-shipping',
+		3: 'status-receiving',
+		4: 'status-completed',
+		5: 'status-cancelled'
+	}
+	return classMap[status] || 'status-unknown'
+}
+
+// 获取规格文本
+const getSpecText = (specs: any): string => {
+	if (!specs) return ''
+	if (typeof specs === 'object') {
+		return Object.keys(specs)
+			.map(key => `${key}: ${specs[key]}`)
+			.join('; ')
+	}
+	return String(specs)
+}
+
+// 格式化时间
+const formatTime = (timeStr: string): string => {
+	const date = new Date(timeStr)
+	const year = date.getFullYear()
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	const hour = date.getHours().toString().padStart(2, '0')
+	const minute = date.getMinutes().toString().padStart(2, '0')
+	return `${year}-${month}-${day} ${hour}:${minute}`
+}
+
+// 计算商品总数
+const getTotalQuantity = (items: OrderItemType[]): number => {
+	return items.reduce((total, item) => total + item.quantity, 0)
+}
+
+// 标签页切换
+const changeTab = (tab: string) => {
+	activeTab.value = tab
+}
+
+// 加载更多
+const loadMore = () => {
+	if (hasMore.value && !isLoading.value) {
+		loadOrders(true)
+	}
+}
+
+// 查看订单详情
+const viewOrderDetail = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/order-detail?id=${order.id}`
+	})
+}
+
+// 支付订单
+const payOrder = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/payment?orderId=${order.id}&amount=${order.actual_amount}`
+	})
+}
+
+// 取消订单
+const cancelOrder = async (order: FullOrderType) => {
+	uni.showModal({
+		title: '取消订单',
+		content: '确定要取消这个订单吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+                    /*
+					const { error } = await supa
+						.from('orders')
+						.update({ status: 5 })
+						.eq('id', order.id)
+
+					if (error !== null) {
+						console.error('取消订单失败:', error)
+						uni.showToast({
+							title: '取消失败',
+							icon: 'none'
+						})
+						return
+					}
+                    */
+
+                    // 更新本地存储
+                    const ordersStr = uni.getStorageSync('orders')
+                    if (ordersStr) {
+                        const ordersArr = JSON.parse(ordersStr as string) as any[]
+                        const index = ordersArr.findIndex((o: any) => o.id === order.id)
+                        if (index !== -1) {
+                            ordersArr[index].status = 5
+                            uni.setStorageSync('orders', JSON.stringify(ordersArr))
+                        }
+                    }
+
+					order.status = 5
+					loadOrderCounts() // 重新加载统计
+					
+					uni.showToast({
+						title: '订单已取消',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('取消订单异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 提醒发货
+const remindShipment = (order: FullOrderType) => {
+	uni.showToast({
+		title: '已提醒商家发货',
+		icon: 'success'
+	})
+}
+
+// 确认收货
+const confirmReceipt = async (order: FullOrderType) => {
+	uni.showModal({
+		title: '确认收货',
+		content: '确认已收到商品吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+                    /*
+					const { error } = await supa
+						.from('orders')
+						.update({ status: 4 })
+						.eq('id', order.id)
+
+					if (error !== null) {
+						console.error('确认收货失败:', error)
+						uni.showToast({
+							title: '确认失败',
+							icon: 'none'
+						})
+						return
+					}
+                    */
+
+                    // 更新本地存储
+                    const ordersStr = uni.getStorageSync('orders')
+                    if (ordersStr) {
+                        const ordersArr = JSON.parse(ordersStr as string) as any[]
+                        const index = ordersArr.findIndex((o: any) => o.id === order.id)
+                        if (index !== -1) {
+                            ordersArr[index].status = 4
+                            uni.setStorageSync('orders', JSON.stringify(ordersArr))
+                        }
+                    }
+
+					order.status = 4
+					loadOrderCounts() // 重新加载统计
+					
+					uni.showToast({
+						title: '确认收货成功',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('确认收货异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 去评价
+const goToReview = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/review?orderId=${order.id}`
+	})
+}
+
+// 删除订单
+const deleteOrder = async (order: FullOrderType) => {
+	uni.showModal({
+		title: '删除订单',
+		content: '确定要删除这个订单吗？删除后将无法恢复',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					/*
+					const { error } = await supa
+						.from('orders')
+						.delete()
+						.eq('id', order.id)
+
+					if (error !== null) {
+						console.error('删除订单失败:', error)
+						uni.showToast({
+							title: '删除失败',
+							icon: 'none'
+						})
+						return
+					}
+					*/
+
+					// 更新本地存储
+					const ordersStr = uni.getStorageSync('orders')
+					if (ordersStr) {
+						const ordersArr = JSON.parse(ordersStr as string) as any[]
+						const index = ordersArr.findIndex((o: any) => o.id === order.id)
+						if (index !== -1) {
+							ordersArr.splice(index, 1)
+							uni.setStorageSync('orders', JSON.stringify(ordersArr))
+						}
+					}
+
+					const index = orders.value.findIndex(o => o.id === order.id)
+					if (index !== -1) {
+						orders.value.splice(index, 1)
+						orders.value = [...orders.value]
+					}
+					
+					uni.showToast({
+						title: '删除成功',
+						icon: 'success'
+					})
+				} catch (err) {
+					console.error('删除订单异常:', err)
+				}
+			}
+		}
+	})
+}
+
+// 再次购买
+const reBuy = async (order: FullOrderType) => {
+	// 将订单商品加入购物车
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+        /*
+		const addPromises = order.items.map(item =>
+			supa
+				.from('shopping_cart')
+				.upsert({
+					user_id: userId,
+					product_id: item.product_id,
+					sku_id: null, // 这里需要获取SKU ID
+					quantity: item.quantity
+				})
+		)
+
+		await Promise.all(addPromises)
+        */
+		
+		uni.showToast({
+			title: '已加入购物车',
+			icon: 'success'
+		})
+	} catch (err) {
+		console.error('再次购买异常:', err)
+		uni.showToast({
+			title: '操作失败',
+			icon: 'none'
+		})
+	}
+}
+
+// 联系客服
+const contactService = (order: FullOrderType) => {
+	uni.navigateTo({
+		url: `/pages/mall/service/chat?orderId=${order.id}`
+	})
+}
+
+// 去逛逛
+const goShopping = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+
+// 导航方法
+const goToHome = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/index'
+	})
+}
+
+const goToCategory = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/category'
+	})
+}
+
+const goToProfile = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/profile'
+	})
+}
+</script>
+
+<style scoped>
+.orders-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.orders-header {
+	background-color: #ffffff;
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.header-title {
+	text-align: center;
+}
+
+.title-text {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.order-tabs {
+	background-color: #ffffff;
+	display: flex;
+	overflow-x: auto;
+	white-space: nowrap;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.order-tab {
+	flex: 1;
+	min-width: 80px;
+	padding: 15px 10px;
+	text-align: center;
+	position: relative;
+}
+
+.order-tab.active {
+	color: #007aff;
+	border-bottom: 2px solid #007aff;
+}
+
+.tab-text {
+	font-size: 14px;
+	color: #666666;
+}
+
+.order-tab.active .tab-text {
+	color: #007aff;
+	font-weight: bold;
+}
+
+.tab-badge {
+	position: absolute;
+	top: 8px;
+	right: 5px;
+	background-color: #ff4757;
+	color: #ffffff;
+	font-size: 10px;
+	padding: 2px 5px;
+	border-radius: 8px;
+	min-width: 16px;
+	text-align: center;
+}
+
+.orders-list {
+	flex: 1;
+}
+
+.empty-orders {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80px 20px;
+	background-color: #ffffff;
+}
+
+.empty-icon {
+	font-size: 80px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+	margin-bottom: 30px;
+}
+
+.go-shopping-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 10px 40px;
+	border-radius: 25px;
+	font-size: 14px;
+	border: none;
+}
+
+.order-item {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+}
+
+.order-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.order-no {
+	font-size: 14px;
+	color: #333333;
+}
+
+.order-status {
+	font-size: 14px;
+	padding: 4px 10px;
+	border-radius: 12px;
+}
+
+.status-pending {
+	background-color: #ffa726;
+	color: #ffffff;
+}
+
+.status-shipping {
+	background-color: #2196f3;
+	color: #ffffff;
+}
+
+.status-receiving {
+	background-color: #9c27b0;
+	color: #ffffff;
+}
+
+.status-completed {
+	background-color: #4caf50;
+	color: #ffffff;
+}
+
+.status-cancelled {
+	background-color: #9e9e9e;
+	color: #ffffff;
+}
+
+.order-products {
+	margin-bottom: 15px;
+}
+
+.product-item {
+	display: flex;
+	margin-bottom: 10px;
+}
+
+.product-item:last-child {
+	margin-bottom: 0;
+}
+
+.product-image {
+	width: 60px;
+	height: 60px;
+	border-radius: 5px;
+	margin-right: 10px;
+}
+
+.product-info {
+	flex: 1;
+}
+
+.product-name {
+	font-size: 13px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.product-spec {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 5px;
+}
+
+.product-price-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.product-price {
+	font-size: 14px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.product-quantity {
+	font-size: 12px;
+	color: #666666;
+}
+
+.order-info {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	padding-top: 10px;
+	border-top: 1px solid #f5f5f5;
+}
+
+.order-time {
+	font-size: 12px;
+	color: #999999;
+}
+
+.order-total {
+	font-size: 14px;
+	color: #333333;
+}
+
+.total-amount {
+	font-size: 16px;
+	color: #ff4757;
+	font-weight: bold;
+	margin-left: 5px;
+}
+
+.order-actions {
+	display: flex;
+	justify-content: flex-end;
+	gap: 10px;
+	flex-wrap: wrap;
+}
+
+.action-btn {
+	padding: 8px 15px;
+	border-radius: 15px;
+	font-size: 12px;
+	border: 1px solid;
+	background-color: #ffffff;
+}
+
+.action-btn.pay {
+	border-color: #ff4757;
+	color: #ff4757;
+}
+
+.action-btn.cancel {
+	border-color: #666666;
+	color: #666666;
+}
+
+.action-btn.remind {
+	border-color: #2196f3;
+	color: #2196f3;
+}
+
+.action-btn.confirm {
+	border-color: #4caf50;
+	color: #4caf50;
+}
+
+.action-btn.review {
+	border-color: #ffa726;
+	color: #ffa726;
+}
+
+.action-btn.delete {
+	border-color: #9e9e9e;
+	color: #9e9e9e;
+}
+
+.action-btn.rebuy {
+	border-color: #007aff;
+	color: #007aff;
+}
+
+.action-btn.service {
+	border-color: #9c27b0;
+	color: #9c27b0;
+}
+
+.loading-more,
+.no-more {
+	padding: 20px;
+	text-align: center;
+	background-color: #ffffff;
+}
+
+.loading-text,
+.no-more-text {
+	color: #999999;
+	font-size: 14px;
+}
+
+.bottom-navigation {
+	background-color: #ffffff;
+	border-top: 1px solid #e5e5e5;
+	display: flex;
+	padding: 10px 0;
+}
+
+.nav-item {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.nav-item.active {
+	color: #007aff;
+}
+
+.nav-icon {
+	font-size: 20px;
+	margin-bottom: 2px;
+}
+
+.nav-text {
+	font-size: 10px;
+}
+</style>
diff --git a/pages/mall/consumer/payment-success.uvue b/pages/mall/consumer/payment-success.uvue
new file mode 100644
index 00000000..1cb6e888
--- /dev/null
+++ b/pages/mall/consumer/payment-success.uvue
@@ -0,0 +1,190 @@
+<template>
+  <view class="payment-success-page">
+    <view class="success-content">
+      <view class="icon-wrapper">
+        <text class="success-icon">✓</text>
+      </view>
+      <text class="success-title">支付成功</text>
+      <text class="success-desc">您的订单已支付成功，我们将尽快为您发货</text>
+      
+      <view class="order-info" v-if="orderId">
+        <text class="info-text">订单编号：{{ orderNo }}</text>
+        <text class="info-text">支付金额：¥{{ amount.toFixed(2) }}</text>
+      </view>
+      
+      <view class="action-buttons">
+        <button class="btn primary-btn" @click="viewOrder">查看订单</button>
+        <button class="btn secondary-btn" @click="goHome">返回首页</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+// import supa from '@/components/supadb/aksupainstance.uts' // 暂时注释掉数据库连接
+
+const orderId = ref('')
+const orderNo = ref('')
+const amount = ref(0)
+
+onMounted(() => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  const options = currentPage.options as any
+  
+  if (options.orderId) {
+    orderId.value = options.orderId
+    orderNo.value = options.orderId // 使用订单ID作为订单号
+    
+    // 优先使用传递的 amount
+    if (options.amount) {
+        amount.value = parseFloat(options.amount)
+    } else {
+        // 如果没有传 amount，尝试从本地存储查找订单
+        try {
+            const ordersStr = uni.getStorageSync('orders')
+            if (ordersStr) {
+                const orders = JSON.parse(ordersStr as string) as any[]
+                const order = orders.find((o: any) => o.id === orderId.value)
+                if (order) {
+                    amount.value = order.actual_amount || order.total_amount || 0
+                }
+            }
+        } catch (e) {
+            console.error('读取本地订单失败', e)
+        }
+    }
+    
+    // loadOrderInfo() // 暂时注释掉数据库查询
+  }
+})
+
+// const loadOrderInfo = async () => {
+//   try {
+//     const { data, error } = await supa
+//       .from('orders')
+//       .select('order_no, actual_amount')
+//       .eq('id', orderId.value)
+//       .single()
+// 
+//     if (error == null && data != null) {
+//       orderNo.value = data['order_no'] as string
+//       amount.value = data['actual_amount'] as number
+//     }
+//   } catch (err) {
+//     console.error('加载订单信息失败', err)
+//   }
+// }
+
+const viewOrder = () => {
+  uni.navigateTo({
+    url: '/pages/mall/consumer/orders'
+  })
+}
+
+const goHome = () => {
+  uni.switchTab({
+    url: '/pages/mall/consumer/index'
+  })
+}
+</script>
+
+<style scoped>
+.payment-success-page {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+  background-color: #ffffff;
+  padding: 0 30px;
+}
+
+.success-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+
+.icon-wrapper {
+  width: 80px;
+  height: 80px;
+  border-radius: 40px;
+  background-color: #4cd964;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20px;
+  box-shadow: 0 4px 10px rgba(76, 217, 100, 0.3);
+}
+
+.success-icon {
+  font-size: 40px;
+  color: #ffffff;
+  font-weight: bold;
+}
+
+.success-title {
+  font-size: 24px;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 10px;
+}
+
+.success-desc {
+  font-size: 14px;
+  color: #999999;
+  text-align: center;
+  margin-bottom: 30px;
+  line-height: 1.5;
+}
+
+.order-info {
+  background-color: #f9f9f9;
+  padding: 15px 20px;
+  border-radius: 8px;
+  width: 100%;
+  margin-bottom: 30px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.info-text {
+  font-size: 14px;
+  color: #666666;
+  margin-bottom: 5px;
+}
+
+.action-buttons {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+}
+
+.btn {
+  width: 100%;
+  height: 45px;
+  border-radius: 22.5px;
+  font-size: 16px;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.primary-btn {
+  background-color: #007aff;
+  color: #ffffff;
+  border: none;
+}
+
+.secondary-btn {
+  background-color: #ffffff;
+  color: #666666;
+  border: 1px solid #cccccc;
+}
+</style>
diff --git a/pages/mall/consumer/payment.uvue b/pages/mall/consumer/payment.uvue
new file mode 100644
index 00000000..7d4f8c11
--- /dev/null
+++ b/pages/mall/consumer/payment.uvue
@@ -0,0 +1,988 @@
+<!-- 支付页面 -->
+<template>
+	<view class="payment-page">
+		<view class="payment-content">
+			<!-- 价格明细 -->
+			<view class="price-detail-section">
+				<text class="section-title">价格明细</text>
+				<view class="price-detail">
+					<view class="price-row">
+						<text class="price-label">商品总价</text>
+						<text class="price-value">¥{{ productAmount.toFixed(2) }}</text>
+					</view>
+					<view class="price-row">
+						<text class="price-label">运费</text>
+						<text class="price-value">+¥{{ deliveryFee.toFixed(2) }}</text>
+					</view>
+					<view v-if="discountAmount > 0" class="price-row">
+						<text class="price-label">优惠减免</text>
+						<text class="price-value discount">-¥{{ discountAmount.toFixed(2) }}</text>
+					</view>
+					<view class="price-row total">
+						<text class="price-label">应付金额</text>
+						<text class="price-value total-price">¥{{ amount.toFixed(2) }}</text>
+					</view>
+				</view>
+				<text class="order-no">订单号: {{ orderNo }}</text>
+			</view>
+
+			<!-- 支付方式 -->
+			<view class="methods-section">
+				<text class="section-title">选择支付方式</text>
+				<view class="method-list">
+					<view v-for="method in paymentMethods" 
+								:key="method.id" 
+								:class="['method-item', { selected: selectedMethod === method.id }]"
+								@click="selectMethod(method)">
+						<view class="method-left">
+							<text class="method-icon">{{ getMethodIcon(method.id) }}</text>
+							<view class="method-info">
+								<text class="method-name">{{ method.name }}</text>
+								<text class="method-desc">{{ method.description }}</text>
+							</view>
+						</view>
+						<view v-if="selectedMethod === method.id" class="method-selected">
+							<text class="selected-icon">✓</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 余额支付 -->
+			<view v-if="selectedMethod === 'balance' && userBalance > 0" class="balance-section">
+				<view class="balance-info">
+					<text class="balance-label">账户余额</text>
+					<text class="balance-value">¥{{ userBalance.toFixed(2) }}</text>
+				</view>
+				<view v-if="userBalance < amount" class="balance-tip">
+					<text class="tip-text">余额不足，请选择其他支付方式</text>
+				</view>
+			</view>
+
+			<!-- 密码输入 -->
+			<view v-if="showPassword" class="password-section">
+				<text class="password-title">请输入支付密码</text>
+				<view class="password-input">
+					<view v-for="(_, index) in 6" 
+								:key="index" 
+								class="password-dot">
+						<text v-if="password.length > index">●</text>
+					</view>
+				</view>
+				<text class="forgot-password" @click="forgotPassword">忘记密码？</text>
+			</view>
+		</view>
+
+		<!-- 底部支付按钮 -->
+		<view class="payment-bottom">
+			<view class="price-summary">
+				<text class="summary-label">需支付:</text>
+				<text class="summary-price">¥{{ amount.toFixed(2) }}</text>
+			</view>
+			<button class="pay-btn" 
+							:class="{ disabled: isPaying || (selectedMethod === 'balance' && userBalance < amount) }"
+							@click="confirmPayment">
+				<text v-if="!isPaying" class="pay-text">{{ getPayButtonText() }}</text>
+				<text v-else class="pay-text">支付中...</text>
+			</button>
+		</view>
+
+		<!-- 密码键盘 -->
+		<view v-if="showPassword" class="password-keyboard">
+			<view class="keyboard-grid">
+				<view v-for="num in 9" 
+							:key="num" 
+							class="keyboard-key"
+							@click="inputPassword(num.toString())">
+					<text class="key-text">{{ num }}</text>
+				</view>
+				<view class="keyboard-key"></view>
+				<view class="keyboard-key" @click="inputPassword('0')">
+					<text class="key-text">0</text>
+				</view>
+				<view class="keyboard-key" @click="deletePassword">
+					<text class="key-text">⌫</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, watch, computed, onUnmounted } from 'vue'
+import { onLoad, onBackPress } from '@dcloudio/uni-app'
+// import { supabase as supa } from '@/components/supadb/aksupainstance.uts'
+
+type PaymentMethodType = {
+	id: string
+	name: string
+	description: string
+	icon: string
+	enabled: boolean
+}
+
+const orderId = ref<string>('')
+const orderNo = ref<string>('')
+const amount = ref<number>(0)
+const paymentMethods = ref<Array<PaymentMethodType>>([])
+const selectedMethod = ref<string>('wechat')
+const userBalance = ref<number>(0)
+const isPaying = ref<boolean>(false)
+const showPassword = ref<boolean>(false)
+const password = ref<string>('')
+
+// 价格相关变量
+const productAmount = ref<number>(0) // 商品总价
+const deliveryFee = ref<number>(0) // 运费
+const discountAmount = ref<number>(0) // 优惠减免
+
+// 生命周期
+onMounted(() => {
+	const pages = getCurrentPages()
+	const currentPage = pages[pages.length - 1]
+	const options = currentPage.options as any
+	
+	if (options.orderId) {
+		orderId.value = options.orderId
+		loadOrderInfo()
+	}
+	
+	if (options.amount) {
+		amount.value = parseFloat(options.amount)
+	}
+    
+    // 获取传递的价格详情
+    if (options.productAmount) {
+        productAmount.value = parseFloat(options.productAmount)
+    }
+    if (options.deliveryFee) {
+        deliveryFee.value = parseFloat(options.deliveryFee)
+    }
+    if (options.discountAmount) {
+        discountAmount.value = parseFloat(options.discountAmount)
+    }
+    
+    // 如果没有传详情，尝试根据总价估算（兼容旧逻辑，但优先使用传参）
+    if (!options.productAmount && amount.value > 0) {
+		calculatePriceDetails(amount.value)
+    }
+	
+	loadPaymentMethods()
+	loadUserBalance()
+})
+
+// 监听返回操作（包含系统返回键和导航栏返回按钮）
+onBackPress((options) => {
+	// 如果是通过代码主动调用 navigateBack 返回，则允许
+	if (options.from === 'navigateBack') {
+		return false
+	}
+	
+	// 否则拦截返回，显示确认弹窗
+	goBack()
+	return true
+})
+
+// 更新本地存储中的订单状态
+const updateOrderInStorage = (status: number) => {
+	try {
+        // 尝试从 'orders' 读取 (checkout页面写入的key)
+		const ordersStr = uni.getStorageSync('orders')
+		let orders: any[] = []
+		if (ordersStr) {
+			orders = JSON.parse(ordersStr as string) as any[]
+		}
+		
+		const index = orders.findIndex((o: any) => o.id === orderId.value)
+		if (index !== -1) {
+			orders[index].status = status
+			orders[index].payment_status = status === 2 ? 1 : 0 // 2=待发货(已支付), 1=待支付(未支付)
+			orders[index].updated_at = new Date().toISOString()
+            // 确保更新的是 'orders' key
+			uni.setStorageSync('orders', JSON.stringify(orders))
+            console.log('订单状态已更新到Storage (orders):', orderId.value, status)
+		} else {
+            console.warn('在Storage (orders)中未找到订单:', orderId.value)
+        }
+	} catch (e) {
+		console.error('更新订单状态失败', e)
+	}
+}
+
+// 加载订单信息
+const loadOrderInfo = async () => {
+	try {
+		/* const { data, error } = await supa
+			.from('orders')
+			.select('order_no, actual_amount')
+			.eq('id', orderId.value)
+			.single()
+
+		if (error !== null) {
+			console.error('加载订单信息失败:', error)
+			return
+		}
+
+		if (data) {
+			orderNo.value = data.order_no
+			amount.value = data.actual_amount || amount.value
+		} */
+        
+        // MOCK DATA
+        orderNo.value = 'ORD_MOCK_' + Date.now()
+        // Amount already set from options or default
+	} catch (err) {
+		console.error('加载订单信息异常:', err)
+	}
+}
+
+// 加载支付方式
+const loadPaymentMethods = () => {
+	paymentMethods.value = [
+		{
+			id: 'wechat',
+			name: '微信支付',
+			description: '推荐安装微信5.0及以上版本使用',
+			icon: '💳',
+			enabled: true
+		},
+		{
+			id: 'alipay',
+			name: '支付宝',
+			description: '推荐安装支付宝10.0及以上版本使用',
+			icon: '💳',
+			enabled: true
+		},
+		{
+			id: 'balance',
+			name: '余额支付',
+			description: '使用账户余额支付',
+			icon: '💰',
+			enabled: true
+		},
+		{
+			id: 'bankcard',
+			name: '银行卡支付',
+			description: '支持储蓄卡、信用卡',
+			icon: '💳',
+			enabled: true
+		}
+	]
+}
+
+// 加载用户余额
+const loadUserBalance = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+		// 这里假设有用户钱包表
+		/* const { data, error } = await supa
+			.from('user_wallets')
+			.select('balance')
+			.eq('user_id', userId)
+			.single()
+
+		if (error !== null) {
+			console.error('加载用户余额失败:', error)
+			return
+		}
+
+		userBalance.value = data?.balance || 0 */
+        
+        // MOCK BALANCE
+        userBalance.value = 10000.00
+	} catch (err) {
+		console.error('加载用户余额异常:', err)
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || ''
+}
+
+// 获取支付方式图标
+const getMethodIcon = (methodId: string): string => {
+	const icons: Record<string, string> = {
+		wechat: '💳',
+		alipay: '💳',
+		balance: '💰',
+		bankcard: '💳'
+	}
+	return icons[methodId] || '💳'
+}
+
+// 选择支付方式
+const selectMethod = (method: PaymentMethodType) => {
+	if (!method.enabled) {
+		uni.showToast({
+			title: '该支付方式暂不可用',
+			icon: 'none'
+		})
+		return
+	}
+	
+	selectedMethod.value = method.id
+	showPassword.value = method.id === 'balance' || method.id === 'bankcard'
+	password.value = '' // 清空密码
+}
+
+// 获取支付按钮文本
+const getPayButtonText = (): string => {
+	if (selectedMethod.value === 'balance' && userBalance.value < amount.value) {
+		return '余额不足'
+	}
+	
+	const texts: Record<string, string> = {
+		wechat: '微信支付',
+		alipay: '支付宝支付',
+		balance: '余额支付',
+		bankcard: '银行卡支付'
+	}
+	
+	return texts[selectedMethod.value] || '确认支付'
+}
+
+// 减少商品库存
+const reduceStock = (orderId: string) => {
+    try {
+        // 读取订单
+        const ordersStr = uni.getStorageSync('orders')
+        if (!ordersStr) return
+        
+        const orders = JSON.parse(ordersStr as string) as any[]
+        const order = orders.find((o: any) => o.id === orderId)
+        
+        if (!order || !order.items) return
+        
+        // 读取商品库（这里假设商品库也在本地，实际项目中通常在服务器端处理）
+        // 模拟：如果有本地商品缓存，则更新
+        /*
+        const productsStr = uni.getStorageSync('products')
+        if (productsStr) {
+            const products = JSON.parse(productsStr as string) as any[]
+            let hasChange = false
+            
+            order.items.forEach((item: any) => {
+                const product = products.find((p: any) => p.id === item.product_id)
+                if (product && product.stock >= item.quantity) {
+                    product.stock -= item.quantity
+                    hasChange = true
+                    console.log(`商品 ${product.name} 库存减少 ${item.quantity}, 剩余 ${product.stock}`)
+                }
+            })
+            
+            if (hasChange) {
+                uni.setStorageSync('products', JSON.stringify(products))
+            }
+        }
+        */
+       console.log('模拟扣减库存成功', order.items)
+    } catch (e) {
+        console.error('扣减库存失败', e)
+    }
+}
+
+// 确认支付
+const confirmPayment = async () => {
+	if (isPaying.value) return
+	
+	// 余额支付检查
+	if (selectedMethod.value === 'balance') {
+		if (userBalance.value < amount.value) {
+			uni.showToast({
+				title: '余额不足',
+				icon: 'none'
+			})
+			return
+		}
+		
+		if (!showPassword.value) {
+			showPassword.value = true
+			return
+		}
+		
+		if (password.value.length !== 6) {
+			uni.showToast({
+				title: '请输入6位支付密码',
+				icon: 'none'
+			})
+			return
+		}
+	}
+	
+	isPaying.value = true
+	
+	try {
+		// 模拟支付过程
+		await new Promise(resolve => setTimeout(resolve, 2000))
+		
+		// 更新订单状态
+        updateOrderInStorage(2) // 2: 待发货(已支付)
+        
+        // 扣减库存
+        reduceStock(orderId.value)
+        
+		/* const { error } = await supa
+			.from('orders')
+			.update({
+				status: 2, // 待发货
+				payment_method: getPaymentMethodCode(selectedMethod.value),
+				payment_status: 1, // 已支付
+				updated_at: new Date().toISOString()
+			})
+			.eq('id', orderId.value)
+
+		if (error !== null) {
+			throw error
+		}
+		
+		// 余额支付需要扣减余额
+		if (selectedMethod.value === 'balance') {
+			await updateUserBalance(-amount.value)
+		} */
+		
+		// 支付成功
+		uni.showToast({
+			title: '支付成功',
+			icon: 'success',
+			duration: 2000
+		})
+		
+		// 发布订单更新事件，让profile页面可以刷新数据
+		uni.$emit('orderUpdated', { orderId: orderId.value, status: 2 }) // 2: 待发货
+		
+		// 跳转到支付成功页面
+		setTimeout(() => {
+			uni.redirectTo({
+				url: `/pages/mall/consumer/payment-success?orderId=${orderId.value}`
+			})
+		}, 1500)
+		
+	} catch (err) {
+		console.error('支付失败:', err)
+		uni.showToast({
+			title: '支付失败',
+			icon: 'none'
+		})
+	} finally {
+		isPaying.value = false
+	}
+}
+
+// 获取支付方式代码
+const getPaymentMethodCode = (methodId: string): number => {
+	const codes: Record<string, number> = {
+		wechat: 1,
+		alipay: 2,
+		balance: 3,
+		bankcard: 4
+	}
+	return codes[methodId] || 0
+}
+
+// 更新用户余额
+const updateUserBalance = async (change: number) => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+		/* const { data: wallet, error: walletError } = await supa
+			.from('user_wallets')
+			.select('balance')
+			.eq('user_id', userId)
+			.single()
+
+		if (walletError !== null) {
+			console.error('查询钱包失败:', walletError)
+			return
+		}
+
+		const newBalance = (wallet?.balance || 0) + change
+		
+		const { error: updateError } = await supa
+			.from('user_wallets')
+			.update({ balance: newBalance })
+			.eq('user_id', userId)
+
+		if (updateError !== null) {
+			console.error('更新余额失败:', updateError)
+			return
+		}
+		
+		// 记录余额变动
+		const { error: recordError } = await supa
+			.from('balance_records')
+			.insert({
+				user_id: userId,
+				change_amount: change,
+				current_balance: newBalance,
+				change_type: 'order_payment',
+				related_id: orderId.value,
+				remark: `订单支付: ${orderNo.value}`
+			})
+
+		if (recordError !== null) {
+			console.error('记录余额变动失败:', recordError)
+		}
+		
+		userBalance.value = newBalance */
+	} catch (err) {
+		console.error('更新余额异常:', err)
+	}
+}
+
+// 输入密码
+const inputPassword = (num: string) => {
+	if (password.value.length >= 6) return
+	password.value += num
+}
+
+// 删除密码
+const deletePassword = () => {
+	if (password.value.length > 0) {
+		password.value = password.value.slice(0, -1)
+	}
+}
+
+// 监听密码输入
+watch(password, (newPassword) => {
+	if (newPassword.length === 6) {
+		// 自动验证密码
+		verifyPassword()
+	}
+})
+
+// 验证密码
+const verifyPassword = async () => {
+	// 这里应该验证支付密码，这里简单模拟
+	const userId = getCurrentUserId()
+	
+	try {
+		// 模拟验证
+		await new Promise(resolve => setTimeout(resolve, 500))
+		
+		// 假设密码正确
+		const isCorrect = true
+		
+		if (isCorrect) {
+			// 密码正确，继续支付
+			confirmPayment()
+		} else {
+			password.value = ''
+			uni.showToast({
+				title: '密码错误',
+				icon: 'none'
+			})
+		}
+		
+	} catch (err) {
+		console.error('验证密码异常:', err)
+	}
+}
+
+// 忘记密码
+const forgotPassword = () => {
+	uni.navigateTo({
+		url: '/pages/user/forgot-password'
+	})
+}
+
+// 计算价格明细
+const calculatePriceDetails = (totalAmount: number) => {
+	// 模拟计算各项费用
+	// 假设商品总价占总金额的80%，运费占10%，优惠减免占10%
+	productAmount.value = totalAmount * 0.8
+	deliveryFee.value = totalAmount * 0.1
+	discountAmount.value = totalAmount * 0.1
+	
+	// 确保总和等于应付金额
+	const calculatedTotal = productAmount.value + deliveryFee.value - discountAmount.value
+	if (Math.abs(calculatedTotal - totalAmount) > 0.01) {
+		// 调整商品总价以匹配应付金额
+		productAmount.value = totalAmount + discountAmount.value - deliveryFee.value
+	}
+}
+
+// 在组件卸载时移除返回键监听
+onUnmounted(() => {
+	// uni.offBackPress() 在uni-app中不需要手动移除
+})
+
+// 返回
+const goBack = () => {
+	uni.showModal({
+		title: '取消支付',
+		content: '确定要取消支付吗？取消后订单将保存到待支付订单中',
+		confirmText: '取消支付',
+		cancelText: '继续支付',
+		success: async (res) => {
+			if (res.confirm) {
+				// 用户确认取消支付，更新订单状态为待支付
+				await cancelPayment()
+			} else {
+				// 用户选择继续支付，留在当前页面
+				return
+			}
+		}
+	})
+}
+
+// 取消支付，更新订单状态
+const cancelPayment = async () => {
+	try {
+		// 这里应该调用API更新订单状态为待支付（status: 1）
+		// 模拟更新订单状态
+		/* const { error } = await supa
+			.from('orders')
+			.update({
+				status: 1, // 待支付
+				updated_at: new Date().toISOString()
+			})
+			.eq('id', orderId.value)
+
+		if (error !== null) {
+			console.error('更新订单状态失败:', error)
+			uni.showToast({
+				title: '操作失败',
+				icon: 'none'
+			})
+			return
+		} */
+        
+        // 更新本地存储
+        updateOrderInStorage(orderId.value, 1) // 1: 待支付
+		
+		// 发布订单更新事件，让profile页面可以刷新数据
+		uni.$emit('orderUpdated', { orderId: orderId.value, status: 1 })
+		
+		uni.showToast({
+			title: '已保存到待支付订单',
+			icon: 'success'
+		})
+		
+		// 延迟返回，让用户看到提示
+		setTimeout(() => {
+			uni.navigateBack()
+		}, 1500)
+		
+	} catch (err) {
+		console.error('取消支付异常:', err)
+		uni.showToast({
+			title: '操作失败',
+			icon: 'none'
+		})
+	}
+}
+</script>
+
+<style scoped>
+.payment-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.payment-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+	margin-right: 15px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.payment-content {
+	flex: 1;
+	overflow-y: auto;
+}
+
+/* 价格明细部分 */
+.price-detail-section {
+	background-color: #ffffff;
+	padding: 20px 15px;
+	margin-bottom: 10px;
+}
+
+.price-detail {
+	padding: 15px;
+	background-color: #f8f9fa;
+	border-radius: 8px;
+	margin-bottom: 15px;
+}
+
+.price-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 8px 0;
+}
+
+.price-row.total {
+	border-top: 1px solid #e5e5e5;
+	margin-top: 8px;
+	padding-top: 15px;
+}
+
+.price-label {
+	font-size: 14px;
+	color: #666666;
+}
+
+.price-value {
+	font-size: 14px;
+	color: #333333;
+}
+
+.price-value.discount {
+	color: #4caf50;
+}
+
+.price-value.total-price {
+	font-size: 18px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.order-no {
+	display: block;
+	font-size: 12px;
+	color: #999999;
+	text-align: center;
+}
+
+.methods-section {
+	background-color: #ffffff;
+	padding: 20px 15px;
+	margin-bottom: 10px;
+}
+
+.section-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.method-list {
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+}
+
+.method-item {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 15px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+}
+
+.method-item.selected {
+	border-color: #007aff;
+	background-color: #f0f8ff;
+}
+
+.method-left {
+	display: flex;
+	align-items: center;
+}
+
+.method-icon {
+	font-size: 24px;
+	margin-right: 15px;
+}
+
+.method-info {
+	display: flex;
+	flex-direction: column;
+}
+
+.method-name {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 5px;
+}
+
+.method-desc {
+	font-size: 12px;
+	color: #999999;
+}
+
+.method-selected {
+	width: 24px;
+	height: 24px;
+	border-radius: 12px;
+	background-color: #007aff;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.selected-icon {
+	color: #ffffff;
+	font-size: 14px;
+}
+
+.balance-section {
+	background-color: #ffffff;
+	padding: 15px;
+	margin-bottom: 10px;
+}
+
+.balance-info {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 10px;
+}
+
+.balance-label {
+	font-size: 14px;
+	color: #333333;
+}
+
+.balance-value {
+	font-size: 18px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.balance-tip {
+	padding: 10px;
+	background-color: #fff0f0;
+	border-radius: 5px;
+}
+
+.tip-text {
+	font-size: 12px;
+	color: #ff4757;
+}
+
+.password-section {
+	background-color: #ffffff;
+	padding: 30px 15px;
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+.password-title {
+	display: block;
+	font-size: 16px;
+	color: #333333;
+	margin-bottom: 30px;
+}
+
+.password-input {
+	display: flex;
+	justify-content: center;
+	gap: 15px;
+	margin-bottom: 20px;
+}
+
+.password-dot {
+	width: 12px;
+	height: 12px;
+	border-radius: 6px;
+	background-color: #333333;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.password-dot text {
+	color: #ffffff;
+	font-size: 8px;
+}
+
+.forgot-password {
+	color: #007aff;
+	font-size: 14px;
+}
+
+.payment-bottom {
+	background-color: #ffffff;
+	border-top: 1px solid #e5e5e5;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.price-summary {
+	display: flex;
+	align-items: baseline;
+}
+
+.summary-label {
+	font-size: 14px;
+	color: #333333;
+	margin-right: 5px;
+}
+
+.summary-price {
+	font-size: 20px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.pay-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 0 40px;
+	height: 45px;
+	border-radius: 22.5px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+}
+
+.pay-btn.disabled {
+	background-color: #cccccc;
+	opacity: 0.6;
+}
+
+.password-keyboard {
+	background-color: #ffffff;
+	border-top: 1px solid #e5e5e5;
+	padding: 10px;
+}
+
+.keyboard-grid {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	grid-gap: 1px;
+	background-color: #e5e5e5;
+}
+
+.keyboard-key {
+	background-color: #ffffff;
+	height: 60px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.key-text {
+	font-size: 24px;
+	color: #333333;
+}
+</style>
diff --git a/pages/mall/consumer/product-detail.uvue b/pages/mall/consumer/product-detail.uvue
index a65a7b6e..fc8a8495 100644
--- a/pages/mall/consumer/product-detail.uvue
+++ b/pages/mall/consumer/product-detail.uvue
@@ -25,13 +25,13 @@
     <view class="shop-info" @click="goToShop">
       <image :src="merchant.shop_logo || '/static/default-shop.png'" class="shop-logo" />
       <view class="shop-details">
-        <text class="shop-name">{{ merchant.shop_name }}</text>
-        <view class="shop-rating">
-          <text class="rating-text">评分: {{ merchant.rating.toFixed(1) }}</text>
-          <text class="sales-text">销量: {{ merchant.total_sales }}</text>
+        <text class="shop-name" @click.stop="goToShop">{{ merchant.shop_name }}</text>
+        <view class="shop-stats-row">
+           <text class="rating-text">评分: {{ merchant.rating.toFixed(1) }}</text>
+           <text class="sales-text">销量: {{ merchant.total_sales }}</text>
         </view>
       </view>
-      <text class="enter-shop">进店 ></text>
+      <text class="enter-shop" @click.stop="goToShop">进店 ></text>
     </view>
 
     <!-- 规格选择 -->
@@ -41,6 +41,26 @@
       <text class="spec-arrow">></text>
     </view>
 
+    <!-- 数量选择 -->
+    <view class="quantity-section">
+      <text class="quantity-title">数量</text>
+      <view class="quantity-selector">
+        <view class="quantity-btn minus" @click="decreaseQuantity">
+          <text class="quantity-btn-text">-</text>
+        </view>
+        <input class="quantity-input" 
+               type="number" 
+               v-model="quantity" 
+               :min="1" 
+               :max="getMaxQuantity()"
+               @input="validateQuantity" />
+        <view class="quantity-btn plus" @click="increaseQuantity">
+          <text class="quantity-btn-text">+</text>
+        </view>
+      </view>
+      <text class="quantity-stock">库存{{ getAvailableStock() }}件</text>
+    </view>
+
     <!-- 商品详情 -->
     <view class="product-description">
       <view class="section-title">商品详情</view>
@@ -50,6 +70,16 @@
     <!-- 底部操作栏 -->
     <view class="bottom-actions">
       <view class="action-buttons">
+        <view class="action-btn" @click="goToCart">
+          <text class="action-icon">🛒</text>
+          <text class="action-text">购物车</text>
+        </view>
+        <view class="action-btn" @click="toggleFavorite">
+          <text class="action-icon">{{ isFavorite ? '❤️' : '🤍' }}</text>
+          <text class="action-text">{{ isFavorite ? '已收藏' : '收藏' }}</text>
+        </view>
+      </view>
+      <view class="btn-group">
         <button class="cart-btn" @click="addToCart">加入购物车</button>
         <button class="buy-btn" @click="buyNow">立即购买</button>
       </view>
@@ -116,49 +146,157 @@ export default {
       showSpec: false,
       selectedSkuId: '',
       selectedSpec: '',
-      quantity: 1
+      quantity: 1,
+      isFavorite: false
     }
   },
   onLoad(options: any) {
-    const productId = options.productId as string
+    const productId = options.productId as string || options.id as string
+    const productPrice = options.price ? parseFloat(options.price) : null
+    const productOriginalPrice = options.original_price ? parseFloat(options.original_price) : null
+    const productName = options.name as string
+    const productImage = options.image as string
+    
     if (productId) {
-      this.loadProductDetail(productId)
+      this.loadProductDetail(productId, {
+        price: productPrice,
+        originalPrice: productOriginalPrice,
+        name: productName,
+        image: productImage
+      })
+      this.checkFavoriteStatus(productId)
+      this.saveFootprint(productId)
+    }
+  },
+  computed: {
+    displayPrice(): number {
+      if (this.selectedSkuId) {
+        const sku = this.productSkus.find(s => s.id === this.selectedSkuId)
+        if (sku) return sku.price
+      }
+      return this.product.price
     }
   },
   methods: {
-    loadProductDetail(productId: string) {
-      // 模拟加载商品详情数据
+    saveFootprint(productId: string) {
+      const footprintData = uni.getStorageSync('footprints')
+      let footprints: any[] = []
+      
+      if (footprintData) {
+        try {
+          footprints = JSON.parse(footprintData as string) as any[]
+        } catch (e) {
+          console.error('Failed to parse footprints', e)
+        }
+      }
+      
+      // 移除已存在的相同商品（为了将其移到最新位置）
+      footprints = footprints.filter(item => item.id !== productId)
+      
+      // 添加到头部
+      footprints.unshift({
+        id: this.product.id,
+        name: this.product.name,
+        price: this.product.price,
+        original_price: this.product.original_price, // 添加原价
+        image: this.product.images[0],
+        sales: this.product.sales,
+        shopId: this.merchant.id,
+        shopName: this.merchant.shop_name,
+        viewTime: Date.now()
+      })
+      
+      // 限制数量，例如最近50条
+      if (footprints.length > 50) {
+        footprints = footprints.slice(0, 50)
+      }
+      
+      uni.setStorageSync('footprints', JSON.stringify(footprints))
+    },
+    
+    loadProductDetail(productId: string, options: any = {}) {
+      // 根据商品ID生成一个基础价格（如果没有传入价格）
+      const generatePriceFromId = (id: string): number => {
+        // 简单哈希函数，将字符串转换为一个在50-500之间的价格
+        let hash = 0
+        for (let i = 0; i < id.length; i++) {
+          hash = (hash << 5) - hash + id.charCodeAt(i)
+          hash |= 0 // 转换为32位整数
+        }
+        // 将哈希值映射到50-500之间
+        const price = 50 + Math.abs(hash % 450)
+        // 保留两位小数
+        return parseFloat(price.toFixed(2))
+      }
+
+      // 优先使用传入的参数，否则根据商品ID生成价格
+      const basePrice = options.price ? parseFloat(options.price) : generatePriceFromId(productId)
+      // 原价比现价高20%左右
+      const originalPrice = options.originalPrice ? parseFloat(options.originalPrice) : parseFloat((basePrice * 1.2).toFixed(2))
+      
+      // 根据商品ID生成不同的商品名称，使其更真实
+      const productNames = [
+        '高品质运动休闲鞋',
+        '时尚简约双肩背包',
+        '多功能智能手环',
+        '便携式蓝牙音箱',
+        '全自动雨伞',
+        '抗菌防螨床上四件套',
+        '不锈钢保温杯',
+        '无线充电器',
+        '高清行车记录仪',
+        '智能体脂秤'
+      ]
+      const nameIndex = Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % productNames.length
+      const productName = options.name ? options.name : productNames[nameIndex]
+      
+      // 模拟销量和库存，使其更真实
+      const sales = 1000 + Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % 5000
+      const stock = 50 + Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % 200
+      
       this.product = {
         id: productId,
-        merchant_id: 'merchant_001',
-        category_id: 'cat_001',
-        name: '精选好物商品',
-        description: '这是一个高品质的商品，具有优秀的性能和优美的外观设计。',
+        merchant_id: 'merchant_' + (Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % 5 + 1).toString().padStart(3, '0'),
+        category_id: 'cat_' + (Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % 10 + 1).toString().padStart(3, '0'),
+        name: productName,
+        description: '这是一个高品质的商品，具有优秀的性能和优美的外观设计。采用环保材料，经过严格质检，保证用户的使用体验。',
         images: [
           '/static/product1.jpg',
           '/static/product2.jpg',
           '/static/product3.jpg'
         ],
-        price: 199.99,
-        original_price: 299.99,
-        stock: 100,
-        sales: 1256,
+        price: basePrice,
+        original_price: originalPrice,
+        stock: stock,
+        sales: sales,
         status: 1,
         created_at: '2024-01-15'
       }
       
+      // 根据商家ID生成不同的商家信息
+      const merchantIndex = Math.abs(this.product.merchant_id.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % 5
+      const shopNames = ['优质好店', '品牌直营店', '官方旗舰店', '专卖店', '精品小店']
+      const shopDescriptions = [
+        '专注品质生活',
+        '品牌官方直营，正品保障',
+        '厂家直销，价格优惠',
+        '专注本领域十年老店',
+        '用心服务每一位顾客'
+      ]
+      const contactNames = ['店主小王', '店长小李', '经理小张', '客服小赵', '老板小钱']
+      
       this.merchant = {
-        id: 'merchant_001',
-        user_id: 'user_001',
-        shop_name: '优质好店',
+        id: this.product.merchant_id,
+        user_id: 'user_' + (merchantIndex + 1).toString().padStart(3, '0'),
+        shop_name: shopNames[merchantIndex],
         shop_logo: '/static/shop-logo.png',
         shop_banner: '/static/shop-banner.png',
-        shop_description: '专注品质生活',
-        contact_name: '店主小王',
-        contact_phone: '13800138000',
+        shop_description: shopDescriptions[merchantIndex],
+        contact_name: contactNames[merchantIndex],
+        contact_phone: '138' + (10000000 + merchantIndex * 1111111).toString().substring(0, 8),
         shop_status: 1,
-        rating: 4.8,
-        total_sales: 15680,
+        rating: 4.5 + (merchantIndex * 0.1),
+        total_sales: 10000 + merchantIndex * 5000,
         created_at: '2023-06-01'
       }
       
@@ -167,13 +305,15 @@ export default {
     
     loadProductSkus(productId: string) {
       // 模拟加载商品SKU数据
+      const basePrice = this.product.price
+      
       this.productSkus = [
         {
           id: 'sku_001',
           product_id: productId,
           sku_code: 'SKU001',
           specifications: { color: '红色', size: 'M' },
-          price: 199.99,
+          price: basePrice,
           stock: 50,
           image_url: '/static/sku1.jpg',
           status: 1
@@ -183,7 +323,7 @@ export default {
           product_id: productId,
           sku_code: 'SKU002',
           specifications: { color: '蓝色', size: 'L' },
-          price: 219.99,
+          price: parseFloat((basePrice * 1.1).toFixed(2)),
           stock: 30,
           image_url: '/static/sku2.jpg',
           status: 1
@@ -222,6 +362,45 @@ export default {
         return
       }
       
+      // 获取现有购物车数据
+      const cartData = uni.getStorageSync('cart')
+      let cartItems: any[] = []
+      
+      if (cartData) {
+        try {
+          cartItems = JSON.parse(cartData as string) as any[]
+        } catch (e) {
+          console.error('解析购物车数据失败', e)
+        }
+      }
+      
+      // 检查商品是否已存在 (同一SKU)
+      const existingItem = cartItems.find((item: any) => item.id === this.selectedSkuId)
+      
+      if (existingItem) {
+        existingItem.quantity += this.quantity
+      } else {
+        // 查找SKU信息
+        const sku = this.productSkus.find(s => s.id === this.selectedSkuId)
+        
+        // 添加新商品
+        cartItems.push({
+          id: this.selectedSkuId, // 使用SKU ID作为购物车条目ID
+          productId: this.product.id,
+          shopId: this.merchant.id,
+          shopName: this.merchant.shop_name,
+          name: this.product.name,
+          price: sku ? sku.price : this.product.price,
+          image: (sku && sku.image_url) ? sku.image_url : this.product.images[0],
+          spec: this.selectedSpec,
+          quantity: this.quantity,
+          selected: true
+        })
+      }
+      
+      // 保存回存储
+      uni.setStorageSync('cart', JSON.stringify(cartItems))
+      
       // 模拟添加到购物车
       uni.showToast({
         title: '已添加到购物车',
@@ -238,9 +417,41 @@ export default {
         return
       }
       
+      const sku = this.productSkus.find(s => s.id === this.selectedSkuId)
+      
+	// 调试：打印价格信息
+	console.log('立即购买 - 商品价格信息:')
+	console.log('SKU价格:', sku ? sku.price : '无SKU')
+	console.log('商品价格:', this.product.price)
+	console.log('选择的价格:', (sku ? sku.price : this.product.price))
+	console.log('数量:', this.quantity)
+	
+	const selectedItem = {
+		id: this.selectedSkuId,
+		product_id: this.product.id,
+		sku_id: this.selectedSkuId,
+		product_name: this.product.name,
+		product_image: (sku && sku.image_url) ? sku.image_url : this.product.images[0],
+		sku_specifications: sku ? sku.specifications : {},
+		price: Number(parseFloat((sku ? sku.price : this.product.price).toString()).toFixed(2)),
+		quantity: Number(this.quantity)
+	}
+	
+	// 调试：打印最终传递的数据
+	console.log('立即购买 - 传递的商品数据:', selectedItem)
+
+      // 使用Storage传递数据，避免EventChannel可能的问题
+      uni.setStorageSync('checkout_type', 'buy_now')
+      uni.setStorageSync('checkout_items', JSON.stringify([selectedItem]))
+
       // 跳转到订单确认页
       uni.navigateTo({
-        url: `/pages/mall/consumer/order-confirm?productId=${this.product.id}&skuId=${this.selectedSkuId}&quantity=${this.quantity}`
+        url: '/pages/mall/consumer/checkout',
+        success: (res) => {
+            res.eventChannel.emit('acceptData', {
+                selectedItems: [selectedItem]
+            })
+        }
       })
     },
     
@@ -248,6 +459,125 @@ export default {
       uni.navigateTo({
         url: `/pages/mall/consumer/shop-detail?merchantId=${this.merchant.id}`
       })
+    },
+
+    checkFavoriteStatus(id: string) {
+      const storedFavorites = uni.getStorageSync('favorites')
+      if (storedFavorites) {
+        try {
+          const favorites = JSON.parse(storedFavorites as string) as any[]
+          this.isFavorite = favorites.some(item => item.id === id)
+        } catch (e) {
+          console.error('Failed to parse favorites', e)
+        }
+      }
+    },
+
+    toggleFavorite() {
+      const storedFavorites = uni.getStorageSync('favorites')
+      let favorites: any[] = []
+      
+      if (storedFavorites) {
+        try {
+          favorites = JSON.parse(storedFavorites as string) as any[]
+        } catch (e) {
+          console.error('Failed to parse favorites', e)
+        }
+      }
+      
+      if (this.isFavorite) {
+        // 取消收藏
+        favorites = favorites.filter(item => item.id !== this.product.id)
+        uni.showToast({
+          title: '已取消收藏',
+          icon: 'none'
+        })
+      } else {
+        // 添加收藏
+        favorites.push({
+          id: this.product.id,
+          name: this.product.name,
+          price: this.product.price,
+          original_price: this.product.original_price, // 保存原价
+          image: this.product.images[0],
+          sales: this.product.sales,
+          shopId: this.merchant.id,
+          shopName: this.merchant.shop_name
+        })
+        uni.showToast({
+          title: '收藏成功',
+          icon: 'success'
+        })
+      }
+      
+      uni.setStorageSync('favorites', JSON.stringify(favorites))
+      this.isFavorite = !this.isFavorite
+    },
+
+    goToHome() {
+      uni.switchTab({
+        url: '/pages/mall/consumer/home'
+      })
+    },
+
+    goToCart() {
+      uni.switchTab({
+        url: '/pages/mall/consumer/cart'
+      })
+    },
+
+    // 数量选择相关方法
+    decreaseQuantity() {
+      if (this.quantity > 1) {
+        this.quantity--
+      }
+    },
+    
+    increaseQuantity() {
+      const maxQuantity = this.getMaxQuantity()
+      if (this.quantity < maxQuantity) {
+        this.quantity++
+      } else {
+        uni.showToast({
+          title: `最多只能购买${maxQuantity}件`,
+          icon: 'none'
+        })
+      }
+    },
+    
+    validateQuantity() {
+      // 确保数量是数字
+      let num = parseInt(this.quantity)
+      if (isNaN(num)) {
+        num = 1
+      }
+      
+      // 限制在1和最大库存之间
+      const maxQuantity = this.getMaxQuantity()
+      if (num < 1) {
+        num = 1
+      } else if (num > maxQuantity) {
+        num = maxQuantity
+        uni.showToast({
+          title: `最多只能购买${maxQuantity}件`,
+          icon: 'none'
+        })
+      }
+      
+      this.quantity = num
+    },
+    
+    getMaxQuantity() {
+      // 如果有选择SKU，使用SKU的库存，否则使用商品总库存
+      if (this.selectedSkuId) {
+        const sku = this.productSkus.find(s => s.id === this.selectedSkuId)
+        if (sku) return sku.stock
+      }
+      return this.product.stock
+    },
+    
+    getAvailableStock() {
+      return this.getMaxQuantity()
     }
   }
 }
@@ -328,6 +658,7 @@ export default {
   padding: 30rpx;
   margin-bottom: 20rpx;
   display: flex;
+  flex-direction: row; /* 显式横向排列 */
   align-items: center;
 }
 
@@ -340,6 +671,9 @@ export default {
 
 .shop-details {
   flex: 1;
+  display: flex;
+  flex-direction: column; /* 内部信息保持纵向，或者根据需要改为横向 */
+  justify-content: center;
 }
 
 .shop-name {
@@ -349,8 +683,10 @@ export default {
   margin-bottom: 10rpx;
 }
 
-.shop-rating {
+.shop-stats-row {
   display: flex;
+  flex-direction: row; /* 显式横向排列 */
+  align-items: center;
 }
 
 .rating-text, .sales-text {
@@ -389,6 +725,66 @@ export default {
   color: #999;
 }
 
+.quantity-section {
+  background-color: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.quantity-title {
+  font-size: 30rpx;
+  color: #333;
+  width: 120rpx;
+}
+
+.quantity-selector {
+  display: flex;
+  align-items: center;
+  border: 1rpx solid #e5e5e5;
+  border-radius: 8rpx;
+  overflow: hidden;
+}
+
+.quantity-btn {
+  width: 60rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f5f5;
+}
+
+.quantity-btn.minus {
+  border-right: 1rpx solid #e5e5e5;
+}
+
+.quantity-btn.plus {
+  border-left: 1rpx solid #e5e5e5;
+}
+
+.quantity-btn-text {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.quantity-input {
+  width: 80rpx;
+  height: 60rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333;
+  border: none;
+  background-color: #fff;
+}
+
+.quantity-stock {
+  font-size: 24rpx;
+  color: #666;
+}
+
 .product-description {
   background-color: #fff;
   padding: 30rpx;
@@ -414,21 +810,55 @@ export default {
   left: 0;
   right: 0;
   background-color: #fff;
-  padding: 20rpx 30rpx;
+  padding: 10rpx 20rpx;
   box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
+  display: flex;
+  flex-direction: row; /* 显式设置横向排列 */
+  align-items: center;
+  justify-content: space-between;
 }
 
 .action-buttons {
   display: flex;
-  gap: 20rpx;
+  flex-direction: row; /* 显式设置横向排列 */
+  align-items: center;
+  margin-right: 20rpx;
+}
+
+.action-btn {
+  display: flex;
+  flex-direction: column; /* 图标文字保持纵向 */
+  align-items: center;
+  justify-content: center;
+  margin-right: 20rpx;
+  min-width: 80rpx;
+}
+
+.action-icon {
+  font-size: 40rpx;
+  margin-bottom: 4rpx;
+}
+
+.action-text {
+  font-size: 20rpx;
+  color: #666;
+}
+
+.btn-group {
+  flex: 1;
+  display: flex;
+  flex-direction: row; /* 显式设置横向排列 */
+  align-items: center;
 }
 
 .cart-btn, .buy-btn {
   flex: 1;
-  height: 80rpx;
-  border-radius: 40rpx;
-  font-size: 28rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  border-radius: 36rpx;
+  font-size: 26rpx;
   border: none;
+  margin: 0 10rpx;
 }
 
 .cart-btn {
diff --git a/pages/mall/consumer/profile - 副本.uvue b/pages/mall/consumer/profile - 副本.uvue
new file mode 100644
index 00000000..c5cb4297
--- /dev/null
+++ b/pages/mall/consumer/profile - 副本.uvue	
@@ -0,0 +1,909 @@
+<!-- 消费者端 - 个人中心 -->
+<template>
+  <view class="consumer-profile">
+    <!-- 用户信息头部 -->
+    <view class="profile-header">
+      <image :src="userInfo.avatar_url || '/static/default-avatar.png'" class="user-avatar" @click="editProfile" />
+      <view class="user-info">
+        <text class="user-name">{{ userInfo.nickname || userInfo.phone }}</text>
+        <text class="user-level">{{ getUserLevel() }}</text>
+        <view class="user-stats">
+          <text class="stat-item">积分: {{ userStats.points }}</text>
+          <text class="stat-item">余额: ¥{{ userStats.balance }}</text>
+        </view>
+      </view>
+      <view class="settings-icon" @click="goToSettings">⚙️</view>
+    </view>
+
+    <!-- 订单状态快捷入口 -->
+    <view class="order-shortcuts">
+      <view class="section-title">我的订单</view>
+      <view class="order-tabs">
+        <view class="order-tab" @click="goToOrders('all')">
+          <text class="tab-icon">📋</text>
+          <text class="tab-text">全部订单</text>
+          <text v-if="orderCounts.total > 0" class="tab-badge">{{ orderCounts.total }}</text>
+        </view>
+        <view class="order-tab" @click="goToOrders('pending')">
+          <text class="tab-icon">💰</text>
+          <text class="tab-text">待支付</text>
+          <text v-if="orderCounts.pending > 0" class="tab-badge">{{ orderCounts.pending }}</text>
+        </view>
+        <view class="order-tab" @click="goToOrders('shipped')">
+          <text class="tab-icon">🚚</text>
+          <text class="tab-text">待收货</text>
+          <text v-if="orderCounts.shipped > 0" class="tab-badge">{{ orderCounts.shipped }}</text>
+        </view>
+        <view class="order-tab" @click="goToOrders('completed')">
+          <text class="tab-icon">⭐</text>
+          <text class="tab-text">待评价</text>
+          <text v-if="orderCounts.review > 0" class="tab-badge">{{ orderCounts.review }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 最近订单 -->
+    <view class="recent-orders">
+      <view class="section-header">
+        <text class="section-title">最近订单</text>
+        <text class="view-all" @click="goToOrders('all')">查看全部 ></text>
+      </view>
+      
+      <view v-if="recentOrders.length === 0" class="empty-orders">
+        <text class="empty-text">暂无订单记录</text>
+        <button class="start-shopping" @click="goShopping">去逛逛</button>
+      </view>
+      
+      <view v-for="order in recentOrders" :key="order.id" class="order-item" @click="viewOrderDetail(order)">
+        <view class="order-header">
+          <text class="order-no">订单号: {{ order.order_no }}</text>
+          <text class="order-status" :class="getOrderStatusClass(order.status)">{{ getOrderStatusText(order.status) }}</text>
+        </view>
+        <view class="order-content">
+          <image :src="getOrderMainImage(order)" class="order-image" />
+          <view class="order-info">
+            <text class="order-title">{{ getOrderTitle(order) }}</text>
+            <text class="order-amount">¥{{ order.actual_amount }}</text>
+            <text class="order-time">{{ formatTime(order.created_at) }}</text>
+          </view>
+        </view>
+        <view class="order-actions">
+          <button v-if="order.status === 1" class="action-btn pay" @click.stop="payOrder(order)">立即支付</button>
+          <button v-if="order.status === 3" class="action-btn confirm" @click.stop="confirmReceive(order)">确认收货</button>
+          <button v-if="order.status === 4" class="action-btn review" @click.stop="reviewOrder(order)">评价</button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 我的服务 -->
+    <view class="my-services">
+      <view class="section-title">我的服务</view>
+      <view class="service-grid">
+        <view class="service-item" @click="goToCoupons">
+          <text class="service-icon">🎫</text>
+          <text class="service-text">优惠券</text>
+          <text v-if="serviceCounts.coupons > 0" class="service-badge">{{ serviceCounts.coupons }}</text>
+        </view>
+        <view class="service-item" @click="goToAddress">
+          <text class="service-icon">📍</text>
+          <text class="service-text">收货地址</text>
+        </view>
+        <view class="service-item" @click="goToFavorites">
+          <text class="service-icon">❤️</text>
+          <text class="service-text">我的收藏</text>
+          <text v-if="serviceCounts.favorites > 0" class="service-badge">{{ serviceCounts.favorites }}</text>
+        </view>
+        <view class="service-item" @click="goToFootprint">
+          <text class="service-icon">👣</text>
+          <text class="service-text">浏览足迹</text>
+        </view>
+        <view class="service-item" @click="goToRefund">
+          <text class="service-icon">🔄</text>
+          <text class="service-text">退款/售后</text>
+        </view>
+        <view class="service-item" @click="contactService">
+          <text class="service-icon">💬</text>
+          <text class="service-text">在线客服</text>
+        </view>
+        <view class="service-item" @click="goToMySubscriptions">
+          <text class="service-icon">🧩</text>
+          <text class="service-text">我的订阅</text>
+        </view>
+        <view class="service-item" @click="goToSubscriptions">
+          <text class="service-icon">🧩</text>
+          <text class="service-text">软件订阅</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 消费统计 -->
+    <view class="consumption-stats">
+      <view class="section-title">消费统计</view>
+      <view class="stats-period">
+        <text v-for="period in statsPeriods" :key="period.key" 
+              class="period-tab" 
+              :class="{ active: activeStatsPeriod === period.key }"
+              @click="switchStatsPeriod(period.key)">{{ period.label }}</text>
+      </view>
+      
+      <view class="stats-content">
+        <view class="stat-card">
+          <text class="stat-value">¥{{ currentStats.total_amount }}</text>
+          <text class="stat-label">总消费</text>
+        </view>
+        <view class="stat-card">
+          <text class="stat-value">{{ currentStats.order_count }}</text>
+          <text class="stat-label">订单数</text>
+        </view>
+        <view class="stat-card">
+          <text class="stat-value">¥{{ currentStats.avg_amount }}</text>
+          <text class="stat-label">平均消费</text>
+        </view>
+        <view class="stat-card">
+          <text class="stat-value">{{ currentStats.save_amount }}</text>
+          <text class="stat-label">节省金额</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 账户安全 -->
+    <view class="account-security">
+      <view class="section-title">账户安全</view>
+      <view class="security-items">
+        <view class="security-item" @click="changePassword">
+          <text class="security-icon">🔒</text>
+          <text class="security-text">修改密码</text>
+          <text class="security-arrow">></text>
+        </view>
+        <view class="security-item" @click="bindPhone">
+          <text class="security-icon">📱</text>
+          <text class="security-text">手机绑定</text>
+          <view class="security-status">
+            <text class="status-text" :class="{ bound: userInfo.phone }">{{ userInfo.phone ? '已绑定' : '未绑定' }}</text>
+            <text class="security-arrow">></text>
+          </view>
+        </view>
+        <view class="security-item" @click="bindEmail">
+          <text class="security-icon">📧</text>
+          <text class="security-text">邮箱绑定</text>
+          <view class="security-status">
+            <text class="status-text" :class="{ bound: userInfo.email }">{{ userInfo.email ? '已绑定' : '未绑定' }}</text>
+            <text class="security-arrow">></text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { UserType, OrderType } from '@/types/mall-types.uts'
+
+type UserStatsType = {
+  points: number
+  balance: number
+  level: number
+}
+
+type OrderCountsType = {
+  total: number
+  pending: number
+  shipped: number
+  review: number
+}
+
+type ServiceCountsType = {
+  coupons: number
+  favorites: number
+}
+
+type ConsumptionStatsType = {
+  total_amount: number
+  order_count: number
+  avg_amount: number
+  save_amount: number
+}
+
+type StatsPeriodType = {
+  key: string
+  label: string
+}
+
+export default {
+  data() {
+    return {
+      userInfo: {
+        id: '',
+        phone: '',
+        email: '',
+        nickname: '',
+        avatar_url: '',
+        gender: 0,
+        user_type: 0,
+        status: 0,
+        created_at: ''
+      } as UserType,
+      userStats: {
+        points: 0,
+        balance: 0,
+        level: 1
+      } as UserStatsType,
+      orderCounts: {
+        total: 0,
+        pending: 0,
+        shipped: 0,
+        review: 0
+      } as OrderCountsType,
+      serviceCounts: {
+        coupons: 0,
+        favorites: 0
+      } as ServiceCountsType,
+      recentOrders: [] as Array<OrderType>,
+      statsPeriods: [
+        { key: 'month', label: '本月' },
+        { key: 'quarter', label: '本季度' },
+        { key: 'year', label: '本年' },
+        { key: 'all', label: '全部' }
+      ] as Array<StatsPeriodType>,
+      activeStatsPeriod: 'month',
+      currentStats: {
+        total_amount: 0,
+        order_count: 0,
+        avg_amount: 0,
+        save_amount: 0
+      } as ConsumptionStatsType
+    }
+  },
+  onLoad() {
+    this.loadUserProfile()
+  },
+  onShow() {
+    this.refreshData()
+  },
+  methods: {
+    loadUserProfile() {
+      // 模拟加载用户信息
+      this.userInfo = {
+        id: 'user_001',
+        phone: '13800138000',
+        email: 'user@example.com',
+        nickname: '张三',
+        avatar_url: '/static/avatar1.jpg',
+        gender: 1,
+        user_type: 1,
+        status: 1,
+        created_at: '2023-06-15T10:30:00'
+      }
+      
+      this.userStats = {
+        points: 1580,
+        balance: 268.50,
+        level: 3
+      }
+      
+      this.orderCounts = {
+        total: 23,
+        pending: 2,
+        shipped: 1,
+        review: 3
+      }
+      
+      this.serviceCounts = {
+        coupons: 5,
+        favorites: 12
+      }
+      
+      this.recentOrders = [
+        {
+          id: 'order_001',
+          order_no: 'ORD202401150001',
+          user_id: 'user_001',
+          merchant_id: 'merchant_001',
+          status: 3,
+          total_amount: 299.98,
+          discount_amount: 30.00,
+          delivery_fee: 8.00,
+          actual_amount: 277.98,
+          payment_method: 1,
+          payment_status: 1,
+          delivery_address: {},
+          created_at: '2024-01-15T14:30:00'
+        },
+        {
+          id: 'order_002',
+          order_no: 'ORD202401140002',
+          user_id: 'user_001',
+          merchant_id: 'merchant_002',
+          status: 4,
+          total_amount: 158.00,
+          discount_amount: 0,
+          delivery_fee: 6.00,
+          actual_amount: 164.00,
+          payment_method: 1,
+          payment_status: 1,
+          delivery_address: {},
+          created_at: '2024-01-14T09:20:00'
+        }
+      ]
+      
+      this.loadConsumptionStats()
+    },
+    
+    loadConsumptionStats() {
+      // 模拟加载消费统计数据
+      const statsData: Record<string, ConsumptionStatsType> = {
+        month: {
+          total_amount: 1280.50,
+          order_count: 8,
+          avg_amount: 160.06,
+          save_amount: 85.20
+        },
+        quarter: {
+          total_amount: 3680.80,
+          order_count: 18,
+          avg_amount: 204.49,
+          save_amount: 256.30
+        },
+        year: {
+          total_amount: 15680.90,
+          order_count: 56,
+          avg_amount: 280.02,
+          save_amount: 986.50
+        },
+        all: {
+          total_amount: 25680.50,
+          order_count: 89,
+          avg_amount: 288.55,
+          save_amount: 1580.20
+        }
+      }
+      
+      this.currentStats = statsData[this.activeStatsPeriod]
+    },
+    
+    refreshData() {
+      // 刷新页面数据
+      this.loadUserProfile()
+    },
+    
+    getUserLevel(): string {
+      const levels = ['新手', '铜牌会员', '银牌会员', '金牌会员', '钻石会员']
+      return levels[this.userStats.level] || '新手'
+    },
+    
+    getOrderStatusText(status: number): string {
+      const statusTexts = ['异常', '待支付', '待发货', '待收货', '已完成', '已取消']
+      return statusTexts[status] || '未知'
+    },
+    
+    getOrderStatusClass(status: number): string {
+      const statusClasses = ['error', 'pending', 'processing', 'shipping', 'completed', 'cancelled']
+      return statusClasses[status] || 'error'
+    },
+    
+    getOrderMainImage(order: OrderType): string {
+      // 模拟获取订单主图
+      return '/static/product1.jpg'
+    },
+    
+    getOrderTitle(order: OrderType): string {
+      // 模拟获取订单标题
+      return '精选商品等多件商品'
+    },
+    
+    formatTime(timeStr: string): string {
+      const date = new Date(timeStr)
+      const now = new Date()
+      const diff = now.getTime() - date.getTime()
+      const days = Math.floor(diff / (1000 * 60 * 60 * 24))
+      
+      if (days === 0) {
+        return '今天'
+      } else if (days === 1) {
+        return '昨天'
+      } else {
+        return `${days}天前`
+      }
+    },
+    
+    switchStatsPeriod(period: string) {
+      this.activeStatsPeriod = period
+      this.loadConsumptionStats()
+    },
+    
+    editProfile() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/edit-profile'
+      })
+    },
+    
+    goToSettings() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/settings'
+      })
+    },
+    
+    goToOrders(type: string) {
+      uni.navigateTo({
+        url: `/pages/mall/consumer/orders?type=${type}`
+      })
+    },
+    
+    goShopping() {
+      uni.switchTab({
+        url: '/pages/mall/consumer/index'
+      })
+    },
+    
+    viewOrderDetail(order: OrderType) {
+      uni.navigateTo({
+        url: `/pages/mall/consumer/order-detail?orderId=${order.id}`
+      })
+    },
+    
+    payOrder(order: OrderType) {
+      uni.navigateTo({
+        url: `/pages/mall/consumer/payment?orderId=${order.id}`
+      })
+    },
+    
+    confirmReceive(order: OrderType) {
+      uni.showModal({
+        title: '确认收货',
+        content: '确认已收到商品吗？',
+        success: (res) => {
+          if (res.confirm) {
+            uni.showToast({
+              title: '确认收货成功',
+              icon: 'success'
+            })
+            this.refreshData()
+          }
+        }
+      })
+    },
+    
+    reviewOrder(order: OrderType) {
+      uni.navigateTo({
+        url: `/pages/mall/consumer/review?orderId=${order.id}`
+      })
+    },
+    
+    goToCoupons() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/coupons'
+      })
+    },
+    
+    goToAddress() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/address'
+      })
+    },
+    
+    goToFavorites() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/favorites'
+      })
+    },
+    
+    goToFootprint() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/footprint'
+      })
+    },
+    
+    goToRefund() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/refund'
+      })
+    },
+    
+    contactService() {
+      uni.navigateTo({
+        url: '/pages/mall/service/chat'
+      })
+    },
+    goToMySubscriptions() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/subscription/my-subscriptions'
+      })
+    },
+    goToSubscriptions() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/subscription/plan-list'
+      })
+    },
+    
+    changePassword() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/change-password'
+      })
+    },
+    
+    bindPhone() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/bind-phone'
+      })
+    },
+    
+    bindEmail() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/bind-email'
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.consumer-profile {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.profile-header {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  padding: 60rpx 30rpx 40rpx;
+  display: flex;
+  align-items: center;
+  color: #fff;
+}
+
+.user-avatar {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 60rpx;
+  margin-right: 30rpx;
+  border: 4rpx solid rgba(255, 255, 255, 0.3);
+}
+
+.user-info {
+  flex: 1;
+}
+
+.user-name {
+  font-size: 36rpx;
+  font-weight: bold;
+  margin-bottom: 8rpx;
+}
+
+.user-level {
+  font-size: 24rpx;
+  background-color: rgba(255, 255, 255, 0.2);
+  padding: 6rpx 12rpx;
+  border-radius: 12rpx;
+  margin-bottom: 15rpx;
+  display: inline-block;
+}
+
+.user-stats {
+  display: flex;
+  gap: 30rpx;
+}
+
+.stat-item {
+  font-size: 24rpx;
+  opacity: 0.9;
+}
+
+.settings-icon {
+  font-size: 32rpx;
+  padding: 10rpx;
+}
+
+.order-shortcuts, .recent-orders, .my-services, .consumption-stats, .account-security {
+  background-color: #fff;
+  margin-bottom: 20rpx;
+  padding: 30rpx;
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 25rpx;
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25rpx;
+}
+
+.view-all {
+  font-size: 24rpx;
+  color: #007aff;
+}
+
+.order-tabs {
+  display: flex;
+  justify-content: space-between;
+}
+
+.order-tab {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+
+.tab-icon {
+  font-size: 40rpx;
+  margin-bottom: 10rpx;
+}
+
+.tab-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.tab-badge {
+  position: absolute;
+  top: -8rpx;
+  right: 20rpx;
+  background-color: #ff4444;
+  color: #fff;
+  font-size: 20rpx;
+  padding: 4rpx 8rpx;
+  border-radius: 10rpx;
+  min-width: 32rpx;
+  text-align: center;
+}
+
+.empty-orders {
+  text-align: center;
+  padding: 80rpx 0;
+}
+
+.empty-text {
+  font-size: 28rpx;
+  color: #999;
+  margin-bottom: 30rpx;
+}
+
+.start-shopping {
+  background-color: #007aff;
+  color: #fff;
+  padding: 20rpx 40rpx;
+  border-radius: 25rpx;
+  font-size: 26rpx;
+  border: none;
+}
+
+.order-item {
+  padding: 25rpx 0;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+
+.order-item:last-child {
+  border-bottom: none;
+}
+
+.order-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15rpx;
+}
+
+.order-no {
+  font-size: 26rpx;
+  color: #333;
+}
+
+.order-status {
+  font-size: 24rpx;
+  padding: 6rpx 12rpx;
+  border-radius: 10rpx;
+  color: #fff;
+}
+
+.order-status.pending {
+  background-color: #ffa726;
+}
+
+.order-status.processing {
+  background-color: #2196f3;
+}
+
+.order-status.shipping {
+  background-color: #9c27b0;
+}
+
+.order-status.completed {
+  background-color: #4caf50;
+}
+
+.order-content {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15rpx;
+}
+
+.order-image {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 8rpx;
+  margin-right: 20rpx;
+}
+
+.order-info {
+  flex: 1;
+}
+
+.order-title {
+  font-size: 26rpx;
+  color: #333;
+  margin-bottom: 8rpx;
+}
+
+.order-amount {
+  font-size: 28rpx;
+  color: #ff4444;
+  font-weight: bold;
+  margin-bottom: 5rpx;
+}
+
+.order-time {
+  font-size: 22rpx;
+  color: #999;
+}
+
+.order-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 15rpx;
+}
+
+.action-btn {
+  padding: 12rpx 25rpx;
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  border: none;
+}
+
+.action-btn.pay {
+  background-color: #ff4444;
+  color: #fff;
+}
+
+.action-btn.confirm {
+  background-color: #4caf50;
+  color: #fff;
+}
+
+.action-btn.review {
+  background-color: #ffa726;
+  color: #fff;
+}
+
+.service-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 30rpx;
+}
+
+.service-item {
+  width: 30%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+
+.service-icon {
+  font-size: 48rpx;
+  margin-bottom: 15rpx;
+}
+
+.service-text {
+  font-size: 24rpx;
+  color: #333;
+}
+
+.service-badge {
+  position: absolute;
+  top: -5rpx;
+  right: 10rpx;
+  background-color: #ff4444;
+  color: #fff;
+  font-size: 18rpx;
+  padding: 4rpx 6rpx;
+  border-radius: 8rpx;
+  min-width: 24rpx;
+  text-align: center;
+}
+
+.stats-period {
+  display: flex;
+  gap: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.period-tab {
+  font-size: 26rpx;
+  color: #666;
+  padding: 12rpx 24rpx;
+  border-radius: 20rpx;
+  background-color: #f0f0f0;
+}
+
+.period-tab.active {
+  background-color: #007aff;
+  color: #fff;
+}
+
+.stats-content {
+  display: flex;
+  gap: 20rpx;
+}
+
+.stat-card {
+  flex: 1;
+  text-align: center;
+  padding: 30rpx 0;
+  background-color: #f8f9fa;
+  border-radius: 10rpx;
+}
+
+.stat-value {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 8rpx;
+}
+
+.stat-label {
+  font-size: 22rpx;
+  color: #666;
+}
+
+.security-items {
+  margin-top: 25rpx;
+}
+
+.security-item {
+  display: flex;
+  align-items: center;
+  padding: 25rpx 0;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+
+.security-item:last-child {
+  border-bottom: none;
+}
+
+.security-icon {
+  font-size: 32rpx;
+  margin-right: 20rpx;
+}
+
+.security-text {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.security-status {
+  display: flex;
+  align-items: center;
+}
+
+.status-text {
+  font-size: 24rpx;
+  color: #999;
+  margin-right: 10rpx;
+}
+
+.status-text.bound {
+  color: #4caf50;
+}
+
+.security-arrow {
+  font-size: 24rpx;
+  color: #999;
+}
+</style>
diff --git a/pages/mall/consumer/profile.uvue b/pages/mall/consumer/profile.uvue
index c5cb4297..d29a1fa6 100644
--- a/pages/mall/consumer/profile.uvue
+++ b/pages/mall/consumer/profile.uvue
@@ -1,66 +1,136 @@
 <!-- 消费者端 - 个人中心 -->
 <template>
   <view class="consumer-profile">
-    <!-- 用户信息头部 -->
-    <view class="profile-header">
-      <image :src="userInfo.avatar_url || '/static/default-avatar.png'" class="user-avatar" @click="editProfile" />
-      <view class="user-info">
-        <text class="user-name">{{ userInfo.nickname || userInfo.phone }}</text>
-        <text class="user-level">{{ getUserLevel() }}</text>
-        <view class="user-stats">
-          <text class="stat-item">积分: {{ userStats.points }}</text>
-          <text class="stat-item">余额: ¥{{ userStats.balance }}</text>
+    <!-- 智能顶部导航栏 - 与消息页保持一致 -->
+    <view class="smart-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="nav-container">
+        <!-- 头像 -->
+        <image 
+          :src="userInfo.avatar_url || '/static/default-avatar.png'" 
+          class="nav-avatar" 
+          @click="editProfile"
+        />
+        
+        <!-- 用户信息横向排列 (名字、积分、余额、优惠券) -->
+        <view class="nav-user-stats">
+          <text class="nav-user-name">{{ userInfo.nickname || userInfo.phone }}</text>
+          
+          <view class="nav-stat-item">
+            <text class="nav-stat-label">积分</text>
+            <text class="nav-stat-value">{{ userStats.points }}</text>
+          </view>
+          
+          <view class="nav-stat-item">
+            <text class="nav-stat-label">余额</text>
+            <text class="nav-stat-value" @click="goToWallet">¥{{ userStats.balance }}</text>
+          </view>
+          
+          <view class="nav-stat-item" @click="goToCoupons">
+            <text class="nav-stat-label">券</text>
+            <text class="nav-stat-value">{{ serviceCounts.coupons }}</text>
+          </view>
+        </view>
+        
+        <!-- 设置按钮 (右侧) -->
+        <view class="nav-actions">
+          <view class="action-btn" @click="goToSettings">
+            <text class="action-icon">⚙️</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 导航栏占位符 - 恢复 -->
+    <view :style="{ height: (statusBarHeight + 10) + 'px' }"></view>
+    
+    <!-- 我的服务 (移到订单上方) -->
+    <view class="my-services" style="margin-top: 10px;">
+      <view class="section-title">我的服务</view>
+      <view class="service-grid">
+        <view class="service-item" @click="goToCoupons">
+          <text class="service-icon">🎫</text>
+          <text class="service-text">优惠券</text>
+          <text v-if="serviceCounts.coupons > 0" class="service-badge">{{ serviceCounts.coupons }}</text>
+        </view>
+        <view class="service-item" @click="goToAddress">
+          <text class="service-icon">📍</text>
+          <text class="service-text">收货地址</text>
+        </view>
+        <view class="service-item" @click="goToFavorites">
+          <text class="service-icon">❤️</text>
+          <text class="service-text">我的收藏</text>
+          <text v-if="serviceCounts.favorites > 0" class="service-badge">{{ serviceCounts.favorites }}</text>
+        </view>
+
+        <view class="service-item" @click="goToFootprint">
+          <text class="service-icon">👣</text>
+          <text class="service-text">浏览足迹</text>
+        </view>
+        <view class="service-item" @click="goToRefund">
+          <text class="service-icon">🔄</text>
+          <text class="service-text">退款/售后</text>
+        </view>
+        <view class="service-item" @click="contactService">
+          <text class="service-icon">💬</text>
+          <text class="service-text">在线客服</text>
+        </view>
+        <view class="service-item" @click="goToMySubscriptions">
+          <text class="service-icon">🧩</text>
+          <text class="service-text">我的订阅</text>
+        </view>
+        <view class="service-item" @click="goToSubscriptions">
+          <text class="service-icon">📱</text>
+          <text class="service-text">软件订阅</text>
         </view>
       </view>
-      <view class="settings-icon" @click="goToSettings">⚙️</view>
     </view>
 
     <!-- 订单状态快捷入口 -->
     <view class="order-shortcuts">
       <view class="section-title">我的订单</view>
       <view class="order-tabs">
-        <view class="order-tab" @click="goToOrders('all')">
+        <view class="order-tab" :class="{ active: currentOrderTab === 'all' }" @click="switchOrderTab('all')">
           <text class="tab-icon">📋</text>
-          <text class="tab-text">全部订单</text>
+          <text class="tab-text">全部</text>
           <text v-if="orderCounts.total > 0" class="tab-badge">{{ orderCounts.total }}</text>
         </view>
-        <view class="order-tab" @click="goToOrders('pending')">
+        <view class="order-tab" :class="{ active: currentOrderTab === 'pending' }" @click="switchOrderTab('pending')">
           <text class="tab-icon">💰</text>
           <text class="tab-text">待支付</text>
           <text v-if="orderCounts.pending > 0" class="tab-badge">{{ orderCounts.pending }}</text>
         </view>
-        <view class="order-tab" @click="goToOrders('shipped')">
+        <view class="order-tab" :class="{ active: currentOrderTab === 'toship' }" @click="switchOrderTab('toship')">
           <text class="tab-icon">🚚</text>
+          <text class="tab-text">待发货</text>
+          <text v-if="orderCounts.toship > 0" class="tab-badge">{{ orderCounts.toship }}</text>
+        </view>
+        <view class="order-tab" :class="{ active: currentOrderTab === 'shipped' }" @click="switchOrderTab('shipped')">
+          <text class="tab-icon">📦</text>
           <text class="tab-text">待收货</text>
           <text v-if="orderCounts.shipped > 0" class="tab-badge">{{ orderCounts.shipped }}</text>
         </view>
-        <view class="order-tab" @click="goToOrders('completed')">
-          <text class="tab-icon">⭐</text>
-          <text class="tab-text">待评价</text>
-          <text v-if="orderCounts.review > 0" class="tab-badge">{{ orderCounts.review }}</text>
-        </view>
       </view>
     </view>
 
-    <!-- 最近订单 -->
+    <!-- 最近订单列表 (根据Tab切换显示) -->
     <view class="recent-orders">
       <view class="section-header">
-        <text class="section-title">最近订单</text>
-        <text class="view-all" @click="goToOrders('all')">查看全部 ></text>
+        <text class="section-title">{{ getOrderSectionTitle() }}</text>
+        <text class="view-all" @click="goToOrders(currentOrderTab)">查看更多 ></text>
       </view>
       
-      <view v-if="recentOrders.length === 0" class="empty-orders">
-        <text class="empty-text">暂无订单记录</text>
+      <view v-if="filteredOrders.length === 0" class="empty-orders">
+        <text class="empty-text">暂无相关订单记录</text>
         <button class="start-shopping" @click="goShopping">去逛逛</button>
       </view>
       
-      <view v-for="order in recentOrders" :key="order.id" class="order-item" @click="viewOrderDetail(order)">
+      <view v-for="order in filteredOrders" :key="order.id" class="order-item" @click="viewOrderDetail(order)">
         <view class="order-header">
           <text class="order-no">订单号: {{ order.order_no }}</text>
           <text class="order-status" :class="getOrderStatusClass(order.status)">{{ getOrderStatusText(order.status) }}</text>
         </view>
         <view class="order-content">
-          <image :src="getOrderMainImage(order)" class="order-image" />
+          <image :src="getOrderMainImage(order)" class="order-image" mode="aspectFill" />
           <view class="order-info">
             <text class="order-title">{{ getOrderTitle(order) }}</text>
             <text class="order-amount">¥{{ order.actual_amount }}</text>
@@ -76,7 +146,7 @@
     </view>
 
     <!-- 我的服务 -->
-    <view class="my-services">
+    <!-- <view class="my-services">
       <view class="section-title">我的服务</view>
       <view class="service-grid">
         <view class="service-item" @click="goToCoupons">
@@ -114,7 +184,7 @@
           <text class="service-text">软件订阅</text>
         </view>
       </view>
-    </view>
+    </view> -->
 
     <!-- 消费统计 -->
     <view class="consumption-stats">
@@ -147,7 +217,7 @@
     </view>
 
     <!-- 账户安全 -->
-    <view class="account-security">
+    <!-- <view class="account-security">
       <view class="section-title">账户安全</view>
       <view class="security-items">
         <view class="security-item" @click="changePassword">
@@ -172,12 +242,13 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> -->
   </view>
 </template>
 
 <script>
 import { UserType, OrderType } from '@/types/mall-types.uts'
+// import { supabase as supa } from '@/components/supadb/aksupainstance.uts'
 
 type UserStatsType = {
   points: number
@@ -188,8 +259,8 @@ type UserStatsType = {
 type OrderCountsType = {
   total: number
   pending: number
+  toship: number
   shipped: number
-  review: number
 }
 
 type ServiceCountsType = {
@@ -231,9 +302,9 @@ export default {
       orderCounts: {
         total: 0,
         pending: 0,
+        toship: 0,
         shipped: 0,
-        review: 0
-      } as OrderCountsType,
+      } as any,
       serviceCounts: {
         coupons: 0,
         favorites: 0
@@ -251,16 +322,101 @@ export default {
         order_count: 0,
         avg_amount: 0,
         save_amount: 0
-      } as ConsumptionStatsType
+      } as ConsumptionStatsType,
+      statusBarHeight: 0,
+      currentOrderTab: 'all' as string, // 当前选中的订单Tab
+      allOrders: [] as Array<OrderType> // 存储所有订单数据
     }
   },
   onLoad() {
+    this.initPage()
     this.loadUserProfile()
+    this.loadOrders()
+    
+    // 监听订单更新事件
+    uni.$on('orderUpdated', this.handleOrderUpdated)
   },
   onShow() {
     this.refreshData()
   },
+  onUnload() {
+    // 移除事件监听
+    uni.$off('orderUpdated', this.handleOrderUpdated)
+  },
+  computed: {
+    // 根据当前Tab筛选订单
+    filteredOrders(): Array<OrderType> {
+      if (this.currentOrderTab === 'all') {
+        return this.allOrders
+      } else if (this.currentOrderTab === 'pending') {
+        return this.allOrders.filter((order: OrderType): boolean => order.status === 1)
+      } else if (this.currentOrderTab === 'toship') {
+        return this.allOrders.filter((order: OrderType): boolean => order.status === 2)
+      } else if (this.currentOrderTab === 'shipped') {
+        return this.allOrders.filter((order: OrderType): boolean => order.status === 3)
+      } else if (this.currentOrderTab === 'review') {
+        return this.allOrders.filter((order: OrderType): boolean => order.status === 4)
+      }
+      return []
+    }
+  },
   methods: {
+    // 加载订单数据
+    async loadOrders() {
+      const userStore = uni.getStorageSync('userInfo')
+      // const userId = userStore?.id
+      // if (!userId) return
+
+      try {
+        // 从本地存储加载订单数据
+        const storedOrders = uni.getStorageSync('orders')
+        let orders: any[] = []
+        if (storedOrders) {
+             orders = JSON.parse(storedOrders as string) as any[]
+        }
+        
+        this.allOrders = orders
+        // 按时间倒序
+        this.allOrders.sort((a: any, b: any) => {
+            return new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
+        })
+        
+        // 过滤最近的订单
+        this.recentOrders = this.allOrders.slice(0, 5)
+        
+        // 更新角标统计 (确保状态码一致: 1=待支付, 2=待发货, 3=待收货, 4=待评价)
+        this.orderCounts = {
+            total: this.allOrders.length,
+            pending: this.allOrders.filter((o: any) => o.status === 1).length,
+            toship: this.allOrders.filter((o: any) => o.status === 2).length, // 修复：仅计算状态2为待发货
+            shipped: this.allOrders.filter((o: any) => o.status === 3).length, // 修复：仅计算状态3为待收货
+            review: this.allOrders.filter((o: any) => o.status === 4).length
+        }
+      } catch (e) {
+          console.error('加载订单异常', e)
+      }
+    },
+    
+    // 切换订单Tab
+    switchOrderTab(tab: string) {
+      this.currentOrderTab = tab
+    },
+    
+    // 获取当前订单部分标题
+    getOrderSectionTitle(): string {
+      const titles: Record<string, string> = {
+        'all': '全部订单',
+        'pending': '待支付订单',
+        'shipped': '待收货订单',
+        'review': '待评价订单'
+      }
+      return titles[this.currentOrderTab] || '我的订单'
+    },
+
+    initPage() {
+      const systemInfo = uni.getSystemInfoSync()
+      this.statusBarHeight = systemInfo.statusBarHeight || 0
+    },
     loadUserProfile() {
       // 模拟加载用户信息
       this.userInfo = {
@@ -364,6 +520,15 @@ export default {
     refreshData() {
       // 刷新页面数据
       this.loadUserProfile()
+      this.loadOrders()
+      this.updateCouponCount() // 更新优惠券数量
+    },
+    
+    updateCouponCount() {
+      // 从本地存储读取领取的优惠券数量并叠加到基础数量上
+      const baseCoupons = 5
+      const claimedCoupons = uni.getStorageSync('claimedCoupons') || 0
+      this.serviceCounts.coupons = baseCoupons + (claimedCoupons as number)
     },
     
     getUserLevel(): string {
@@ -417,12 +582,20 @@ export default {
       })
     },
     
+    // 跳转设置
     goToSettings() {
       uni.navigateTo({
         url: '/pages/mall/consumer/settings'
       })
     },
     
+    // 跳转钱包
+    goToWallet() {
+      uni.navigateTo({
+        url: '/pages/mall/consumer/wallet'
+      })
+    },
+    
     goToOrders(type: string) {
       uni.navigateTo({
         url: `/pages/mall/consumer/orders?type=${type}`
@@ -476,8 +649,9 @@ export default {
     },
     
     goToAddress() {
+      // 暂时跳转到设置页的地址管理
       uni.navigateTo({
-        url: '/pages/mall/consumer/address'
+        url: '/pages/mall/consumer/address-list'
       })
     },
     
@@ -531,6 +705,26 @@ export default {
       uni.navigateTo({
         url: '/pages/mall/consumer/bind-email'
       })
+    },
+    
+    // 处理订单更新事件
+    handleOrderUpdated(data: any) {
+      // 当收到订单更新事件时，刷新订单数据
+      console.log('收到订单更新事件:', data)
+      this.refreshData()
+      
+      // 显示提示
+      if (data.status === 1) {
+        uni.showToast({
+          title: '订单已保存到待支付',
+          icon: 'success'
+        })
+      } else if (data.status === 2) {
+        uni.showToast({
+          title: '支付成功，订单待发货',
+          icon: 'success'
+        })
+      }
     }
   }
 }
@@ -542,115 +736,183 @@ export default {
   min-height: 100vh;
 }
 
-.profile-header {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  padding: 60rpx 30rpx 40rpx;
+/* 智能顶部导航栏 */
+.smart-navbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  background: linear-gradient(135deg, #4CAF50 0%, #2E7D32 100%);
+  z-index: 1000;
+  box-shadow: 0 2px 12px rgba(76, 175, 80, 0.15);
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
+.nav-container {
+  padding: 0 16px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  max-width: 1400px;
+  margin: 0 auto;
+  height: 44px;
+}
+
+/* 导航栏用户信息区域 */
+.nav-user-stats {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start; /* 靠左对齐，紧跟头像 */
+  margin-right: 12px;
+  overflow: hidden; /* 防止溢出 */
+}
+
+.nav-user-name {
+  font-size: 16px;
+  font-weight: bold;
+  color: white;
+  margin-right: 12px;
+  max-width: 30%; /* 限制名字宽度 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.nav-stat-item {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 12px;
+  padding: 2px 8px;
+  margin-right: 8px;
+  flex-shrink: 0; /* 防止被压缩 */
+}
+
+.nav-stat-label {
+  font-size: 11px;
+  color: rgba(255, 255, 255, 0.9);
+  margin-right: 4px;
+}
+
+.nav-stat-value {
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+}
+
+.nav-avatar {
+  width: 36px;
+  height: 36px;
+  border-radius: 18px;
+  border: 2px solid rgba(255, 255, 255, 0.8);
+  margin-right: 12px;
+  flex-shrink: 0;
+}
+
+.nav-actions {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-shrink: 0;
+}
+
+.action-btn {
   display: flex;
   align-items: center;
-  color: #fff;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 16px;
+  cursor: pointer;
 }
 
-.user-avatar {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 60rpx;
-  margin-right: 30rpx;
-  border: 4rpx solid rgba(255, 255, 255, 0.3);
+.action-icon {
+  font-size: 18px;
+  color: white;
 }
 
-.user-info {
-  flex: 1;
-}
-
-.user-name {
-  font-size: 36rpx;
-  font-weight: bold;
-  margin-bottom: 8rpx;
-}
-
-.user-level {
-  font-size: 24rpx;
-  background-color: rgba(255, 255, 255, 0.2);
-  padding: 6rpx 12rpx;
-  border-radius: 12rpx;
-  margin-bottom: 15rpx;
-  display: inline-block;
-}
-
-.user-stats {
-  display: flex;
-  gap: 30rpx;
-}
-
-.stat-item {
-  font-size: 24rpx;
-  opacity: 0.9;
-}
-
-.settings-icon {
-  font-size: 32rpx;
-  padding: 10rpx;
+/* 导航栏占位符 */
+.navbar-placeholder {
+  width: 100%;
+  flex-shrink: 0;
 }
 
 .order-shortcuts, .recent-orders, .my-services, .consumption-stats, .account-security {
   background-color: #fff;
-  margin-bottom: 20rpx;
-  padding: 30rpx;
+  margin: 15px 15px; /* 顶部恢复 margin */
+  border-radius: 12px; /* 统一圆角 */
+  padding: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.05);
 }
 
 .section-title {
-  font-size: 32rpx;
+  font-size: 16px;
   font-weight: bold;
   color: #333;
-  margin-bottom: 25rpx;
-}
-
-.section-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 25rpx;
-}
-
-.view-all {
-  font-size: 24rpx;
-  color: #007aff;
+  margin-bottom: 16px;
 }
 
 .order-tabs {
   display: flex;
+  flex-direction: row; /* 显式横向排列 */
   justify-content: space-between;
+  width: 100%;
 }
 
 .order-tab {
   flex: 1;
   display: flex;
-  flex-direction: column;
+  flex-direction: row; /* 关键：改为横向排列 */
   align-items: center;
+  justify-content: center; /* 居中 */
   position: relative;
+  padding: 8px 0;
 }
 
 .tab-icon {
-  font-size: 40rpx;
-  margin-bottom: 10rpx;
+  font-size: 20px;
+  margin-right: 6px; /* 图标和文字间距 */
+  margin-bottom: 0; /* 移除底部间距 */
 }
 
 .tab-text {
-  font-size: 24rpx;
-  color: #666;
+  font-size: 14px;
+  color: #333;
+}
+
+/* 选中状态的Tab */
+.order-tab.active .tab-icon,
+.order-tab.active .tab-text {
+  color: #4CAF50;
+  font-weight: bold;
+}
+
+.order-tab.active {
+  background-color: #f0f9f0;
+  border-radius: 8px;
 }
 
 .tab-badge {
   position: absolute;
-  top: -8rpx;
-  right: 20rpx;
+  top: 0;
+  right: 10%; /* 调整位置 */
   background-color: #ff4444;
   color: #fff;
-  font-size: 20rpx;
-  padding: 4rpx 8rpx;
-  border-radius: 10rpx;
-  min-width: 32rpx;
+  font-size: 10px;
+  padding: 1px 5px;
+  border-radius: 8px;
+  min-width: 14px;
   text-align: center;
+  line-height: 1.2;
 }
 
 .empty-orders {
@@ -782,16 +1044,19 @@ export default {
 
 .service-grid {
   display: flex;
-  flex-wrap: wrap;
-  gap: 30rpx;
+  flex-direction: row;
+  flex-wrap: wrap; /* 允许换行 */
+  gap: 16px 0; /* 行间距16px，列间距由 flex 控制 */
+  justify-content: flex-start; /* 从左开始排列 */
 }
 
 .service-item {
-  width: 30%;
+  width: 25%; /* 每行4个 */
   display: flex;
   flex-direction: column;
   align-items: center;
   position: relative;
+  box-sizing: border-box; /* 确保 padding 不影响宽度 */
 }
 
 .service-icon {
diff --git a/pages/mall/consumer/refund-review.uvue b/pages/mall/consumer/refund-review.uvue
new file mode 100644
index 00000000..4e4efb66
--- /dev/null
+++ b/pages/mall/consumer/refund-review.uvue
@@ -0,0 +1,163 @@
+<template>
+  <view class="review-page">
+    <view class="header">
+      <text class="title">服务评价</text>
+      <text class="subtitle">请对本次售后服务进行评价</text>
+    </view>
+
+    <view class="rating-section">
+      <text class="label">服务评分</text>
+      <view class="stars">
+        <text 
+          v-for="i in 5" 
+          :key="i" 
+          class="star" 
+          :class="{ active: i <= rating }"
+          @click="setRating(i)"
+        >★</text>
+      </view>
+      <text class="rating-text">{{ ratingText }}</text>
+    </view>
+
+    <view class="comment-section">
+      <textarea 
+        v-model="comment" 
+        class="comment-input" 
+        placeholder="请输入您的评价内容，您的建议是我们改进的动力"
+        maxlength="200"
+      />
+      <text class="word-count">{{ comment.length }}/200</text>
+    </view>
+
+    <button class="submit-btn" @click="submitReview" :loading="submitting">提交评价</button>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, computed } from 'vue'
+
+const rating = ref(5)
+const comment = ref('')
+const submitting = ref(false)
+
+const ratingText = computed(() => {
+  const texts = ['非常不满意', '不满意', '一般', '满意', '非常满意']
+  return texts[rating.value - 1]
+})
+
+const setRating = (val: number) => {
+  rating.value = val
+}
+
+const submitReview = () => {
+  if (submitting.value) return
+  submitting.value = true
+  
+  // 模拟提交
+  setTimeout(() => {
+    uni.showToast({
+      title: '评价成功',
+      icon: 'success'
+    })
+    
+    setTimeout(() => {
+      uni.navigateBack()
+    }, 1500)
+    
+    submitting.value = false
+  }, 1000)
+}
+</script>
+
+<style scoped>
+.review-page {
+  min-height: 100vh;
+  background-color: #ffffff;
+  padding: 20px;
+}
+
+.header {
+  margin-bottom: 30px;
+  text-align: center;
+}
+
+.title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #333;
+  display: block;
+  margin-bottom: 10px;
+}
+
+.subtitle {
+  font-size: 14px;
+  color: #999;
+}
+
+.rating-section {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 30px;
+}
+
+.label {
+  font-size: 16px;
+  color: #333;
+  margin-bottom: 15px;
+}
+
+.stars {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 10px;
+}
+
+.star {
+  font-size: 32px;
+  color: #ddd;
+  transition: color 0.2s;
+}
+
+.star.active {
+  color: #ffca28;
+}
+
+.rating-text {
+  font-size: 14px;
+  color: #666;
+}
+
+.comment-section {
+  position: relative;
+  margin-bottom: 30px;
+}
+
+.comment-input {
+  width: 100%;
+  height: 120px;
+  background-color: #f5f5f5;
+  border-radius: 8px;
+  padding: 15px;
+  font-size: 14px;
+  box-sizing: border-box;
+}
+
+.word-count {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+  font-size: 12px;
+  color: #999;
+}
+
+.submit-btn {
+  background-color: #007aff;
+  color: #ffffff;
+  border-radius: 25px;
+  font-size: 16px;
+  font-weight: bold;
+  height: 50px;
+  line-height: 50px;
+}
+</style>
diff --git a/pages/mall/consumer/refund.uvue b/pages/mall/consumer/refund.uvue
new file mode 100644
index 00000000..226d8b92
--- /dev/null
+++ b/pages/mall/consumer/refund.uvue
@@ -0,0 +1,858 @@
+<!-- 退款页面 -->
+<template>
+	<view class="refund-page">
+		<!-- 顶部栏 -->
+		<view class="refund-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="header-title">退款/售后</text>
+		</view>
+
+		<!-- 标签页 -->
+		<view class="refund-tabs">
+			<view :class="['refund-tab', { active: activeTab === 'all' }]" @click="changeTab('all')">
+				<text class="tab-text">全部</text>
+			</view>
+			<view :class="['refund-tab', { active: activeTab === 'processing' }]" @click="changeTab('processing')">
+				<text class="tab-text">处理中</text>
+				<text v-if="tabCounts.processing > 0" class="tab-badge">{{ tabCounts.processing }}</text>
+			</view>
+			<view :class="['refund-tab', { active: activeTab === 'completed' }]" @click="changeTab('completed')">
+				<text class="tab-text">已完成</text>
+			</view>
+		</view>
+
+		<!-- 售后列表 -->
+		<scroll-view class="refund-content" scroll-y @scrolltolower="loadMore">
+			<!-- 空状态 -->
+			<view v-if="refunds.length === 0 && !isLoading" class="empty-refunds">
+				<text class="empty-icon">🔄</text>
+				<text class="empty-text">暂无售后记录</text>
+				<text class="empty-subtext">您可以在订单详情中申请售后</text>
+				<button class="go-orders-btn" @click="goToOrders">查看订单</button>
+			</view>
+
+			<!-- 售后项 -->
+			<view v-for="refund in refunds" :key="refund.id" class="refund-item">
+				<view class="refund-header">
+					<text class="refund-no">售后单号: {{ refund.refund_no }}</text>
+					<text :class="['refund-status', getStatusClass(refund.status)]">
+						{{ getStatusText(refund.status) }}
+					</text>
+				</view>
+
+				<view class="order-info">
+					<text class="order-no">订单号: {{ refund.order?.order_no }}</text>
+					<text class="order-time">{{ formatTime(refund.order?.created_at) }}</text>
+				</view>
+
+				<view class="product-info" @click="viewOrder(refund.order_id)">
+					<image class="product-image" :src="getProductImage(refund)" />
+					<view class="product-details">
+						<text class="product-name">{{ getProductName(refund) }}</text>
+						<text v-if="refund.refund_reason" class="refund-reason">原因: {{ refund.refund_reason }}</text>
+						<view class="refund-amount">
+							<text class="amount-label">退款金额:</text>
+							<text class="amount-value">¥{{ refund.refund_amount }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 进度时间线 -->
+				<view v-if="refund.status_history?.length > 0" class="timeline">
+					<view v-for="(step, index) in getTimelineSteps(refund)" 
+								:key="index" 
+								class="timeline-step">
+						<view class="step-dot" :class="{ active: step.active, completed: step.completed }"></view>
+						<view class="step-info">
+							<text class="step-title">{{ step.title }}</text>
+							<text class="step-time">{{ step.time }}</text>
+							<text v-if="step.desc" class="step-desc">{{ step.desc }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 操作按钮 -->
+				<view v-if="refund.status === 1" class="refund-actions">
+					<button class="action-btn cancel" @click="cancelRefund(refund)">取消申请</button>
+					<button class="action-btn contact" @click="contactService(refund)">联系客服</button>
+				</view>
+
+				<view v-if="refund.status === 3" class="refund-actions">
+					<button class="action-btn review" @click="reviewRefund(refund)">评价服务</button>
+					<button class="action-btn delete" @click="deleteRefund(refund)">删除记录</button>
+				</view>
+			</view>
+
+			<!-- 加载更多 -->
+			<view v-if="isLoading" class="loading-more">
+				<text class="loading-text">加载中...</text>
+			</view>
+			<view v-if="!hasMore && refunds.length > 0" class="no-more">
+				<text class="no-more-text">没有更多了</text>
+			</view>
+		</scroll-view>
+
+		<!-- 申请售后按钮 -->
+		<view class="apply-btn-container">
+			<button class="apply-btn" @click="applyRefund">申请售后</button>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, watch } from 'vue'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+type RefundType = {
+	id: string
+	user_id: string
+	order_id: string
+	refund_no: string
+	refund_type: number // 1:仅退款 2:退货退款
+	refund_reason: string
+	refund_amount: number
+	status: number // 1:待处理 2:处理中 3:已完成 4:已取消 5:已拒绝
+	status_history: Array<{
+		status: number
+		remark: string
+		created_at: string
+	}> | null
+	created_at: string
+	order?: {
+		id: string
+		order_no: string
+		created_at: string
+		order_items: Array<{
+			id: string
+			product_name: string
+			sku_specifications: any
+			price: number
+			quantity: number
+			product?: {
+				images: string[]
+			}
+		}>
+	}
+}
+
+type TabCountsType = {
+	processing: number
+}
+
+const activeTab = ref<string>('all')
+const refunds = ref<Array<RefundType>>([])
+const tabCounts = ref<TabCountsType>({
+	processing: 0
+})
+const isLoading = ref<boolean>(false)
+const currentPage = ref<number>(1)
+const pageSize = ref<number>(15)
+const hasMore = ref<boolean>(true)
+
+// 监听标签页变化
+watch(activeTab, () => {
+	resetData()
+	loadRefunds()
+})
+
+// 生命周期
+onMounted(() => {
+	loadRefunds()
+	loadTabCounts()
+})
+
+// 重置数据
+const resetData = () => {
+	refunds.value = []
+	currentPage.value = 1
+	hasMore.value = true
+}
+
+// 加载售后数据
+const loadRefunds = async (loadMore: boolean = false) => {
+	if (isLoading.value || (!hasMore.value && loadMore)) {
+		return
+	}
+
+	isLoading.value = true
+
+	try {
+		const userId = getCurrentUserId()
+		if (!userId) {
+			uni.navigateTo({
+				url: '/pages/user/login'
+			})
+			return
+		}
+
+		const page = loadMore ? currentPage.value + 1 : 1
+		
+		let query = supa
+			.from('refunds')
+			.select(`
+				*,
+				order:order_id(
+					order_no,
+					created_at,
+					order_items(
+						*,
+						product:product_id(images)
+					)
+				)
+			`)
+			.eq('user_id', userId)
+			.order('created_at', { ascending: false })
+
+		// 根据标签页过滤
+		if (activeTab.value === 'processing') {
+			query = query.in('status', [1, 2]) // 待处理和处理中
+		} else if (activeTab.value === 'completed') {
+			query = query.in('status', [3, 4, 5]) // 已完成、已取消、已拒绝
+		}
+
+		// 分页
+		query = query.range((page - 1) * pageSize.value, page * pageSize.value - 1)
+
+		const { data, error } = await query
+
+		if (error !== null) {
+			console.error('加载售后记录失败:', error)
+			return
+		}
+
+		const newRefunds = data || []
+
+		if (loadMore) {
+			refunds.value.push(...newRefunds)
+			currentPage.value = page
+		} else {
+			refunds.value = newRefunds
+			currentPage.value = 1
+		}
+
+		hasMore.value = newRefunds.length === pageSize.value
+	} catch (err) {
+		console.error('加载售后记录异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 加载标签页计数
+const loadTabCounts = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+		const { count, error } = await supa
+			.from('refunds')
+			.select('*', { count: 'exact' })
+			.eq('user_id', userId)
+			.in('status', [1, 2])
+
+		if (error !== null) {
+			console.error('加载计数失败:', error)
+			return
+		}
+
+		tabCounts.value.processing = count || 0
+	} catch (err) {
+		console.error('加载计数异常:', err)
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || ''
+}
+
+// 获取状态文本
+const getStatusText = (status: number): string => {
+	const statusMap: Record<number, string> = {
+		1: '待处理',
+		2: '处理中',
+		3: '已完成',
+		4: '已取消',
+		5: '已拒绝'
+	}
+	return statusMap[status] || '未知状态'
+}
+
+// 获取状态样式类
+const getStatusClass = (status: number): string => {
+	const classMap: Record<number, string> = {
+		1: 'status-pending',
+		2: 'status-processing',
+		3: 'status-completed',
+		4: 'status-cancelled',
+		5: 'status-rejected'
+	}
+	return classMap[status] || 'status-unknown'
+}
+
+// 获取商品图片
+const getProductImage = (refund: RefundType): string => {
+	const firstItem = refund.order?.order_items?.[0]
+	if (!firstItem?.product?.images?.[0]) {
+		return '/static/default-product.png'
+	}
+	return firstItem.product.images[0]
+}
+
+// 获取商品名称
+const getProductName = (refund: RefundType): string => {
+	const items = refund.order?.order_items || []
+	if (items.length === 0) return '未知商品'
+	
+	if (items.length === 1) {
+		return items[0].product_name
+	} else {
+		return `${items[0].product_name}等${items.length}件商品`
+	}
+}
+
+// 格式化时间
+const formatTime = (timeStr?: string): string => {
+	if (!timeStr) return ''
+	const date = new Date(timeStr)
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	return `${month}-${day}`
+}
+
+// 获取时间线步骤
+const getTimelineSteps = (refund: RefundType): Array<any> => {
+	const steps = [
+		{ status: 0, title: '提交申请', time: refund.created_at },
+		{ status: 1, title: '商家处理', time: '' },
+		{ status: 3, title: '退款完成', time: '' }
+	]
+	
+	// 如果有状态历史，更新时间和描述
+	if (refund.status_history) {
+		refund.status_history.forEach(history => {
+			if (history.status === 1 || history.status === 2) {
+				steps[1].time = history.created_at
+				steps[1].desc = history.remark
+			} else if (history.status === 3) {
+				steps[2].time = history.created_at
+				steps[2].desc = history.remark
+			}
+		})
+	}
+	
+	// 标记当前状态
+	return steps.map((step, index) => ({
+		...step,
+		active: index === getCurrentStepIndex(refund.status),
+		completed: index < getCurrentStepIndex(refund.status)
+	}))
+}
+
+// 获取当前步骤索引
+const getCurrentStepIndex = (status: number): number => {
+	switch (status) {
+		case 1: return 0 // 待处理
+		case 2: return 1 // 处理中
+		case 3: return 2 // 已完成
+		case 4: return 0 // 已取消
+		case 5: return 1 // 已拒绝
+		default: return 0
+	}
+}
+
+// 切换标签页
+const changeTab = (tab: string) => {
+	activeTab.value = tab
+}
+
+// 加载更多
+const loadMore = () => {
+	if (hasMore.value && !isLoading.value) {
+		loadRefunds(true)
+	}
+}
+
+// 查看订单
+const viewOrder = (orderId: string) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/order-detail?id=${orderId}`
+	})
+}
+
+// 取消退款申请
+const cancelRefund = (refund: RefundType) => {
+	uni.showModal({
+		title: '取消申请',
+		content: '确定要取消这个退款申请吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					const { error } = await supa
+						.from('refunds')
+						.update({ 
+							status: 4, // 已取消
+							status_history: [...(refund.status_history || []), {
+								status: 4,
+								remark: '用户取消申请',
+								created_at: new Date().toISOString()
+							}]
+						})
+						.eq('id', refund.id)
+
+					if (error !== null) {
+						throw error
+					}
+
+					refund.status = 4
+					loadTabCounts() // 重新加载计数
+					
+					uni.showToast({
+						title: '已取消',
+						icon: 'success'
+					})
+					
+				} catch (err) {
+					console.error('取消退款失败:', err)
+					uni.showToast({
+						title: '取消失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 联系客服
+const contactService = (refund: RefundType) => {
+	uni.navigateTo({
+		url: `/pages/mall/service/chat?refundId=${refund.id}`
+	})
+}
+
+// 评价服务
+const reviewRefund = (refund: RefundType) => {
+	uni.navigateTo({
+		url: `/pages/mall/consumer/refund-review?id=${refund.id}`
+	})
+}
+
+// 删除记录
+const deleteRefund = (refund: RefundType) => {
+	uni.showModal({
+		title: '删除记录',
+		content: '确定要删除这个售后记录吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					const { error } = await supa
+						.from('refunds')
+						.delete()
+						.eq('id', refund.id)
+
+					if (error !== null) {
+						throw error
+					}
+
+					const index = refunds.value.findIndex(r => r.id === refund.id)
+					if (index !== -1) {
+						refunds.value.splice(index, 1)
+						refunds.value = [...refunds.value]
+					}
+					
+					uni.showToast({
+						title: '删除成功',
+						icon: 'success'
+					})
+					
+				} catch (err) {
+					console.error('删除记录失败:', err)
+					uni.showToast({
+						title: '删除失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 申请售后
+const applyRefund = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/apply-refund'
+	})
+}
+
+// 查看订单
+const goToOrders = () => {
+	uni.switchTab({
+		url: '/pages/mall/consumer/orders'
+	})
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+.refund-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.refund-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+	margin-right: 15px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.refund-tabs {
+	background-color: #ffffff;
+	display: flex;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.refund-tab {
+	flex: 1;
+	padding: 15px;
+	text-align: center;
+	position: relative;
+}
+
+.refund-tab.active {
+	color: #007aff;
+}
+
+.refund-tab.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 2px;
+	background-color: #007aff;
+}
+
+.tab-text {
+	font-size: 16px;
+	color: #666666;
+}
+
+.refund-tab.active .tab-text {
+	color: #007aff;
+	font-weight: bold;
+}
+
+.tab-badge {
+	position: absolute;
+	top: 10px;
+	right: 20px;
+	background-color: #ff4757;
+	color: #ffffff;
+	font-size: 10px;
+	padding: 2px 5px;
+	border-radius: 8px;
+	min-width: 16px;
+	text-align: center;
+}
+
+.refund-content {
+	flex: 1;
+}
+
+.empty-refunds {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 80px 20px;
+	background-color: #ffffff;
+}
+
+.empty-icon {
+	font-size: 80px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+	margin-bottom: 30px;
+}
+
+.go-orders-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	padding: 10px 40px;
+	border-radius: 25px;
+	font-size: 14px;
+	border: none;
+}
+
+.refund-item {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+}
+
+.refund-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.refund-no {
+	font-size: 14px;
+	color: #333333;
+}
+
+.refund-status {
+	font-size: 14px;
+	padding: 4px 10px;
+	border-radius: 12px;
+	color: #ffffff;
+}
+
+.status-pending {
+	background-color: #ffa726;
+}
+
+.status-processing {
+	background-color: #2196f3;
+}
+
+.status-completed {
+	background-color: #4caf50;
+}
+
+.status-cancelled {
+	background-color: #9e9e9e;
+}
+
+.status-rejected {
+	background-color: #f44336;
+}
+
+.order-info {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.order-no {
+	font-size: 13px;
+	color: #666666;
+}
+
+.order-time {
+	font-size: 12px;
+	color: #999999;
+}
+
+.product-info {
+	display: flex;
+	margin-bottom: 15px;
+}
+
+.product-image {
+	width: 60px;
+	height: 60px;
+	border-radius: 5px;
+	margin-right: 15px;
+}
+
+.product-details {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.product-name {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+}
+
+.refund-reason {
+	font-size: 12px;
+	color: #666666;
+	margin-bottom: 8px;
+}
+
+.refund-amount {
+	display: flex;
+	align-items: baseline;
+}
+
+.amount-label {
+	font-size: 13px;
+	color: #666666;
+	margin-right: 5px;
+}
+
+.amount-value {
+	font-size: 16px;
+	color: #ff4757;
+	font-weight: bold;
+}
+
+.timeline {
+	padding: 15px 0;
+	border-top: 1px solid #f5f5f5;
+}
+
+.timeline-step {
+	display: flex;
+	margin-bottom: 15px;
+}
+
+.timeline-step:last-child {
+	margin-bottom: 0;
+}
+
+.step-dot {
+	width: 12px;
+	height: 12px;
+	border-radius: 6px;
+	border: 2px solid #e5e5e5;
+	margin-right: 15px;
+	position: relative;
+	top: 3px;
+}
+
+.step-dot.active {
+	border-color: #007aff;
+	background-color: #007aff;
+}
+
+.step-dot.completed {
+	border-color: #4caf50;
+	background-color: #4caf50;
+}
+
+.step-info {
+	flex: 1;
+}
+
+.step-title {
+	font-size: 14px;
+	color: #333333;
+	font-weight: bold;
+	margin-bottom: 3px;
+	display: block;
+}
+
+.step-time {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 3px;
+	display: block;
+}
+
+.step-desc {
+	font-size: 12px;
+	color: #666666;
+	display: block;
+}
+
+.refund-actions {
+	display: flex;
+	justify-content: flex-end;
+	gap: 10px;
+	padding-top: 15px;
+	border-top: 1px solid #f5f5f5;
+}
+
+.action-btn {
+	padding: 8px 15px;
+	border-radius: 15px;
+	font-size: 12px;
+	border: 1px solid;
+	background-color: #ffffff;
+}
+
+.action-btn.cancel {
+	border-color: #666666;
+	color: #666666;
+}
+
+.action-btn.contact {
+	border-color: #007aff;
+	color: #007aff;
+}
+
+.action-btn.review {
+	border-color: #ffa726;
+	color: #ffa726;
+}
+
+.action-btn.delete {
+	border-color: #f44336;
+	color: #f44336;
+}
+
+.loading-more,
+.no-more {
+	padding: 20px;
+	text-align: center;
+	background-color: #ffffff;
+}
+
+.loading-text,
+.no-more-text {
+	color: #999999;
+	font-size: 14px;
+}
+
+.apply-btn-container {
+	background-color: #ffffff;
+	padding: 15px;
+	border-top: 1px solid #e5e5e5;
+}
+
+.apply-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	height: 50px;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/review.uvue b/pages/mall/consumer/review.uvue
new file mode 100644
index 00000000..7c11504f
--- /dev/null
+++ b/pages/mall/consumer/review.uvue
@@ -0,0 +1,775 @@
+<!-- 评价页面 -->
+<template>
+	<view class="review-page">
+		<!-- 顶部栏 -->
+		<view class="review-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="header-title">评价商品</text>
+		</view>
+
+		<scroll-view class="review-content" scroll-y>
+			<!-- 订单信息 -->
+			<view class="order-section">
+				<text class="order-no">订单号: {{ order?.order_no }}</text>
+				<text class="order-time">下单时间: {{ formatTime(order?.created_at) }}</text>
+			</view>
+
+			<!-- 商品评价 -->
+			<view class="products-section">
+				<view v-for="(item, index) in orderItems" :key="item.id" class="product-review">
+					<view class="product-header">
+						<image class="product-image" :src="item.product_image || '/static/default-product.png'" />
+						<view class="product-info">
+							<text class="product-name">{{ item.product_name }}</text>
+							<text v-if="item.sku_specifications" class="product-spec">{{ getSpecText(item.sku_specifications) }}</text>
+						</view>
+					</view>
+
+					<!-- 评分 -->
+					<view class="rating-section">
+						<text class="rating-label">评分</text>
+						<view class="rating-stars">
+							<text v-for="star in 5" 
+										:key="star" 
+										class="star-icon"
+										:class="{ active: star <= ratings[index] }"
+										@click="setRating(index, star)">
+								⭐
+							</text>
+						</view>
+						<text class="rating-text">{{ getRatingText(ratings[index]) }}</text>
+					</view>
+
+					<!-- 评价内容 -->
+					<view class="content-section">
+						<textarea class="review-textarea" 
+											v-model="contents[index]" 
+											placeholder="请写下您的使用感受，分享给其他小伙伴吧"
+											maxlength="500" />
+						<text class="word-count">{{ contents[index]?.length || 0 }}/500</text>
+					</view>
+
+					<!-- 图片上传 -->
+					<view class="images-section">
+						<text class="images-label">上传图片(可选)</text>
+						<view class="images-grid">
+							<view v-for="(image, imgIndex) in images[index]" 
+										:key="imgIndex" 
+										class="image-item">
+								<image class="uploaded-image" :src="image" />
+								<text class="delete-image" @click="deleteImage(index, imgIndex)">×</text>
+							</view>
+							<view v-if="images[index].length < 9" 
+										class="upload-btn" 
+										@click="uploadImage(index)">
+								<text class="upload-icon">+</text>
+								<text class="upload-text">添加图片</text>
+							</view>
+						</view>
+					</view>
+
+					<!-- 匿名评价 -->
+					<view class="anonymous-section">
+						<view class="anonymous-switch">
+							<text class="switch-label">匿名评价</text>
+							<switch :checked="anonymous" @change="toggleAnonymous" />
+						</view>
+						<text class="anonymous-tip">评价内容对其他用户不可见</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 店铺评价 -->
+			<view v-if="merchant" class="merchant-section">
+				<text class="section-title">店铺评价</text>
+				<view class="merchant-rating">
+					<text class="rating-item">商品描述相符</text>
+					<view class="rating-stars small">
+						<text v-for="star in 5" 
+									:key="star" 
+									class="star-icon"
+									:class="{ active: star <= merchantRating.description }"
+									@click="setMerchantRating('description', star)">
+							⭐
+						</text>
+					</view>
+				</view>
+				<view class="merchant-rating">
+					<text class="rating-item">物流服务</text>
+					<view class="rating-stars small">
+						<text v-for="star in 5" 
+									:key="star" 
+									class="star-icon"
+									:class="{ active: star <= merchantRating.logistics }"
+									@click="setMerchantRating('logistics', star)">
+							⭐
+						</text>
+					</view>
+				</view>
+				<view class="merchant-rating">
+					<text class="rating-item">服务态度</text>
+					<view class="rating-stars small">
+						<text v-for="star in 5" 
+									:key="star" 
+									class="star-icon"
+									:class="{ active: star <= merchantRating.service }"
+									@click="setMerchantRating('service', star)">
+							⭐
+						</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 评价提示 -->
+			<view class="tips-section">
+				<text class="tip-title">评价须知</text>
+				<text class="tip-item">1. 评价后不可修改，请谨慎评价</text>
+				<text class="tip-item">2. 上传图片需为真实商品照片</text>
+				<text class="tip-item">3. 恶意评价将被删除并限制评价功能</text>
+				<text class="tip-item">4. 优质评价可获得积分奖励</text>
+			</view>
+		</scroll-view>
+
+		<!-- 提交按钮 -->
+		<view class="submit-section">
+			<button class="submit-btn" 
+							:class="{ disabled: !canSubmit || isSubmitting }"
+							@click="submitReview">
+				<text v-if="!isSubmitting" class="submit-text">提交评价</text>
+				<text v-else class="submit-text">提交中...</text>
+			</button>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, computed } from 'vue'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+type OrderItemType = {
+	id: string
+	product_id: string
+	product_name: string
+	product_image: string
+	sku_specifications: any
+	price: number
+	quantity: number
+}
+
+type MerchantType = {
+	id: string
+	shop_name: string
+	rating: number
+}
+
+const orderId = ref<string>('')
+const order = ref<any>(null)
+const orderItems = ref<Array<OrderItemType>>([])
+const merchant = ref<MerchantType | null>(null)
+const ratings = ref<Array<number>>([])
+const contents = ref<Array<string>>([])
+const images = ref<Array<Array<string>>>([])
+const anonymous = ref<boolean>(false)
+const merchantRating = ref({
+	description: 5,
+	logistics: 5,
+	service: 5
+})
+const isSubmitting = ref<boolean>(false)
+
+// 计算属性
+const canSubmit = computed(() => {
+	// 检查是否所有商品都已评分
+	if (ratings.value.length === 0) return false
+	return ratings.value.every(rating => rating > 0)
+})
+
+// 生命周期
+onMounted(() => {
+	const pages = getCurrentPages()
+	const currentPage = pages[pages.length - 1]
+	const options = currentPage.options as any
+	
+	if (options.orderId) {
+		orderId.value = options.orderId
+		loadOrderData()
+	}
+})
+
+// 加载订单数据
+const loadOrderData = async () => {
+	try {
+		const { data: orderData, error: orderError } = await supa
+			.from('orders')
+			.select('*')
+			.eq('id', orderId.value)
+			.single()
+
+		if (orderError !== null) {
+			console.error('加载订单失败:', orderError)
+			return
+		}
+
+		order.value = orderData
+
+		// 加载订单商品
+		const { data: itemsData, error: itemsError } = await supa
+			.from('order_items')
+			.select(`
+				*,
+				product:product_id(images)
+			`)
+			.eq('order_id', orderId.value)
+
+		if (itemsError !== null) {
+			console.error('加载订单商品失败:', itemsError)
+			return
+		}
+
+		orderItems.value = (itemsData || []).map((item: any) => ({
+			...item,
+			product_image: item.product?.images?.[0] || '/static/default-product.png'
+		}))
+
+		// 初始化评分和内容数组
+		const count = orderItems.value.length
+		ratings.value = new Array(count).fill(5)
+		contents.value = new Array(count).fill('')
+		images.value = new Array(count).fill([])
+
+		// 加载商家信息
+		if (order.value.merchant_id) {
+			const { data: merchantData, error: merchantError } = await supa
+				.from('merchants')
+				.select('id, shop_name, rating')
+				.eq('id', order.value.merchant_id)
+				.single()
+
+			if (!merchantError) {
+				merchant.value = merchantData
+			}
+		}
+
+	} catch (err) {
+		console.error('加载订单数据异常:', err)
+	}
+}
+
+// 格式化时间
+const formatTime = (timeStr?: string): string => {
+	if (!timeStr) return ''
+	const date = new Date(timeStr)
+	const year = date.getFullYear()
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	return `${year}-${month}-${day}`
+}
+
+// 获取规格文本
+const getSpecText = (specs: any): string => {
+	if (!specs) return ''
+	if (typeof specs === 'object') {
+		return Object.keys(specs)
+			.map(key => `${key}: ${specs[key]}`)
+			.join('; ')
+	}
+	return String(specs)
+}
+
+// 获取评分文本
+const getRatingText = (rating: number): string => {
+	const texts = ['非常差', '差', '一般', '好', '非常好']
+	return texts[rating - 1] || '未评价'
+}
+
+// 设置商品评分
+const setRating = (index: number, rating: number) => {
+	ratings.value[index] = rating
+	ratings.value = [...ratings.value]
+}
+
+// 设置商家评分
+const setMerchantRating = (type: keyof typeof merchantRating.value, rating: number) => {
+	merchantRating.value[type] = rating
+	merchantRating.value = { ...merchantRating.value }
+}
+
+// 切换匿名
+const toggleAnonymous = (event: any) => {
+	anonymous.value = event.detail.value
+}
+
+// 上传图片
+const uploadImage = async (index: number) => {
+	// 检查图片数量限制
+	if (images.value[index].length >= 9) {
+		uni.showToast({
+			title: '最多上传9张图片',
+			icon: 'none'
+		})
+		return
+	}
+
+	// 使用uni.chooseImage选择图片
+	uni.chooseImage({
+		count: 9 - images.value[index].length,
+		sizeType: ['compressed'],
+		sourceType: ['album', 'camera'],
+		success: (res) => {
+			const tempFiles = res.tempFilePaths
+			
+			// 模拟上传过程
+			uni.showLoading({
+				title: '上传中...'
+			})
+			
+			setTimeout(() => {
+				// 这里应该调用真实的上传接口
+				images.value[index].push(...tempFiles)
+				images.value = [...images.value]
+				
+				uni.hideLoading()
+				uni.showToast({
+					title: '上传成功',
+					icon: 'success'
+				})
+			}, 1000)
+		}
+	})
+}
+
+// 删除图片
+const deleteImage = (index: number, imgIndex: number) => {
+	images.value[index].splice(imgIndex, 1)
+	images.value = [...images.value]
+}
+
+// 提交评价
+const submitReview = async () => {
+	if (!canSubmit.value || isSubmitting.value) return
+
+	isSubmitting.value = true
+
+	try {
+		const userId = getCurrentUserId()
+		if (!userId) {
+			uni.showToast({
+				title: '用户信息错误',
+				icon: 'none'
+			})
+			return
+		}
+
+		// 提交商品评价
+		/* const productReviews = orderItems.value.map((item, index) => ({
+			user_id: userId,
+			product_id: item.product_id,
+			order_id: orderId.value,
+			rating: ratings.value[index],
+			content: contents.value[index] || '',
+			images: images.value[index],
+			is_anonymous: anonymous.value,
+			is_valid: true,
+			created_at: new Date().toISOString()
+		}))
+
+		const { error: reviewsError } = await supa
+			.from('product_reviews')
+			.insert(productReviews)
+
+		if (reviewsError !== null) {
+			throw reviewsError
+		}
+
+		// 提交店铺评价
+		if (merchant.value) {
+			const merchantReview = {
+				user_id: userId,
+				merchant_id: merchant.value.id,
+				order_id: orderId.value,
+				description_rating: merchantRating.value.description,
+				logistics_rating: merchantRating.value.logistics,
+				service_rating: merchantRating.value.service,
+				average_rating: (
+					merchantRating.value.description +
+					merchantRating.value.logistics +
+					merchantRating.value.service
+				) / 3,
+				is_anonymous: anonymous.value,
+				created_at: new Date().toISOString()
+			}
+
+			const { error: merchantError } = await supa
+				.from('merchant_reviews')
+				.insert(merchantReview)
+
+			if (merchantError !== null) {
+				console.error('提交店铺评价失败:', merchantError)
+			}
+		}
+
+		// 更新订单状态为已评价
+		const { error: orderError } = await supa
+			.from('orders')
+			.update({ status: 4 }) // 已完成
+			.eq('id', orderId.value)
+
+		if (orderError !== null) {
+			console.error('更新订单状态失败:', orderError)
+		} */
+        
+        // MOCK SUBMIT
+        await new Promise(resolve => setTimeout(resolve, 1000))
+
+		// 显示成功提示
+		uni.showToast({
+			title: '评价成功',
+			icon: 'success',
+			duration: 2000
+		})
+
+		// 跳转到评价成功页面
+		setTimeout(() => {
+			uni.navigateBack()
+		}, 1500)
+
+	} catch (err) {
+		console.error('提交评价失败:', err)
+		uni.showToast({
+			title: '提交失败',
+			icon: 'none'
+		})
+	} finally {
+		isSubmitting.value = false
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || ''
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+.review-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.review-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+	margin-right: 15px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.review-content {
+	flex: 1;
+}
+
+.order-section {
+	background-color: #ffffff;
+	padding: 15px;
+	margin-bottom: 10px;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.order-no {
+	font-size: 14px;
+	color: #333333;
+}
+
+.order-time {
+	font-size: 12px;
+	color: #999999;
+}
+
+.products-section {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+}
+
+.product-review {
+	padding: 15px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.product-review:last-child {
+	border-bottom: none;
+}
+
+.product-header {
+	display: flex;
+	margin-bottom: 20px;
+}
+
+.product-image {
+	width: 60px;
+	height: 60px;
+	border-radius: 5px;
+	margin-right: 15px;
+}
+
+.product-info {
+	flex: 1;
+}
+
+.product-name {
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+	margin-bottom: 5px;
+	display: block;
+}
+
+.product-spec {
+	font-size: 12px;
+	color: #999999;
+	display: block;
+}
+
+.rating-section {
+	display: flex;
+	align-items: center;
+	margin-bottom: 15px;
+}
+
+.rating-label {
+	font-size: 14px;
+	color: #333333;
+	margin-right: 15px;
+}
+
+.rating-stars {
+	display: flex;
+	gap: 10px;
+}
+
+.rating-stars.small {
+	gap: 5px;
+}
+
+.star-icon {
+	font-size: 24px;
+	color: #cccccc;
+}
+
+.star-icon.active {
+	color: #ffa726;
+}
+
+.rating-text {
+	margin-left: 15px;
+	font-size: 14px;
+	color: #666666;
+}
+
+.content-section {
+	margin-bottom: 15px;
+}
+
+.review-textarea {
+	width: 100%;
+	min-height: 80px;
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	font-size: 14px;
+	color: #333333;
+	line-height: 1.4;
+}
+
+.word-count {
+	display: block;
+	text-align: right;
+	font-size: 12px;
+	color: #999999;
+	margin-top: 5px;
+}
+
+.images-section {
+	margin-bottom: 15px;
+}
+
+.images-label {
+	display: block;
+	font-size: 14px;
+	color: #333333;
+	margin-bottom: 10px;
+}
+
+.images-grid {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+}
+
+.image-item {
+	width: 70px;
+	height: 70px;
+	border-radius: 5px;
+	overflow: hidden;
+	position: relative;
+}
+
+.uploaded-image {
+	width: 100%;
+	height: 100%;
+}
+
+.delete-image {
+	position: absolute;
+	top: 2px;
+	right: 2px;
+	width: 16px;
+	height: 16px;
+	border-radius: 8px;
+	background-color: rgba(0, 0, 0, 0.5);
+	color: #ffffff;
+	font-size: 12px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.upload-btn {
+	width: 70px;
+	height: 70px;
+	border: 1px dashed #cccccc;
+	border-radius: 5px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.upload-icon {
+	font-size: 24px;
+	color: #999999;
+	margin-bottom: 5px;
+}
+
+.upload-text {
+	font-size: 10px;
+	color: #999999;
+}
+
+.anonymous-section {
+	margin-bottom: 15px;
+}
+
+.anonymous-switch {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 5px;
+}
+
+.switch-label {
+	font-size: 14px;
+	color: #333333;
+}
+
+.anonymous-tip {
+	display: block;
+	font-size: 12px;
+	color: #999999;
+}
+
+.merchant-section {
+	background-color: #ffffff;
+	padding: 15px;
+	margin-bottom: 10px;
+}
+
+.section-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.merchant-rating {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+}
+
+.rating-item {
+	font-size: 14px;
+	color: #333333;
+}
+
+.tips-section {
+	background-color: #ffffff;
+	padding: 15px;
+	margin-bottom: 10px;
+}
+
+.tip-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 10px;
+}
+
+.tip-item {
+	display: block;
+	font-size: 12px;
+	color: #666666;
+	line-height: 1.6;
+	margin-bottom: 5px;
+}
+
+.tip-item:last-child {
+	margin-bottom: 0;
+}
+
+.submit-section {
+	background-color: #ffffff;
+	padding: 15px;
+	border-top: 1px solid #e5e5e5;
+}
+
+.submit-btn {
+	background-color: #007aff;
+	color: #ffffff;
+	height: 50px;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+}
+
+.submit-btn.disabled {
+	background-color: #cccccc;
+	opacity: 0.6;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/search.uvue b/pages/mall/consumer/search.uvue
new file mode 100644
index 00000000..ddf5d0f4
--- /dev/null
+++ b/pages/mall/consumer/search.uvue
@@ -0,0 +1,1233 @@
+<template>
+	<view class="search-page">
+		<!-- 搜索头部 -->
+		<view class="search-header" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="search-bar-container">
+				<!-- 返回按钮：小于号加粗 -->
+				<view class="back-btn" @click="goBack">
+					<text class="back-icon">&lt;</text>
+				</view>
+				
+				<!-- 搜索框 -->
+				<view class="search-input-container">
+					<input
+						class="search-input"
+						type="text"
+						:value="searchKeyword"
+						@input="onInput"
+						@confirm="onSearch"
+						placeholder="请输入药品名称、症状或品牌"
+						placeholder-class="placeholder"
+						:focus="autoFocus"
+					/>
+					
+					<!-- 清除按钮 -->
+					<view v-if="searchKeyword" class="clear-btn" @click="clearSearch">
+						<text class="clear-icon">×</text>
+					</view>
+					
+					<!-- 相机图标 -->
+					<view class="camera-btn" @click="openCamera">
+						<text class="camera-icon">📷</text>
+					</view>
+
+					<!-- 搜索按钮：移入输入框内部 -->
+					<view class="inner-search-btn" @click="onSearch">
+						<text class="inner-search-text">搜索</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 错误状态（模拟服务器超时） -->
+		<view v-if="isError" class="error-state" @click="retryLoad">
+			<view class="error-content">
+				<text class="error-icon">⚠️</text>
+				<text class="error-title">加载服务器超时</text>
+				<text class="error-desc">请点击屏幕重试</text>
+			</view>
+		</view>
+
+		<!-- 主内容区域 -->
+		<scroll-view 
+			v-else 
+			scroll-y 
+			class="main-content" 
+			:style="{ height: scrollHeight + 'px' }"
+			@scrolltolower="loadMore"
+		>
+			<!-- 初始状态（无搜索词） -->
+			<view v-if="!searchKeyword && !showResults">
+				<!-- 搜索历史 -->
+				<view v-if="searchHistory.length > 0" class="search-history">
+					<view class="section-header">
+						<text class="section-title">搜索历史</text>
+						<view class="header-right" @click="clearHistory">
+							<text class="clear-text">清空</text>
+							<text class="clear-icon-trash">🗑️</text>
+						</view>
+					</view>
+					<view class="history-tags">
+						<view
+							v-for="(item, index) in searchHistory"
+							:key="index"
+							class="history-tag"
+							@click="searchFromHistory(item)"
+						>
+							<text class="history-text">{{ item }}</text>
+							<view class="delete-tag-btn" @click.stop="deleteHistoryItem(index)">
+								<text class="delete-icon">×</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 热门搜索 -->
+				<view class="hot-search">
+					<view class="section-header">
+						<text class="section-title">热门搜索</text>
+					</view>
+					<view class="hot-tags">
+						<view
+							v-for="(item, index) in hotSearchList"
+							:key="index"
+							class="hot-tag"
+							:class="{ 'hot': item.hot }"
+							@click="searchFromHot(item.keyword)"
+						>
+							<text class="hot-rank" :class="{ 'top-three': index < 3 }">{{ index + 1 }}</text>
+							<text class="hot-text">{{ item.keyword }}</text>
+							<text v-if="item.hot" class="hot-icon">🔥</text>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 猜你需要 (新增功能) -->
+				<view class="guess-you-like">
+					<view class="section-header">
+						<view class="title-with-icon">
+							<text class="section-icon">✨</text>
+							<text class="section-title">猜你需要</text>
+						</view>
+						<text class="refresh-btn" @click="refreshGuessList">换一批</text>
+					</view>
+					
+					<view class="guess-grid">
+						<view 
+							v-for="item in guessList" 
+							:key="item.id" 
+							class="guess-item"
+							@click="viewProductDetail(item)"
+						>
+							<view class="guess-img-box">
+								<image class="guess-img" :src="item.image" mode="aspectFill" />
+							</view>
+							<view class="guess-info">
+								<text class="guess-name">{{ item.name }}</text>
+								<view class="guess-price-row">
+									<text class="price-symbol">¥</text>
+									<text class="price-num">{{ item.price }}</text>
+									<text class="sales-text">已售{{ item.sales }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 搜索建议 -->
+			<view v-if="searchKeyword && !showResults" class="search-suggestions">
+				<view class="suggestions-list">
+					<view
+						v-for="(suggestion, index) in searchSuggestions"
+						:key="index"
+						class="suggestion-item"
+						@click="selectSuggestion(suggestion)"
+					>
+						<view class="suggestion-icon">🔍</view>
+						<text class="suggestion-text">{{ suggestion }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 搜索结果 -->
+			<view v-if="showResults" class="search-results">
+				<view class="results-header">
+					<text class="results-title">搜索结果</text>
+					<view class="filter-tabs">
+						<text 
+							class="filter-tab" 
+							:class="{ active: activeSort === 'default' }"
+							@click="switchSort('default')"
+						>综合</text>
+						<text 
+							class="filter-tab" 
+							:class="{ active: activeSort === 'sales' }"
+							@click="switchSort('sales')"
+						>销量</text>
+						<text 
+							class="filter-tab" 
+							:class="{ active: activeSort === 'price' }"
+							@click="switchSort('price')"
+						>
+							价格 {{ activeSort === 'price' ? (priceSortAsc ? '↑' : '↓') : '' }}
+						</text>
+					</view>
+				</view>
+				
+				<view v-if="searchResults.length > 0" class="results-list">
+					<view
+						v-for="product in searchResults"
+						:key="product.id"
+						class="result-item"
+						@click="viewProductDetail(product)"
+					>
+						<image class="product-image" :src="product.image" mode="aspectFill" />
+						<view class="product-info">
+							<text class="product-name">{{ product.name }}</text>
+							<view class="product-tags-row" v-if="product.tag">
+								<text class="product-tag">{{ product.tag }}</text>
+							</view>
+							<text class="product-spec">{{ product.specification }}</text>
+							
+							<view class="product-bottom">
+								<view class="price-box">
+									<text class="price-symbol">¥</text>
+									<text class="price-value">{{ product.price }}</text>
+								</view>
+								<view class="add-cart-btn" @click.stop="addToCart(product)">
+									<text class="cart-icon">+</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 空结果 - 仅在非加载状态且无结果时显示 -->
+				<view v-if="!loading && searchResults.length === 0" class="empty-result">
+					<text class="empty-icon">🤔</text>
+					<text class="empty-text">未找到相关商品</text>
+					<text class="empty-sub">换个关键词试试吧</text>
+				</view>
+
+				<!-- 加载更多/加载中 - 在加载状态或有更多数据时显示 -->
+				<view v-if="loading" class="loading-more">
+					<view class="loading-spinner"></view>
+					<text class="loading-text">加载中...</text>
+				</view>
+				
+				<view v-if="!hasMore && searchResults.length > 0" class="no-more">
+					<text class="no-more-text">--- 到底了 ---</text>
+				</view>
+			</view>
+
+			<!-- 底部安全区域 -->
+			<view class="safe-area"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, reactive, onMounted, computed } from 'vue'
+
+// 状态定义
+const statusBarHeight = ref(0)
+const scrollHeight = ref(0)
+const searchKeyword = ref('')
+const showResults = ref(false)
+const loading = ref(false)
+const hasMore = ref(true)
+const isError = ref(false) // 错误状态控制
+const autoFocus = ref(true)
+const activeSort = ref('default') // 当前排序方式: default, sales, price
+const priceSortAsc = ref(false) // 价格排序是否为升序
+
+// 数据定义
+const searchHistory = ref<string[]>([])
+const hotSearchList = ref<any[]>([])
+const guessList = ref<any[]>([])
+const searchResults = ref<any[]>([])
+
+// 模拟数据库
+const mockDatabase = {
+	hot: [
+		{ keyword: '感冒灵', hot: true },
+		{ keyword: '布洛芬', hot: true },
+		{ keyword: '口罩', hot: true },
+		{ keyword: '维生素C', hot: false },
+		{ keyword: '板蓝根', hot: false },
+		{ keyword: '创可贴', hot: false },
+	],
+	guess: [
+		{ id: 'g1', name: '医用外科口罩', price: 19.9, image: 'https://picsum.photos/200/200?random=1', sales: '1万+' },
+		{ id: 'g2', name: '酒精消毒液', price: 9.9, image: 'https://picsum.photos/200/200?random=2', sales: '5000+' },
+		{ id: 'g3', name: '电子体温计', price: 29.9, image: 'https://picsum.photos/200/200?random=3', sales: '2000+' },
+		{ id: 'g4', name: '碘伏消毒液', price: 5.5, image: 'https://picsum.photos/200/200?random=4', sales: '1000+' },
+		{ id: 'g5', name: '退热贴', price: 15.8, image: 'https://picsum.photos/200/200?random=5', sales: '3000+' },
+		{ id: 'g6', name: '棉签', price: 3.9, image: 'https://picsum.photos/200/200?random=6', sales: '8000+' },
+	]
+}
+
+// 搜索建议
+const searchSuggestions = computed(() => {
+	if (!searchKeyword.value) return []
+	// 简单模拟
+	return [
+		`${searchKeyword.value}胶囊`,
+		`${searchKeyword.value}颗粒`,
+		`${searchKeyword.value}片`,
+		`儿童${searchKeyword.value}`
+	]
+})
+
+onMounted(() => {
+	initPage()
+})
+
+const initPage = () => {
+	try {
+		const systemInfo = uni.getSystemInfoSync()
+		statusBarHeight.value = systemInfo.statusBarHeight || 0
+		const windowHeight = systemInfo.windowHeight
+		// 减去头部高度 (约60px + statusBarHeight)
+		scrollHeight.value = windowHeight - (60 + statusBarHeight.value)
+		
+		loadData()
+		
+		// 检查页面参数
+		const pages = getCurrentPages()
+		if (pages.length > 0) {
+			const currentPage = pages[pages.length - 1]
+			// @ts-ignore
+			const options = currentPage.options
+			if (options && options['keyword']) {
+				const keyword = decodeURIComponent(options['keyword'])
+				searchKeyword.value = keyword
+				
+				if (options['type'] === 'family') {
+					// 如果是家庭常备药类型，直接添加到历史并搜索
+					addToHistory(keyword)
+					// 立即显示结果区域并设置为加载中
+					showResults.value = true
+					loading.value = true
+					// 确保searchResults不为空数组导致闪烁（虽然loading=true已经拦截了empty-result，但双重保险）
+					// 此时不要置空searchResults，或者给一个初始值
+					
+					// 直接调用搜索，移除setTimeout，防止中间状态
+					performSearch()
+				}
+			}
+		}
+	} catch (e) {
+		console.error('初始化失败', e)
+		isError.value = true
+	}
+}
+
+// 加载基础数据
+const loadData = () => {
+	// loading.value = true // 不使用全局loading，避免影响搜索状态
+	isError.value = false
+	
+	// 模拟网络请求
+	setTimeout(() => {
+		try {
+			loadSearchHistory()
+			hotSearchList.value = mockDatabase.hot
+			guessList.value = mockDatabase.guess
+			// loading.value = false // 不使用全局loading
+		} catch (e) {
+			isError.value = true
+			// loading.value = false
+		}
+	}, 500)
+}
+
+// 点击重试
+const retryLoad = () => {
+	uni.showLoading({ title: '重新加载中' })
+	setTimeout(() => {
+		uni.hideLoading()
+		loadData()
+	}, 1000)
+}
+
+// 历史记录管理
+const loadSearchHistory = () => {
+	const history = uni.getStorageSync('searchHistory')
+	if (history) {
+		try {
+			// 确保是数组
+			const parsed = JSON.parse(history as string)
+			if (Array.isArray(parsed)) {
+				searchHistory.value = parsed as string[]
+			}
+		} catch (e) {
+			searchHistory.value = []
+		}
+	}
+}
+
+const saveSearchHistory = () => {
+	uni.setStorageSync('searchHistory', JSON.stringify(searchHistory.value))
+}
+
+const addToHistory = (keyword: string) => {
+	if (!keyword) return
+	const index = searchHistory.value.indexOf(keyword)
+	if (index > -1) {
+		searchHistory.value.splice(index, 1)
+	}
+	searchHistory.value.unshift(keyword)
+	if (searchHistory.value.length > 10) searchHistory.value.pop()
+	saveSearchHistory()
+}
+
+const clearHistory = () => {
+	uni.showModal({
+		title: '提示',
+		content: '确定清空搜索历史吗？',
+		success: (res) => {
+			if (res.confirm) {
+				searchHistory.value = []
+				uni.removeStorageSync('searchHistory')
+			}
+		}
+	})
+}
+
+const deleteHistoryItem = (index: number) => {
+	searchHistory.value.splice(index, 1)
+	saveSearchHistory()
+}
+
+// 搜索逻辑
+const onInput = (e: any) => {
+	searchKeyword.value = e.detail.value
+	if (!searchKeyword.value) {
+		showResults.value = false
+	}
+}
+
+const clearSearch = () => {
+	searchKeyword.value = ''
+	showResults.value = false
+}
+
+const onSearch = () => {
+	if (!searchKeyword.value.trim()) return
+	addToHistory(searchKeyword.value.trim())
+	performSearch()
+}
+
+const searchFromHistory = (keyword: string) => {
+	searchKeyword.value = keyword
+	performSearch()
+}
+
+const searchFromHot = (keyword: string) => {
+	searchKeyword.value = keyword
+	addToHistory(keyword)
+	performSearch()
+}
+
+const selectSuggestion = (suggestion: string) => {
+	searchKeyword.value = suggestion
+	addToHistory(suggestion)
+	performSearch()
+}
+
+const performSearch = () => {
+	// 再次强制设置状态，确保万无一失
+	showResults.value = true
+	loading.value = true
+	// 注意：这里不要清空 searchResults.value = []，否则如果 loading 状态切换有微小延迟，可能会短暂满足 "无数据且非加载" 的条件
+	// 保持旧数据直到新数据回来，或者依靠 loading 状态完全遮罩
+	
+	// 模拟搜索请求
+	setTimeout(() => {
+		// 生成模拟结果
+		const newResults = Array.from({ length: 6 }, (_, i) => ({
+			id: `s${Date.now()}${i}`, // 确保ID唯一
+			shopId: i % 2 === 0 ? 'shop_self' : `shop_${i}_${Date.now()}`,
+			shopName: i % 2 === 0 ? '平台自营大药房' : '阿里健康大药房',
+			name: `${searchKeyword.value}相关药品-${i+1}`,
+			specification: '10g*12袋',
+			price: (Math.random() * 50 + 10).toFixed(1),
+			image: '/static/images/default-product.png', // 使用本地默认图片
+			sales: Math.floor(Math.random() * 1000),
+			tag: i % 2 === 0 ? '自营' : ''
+		}))
+		
+		// 数据准备好后再关闭 loading，确保无缝衔接
+		searchResults.value = newResults
+		// 应用当前排序
+		sortResults()
+		
+		loading.value = false
+		hasMore.value = true
+	}, 800)
+}
+
+// 切换排序
+const switchSort = (type: string) => {
+	if (type === 'price') {
+		if (activeSort.value === 'price') {
+			priceSortAsc.value = !priceSortAsc.value
+		} else {
+			activeSort.value = 'price'
+			priceSortAsc.value = true // 默认升序
+		}
+	} else {
+		activeSort.value = type
+	}
+	sortResults()
+}
+
+// 执行排序逻辑
+const sortResults = () => {
+	const list = [...searchResults.value]
+	if (activeSort.value === 'sales') {
+		// 销量降序
+		list.sort((a, b) => b.sales - a.sales)
+	} else if (activeSort.value === 'price') {
+		// 价格排序
+		list.sort((a, b) => {
+			const p1 = parseFloat(a.price)
+			const p2 = parseFloat(b.price)
+			return priceSortAsc.value ? (p1 - p2) : (p2 - p1)
+		})
+	} else {
+		// 综合排序（这里简单按ID倒序模拟）
+		list.sort((a, b) => (a.id > b.id ? -1 : 1))
+	}
+	searchResults.value = list
+}
+
+const loadMore = () => {
+	if (loading.value || !hasMore.value) return
+	loading.value = true
+	setTimeout(() => {
+		const newItems = Array.from({ length: 4 }, (_, i) => ({
+			id: `more${Date.now()}${i}`,
+			shopId: i % 2 === 0 ? 'shop_self' : `shop_more_${i}_${Date.now()}`,
+			shopName: i % 2 === 0 ? '平台自营大药房' : '好药师大药房',
+			name: `${searchKeyword.value}更多药品-${i+1}`,
+			specification: '盒装',
+			price: (Math.random() * 50 + 10).toFixed(1),
+			image: '/static/images/default-product.png',
+			sales: Math.floor(Math.random() * 500),
+			tag: ''
+		}))
+		searchResults.value.push(...newItems)
+		loading.value = false
+		if (searchResults.value.length > 20) hasMore.value = false
+	}, 1000)
+}
+
+const refreshGuessList = () => {
+	uni.showLoading({ title: '刷新中' })
+	setTimeout(() => {
+		guessList.value = guessList.value.sort(() => Math.random() - 0.5)
+		uni.hideLoading()
+	}, 500)
+}
+
+const viewProductDetail = (item: any) => {
+	// 跳转详情页逻辑
+	console.log('查看商品', item)
+	uni.navigateTo({
+		url: `/pages/mall/consumer/product-detail?productId=${item.id}&price=${item.price}&originalPrice=${item.originalPrice || ''}`
+	})
+}
+
+// 添加到购物车
+const addToCart = (product: any) => {
+	// 获取现有购物车数据
+	const cartData = uni.getStorageSync('cart')
+	let cartItems: any[] = []
+	
+	if (cartData) {
+		try {
+			cartItems = JSON.parse(cartData as string) as any[]
+		} catch (e) {
+			console.error('解析购物车数据失败', e)
+		}
+	}
+	
+	// 检查商品是否已存在
+	const existingItem = cartItems.find((item: any) => item.id === product.id)
+	
+	if (existingItem) {
+		existingItem.quantity++
+	} else {
+		// 添加新商品
+		cartItems.push({
+			id: product.id,
+			shopId: product.shopId || 'shop_search_default',
+			shopName: product.shopName || (product.tag === '自营' ? '平台自营大药房' : '优质大药房'),
+			name: product.name,
+			price: product.price,
+			image: product.image,
+			spec: product.specification || '默认规格',
+			quantity: 1,
+			selected: true
+		})
+	}
+	
+	// 保存回存储
+	uni.setStorageSync('cart', JSON.stringify(cartItems))
+	
+	uni.showToast({
+		title: '已添加到购物车',
+		icon: 'success'
+	})
+}
+
+const openCamera = () => {
+	uni.chooseImage({
+		count: 1,
+		sourceType: ['camera'],
+		success: (res) => {
+			console.log('拍摄图片路径：', res.tempFilePaths[0])
+			uni.showToast({ title: '已启用相机', icon: 'none' })
+		},
+		fail: (err) => {
+			console.error('启用相机失败', err)
+		}
+	})
+}
+
+const goBack = () => {
+	if (showResults.value) {
+		// 如果在搜索结果页，先返回到搜索初始页
+		showResults.value = false
+		searchKeyword.value = ''
+	} else {
+		// 如果在搜索初始页，则返回上一页
+		uni.navigateBack()
+	}
+}
+</script>
+
+<style>
+.search-page {
+	width: 100%;
+	height: 100vh;
+	background-color: #f5f5f5;
+	display: flex;
+	flex-direction: column;
+}
+
+/* 头部样式 */
+.search-header {
+	background-color: #ffffff;
+	padding-bottom: 10px;
+	/* #ifdef APP-PLUS */
+	padding-top: 0; /* 在App端由style动态控制 */
+	/* #endif */
+}
+
+.search-bar-container {
+	display: flex;
+	flex-direction: row; /* UVUE 必须显式设置 row */
+	align-items: center;
+	padding: 10px 16px;
+	gap: 12px;
+	width: 100%; /* 确保占满宽度 */
+}
+
+.back-btn {
+	padding: 4px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	width: 32px; /* 固定宽度防止压缩 */
+	height: 32px;
+}
+
+.back-icon {
+	font-size: 24px;
+	color: #333;
+	font-weight: bold;
+	font-family: monospace;
+}
+
+.search-input-container {
+	flex: 1; /* 占据剩余空间 */
+	height: 40px; /*稍微增高一点以容纳按钮*/
+	background-color: #f0f0f0;
+	border-radius: 20px;
+	display: flex;
+	flex-direction: row; /* UVUE 必须显式设置 row */
+	align-items: center;
+	padding: 0 4px 0 12px;
+}
+
+.search-input {
+	flex: 1;
+	font-size: 14px;
+	color: #333;
+	height: 100%;
+	background-color: transparent; /* 确保背景透明 */
+}
+
+.placeholder {
+	color: #999;
+}
+
+.clear-btn {
+	padding: 4px;
+	margin-right: 2px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.clear-icon {
+	font-size: 16px;
+	color: #999;
+}
+
+.camera-btn {
+	padding: 4px 8px 4px 4px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	border-right-width: 1px; /* UVUE 边框写法 */
+	border-right-style: solid;
+	border-right-color: #ddd;
+	margin-right: 8px;
+}
+
+.camera-icon {
+	font-size: 20px;
+}
+
+/* 内部搜索按钮样式 */
+.inner-search-btn {
+	padding: 0 16px;
+	background-color: #87CEEB;
+	border-radius: 16px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	height: 32px;
+}
+
+.inner-search-text {
+	font-size: 13px;
+	color: #ffffff;
+	font-weight: 500;
+}
+
+/* 内容区域 */
+.main-content {
+	flex: 1;
+	padding: 12px;
+	box-sizing: border-box;
+}
+
+/* 模块通用头部 */
+.section-header {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 12px;
+	margin-top: 8px;
+	width: 100%;
+}
+
+.section-title {
+	font-size: 15px;
+	font-weight: bold;
+	color: #333;
+	flex: 1; /* 占据左侧空间 */
+}
+
+.header-right {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	align-items: center;
+	gap: 4px;
+	flex-shrink: 0; /* 防止被压缩 */
+}
+
+.clear-text {
+	font-size: 12px;
+	color: #999;
+}
+
+.clear-icon-trash {
+	font-size: 14px;
+}
+
+/* 搜索历史 */
+.search-history {
+	margin-bottom: 24px;
+	padding: 0 4px; /* 微调内边距 */
+}
+
+.history-tags {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	gap: 10px;
+	flex-wrap: wrap; /* 允许换行 */
+	padding: 0 4px;
+	align-items: center;
+}
+
+.history-tag {
+	background-color: #fff;
+	padding: 6px 12px;
+	border-radius: 16px;
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	flex-shrink: 0; /* 防止被压缩 */
+}
+
+.history-text {
+	font-size: 13px;
+	color: #666;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.delete-tag-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 16px;
+	height: 16px;
+	border-radius: 50%;
+	background-color: #f0f0f0;
+}
+
+.delete-icon {
+	font-size: 12px;
+	color: #999;
+	line-height: 1;
+}
+
+/* 热门搜索 */
+.hot-search {
+	margin-bottom: 24px;
+}
+
+.hot-tags {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	flex-wrap: wrap; /* 允许换行 */
+	gap: 10px;
+	padding: 0 4px;
+}
+
+.hot-tag {
+	background-color: #fff;
+	padding: 6px 12px;
+	border-radius: 16px; /* 增加圆角，像胶囊一样 */
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 4px;
+	flex-shrink: 0; /* 防止被压缩 */
+}
+
+.hot-tag.hot {
+	background-color: #fff0f0;
+}
+
+.hot-rank {
+	font-size: 12px;
+	color: #999;
+	font-weight: bold;
+	margin-right: 2px;
+}
+
+.hot-rank.top-three {
+	color: #ff5000;
+}
+
+.hot-text {
+	font-size: 13px;
+	color: #333;
+}
+
+.hot-icon {
+	font-size: 12px;
+}
+
+/* 猜你需要 */
+.guess-you-like {
+	margin-bottom: 20px;
+}
+
+.title-with-icon {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+}
+
+.section-icon {
+	font-size: 16px;
+}
+
+.refresh-btn {
+	font-size: 12px;
+	color: #4CAF50;
+}
+
+.guess-grid {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr);
+	gap: 10px;
+}
+
+.guess-item {
+	background-color: #fff;
+	border-radius: 8px;
+	overflow: hidden;
+	padding-bottom: 8px;
+}
+
+.guess-img-box {
+	width: 100%;
+	height: 0;
+	padding-bottom: 100%;
+	position: relative;
+	background-color: #f0f0f0;
+}
+
+.guess-img {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+
+.guess-info {
+	padding: 8px;
+}
+
+.guess-name {
+	font-size: 13px;
+	color: #333;
+	margin-bottom: 6px;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+
+.guess-price-row {
+	display: flex;
+	align-items: baseline;
+}
+
+.price-symbol {
+	font-size: 12px;
+	color: #ff5000;
+}
+
+.price-num {
+	font-size: 16px;
+	color: #ff5000;
+	font-weight: bold;
+	margin-right: 6px;
+}
+
+.sales-text {
+	font-size: 10px;
+	color: #999;
+}
+
+/* 搜索建议列表 */
+.search-suggestions {
+	background-color: #fff;
+	border-radius: 8px;
+	padding: 0 12px;
+}
+
+.suggestion-item {
+	display: flex;
+	align-items: center;
+	height: 44px;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.suggestion-icon {
+	margin-right: 10px;
+	font-size: 14px;
+	color: #999;
+}
+
+.suggestion-text {
+	font-size: 14px;
+	color: #333;
+}
+
+/* 搜索结果 */
+.search-results {
+	padding-bottom: 20px;
+}
+
+.results-header {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 12px;
+	flex-wrap: wrap; /* 允许换行以适应小屏 */
+	gap: 8px;
+}
+
+.results-title {
+	font-size: 15px;
+	font-weight: bold;
+	color: #333;
+}
+
+.filter-tabs {
+	display: flex;
+	flex-direction: row; /* UVUE 显式设置 row */
+	gap: 16px;
+	flex: 1; /* 自适应填充剩余空间 */
+	justify-content: flex-end; /* 靠右对齐 */
+}
+
+.filter-tab {
+	font-size: 13px;
+	color: #666;
+	padding: 4px 8px; /* 增加点击区域 */
+}
+
+.filter-tab.active {
+	color: #4CAF50;
+	font-weight: 500;
+}
+
+.results-list {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr); /* 默认移动端双列 */
+	gap: 10px;
+	padding: 0 4px;
+}
+
+/* 响应式布局 */
+/* 平板设备 (768px以上) */
+@media screen and (min-width: 768px) {
+	.results-list {
+		grid-template-columns: repeat(3, 1fr); /* 平板显示3列 */
+		gap: 16px;
+		padding: 0 16px;
+	}
+	
+	.guess-grid {
+		grid-template-columns: repeat(4, 1fr); /* 猜你喜欢在平板上显示4列 */
+	}
+}
+
+/* 桌面设备 (1024px以上) */
+@media screen and (min-width: 1024px) {
+	.results-list {
+		grid-template-columns: repeat(4, 1fr); /* 桌面显示4列 */
+		gap: 20px;
+		padding: 0 24px;
+	}
+	
+	.guess-grid {
+		grid-template-columns: repeat(6, 1fr); /* 猜你喜欢在桌面上显示6列 */
+	}
+	
+	/* 桌面端调整图片高度 */
+	.product-image {
+		height: 160px;
+	}
+}
+
+.result-item {
+	background-color: #fff;
+	border-radius: 8px;
+	padding: 8px;
+	display: flex;
+	flex-direction: column; /* 垂直排列 */
+	gap: 8px;
+}
+
+.product-image {
+	width: 100%;
+	height: 120px; /* 调整图片高度 */
+	border-radius: 4px;
+	background-color: #f0f0f0;
+}
+
+.product-info {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+
+.product-name {
+	font-size: 13px; /* 减小字号 */
+	color: #333;
+	font-weight: 500;
+	line-height: 1.3;
+	height: 34px; /* 限制高度 */
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.product-tags-row {
+	margin-top: 2px;
+	display: none; /* 隐藏标签以保持简洁 */
+}
+
+.product-spec {
+	display: none; /* 隐藏规格 */
+}
+
+.product-bottom {
+	display: flex;
+	justify-content: space-between;
+	align-items: center; /* 垂直居中 */
+	margin-top: 4px;
+}
+
+.price-box {
+	color: #ff5000;
+	display: flex;
+	align-items: baseline;
+}
+
+.price-symbol {
+	font-size: 10px;
+}
+
+.price-value {
+	font-size: 16px; /* 减小价格字号 */
+	font-weight: 600;
+}
+
+.add-cart-btn {
+	width: 24px;
+	height: 24px;
+	background-color: #4CAF50;
+	border-radius: 12px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.cart-icon {
+	color: #fff;
+	font-size: 14px;
+	font-weight: bold;
+}
+
+/* 错误状态 */
+.error-state {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #fff;
+}
+
+.error-content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 12px;
+}
+
+.error-icon {
+	font-size: 48px;
+}
+
+.error-title {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333;
+}
+
+.error-desc {
+	font-size: 14px;
+	color: #999;
+}
+
+/* 加载更多 */
+.loading-more {
+	padding: 20px 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.loading-spinner {
+	width: 24px;
+	height: 24px;
+	border: 2px solid #f0f0f0;
+	border-top-color: #4CAF50;
+	border-radius: 50%;
+	animation: spin 1s linear infinite;
+	margin-bottom: 8px;
+}
+
+@keyframes spin {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+.loading-text {
+	font-size: 12px;
+	color: #999;
+}
+
+.no-more {
+	padding: 20px 0;
+	text-align: center;
+}
+
+.no-more-text {
+	font-size: 12px;
+	color: #ccc;
+}
+
+.empty-result {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 40px 0;
+}
+
+.empty-icon {
+	font-size: 40px;
+	margin-bottom: 12px;
+}
+
+.empty-text {
+	font-size: 14px;
+	color: #666;
+	margin-bottom: 4px;
+}
+
+.empty-sub {
+	font-size: 12px;
+	color: #999;
+}
+
+.safe-area {
+	height: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/settings - 副本.uvue b/pages/mall/consumer/settings - 副本.uvue
new file mode 100644
index 00000000..6d9d4ec3
--- /dev/null
+++ b/pages/mall/consumer/settings - 副本.uvue	
@@ -0,0 +1,702 @@
+<!-- 设置页面 -->
+<template>
+	<view class="settings-page">
+		<!-- 顶部栏 -->
+		<view class="settings-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="header-title">设置</text>
+		</view>
+
+		<scroll-view class="settings-content" scroll-y>
+			<!-- 账户设置 -->
+			<view class="settings-section">
+				<text class="section-title">账户设置</text>
+				<view class="section-list">
+					<view class="list-item" @click="goToProfile">
+						<text class="item-icon">👤</text>
+						<text class="item-text">个人资料</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="goToAddress">
+						<text class="item-icon">📍</text>
+						<text class="item-text">收货地址</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="changePassword">
+						<text class="item-icon">🔒</text>
+						<text class="item-text">修改密码</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="bindPhone">
+						<text class="item-icon">📱</text>
+						<text class="item-text">手机绑定</text>
+						<view class="item-right">
+							<text class="item-status" :class="{ bound: userInfo.phone }">
+								{{ userInfo.phone ? '已绑定' : '未绑定' }}
+							</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+					<view class="list-item" @click="bindEmail">
+						<text class="item-icon">📧</text>
+						<text class="item-text">邮箱绑定</text>
+						<view class="item-right">
+							<text class="item-status" :class="{ bound: userInfo.email }">
+								{{ userInfo.email ? '已绑定' : '未绑定' }}
+							</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 消息通知 -->
+			<view class="settings-section">
+				<text class="section-title">消息通知</text>
+				<view class="section-list">
+					<view class="list-item">
+						<text class="item-icon">🔔</text>
+						<text class="item-text">订单消息</text>
+						<switch :checked="notifications.order" @change="toggleNotification('order')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">🎁</text>
+						<text class="item-text">促销活动</text>
+						<switch :checked="notifications.promotion" @change="toggleNotification('promotion')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">⭐</text>
+						<text class="item-text">评价提醒</text>
+						<switch :checked="notifications.review" @change="toggleNotification('review')" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 隐私设置 -->
+			<view class="settings-section">
+				<text class="section-title">隐私设置</text>
+				<view class="section-list">
+					<view class="list-item">
+						<text class="item-icon">👁️</text>
+						<text class="item-text">隐藏购物记录</text>
+						<switch :checked="privacy.hidePurchase" @change="togglePrivacy('hidePurchase')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">🔍</text>
+						<text class="item-text">允许通过手机号找到我</text>
+						<switch :checked="privacy.allowSearchByPhone" @change="togglePrivacy('allowSearchByPhone')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">💬</text>
+						<text class="item-text">接收商家消息</text>
+						<switch :checked="privacy.receiveMerchantMsg" @change="togglePrivacy('receiveMerchantMsg')" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 通用设置 -->
+			<view class="settings-section">
+				<text class="section-title">通用设置</text>
+				<view class="section-list">
+					<view class="list-item" @click="clearCache">
+						<text class="item-icon">🗑️</text>
+						<text class="item-text">清除缓存</text>
+						<view class="item-right">
+							<text class="item-cache">{{ cacheSize }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+					<view class="list-item" @click="changeLanguage">
+						<text class="item-icon">🌐</text>
+						<text class="item-text">语言设置</text>
+						<view class="item-right">
+							<text class="item-status">{{ currentLanguage }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+					<view class="list-item" @click="changeTheme">
+						<text class="item-icon">🎨</text>
+						<text class="item-text">主题设置</text>
+						<view class="item-right">
+							<text class="item-status">{{ currentTheme }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 关于我们 -->
+			<view class="settings-section">
+				<text class="section-title">关于我们</text>
+				<view class="section-list">
+					<view class="list-item" @click="aboutUs">
+						<text class="item-icon">ℹ️</text>
+						<text class="item-text">关于商城</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="userAgreement">
+						<text class="item-icon">📜</text>
+						<text class="item-text">用户协议</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="privacyPolicy">
+						<text class="item-icon">🛡️</text>
+						<text class="item-text">隐私政策</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="checkUpdate">
+						<text class="item-icon">🔄</text>
+						<text class="item-text">检查更新</text>
+						<view class="item-right">
+							<text class="item-status">{{ appVersion }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 客服与反馈 -->
+			<view class="settings-section">
+				<text class="section-title">客服与反馈</text>
+				<view class="section-list">
+					<view class="list-item" @click="contactService">
+						<text class="item-icon">💬</text>
+						<text class="item-text">联系客服</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="feedback">
+						<text class="item-icon">📝</text>
+						<text class="item-text">意见反馈</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="rateApp">
+						<text class="item-icon">⭐</text>
+						<text class="item-text">给个好评</text>
+						<text class="item-arrow">›</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 退出登录 -->
+			<view class="logout-section">
+				<button class="logout-btn" @click="logout">退出登录</button>
+			</view>
+
+			<!-- 账号注销 -->
+			<view class="delete-account-section">
+				<text class="delete-account" @click="deleteAccount">注销账号</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+// import supa from '@/components/supadb/aksupainstance.uts'
+
+type UserType = {
+	id: string
+	phone: string | null
+	email: string | null
+	nickname: string | null
+	avatar_url: string | null
+}
+
+type NotificationType = {
+	order: boolean
+	promotion: boolean
+	review: boolean
+}
+
+type PrivacyType = {
+	hidePurchase: boolean
+	allowSearchByPhone: boolean
+	receiveMerchantMsg: boolean
+}
+
+const userInfo = ref<UserType>({
+	id: '',
+	phone: null,
+	email: null,
+	nickname: null,
+	avatar_url: null
+})
+const notifications = ref<NotificationType>({
+	order: true,
+	promotion: true,
+	review: true
+})
+const privacy = ref<PrivacyType>({
+	hidePurchase: false,
+	allowSearchByPhone: true,
+	receiveMerchantMsg: true
+})
+const cacheSize = ref<string>('0.0 MB')
+const currentLanguage = ref<string>('简体中文')
+const currentTheme = ref<string>('自动')
+const appVersion = ref<string>('1.0.0')
+
+// 生命周期
+onMounted(() => {
+	loadUserInfo()
+	loadSettings()
+})
+
+// 加载用户信息
+const loadUserInfo = () => {
+	const userStore = uni.getStorageSync('userInfo')
+	if (userStore) {
+		userInfo.value = userStore
+	}
+}
+
+// 加载设置
+const loadSettings = () => {
+	// 从本地存储加载设置
+	const savedNotifications = uni.getStorageSync('userNotifications')
+	if (savedNotifications) {
+		notifications.value = savedNotifications
+	}
+	
+	const savedPrivacy = uni.getStorageSync('userPrivacy')
+	if (savedPrivacy) {
+		privacy.value = savedPrivacy
+	}
+	
+	// 计算缓存大小
+	calculateCacheSize()
+	
+	// 获取应用版本
+	// @ts-ignore
+	const appInfo = uni.getAppBaseInfo()
+	if (appInfo?.appVersion) {
+		appVersion.value = appInfo.appVersion
+	}
+}
+
+// 计算缓存大小
+const calculateCacheSize = () => {
+	// 这里应该计算实际缓存大小，这里使用模拟数据
+	cacheSize.value = '12.5 MB'
+}
+
+// 跳转到个人资料
+const goToProfile = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/profile'
+	})
+}
+
+// 跳转到地址管理
+const goToAddress = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/address'
+	})
+}
+
+// 修改密码
+const changePassword = () => {
+	uni.navigateTo({
+		url: '/pages/user/change-password'
+	})
+}
+
+// 绑定手机
+const bindPhone = () => {
+	uni.navigateTo({
+		url: '/pages/user/bind-phone'
+	})
+}
+
+// 绑定邮箱
+const bindEmail = () => {
+	uni.navigateTo({
+		url: '/pages/user/bind-email'
+	})
+}
+
+// 切换通知设置
+const toggleNotification = (type: keyof NotificationType) => {
+	notifications.value[type] = !notifications.value[type]
+	uni.setStorageSync('userNotifications', notifications.value)
+}
+
+// 切换隐私设置
+const togglePrivacy = (type: keyof PrivacyType) => {
+	privacy.value[type] = !privacy.value[type]
+	uni.setStorageSync('userPrivacy', privacy.value)
+}
+
+// 清除缓存
+const clearCache = () => {
+	uni.showModal({
+		title: '清除缓存',
+		content: `确定要清除 ${cacheSize.value} 缓存吗？`,
+		success: (res) => {
+			if (res.confirm) {
+				// 这里应该清除实际缓存
+				uni.showLoading({
+					title: '清除中...'
+				})
+				
+				setTimeout(() => {
+					cacheSize.value = '0.0 MB'
+					uni.hideLoading()
+					uni.showToast({
+						title: '缓存已清除',
+						icon: 'success'
+					})
+				}, 1000)
+			}
+		}
+	})
+}
+
+// 切换语言
+const changeLanguage = () => {
+	uni.showActionSheet({
+		itemList: ['简体中文', 'English', '日本語'],
+		success: (res) => {
+			const languages = ['简体中文', 'English', '日本語']
+			currentLanguage.value = languages[res.tapIndex]
+			uni.setStorageSync('appLanguage', currentLanguage.value)
+			
+			uni.showToast({
+				title: '语言已切换',
+				icon: 'success'
+			})
+		}
+	})
+}
+
+// 切换主题
+const changeTheme = () => {
+	uni.showActionSheet({
+		itemList: ['自动', '浅色模式', '深色模式'],
+		success: (res) => {
+			const themes = ['自动', '浅色模式', '深色模式']
+			currentTheme.value = themes[res.tapIndex]
+			uni.setStorageSync('appTheme', currentTheme.value)
+			
+			uni.showToast({
+				title: '主题已切换',
+				icon: 'success'
+			})
+		}
+	})
+}
+
+// 关于我们
+const aboutUs = () => {
+	uni.navigateTo({
+		url: '/pages/info/about'
+	})
+}
+
+// 用户协议
+const userAgreement = () => {
+	uni.navigateTo({
+		url: '/pages/user/terms'
+	})
+}
+
+// 隐私政策
+const privacyPolicy = () => {
+	uni.navigateTo({
+		url: '/pages/info/privacy'
+	})
+}
+
+// 检查更新
+const checkUpdate = () => {
+	uni.showLoading({
+		title: '检查更新中...'
+	})
+	
+	setTimeout(() => {
+		uni.hideLoading()
+		uni.showModal({
+			title: '检查更新',
+			content: '当前已是最新版本',
+			showCancel: false
+		})
+	}, 1000)
+}
+
+// 联系客服
+const contactService = () => {
+	uni.navigateTo({
+		url: '/pages/mall/service/chat'
+	})
+}
+
+// 意见反馈
+const feedback = () => {
+	uni.navigateTo({
+		url: '/pages/info/feedback'
+	})
+}
+
+// 给个好评
+const rateApp = () => {
+	// 这里应该跳转到应用商店评分
+	uni.showModal({
+		title: '给个好评',
+		content: '如果喜欢我们的应用，请给个好评吧！',
+		confirmText: '去评分',
+		success: (res) => {
+			if (res.confirm) {
+				// 跳转到应用商店
+				// @ts-ignore
+				uni.navigateToMiniProgram({
+					appId: 'wx1234567890', // 示例AppID
+					fail: () => {
+						uni.showToast({
+							title: '跳转失败',
+							icon: 'none'
+						})
+					}
+				})
+			}
+		}
+	})
+}
+
+// 退出登录
+const logout = () => {
+	uni.showModal({
+		title: '退出登录',
+		content: '确定要退出登录吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					// 调用登出接口
+                    /*
+					const { error } = await supa.auth.signOut()
+					
+					if (error !== null) {
+						console.error('登出失败:', error)
+						uni.showToast({
+							title: '登出失败',
+							icon: 'none'
+						})
+						return
+					}
+                    */
+					
+					// 清除本地存储
+					uni.removeStorageSync('userInfo')
+					uni.removeStorageSync('token')
+					uni.removeStorageSync('userSettings')
+					
+					// 跳转到登录页
+					uni.reLaunch({
+						url: '/pages/user/login'
+					})
+					
+				} catch (err) {
+					console.error('登出异常:', err)
+					uni.showToast({
+						title: '登出失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 注销账号
+const deleteAccount = () => {
+	uni.showModal({
+		title: '注销账号',
+		content: '确定要注销账号吗？此操作不可恢复，所有数据将被删除！',
+		confirmText: '注销',
+		confirmColor: '#ff4757',
+		success: async (res) => {
+			if (res.confirm) {
+				uni.showLoading({
+					title: '处理中...'
+				})
+				
+				try {
+					const userId = userInfo.value.id
+					
+					// 这里应该调用注销账号的API
+                    /*
+					const { error } = await supa
+						.from('users')
+						.update({ status: 0 }) // 标记为注销状态
+						.eq('id', userId)
+					
+					if (error !== null) {
+						throw error
+					}
+                    */
+					
+					// 清除本地存储
+					uni.removeStorageSync('userInfo')
+					uni.removeStorageSync('token')
+					
+					// 提示并跳转
+					uni.hideLoading()
+					uni.showToast({
+						title: '账号已注销',
+						icon: 'success',
+						duration: 2000
+					})
+					
+					setTimeout(() => {
+						uni.reLaunch({
+							url: '/pages/user/login'
+						})
+					}, 1500)
+					
+				} catch (err) {
+					uni.hideLoading()
+					console.error('注销账号失败:', err)
+					uni.showToast({
+						title: '注销失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+.settings-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.settings-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+	margin-right: 15px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.settings-content {
+	flex: 1;
+}
+
+.settings-section {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+}
+
+.section-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.section-list {
+	display: flex;
+	flex-direction: column;
+}
+
+.list-item {
+	display: flex;
+	align-items: center;
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.list-item:last-child {
+	border-bottom: none;
+}
+
+.item-icon {
+	font-size: 20px;
+	margin-right: 15px;
+}
+
+.item-text {
+	flex: 1;
+	font-size: 14px;
+	color: #333333;
+}
+
+.item-arrow {
+	color: #999999;
+	font-size: 16px;
+	margin-left: 10px;
+}
+
+.item-right {
+	display: flex;
+	align-items: center;
+}
+
+.item-status {
+	font-size: 12px;
+	color: #999999;
+	margin-right: 10px;
+}
+
+.item-status.bound {
+	color: #4caf50;
+}
+
+.item-cache {
+	font-size: 12px;
+	color: #999999;
+	margin-right: 10px;
+}
+
+.logout-section {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 15px;
+}
+
+.logout-btn {
+	background-color: #ffffff;
+	color: #ff4757;
+	height: 45px;
+	border: 1px solid #ff4757;
+	border-radius: 22.5px;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.delete-account-section {
+	background-color: #ffffff;
+	padding: 20px 15px;
+	text-align: center;
+}
+
+.delete-account {
+	color: #999999;
+	font-size: 14px;
+	text-decoration: underline;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/settings.uvue b/pages/mall/consumer/settings.uvue
new file mode 100644
index 00000000..d62bb723
--- /dev/null
+++ b/pages/mall/consumer/settings.uvue
@@ -0,0 +1,747 @@
+<!-- 设置页面 -->
+<template>
+	<view class="settings-page">
+		<!-- 顶部栏 -->
+		<view class="settings-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="header-title">设置</text>
+		</view>
+
+		<scroll-view class="settings-content" scroll-y>
+			<!-- 账户设置 -->
+			<view class="settings-section">
+				<text class="section-title">账户设置</text>
+				<view class="section-list">
+					<view class="list-item" @click="goToProfile">
+						<text class="item-icon">👤</text>
+						<text class="item-text">个人资料</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="goToAddressList">
+						<text class="item-icon">📍</text>
+						<text class="item-text">收货地址</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="changePassword">
+						<text class="item-icon">🔒</text>
+						<text class="item-text">修改密码</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="bindPhone">
+						<text class="item-icon">📱</text>
+						<text class="item-text">手机绑定</text>
+						<view class="item-right">
+							<text class="item-status" :class="{ bound: userInfo.phone }">
+								{{ userInfo.phone ? '已绑定' : '未绑定' }}
+							</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+					<view class="list-item" @click="bindEmail">
+						<text class="item-icon">📧</text>
+						<text class="item-text">邮箱绑定</text>
+						<view class="item-right">
+							<text class="item-status" :class="{ bound: userInfo.email }">
+								{{ userInfo.email ? '已绑定' : '未绑定' }}
+							</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 消息通知 -->
+			<view class="settings-section">
+				<text class="section-title">消息通知</text>
+				<view class="section-list">
+					<view class="list-item">
+						<text class="item-icon">🔔</text>
+						<text class="item-text">订单消息</text>
+						<switch :checked="notifications.order" @change="toggleNotification('order')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">🎁</text>
+						<text class="item-text">促销活动</text>
+						<switch :checked="notifications.promotion" @change="toggleNotification('promotion')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">⭐</text>
+						<text class="item-text">评价提醒</text>
+						<switch :checked="notifications.review" @change="toggleNotification('review')" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 隐私设置 -->
+			<view class="settings-section">
+				<text class="section-title">隐私设置</text>
+				<view class="section-list">
+					<view class="list-item">
+						<text class="item-icon">👁️</text>
+						<text class="item-text">隐藏购物记录</text>
+						<switch :checked="privacy.hidePurchase" @change="togglePrivacy('hidePurchase')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">🔍</text>
+						<text class="item-text">允许通过手机号找到我</text>
+						<switch :checked="privacy.allowSearchByPhone" @change="togglePrivacy('allowSearchByPhone')" />
+					</view>
+					<view class="list-item">
+						<text class="item-icon">💬</text>
+						<text class="item-text">接收商家消息</text>
+						<switch :checked="privacy.receiveMerchantMsg" @change="togglePrivacy('receiveMerchantMsg')" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 通用设置 -->
+			<view class="settings-section">
+				<text class="section-title">通用设置</text>
+				<view class="section-list">
+					<view class="list-item" @click="clearCache">
+						<text class="item-icon">🗑️</text>
+						<text class="item-text">清除缓存</text>
+						<view class="item-right">
+							<text class="item-cache">{{ cacheSize }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+					<view class="list-item" @click="changeLanguage">
+						<text class="item-icon">🌐</text>
+						<text class="item-text">语言设置</text>
+						<view class="item-right">
+							<text class="item-status">{{ currentLanguage }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+					<view class="list-item" @click="changeTheme">
+						<text class="item-icon">🎨</text>
+						<text class="item-text">主题设置</text>
+						<view class="item-right">
+							<text class="item-status">{{ currentTheme }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 关于我们 -->
+			<view class="settings-section">
+				<text class="section-title">关于我们</text>
+				<view class="section-list">
+					<view class="list-item" @click="aboutUs">
+						<text class="item-icon">ℹ️</text>
+						<text class="item-text">关于商城</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="userAgreement">
+						<text class="item-icon">📜</text>
+						<text class="item-text">用户协议</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="privacyPolicy">
+						<text class="item-icon">🛡️</text>
+						<text class="item-text">隐私政策</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="checkUpdate">
+						<text class="item-icon">🔄</text>
+						<text class="item-text">检查更新</text>
+						<view class="item-right">
+							<text class="item-status">{{ appVersion }}</text>
+							<text class="item-arrow">›</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 客服与反馈 -->
+			<view class="settings-section">
+				<text class="section-title">客服与反馈</text>
+				<view class="section-list">
+					<view class="list-item" @click="contactService">
+						<text class="item-icon">💬</text>
+						<text class="item-text">联系客服</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="feedback">
+						<text class="item-icon">📝</text>
+						<text class="item-text">意见反馈</text>
+						<text class="item-arrow">›</text>
+					</view>
+					<view class="list-item" @click="rateApp">
+						<text class="item-icon">⭐</text>
+						<text class="item-text">给个好评</text>
+						<text class="item-arrow">›</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 退出登录 -->
+			<view class="logout-section">
+				<button class="logout-btn" @click="logout">退出登录</button>
+			</view>
+
+			<!-- 账号注销 -->
+			<view class="delete-account-section">
+				<text class="delete-account" @click="deleteAccount">注销账号</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+// import supa from '@/components/supadb/aksupainstance.uts'
+
+type UserType = {
+	id: string
+	phone: string | null
+	email: string | null
+	nickname: string | null
+	avatar_url: string | null
+}
+
+type NotificationType = {
+	order: boolean
+	promotion: boolean
+	review: boolean
+}
+
+type PrivacyType = {
+	hidePurchase: boolean
+	allowSearchByPhone: boolean
+	receiveMerchantMsg: boolean
+}
+
+const userInfo = ref<UserType>({
+	id: '',
+	phone: null,
+	email: null,
+	nickname: null,
+	avatar_url: null
+})
+const notifications = ref<NotificationType>({
+	order: true,
+	promotion: true,
+	review: true
+})
+const privacy = ref<PrivacyType>({
+	hidePurchase: false,
+	allowSearchByPhone: true,
+	receiveMerchantMsg: true
+})
+const cacheSize = ref<string>('0.0 MB')
+const currentLanguage = ref<string>('简体中文')
+const currentTheme = ref<string>('自动')
+const appVersion = ref<string>('1.0.0')
+
+// 生命周期
+onMounted(() => {
+	loadUserInfo()
+	loadSettings()
+})
+
+// 加载用户信息
+const loadUserInfo = () => {
+	const userStore = uni.getStorageSync('userInfo')
+	if (userStore) {
+		userInfo.value = userStore
+	}
+}
+
+// 加载设置
+const loadSettings = () => {
+	// 从本地存储加载设置
+	const savedNotifications = uni.getStorageSync('userNotifications')
+	if (savedNotifications) {
+		notifications.value = savedNotifications
+	}
+	
+	const savedPrivacy = uni.getStorageSync('userPrivacy')
+	if (savedPrivacy) {
+		privacy.value = savedPrivacy
+	}
+	
+	// 计算缓存大小
+	calculateCacheSize()
+	
+	// 获取应用版本
+	// @ts-ignore
+	const appInfo = uni.getAppBaseInfo()
+	if (appInfo?.appVersion) {
+		appVersion.value = appInfo.appVersion
+	}
+}
+
+// 计算缓存大小
+const calculateCacheSize = () => {
+	// 这里应该计算实际缓存大小，这里使用模拟数据
+	cacheSize.value = '12.5 MB'
+}
+
+// 跳转到个人资料
+const goToProfile = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/profile'
+	})
+}
+
+// 跳转到地址管理
+const goToAddressList = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/address-list'
+	})
+}
+
+// 修改密码
+const changePassword = () => {
+	uni.navigateTo({
+		url: '/pages/user/change-password'
+	})
+}
+
+// 绑定手机
+const bindPhone = () => {
+	uni.navigateTo({
+		url: '/pages/user/bind-phone'
+	})
+}
+
+// 绑定邮箱
+const bindEmail = () => {
+	uni.navigateTo({
+		url: '/pages/user/bind-email'
+	})
+}
+
+// 切换通知设置
+const toggleNotification = (type: keyof NotificationType) => {
+	notifications.value[type] = !notifications.value[type]
+	uni.setStorageSync('userNotifications', notifications.value)
+}
+
+// 切换隐私设置
+const togglePrivacy = (type: keyof PrivacyType) => {
+	privacy.value[type] = !privacy.value[type]
+	uni.setStorageSync('userPrivacy', privacy.value)
+}
+
+// 清除缓存
+const clearCache = () => {
+	uni.showModal({
+		title: '清除缓存',
+		content: `确定要清除 ${cacheSize.value} 缓存吗？`,
+		success: (res) => {
+			if (res.confirm) {
+				// 这里应该清除实际缓存
+				uni.showLoading({
+					title: '清除中...'
+				})
+				
+				setTimeout(() => {
+					cacheSize.value = '0.0 MB'
+					uni.hideLoading()
+					uni.showToast({
+						title: '缓存已清除',
+						icon: 'success'
+					})
+				}, 1000)
+			}
+		}
+	})
+}
+
+// 切换语言
+const changeLanguage = () => {
+	uni.showActionSheet({
+		itemList: ['简体中文', 'English', '日本語'],
+		success: (res) => {
+			const languages = ['简体中文', 'English', '日本語']
+			currentLanguage.value = languages[res.tapIndex]
+			uni.setStorageSync('appLanguage', currentLanguage.value)
+			
+			uni.showToast({
+				title: '语言已切换',
+				icon: 'success'
+			})
+		}
+	})
+}
+
+// 切换主题
+const changeTheme = () => {
+	uni.showActionSheet({
+		itemList: ['自动', '浅色模式', '深色模式'],
+		success: (res) => {
+			const themes = ['自动', '浅色模式', '深色模式']
+			currentTheme.value = themes[res.tapIndex]
+			uni.setStorageSync('appTheme', currentTheme.value)
+			
+			uni.showToast({
+				title: '主题已切换',
+				icon: 'success'
+			})
+		}
+	})
+}
+
+// 关于我们
+const aboutUs = () => {
+	uni.navigateTo({
+		url: '/pages/info/about'
+	})
+}
+
+// 用户协议
+const userAgreement = () => {
+	uni.navigateTo({
+		url: '/pages/user/terms'
+	})
+}
+
+// 隐私政策
+const privacyPolicy = () => {
+	uni.navigateTo({
+		url: '/pages/info/privacy'
+	})
+}
+
+// 检查更新
+const checkUpdate = () => {
+	uni.showLoading({
+		title: '检查更新中...'
+	})
+	
+	setTimeout(() => {
+		uni.hideLoading()
+		uni.showModal({
+			title: '检查更新',
+			content: '当前已是最新版本',
+			showCancel: false
+		})
+	}, 1000)
+}
+
+// 联系客服
+const contactService = () => {
+	uni.navigateTo({
+		url: '/pages/mall/service/chat'
+	})
+}
+
+// 意见反馈
+const feedback = () => {
+	uni.navigateTo({
+		url: '/pages/info/feedback'
+	})
+}
+
+// 给个好评
+const rateApp = () => {
+	// 这里应该跳转到应用商店评分
+	uni.showModal({
+		title: '给个好评',
+		content: '如果喜欢我们的应用，请给个好评吧！',
+		confirmText: '去评分',
+		success: (res) => {
+			if (res.confirm) {
+				// 跳转到应用商店
+				// @ts-ignore
+				uni.navigateToMiniProgram({
+					appId: 'wx1234567890', // 示例AppID
+					fail: () => {
+						uni.showToast({
+							title: '跳转失败',
+							icon: 'none'
+						})
+					}
+				})
+			}
+		}
+	})
+}
+
+// 退出登录
+const logout = () => {
+	uni.showModal({
+		title: '退出登录',
+		content: '确定要退出登录吗？',
+		success: async (res) => {
+			if (res.confirm) {
+				try {
+					// 调用登出接口
+                    /*
+					const { error } = await supa.auth.signOut()
+					
+					if (error !== null) {
+						console.error('登出失败:', error)
+						uni.showToast({
+							title: '登出失败',
+							icon: 'none'
+						})
+						return
+					}
+                    */
+					
+					// 清除本地存储
+					uni.removeStorageSync('userInfo')
+					uni.removeStorageSync('token')
+					uni.removeStorageSync('userSettings')
+					
+					// 跳转到登录页
+					uni.reLaunch({
+						url: '/pages/user/login'
+					})
+					
+				} catch (err) {
+					console.error('登出异常:', err)
+					uni.showToast({
+						title: '登出失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 注销账号
+const deleteAccount = () => {
+	uni.showModal({
+		title: '注销账号',
+		content: '确定要注销账号吗？此操作不可恢复，所有数据将被删除！',
+		confirmText: '注销',
+		confirmColor: '#ff4757',
+		success: async (res) => {
+			if (res.confirm) {
+				uni.showLoading({
+					title: '处理中...'
+				})
+				
+				try {
+					const userId = userInfo.value.id
+					
+					// 这里应该调用注销账号的API
+                    /*
+					const { error } = await supa
+						.from('users')
+						.update({ status: 0 }) // 标记为注销状态
+						.eq('id', userId)
+					
+					if (error !== null) {
+						throw error
+					}
+                    */
+					
+					// 清除本地存储
+					uni.removeStorageSync('userInfo')
+					uni.removeStorageSync('token')
+					
+					// 提示并跳转
+					uni.hideLoading()
+					uni.showToast({
+						title: '账号已注销',
+						icon: 'success',
+						duration: 2000
+					})
+					
+					setTimeout(() => {
+						uni.reLaunch({
+							url: '/pages/user/login'
+						})
+					}, 1500)
+					
+				} catch (err) {
+					uni.hideLoading()
+					console.error('注销账号失败:', err)
+					uni.showToast({
+						title: '注销失败',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	})
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+/* 响应式布局优化 */
+@media screen and (min-width: 768px) {
+	.settings-content {
+		padding: 20px;
+		background-color: #f5f5f5;
+	}
+
+	.settings-section {
+		border-radius: 8px;
+		margin-bottom: 20px;
+		max-width: 800px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+
+	/* 电脑端横向排列部分内容 */
+	.section-list {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.logout-section, .delete-account-section {
+		max-width: 800px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+}
+
+@media screen and (min-width: 1024px) {
+	.settings-page {
+		flex-direction: row; /* 大屏下改为横向布局，左侧导航，右侧内容 */
+	}
+
+	.settings-header {
+		display: none; /* 大屏下隐藏顶部栏，可能使用侧边栏或其他导航 */
+	}
+	
+	/* 这里只是简单示例，实际可能需要更复杂的布局调整 */
+	.settings-content {
+		width: 100%;
+		max-width: 1000px;
+		margin: 0 auto;
+	}
+}
+
+.settings-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.settings-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+	margin-right: 15px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.settings-content {
+	flex: 1;
+}
+
+.settings-section {
+	background-color: #ffffff;
+	margin-bottom: 10px;
+	padding: 15px;
+}
+
+.section-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.section-list {
+	display: flex;
+	flex-direction: column;
+}
+
+.list-item {
+	display: flex;
+	align-items: center;
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.list-item:last-child {
+	border-bottom: none;
+}
+
+.item-icon {
+	font-size: 20px;
+	margin-right: 15px;
+}
+
+.item-text {
+	flex: 1;
+	font-size: 14px;
+	color: #333333;
+}
+
+.item-arrow {
+	color: #999999;
+	font-size: 16px;
+	margin-left: 10px;
+}
+
+.item-right {
+	display: flex;
+	align-items: center;
+}
+
+.item-status {
+	font-size: 12px;
+	color: #999999;
+	margin-right: 10px;
+}
+
+.item-status.bound {
+	color: #4caf50;
+}
+
+.item-cache {
+	font-size: 12px;
+	color: #999999;
+	margin-right: 10px;
+}
+
+.logout-section {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 15px;
+}
+
+.logout-btn {
+	background-color: #ffffff;
+	color: #ff4757;
+	height: 45px;
+	border: 1px solid #ff4757;
+	border-radius: 22.5px;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.delete-account-section {
+	background-color: #ffffff;
+	padding: 20px 15px;
+	text-align: center;
+}
+
+.delete-account {
+	color: #999999;
+	font-size: 14px;
+	text-decoration: underline;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/shop-detail.uvue b/pages/mall/consumer/shop-detail.uvue
new file mode 100644
index 00000000..c2bf505e
--- /dev/null
+++ b/pages/mall/consumer/shop-detail.uvue
@@ -0,0 +1,375 @@
+<template>
+  <view class="shop-detail-page">
+    <!-- 店铺头部信息 -->
+    <view class="shop-header">
+      <image :src="merchant.shop_banner || '/static/default-banner.png'" class="shop-banner" mode="aspectFill" />
+      <view class="shop-info-card">
+        <image :src="merchant.shop_logo || '/static/default-shop.png'" class="shop-logo" />
+        <view class="shop-basic-info">
+          <text class="shop-name">{{ merchant.shop_name }}</text>
+          <view class="shop-stats">
+            <text class="stat-item">⭐ {{ merchant.rating.toFixed(1) }}</text>
+            <text class="stat-item">销量 {{ merchant.total_sales }}</text>
+          </view>
+        </view>
+        <button class="follow-btn" @click="toggleFollow">{{ isFollowed ? '已关注' : '+ 关注' }}</button>
+      </view>
+      <text class="shop-desc">{{ merchant.shop_description || '这家店很懒，什么都没写~' }}</text>
+    </view>
+
+    <!-- 商品列表 -->
+    <view class="product-section">
+      <view class="section-title">全部商品</view>
+      <view class="product-grid">
+        <view v-for="product in products" :key="product.id" class="product-item" @click="goToProduct(product.id)">
+          <image :src="product.images[0]" class="product-image" mode="aspectFill" />
+          <view class="product-info">
+            <text class="product-name">{{ product.name }}</text>
+            <view class="price-row">
+              <view class="price-left">
+                <text class="product-price">¥{{ product.price }}</text>
+                <text class="product-sales">已售 {{ product.sales }}</text>
+              </view>
+              <view class="cart-btn" @click.stop="addToCart(product)">
+                <text class="cart-icon">🛒</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted } from 'vue'
+import { MerchantType, ProductType } from '@/types/mall-types.uts'
+
+const merchant = ref<MerchantType>({
+  id: '',
+  user_id: '',
+  shop_name: '',
+  shop_logo: '',
+  shop_banner: '',
+  shop_description: '',
+  contact_name: '',
+  contact_phone: '',
+  shop_status: 0,
+  rating: 0,
+  total_sales: 0,
+  created_at: ''
+} as MerchantType)
+
+const products = ref<ProductType[]>([])
+const isFollowed = ref(false)
+
+onMounted(() => {
+  const pages = getCurrentPages()
+  const options = pages[pages.length - 1].options as any
+  const merchantId = options['merchantId'] as string
+  
+  if (merchantId) {
+    loadShopData(merchantId)
+    loadShopProducts(merchantId)
+  }
+})
+
+const loadShopData = (id: string) => {
+  // 模拟加载店铺数据
+  merchant.value = {
+    id: id,
+    user_id: 'user_001',
+    shop_name: '优质好店',
+    shop_logo: '/static/shop-logo.png',
+    shop_banner: '/static/shop-banner.png',
+    shop_description: '专注品质生活，为您提供最优质的商品和服务。',
+    contact_name: '店主小王',
+    contact_phone: '13800138000',
+    shop_status: 1,
+    rating: 4.8,
+    total_sales: 15680,
+    created_at: '2023-06-01'
+  }
+}
+
+const loadShopProducts = (id: string) => {
+  // 模拟加载店铺商品列表
+  products.value = [
+    {
+      id: 'prod_001',
+      merchant_id: id,
+      category_id: 'cat_001',
+      name: '精选好物商品 A',
+      description: '商品描述 A',
+      images: ['/static/product1.jpg'],
+      price: 199.99,
+      original_price: 299.99,
+      stock: 100,
+      sales: 1256,
+      status: 1,
+      created_at: '2024-01-15'
+    },
+    {
+      id: 'prod_002',
+      merchant_id: id,
+      category_id: 'cat_001',
+      name: '精选好物商品 B',
+      description: '商品描述 B',
+      images: ['/static/product2.jpg'],
+      price: 299.00,
+      original_price: 399.00,
+      stock: 50,
+      sales: 856,
+      status: 1,
+      created_at: '2024-01-16'
+    },
+    {
+      id: 'prod_003',
+      merchant_id: id,
+      category_id: 'cat_002',
+      name: '精选好物商品 C',
+      description: '商品描述 C',
+      images: ['/static/product3.jpg'],
+      price: 99.00,
+      original_price: 129.00,
+      stock: 200,
+      sales: 3256,
+      status: 1,
+      created_at: '2024-01-17'
+    }
+  ]
+}
+
+const toggleFollow = () => {
+  isFollowed.value = !isFollowed.value
+  uni.showToast({
+    title: isFollowed.value ? '关注成功' : '已取消关注',
+    icon: 'none'
+  })
+}
+
+const addToCart = (product: ProductType) => {
+  // 获取现有购物车数据
+  const cartData = uni.getStorageSync('cart')
+  let cartItems: any[] = []
+  
+  if (cartData) {
+    try {
+      cartItems = JSON.parse(cartData as string) as any[]
+    } catch (e) {
+      console.error('解析购物车数据失败', e)
+    }
+  }
+  
+  // 检查商品是否已存在
+  const existingItem = cartItems.find((item: any) => item.productId === product.id)
+  
+  if (existingItem) {
+    existingItem.quantity++
+  } else {
+    // 添加新商品
+    cartItems.push({
+      id: product.id, // 简单使用产品ID作为购物车ID，实际可能有规格
+      productId: product.id,
+      shopId: merchant.value.id,
+      shopName: merchant.value.shop_name,
+      name: product.name,
+      price: product.price,
+      image: product.images[0],
+      spec: '默认规格',
+      quantity: 1,
+      selected: true
+    })
+  }
+  
+  // 保存回存储
+  uni.setStorageSync('cart', JSON.stringify(cartItems))
+  
+  uni.showToast({
+    title: '已添加到购物车',
+    icon: 'success'
+  })
+}
+
+const goToProduct = (id: string) => {
+  uni.navigateTo({
+    url: `/pages/mall/consumer/product-detail?productId=${id}`
+  })
+}
+</script>
+
+<style>
+.shop-detail-page {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.shop-header {
+  background-color: #fff;
+  padding-bottom: 20px;
+  margin-bottom: 10px;
+}
+
+.shop-banner {
+  width: 100%;
+  height: 150px;
+  background-color: #eee;
+}
+
+.shop-info-card {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0 15px;
+  margin-top: -30px; /* Logo 向上重叠 banner */
+  position: relative;
+  z-index: 1;
+}
+
+.shop-logo {
+  width: 60px;
+  height: 60px;
+  border-radius: 8px;
+  border: 2px solid #fff;
+  background-color: #fff;
+  margin-right: 12px;
+}
+
+.shop-basic-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  padding-top: 30px; /* 给 logo 上浮留空间 */
+}
+
+.shop-name {
+  font-size: 18px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 4px;
+}
+
+.shop-stats {
+  display: flex;
+  flex-direction: row;
+}
+
+.stat-item {
+  font-size: 12px;
+  color: #666;
+  margin-right: 12px;
+  background-color: #f0f0f0;
+  padding: 2px 6px;
+  border-radius: 4px;
+}
+
+.follow-btn {
+  font-size: 14px;
+  background-color: #ff4444;
+  color: white;
+  padding: 6px 16px;
+  border-radius: 20px;
+  margin-top: 30px; /* 对齐 */
+  line-height: 1.5;
+}
+
+.shop-desc {
+  display: block;
+  font-size: 14px;
+  color: #666;
+  padding: 10px 15px 0;
+  line-height: 1.4;
+}
+
+.product-section {
+  padding: 15px;
+}
+
+.section-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 15px;
+  padding-left: 8px;
+  border-left: 4px solid #ff4444;
+}
+
+.product-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+
+.product-item {
+  width: calc(50% - 5px);
+  background-color: white;
+  border-radius: 8px;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 10px;
+}
+
+.product-image {
+  width: 100%;
+  height: 170px;
+  background-color: #f5f5f5;
+}
+
+.product-info {
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+}
+
+.product-name {
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 8px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  height: 40px;
+  line-height: 20px;
+}
+
+.price-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.price-left {
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+}
+
+.cart-btn {
+  width: 24px;
+  height: 24px;
+  background-color: #ff4444;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.cart-icon {
+  font-size: 14px;
+  color: white;
+}
+
+.product-price {
+  font-size: 16px;
+  color: #ff4444;
+  font-weight: bold;
+}
+
+.product-sales {
+  font-size: 12px;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/wallet - 副本.uvue b/pages/mall/consumer/wallet - 副本.uvue
new file mode 100644
index 00000000..f51846ce
--- /dev/null
+++ b/pages/mall/consumer/wallet - 副本.uvue	
@@ -0,0 +1,950 @@
+<!-- 钱包页面 -->
+<template>
+	<view class="wallet-page">
+		<!-- 顶部栏 -->
+		<view class="wallet-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="header-title">我的钱包</text>
+			<text class="more-btn" @click="showMoreActions">···</text>
+		</view>
+
+		<scroll-view class="wallet-content" scroll-y>
+			<!-- 余额概览 -->
+			<view class="balance-overview">
+				<text class="balance-label">账户余额</text>
+				<text class="balance-value">¥{{ balance.toFixed(2) }}</text>
+				<view class="balance-actions">
+					<button class="action-btn recharge" @click="recharge">充值</button>
+					<button class="action-btn withdraw" @click="withdraw">提现</button>
+				</view>
+			</view>
+
+			<!-- 资产统计 -->
+			<view class="assets-stats">
+				<view class="stat-item">
+					<text class="stat-label">累计充值</text>
+					<text class="stat-value">¥{{ stats.totalRecharge.toFixed(2) }}</text>
+				</view>
+				<view class="stat-item">
+					<text class="stat-label">累计消费</text>
+					<text class="stat-value">¥{{ stats.totalConsume.toFixed(2) }}</text>
+				</view>
+				<view class="stat-item">
+					<text class="stat-label">累计提现</text>
+					<text class="stat-value">¥{{ stats.totalWithdraw.toFixed(2) }}</text>
+				</view>
+			</view>
+
+			<!-- 快捷功能 -->
+			<view class="quick-actions">
+				<view class="action-grid">
+					<view class="action-item" @click="goToCoupons">
+						<text class="action-icon">🎫</text>
+						<text class="action-text">优惠券</text>
+					</view>
+					<view class="action-item" @click="goToRedPackets">
+						<text class="action-icon">🧧</text>
+						<text class="action-text">红包</text>
+					</view>
+					<view class="action-item" @click="goToPoints">
+						<text class="action-icon">⭐</text>
+						<text class="action-text">积分</text>
+					</view>
+					<view class="action-item" @click="goToBankCards">
+						<text class="action-icon">💳</text>
+						<text class="action-text">银行卡</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 交易记录 -->
+			<view class="transactions-section">
+				<view class="section-header">
+					<text class="section-title">交易记录</text>
+					<view class="filter-tabs">
+						<text :class="['filter-tab', { active: activeFilter === 'all' }]" 
+									@click="changeFilter('all')">全部</text>
+						<text :class="['filter-tab', { active: activeFilter === 'income' }]" 
+									@click="changeFilter('income')">收入</text>
+						<text :class="['filter-tab', { active: activeFilter === 'expense' }]" 
+									@click="changeFilter('expense')">支出</text>
+					</view>
+				</view>
+
+				<!-- 空状态 -->
+				<view v-if="transactions.length === 0 && !isLoading" class="empty-transactions">
+					<text class="empty-icon">💰</text>
+					<text class="empty-text">暂无交易记录</text>
+					<text class="empty-subtext">快去使用钱包功能吧</text>
+				</view>
+
+				<!-- 交易列表 -->
+				<view class="transactions-list">
+					<view v-for="transaction in transactions" 
+								:key="transaction.id" 
+								class="transaction-item">
+						<view class="transaction-left">
+							<text class="transaction-icon">{{ getTransactionIcon(transaction.type) }}</text>
+							<view class="transaction-info">
+								<text class="transaction-title">{{ getTransactionTitle(transaction.type) }}</text>
+								<text class="transaction-time">{{ formatTime(transaction.created_at) }}</text>
+								<text v-if="transaction.remark" class="transaction-remark">{{ transaction.remark }}</text>
+							</view>
+						</view>
+						<view class="transaction-right">
+							<text :class="['transaction-amount', 
+													 { income: transaction.amount > 0, expense: transaction.amount < 0 }]">
+								{{ transaction.amount > 0 ? '+' : '' }}¥{{ Math.abs(transaction.amount).toFixed(2) }}
+							</text>
+							<text class="transaction-balance">余额: ¥{{ transaction.current_balance.toFixed(2) }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 加载更多 -->
+				<view v-if="isLoading" class="loading-more">
+					<text class="loading-text">加载中...</text>
+				</view>
+				<view v-if="!hasMore && transactions.length > 0" class="no-more">
+					<text class="no-more-text">没有更多记录了</text>
+				</view>
+			</view>
+
+			<!-- 安全提示 -->
+			<view class="security-tips">
+				<text class="tip-title">安全提示</text>
+				<text class="tip-item">1. 请妥善保管您的支付密码</text>
+				<text class="tip-item">2. 不要向他人透露您的账户信息</text>
+				<text class="tip-item">3. 定期修改密码以确保账户安全</text>
+			</view>
+		</scroll-view>
+
+		<!-- 充值弹窗 -->
+		<view v-if="showRechargePopup" class="recharge-popup">
+			<view class="popup-mask" @click="closeRechargePopup"></view>
+			<view class="popup-content">
+				<view class="popup-header">
+					<text class="popup-title">充值</text>
+					<text class="popup-close" @click="closeRechargePopup">×</text>
+				</view>
+				<view class="popup-body">
+					<text class="amount-label">充值金额</text>
+					<view class="amount-input">
+						<text class="currency-symbol">¥</text>
+						<input class="amount-field" 
+									 v-model="rechargeAmount" 
+									 type="number" 
+									 placeholder="请输入充值金额"
+									 focus />
+					</view>
+					<view class="quick-amounts">
+						<text v-for="amount in quickAmounts" 
+									:key="amount" 
+									:class="['quick-amount', { active: rechargeAmount === amount.toString() }]"
+									@click="selectQuickAmount(amount)">
+							¥{{ amount }}
+						</text>
+					</view>
+					<text class="recharge-tip">单笔充值最低10元，最高5000元</text>
+				</view>
+				<view class="popup-footer">
+					<button class="cancel-btn" @click="closeRechargePopup">取消</button>
+					<button class="confirm-btn" 
+									:class="{ disabled: !canRecharge }"
+									@click="confirmRecharge">
+						确认充值
+					</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, computed, watch } from 'vue'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+type WalletType = {
+	id: string
+	user_id: string
+	balance: number
+	total_recharge: number
+	total_consume: number
+	total_withdraw: number
+	updated_at: string
+}
+
+type TransactionType = {
+	id: string
+	user_id: string
+	change_amount: number
+	current_balance: number
+	change_type: string // 'recharge' | 'consume' | 'withdraw' | 'refund' | 'reward'
+	related_id: string | null
+	remark: string | null
+	created_at: string
+}
+
+type StatsType = {
+	totalRecharge: number
+	totalConsume: number
+	totalWithdraw: number
+}
+
+const balance = ref<number>(0)
+const stats = ref<StatsType>({
+	totalRecharge: 0,
+	totalConsume: 0,
+	totalWithdraw: 0
+})
+const transactions = ref<Array<TransactionType>>([])
+const activeFilter = ref<string>('all')
+const isLoading = ref<boolean>(false)
+const currentPage = ref<number>(1)
+const pageSize = ref<number>(20)
+const hasMore = ref<boolean>(true)
+const showRechargePopup = ref<boolean>(false)
+const rechargeAmount = ref<string>('')
+const quickAmounts = [50, 100, 200, 500, 1000]
+
+// 计算属性
+const canRecharge = computed(() => {
+	const amount = parseFloat(rechargeAmount.value)
+	return !isNaN(amount) && amount >= 10 && amount <= 5000
+})
+
+// 监听过滤器变化
+watch(activeFilter, () => {
+	resetTransactions()
+	loadTransactions()
+})
+
+// 生命周期
+onMounted(() => {
+	loadWalletData()
+})
+
+// 重置交易记录
+const resetTransactions = () => {
+	transactions.value = []
+	currentPage.value = 1
+	hasMore.value = true
+}
+
+// 加载钱包数据
+const loadWalletData = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) {
+		uni.navigateTo({
+			url: '/pages/user/login'
+		})
+		return
+	}
+
+	await Promise.all([
+		loadBalance(),
+		loadTransactions()
+	])
+}
+
+// 加载余额信息
+const loadBalance = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+		const { data, error } = await supa
+			.from('user_wallets')
+			.select('*')
+			.eq('user_id', userId)
+			.single()
+
+		if (error !== null) {
+			console.error('加载钱包失败:', error)
+			return
+		}
+
+		if (data) {
+			balance.value = data.balance || 0
+			stats.value = {
+				totalRecharge: data.total_recharge || 0,
+				totalConsume: data.total_consume || 0,
+				totalWithdraw: data.total_withdraw || 0
+			}
+		}
+	} catch (err) {
+		console.error('加载钱包异常:', err)
+	}
+}
+
+// 加载交易记录
+const loadTransactions = async (loadMore: boolean = false) => {
+	if (isLoading.value || (!hasMore.value && loadMore)) {
+		return
+	}
+
+	isLoading.value = true
+
+	try {
+		const userId = getCurrentUserId()
+		if (!userId) return
+
+		const page = loadMore ? currentPage.value + 1 : 1
+		
+		let query = supa
+			.from('balance_records')
+			.select('*')
+			.eq('user_id', userId)
+			.order('created_at', { ascending: false })
+
+		// 根据过滤器筛选
+		if (activeFilter.value === 'income') {
+			query = query.gt('change_amount', 0)
+		} else if (activeFilter.value === 'expense') {
+			query = query.lt('change_amount', 0)
+		}
+
+		// 分页
+		query = query.range((page - 1) * pageSize.value, page * pageSize.value - 1)
+
+		const { data, error } = await query
+
+		if (error !== null) {
+			console.error('加载交易记录失败:', error)
+			return
+		}
+
+		const newTransactions = data || []
+
+		if (loadMore) {
+			transactions.value.push(...newTransactions)
+			currentPage.value = page
+		} else {
+			transactions.value = newTransactions
+			currentPage.value = 1
+		}
+
+		hasMore.value = newTransactions.length === pageSize.value
+	} catch (err) {
+		console.error('加载交易记录异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || ''
+}
+
+// 获取交易图标
+const getTransactionIcon = (type: string): string => {
+	const icons: Record<string, string> = {
+		recharge: '💳',
+		consume: '🛒',
+		withdraw: '🏦',
+		refund: '🔄',
+		reward: '🎁',
+		income: '💰',
+		expense: '📤'
+	}
+	return icons[type] || '💰'
+}
+
+// 获取交易标题
+const getTransactionTitle = (type: string): string => {
+	const titles: Record<string, string> = {
+		recharge: '账户充值',
+		consume: '商品消费',
+		withdraw: '余额提现',
+		refund: '订单退款',
+		reward: '活动奖励',
+		income: '收入',
+		expense: '支出'
+	}
+	return titles[type] || '交易'
+}
+
+// 格式化时间
+const formatTime = (timeStr: string): string => {
+	const date = new Date(timeStr)
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	const hours = date.getHours().toString().padStart(2, '0')
+	const minutes = date.getMinutes().toString().padStart(2, '0')
+	return `${month}-${day} ${hours}:${minutes}`
+}
+
+// 显示更多操作
+const showMoreActions = () => {
+	uni.showActionSheet({
+		itemList: ['交易记录', '安全设置', '帮助中心'],
+		success: (res) => {
+			switch (res.tapIndex) {
+				case 0:
+					// 交易记录已经在当前页
+					break
+				case 1:
+					uni.navigateTo({
+						url: '/pages/mall/consumer/settings'
+					})
+					break
+				case 2:
+					uni.navigateTo({
+						url: '/pages/info/help'
+					})
+					break
+			}
+		}
+	})
+}
+
+// 充值
+const recharge = () => {
+	showRechargePopup.value = true
+	rechargeAmount.value = ''
+}
+
+// 提现
+const withdraw = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/withdraw'
+	})
+}
+
+// 跳转到优惠券
+const goToCoupons = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/coupons'
+	})
+}
+
+// 跳转到红包
+const goToRedPackets = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/red-packets'
+	})
+}
+
+// 跳转到积分
+const goToPoints = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/points'
+	})
+}
+
+// 跳转到银行卡
+const goToBankCards = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/bank-cards'
+	})
+}
+
+// 切换过滤器
+const changeFilter = (filter: string) => {
+	activeFilter.value = filter
+}
+
+// 加载更多
+const loadMore = () => {
+	if (hasMore.value && !isLoading.value) {
+		loadTransactions(true)
+	}
+}
+
+// 选择快捷金额
+const selectQuickAmount = (amount: number) => {
+	rechargeAmount.value = amount.toString()
+}
+
+// 确认充值
+const confirmRecharge = async () => {
+	if (!canRecharge.value) return
+
+	const amount = parseFloat(rechargeAmount.value)
+	if (isNaN(amount)) return
+
+	// 这里应该跳转到支付页面进行充值
+	uni.navigateTo({
+		url: `/pages/mall/consumer/payment?type=recharge&amount=${amount}`
+	})
+	
+	closeRechargePopup()
+}
+
+// 关闭充值弹窗
+const closeRechargePopup = () => {
+	showRechargePopup.value = false
+	rechargeAmount.value = ''
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+.wallet-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.wallet-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.more-btn {
+	color: #333333;
+	font-size: 20px;
+	padding: 5px;
+}
+
+.wallet-content {
+	flex: 1;
+}
+
+.balance-overview {
+	background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	padding: 30px 20px;
+	color: #ffffff;
+}
+
+.balance-label {
+	display: block;
+	font-size: 14px;
+	opacity: 0.9;
+	margin-bottom: 10px;
+	text-align: center;
+}
+
+.balance-value {
+	display: block;
+	font-size: 36px;
+	font-weight: bold;
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+.balance-actions {
+	display: flex;
+	gap: 20px;
+}
+
+.action-btn {
+	flex: 1;
+	height: 40px;
+	border-radius: 20px;
+	font-size: 14px;
+	font-weight: bold;
+	border: none;
+}
+
+.action-btn.recharge {
+	background-color: #ffffff;
+	color: #667eea;
+}
+
+.action-btn.withdraw {
+	background-color: rgba(255, 255, 255, 0.2);
+	color: #ffffff;
+	border: 1px solid rgba(255, 255, 255, 0.5);
+}
+
+.assets-stats {
+	background-color: #ffffff;
+	padding: 20px;
+	display: flex;
+	justify-content: space-between;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.stat-item {
+	flex: 1;
+	text-align: center;
+}
+
+.stat-label {
+	display: block;
+	font-size: 12px;
+	color: #666666;
+	margin-bottom: 8px;
+}
+
+.stat-value {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.quick-actions {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 20px;
+}
+
+.action-grid {
+	display: flex;
+	justify-content: space-between;
+}
+
+.action-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.action-icon {
+	font-size: 28px;
+	margin-bottom: 8px;
+}
+
+.action-text {
+	font-size: 12px;
+	color: #666666;
+}
+
+.transactions-section {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 15px;
+}
+
+.section-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+}
+
+.section-title {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.filter-tabs {
+	display: flex;
+	gap: 15px;
+}
+
+.filter-tab {
+	font-size: 14px;
+	color: #666666;
+	padding: 5px 0;
+	position: relative;
+}
+
+.filter-tab.active {
+	color: #007aff;
+	font-weight: bold;
+}
+
+.filter-tab.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 2px;
+	background-color: #007aff;
+}
+
+.empty-transactions {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 40px 20px;
+}
+
+.empty-icon {
+	font-size: 60px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+}
+
+.transactions-list {
+	display: flex;
+	flex-direction: column;
+}
+
+.transaction-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.transaction-item:last-child {
+	border-bottom: none;
+}
+
+.transaction-left {
+	display: flex;
+	align-items: flex-start;
+}
+
+.transaction-icon {
+	font-size: 24px;
+	margin-right: 15px;
+}
+
+.transaction-info {
+	display: flex;
+	flex-direction: column;
+}
+
+.transaction-title {
+	font-size: 14px;
+	color: #333333;
+	font-weight: bold;
+	margin-bottom: 5px;
+}
+
+.transaction-time {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 3px;
+}
+
+.transaction-remark {
+	font-size: 12px;
+	color: #666666;
+}
+
+.transaction-right {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+}
+
+.transaction-amount {
+	font-size: 16px;
+	font-weight: bold;
+	margin-bottom: 5px;
+}
+
+.transaction-amount.income {
+	color: #4caf50;
+}
+
+.transaction-amount.expense {
+	color: #333333;
+}
+
+.transaction-balance {
+	font-size: 12px;
+	color: #999999;
+}
+
+.loading-more,
+.no-more {
+	padding: 20px;
+	text-align: center;
+}
+
+.loading-text,
+.no-more-text {
+	color: #999999;
+	font-size: 14px;
+}
+
+.security-tips {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 20px;
+}
+
+.tip-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.tip-item {
+	display: block;
+	font-size: 12px;
+	color: #666666;
+	line-height: 1.6;
+	margin-bottom: 8px;
+}
+
+.tip-item:last-child {
+	margin-bottom: 0;
+}
+
+.recharge-popup {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 999;
+}
+
+.popup-mask {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+	padding: 20px;
+}
+
+.popup-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 20px;
+	padding-bottom: 15px;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.popup-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.popup-close {
+	font-size: 24px;
+	color: #999999;
+	padding: 5px;
+}
+
+.popup-body {
+	margin-bottom: 20px;
+}
+
+.amount-label {
+	display: block;
+	font-size: 14px;
+	color: #333333;
+	margin-bottom: 10px;
+}
+
+.amount-input {
+	display: flex;
+	align-items: center;
+	margin-bottom: 20px;
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+}
+
+.currency-symbol {
+	font-size: 20px;
+	color: #333333;
+	margin-right: 10px;
+}
+
+.amount-field {
+	flex: 1;
+	font-size: 24px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.quick-amounts {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	margin-bottom: 15px;
+}
+
+.quick-amount {
+	padding: 8px 15px;
+	border: 1px solid #e5e5e5;
+	border-radius: 15px;
+	font-size: 14px;
+	color: #333333;
+}
+
+.quick-amount.active {
+	background-color: #007aff;
+	color: #ffffff;
+	border-color: #007aff;
+}
+
+.recharge-tip {
+	display: block;
+	font-size: 12px;
+	color: #999999;
+}
+
+.popup-footer {
+	display: flex;
+	gap: 15px;
+}
+
+.cancel-btn,
+.confirm-btn {
+	flex: 1;
+	height: 45px;
+	border-radius: 22.5px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+}
+
+.cancel-btn {
+	background-color: #f5f5f5;
+	color: #666666;
+}
+
+.confirm-btn {
+	background-color: #007aff;
+	color: #ffffff;
+}
+
+.confirm-btn.disabled {
+	background-color: #cccccc;
+	opacity: 0.6;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mall/consumer/wallet.uvue b/pages/mall/consumer/wallet.uvue
new file mode 100644
index 00000000..715e894f
--- /dev/null
+++ b/pages/mall/consumer/wallet.uvue
@@ -0,0 +1,998 @@
+<!-- 钱包页面 -->
+<template>
+	<view class="wallet-page">
+		<!-- 顶部栏 -->
+		<view class="wallet-header">
+			<text class="back-btn" @click="goBack">‹</text>
+			<text class="header-title">我的钱包</text>
+			<text class="more-btn" @click="showMoreActions">···</text>
+		</view>
+
+		<scroll-view class="wallet-content" scroll-y>
+			<!-- 余额概览 -->
+			<view class="balance-overview">
+				<text class="balance-label">账户余额</text>
+				<text class="balance-value">¥{{ balance.toFixed(2) }}</text>
+				<view class="balance-actions">
+					<button class="action-btn recharge" @click="recharge">充值</button>
+					<button class="action-btn withdraw" @click="withdraw">提现</button>
+				</view>
+			</view>
+
+			<!-- 资产统计 -->
+			<view class="assets-stats">
+				<view class="stat-item">
+					<text class="stat-label">累计充值</text>
+					<text class="stat-value">¥{{ stats.totalRecharge.toFixed(2) }}</text>
+				</view>
+				<view class="stat-item">
+					<text class="stat-label">累计消费</text>
+					<text class="stat-value">¥{{ stats.totalConsume.toFixed(2) }}</text>
+				</view>
+				<view class="stat-item">
+					<text class="stat-label">累计提现</text>
+					<text class="stat-value">¥{{ stats.totalWithdraw.toFixed(2) }}</text>
+				</view>
+			</view>
+
+			<!-- 快捷功能 -->
+			<view class="quick-actions">
+				<view class="action-grid">
+					<view class="action-item" @click="goToCoupons">
+						<text class="action-icon">🎫</text>
+						<text class="action-text">优惠券</text>
+					</view>
+					<view class="action-item" @click="goToRedPackets">
+						<text class="action-icon">🧧</text>
+						<text class="action-text">红包</text>
+					</view>
+					<view class="action-item" @click="goToPoints">
+						<text class="action-icon">⭐</text>
+						<text class="action-text">积分</text>
+					</view>
+					<view class="action-item" @click="goToBankCards">
+						<text class="action-icon">💳</text>
+						<text class="action-text">银行卡</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 交易记录 -->
+			<view class="transactions-section">
+				<view class="section-header">
+					<text class="section-title">交易记录</text>
+					<view class="filter-tabs">
+						<text :class="['filter-tab', { active: activeFilter === 'all' }]" 
+									@click="changeFilter('all')">全部</text>
+						<text :class="['filter-tab', { active: activeFilter === 'income' }]" 
+									@click="changeFilter('income')">收入</text>
+						<text :class="['filter-tab', { active: activeFilter === 'expense' }]" 
+									@click="changeFilter('expense')">支出</text>
+					</view>
+				</view>
+
+				<!-- 空状态 -->
+				<view v-if="transactions.length === 0 && !isLoading" class="empty-transactions">
+					<text class="empty-icon">💰</text>
+					<text class="empty-text">暂无交易记录</text>
+					<text class="empty-subtext">快去使用钱包功能吧</text>
+				</view>
+
+				<!-- 交易列表 -->
+				<view class="transactions-list">
+					<view v-for="transaction in transactions" 
+								:key="transaction.id" 
+								class="transaction-item">
+						<view class="transaction-left">
+							<text class="transaction-icon">{{ getTransactionIcon(transaction.type) }}</text>
+							<view class="transaction-info">
+								<text class="transaction-title">{{ getTransactionTitle(transaction.type) }}</text>
+								<text class="transaction-time">{{ formatTime(transaction.created_at) }}</text>
+								<text v-if="transaction.remark" class="transaction-remark">{{ transaction.remark }}</text>
+							</view>
+						</view>
+						<view class="transaction-right">
+							<text :class="['transaction-amount', 
+													 { income: transaction.amount > 0, expense: transaction.amount < 0 }]">
+								{{ transaction.amount > 0 ? '+' : '' }}¥{{ Math.abs(transaction.amount).toFixed(2) }}
+							</text>
+							<text class="transaction-balance">余额: ¥{{ transaction.current_balance.toFixed(2) }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 加载更多 -->
+				<view v-if="isLoading" class="loading-more">
+					<text class="loading-text">加载中...</text>
+				</view>
+				<view v-if="!hasMore && transactions.length > 0" class="no-more">
+					<text class="no-more-text">没有更多记录了</text>
+				</view>
+			</view>
+
+			<!-- 安全提示 -->
+			<view class="security-tips">
+				<text class="tip-title">安全提示</text>
+				<text class="tip-item">1. 请妥善保管您的支付密码</text>
+				<text class="tip-item">2. 不要向他人透露您的账户信息</text>
+				<text class="tip-item">3. 定期修改密码以确保账户安全</text>
+			</view>
+		</scroll-view>
+
+		<!-- 充值弹窗 -->
+		<view v-if="showRechargePopup" class="recharge-popup">
+			<view class="popup-mask" @click="closeRechargePopup"></view>
+			<view class="popup-content">
+				<view class="popup-header">
+					<text class="popup-title">充值</text>
+					<text class="popup-close" @click="closeRechargePopup">×</text>
+				</view>
+				<view class="popup-body">
+					<text class="amount-label">充值金额</text>
+					<view class="amount-input">
+						<text class="currency-symbol">¥</text>
+						<input class="amount-field" 
+									 v-model="rechargeAmount" 
+									 type="number" 
+									 placeholder="请输入充值金额"
+									 focus />
+					</view>
+					<view class="quick-amounts">
+						<text v-for="amount in quickAmounts" 
+									:key="amount" 
+									:class="['quick-amount', { active: rechargeAmount === amount.toString() }]"
+									@click="selectQuickAmount(amount)">
+							¥{{ amount }}
+						</text>
+					</view>
+					<text class="recharge-tip">单笔充值最低10元，最高5000元</text>
+				</view>
+				<view class="popup-footer">
+					<button class="cancel-btn" @click="closeRechargePopup">取消</button>
+					<button class="confirm-btn" 
+									:class="{ disabled: !canRecharge }"
+									@click="confirmRecharge">
+						确认充值
+					</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, onMounted, computed, watch } from 'vue'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+type WalletType = {
+	id: string
+	user_id: string
+	balance: number
+	total_recharge: number
+	total_consume: number
+	total_withdraw: number
+	updated_at: string
+}
+
+type TransactionType = {
+	id: string
+	user_id: string
+	change_amount: number
+	current_balance: number
+	change_type: string // 'recharge' | 'consume' | 'withdraw' | 'refund' | 'reward'
+	related_id: string | null
+	remark: string | null
+	created_at: string
+}
+
+type StatsType = {
+	totalRecharge: number
+	totalConsume: number
+	totalWithdraw: number
+}
+
+const balance = ref<number>(0)
+const stats = ref<StatsType>({
+	totalRecharge: 0,
+	totalConsume: 0,
+	totalWithdraw: 0
+})
+const transactions = ref<Array<TransactionType>>([])
+const activeFilter = ref<string>('all')
+const isLoading = ref<boolean>(false)
+const currentPage = ref<number>(1)
+const pageSize = ref<number>(20)
+const hasMore = ref<boolean>(true)
+const showRechargePopup = ref<boolean>(false)
+const rechargeAmount = ref<string>('')
+const quickAmounts = [50, 100, 200, 500, 1000]
+
+// 计算属性
+const canRecharge = computed(() => {
+	const amount = parseFloat(rechargeAmount.value)
+	return !isNaN(amount) && amount >= 10 && amount <= 5000
+})
+
+// 监听过滤器变化
+watch(activeFilter, () => {
+	resetTransactions()
+	loadTransactions()
+})
+
+// 生命周期
+onMounted(() => {
+	loadWalletData()
+})
+
+// 重置交易记录
+const resetTransactions = () => {
+	transactions.value = []
+	currentPage.value = 1
+	hasMore.value = true
+}
+
+// 加载钱包数据
+const loadWalletData = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) {
+		uni.navigateTo({
+			url: '/pages/user/login'
+		})
+		return
+	}
+
+	await Promise.all([
+		loadBalance(),
+		loadTransactions()
+	])
+}
+
+// 加载余额信息
+const loadBalance = async () => {
+	const userId = getCurrentUserId()
+	if (!userId) return
+
+	try {
+		const { data, error } = await supa
+			.from('user_wallets')
+			.select('*')
+			.eq('user_id', userId)
+			.single()
+
+		if (error !== null) {
+			console.error('加载钱包失败:', error)
+			return
+		}
+
+		if (data) {
+			balance.value = data.balance || 0
+			stats.value = {
+				totalRecharge: data.total_recharge || 0,
+				totalConsume: data.total_consume || 0,
+				totalWithdraw: data.total_withdraw || 0
+			}
+		}
+	} catch (err) {
+		console.error('加载钱包异常:', err)
+	}
+}
+
+// 加载交易记录
+const loadTransactions = async (loadMore: boolean = false) => {
+	if (isLoading.value || (!hasMore.value && loadMore)) {
+		return
+	}
+
+	isLoading.value = true
+
+	try {
+		const userId = getCurrentUserId()
+		if (!userId) return
+
+		const page = loadMore ? currentPage.value + 1 : 1
+		
+		let query = supa
+			.from('balance_records')
+			.select('*')
+			.eq('user_id', userId)
+			.order('created_at', { ascending: false })
+
+		// 根据过滤器筛选
+		if (activeFilter.value === 'income') {
+			query = query.gt('change_amount', 0)
+		} else if (activeFilter.value === 'expense') {
+			query = query.lt('change_amount', 0)
+		}
+
+		// 分页
+		query = query.range((page - 1) * pageSize.value, page * pageSize.value - 1)
+
+		const { data, error } = await query
+
+		if (error !== null) {
+			console.error('加载交易记录失败:', error)
+			return
+		}
+
+		const newTransactions = data || []
+
+		if (loadMore) {
+			transactions.value.push(...newTransactions)
+			currentPage.value = page
+		} else {
+			transactions.value = newTransactions
+			currentPage.value = 1
+		}
+
+		hasMore.value = newTransactions.length === pageSize.value
+	} catch (err) {
+		console.error('加载交易记录异常:', err)
+	} finally {
+		isLoading.value = false
+	}
+}
+
+// 获取当前用户ID
+const getCurrentUserId = (): string => {
+	const userStore = uni.getStorageSync('userInfo')
+	return userStore?.id || ''
+}
+
+// 获取交易图标
+const getTransactionIcon = (type: string): string => {
+	const icons: Record<string, string> = {
+		recharge: '💳',
+		consume: '🛒',
+		withdraw: '🏦',
+		refund: '🔄',
+		reward: '🎁',
+		income: '💰',
+		expense: '📤'
+	}
+	return icons[type] || '💰'
+}
+
+// 获取交易标题
+const getTransactionTitle = (type: string): string => {
+	const titles: Record<string, string> = {
+		recharge: '账户充值',
+		consume: '商品消费',
+		withdraw: '余额提现',
+		refund: '订单退款',
+		reward: '活动奖励',
+		income: '收入',
+		expense: '支出'
+	}
+	return titles[type] || '交易'
+}
+
+// 格式化时间
+const formatTime = (timeStr: string): string => {
+	const date = new Date(timeStr)
+	const month = (date.getMonth() + 1).toString().padStart(2, '0')
+	const day = date.getDate().toString().padStart(2, '0')
+	const hours = date.getHours().toString().padStart(2, '0')
+	const minutes = date.getMinutes().toString().padStart(2, '0')
+	return `${month}-${day} ${hours}:${minutes}`
+}
+
+// 显示更多操作
+const showMoreActions = () => {
+	uni.showActionSheet({
+		itemList: ['交易记录', '安全设置', '帮助中心'],
+		success: (res) => {
+			switch (res.tapIndex) {
+				case 0:
+					// 交易记录已经在当前页
+					break
+				case 1:
+					uni.navigateTo({
+						url: '/pages/mall/consumer/settings'
+					})
+					break
+				case 2:
+					uni.navigateTo({
+						url: '/pages/info/help'
+					})
+					break
+			}
+		}
+	})
+}
+
+// 充值
+const recharge = () => {
+	showRechargePopup.value = true
+	rechargeAmount.value = ''
+}
+
+// 提现
+const withdraw = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/withdraw'
+	})
+}
+
+// 跳转到优惠券
+const goToCoupons = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/coupons'
+	})
+}
+
+// 跳转到红包
+const goToRedPackets = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/red-packets'
+	})
+}
+
+// 跳转到积分
+const goToPoints = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/points'
+	})
+}
+
+// 跳转到银行卡
+const goToBankCards = () => {
+	uni.navigateTo({
+		url: '/pages/mall/consumer/bank-cards'
+	})
+}
+
+// 切换过滤器
+const changeFilter = (filter: string) => {
+	activeFilter.value = filter
+}
+
+// 加载更多
+const loadMore = () => {
+	if (hasMore.value && !isLoading.value) {
+		loadTransactions(true)
+	}
+}
+
+// 选择快捷金额
+const selectQuickAmount = (amount: number) => {
+	rechargeAmount.value = amount.toString()
+}
+
+// 确认充值
+const confirmRecharge = async () => {
+	if (!canRecharge.value) return
+
+	const amount = parseFloat(rechargeAmount.value)
+	if (isNaN(amount)) return
+
+	// 这里应该跳转到支付页面进行充值
+	uni.navigateTo({
+		url: `/pages/mall/consumer/payment?type=recharge&amount=${amount}`
+	})
+	
+	closeRechargePopup()
+}
+
+// 关闭充值弹窗
+const closeRechargePopup = () => {
+	showRechargePopup.value = false
+	rechargeAmount.value = ''
+}
+
+// 返回
+const goBack = () => {
+	uni.navigateBack()
+}
+</script>
+
+<style scoped>
+/* 响应式布局优化 */
+@media screen and (min-width: 768px) {
+	.wallet-content {
+		padding: 20px;
+		background-color: #f5f5f5;
+	}
+
+	.balance-overview {
+		border-radius: 12px;
+		margin-bottom: 20px;
+		max-width: 800px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+
+	.assets-stats, .quick-actions, .transactions-section, .security-tips {
+		border-radius: 8px;
+		margin-bottom: 20px;
+		max-width: 800px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+
+	.popup-content {
+		width: 400px;
+		left: 50%;
+		bottom: 50%;
+		transform: translate(-50%, 50%);
+		border-radius: 15px;
+	}
+}
+
+@media screen and (min-width: 1024px) {
+	.wallet-page {
+		flex-direction: row; /* 大屏下改为横向布局 */
+	}
+
+	.wallet-header {
+		display: none; /* 大屏下隐藏顶部栏 */
+	}
+	
+	.wallet-content {
+		width: 100%;
+		max-width: 1000px;
+		margin: 0 auto;
+	}
+}
+
+.wallet-page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.wallet-header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	font-size: 24px;
+	color: #333333;
+	padding: 5px;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.more-btn {
+	color: #333333;
+	font-size: 20px;
+	padding: 5px;
+}
+
+.wallet-content {
+	flex: 1;
+}
+
+.balance-overview {
+	background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+	padding: 30px 20px;
+	color: #ffffff;
+}
+
+.balance-label {
+	display: block;
+	font-size: 14px;
+	opacity: 0.9;
+	margin-bottom: 10px;
+	text-align: center;
+}
+
+.balance-value {
+	display: block;
+	font-size: 36px;
+	font-weight: bold;
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+.balance-actions {
+	display: flex;
+	gap: 20px;
+}
+
+.action-btn {
+	flex: 1;
+	height: 40px;
+	border-radius: 20px;
+	font-size: 14px;
+	font-weight: bold;
+	border: none;
+}
+
+.action-btn.recharge {
+	background-color: #ffffff;
+	color: #667eea;
+}
+
+.action-btn.withdraw {
+	background-color: rgba(255, 255, 255, 0.2);
+	color: #ffffff;
+	border: 1px solid rgba(255, 255, 255, 0.5);
+}
+
+.assets-stats {
+	background-color: #ffffff;
+	padding: 20px;
+	display: flex;
+	justify-content: space-between;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.stat-item {
+	flex: 1;
+	text-align: center;
+}
+
+.stat-label {
+	display: block;
+	font-size: 12px;
+	color: #666666;
+	margin-bottom: 8px;
+}
+
+.stat-value {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.quick-actions {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 20px;
+}
+
+.action-grid {
+	display: flex;
+	justify-content: space-between;
+}
+
+.action-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.action-icon {
+	font-size: 28px;
+	margin-bottom: 8px;
+}
+
+.action-text {
+	font-size: 12px;
+	color: #666666;
+}
+
+.transactions-section {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 15px;
+}
+
+.section-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+}
+
+.section-title {
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.filter-tabs {
+	display: flex;
+	gap: 15px;
+}
+
+.filter-tab {
+	font-size: 14px;
+	color: #666666;
+	padding: 5px 0;
+	position: relative;
+}
+
+.filter-tab.active {
+	color: #007aff;
+	font-weight: bold;
+}
+
+.filter-tab.active::after {
+	content: '';
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 2px;
+	background-color: #007aff;
+}
+
+.empty-transactions {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 40px 20px;
+}
+
+.empty-icon {
+	font-size: 60px;
+	margin-bottom: 20px;
+}
+
+.empty-text {
+	font-size: 16px;
+	color: #666666;
+	margin-bottom: 10px;
+}
+
+.empty-subtext {
+	font-size: 14px;
+	color: #999999;
+}
+
+.transactions-list {
+	display: flex;
+	flex-direction: column;
+}
+
+.transaction-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	padding: 15px 0;
+	border-bottom: 1px solid #f5f5f5;
+}
+
+.transaction-item:last-child {
+	border-bottom: none;
+}
+
+.transaction-left {
+	display: flex;
+	align-items: flex-start;
+}
+
+.transaction-icon {
+	font-size: 24px;
+	margin-right: 15px;
+}
+
+.transaction-info {
+	display: flex;
+	flex-direction: column;
+}
+
+.transaction-title {
+	font-size: 14px;
+	color: #333333;
+	font-weight: bold;
+	margin-bottom: 5px;
+}
+
+.transaction-time {
+	font-size: 12px;
+	color: #999999;
+	margin-bottom: 3px;
+}
+
+.transaction-remark {
+	font-size: 12px;
+	color: #666666;
+}
+
+.transaction-right {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+}
+
+.transaction-amount {
+	font-size: 16px;
+	font-weight: bold;
+	margin-bottom: 5px;
+}
+
+.transaction-amount.income {
+	color: #4caf50;
+}
+
+.transaction-amount.expense {
+	color: #333333;
+}
+
+.transaction-balance {
+	font-size: 12px;
+	color: #999999;
+}
+
+.loading-more,
+.no-more {
+	padding: 20px;
+	text-align: center;
+}
+
+.loading-text,
+.no-more-text {
+	color: #999999;
+	font-size: 14px;
+}
+
+.security-tips {
+	background-color: #ffffff;
+	margin-top: 10px;
+	padding: 20px;
+}
+
+.tip-title {
+	display: block;
+	font-size: 16px;
+	font-weight: bold;
+	color: #333333;
+	margin-bottom: 15px;
+}
+
+.tip-item {
+	display: block;
+	font-size: 12px;
+	color: #666666;
+	line-height: 1.6;
+	margin-bottom: 8px;
+}
+
+.tip-item:last-child {
+	margin-bottom: 0;
+}
+
+.recharge-popup {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 999;
+}
+
+.popup-mask {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+.popup-content {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+	padding: 20px;
+}
+
+.popup-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 20px;
+	padding-bottom: 15px;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.popup-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.popup-close {
+	font-size: 24px;
+	color: #999999;
+	padding: 5px;
+}
+
+.popup-body {
+	margin-bottom: 20px;
+}
+
+.amount-label {
+	display: block;
+	font-size: 14px;
+	color: #333333;
+	margin-bottom: 10px;
+}
+
+.amount-input {
+	display: flex;
+	align-items: center;
+	margin-bottom: 20px;
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+}
+
+.currency-symbol {
+	font-size: 20px;
+	color: #333333;
+	margin-right: 10px;
+}
+
+.amount-field {
+	flex: 1;
+	font-size: 24px;
+	font-weight: bold;
+	color: #333333;
+}
+
+.quick-amounts {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	margin-bottom: 15px;
+}
+
+.quick-amount {
+	padding: 8px 15px;
+	border: 1px solid #e5e5e5;
+	border-radius: 15px;
+	font-size: 14px;
+	color: #333333;
+}
+
+.quick-amount.active {
+	background-color: #007aff;
+	color: #ffffff;
+	border-color: #007aff;
+}
+
+.recharge-tip {
+	display: block;
+	font-size: 12px;
+	color: #999999;
+}
+
+.popup-footer {
+	display: flex;
+	gap: 15px;
+}
+
+.cancel-btn,
+.confirm-btn {
+	flex: 1;
+	height: 45px;
+	border-radius: 22.5px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+}
+
+.cancel-btn {
+	background-color: #f5f5f5;
+	color: #666666;
+}
+
+.confirm-btn {
+	background-color: #007aff;
+	color: #ffffff;
+}
+
+.confirm-btn.disabled {
+	background-color: #cccccc;
+	opacity: 0.6;
+}
+</style>
\ No newline at end of file
diff --git a/pages/sense/senseDataService.uts b/pages/sense/senseDataService.uts
index f12f19eb..298bc552 100644
--- a/pages/sense/senseDataService.uts
+++ b/pages/sense/senseDataService.uts
@@ -1,4 +1,4 @@
-import supa, { supaReady } from '@/components/supadb/aksupainstance.uts'
+import { supabase, ensureSupabaseReady } from '@/components/supadb/aksupainstance.uts'
 import type { DeviceInfo, DeviceParams } from './types.uts'
 
 // 服务响应类型
@@ -17,8 +17,8 @@ export class SenseDataService {
 	 */
 	static async getDevices(params: DeviceParams): Promise<ServiceResponse<Array<DeviceInfo>>> {
 		try {
-			await supaReady
-			const res = await supa.from(SenseDataService.TABLE_NAME)
+			await ensureSupabaseReady()
+			const res = await supabase.from(SenseDataService.TABLE_NAME)
 				.select('*', {})
 				.eq('user_id', params.user_id)
 				.execute()
@@ -46,8 +46,8 @@ export class SenseDataService {
 	 */
 	static async bindDevice(deviceData: UTSJSONObject): Promise<ServiceResponse<DeviceInfo>> {
 		try {
-			await supaReady
-			const res = await supa.from(SenseDataService.TABLE_NAME)
+			await ensureSupabaseReady()
+			const res = await supabase.from(SenseDataService.TABLE_NAME)
 				.insert(deviceData)
 				.select('*', {})
 				.single()
@@ -75,8 +75,8 @@ export class SenseDataService {
 	 */
 	static async unbindDevice(deviceId: string): Promise<ServiceResponse<null>> {
 		try {
-			await supaReady
-			const res = await supa.from(SenseDataService.TABLE_NAME)
+			await ensureSupabaseReady()
+			const res = await supabase.from(SenseDataService.TABLE_NAME)
 				.delete()
 				.eq('id', deviceId)
 				.execute()
@@ -102,8 +102,8 @@ export class SenseDataService {
 	 */
 	static async updateDevice(deviceId: string, configData: UTSJSONObject): Promise<ServiceResponse<DeviceInfo>> {
 		try {
-			await supaReady
-			const res = await supa.from(SenseDataService.TABLE_NAME)
+			await ensureSupabaseReady()
+			const res = await supabase.from(SenseDataService.TABLE_NAME)
 				.update(configData)
 				.eq('id', deviceId)
 				.select('*', {})
diff --git a/static/images/default-banner.png b/static/images/default-banner.png
new file mode 100644
index 00000000..e69de29b
diff --git a/static/images/default-product.png b/static/images/default-product.png
new file mode 100644
index 00000000..e69de29b
diff --git a/types/mall-types - 副本.uts b/types/mall-types - 副本.uts
new file mode 100644
index 00000000..b4722d09
--- /dev/null
+++ b/types/mall-types - 副本.uts	
@@ -0,0 +1,365 @@
+// 电商商城系统类型定义 - UTS Android 兼容
+
+// 用户类型
+export type UserType = {
+	id: string
+	phone: string
+	email: string | null
+	nickname: string | null
+	avatar_url: string | null
+	gender: number
+	user_type: number
+	status: number
+	created_at: string
+}
+
+// 商城用户扩展信息类型
+export type MallUserProfileType = {
+	id: string
+	user_id: string
+	user_type: number
+	status: number
+	real_name: string | null
+	id_card: string | null
+	credit_score: number
+	mall_role: string
+	verification_status: number
+	verification_data: UTSJSONObject | null
+	business_license: string | null
+	shop_category: string | null
+	service_areas: UTSJSONObject | null
+	emergency_contact: string | null
+	preferences: UTSJSONObject | null
+	created_at: string
+	updated_at: string
+}
+
+// 用户地址类型
+export type UserAddressType = {
+	id: string
+	user_id: string
+	receiver_name: string
+	receiver_phone: string
+	province: string
+	city: string
+	district: string
+	address_detail: string
+	postal_code: string | null
+	is_default: boolean
+	label: string | null
+	coordinates: string | null
+	delivery_instructions: string | null
+	business_hours: string | null
+	status: number
+	created_at: string
+	updated_at: string
+}
+
+// 商家类型
+export type MerchantType = {
+	id: string
+	user_id: string
+	shop_name: string
+	shop_logo: string | null
+	shop_banner: string | null
+	shop_description: string | null
+	contact_name: string
+	contact_phone: string
+	shop_status: number
+	rating: number
+	total_sales: number
+	created_at: string
+}
+
+// 商品类型
+export type ProductType = {
+	id: string
+	merchant_id: string
+	category_id: string
+	name: string
+	description: string | null
+	images: Array<string>
+	price: number
+	original_price: number | null
+	stock: number
+	sales: number
+	status: number
+	created_at: string
+}
+
+// 商品SKU类型
+export type ProductSkuType = {
+	id: string
+	product_id: string
+	sku_code: string
+	specifications: UTSJSONObject | null
+	price: number
+	stock: number
+	image_url: string | null
+	status: number
+}
+
+// 购物车类型
+export type CartItemType = {
+	id: string
+	user_id: string
+	product_id: string
+	sku_id: string
+	quantity: number
+	selected: boolean
+	product: ProductType | null
+	sku: ProductSkuType | null
+}
+
+// 订单类型
+export type OrderType = {
+	id: string
+	order_no: string
+	user_id: string
+	merchant_id: string
+	status: number
+	total_amount: number
+	discount_amount: number
+	delivery_fee: number
+	actual_amount: number
+	payment_method: number | null
+	payment_status: number
+	delivery_address: UTSJSONObject
+	created_at: string
+}
+
+// 订单商品类型
+export type OrderItemType = {
+	id: string
+	order_id: string
+	product_id: string
+	sku_id: string
+	product_name: string
+	sku_specifications: UTSJSONObject | null
+	price: number
+	quantity: number
+	total_amount: number
+}
+
+// 配送员类型
+export type DeliveryDriverType = {
+	id: string
+	user_id: string
+	real_name: string
+	id_card: string
+	driver_license: string | null
+	vehicle_type: number
+	vehicle_number: string | null
+	work_status: number
+	current_location: UTSJSONObject | null
+	service_areas: Array<string>
+	rating: number
+	total_orders: number
+	auth_status: number
+	created_at: string
+	updated_at: string
+}
+
+// 配送任务类型
+export type DeliveryTaskType = {
+	id: string
+	order_id: string
+	driver_id: string | null
+	pickup_address: UTSJSONObject
+	delivery_address: UTSJSONObject
+	distance: number | null
+	estimated_time: number | null
+	delivery_fee: number
+	status: number
+	pickup_time: string | null
+	delivered_time: string | null
+	delivery_code: string | null
+	remark: string | null
+	created_at: string
+	updated_at: string
+}
+
+// 优惠券模板类型
+export type CouponTemplateType = {
+	id: string
+	name: string
+	description: string | null
+	coupon_type: number
+	discount_type: number
+	discount_value: number
+	min_order_amount: number
+	max_discount_amount: number | null
+	total_quantity: number | null
+	per_user_limit: number
+	usage_limit: number
+	merchant_id: string | null
+	category_ids: Array<string>
+	product_ids: Array<string>
+	user_type_limit: number | null
+	start_time: string
+	end_time: string
+	status: number
+	created_at: string
+}
+
+// 用户优惠券类型
+export type UserCouponType = {
+	id: string
+	user_id: string
+	template_id: string
+	coupon_code: string
+	status: number
+	used_at: string | null
+	order_id: string | null
+	received_at: string
+	expire_at: string
+}
+
+// 分页数据类型
+export type PageDataType<T> = {
+	data: Array<T>
+	total: number
+	page: number
+	pageSize: number
+	hasMore: boolean
+}
+
+// API响应类型
+export type ApiResponseType<T> = {
+	success: boolean
+	data: T | null
+	message: string
+	code: number
+}
+
+// 订单状态枚举
+export const ORDER_STATUS = {
+	PENDING_PAYMENT: 1,
+	PAID: 2,
+	SHIPPED: 3,
+	DELIVERED: 4,
+	COMPLETED: 5,
+	CANCELLED: 6,
+	REFUNDING: 7,
+	REFUNDED: 8
+} as const
+
+// 优惠券类型枚举
+export const COUPON_TYPE = {
+	DISCOUNT_AMOUNT: 1, // 满减券
+	DISCOUNT_PERCENT: 2, // 折扣券
+	FREE_SHIPPING: 3, // 免运费券
+	NEWBIE: 4, // 新人券
+	MEMBER: 5, // 会员券
+	CATEGORY: 6, // 品类券
+	MERCHANT: 7, // 商家券
+	LIMITED_TIME: 8 // 限时券
+} as const
+
+// 支付方式枚举
+export const PAYMENT_METHOD = {
+	WECHAT: 1,
+	ALIPAY: 2,
+	UNIONPAY: 3,
+	BALANCE: 4
+} as const
+
+// 配送状态枚举
+export const DELIVERY_STATUS = {
+	PENDING: 1,
+	ASSIGNED: 2,
+	PICKED_UP: 3,
+	IN_TRANSIT: 4,
+	DELIVERED: 5,
+	FAILED: 6
+} as const
+
+// 用户类型枚举
+export const MALL_USER_TYPE = {
+	CONSUMER: 1, // 消费者
+	MERCHANT: 2, // 商家
+	DELIVERY: 3, // 配送员
+	SERVICE: 4, // 客服
+	ADMIN: 5 // 管理员
+} as const
+
+// 用户状态枚举
+export const USER_STATUS = {
+	NORMAL: 1, // 正常
+	FROZEN: 2, // 冻结
+	CANCELLED: 3, // 注销
+	PENDING: 4 // 待审核
+} as const
+
+// 认证状态枚举
+export const VERIFICATION_STATUS = {
+	UNVERIFIED: 0, // 未认证
+	VERIFIED: 1, // 已认证
+	FAILED: 2 // 认证失败
+} as const
+
+// 地址标签枚举
+export const ADDRESS_LABEL = {
+	HOME: 'home', // 家
+	OFFICE: 'office', // 公司
+	SCHOOL: 'school', // 学校
+	OTHER: 'other' // 其他
+} as const
+
+// 收藏类型枚举
+export const FAVORITE_TYPE = {
+	PRODUCT: 'product', // 商品
+	SHOP: 'shop' // 店铺
+} as const
+
+// =========================
+// 订阅相关类型与枚举
+// =========================
+
+// 订阅周期枚举
+export const SUBSCRIPTION_PERIOD = {
+	MONTHLY: 'monthly',
+	YEARLY: 'yearly'
+} as const
+
+// 订阅状态枚举
+export const SUBSCRIPTION_STATUS = {
+	TRIAL: 'trial',
+	ACTIVE: 'active',
+	PAST_DUE: 'past_due',
+	CANCELED: 'canceled',
+	EXPIRED: 'expired'
+} as const
+
+// 软件订阅方案类型
+export type SubscriptionPlanType = {
+	id: string
+	plan_code: string
+	name: string
+	description: string | null
+	features: UTSJSONObject | null // { featureKey: description }
+	price: number // 单位：元（或分，取决于后端；前端以显示为准）
+	currency: string | null // 'CNY' | 'USD' ...
+	billing_period: keyof typeof SUBSCRIPTION_PERIOD | string // 'monthly' | 'yearly'
+	trial_days: number | null
+	is_active: boolean
+	sort_order?: number | null
+	created_at?: string
+	updated_at?: string
+}
+
+// 用户订阅记录类型
+export type UserSubscriptionType = {
+	id: string
+	user_id: string
+	plan_id: string
+	status: keyof typeof SUBSCRIPTION_STATUS | string
+	start_date: string
+	end_date: string | null
+	next_billing_date: string | null
+	auto_renew: boolean
+	cancel_at_period_end?: boolean | null
+	metadata?: UTSJSONObject | null
+	created_at?: string
+	updated_at?: string
+}
diff --git a/types/mall-types.uts b/types/mall-types.uts
index b4722d09..6a54f7ee 100644
--- a/types/mall-types.uts
+++ b/types/mall-types.uts
@@ -363,3 +363,99 @@ export type UserSubscriptionType = {
 	created_at?: string
 	updated_at?: string
 }
+export interface Product {
+    id: string
+    name: string
+    description: string | null  // 允许null
+    price: number
+    original_price: number | null  // 允许null
+    images: string[]
+    // ... 其他属性
+}
+// types/mall-types.uts
+export interface ProductType {
+    id: string
+    name: string
+    description: string
+    price: number
+    original_price: number
+    images: string[]
+    category_id: string
+    status: number
+    stock: number
+    sales: number
+    tags: string[]
+    created_at: string
+    updated_at: string
+}
+
+export interface CategoryType {
+    id: string
+    name: string
+    icon_url: string
+    parent_id: string | null
+    is_active: boolean
+    sort_order: number
+}
+
+export interface BannerType {
+    id: string
+    title: string
+    image_url: string
+    link_url: string
+    sort_order: number
+    status: number
+}
+
+export interface CouponTemplateType {
+    id: string
+    name: string
+    discount_value: number
+    min_order_amount: number
+    start_time: string
+    end_time: string
+    status: number
+    per_user_limit: number
+}
+
+export interface CartItemType {
+    id: string
+    user_id: string
+    product_id: string
+    quantity: number
+    created_at: string
+}
+
+// Mock 数据类型
+export interface MockData {
+    banners: BannerType[]
+    categories: CategoryType[]
+    coupons: CouponTemplateType[]
+    products: ProductType[]
+}
+
+// 用户基础信息类型 (兼容 pages/user/types.uts)
+export type UserProfile = {
+  id?: string;
+  username: string;
+  email: string;
+  gender?: string;
+  birthday?: string;
+  height_cm?: number;
+  weight_kg?: number;
+  bio?: string;
+  avatar_url?: string;
+  preferred_language?: string;
+  role?: string;
+  school_id?: string;
+  grade_id?: string;
+  class_id?: string;
+  created_at?: string;
+  updated_at?: string;
+}
+
+export type UserStats = {
+  trainings: number;
+  points: number;
+  streak: number;
+}
diff --git a/unpackage/cache/.app-android/tsc/app-android/.tsbuildInfo b/unpackage/cache/.app-android/tsc/app-android/.tsbuildInfo
new file mode 100644
index 00000000..b644120c
--- /dev/null
+++ b/unpackage/cache/.app-android/tsc/app-android/.tsbuildInfo
@@ -0,0 +1 @@
+{"program":{"fileNames":["d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/boolean.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/console.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/date.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/error.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/json.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/map.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/math.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/number.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/regexp.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/set.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/string.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/timers.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/utsjsonobject.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/arraybuffer.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/float32array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/float64array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/int8array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/int16array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/int32array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/uint8array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/uint8clampedarray.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/uint16array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/uint32array.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/dataview.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/iterable.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/common/common.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/shims.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es5.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2015.collection.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2015.promise.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2015.symbol.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2015.symbol.wellknown.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2015.iterable.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2018.asynciterable.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2018.asyncgenerator.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2018.promise.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/lib.es2020.symbol.wellknown.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/shims/index.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uts/index.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/hbuilder-x/hbuilderx.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/hbuilder-x/index.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/@vue/shared/dist/shared.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/@vue/reactivity/dist/reactivity.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/@vue/runtime-core/dist/runtime-core.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/@vue/global.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/vue.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/shims/common.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/shims/app-android.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/app-android/utsactivitycallback.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/app-android/utsandroid.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/app-android/utsandroidhookproxy.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/app-js/utsjs.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uts-types/app-android/index.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/worker.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/webviewstyles.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/viewtotempfilepathoptions.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/drawablecontext.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/snapshotoptions.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/cssstyledeclaration.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/domrect.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unicallbackwrapper.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/path2d.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/canvasrenderingcontext2d.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unianimationplaybackevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unianimation.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unisafeareainsets.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unipage.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitextlayout.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/iunielement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unievent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unipageevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewservicemessageevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unicustomevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewmessageevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewloadingevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewloadevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewerrorevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/nodedata.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/pagenode.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unielement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewdownloadevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniwebviewcontentheightchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/univideoelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitouchevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitextarealinechangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitextareafocusevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitextareablurevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitextelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitabselement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unitabtapevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniswipertransitionevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniswiperchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniswiperanimationfinishevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unistopnestedscrollevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unistartnestedscrollevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniscrolltoupperevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniscrolltolowerevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniscrollevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unirichtextitemclickevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniresizeobserver.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniresizeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unirefresherevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniprovider.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unipointerevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unipagescrollevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unidocument.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/asyncapiresult.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/iunierror.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unierror.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/nativeloadfontfaceoptions.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unipagebody.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uninativepage.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unipagemanager.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uninestedprescrollevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uninativeapp.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniinputkeyboardheightchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniinputfocusevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniinputevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniinputconfirmevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniinputchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniinputblurevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniimageloadevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniimageerrorevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniformcontrol.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniformcontrolelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unicustomelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/unicanvaselement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/sourceerror.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/uniaggregateerror.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/utsandroidhookproxy.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/iuninativeviewelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/iuniform.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/inavigationbar.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/index.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/native/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/checkboxgroupchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/pickerviewchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/progressactiveendevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/radiogroupchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/sliderchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/switchchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/pickerchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/pickercolumnchangeevent.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/uninavigatorelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/uniclouddbelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/uniformelement.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/lifecycle.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/index.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vue/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/base/index.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/env/index.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-actionsheet/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-actionsheet/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-addphonecontact/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-addphonecontact/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-arraybuffertobase64/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-arraybuffertobase64/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-authentication/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-authentication/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-barcode-scanning/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-barcode-scanning/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-base64toarraybuffer/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-base64toarraybuffer/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-chooselocation/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-chooselocation/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-choosemedia/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-choosemedia/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-clipboard/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-clipboard/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createinneraudiocontext/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createinneraudiocontext/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createintersectionobserver/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createintersectionobserver/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createrequestpermissionlistener/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createrequestpermissionlistener/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createselectorquery/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createselectorquery/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createwebviewcontext/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createwebviewcontext/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createworker/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-createworker/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-dialogpage/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-dialogpage/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-event/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-event/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-exit/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-exit/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-file/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-file/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-filesystemmanager/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-filesystemmanager/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getaccessibilityinfo/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getaccessibilityinfo/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getappauthorizesetting/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getappauthorizesetting/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getappbaseinfo/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getappbaseinfo/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getbackgroundaudiomanager/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getbackgroundaudiomanager/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getdeviceinfo/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getdeviceinfo/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getelementbyid/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getelementbyid/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getenteroptionssync/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getenteroptionssync/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getlaunchoptionssync/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getlaunchoptionssync/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getlocation-tencent-uni1/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getlocation-tencent-uni1/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getnetworktype/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getnetworktype/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getperformance/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getperformance/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getprovider/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getprovider/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getsysteminfo/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getsysteminfo/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getsystemsetting/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-getsystemsetting/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-installapk/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-installapk/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-interceptor/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-interceptor/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-keyboard/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-keyboard/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-loadfontface/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-loadfontface/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-location-system/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-location-system/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-location-tencent/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-location-tencent/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-location/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-location/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-makephonecall/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-makephonecall/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-media/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-media/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-modal/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-modal/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-navigationbar/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-navigationbar/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-network/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-network/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-oauth-huawei/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-oauth-huawei/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-oauth-weixin/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-oauth-weixin/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-oauth/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-oauth/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-openappauthorizesetting/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-openappauthorizesetting/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-opendocument/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-opendocument/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-pagescrollto/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-pagescrollto/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment-alipay/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment-alipay/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment-huawei/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment-huawei/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment-wxpay/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment-wxpay/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-payment/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-previewimage/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-previewimage/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-privacy/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-privacy/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-prompt/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-prompt/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-pulldownrefresh/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-pulldownrefresh/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-recorder/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-recorder/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-requestmerchanttransfer/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-requestmerchanttransfer/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-route/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-route/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-rpx2px/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-rpx2px/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-scancode/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-scancode/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-screenbrightness/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-screenbrightness/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-share-weixin/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-share-weixin/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-share/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-share/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-sharewithsystem/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-sharewithsystem/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-sse/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-sse/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-storage/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-storage/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-tabbar/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-tabbar/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-theme/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-theme/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-virtualpayment/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-virtualpayment/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-websocket/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/lib/uni-websocket/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-api/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-ad/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-ad/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-crash/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-crash/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-facialverify/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-facialverify/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-live-player/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-live-player/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-live-pusher/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-live-pusher/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-map-tencent/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-map-tencent/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-fcm/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-fcm/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-gp/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-gp/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-hms/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-hms/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-honor/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-honor/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-mainland/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-mainland/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-meizu/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-meizu/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-oppo/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-oppo/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-vivo/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-vivo/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-xiaomi/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push-xiaomi/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-push/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-secure-network/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-secure-network/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-verify/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/lib/uni-verify/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-biz/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/lib/uni-camera/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/lib/uni-camera/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/lib/uni-canvas/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/lib/uni-canvas/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/lib/uni-video/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/lib/uni-video/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-component/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-openlocation/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-openlocation/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-compass/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-compass/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-canvas/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-canvas/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-locale/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-locale/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-accelerometer/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-accelerometer/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-memory/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-memory/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-preloadpage/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-preloadpage/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-createmediaqueryobserver/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-createmediaqueryobserver/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-__f__/utssdk/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/lib/uni-__f__/utssdk/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uts-plugin-extend/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uni-map-tencent-map.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uni-map-tencent-global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uni-camera.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/uni-camera-global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni/global.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni-cloud/unicloud-db/index.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni-cloud/interface.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/uni-cloud/index.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/common.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/app.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/page.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/process.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/vite.d.ts","d:/exe/hbuilderx/plugins/hbuilderx-language-services/builtin-dts/uniappx/node_modules/@dcloudio/uni-app-x/types/index.d.ts","d:/exe/hbuilderx/plugins/uniapp-uts-v1/node_modules/@dcloudio/uni-uts-v1/lib/uts/types/uni-x/app-android.d.ts","d:/exe/hbuilderx/plugins/uniapp-cli-vite/node_modules/@dcloudio/uni-console/src/runtime/app/socket.ts","d:/exe/hbuilderx/plugins/uniapp-cli-vite/node_modules/@dcloudio/uni-console/src/runtime/app/index.ts","../../../../dist/dev/.tsc/app-android/app.uvue.ts","../../../../dist/dev/.tsc/app-android/uni_modules/i18n/index.uts.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/index.uvue.ts","../../../../dist/dev/.tsc/app-android/types/mall-types.uts.ts","../../../../dist/dev/.tsc/app-android/uni_modules/ak-req/interface.uts.ts","../../../../dist/dev/.tsc/app-android/uni_modules/ak-req/ak-req.uts.ts","../../../../dist/dev/.tsc/app-android/uni_modules/ak-req/index.uts.ts","../../../../dist/dev/.tsc/app-android/utils/utils.uts.ts","../../../../dist/dev/.tsc/app-android/components/supadb/aksupa.uts.ts","../../../../dist/dev/.tsc/app-android/ak/config.uts.ts","../../../../dist/dev/.tsc/app-android/components/supadb/aksupainstance.uts.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/category.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/search.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/product-detail.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/cart.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/orders.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/order-detail.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/address.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/address-edit.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/coupons.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/favorites.uvue.ts","../../../../dist/dev/.tsc/app-android/pages/mall/consumer/profile.uvue.ts","../../../../dist/dev/.tsc/app-android/main.uts.ts"],"fileInfos":[{"version":"6e80ad2ee01e6eea8837f649d0b91002724ec74cef9b3d2b5fda718b14fc6ec9","affectsGlobalScope":true},{"version":"87e0a7f9366dc80be7b72c6d0a6e23c4f68cd2b96c90edd3da8082bfdd237af9","affectsGlobalScope":true},{"version":"2c44751aff2b2161d0450df9812bb5114ba050a522e1d5fa67f66649d678fcb4","affectsGlobalScope":true},{"version":"68566331a40bef8710069a7f5ac951543c5653c1c3fa8cc3a54c95753abbcf7a","affectsGlobalScope":true},{"version":"173b34be3df2099c2da11fb3ceecf87e883bd64f5219c0ee7bc6add9bc812cde","affectsGlobalScope":true},{"version":"9c867cbb4270f3c93a0ffaa8840b3034033a95025cd4f6bf9989ecb7b7c54a4e","affectsGlobalScope":true},{"version":"6d41c5eb02906006bad04d0ba26eafc1b10c433760b9209f4dbb7af1b8231071","affectsGlobalScope":true},{"version":"7b435c510e94d33c438626dff7d8df57d20d69f6599ba461c46fc87b8c572bce","affectsGlobalScope":true},{"version":"25f08344cf6121c92864c9f22b22ab6574001771eb1d75843006938c11f7d4ab","affectsGlobalScope":true},{"version":"f955119e78143380da1b952b56ab8ca46e10776d17e0a748678729086b0fae49","affectsGlobalScope":true},{"version":"b15b894ea3a5bcdfd96e2160e10f71ea6db8563804bbaa4cdf3b86a21c7e7da0","affectsGlobalScope":true},{"version":"db491a26fb6bb04dd6c9aecbe3803dd94c1e5d3dd839ffed552ffaf4e419871a","affectsGlobalScope":true},{"version":"463cb70eebbf68046eba623ed570e54c425ea29d46d7476da84134722a6d155b","affectsGlobalScope":true},{"version":"a7cca769cf6ecd24d991ae00ac9715b012cae512f27d569513eb2e47fc8ef952","affectsGlobalScope":true},{"version":"d27811b28326ce496b3a0810a4b38d9391e929b150d9d8b881a562c9c9d666c0","affectsGlobalScope":true},{"version":"0aca09a3a690438ac20a824d8236bfdb84e4035724e77073c7f144b18339ec65","affectsGlobalScope":true},{"version":"0f844aa90d79ff631b051f5ee8540a8936d48c39914c910e89e7b7949bbac865","affectsGlobalScope":true},{"version":"0fbf8b372e8d8349a3b5a1f470bb7897272bb43aa88066e50dce25fde261cd93","affectsGlobalScope":true},{"version":"0ef38eeb51b042d85f64103ec93a37ba8683a31c22fdfd76c69852e982aa08c6","affectsGlobalScope":true},{"version":"9652d98559378167cb1f4eb57e51119e4fef5861d18c5928c6bae207b80adfe3","affectsGlobalScope":true},{"version":"7c1cfb70557e907294946a14c5eba189f77d5e9dfe7f02832ee5c6f3f34dc4d5","affectsGlobalScope":true},{"version":"baa7e3434cefa49e8965ea72a0c26fe056b2e9d978ac2bb3abd204fcd6c4fc0d","affectsGlobalScope":true},{"version":"aca5b50919b30253d6db79ecb92848d8dae72c7998df1454a19e21dd633a75b1","affectsGlobalScope":true},{"version":"016e96968aee1fb6804200c75a11e876371536a98e772cb55ffbf482ddbd8822","affectsGlobalScope":true},{"version":"4567cbd464d15226a40a5b3d671e20665aa070a2c4fa3f4682700f563f9ab730","affectsGlobalScope":true},{"version":"bfea9c54c2142652e7f2f09b7b395c57f3e7650fb2981d9f183de9eeae8a1487","affectsGlobalScope":true},{"version":"5b4344f074c83584664e93d170e99db772577f7ced22b73deaf3cfb798a76958","affectsGlobalScope":true},"db8eb85d3f5c85cc8b2b051fde29f227ec8fbe50fd53c0dc5fc7a35b0209de4a",{"version":"8b46e06cc0690b9a6bf177133da7a917969cacbd6a58c8b9b1a261abd33cb04d","affectsGlobalScope":true},{"version":"c2e5d9c9ebf7c1dc6e3f4de35ae66c635240fe1f90cccc58c88200a5aa4a227c","affectsGlobalScope":true},{"version":"c5277ad101105fbcb9e32c74cea42b2a3fbebc5b63d26ca5b0c900be136a7584","affectsGlobalScope":true},{"version":"46a47bc3acc0af133029fb44c0c25f102828995c1c633d141ac84240b68cdfad","affectsGlobalScope":true},{"version":"bf7e3cadb46cd342e77f1409a000ea51a26a336be4093ee1791288e990f3dadf","affectsGlobalScope":true},{"version":"3fb65674722f36d0cc143a1eb3f44b3ab9ecd8d5e09febcfbc0393bec72c16b5","affectsGlobalScope":true},{"version":"daf924aae59d404ac5e4b21d9a8b817b2118452e7eb2ec0c2c8494fb25cb4ab3","affectsGlobalScope":true},{"version":"120ddb03b09c36f2e2624563a384123d08f6243018e131e8c97a1bb1f0e73df5","affectsGlobalScope":true},{"version":"0daef79ef17e2d10a96f021096f6c02d51a0648514f39def46c9a8a3018196be","affectsGlobalScope":true},{"version":"571605fec3d26fc2b8fbffb6aa32d2ef810b06aa51c1b0c3c65bbc47bd5b4a5e","affectsGlobalScope":true},{"version":"51536e45c08d8b901d596d8d48db9ab14f2a2fd465ed5e2a18dda1d1bae6fe5a","affectsGlobalScope":true},"897a4b80718f9228e992483fefa164d61e78548e57fbf23c76557f9e9805285e","ab2680cfdaea321773953b64ec757510297477ad349307e93b883f0813e2a744",{"version":"8a931e7299563cecc9c06d5b0b656dca721af7339b37c7b4168e41b63b7cfd04","affectsGlobalScope":true},"7da94064e1304209e28b08779b3e1a9d2e939cf9b736c9c450bc2596521c417f","7cce3fa83b9b8cad28998e2ffa7bb802841bb843f83164ba12342b51bf3ae453","dc44a5ac4c9a05feede6d8acf7e6e768ca266b1ce56030af1a3ab4138234bf45",{"version":"451f4c4dd94dd827770739cc52e3c65ac6c3154ad35ae34ad066de2a664b727a","affectsGlobalScope":true},{"version":"2f2af0034204cd7e4e6fc0c8d7a732152c055e030f1590abea84af9127e0ed46","affectsGlobalScope":true},{"version":"0c26e42734c9bf81c50813761fc91dc16a0682e4faa8944c218f4aaf73d74acf","affectsGlobalScope":true},{"version":"af11b7631baab8e9159d290632eb6d5aa2f44e08c34b5ea5dc3ac45493fffed5","affectsGlobalScope":true},{"version":"9ae2c80b25e85af48286ea185227d52786555ac3b556b304afd2226866a43e2a","affectsGlobalScope":true},"25120cc5b77f87056bb13b0c01a05168d6485323d5972feca20cea124a4f618f",{"version":"397fe1ca4ecca584df1b191b80066313ba83e2120c8c6662511d1ae61c28a7eb","affectsGlobalScope":true},{"version":"fd45f5d7408b4ade5b812478e612b59801d371e4b8e467cf1b1aca46acd1564a","affectsGlobalScope":true},{"version":"b9241ecb5024beeaeb98fb558000dbc55e650576e572d194508f52807af6bcba","affectsGlobalScope":true},"3039ca5b4c980b09439c8b8962ea05552573fd995304d31957d47e01a6bca5ab","2e5ac0dd461b94010e16057c26d281841e3a935df927d76123b6864880086a26","b911176e7778c30f6549f86daae0353c53730eb0ee59b6476f1072cb51ab1af3","f8cc7ac396a3ea99a6959ddbaf883388260e035721216e5971af17db61f11f0b","895bedc6daf4f0da611480f24f65df818ea9e01404e4bf5927043dbf4eeed4d1","ea4facc7918e50e285a4419f7bc7ffdf978385899a3cf19ef7d7b782b896616d","8db893a4613484d4036337ffea6a5b675624518ad34597a8df255379802001ab","5828081db18ff2832ce9c56cc87f192bcc4df6378a03318775a40a775a824623","33b7db19877cf2f9306524371fcfc45dcb6436c8e905472ede7346c9f044bf20","b8eb76852bc6e72782541a2725580b1c3df02a0c96db570b0a7681567aeed598","6a7b38162c0cff2af6d2cbd4a98cfac6c0ea4fb1b5700c42f648de9b8c2e8e1f","19828d5df3be9b94598e5c25d783b936fcccaa226a2820bacee9ea94dc8aff2f","5d45955831c840d09b502ce6726a06435866b4736978e235a7d817ed45990df7","3bdf7ca46ef934ee671b3dd0e3d4cddcaecfe6146811b330743acdfb8e60f36c","70dab20ce12f8d153044fc487f2bfd40d21fc64329446f02c6a94b9759c13265","c1eed15acf77bbaa4a4840edbdcf70ff2f3c2a0f5af498578ce020e2f2c73f7f","71943244e9813364dac70c5be97fdce7bc775c96bb212d97a60ba072344dcbbc","6f1fa6fc9b169b165be0d8550a3ca0b5181af0c41e4e1e15f5e6bcb2a6e1c344","e311e90ded1cd037cbece1bc6649eaa7b65f4346c94ae81ba5441a8f9df93fa3","8eb08fff3569e1b9eddb72e9541a21e9a88b0c069945e8618e9bc75074048249","d596c650714d80a93a2fe15dce31ed9a77c2f2b1b9f4540684eaf271f05e2691","8f9fb9a9d72997c334ca96106095da778555f81ac31f1d2a9534d187b94e8bf6","aea632713de6ee4a86e99873486c807d3104c2bf704acef8d9c2567d0d073301","1adb14a91196aa7104b1f3d108533771182dc7aaea5d636921bc0f812cfee5f5","8d90bb23d4e2a4708dbf507b721c1a63f3abd12d836e22e418011a5f37767665","8cb0d02bb611ea5e97884deb11d6177eb919f52703f0e8060d4f190c97bb3f6c","78880fa8d163b58c156843fda943cc029c80fac5fb769724125db8e884dce32d","7856bc6f351d5439a07d4b23950aa060ea972fd98cbc5add0ad94bfc815f4c4c","ce379fb42f8ba7812c2cb88b5a4d2d94c5c75f31c31e25d10073e38b8758bd62","9d3db8aef76e0766621b93a1144069623346b9cfccf538b67859141a9793d16d","13fb62b7b7affaf711211d4e0c57e9e29d87165561971cc55cda29e7f765c44f","8868c445f34ee81895103fd83307eadbe213cfb53bbc5cd0e7f063e4214c49b0","277990f7c3f5cbbf2abd201df1d68b0001ff6f024d75ca874d55c2c58dd6e179","a31dfa9913def0386f7b538677c519094e4db7ce12db36d4d80a89891ef1a48f","f4c0c7ee2e447f369b8768deed1e4dd40b338f7af33b6cc15c77c44ff68f572d","2f268bd768d2b35871af601db7f640c9e6a7a2364de2fd83177158e0f7b454dc","73bfa99afd564cfef641ccb4fdef0debdb3c49f0a817085d68fc6b6508266f09","a004a3b60f23fcfb36d04221b4bef155e11fd57293ba4f1c020a220fadf0fc85","4e145e72e5600a49fa27282d63bb9715b19343d8826f91be0f324af73bc25322","62f734f7517d2ca3bf02abddaf8abf7e3de258667a63e8258373658bbb9153b6","df99236666c99f3e5c22c886fc4dba8156fed038057f7f56c4c39a0c363cc66a","b4bce232891b663cc0768f737f595a83de80b74671db22b137570ef2dc6b86ef","781b566c3eccba1a2cafbb827fb6fc02d5147c89a40e11c7892057481a195270","c9befaf90879c27ee3f7f12afd15b4531fbbea9ec37d145b83807a67d9f55c82","8630f26d1038328e6b9da9c082f6fa911903bc638499baa6cfab002b5a70af96","73474d70a9b4f02771119085c4cd7562be4169e7973544c9541341ca2931aa3d","54da497c3b3b94fae91a66ed222e21411dc595a17f9e6bd229e233d0de732691","803da2f4e024efa2edc55c67d35c5240e7ae599baf9263b453acd02127a582e9","b8b070df71250096699ad55a106d161d403347ed335f72c5ae8485e5d858524d","a9716557f56781aef13d6d3c5dafc61236f64bfd48d462c4848a7eca25f924ff","3d15b5e24065431bf7831b8e84000c0e767d921135af86ef0b0c034f14df5d8f","a563202fc316d8926dc83759cec155d5c028a7828996cbd283470ac7e8c58727","e5c004f39619ebaaa2475b18e949e12e51ff629132f48d56608081e5f0195577","e6b7a14eb53f023f455f4513b6a560f004fa1ebf6cc298b479be796541e322e6","771bf8091a4e40be8f539648b5a0ff7ecba8f46e72fc16acc10466c4c1304524","cb66d1c49ad20e7246b73671f59acaaaac72c58b7e37faae69ae366fd6adf1d3","e5c1c52655dc3f8400a3406fd9da0c4888e6b28c29de33bee51f9eaeda290b4d","1e28ee6d718080b750621e18befe236487df6685b37c17958520aaf777b7aeff","8891345dbe1920b9ed3f446a87de27b5cd6b2053112f6ff3975a661f9a03ec34","a72e21b05b937630b97b1d36bb76b879bb243a021516aef10701775f2da7f872","4debe398f42800c1359d60396fc76aa4fa34a23a96b597672b5c284fd81c0158","a720d8028d38f2b94855967789252c6148957dcd24e280d193b78db00eb3a099","1b0818297187a33e2c24c39145b409e11624523d32364edc22bceaf1f4c86f1b","332e362ba8bd05237c661ba685b2c37e9cde5e0876cb81bf515d15623bdee74c","84648722d2b1f16c55cb68dbfaf18b913a13a78274641f7236eeb4d7088f6db8","f63d313c2673117608b3ed762ac07f618ee873bee3764406b06bcfcb5a713afe","2e2a2a0f7ef2a7587cfe40a96dbca31e8badb15a8a42bf042fe7a63abc9e2f27","2bb32fb3f0fe14c48170dcad3d2a501c1883516d4da9cbd0a2043d90c9789a7b","352532af4d27bdf545d9bb20f0c55758138327404bd86f0934edc7ded76be7e6","64d93f4a24f8a70b64658a7d9b9e96bd46ad498ad5dc9cdb9d52da547e77ff68","8a728de3047a1dadcb69595e74c3d75bc80a2c8165f8cf875ab610042a137fbe","3eafed0be4b194295bcde379e7d083779d0f27f31b715738a3beac49547dc613","7e74740cb7a937af187118ae4582fbe5d4d30b34e9cddec2bd7f7a865e7824ca","8cdf90b59995b9f7c728a28e7af5dc4431f08f3346e6c16af49f548461a3e0aa","1d472b3eedeeaab5418ea6563734fffc68c404feac91900633e7126bee346590","6cf7182d798892394143549a7b27ed27f7bcf1bf058535ec21cc03f39904bfb3","abe524377702be43d1600db4a5a940da5c68949e7ac034c4092851c235c38803","daf4418239ceadb20481bff0111fe102ee0f6f40daaa4ee1fdaca6d582906a26","8a5c5bc61338c6f2476eb98799459fd8c0c7a0fc20cbcd559bb016021da98111","644cf9d778fa319c8044aed7eeb05a3adb81a1a5b8372fdc9980fbdd6a61f78e","d2c6adc44948dbfdece6673941547b0454748e2846bb1bcba900ee06f782b01d","d80b7e2287ee54b23fe6698cb4e09b1dabc8e1a90fb368e301ac6fbc9ad412e2","60b678d3c92834151ca6701c399c74c961193c06cc9d97da32cc4ad22ee5951e",{"version":"c7eebbc98b3e28df60899db055f0b1940295e6c68173e1859b97c062e02e00cf","affectsGlobalScope":true},"816f825b072afd246eb3905cf51528d65e6fe51c12a1f8fb370c93bb0e031c9b","f6a64974d6fab49d27f8b31578a08662b9a7f607de3b5ec2d7c45b3466d914fd","a8e9d24cd3dc3bd95b34eb6edeac7525b7fdbe23b373554bdc3e91572b8079ee","1d5fd841722ce9aa05b9d602153c15914108bdaa8154bdd24eddadb8a3df586c","14788c10b66324b98feee7a2567eb30d1066e11506e54bf1215b369d70da4932","316785de2c0af9fbd9f2191904670e880bc3836671dd306236675515e481973a","070d805e34c4b9a7ce184aabb7da77dc60f2bdb662349cf7fc23a2a69d17de8d","092deae5b432b6b04f8b4951f1478c08862e832abd4477315dba6ea0c39f1d9e","27d668b912bf3fd0a4ddf3886a8b405eed97505fdc78a9f0b708f38e3e51655d","72654e8bed98873e19827d9a661b419dfd695dbc89fd2bb20f7609e3d16ebd50","66bdb366b92004ba3bf97df0502b68010f244174ee27f8c344d0f62cb2ac8f1e","ae41e04ff8c248ab719fe7958754e8d517add8f1c7abcc8d50214fd67c14194d","558008ff2f788e594beaa626dfcfb8d65db138f0236b2295a6140e80f7abd5d2",{"version":"6573e49f0f35a2fd56fd0bb27e8d949834b98a9298473f45e947553447dd3158","affectsGlobalScope":true},{"version":"e04ea44fae6ce4dc40d15b76c9a96c846425fff7cc11abce7a00b6b7367cbf65","affectsGlobalScope":true},{"version":"7526edb97536a6bba861f8c28f4d3ddd68ddd36b474ee6f4a4d3e7531211c25d","affectsGlobalScope":true},"3c499fc4aad3185e54006bdb0bd853f7dd780c61e805ab4a01a704fa40a3f778",{"version":"13f46aaf5530eb680aeebb990d0efc9b8be6e8de3b0e8e7e0419a4962c01ac55","affectsGlobalScope":true},"17477b7b77632178ce46a2fce7c66f4f0a117aa6ef8f4d4d92d3368c729403c9",{"version":"700d5c16f91eb843726008060aebf1a79902bd89bf6c032173ad8e59504bc7ea","affectsGlobalScope":true},"169c322c713a62556aedbf3f1c3c5cf91c84ce57846a4f3b5de53f245149ec7b",{"version":"b0b314030907c0badf21a107290223e97fe114f11d5e1deceea6f16cabd53745","affectsGlobalScope":true},"7c6c5a958a0425679b5068a8f0cc8951b42eb0571fee5d6187855a17fa03d08a",{"version":"f659d54aa3496515d87ff35cd8205d160ca9d5a6eaf2965e69c4df2fa7270c2c","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"4a4d7982941daaeb02f730f07578bce156d2c7cabfa184099321ed8b1e51591b",{"version":"cc8e57cfe18cd11c3bab5157ec583cfe5d75eefefe4b9682e54b0055bf86159f","affectsGlobalScope":true},"75f6112942f6aba10b3e2de5371ec8d40a9ab9ab05c8eb8f98a7e8e9f220c8a2",{"version":"8a3b75fccc93851209da864abe53d968629fab3125981b6f47008ec63061eb39","affectsGlobalScope":true},"4aafdcfff990abfe7feb894446ab43d2268657084ba656222e9b873d2845fe3c",{"version":"d6f55de9010fbefe991546d35da3f09ae0e47afae754cb8a4c867fd7e50dcec0","affectsGlobalScope":true},"afac637a8547d41243dd8c4824c202c9d024534c5031181a81dece1281f1e261",{"version":"1ce2f82236ecdd61ff4e476c96d83ce37d9f2a80601a627fe1d3048e8648f43c","affectsGlobalScope":true},"42d908b851ddcf6df729c0a2ae56f151bad6610ea368729d68f0c8fbbd779913",{"version":"592e99b73ae40c0e64ce44b3e28cea3d7149864f2f3cbc6ccb71f784373ade97","affectsGlobalScope":true},"fa601c3ce9e69927d13e178fdcb6b70a489bb20c5ca1459add96e652dbdefcf6",{"version":"8f8ebce0e991de85323524170fad48f0f29e473b6dd0166118e2c2c3ba52f9d6","affectsGlobalScope":true},"e58a369a59a067b5ee3990d7e7ed6e2ce846d82133fb5c62503b8c86427421a4",{"version":"f877e78f5304ec3e183666aab8d5a1c42c3a617ff616d27e88cc6e0307641beb","affectsGlobalScope":true},"82a66c8db63050ce22777862d6dc095b5e74f80f56e3a2631870d7ee8d104c9e",{"version":"4fc0006f46461bb20aac98aed6c0263c1836ef5e1bbf1ca268db4258ed6a965e","affectsGlobalScope":true},"e086e212ddb5de48f83d971e892949a9ed5ada7134b3116f17768b6885bce6f3",{"version":"867954bf7772a2979c5c722ef216e432d0d8442e995e6018e89a159e08d5d183","affectsGlobalScope":true},"6cc643a497641f28562d8a24b3bd6c4252f3476b462ea406f3123ae70be343ce",{"version":"cd8a7e7d61af5ca34b39095ab24bdcb308bfd4ab379df8ef9d53ce9fa83187a8","affectsGlobalScope":true},"9e837aadb58587a9f79d1ba6a1625cfe40e4077c6bc89cd1c1d5886a2d2489cc",{"version":"544f8c58d5e1b386997f5ae49c6a0453b10bd9c7034c5de51317c8ac8ea82e9a","affectsGlobalScope":true},"2382c18dddfe93b455dfaccc5e6ad795cc33ba8a6a72de41622ef03dd27e377f",{"version":"ae9b62dd72bf086ccc808ba2e0d626d7d086281328fc2cf47030fd48b5eb7b16","affectsGlobalScope":true},"b03e600a48c41adfad25cda292a2bcd87963f7fce09f3561978482f9f6530fc4",{"version":"cc1bddca46e3993a368c85e6a3a37f143320b1c13e5bfe198186d7ed21205606","affectsGlobalScope":true},"34cb99d3f4d6e60c5776445e927c460158639eeb8fd480e181943e93685e1166",{"version":"c77843976650a6b19c00ed2ede800f57517b3895b2437d01efc623f576ef1473","affectsGlobalScope":true},"c8db20febc70a33fc8668c2f6475c42be345a0545f6bd719f787b62e60d8f49e",{"version":"5ebba285fdef0037c21fcbef6caad0e6cc9a36550a33b59f55f2d8d5746fc9b2","affectsGlobalScope":true},"85397e8169bdc706449ae59a849719349ecef1e26eef3e651a54bb2cc5ba8d65",{"version":"2b8dc33e6e5b898a5bca6ae330cd29307f718dca241f6a2789785a0ddfaa0895","affectsGlobalScope":true},"cc2c766993dfe7a58134ab3cacd2ef900ace4dec870d7b3805bf06c2a68928bd",{"version":"dde8acfb7dd736b0d71c8657f1be28325fea52b48f8bdb7a03c700347a0e3504","affectsGlobalScope":true},"96c711d561eaa29cec567f90571ea515f91412bb005ac2a4538bcadf0e439fa5",{"version":"34c9c31b78d5b5ef568a565e11232decf3134f772325e7cd0e2128d0144ff1e5","affectsGlobalScope":true},"7e72ce64e021f6f43c8743682a3c7cf2035166f8283ca675a4589e1bd8a63e55",{"version":"60cc5b4f0a18127b33f8202d0d0fde56bc5699f4da1764b62ed770da2d5d44f1","affectsGlobalScope":true},"5da9bade8fea62743220d554e24489ea6aa46596e94e67cfff19b95804a54a5f",{"version":"d11fa2d42f762954eb4a07a0ab16b0a46aa6faf7b239f6cd1a8f5a38cb08edcd","affectsGlobalScope":true},"87daa4e406afddcea17302b85e08a2de9444fe561347cd1572ffa671c0171552",{"version":"781afd67249e2733eb65511694e19cdcdb3af496e5d8cdee0a80eba63557ff6e","affectsGlobalScope":true},"6b32428a82779c0a33356f537ec131882935bc76ad0371722618a9ac6403cca0",{"version":"f3275e1f0e5852b1a50fd3669f6ad8e6e04db94693bcfb97d31851e63f8e301e","affectsGlobalScope":true},"de82ff7892200413e9e0c54b038d87099de9d74a9e815b3cb6e9908f950f6ccd",{"version":"8a6ecff784dafbdb121906a61009670121882523b646338196099d4f3b5761d8","affectsGlobalScope":true},"1d5f5827fdeb0d59f76a1ee6caf0804d5d3c260e60e465b0b62baea333199e62",{"version":"256bdff4c082d9f4e2303138f64c152c6bd7b9dbca3be565095b3f3d51e2ab36","affectsGlobalScope":true},"0b14c87ea4887402356f7c8b321dfd944880ae76cd703e342c57ac7a83de4465",{"version":"e214a2a7769955cd4d4c29b74044036e4af6dca4ab9aaa2ed69286fcdf5d23b3","affectsGlobalScope":true},"85647ff695641f7f2fdf511385d441fec76ee47b2ed3edb338f3d6701bf86059",{"version":"25659b24ac2917dbfcbb61577d73077d819bd235e3e7112c76a16de8818c5fd6","affectsGlobalScope":true},"d6f83ae805f5842baa481a110e50ca8dbed0b631e0fd197b721de91dd6948d77",{"version":"7402e6ca4224d9c8cdd742afd0b656470ea6a5efe2229644418198715bb4b557","affectsGlobalScope":true},"36b19abb9d0a0e6809f9493786fe73c3058f66f0a5778554b30bd09d6d21d3d8",{"version":"242b00f3d86b322df41ed0bbea60ad286c033ac08d643b71989213403abcdf8a","affectsGlobalScope":true},"009a83d5af0027c9ab394c09b87ba6b4ca88a77aa695814ead6e765ea9c7a7cd",{"version":"4dc6e0aeb511a3538b6d6d13540496f06911941013643d81430075074634a375","affectsGlobalScope":true},"3a9312d5650fcbaf5888d260ac21bc800cc19cc5cc93867877dfeb9bbd53e2ca",{"version":"7ed57d9cb47c621d4ef4d4d11791fec970237884ff9ef7e806be86b2662343e8","affectsGlobalScope":true},"3bee2291e79f793251dcbea6b2692f84891c8c6508d97d89e95e66f26d136d37",{"version":"5bd49ff5317b8099b386eb154d5f72eca807889a354bcee0dc23bdcd8154d224","affectsGlobalScope":true},"1d5156bc15078b5ae9a798c122c436ce40692d0b29d41b4dc5e6452119a76c0e",{"version":"bd449d8024fc6b067af5eac1e0feb830406f244b4c126f2c17e453091d4b1cb3","affectsGlobalScope":true},"b6ce2b60910be81d4f2000ffe0bdbec408d6423196f6ad00db2a467cd53d676b",{"version":"dd5eab3bb4d13ecb8e4fdc930a58bc0dfd4825c5df8d4377524d01c7dc1380c5","affectsGlobalScope":true},"f011eacef91387abfde6dc4c363d7ffa3ce8ffc472bcbaeaba51b789f28bd1ef",{"version":"ceae66bbecbf62f0069b9514fae6da818974efb6a2d1c76ba5f1b58117c7e32e","affectsGlobalScope":true},"4101e45f397e911ce02ba7eceb8df6a8bd12bef625831e32df6af6deaf445350",{"version":"07a772cc9e01a1014a626275025b8af79535011420daa48a8b32bfe44588609c","affectsGlobalScope":true},"6d0790ee42e40b27183db10ce3be3f0e98dc3944d73c9a4c092bf5ec3bb184f7",{"version":"5be6cb715e042708f5ec2375975ba7a855f54d3554cf8970cd49d0434ad5c235","affectsGlobalScope":true},"02fbf1f4aabb776e2cf229fd74840a27eee5a08642b8ca0677e680a8427d6d12",{"version":"4d13cccdda804f10cecab5e99408e4108f5db47c2ad85845c838b8c0d4552e13","affectsGlobalScope":true},"780abc69f1e0ed0a3ed43cfaf201378faf6e8d8ec13354ed7169159cdeead3b9",{"version":"7ced457d6288fcb2fa3b64ddcaba92dbe7c539cc494ad303f64fc0a2ab72157d","affectsGlobalScope":true},"5d2721c49e058b8f28e495a54f709a004571cd3f57a62df63ed3eddb9e860af1",{"version":"0ccde5fc989806345b5ecca397796e26bbbca2882297adea57009022be7a300a","affectsGlobalScope":true},"730592593eaba845555f4d8f602d8c066972c97a3a8522a0c6f8f721e36bdc90",{"version":"725128203f84341790bab6555e2c343db6e1108161f69d7650a96b141a3153be","affectsGlobalScope":true},"e6ed9d8801e5fddc1a4260510e4266fbf80d5767cf2b9a6cbe8d0eb39d45971d",{"version":"947bf6ad14731368d6d6c25d87a9858e7437a183a99f1b67a8f1850f41f8cedd","affectsGlobalScope":true},"8eda6e4644c03f941c57061e33cef31cfde1503caadb095d0eb60704f573adee",{"version":"0538a53133eebb69d3007755def262464317adcf2ce95f1648482a0550ffc854","affectsGlobalScope":true},"a1dd4d1eada136ec8afb47871da02c1a28be6adc81717106ded5fcdd6548835c",{"version":"8d3ccb8e37673a205fb24f1a3ce7bc9237d32be05494c240245e3a783dd8e16d","affectsGlobalScope":true},"92492e2b8992cc1d68eca60f289ce9fa29dda1eb4d12eed577bcdb958666754b",{"version":"d155bad43ed0facccf039f4220d5d07fbafab34d9b1405e30d213d1ab36af590","affectsGlobalScope":true},"4a5259be4d6c85a4cd49745fb1d29d510a4a855e84261ad77d0df8585808292c",{"version":"220f860f55d18691bedf54ba7df667e0f1a7f0eed11485622111478b0ab46517","affectsGlobalScope":true},"3bee701deb7e118ea775daf8355be548d8b87ddf705fe575120a14dcace0468a",{"version":"9c473a989218576ad80b55ea7f75c6a265e20b67872a04acb9fb347a0c48b1a0","affectsGlobalScope":true},"5f666c585bb469b58187b892ed6dfb1ebf4aa84464b8d383b1f6defc0abe5ae0",{"version":"20b41a2f0d37e930d7b52095422bea2090ab08f9b8fcdce269518fd9f8c59a21","affectsGlobalScope":true},"dbac1f0434cde478156c9cbf705a28efca34759c45e618af88eff368dd09721d",{"version":"0f864a43fa6819d8659e94d861cecf2317b43a35af2a344bd552bb3407d7f7ec","affectsGlobalScope":true},"855391e91f3f1d3e5ff0677dbd7354861f33a264dc9bcd6814be9eec3c75dc96",{"version":"ebb2f05e6d17d9c9aa635e2befe083da4be0b8a62e47e7cc7992c20055fac4f0","affectsGlobalScope":true},"aee945b0aace269d555904ab638d1e6c377ce2ad35ab1b6a82f481a26ef84330",{"version":"9fb8ef1b9085ff4d56739d826dc889a75d1fefa08f6081f360bff66ac8dd6c8d","affectsGlobalScope":true},"342fd04a625dc76a10b4dea5ffee92d59e252d968dc99eb49ce9ed07e87a49d0",{"version":"e1425c8355feaaca104f9d816dce78025aa46b81945726fb398b97530eee6b71","affectsGlobalScope":true},"c000363e096f8d47779728ebba1a8e19a5c9ad4c54dbde8729eafc7e75eee8dc",{"version":"42c6b2370c371581bfa91568611dae8d640c5d64939a460c99d311a918729332","affectsGlobalScope":true},"590155b280f2902ebb42a991e9f4817ddf6558e5eb197deb3a693f5e0fc79bd9",{"version":"867b000c7a948de02761982c138124ad05344d5f8cb5a7bf087e45f60ff38e7c","affectsGlobalScope":true},"6f1d28967ec27ef5d244770ac80a62b66f10439aea63ed52e0604a18aad6468c",{"version":"02c22afdab9f51039e120327499536ac95e56803ceb6db68e55ad8751d25f599","affectsGlobalScope":true},"aba5fbfef4b20028806dac5702f876b902a6ba04e3c5b79760b62fc268c1bc80",{"version":"37129ad43dd9666177894b0f3ce63bba752dc3577a916aa7fe2baa105f863de3","affectsGlobalScope":true},"68526c897cd9e129d21f982679011d64068eac52cc437fce5e48bc78670356f3",{"version":"31f709dc6793c847f5768128e46c00813c8270f7efdb2a67b19edceb0d11f353","affectsGlobalScope":true},"eee3c05152eff43e7a9555abbef7d8710bfdb404511432599e8ac63ae761c46c",{"version":"018847821d07559c56b0709a12e6ffaa0d93170e73c60ee9f108211d8a71ec97","affectsGlobalScope":true},"b50322892db37ef61b48411c989f4cd36b3f41205ad10e7c03f14afade571256",{"version":"7832e8fe1841bee70f9a5c04943c5af1b1d4040ac6ff43472aeb1d43c692a957","affectsGlobalScope":true},"9f2282aa955832e76be86172346dc00c903ea14daf99dd273e3ec562d9a90882",{"version":"013853836ed002be194bc921b75e49246d15c44f72e9409273d4f78f2053fc8f","affectsGlobalScope":true},"0e9a7364eaf09801cbb8cf0118441d5f7f011fc0060c60191587526c448974c4",{"version":"e08392a815b5a4a729d5f8628e3ed0d2402f83ed76b20c1bf551d454f59d3d16","affectsGlobalScope":true},"6a7f172fb4524b4091b793d0e2cccdb365876dcf7f056552a93fbf6c2c1d64d9",{"version":"c3dfd6032ba0bc68520b99fc40cb45f46c73f4c98dedcde79b181f1f0632c262","affectsGlobalScope":true},"261f0f336c13435274021ab058138312b2443bd61723de6acbc4e57a8cecf349",{"version":"5768572c8e94e5e604730716ac9ffe4e6abecbc6720930f067f5b799538f7991","affectsGlobalScope":true},"198075277aef627743ef66a469881addbbf2f6c4c508ffb4c96de94137ca8563",{"version":"e2ae8c8fcfb98fae10647c9159915deea2073bdfcc3fe99b5846fd9563867399","affectsGlobalScope":true},"d0984177c1dc95545541f477fb0df1fb76e7454a943c98ed208dc0da2ff096b2",{"version":"f366ca25885ab7c99fc71a54843420be31df1469f8556c37d24f72e4037cb601","affectsGlobalScope":true},"a05b412a93ba43d2d6e9c81718dea87a42c7e4f9e8b1efbaafee03a94eaf4b7a",{"version":"163cc945edad3584b23de3879dbad7b538d4de3a6c51cc28ae4115caee70ce21","affectsGlobalScope":true},"4fefff4da619ba238fccd45484e9ee84ee1ae89152eac9e64d0f1e871911121c",{"version":"d604893d4e88daade0087033797bbafc2916c66a6908da92e37c67f0bad608db","affectsGlobalScope":true},"56ce2cd3aa0ebbcf161faed36a9d119e5ff6f962993f1af29b826eff1801bad3",{"version":"dc265f24d2ddad98f081eb76d1a25acfb29e18f569899b75f40b99865a5d9e3b","affectsGlobalScope":true},"7c1538394a43ce6d7b7c471b87cc97c487bc3bff37fdd2fc5f659c67445a3a03",{"version":"dd7f9be1c6c69fbf3304bc0ae81584e6cd17ab6ad4ab69cb8b06f541318cc97e","affectsGlobalScope":true},"f528ce3ce9430376705b10ee52296d36b83871b2b39a8ae3ecec542fc4361928",{"version":"41ffc155348dd4993bc58ee901923f5ade9f44bc3b4d5da14012a8ded17c0edd","affectsGlobalScope":true},"580eedb87f9ed40ff5fc619507e47c984a1e3fbf2fee8f5eecbe98806997d0ee",{"version":"3e8e0655ed5a570a77ea9c46df87eeca341eed30a19d111070cf6b55512694e8","affectsGlobalScope":true},"c1b3019eeb7120da76e837268ac26beea8dc0aa8d6108e286e9cfa9478af562b","6bb6fda2bba279010a8ffb5221fd28aed12d3d37ebc396a6e0f02840adb17970",{"version":"cc4c74d1c56e83aa22e2933bfabd9b0f9222aadc4b939c11f330c1ed6d6a52ca","affectsGlobalScope":true},"b0672e739a3d2875447236285ec9b3693a85f19d2f5017529e3692a3b158803d",{"version":"8a2e0eab2b49688f0a67d4da942f8fd4c208776631ba3f583f1b2de9dfebbe6c","affectsGlobalScope":true},"229648df48b149ecb40a267e69899456c28dbe4b31e64513be64eb2b58e29f1c",{"version":"f6266ada92f0c4e677eb3fbf88039a8779327370f499690bf9720d6f7ad5f199","affectsGlobalScope":true},"ab149c81ee4c7bb5fd0abea1057389185e334d5038c4c8739faa65ec5feb6ffc",{"version":"fb6cb8911a03c7ac61ee80aafdc072623850dd6a6d9fa0c98b015d8b181153a5","affectsGlobalScope":true},"8946ad9bc3d5c42cdb07de081480d869e358f5986166649a9e4230bea2ea84bd",{"version":"09a227ec52ef63acca2a3a1f31ca6d3affa45b51e18ffdf0036152d5f102dfd7","affectsGlobalScope":true},"c03bcada0b059d1f0e83cabf6e8ca6ba0bfe3dece1641e9f80b29b8f6c9bcede",{"version":"f2eac49e9caa2240956e525024bf37132eae37ac50e66f6c9f3d6294a54c654c","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"a0ad84c717107c133f77f15b344d62633863931d4b3592de20c232ded129c50b",{"version":"7373a173ea1b42648b1779267a5a707eb403ccc31a16761870dbf0660eb234ee","affectsGlobalScope":true},"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",{"version":"f3e7a4075f7edc952560ec2254b453bfc8496d78e034768052347e088537694b","affectsGlobalScope":true},"ace629691abf97429c0afef8112cc0c070189ff2d12caee88e8913bdd2aaad25",{"version":"99a71914dd3eb5d2f037f80c3e13ba3caff0c3247d89a3f61a7493663c41b7ea","affectsGlobalScope":true},"25a12a35aeee9c92a4d7516c6197037fc98eee0c7f1d4c53ef8180ffc82cb476",{"version":"b4646ac5ca017c2bb22a1120b4506855f1cef649979bf5a25edbead95a8ea866","affectsGlobalScope":true},"54d94aeec7e46e1dab62270c203f7907ca62e4aaa48c6cdcfed81d0cd4da08f3",{"version":"f9585ff1e49e800c03414267219537635369fe9d0886a84b88a905d4bcfff998","affectsGlobalScope":true},"483d29eb2d4b6c4d486f67b682a5d0ca2d4d452e09e6d43eee0f5ef0f4950aee","eaf540a66adaf590521596a4de7d2f86644aae59b5ef449b26d4b00ccfc13ba5",{"version":"1ff9449d1efdebef55b0ba13fe7f04b697c264e73ec05f41f7633dd057468b2d","affectsGlobalScope":true},"79792358436829ae510866561a6c62e37472108ae7a1836ba2b7136eba000bda",{"version":"7c160037704eee2460c7de4a60f3379da37180db9a196071290137286542b956","affectsGlobalScope":true},"87bdcea89ec013888b0fdb1694ce0cb4b8bf6b9f03f90429cbb4e00b510f838d",{"version":"4681d15a4d7642278bf103db7cd45cc5fe0e8bde5ea0d2be4d5948186a9f4851","affectsGlobalScope":true},"91eb719bcc811a5fb6af041cb0364ac0993591b5bf2f45580b4bb55ddfec41e2","05d7cf6a50e4262ca228218029301e1cdc4770633440293e06a822cb3b0ef923",{"version":"78402a74c2c1fc42b4d1ffbad45f2041327af5929222a264c44be2e23f26b76a","affectsGlobalScope":true},"cc93c43bc9895982441107582b3ecf8ab24a51d624c844a8c7333d2590c929e2",{"version":"c5d44fe7fb9b8f715327414c83fa0d335f703d3fe9f1045a047141bfd113caec","affectsGlobalScope":true},"f8b42b35100812c99430f7b8ce848cb630c33e35cc10db082e85c808c1757554",{"version":"ba28f83668cca1ad073188b0c2d86843f9e34f24c5279f2f7ba182ff051370a4","affectsGlobalScope":true},"349b276c58b9442936b049d5495e087aef7573ad9923d74c4fbb5690c2f42a2e",{"version":"ad8c67f8ddd4c3fcd5f3d90c3612f02b3e9479acafab240b651369292bb2b87a","affectsGlobalScope":true},"1954f24747d14471a5b42bd2ad022c563813a45a7d40ba172fc2e89f465503e2",{"version":"05bbb3d4f0f6ca8774de1a1cc8ba1267fffcc0dd4e9fc3c3478ee2f05824d75d","affectsGlobalScope":true},"37e69b0edd29cbe19be0685d44b180f7baf0bd74239f9ac42940f8a73f267e36",{"version":"afba2e7ffca47f1d37670963b0481eb35983a6e7d043c321b3cfa2723cab93c9","affectsGlobalScope":true},"bb146d5c2867f91eea113d7c91579da67d7d1e7e03eb48261fdbb0dfb0c04d36",{"version":"90b95d16bd0207bb5f6fedf65e5f6dba5a11910ce5b9ffc3955a902e5a8a8bd5","affectsGlobalScope":true},"3698fee6ae409b528a07581f542d5d69e588892f577e9ccdb32a4101e816e435",{"version":"26fc7c5e17d3bcc56ed060c8fb46c6afde9bc8b9dbf24f1c6bdfecca2228dac8","affectsGlobalScope":true},"46fd8192176411dac41055bdb1fdad11cfe58cdce62ccd68acff09391028d23f",{"version":"22791df15401d21a4d62fc958f3683e5edc9b5b727530c5475b766b363d87452","affectsGlobalScope":true},"150ac8ae1c4500f57f2af6e491717a8858a40619063164b1ad746d6a9ef30207","cefffd616954d7b8f99cba34f7b28e832a1712b4e05ac568812345d9ce779540",{"version":"a365952b62dfc98d143e8b12f6dcc848588c4a3a98a0ae5bf17cbd49ceb39791","affectsGlobalScope":true},"af0b1194c18e39526067d571da465fea6db530bca633d7f4b105c3953c7ee807",{"version":"b58e47c6ff296797df7cec7d3f64adef335e969e91d5643a427bf922218ce4ca","affectsGlobalScope":true},"76cbd2a57dc22777438abd25e19005b0c04e4c070adca8bbc54b2e0d038b9e79","4aaf6fd05956c617cc5083b7636da3c559e1062b1cadba1055882e037f57e94c","171ad16fb81daf3fd71d8637a9a1db19b8e97107922e8446d9b37e2fafd3d500",{"version":"d4ce8dfc241ebea15e02f240290653075986daf19cf176c3ce8393911773ac1b","affectsGlobalScope":true},{"version":"52cd0384675a9fa39b785398b899e825b4d8ef0baff718ec2dd331b686e56814","affectsGlobalScope":true},{"version":"58c2bb87fdf190100849a698042d09373be574e531758b1cfe3533258c3d4daa","affectsGlobalScope":true},{"version":"b8f8d5bc91f9618e50778e56f99e74f63dc08f7a91799379887d0fb3ff51fe5e","affectsGlobalScope":true},{"version":"769c459185e07f5b15c8d6ebc0e4fec7e7b584fd5c281f81324f79dd7a06e69c","affectsGlobalScope":true},{"version":"c947df743f2fd638bd995252d7883b54bfef0dbad641f085cc0223705dfd190e","affectsGlobalScope":true},"db78f3b8c08924f96c472319f34b5773daa85ff79faa217865dafef15ea57ffb","8ae46c432d6a66b15bce817f02d26231cf6e75d9690ae55e6a85278eb8242d21","ff5a16ce08431fae07230367d151e3c92aa6899bc9a05669492a51666f11ceb5","526904beb2843034196e50156b58a5001ba5b87c5bb4e7ec04f539e6819f204e","0b8e1d3772938c6cd08e5e1bc9f19eb60601430c62343e0901c075647abdcd3e","74c59e68a89102dd3d5a2c727f03b9adc3e9fa8fbb66b88b9ab3f7fd5fa13a3e","a99a2cd390004f1f4b4ebe8fc761a2275f1cbeac52ee22f022df3a97154548e5","28fc3a786cb2f37e8e033b43d21f8bb453d8ebf76783912c9013e7ebc558514c","4d311eabe35c4c1fe9b47d5e5f82e3c5467be90b34270fd71b3757bb5dbbe296","b13f4e6dc105d752b87d3f6c56dbe8d6a16bea452736c1700854416659a11c77","66500cbabdb5d98df1ea231c2e2c0e04f80cd68274d7824dec4918c57cdc12ed","bfc3139c8fabf7e817ecb0f7e1df3cb2913d11948134d65ac3c7a055326a25fc","a1df10158046f51bd2842160a981804ab4e0509078ad70c9028346bd55d5ac6d","9b89cce04ccf37e0192bb3a20c7db4210b74a45aa80af8732e7d527c18c22370","8be48c50bbc29c4beac1ccc8118f97a0677f5970c05785ec5abbdd84f50f9531","6dab8cd004d5f2a5793bf801fce762605a35c87700f3ee59c12a0365f640699e","21026840f47c8a768f5b0cb1f521932d58f001e2ac838440399a9670ffb68fc3","bdfb2bb6ab07f8729c4fce3f88d8282d6424697965936f579d766ca2b629a8d4","1942d702629dfaee32ea7979571cf7a06508cfaf8064d3398538012b99c01e5b","0686aec51cdae584ffe712843c5a87df8284ce1d8105998715c9347f1bfdb375","921bdb8483b8b1b4c04192068e34cc7d3b530db78504164e295baec8700675fe","8e32a26bcd5d7c9398bece4b9d6e1192e274e7a82bf7f60f797fbdd4347be22f","e5e52b296637db35275ddf433d01cebd57f752eceb347da89b249361cf8da821","d13e2c2a73d71d1d4674210ca41fbb959652926a8387714cd4e44ea77e0988d1","6619d030d1dd235f4ff7650464ccaa6f5a19d47c706b7d01e247d6a86cb6ae44","5b8f4df9bd6fb46c0696083274c7c14f732c58c21fea8ed4c7e33be21900bdc9","04982052767d225bb087130a7c5a4c9af6989617e3c1678920a46dc84dc55a8e"],"root":[383,408],"options":{"inlineSources":true,"module":99,"noEmitOnError":false,"noImplicitAny":false,"noImplicitThis":true,"outDir":"../../../../dist/dev/.uvue/app-android","rootDir":"../../../../dist/dev/.tsc/app-android","skipLibCheck":true,"sourceMap":true,"strict":true,"target":99,"tsBuildInfoFile":"./.tsbuildInfo","useDefineForClassFields":false},"fileIdsList":[[46,48,50,377,378,379],[138,152,373,376,378,379,380,381],[64,71],[137],[56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136],[59,60,61,62,63,65,67,69,70,72],[110],[71,75],[112],[131],[66],[72],[65,71,82],[71,80],[59,60,61,62,63,67,71,72,80,81],[111],[71],[80,81,82,127],[63,72,113,116],[58,63,68,73,80,108,109,113,114],[68,71],[115],[73],[62,71],[71,72],[71,82],[70,71,80,81,82],[75],[46,48,50,69,377,378],[375],[374],[153,154,305,342,349,368,370,372],[371],[369],[156,158,160,162,164,166,168,170,172,174,176,178,180,182,184,186,188,190,192,194,196,198,200,202,204,206,208,210,212,214,216,218,220,222,224,226,228,230,232,234,236,238,240,242,244,246,248,250,252,254,256,258,260,262,264,266,268,270,272,274,276,278,280,282,284,286,288,290,292,294,296,298,300,302,304],[155],[157],[159],[161],[165],[167],[169],[171],[173],[175],[177],[179],[181],[183],[185],[187],[189],[191],[193],[195],[197],[199],[201],[203],[205],[207],[209],[211],[213],[215],[217],[219],[221],[223],[225],[227],[229],[231],[233],[235],[237],[239],[241],[243],[245],[247],[249],[251],[253],[255],[257],[259],[261],[263],[265],[267],[269],[271],[273],[275],[277],[279],[281],[283],[285],[287],[289],[291],[293],[295],[297],[299],[301],[303],[307,309,311,313,315,317,319,321,323,325,327,329,331,333,335,337,339,341],[306],[308],[310],[312],[314],[316],[332],[336],[338],[340],[344,346,348],[343],[345],[347],[351,353,355,357,359,361,363,365,367],[366],[358],[354],[352],[364],[356],[360],[350],[362],[75,82],[151],[139,140,141,142,143,144,145,146,147,148,149,150],[82],[75,82,135],[51,52,53,54],[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27],[384],[46,48,50,378,379],[44],[44,45,46,48],[41,48,49,50],[42],[41,46,48,378,379],[45,46,47,50,378,379],[29,30,31,32,33,34,35,36,37,38,39],[33],[36],[33,35],[392,393],[394,395],[46,48,50,378,379,385,386,387,388,397,398,399,400,401,402,403,404,405,406,407],[46,48,50,378,379,396],[46,48,50,378,379,389,396],[389],[390],[390,391],[387]],"referencedMap":[[378,1],[382,2],[65,3],[138,4],[137,5],[71,6],[111,7],[134,8],[113,9],[132,10],[67,11],[66,12],[130,13],[75,12],[109,14],[82,15],[112,16],[72,17],[128,18],[126,12],[125,12],[124,12],[123,12],[122,12],[121,12],[120,12],[119,12],[118,19],[115,20],[117,12],[69,21],[73,12],[116,22],[108,23],[107,12],[105,12],[104,12],[103,24],[102,12],[101,12],[100,12],[99,12],[98,25],[97,12],[96,12],[95,12],[94,12],[92,26],[93,12],[90,12],[89,12],[88,12],[91,27],[87,12],[86,17],[85,28],[84,28],[83,26],[79,28],[78,28],[77,28],[76,28],[74,23],[379,29],[376,30],[375,31],[373,32],[372,33],[370,34],[305,35],[156,36],[158,37],[160,38],[162,39],[166,40],[168,41],[170,42],[172,43],[174,44],[176,45],[178,46],[180,47],[182,48],[184,49],[186,50],[188,51],[190,52],[192,53],[194,54],[196,55],[198,56],[200,57],[202,58],[204,59],[206,60],[208,61],[210,62],[212,63],[214,64],[216,65],[218,66],[220,67],[222,68],[224,69],[226,70],[228,71],[230,72],[232,73],[234,74],[236,75],[238,76],[240,77],[242,78],[244,79],[246,80],[248,81],[250,82],[252,83],[254,84],[256,85],[258,86],[260,87],[262,88],[264,89],[266,90],[268,91],[270,92],[272,93],[274,94],[276,95],[278,96],[280,97],[282,98],[284,99],[286,100],[288,101],[290,102],[292,103],[294,104],[296,105],[298,106],[300,107],[302,108],[304,109],[342,110],[307,111],[309,112],[311,113],[313,114],[315,115],[317,116],[333,117],[337,118],[339,119],[341,120],[349,121],[344,122],[346,123],[348,124],[368,125],[367,126],[359,127],[355,128],[353,129],[365,130],[357,131],[361,132],[351,133],[363,134],[139,135],[152,136],[151,137],[145,135],[146,135],[140,135],[141,135],[142,135],[143,135],[144,135],[148,138],[149,139],[147,138],[55,140],[28,141],[385,142],[47,143],[45,144],[46,145],[383,146],[43,147],[50,148],[48,149],[40,150],[35,151],[34,151],[37,152],[36,153],[39,153],[394,154],[396,155],[408,156],[404,157],[403,157],[400,158],[397,158],[405,157],[406,157],[388,143],[402,159],[401,158],[399,159],[407,159],[391,160],[392,161],[393,162]],"exportedModulesMap":[[378,1],[382,2],[65,3],[138,4],[137,5],[71,6],[111,7],[134,8],[113,9],[132,10],[67,11],[66,12],[130,13],[75,12],[109,14],[82,15],[112,16],[72,17],[128,18],[126,12],[125,12],[124,12],[123,12],[122,12],[121,12],[120,12],[119,12],[118,19],[115,20],[117,12],[69,21],[73,12],[116,22],[108,23],[107,12],[105,12],[104,12],[103,24],[102,12],[101,12],[100,12],[99,12],[98,25],[97,12],[96,12],[95,12],[94,12],[92,26],[93,12],[90,12],[89,12],[88,12],[91,27],[87,12],[86,17],[85,28],[84,28],[83,26],[79,28],[78,28],[77,28],[76,28],[74,23],[379,29],[376,30],[375,31],[373,32],[372,33],[370,34],[305,35],[156,36],[158,37],[160,38],[162,39],[166,40],[168,41],[170,42],[172,43],[174,44],[176,45],[178,46],[180,47],[182,48],[184,49],[186,50],[188,51],[190,52],[192,53],[194,54],[196,55],[198,56],[200,57],[202,58],[204,59],[206,60],[208,61],[210,62],[212,63],[214,64],[216,65],[218,66],[220,67],[222,68],[224,69],[226,70],[228,71],[230,72],[232,73],[234,74],[236,75],[238,76],[240,77],[242,78],[244,79],[246,80],[248,81],[250,82],[252,83],[254,84],[256,85],[258,86],[260,87],[262,88],[264,89],[266,90],[268,91],[270,92],[272,93],[274,94],[276,95],[278,96],[280,97],[282,98],[284,99],[286,100],[288,101],[290,102],[292,103],[294,104],[296,105],[298,106],[300,107],[302,108],[304,109],[342,110],[307,111],[309,112],[311,113],[313,114],[315,115],[317,116],[333,117],[337,118],[339,119],[341,120],[349,121],[344,122],[346,123],[348,124],[368,125],[367,126],[359,127],[355,128],[353,129],[365,130],[357,131],[361,132],[351,133],[363,134],[139,135],[152,136],[151,137],[145,135],[146,135],[140,135],[141,135],[142,135],[143,135],[144,135],[148,138],[149,139],[147,138],[55,140],[28,141],[385,142],[47,143],[45,144],[46,145],[383,146],[43,147],[50,148],[48,149],[40,150],[35,151],[34,151],[37,152],[36,153],[39,153],[394,154],[396,155],[408,156],[404,157],[403,157],[400,158],[397,158],[405,157],[406,157],[388,143],[402,159],[401,158],[399,159],[407,159],[391,160],[392,161],[393,162]],"semanticDiagnosticsPerFile":[378,377,382,110,65,61,62,59,138,136,137,71,111,135,134,113,80,81,64,60,131,132,67,66,63,130,129,75,109,82,112,72,127,128,126,125,124,123,122,121,120,119,118,115,117,69,114,73,116,108,107,106,105,104,103,102,68,101,100,99,98,97,96,95,94,92,93,90,89,88,91,70,87,86,85,84,83,79,78,77,76,74,133,58,57,56,379,380,376,375,374,153,154,373,372,371,370,369,305,156,155,158,157,160,159,162,161,164,163,166,165,168,167,170,169,172,171,174,173,176,175,178,177,180,179,182,181,184,183,186,185,188,187,190,189,192,191,194,193,196,195,198,197,200,199,202,201,204,203,206,205,208,207,210,209,212,211,214,213,216,215,218,217,220,219,222,221,224,223,226,225,228,227,230,229,232,231,234,233,236,235,238,237,240,239,242,241,244,243,246,245,248,247,250,249,252,251,254,253,256,255,258,257,260,259,262,261,264,263,266,265,268,267,270,269,272,271,274,273,276,275,278,277,280,279,282,281,284,283,286,285,288,287,290,289,292,291,294,293,296,295,298,297,300,299,302,301,304,303,342,307,306,309,308,311,310,313,312,315,314,317,316,319,318,321,320,323,322,325,324,327,326,329,328,331,330,333,332,335,334,337,336,339,338,341,340,349,344,343,346,345,348,347,368,367,366,359,358,355,354,353,352,365,364,357,356,361,360,351,350,363,362,381,139,152,151,150,145,146,140,141,142,143,144,148,149,147,55,51,52,53,54,1,16,2,28,3,26,4,5,17,18,6,20,21,19,27,7,8,9,10,11,12,13,14,24,25,22,23,15,47,45,46,44,383,42,43,50,49,48,41,40,31,35,32,33,34,37,36,38,39,30,29]},"version":"5.2.2"}
\ No newline at end of file
diff --git a/utils/mock-category-data.uts b/utils/mock-category-data.uts
new file mode 100644
index 00000000..e00bebc0
--- /dev/null
+++ b/utils/mock-category-data.uts
@@ -0,0 +1,271 @@
+// 分类页面mock数据模块
+// 导出医药分类数据
+export const medicineCategories = [
+    { id: 'cold', name: '感冒发烧', icon: '🤧', desc: '解热镇痛', color: '#2196F3' },
+    { id: 'stomach', name: '肠胃用药', icon: '🤢', desc: '消化系统', color: '#4CAF50' },
+    { id: 'pain', name: '止痛消炎', icon: '💊', desc: '镇痛消炎', color: '#F44336' },
+    { id: 'skin', name: '皮肤用药', icon: '🤕', desc: '皮肤护理', color: '#9C27B0' },
+    { id: 'vitamin', name: '维生素', icon: '🍊', desc: '营养补充', color: '#FF9800' },
+    { id: 'chronic', name: '慢性病', icon: '🫀', desc: '长期管理', color: '#795548' },
+    { id: 'child', name: '儿童用药', icon: '👶', desc: '儿童专用', color: '#00BCD4' },
+    { id: 'external', name: '外用药品', icon: '🧴', desc: '外用制剂', color: '#8BC34A' },
+    { id: 'device', name: '医疗器械', icon: '🩺', desc: '医疗设备', color: '#607D8B' },
+    { id: 'health', name: '健康食品', icon: '🥗', desc: '保健食品', color: '#FFC107' }
+]
+
+// 导出mock商品数据
+export const mockProducts = {
+    cold: [
+        {
+            id: 'cold1',
+            name: '布洛芬缓释胶囊',
+            specification: '0.3g*24粒',
+            price: 18.5,
+            originalPrice: 25.8,
+            image: '/static/images/default-product.png',
+            manufacturer: '修正药业',
+            sales: 2560,
+            badge: '热销'
+        },
+        {
+            id: 'cold2',
+            name: '板蓝根颗粒',
+            specification: '10g*20袋',
+            price: 22.8,
+            originalPrice: 29.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '白云山',
+            sales: 1890,
+            badge: '推荐'
+        },
+        {
+            id: 'cold3',
+            name: '连花清瘟胶囊',
+            specification: '0.35g*36粒',
+            price: 42.8,
+            originalPrice: 48.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '以岭药业',
+            sales: 3200,
+            badge: '爆款'
+        },
+        {
+            id: 'cold4',
+            name: '对乙酰氨基酚片',
+            specification: '0.5g*12片',
+            price: 8.9,
+            originalPrice: 12.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '强生制药',
+            sales: 1420,
+            badge: '特价'
+        },
+        {
+            id: 'cold5',
+            name: '感冒清热颗粒',
+            specification: '3g*10袋',
+            price: 16.5,
+            originalPrice: 19.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '同仁堂',
+            sales: 980,
+            badge: '新品'
+        },
+        {
+            id: 'cold6',
+            name: '复方氨酚烷胺片',
+            specification: '10片/盒',
+            price: 12.8,
+            originalPrice: 15.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '三九医药',
+            sales: 1650,
+            badge: '家庭装'
+        }
+    ],
+    
+    stomach: [
+        {
+            id: 'stomach1',
+            name: '胃康灵胶囊',
+            specification: '0.4g*24粒',
+            price: 32.8,
+            originalPrice: 38.5,
+            image: '/static/images/default-product.png',
+            manufacturer: '三九医药',
+            sales: 890,
+            badge: '热销'
+        },
+        {
+            id: 'stomach2',
+            name: '奥美拉唑肠溶胶囊',
+            specification: '20mg*14粒',
+            price: 28.5,
+            originalPrice: 35.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '阿斯利康',
+            sales: 1250,
+            badge: '处方药'
+        },
+        {
+            id: 'stomach3',
+            name: '健胃消食片',
+            specification: '0.8g*32片',
+            price: 15.9,
+            originalPrice: 19.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '江中制药',
+            sales: 2100,
+            badge: '推荐'
+        },
+        {
+            id: 'stomach4',
+            name: '蒙脱石散',
+            specification: '3g*10袋',
+            price: 18.6,
+            originalPrice: 22.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '益普生',
+            sales: 1780,
+            badge: '止泻'
+        },
+        {
+            id: 'stomach5',
+            name: '多潘立酮片',
+            specification: '10mg*30片',
+            price: 22.8,
+            originalPrice: 26.5,
+            image: '/static/images/default-product.png',
+            manufacturer: '西安杨森',
+            sales: 950,
+            badge: '促消化'
+        },
+        {
+            id: 'stomach6',
+            name: '铝碳酸镁咀嚼片',
+            specification: '0.5g*20片',
+            price: 25.9,
+            originalPrice: 29.9,
+            image: '/static/images/default-product.png',
+            manufacturer: '拜耳',
+            sales: 1320,
+            badge: '护胃'
+        }
+    ],
+    
+    pain: [
+        {
+            id: 'pain1',
+            name: '阿莫西林胶囊',
+            specification: '0.25g*24粒',
+            price: 28.5,
+            originalPrice: 35.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '华北制药',
+            sales: 1560,
+            badge: '处方药'
+        },
+        {
+            id: 'pain2',
+            name: '双氯芬酸钠缓释片',
+            specification: '75mg*10片',
+            price: 19.8,
+            originalPrice: 24.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '诺华制药',
+            sales: 1280,
+            badge: '止痛'
+        },
+        {
+            id: 'pain3',
+            name: '云南白药胶囊',
+            specification: '0.25g*32粒',
+            price: 35.9,
+            originalPrice: 42.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '云南白药',
+            sales: 2350,
+            badge: '经典'
+        },
+        {
+            id: 'pain4',
+            name: '塞来昔布胶囊',
+            specification: '0.2g*10粒',
+            price: 48.6,
+            originalPrice: 55.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '辉瑞',
+            sales: 890,
+            badge: '抗炎'
+        },
+        {
+            id: 'pain5',
+            name: '布洛芬片',
+            specification: '0.1g*24片',
+            price: 12.5,
+            originalPrice: 15.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '中美史克',
+            sales: 1680,
+            badge: '经济装'
+        },
+        {
+            id: 'pain6',
+            name: '头孢克肟胶囊',
+            specification: '0.1g*6粒',
+            price: 32.8,
+            originalPrice: 38.0,
+            image: '/static/images/default-product.png',
+            manufacturer: '广州白云山',
+            sales: 1120,
+            badge: '抗生素'
+        }
+    ]
+}
+
+// 为其他分类生成默认商品数据
+export const generateDefaultProducts = (categoryId: string) => {
+    const baseProducts = [
+        { name: '通用药品1', price: 25.8, manufacturer: '知名药企', sales: 1200 },
+        { name: '通用药品2', price: 18.5, manufacturer: '知名药企', sales: 950 },
+        { name: '通用药品3', price: 32.0, manufacturer: '知名药企', sales: 1450 },
+        { name: '通用药品4', price: 22.8, manufacturer: '知名药企', sales: 880 },
+        { name: '通用药品5', price: 28.9, manufacturer: '知名药企', sales: 1100 },
+        { name: '通用药品6', price: 19.9, manufacturer: '知名药企', sales: 920 }
+    ]
+    
+    return baseProducts.map((product, index) => ({
+        id: `${categoryId}${index + 1}`,
+        ...product,
+        specification: '规格待定',
+        originalPrice: product.price * 1.2,
+        image: '/static/images/default-product.png',
+        badge: index === 0 ? '热销' : index === 1 ? '推荐' : ''
+    }))
+}
+
+// 获取分类商品数据
+export const getCategoryProducts = (categoryId: string) => {
+    if (mockProducts[categoryId]) {
+        return mockProducts[categoryId]
+    } else {
+        return generateDefaultProducts(categoryId)
+    }
+}
+
+// 获取分类信息
+export const getCategoryInfo = (categoryId: string) => {
+    const category = medicineCategories.find(cat => cat.id === categoryId)
+    if (category) {
+        return {
+            name: category.name,
+            desc: category.desc
+        }
+    } else {
+        // 返回默认分类信息
+        return {
+            name: '感冒发烧',
+            desc: '解热镇痛'
+        }
+    }
+}
diff --git a/utils/sapi.uts b/utils/sapi.uts
index 4235f6ea..9d44c43e 100644
--- a/utils/sapi.uts
+++ b/utils/sapi.uts
@@ -1,5 +1,5 @@
-import supa, { supaReady } from '@/components/supadb/aksupainstance.uts'
-import type { UserProfile } from '@/pages/user/types.uts'
+import { supabase, ensureSupabaseReady } from '@/components/supadb/aksupainstance.uts'
+import type { UserProfile } from '@/types/mall-types.uts'
 
 /**
  * 确保用户资料存在，如果不存在则创建基础资料
@@ -8,7 +8,7 @@ import type { UserProfile } from '@/pages/user/types.uts'
  */
 export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<UserProfile | null> {
 	try {
-		await supaReady
+		await ensureSupabaseReady()
 		
 		// 从 sessionUser 中获取用户ID和邮箱
 		const userId = sessionUser.getString('id')
@@ -20,7 +20,7 @@ export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<Use
 		}
 		
 		// 检查用户是否已存在
-		const checkRes = await supa.from('ak_users')
+		const checkRes = await supabase.from('ak_users')
 			.select('*', {})
 			.eq('id', userId)
 			.single()
@@ -30,7 +30,7 @@ export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<Use
 			// 用户已存在，返回现有资料
 			const existingUser = checkRes.data as UTSJSONObject
 			return {
-				id: existingUser.getString('id'),
+				id: existingUser.getString('id') ?? '',
 				username: existingUser.getString('username') ?? '',
 				email: existingUser.getString('email') ?? email,
 				gender: existingUser.getString('gender'),
@@ -40,10 +40,9 @@ export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<Use
 				bio: existingUser.getString('bio'),
 				avatar_url: existingUser.getString('avatar_url'),
 				preferred_language: existingUser.getString('preferred_language'),
-				role: existingUser.getString('role'),
-				school_id: existingUser.getString('school_id'),
-				grade_id: existingUser.getString('grade_id'),
-				class_id: existingUser.getString('class_id')
+				role: existingUser.getString('role') ?? 'consumer',
+				created_at: existingUser.getString('created_at'),
+				updated_at: existingUser.getString('updated_at')
 			} as UserProfile
 		}
 		
@@ -53,7 +52,7 @@ export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<Use
 		newUserData.set('email', email)
 		newUserData.set('username', email.split('@')[0] ?? 'user') // 默认用户名为邮箱前缀
 		
-		const insertRes = await supa.from('ak_users')
+		const insertRes = await supabase.from('ak_users')
 			.insert(newUserData)
 			.select('*', {})
 			.single()
@@ -62,7 +61,7 @@ export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<Use
 		if (insertRes.status >= 200 && insertRes.status < 300 && insertRes.data != null) {
 			const newUser = insertRes.data as UTSJSONObject
 			return {
-				id: newUser.getString('id'),
+				id: newUser.getString('id') ?? '',
 				username: newUser.getString('username') ?? '',
 				email: newUser.getString('email') ?? email,
 				gender: newUser.getString('gender'),
@@ -72,10 +71,9 @@ export async function ensureUserProfile(sessionUser: UTSJSONObject): Promise<Use
 				bio: newUser.getString('bio'),
 				avatar_url: newUser.getString('avatar_url'),
 				preferred_language: newUser.getString('preferred_language'),
-				role: newUser.getString('role'),
-				school_id: newUser.getString('school_id'),
-				grade_id: newUser.getString('grade_id'),
-				class_id: newUser.getString('class_id')
+				role: newUser.getString('role') ?? 'consumer',
+				created_at: newUser.getString('created_at'),
+				updated_at: newUser.getString('updated_at')
 			} as UserProfile
 		} else {
 			console.error('创建用户资料失败:', insertRes.status)
diff --git a/utils/store.uts b/utils/store.uts
index ac113168..64f49a36 100644
--- a/utils/store.uts
+++ b/utils/store.uts
@@ -1,4 +1,4 @@
-import supa, { supaReady } from '@/components/supadb/aksupainstance.uts'
+import { supabase as supa, ensureSupabaseReady } from '@/components/supadb/aksupainstance.uts'
 import type { UserProfile, UserStats } from '@/pages/user/types.uts'
 import type { DeviceInfo } from '@/pages/sense/types.uts'
 import { SenseDataService, type DeviceParams } from '@/pages/sense/senseDataService.uts'
@@ -50,7 +50,7 @@ export const setUserProfile = (profile : UserProfile) => {
 // 获取当前用户信息（含补全 profile）
 export async function getCurrentUser() : Promise<UserProfile | null> {
 	try {
-		await supaReady
+		await ensureSupabaseReady()
 	} catch (_) {}
 
 	const sessionInfo = supa.getSession()