From af316e6d94c477505554b040f022f3e40457146c Mon Sep 17 00:00:00 2001
From: cyh666666 <2398882793@qq.com>
Date: Wed, 28 Jan 2026 10:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=98=A8=E6=99=9A=E8=87=B3?=
 =?UTF-8?q?=E4=BB=8A=E6=97=A9=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |   18 +
 pages/info/settings.uvue                |   90 ++
 pages/mall/consumer/cart copy.uvue      | 1220 ++++++++++++++++
 pages/mall/consumer/cart.uvue           |  302 ++--
 pages/mall/consumer/checkout copy.uvue  | 1730 ++++++++++++++++++++++
 pages/mall/consumer/checkout.uvue       |   73 +-
 pages/mall/consumer/checkoutgood.uvue   | 1733 +++++++++++++++++++++++
 pages/mall/consumer/product-detail.uvue |   43 +-
 pages/mall/consumer/settings.uvue       |  157 +-
 pages/mall/consumer/wallet.uvue         |   20 +-
 pages/user/bind-email.uvue              |  544 +++++++
 pages/user/bind-phone.uvue              |  548 +++++++
 pages/user/change-password.uvue         |  353 +++++
 13 files changed, 6635 insertions(+), 196 deletions(-)
 create mode 100644 pages/mall/consumer/cart copy.uvue
 create mode 100644 pages/mall/consumer/checkout copy.uvue
 create mode 100644 pages/mall/consumer/checkoutgood.uvue
 create mode 100644 pages/user/bind-email.uvue
 create mode 100644 pages/user/bind-phone.uvue
 create mode 100644 pages/user/change-password.uvue

diff --git a/pages.json b/pages.json
index a6b8041f..c07e0e02 100644
--- a/pages.json
+++ b/pages.json
@@ -169,6 +169,24 @@
         "navigationBarTitleText": "客服聊天",
         "navigationStyle": "custom"
       }
+    },
+    {
+      "path": "pages/user/change-password",
+      "style": {
+        "navigationBarTitleText": "修改密码"
+      }
+    },
+    {
+      "path": "pages/user/bind-phone",
+      "style": {
+        "navigationBarTitleText": "绑定手机"
+      }
+    },
+    {
+      "path": "pages/user/bind-email",
+      "style": {
+        "navigationBarTitleText": "绑定邮箱"
+      }
     }
   ],
   "tabBar": {
diff --git a/pages/info/settings.uvue b/pages/info/settings.uvue
index 6a96b7f5..465042e1 100644
--- a/pages/info/settings.uvue
+++ b/pages/info/settings.uvue
@@ -1033,4 +1033,94 @@ import i18n from '@/uni_modules/i18n/index.uts' // 保留用于语言切换
 .action-btn.primary .action-text {
 	color: #ffffff;
 }
+
+/* 响应式布局优化 */
+@media screen and (min-width: 480px) and (max-width: 767px) {
+	.settings-section {
+		margin: 12px 20px;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+	}
+	
+	.section-header {
+		width: 100%;
+	}
+	
+	.setting-item {
+		flex: 1 0 calc(50% - 20px);
+		margin: 10px;
+		border: 1px solid #f0f0f0;
+		border-radius: 8px;
+		padding: 16px;
+		box-sizing: border-box;
+		border-bottom: none;
+		flex-direction: column;
+		align-items: flex-start;
+	}
+	
+	.item-content {
+		width: 100%;
+		margin-bottom: 10px;
+	}
+	
+	.item-label, .item-desc, .item-value {
+		display: block;
+		width: 100%;
+	}
+	
+	.toggle-switch, .item-arrow {
+		align-self: flex-end;
+		margin-top: auto;
+	}
+}
+
+@media screen and (min-width: 768px) {
+	.settings-page {
+		padding: 20px;
+		background-color: #f5f5f5;
+	}
+	
+	.settings-section {
+		margin: 0 auto 20px;
+		max-width: 800px;
+		border-radius: 12px;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+	}
+	
+	.section-header {
+		width: 100%;
+	}
+	
+	.setting-item {
+		flex: 1 0 calc(33.333% - 20px);
+		margin: 10px;
+		border: 1px solid #f0f0f0;
+		border-radius: 8px;
+		padding: 16px;
+		box-sizing: border-box;
+		border-bottom: none;
+		flex-direction: column;
+		align-items: flex-start;
+	}
+	
+	.item-content {
+		width: 100%;
+		margin-bottom: 10px;
+	}
+	
+	.item-label, .item-desc, .item-value {
+		display: block;
+		width: 100%;
+	}
+	
+	.toggle-switch, .item-arrow {
+		align-self: flex-end;
+		margin-top: auto;
+	}
+}
 </style>
diff --git a/pages/mall/consumer/cart copy.uvue b/pages/mall/consumer/cart copy.uvue
new file mode 100644
index 00000000..7d6e20f8
--- /dev/null
+++ b/pages/mall/consumer/cart copy.uvue	
@@ -0,0 +1,1220 @@
+<!-- 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="cartItems.length > 0" class="cart-action-bar">
+                <view class="action-bar-content">
+                    <view class="action-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="action-right">
+                        <view v-if="!isManageMode" class="total-info">
+                            <text class="total-text">合计:</text>
+                            <text class="total-price">¥{{ totalPrice }}</text>
+                        </view>
+                        <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 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>
+					<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
+	}
+	
+	// 确保最新状态已保存到本地存储
+	saveCartData()
+	
+	// 获取选中的商品 (直接过滤cartItems，不依赖cartGroups)
+	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: Number(item.price), // 确保是数字
+			quantity: Number(item.quantity) // 确保是数字
+		}))
+	
+    // 关键修复：将结算数据写入 Storage，确保 checkout 页面能稳定获取
+    uni.setStorageSync('checkout_type', 'cart')
+    uni.setStorageSync('checkout_items', JSON.stringify(selectedItems))
+
+	// 跳转到结算页面并传递数据
+	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-action-bar {
+		background-color: white;
+		margin: 10px;
+		border-radius: 12px;
+		padding: 15px;
+		box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+	}
+
+	.action-bar-content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.action-left, .action-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.action-right {
+		justify-content: flex-end;
+	}
+	
+	/* 底部结算栏 */
+    /*
+	.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;
+	}
+    
+    /* 响应式调整 */
+    @media screen and (min-width: 768px) {
+        .cart-action-bar {
+            margin: 20px auto;
+            max-width: 95%;
+        }
+    }
+    
+    @media screen and (min-width: 1024px) {
+        .cart-action-bar {
+            max-width: 1200px;
+        }
+    }
+    
+    @media screen and (min-width: 1400px) {
+        .cart-action-bar {
+            max-width: 1400px;
+        }
+    }
+</style>
diff --git a/pages/mall/consumer/cart.uvue b/pages/mall/consumer/cart.uvue
index 69346032..5809cc95 100644
--- a/pages/mall/consumer/cart.uvue
+++ b/pages/mall/consumer/cart.uvue
@@ -82,6 +82,32 @@
 				</view>
 			</view>
 			
+			<!-- 购物车操作栏 (移至推荐商品上方) -->
+            <view v-if="cartItems.length > 0" class="cart-action-bar">
+                <view class="action-bar-content">
+                    <view class="action-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="action-right">
+                        <view v-if="!isManageMode" class="total-info">
+                            <text class="total-text">合计:</text>
+                            <text class="total-price">¥{{ totalPrice }}</text>
+                        </view>
+                        <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 v-if="recommendProducts.length > 0" class="recommend-section">
 				<view class="section-header">
@@ -111,8 +137,8 @@
 			</view>
 		</scroll-view>
 		
-		<!-- 底部结算栏 -->
-		<view v-if="cartItems.length > 0" class="cart-footer">
+		<!-- 底部结算栏 - 已移除，移动到内容区域 -->
+		<!-- <view v-if="cartItems.length > 0" class="cart-footer">
 			<view class="footer-content">
 				<view class="footer-left">
 					<view class="select-all" @click="toggleSelectAll">
@@ -127,8 +153,6 @@
 						<text class="total-text">合计:</text>
 						<text class="total-price">¥{{ totalPrice }}</text>
 					</view>
-                    <!-- 结算按钮：即使在管理模式下，如果用户想结算也可以（或者在管理模式下隐藏结算，只显示删除） -->
-                    <!-- 需求：加购商品前面的按钮时；cart购物车页面顶部的管理点击能对加购商品进行批量删除 -->
 					<button v-if="!isManageMode" class="checkout-btn" @click="goToCheckout">
 						去结算({{ selectedCount }})
 					</button>
@@ -137,7 +161,7 @@
 					</button>
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -415,15 +439,18 @@ const addToCart = (product: any) => {
 		}
 	}
 	
-	// 检查商品是否已存在
-	const existingItem = currentItems.find((item: any) => item.id === product.id)
+	// 检查商品是否已存在 (使用商品ID匹配，因为推荐商品没有SKU)
+	const existingItem = currentItems.find((item: any) => 
+		item.productId === product.id || item.id === product.id
+	)
 	
 	if (existingItem) {
 		existingItem.quantity++
 	} else {
 		// 添加新商品
 		currentItems.push({
-			id: product.id,
+			id: product.id, // 商品ID（因为没有SKU）
+			productId: product.id, // 同样存储商品ID
 			shopId: product.shopId || 'shop_recommend',
 			shopName: product.shopName || '推荐好物',
 			name: product.name,
@@ -453,7 +480,11 @@ const goShopping = () => {
 }
 
 const navigateToProduct = (product: any) => {
-	uni.navigateTo({ url: `/pages/mall/consumer/product-detail?id=${product.id}` })
+	// 使用productId（如果存在）作为跳转的商品ID，否则使用id
+	const productId = product.productId || product.id
+	uni.navigateTo({ 
+		url: `/pages/mall/consumer/product-detail?id=${productId}&name=${encodeURIComponent(product.name)}&price=${product.price}&image=${encodeURIComponent(product.image)}` 
+	})
 }
 
 const goToCheckout = () => {
@@ -465,7 +496,10 @@ const goToCheckout = () => {
 		return
 	}
 	
-	// 获取选中的商品
+	// 确保最新状态已保存到本地存储
+	saveCartData()
+	
+	// 获取选中的商品 (直接过滤cartItems，不依赖cartGroups)
 	const selectedItems = cartItems.value
 		.filter(item => item.selected)
 		.map(item => ({
@@ -475,10 +509,14 @@ const goToCheckout = () => {
 			product_name: item.name,
 			product_image: item.image,
 			sku_specifications: item.spec,
-			price: item.price,
-			quantity: item.quantity
+			price: Number(item.price), // 确保是数字
+			quantity: Number(item.quantity) // 确保是数字
 		}))
 	
+    // 关键修复：将结算数据写入 Storage，确保 checkout 页面能稳定获取
+    uni.setStorageSync('checkout_type', 'cart')
+    uni.setStorageSync('checkout_items', JSON.stringify(selectedItems))
+
 	// 跳转到结算页面并传递数据
 	uni.navigateTo({
 		url: '/pages/mall/consumer/checkout',
@@ -1059,83 +1097,171 @@ const goToCheckout = () => {
 	}
 }
 
-/* 底部结算栏 */
-.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);
-}
+	/* 购物车操作栏样式 - 自适应横向排列 */
+	.cart-action-bar {
+		background-color: white;
+		margin: 10px;
+		border-radius: 12px;
+		padding: 15px;
+		box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+	}
 
-.footer-content {
-	width: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
+	.action-bar-content {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		gap: 10px;
+	}
 
-.footer-left {
-	display: flex;
-	align-items: center;
-}
+	.action-left, .action-right {
+		display: flex;
+		align-items: center;
+		flex-wrap: nowrap;
+	}
 
-.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;
-}
+	.action-right {
+		justify-content: flex-end;
+		flex: 1;
+		min-width: 0; /* 防止溢出 */
+	}
+	
+	/* 合计信息区域 - 自适应横向排列 */
+	.total-info {
+		display: flex;
+		align-items: center;
+		margin-right: 12px;
+		flex-shrink: 0;
+	}
+	
+	.total-text {
+		font-size: 14px;
+		color: #333;
+		margin-right: 5px;
+		white-space: nowrap;
+	}
+	
+	.total-price {
+		font-size: 18px;
+		color: #ff5000;
+		font-weight: bold;
+		white-space: nowrap;
+	}
+	
+	/* 结算按钮 */
+	.checkout-btn, .delete-btn {
+		background-color: #ff5000;
+		color: white;
+		border: none;
+		border-radius: 25px;
+		padding: 8px 20px;
+		font-size: 14px;
+		white-space: nowrap;
+		flex-shrink: 0;
+	}
+	
+	.delete-btn {
+		background-color: #ff3b30; /* 红色删除按钮 */
+		padding: 8px 25px;
+	}
+	
+	/* 全选区域 */
+	.select-all {
+		display: flex;
+		align-items: center;
+	}
+	
+	.select-all-text {
+		margin-left: 8px;
+		font-size: 14px;
+		color: #333;
+		white-space: nowrap;
+	}
+	
+	/* 响应式调整 */
+	/* 手机端小屏幕优化 */
+	@media screen and (max-width: 375px) {
+		.action-bar-content {
+			gap: 8px;
+		}
+		
+		.total-text {
+			font-size: 13px;
+		}
+		
+		.total-price {
+			font-size: 16px;
+		}
+		
+		.checkout-btn, .delete-btn {
+			padding: 8px 15px;
+			font-size: 13px;
+		}
+		
+		.select-all-text {
+			font-size: 13px;
+		}
+	}
+	
+	/* 平板端优化 */
+	@media screen and (min-width: 768px) {
+		.cart-action-bar {
+			margin: 20px auto;
+			max-width: 95%;
+			padding: 20px;
+		}
+		
+		.action-bar-content {
+			gap: 20px;
+		}
+		
+		.total-price {
+			font-size: 20px;
+		}
+		
+		.checkout-btn, .delete-btn {
+			padding: 10px 30px;
+			font-size: 16px;
+		}
+	}
+	
+	/* 桌面端优化 */
+	@media screen and (min-width: 1024px) {
+		.cart-action-bar {
+			max-width: 1200px;
+			padding: 20px 30px;
+		}
+		
+		.action-bar-content {
+			justify-content: space-between;
+		}
+		
+		.total-info {
+			margin-right: 30px;
+		}
+		
+		.total-text {
+			font-size: 16px;
+		}
+		
+		.total-price {
+			font-size: 22px;
+		}
+		
+		.checkout-btn, .delete-btn {
+			padding: 12px 40px;
+			font-size: 16px;
+		}
+		
+		.select-all-text {
+			font-size: 16px;
+		}
+	}
+	
+	/* 大屏幕优化 */
+	@media screen and (min-width: 1400px) {
+		.cart-action-bar {
+			max-width: 1400px;
+		}
+	}
 </style>
diff --git a/pages/mall/consumer/checkout copy.uvue b/pages/mall/consumer/checkout copy.uvue
new file mode 100644
index 00000000..7318fbf1
--- /dev/null
+++ b/pages/mall/consumer/checkout copy.uvue	
@@ -0,0 +1,1730 @@
+<!-- 结算页面 -->
+<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
+	
+	// 默认先尝试从本地存储加载（确保有数据）
+	loadFromLocalStorage()
+	
+	if (eventChannel) {
+		eventChannel.on('acceptData', (data: any) => {
+			console.log('接收到商品数据:', data)
+			let items = data.selectedItems || []
+			if (items.length > 0) {
+				processCheckoutItems(items)
+			}
+			loadDefaultAddress()
+		})
+	}
+})
+
+// 处理商品数据清洗
+const processCheckoutItems = (items: any[]) => {
+		// 数据清洗：确保价格和数量是数字类型
+	if (items && items.length > 0) {
+		items = items.map((item: any) => {
+			// 确保价格是数字
+			let price = 0
+			if (item.price !== undefined && item.price !== null) {
+				price = typeof item.price === 'string' ? parseFloat(item.price) : Number(item.price)
+				if (isNaN(price)) price = 0
+			}
+			
+			// 确保数量是数字
+			let quantity = 1
+			if (item.quantity !== undefined && item.quantity !== null) {
+				quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
+				if (isNaN(quantity) || quantity < 1) quantity = 1
+			}
+			
+			return {
+				id: item.id,
+				product_id: item.product_id || item.id,
+				sku_id: item.sku_id || item.id,
+				product_name: item.product_name || item.name || '',
+				product_image: item.product_image || item.image || '',
+				sku_specifications: item.sku_specifications || item.spec || {},
+				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 => {
+					// 确保价格和数量是数字
+					let price = typeof item.price === 'string' ? parseFloat(item.price) : Number(item.price)
+					if (isNaN(price)) price = 0
+					
+					let quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
+					if (isNaN(quantity) || quantity < 1) quantity = 1
+					
+					return {
+						id: item.id,
+						product_id: item.product_id || item.productId || item.id,
+						sku_id: item.sku_id || item.id,
+						product_name: item.name || '',
+						product_image: item.image || '',
+						sku_specifications: item.spec ? { spec: item.spec } : {},
+						price: price,
+						quantity: quantity
+					}
+				})
+				// 再次经过process处理确保类型正确
+				processCheckoutItems(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/checkout.uvue b/pages/mall/consumer/checkout.uvue
index 57f3d413..3c744516 100644
--- a/pages/mall/consumer/checkout.uvue
+++ b/pages/mall/consumer/checkout.uvue
@@ -394,45 +394,49 @@ onLoad(() => {
 
 	// 从上一页获取数据
 	const eventChannel = uni.getEventChannel ? uni.getEventChannel() : null
+	
+	// 默认先尝试从本地存储加载（确保有数据）
+	loadFromLocalStorage()
+	
 	if (eventChannel) {
 		eventChannel.on('acceptData', (data: any) => {
 			console.log('接收到商品数据:', data)
 			let items = data.selectedItems || []
-			processCheckoutItems(items)
+			if (items.length > 0) {
+				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)
+			let price = 0
+			if (item.price !== undefined && item.price !== null) {
+				price = typeof item.price === 'string' ? parseFloat(item.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)
+			let quantity = 1
+			if (item.quantity !== undefined && item.quantity !== null) {
+				quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
 				if (isNaN(quantity) || quantity < 1) quantity = 1
-			} else {
-				quantity = 1
 			}
 			
 			return {
-				...item,
-				price: Number(price.toFixed(2)), // 保留两位小数
+				id: item.id,
+				product_id: item.product_id || item.id,
+				sku_id: item.sku_id || item.id,
+				product_name: item.product_name || item.name || '',
+				product_image: item.product_image || item.image || '',
+				sku_specifications: item.sku_specifications || item.spec || {},
+				price: Number(price.toFixed(2)),
 				quantity: quantity
 			}
 		})
@@ -466,6 +470,9 @@ onMounted(() => {
 // 组件卸载时移除事件监听
 onUnmounted(() => {
 	uni.$off('addressUpdated')
+    // 离开页面时清除结算数据，防止下次进入时显示旧数据
+    uni.removeStorageSync('checkout_type')
+    uni.removeStorageSync('checkout_items')
 })
 
 // 从本地存储加载结算数据（例如从购物车进入）
@@ -479,17 +486,27 @@ const loadFromLocalStorage = () => {
 			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
+				const convertedItems: CheckoutItemType[] = selectedCartItems.map(item => {
+					// 确保价格和数量是数字
+					let price = typeof item.price === 'string' ? parseFloat(item.price) : Number(item.price)
+					if (isNaN(price)) price = 0
+					
+					let quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
+					if (isNaN(quantity) || quantity < 1) quantity = 1
+					
+					return {
+						id: item.id,
+						product_id: item.product_id || item.productId || item.id,
+						sku_id: item.sku_id || item.id,
+						product_name: item.name || '',
+						product_image: item.image || '',
+						sku_specifications: item.spec ? { spec: item.spec } : {},
+						price: price,
+						quantity: quantity
+					}
+				})
+				// 再次经过process处理确保类型正确
+				processCheckoutItems(convertedItems)
 			}
 		} catch (e) {
 			console.error('解析购物车数据失败:', e)
diff --git a/pages/mall/consumer/checkoutgood.uvue b/pages/mall/consumer/checkoutgood.uvue
new file mode 100644
index 00000000..3c744516
--- /dev/null
+++ b/pages/mall/consumer/checkoutgood.uvue
@@ -0,0 +1,1733 @@
+<!-- 结算页面 -->
+<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
+	
+	// 默认先尝试从本地存储加载（确保有数据）
+	loadFromLocalStorage()
+	
+	if (eventChannel) {
+		eventChannel.on('acceptData', (data: any) => {
+			console.log('接收到商品数据:', data)
+			let items = data.selectedItems || []
+			if (items.length > 0) {
+				processCheckoutItems(items)
+			}
+			loadDefaultAddress()
+		})
+	}
+})
+
+// 处理商品数据清洗
+const processCheckoutItems = (items: any[]) => {
+		// 数据清洗：确保价格和数量是数字类型
+	if (items && items.length > 0) {
+		items = items.map((item: any) => {
+			// 确保价格是数字
+			let price = 0
+			if (item.price !== undefined && item.price !== null) {
+				price = typeof item.price === 'string' ? parseFloat(item.price) : Number(item.price)
+				if (isNaN(price)) price = 0
+			}
+			
+			// 确保数量是数字
+			let quantity = 1
+			if (item.quantity !== undefined && item.quantity !== null) {
+				quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
+				if (isNaN(quantity) || quantity < 1) quantity = 1
+			}
+			
+			return {
+				id: item.id,
+				product_id: item.product_id || item.id,
+				sku_id: item.sku_id || item.id,
+				product_name: item.product_name || item.name || '',
+				product_image: item.product_image || item.image || '',
+				sku_specifications: item.sku_specifications || item.spec || {},
+				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')
+    // 离开页面时清除结算数据，防止下次进入时显示旧数据
+    uni.removeStorageSync('checkout_type')
+    uni.removeStorageSync('checkout_items')
+})
+
+// 从本地存储加载结算数据（例如从购物车进入）
+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 => {
+					// 确保价格和数量是数字
+					let price = typeof item.price === 'string' ? parseFloat(item.price) : Number(item.price)
+					if (isNaN(price)) price = 0
+					
+					let quantity = typeof item.quantity === 'string' ? parseInt(item.quantity) : Number(item.quantity)
+					if (isNaN(quantity) || quantity < 1) quantity = 1
+					
+					return {
+						id: item.id,
+						product_id: item.product_id || item.productId || item.id,
+						sku_id: item.sku_id || item.id,
+						product_name: item.name || '',
+						product_image: item.image || '',
+						sku_specifications: item.spec ? { spec: item.spec } : {},
+						price: price,
+						quantity: quantity
+					}
+				})
+				// 再次经过process处理确保类型正确
+				processCheckoutItems(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/product-detail.uvue b/pages/mall/consumer/product-detail.uvue
index fc8a8495..ef3baf52 100644
--- a/pages/mall/consumer/product-detail.uvue
+++ b/pages/mall/consumer/product-detail.uvue
@@ -234,21 +234,27 @@ export default {
       // 原价比现价高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]
+      // 优先使用传入的商品名称，否则根据商品ID生成名称
+      const productName = options.name ? decodeURIComponent(options.name) : (() => {
+        // 如果options.name未传入，使用默认的商品名称生成逻辑
+        const productNames = [
+          '高品质运动休闲鞋',
+          '时尚简约双肩背包',
+          '多功能智能手环',
+          '便携式蓝牙音箱',
+          '全自动雨伞',
+          '抗菌防螨床上四件套',
+          '不锈钢保温杯',
+          '无线充电器',
+          '高清行车记录仪',
+          '智能体脂秤'
+        ]
+        const nameIndex = Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % productNames.length
+        return productNames[nameIndex]
+      })()
+      
+      // 优先使用传入的图片，否则使用默认图片
+      const productImage = options.image ? decodeURIComponent(options.image) : '/static/product1.jpg'
       
       // 模拟销量和库存，使其更真实
       const sales = 1000 + Math.abs(productId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)) % 5000
@@ -261,7 +267,7 @@ export default {
         name: productName,
         description: '这是一个高品质的商品，具有优秀的性能和优美的外观设计。采用环保材料，经过严格质检，保证用户的使用体验。',
         images: [
-          '/static/product1.jpg',
+          productImage,
           '/static/product2.jpg',
           '/static/product3.jpg'
         ],
@@ -307,9 +313,10 @@ export default {
       // 模拟加载商品SKU数据
       const basePrice = this.product.price
       
+      // 使用 productId 作为前缀生成唯一的 SKU ID，防止不同商品的 SKU ID 冲突
       this.productSkus = [
         {
-          id: 'sku_001',
+          id: `${productId}_sku_001`,
           product_id: productId,
           sku_code: 'SKU001',
           specifications: { color: '红色', size: 'M' },
@@ -319,7 +326,7 @@ export default {
           status: 1
         },
         {
-          id: 'sku_002',
+          id: `${productId}_sku_002`,
           product_id: productId,
           sku_code: 'SKU002',
           specifications: { color: '蓝色', size: 'L' },
diff --git a/pages/mall/consumer/settings.uvue b/pages/mall/consumer/settings.uvue
index d62bb723..5c113dc3 100644
--- a/pages/mall/consumer/settings.uvue
+++ b/pages/mall/consumer/settings.uvue
@@ -2,10 +2,10 @@
 <template>
 	<view class="settings-page">
 		<!-- 顶部栏 -->
-		<view class="settings-header">
+		<!--<view class="settings-header">
 			<text class="back-btn" @click="goBack">‹</text>
 			<text class="header-title">设置</text>
-		</view>
+		</view>-->
 
 		<scroll-view class="settings-content" scroll-y>
 			<!-- 账户设置 -->
@@ -17,11 +17,11 @@
 						<text class="item-text">个人资料</text>
 						<text class="item-arrow">›</text>
 					</view>
-					<view class="list-item" @click="goToAddressList">
+					<!--<view class="list-item" @click="goToAddressList">
 						<text class="item-icon">📍</text>
 						<text class="item-text">收货地址</text>
 						<text class="item-arrow">›</text>
-					</view>
+					</view>-->
 					<view class="list-item" @click="changePassword">
 						<text class="item-icon">🔒</text>
 						<text class="item-text">修改密码</text>
@@ -283,7 +283,7 @@ const calculateCacheSize = () => {
 // 跳转到个人资料
 const goToProfile = () => {
 	uni.navigateTo({
-		url: '/pages/mall/consumer/profile'
+		url: '/pages/user/profile'
 	})
 }
 
@@ -573,47 +573,126 @@ const goBack = () => {
 
 <style scoped>
 /* 响应式布局优化 */
-@media screen and (min-width: 768px) {
-	.settings-content {
-		padding: 20px;
-		background-color: #f5f5f5;
-	}
+.section-list {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+}
 
-	.settings-section {
+.list-item {
+	display: flex;
+	align-items: center;
+	padding: 15px;
+	border-bottom: 1px solid #f5f5f5;
+	background-color: #ffffff;
+	
+	/* 手机端每行显示4个，自适应排到下一行 */
+	width: 25%;
+	flex-direction: column; /* 内容改为垂直排列，图标在上文字在下 */
+	justify-content: center;
+	text-align: center;
+	box-sizing: border-box;
+	border-right: 1px solid #f5f5f5; /* 添加右边框分隔 */
+}
+
+.item-icon {
+	font-size: 24px;
+	margin-right: 0; /* 移除右侧间距 */
+	margin-bottom: 5px; /* 添加底部间距 */
+}
+
+.item-text {
+	font-size: 12px;
+	color: #333333;
+	/* 文字太长可能需要处理，这里暂时不做截断 */
+}
+
+.item-arrow {
+	display: none; /* 网格模式下通常不需要箭头 */
+}
+
+.item-right {
+	display: none; /* 简化显示，隐藏右侧状态/箭头等复杂内容 */
+}
+
+/* 针对 switch 组件的特殊处理，如果需要显示开关，可能需要调整布局 */
+.list-item switch {
+	transform: scale(0.7);
+	margin-top: 5px;
+}
+
+/* 屏幕宽度大于 480px (大屏手机/平板/PC) 时，启用更宽的网格布局或列表布局 */
+@media screen and (min-width: 480px) {
+	.list-item {
+		width: calc(50% - 10px); /* 每行两个，留出间隙 */
+		margin: 5px;
+		border: 1px solid #f0f0f0;
 		border-radius: 8px;
-		margin-bottom: 20px;
-		max-width: 800px;
-		margin-left: auto;
-		margin-right: auto;
+		border-bottom: 1px solid #f0f0f0; 
+		flex-direction: row; /* 恢复水平排列 */
+		text-align: left;
+		justify-content: flex-start;
 	}
-
-	/* 电脑端横向排列部分内容 */
-	.section-list {
-		display: flex;
-		flex-direction: column;
+	
+	.item-icon {
+		margin-right: 15px;
+		margin-bottom: 0;
 	}
-
-	.logout-section, .delete-account-section {
-		max-width: 800px;
-		margin-left: auto;
-		margin-right: auto;
+	
+	.item-text {
+		font-size: 14px;
+	}
+	
+	.item-arrow, .item-right {
+		display: flex; /* 恢复显示 */
+		margin-left: auto; /* 推到右侧 */
 	}
 }
 
+/* 增加针对手机横屏的媒体查询 */
+@media screen and (orientation: landscape) and (max-height: 500px) {
+    .list-item {
+		width: calc(25% - 10px); /* 横屏也保持4个一行，或者根据需要调整 */
+		margin: 5px;
+		border: 1px solid #f0f0f0;
+		border-radius: 8px;
+        flex-direction: column;
+	}
+}
+
+/* 屏幕宽度大于 1024px (大屏PC) 时 */
 @media screen and (min-width: 1024px) {
 	.settings-page {
-		flex-direction: row; /* 大屏下改为横向布局，左侧导航，右侧内容 */
+		flex-direction: row; /* 整体左右布局 */
 	}
 
 	.settings-header {
-		display: none; /* 大屏下隐藏顶部栏，可能使用侧边栏或其他导航 */
+		display: none;
 	}
 	
-	/* 这里只是简单示例，实际可能需要更复杂的布局调整 */
 	.settings-content {
 		width: 100%;
-		max-width: 1000px;
+		max-width: 1200px;
 		margin: 0 auto;
+		padding: 20px;
+	}
+	
+	.list-item {
+		width: calc(33.33% - 10px); /* 每行三个 */
+		flex-direction: row; /* PC端保持水平排列 */
+        justify-content: flex-start;
+        text-align: left;
+	}
+    
+    .item-icon {
+		margin-right: 15px;
+		margin-bottom: 0;
+	}
+    
+    .item-arrow, .item-right {
+		display: flex;
+        margin-left: auto;
 	}
 }
 
@@ -663,21 +742,9 @@ const goBack = () => {
 	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;
-}
+/* 删除多余的 .section-list 定义 */
+/* 删除多余的 .list-item 定义 */
+/* 删除多余的 .list-item:last-child 定义 */
 
 .item-icon {
 	font-size: 20px;
@@ -744,4 +811,4 @@ const goBack = () => {
 	font-size: 14px;
 	text-decoration: underline;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/mall/consumer/wallet.uvue b/pages/mall/consumer/wallet.uvue
index 715e894f..8b638472 100644
--- a/pages/mall/consumer/wallet.uvue
+++ b/pages/mall/consumer/wallet.uvue
@@ -2,11 +2,9 @@
 <template>
 	<view class="wallet-page">
 		<!-- 顶部栏 -->
-		<view class="wallet-header">
+		<!--<view class="wallet-header">
 			<text class="back-btn" @click="goBack">‹</text>
-			<text class="header-title">我的钱包</text>
-			<text class="more-btn" @click="showMoreActions">···</text>
-		</view>
+		</view>-->
 
 		<scroll-view class="wallet-content" scroll-y>
 			<!-- 余额概览 -->
@@ -162,7 +160,7 @@
 
 <script setup lang="uts">
 import { ref, onMounted, computed, watch } from 'vue'
-import supa from '@/components/supadb/aksupainstance.uts'
+//import supa from '@/components/supadb/aksupainstance.uts'
 
 type WalletType = {
 	id: string
@@ -556,18 +554,6 @@ const goBack = () => {
 	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;
 }
diff --git a/pages/user/bind-email.uvue b/pages/user/bind-email.uvue
new file mode 100644
index 00000000..3fdd3ad5
--- /dev/null
+++ b/pages/user/bind-email.uvue
@@ -0,0 +1,544 @@
+<template>
+	<view class="bind-email-page">
+		<view class="header">
+			<view class="back-btn" @click="goBack">
+				<text class="back-icon">‹</text>
+			</view>
+			<text class="header-title">绑定邮箱</text>
+		</view>
+
+		<view class="content">
+			<view v-if="userInfo.email" class="already-bound">
+				<text class="bound-icon">✓</text>
+				<text class="bound-title">已绑定邮箱</text>
+				<text class="bound-email">{{ userInfo.email }}</text>
+				<text class="bound-time">绑定时间：{{ formatTime(userInfo.emailBoundTime) }}</text>
+			</view>
+
+			<form @submit="onSubmit" v-if="!userInfo.email || isChanging">
+				<!-- 邮箱输入 -->
+				<view class="form-item">
+					<text class="label">邮箱地址</text>
+					<input 
+						class="input" 
+						type="email" 
+						placeholder="请输入邮箱地址" 
+						v-model="form.email"
+						:disabled="loading"
+						required
+					/>
+				</view>
+
+				<!-- 验证码 -->
+				<view class="form-item">
+					<text class="label">验证码</text>
+					<view class="code-input-wrapper">
+						<input 
+							class="code-input" 
+							type="number" 
+							placeholder="请输入验证码" 
+							v-model="form.code"
+							:disabled="loading"
+							maxlength="6"
+							required
+						/>
+						<button 
+							class="get-code-btn" 
+							@click="getCode"
+							:disabled="!canGetCode || countdown > 0"
+						>
+							{{ countdown > 0 ? `${countdown}s后重新获取` : '获取验证码' }}
+						</button>
+					</view>
+				</view>
+
+				<!-- 提交按钮 -->
+				<button 
+					class="submit-btn" 
+					form-type="submit" 
+					:disabled="loading || !isFormValid"
+					:loading="loading"
+				>
+					{{ loading ? '处理中...' : userInfo.email ? '更换邮箱' : '绑定邮箱' }}
+				</button>
+			</form>
+
+			<view v-if="userInfo.email && !isChanging" class="action-buttons">
+				<button class="change-btn" @click="startChange">更换邮箱</button>
+				<button class="unbind-btn" @click="unbindEmail">解绑邮箱</button>
+			</view>
+		</view>
+
+		<!-- 成功提示 -->
+		<view v-if="showSuccess" class="success-modal" @click="hideSuccess">
+			<view class="success-content" @click.stop>
+				<text class="success-icon">✓</text>
+				<text class="success-title">{{ successTitle }}</text>
+				<text class="success-text">{{ successMessage }}</text>
+				<button class="success-btn" @click="hideSuccess">确定</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, computed, onMounted } from 'vue'
+//import supa from '@/components/supadb/aksupainstance.uts'
+
+// 用户信息
+const userInfo = ref({
+	email: '',
+	emailBoundTime: null as string | null
+})
+
+const form = ref({
+	email: '',
+	code: ''
+})
+
+const loading = ref<boolean>(false)
+const countdown = ref<number>(0)
+const isChanging = ref<boolean>(false)
+const showSuccess = ref<boolean>(false)
+const successTitle = ref<string>('')
+const successMessage = ref<string>('')
+
+// 表单验证
+const isFormValid = computed((): boolean => {
+	const { email, code } = form.value
+	const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+	return emailRegex.test(email) && /^\d{6}$/.test(code)
+})
+
+// 是否可以获取验证码
+const canGetCode = computed((): boolean => {
+	const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+	return emailRegex.test(form.value.email)
+})
+
+// 加载用户信息
+const loadUserInfo = () => {
+	const storedUserInfo = uni.getStorageSync('userInfo')
+	if (storedUserInfo) {
+		try {
+			const info = JSON.parse(storedUserInfo as string)
+			userInfo.value.email = info.email || ''
+			userInfo.value.emailBoundTime = info.emailBoundTime || null
+		} catch (e) {
+			console.error('Failed to parse user info', e)
+		}
+	}
+}
+
+// 获取验证码
+const getCode = () => {
+	if (!canGetCode.value) {
+		uni.showToast({
+			title: '请输入正确的邮箱地址',
+			icon: 'none'
+		})
+		return
+	}
+
+	// 开始倒计时
+	countdown.value = 60
+	const timer = setInterval(() => {
+		countdown.value--
+		if (countdown.value <= 0) {
+			clearInterval(timer)
+		}
+	}, 1000)
+
+	// 模拟发送验证码
+	uni.showToast({
+		title: '验证码已发送到邮箱',
+		icon: 'success'
+	})
+
+	// 实际项目中这里应该调用发送邮件的API
+	// const response = await sendEmailCode(form.value.email)
+}
+
+// 提交表单
+const onSubmit = async () => {
+	if (!isFormValid.value) {
+		uni.showToast({
+			title: '请填写完整且正确的信息',
+			icon: 'none'
+		})
+		return
+	}
+
+	loading.value = true
+
+	try {
+		// 模拟API调用
+		await new Promise(resolve => setTimeout(resolve, 1000))
+
+		// 更新本地用户信息
+		const storedUserInfo = uni.getStorageSync('userInfo')
+		let userInfoData = storedUserInfo ? JSON.parse(storedUserInfo as string) : {}
+		
+		userInfoData.email = form.value.email
+		userInfoData.emailBoundTime = new Date().toISOString()
+		
+		uni.setStorageSync('userInfo', JSON.stringify(userInfoData))
+		userInfo.value.email = form.value.email
+		userInfo.value.emailBoundTime = userInfoData.emailBoundTime
+
+		// 显示成功消息
+		successTitle.value = isChanging.value ? '更换成功' : '绑定成功'
+		successMessage.value = `邮箱 ${form.value.email} 已成功${isChanging.value ? '更换' : '绑定'}`
+		showSuccess.value = true
+		
+		// 重置表单
+		form.value = { email: '', code: '' }
+		isChanging.value = false
+
+	} catch (error: any) {
+		console.error('绑定邮箱失败:', error)
+		uni.showToast({
+			title: error.message || '操作失败',
+			icon: 'none'
+		})
+	} finally {
+		loading.value = false
+	}
+}
+
+// 开始更换邮箱
+const startChange = () => {
+	isChanging.value = true
+	form.value.email = userInfo.value.email
+}
+
+// 解绑邮箱
+const unbindEmail = () => {
+	uni.showModal({
+		title: '解绑邮箱',
+		content: '确定要解绑邮箱吗？解绑后可能影响账号安全',
+		success: async (res) => {
+			if (res.confirm) {
+				loading.value = true
+				
+				try {
+					// 模拟API调用
+					await new Promise(resolve => setTimeout(resolve, 1000))
+
+					// 更新本地用户信息
+					const storedUserInfo = uni.getStorageSync('userInfo')
+					let userInfoData = storedUserInfo ? JSON.parse(storedUserInfo as string) : {}
+					
+					userInfoData.email = ''
+					userInfoData.emailBoundTime = null
+					
+					uni.setStorageSync('userInfo', JSON.stringify(userInfoData))
+					userInfo.value.email = ''
+					userInfo.value.emailBoundTime = null
+
+					uni.showToast({
+						title: '解绑成功',
+						icon: 'success'
+					})
+
+				} catch (error: any) {
+					console.error('解绑失败:', error)
+					uni.showToast({
+						title: error.message || '解绑失败',
+						icon: 'none'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+		}
+	})
+}
+
+// 格式化时间显示
+const formatTime = (time: string | null): string => {
+	if (!time) return '未知'
+	const date = new Date(time)
+	return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
+}
+
+// 导航函数
+const goBack = () => {
+	uni.navigateBack()
+}
+
+const hideSuccess = () => {
+	showSuccess.value = false
+}
+
+// 生命周期
+onMounted(() => {
+	loadUserInfo()
+})
+</script>
+
+<style>
+.bind-email-page {
+	min-height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	width: 40px;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 10px;
+}
+
+.back-icon {
+	font-size: 24px;
+	color: #333;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	flex: 1;
+}
+
+.content {
+	padding: 20px;
+}
+
+.already-bound {
+	background-color: #ffffff;
+	border-radius: 10px;
+	padding: 20px;
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+.bound-icon {
+	display: block;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	background-color: #4cd964;
+	color: #ffffff;
+	font-size: 30px;
+	border-radius: 50%;
+	margin: 0 auto 15px;
+}
+
+.bound-title {
+	display: block;
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 5px;
+}
+
+.bound-email {
+	display: block;
+	font-size: 16px;
+	color: #007aff;
+	margin-bottom: 10px;
+	font-weight: bold;
+	word-break: break-all;
+}
+
+.bound-time {
+	display: block;
+	font-size: 14px;
+	color: #999;
+}
+
+.form-item {
+	margin-bottom: 20px;
+	background-color: #ffffff;
+	border-radius: 10px;
+	padding: 15px;
+}
+
+.label {
+	display: block;
+	font-size: 16px;
+	color: #333;
+	margin-bottom: 10px;
+	font-weight: bold;
+}
+
+.input {
+	width: 100%;
+	height: 44px;
+	border: 1px solid #ddd;
+	border-radius: 8px;
+	padding: 0 15px;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+
+.input:focus {
+	border-color: #007aff;
+	outline: none;
+}
+
+.input:disabled {
+	background-color: #f9f9f9;
+	color: #999;
+}
+
+.code-input-wrapper {
+	display: flex;
+	gap: 10px;
+}
+
+.code-input {
+	flex: 1;
+	height: 44px;
+	border: 1px solid #ddd;
+	border-radius: 8px;
+	padding: 0 15px;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+
+.get-code-btn {
+	width: 120px;
+	height: 44px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 8px;
+	font-size: 14px;
+	border: none;
+}
+
+.get-code-btn:disabled {
+	background-color: #cccccc;
+}
+
+.submit-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+	margin-top: 30px;
+}
+
+.submit-btn:disabled {
+	background-color: #cccccc;
+}
+
+.action-buttons {
+	display: flex;
+	flex-direction: column;
+	gap: 15px;
+	margin-top: 20px;
+}
+
+.change-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #ffffff;
+	color: #007aff;
+	border: 2px solid #007aff;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.unbind-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #ffffff;
+	color: #ff3b30;
+	border: 2px solid #ff3b30;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+/* 成功提示模态框 */
+.success-modal {
+	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: 1000;
+}
+
+.success-content {
+	width: 280px;
+	background-color: #ffffff;
+	border-radius: 15px;
+	padding: 30px 20px;
+	text-align: center;
+}
+
+.success-icon {
+	display: block;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	background-color: #4cd964;
+	color: #ffffff;
+	font-size: 30px;
+	border-radius: 50%;
+	margin: 0 auto 20px;
+}
+
+.success-title {
+	display: block;
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 10px;
+}
+
+.success-text {
+	display: block;
+	font-size: 14px;
+	color: #666;
+	margin-bottom: 20px;
+	line-height: 1.4;
+}
+
+.success-btn {
+	width: 100%;
+	height: 44px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 22px;
+	font-size: 16px;
+	border: none;
+}
+
+/* 响应式优化 */
+@media screen and (min-width: 768px) {
+	.bind-email-page {
+		max-width: 500px;
+		margin: 0 auto;
+		border-left: 1px solid #e5e5e5;
+		border-right: 1px solid #e5e5e5;
+	}
+
+	.content {
+		padding: 40px;
+	}
+}
+</style>
diff --git a/pages/user/bind-phone.uvue b/pages/user/bind-phone.uvue
new file mode 100644
index 00000000..c98e6406
--- /dev/null
+++ b/pages/user/bind-phone.uvue
@@ -0,0 +1,548 @@
+<template>
+	<view class="bind-phone-page">
+		<view class="header">
+			<view class="back-btn" @click="goBack">
+				<text class="back-icon">‹</text>
+			</view>
+			<text class="header-title">绑定手机</text>
+		</view>
+
+		<view class="content">
+			<view v-if="userInfo.phone" class="already-bound">
+				<text class="bound-icon">✓</text>
+				<text class="bound-title">已绑定手机</text>
+				<text class="bound-phone">{{ formatPhone(userInfo.phone) }}</text>
+				<text class="bound-time">绑定时间：{{ formatTime(userInfo.phoneBoundTime) }}</text>
+			</view>
+
+			<form @submit="onSubmit" v-if="!userInfo.phone || isChanging">
+				<!-- 手机号输入 -->
+				<view class="form-item">
+					<text class="label">手机号</text>
+					<input 
+						class="input" 
+						type="number" 
+						placeholder="请输入手机号" 
+						v-model="form.phone"
+						:disabled="loading || countdown > 0"
+						maxlength="11"
+						required
+					/>
+				</view>
+
+				<!-- 验证码 -->
+				<view class="form-item">
+					<text class="label">验证码</text>
+					<view class="code-input-wrapper">
+						<input 
+							class="code-input" 
+							type="number" 
+							placeholder="请输入验证码" 
+							v-model="form.code"
+							:disabled="loading"
+							maxlength="6"
+							required
+						/>
+						<button 
+							class="get-code-btn" 
+							@click="getCode"
+							:disabled="!canGetCode || countdown > 0"
+						>
+							{{ countdown > 0 ? `${countdown}s后重新获取` : '获取验证码' }}
+						</button>
+					</view>
+				</view>
+
+				<!-- 提交按钮 -->
+				<button 
+					class="submit-btn" 
+					form-type="submit" 
+					:disabled="loading || !isFormValid"
+					:loading="loading"
+				>
+					{{ loading ? '处理中...' : userInfo.phone ? '更换手机号' : '绑定手机号' }}
+				</button>
+			</form>
+
+			<view v-if="userInfo.phone && !isChanging" class="action-buttons">
+				<button class="change-btn" @click="startChange">更换手机号</button>
+				<button class="unbind-btn" @click="unbindPhone">解绑手机</button>
+			</view>
+		</view>
+
+		<!-- 成功提示 -->
+		<view v-if="showSuccess" class="success-modal" @click="hideSuccess">
+			<view class="success-content" @click.stop>
+				<text class="success-icon">✓</text>
+				<text class="success-title">{{ successTitle }}</text>
+				<text class="success-text">{{ successMessage }}</text>
+				<button class="success-btn" @click="hideSuccess">确定</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, computed, onMounted } from 'vue'
+//import supa from '@/components/supadb/aksupainstance.uts'
+
+// 用户信息
+const userInfo = ref({
+	phone: '',
+	phoneBoundTime: null as string | null
+})
+
+const form = ref({
+	phone: '',
+	code: ''
+})
+
+const loading = ref<boolean>(false)
+const countdown = ref<number>(0)
+const isChanging = ref<boolean>(false)
+const showSuccess = ref<boolean>(false)
+const successTitle = ref<string>('')
+const successMessage = ref<string>('')
+
+// 表单验证
+const isFormValid = computed((): boolean => {
+	const { phone, code } = form.value
+	return /^1[3-9]\d{9}$/.test(phone) && /^\d{6}$/.test(code)
+})
+
+// 是否可以获取验证码
+const canGetCode = computed((): boolean => {
+	return /^1[3-9]\d{9}$/.test(form.value.phone)
+})
+
+// 加载用户信息
+const loadUserInfo = () => {
+	const storedUserInfo = uni.getStorageSync('userInfo')
+	if (storedUserInfo) {
+		try {
+			const info = JSON.parse(storedUserInfo as string)
+			userInfo.value.phone = info.phone || ''
+			userInfo.value.phoneBoundTime = info.phoneBoundTime || null
+		} catch (e) {
+			console.error('Failed to parse user info', e)
+		}
+	}
+}
+
+// 获取验证码
+const getCode = () => {
+	if (!canGetCode.value) {
+		uni.showToast({
+			title: '请输入正确的手机号',
+			icon: 'none'
+		})
+		return
+	}
+
+	// 开始倒计时
+	countdown.value = 60
+	const timer = setInterval(() => {
+		countdown.value--
+		if (countdown.value <= 0) {
+			clearInterval(timer)
+		}
+	}, 1000)
+
+	// 模拟发送验证码
+	uni.showToast({
+		title: '验证码已发送',
+		icon: 'success'
+	})
+
+	// 实际项目中这里应该调用发送短信的API
+	// const response = await sendSmsCode(form.value.phone)
+}
+
+// 提交表单
+const onSubmit = async () => {
+	if (!isFormValid.value) {
+		uni.showToast({
+			title: '请填写完整且正确的信息',
+			icon: 'none'
+		})
+		return
+	}
+
+	loading.value = true
+
+	try {
+		// 模拟API调用
+		await new Promise(resolve => setTimeout(resolve, 1000))
+
+		// 更新本地用户信息
+		const storedUserInfo = uni.getStorageSync('userInfo')
+		let userInfoData = storedUserInfo ? JSON.parse(storedUserInfo as string) : {}
+		
+		userInfoData.phone = form.value.phone
+		userInfoData.phoneBoundTime = new Date().toISOString()
+		
+		uni.setStorageSync('userInfo', JSON.stringify(userInfoData))
+		userInfo.value.phone = form.value.phone
+		userInfo.value.phoneBoundTime = userInfoData.phoneBoundTime
+
+		// 显示成功消息
+		successTitle.value = isChanging.value ? '更换成功' : '绑定成功'
+		successMessage.value = `手机号 ${formatPhone(form.value.phone)} 已成功${isChanging.value ? '更换' : '绑定'}`
+		showSuccess.value = true
+		
+		// 重置表单
+		form.value = { phone: '', code: '' }
+		isChanging.value = false
+
+	} catch (error: any) {
+		console.error('绑定手机失败:', error)
+		uni.showToast({
+			title: error.message || '操作失败',
+			icon: 'none'
+		})
+	} finally {
+		loading.value = false
+	}
+}
+
+// 开始更换手机号
+const startChange = () => {
+	isChanging.value = true
+	form.value.phone = userInfo.value.phone
+}
+
+// 解绑手机
+const unbindPhone = () => {
+	uni.showModal({
+		title: '解绑手机',
+		content: '确定要解绑手机吗？解绑后可能影响账号安全',
+		success: async (res) => {
+			if (res.confirm) {
+				loading.value = true
+				
+				try {
+					// 模拟API调用
+					await new Promise(resolve => setTimeout(resolve, 1000))
+
+					// 更新本地用户信息
+					const storedUserInfo = uni.getStorageSync('userInfo')
+					let userInfoData = storedUserInfo ? JSON.parse(storedUserInfo as string) : {}
+					
+					userInfoData.phone = ''
+					userInfoData.phoneBoundTime = null
+					
+					uni.setStorageSync('userInfo', JSON.stringify(userInfoData))
+					userInfo.value.phone = ''
+					userInfo.value.phoneBoundTime = null
+
+					uni.showToast({
+						title: '解绑成功',
+						icon: 'success'
+					})
+
+				} catch (error: any) {
+					console.error('解绑失败:', error)
+					uni.showToast({
+						title: error.message || '解绑失败',
+						icon: 'none'
+					})
+				} finally {
+					loading.value = false
+				}
+			}
+		}
+	})
+}
+
+// 格式化手机号显示
+const formatPhone = (phone: string): string => {
+	if (!phone) return ''
+	return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
+}
+
+// 格式化时间显示
+const formatTime = (time: string | null): string => {
+	if (!time) return '未知'
+	const date = new Date(time)
+	return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
+}
+
+// 导航函数
+const goBack = () => {
+	uni.navigateBack()
+}
+
+const hideSuccess = () => {
+	showSuccess.value = false
+}
+
+// 生命周期
+onMounted(() => {
+	loadUserInfo()
+})
+</script>
+
+<style>
+.bind-phone-page {
+	min-height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	width: 40px;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 10px;
+}
+
+.back-icon {
+	font-size: 24px;
+	color: #333;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	flex: 1;
+}
+
+.content {
+	padding: 20px;
+}
+
+.already-bound {
+	background-color: #ffffff;
+	border-radius: 10px;
+	padding: 20px;
+	margin-bottom: 20px;
+	text-align: center;
+}
+
+.bound-icon {
+	display: block;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	background-color: #4cd964;
+	color: #ffffff;
+	font-size: 30px;
+	border-radius: 50%;
+	margin: 0 auto 15px;
+}
+
+.bound-title {
+	display: block;
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 5px;
+}
+
+.bound-phone {
+	display: block;
+	font-size: 24px;
+	color: #007aff;
+	margin-bottom: 10px;
+	font-weight: bold;
+}
+
+.bound-time {
+	display: block;
+	font-size: 14px;
+	color: #999;
+}
+
+.form-item {
+	margin-bottom: 20px;
+	background-color: #ffffff;
+	border-radius: 10px;
+	padding: 15px;
+}
+
+.label {
+	display: block;
+	font-size: 16px;
+	color: #333;
+	margin-bottom: 10px;
+	font-weight: bold;
+}
+
+.input {
+	width: 100%;
+	height: 44px;
+	border: 1px solid #ddd;
+	border-radius: 8px;
+	padding: 0 15px;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+
+.input:focus {
+	border-color: #007aff;
+	outline: none;
+}
+
+.input:disabled {
+	background-color: #f9f9f9;
+	color: #999;
+}
+
+.code-input-wrapper {
+	display: flex;
+	gap: 10px;
+}
+
+.code-input {
+	flex: 1;
+	height: 44px;
+	border: 1px solid #ddd;
+	border-radius: 8px;
+	padding: 0 15px;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+
+.get-code-btn {
+	width: 120px;
+	height: 44px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 8px;
+	font-size: 14px;
+	border: none;
+}
+
+.get-code-btn:disabled {
+	background-color: #cccccc;
+}
+
+.submit-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+	margin-top: 30px;
+}
+
+.submit-btn:disabled {
+	background-color: #cccccc;
+}
+
+.action-buttons {
+	display: flex;
+	flex-direction: column;
+	gap: 15px;
+	margin-top: 20px;
+}
+
+.change-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #ffffff;
+	color: #007aff;
+	border: 2px solid #007aff;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.unbind-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #ffffff;
+	color: #ff3b30;
+	border: 2px solid #ff3b30;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+/* 成功提示模态框 */
+.success-modal {
+	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: 1000;
+}
+
+.success-content {
+	width: 280px;
+	background-color: #ffffff;
+	border-radius: 15px;
+	padding: 30px 20px;
+	text-align: center;
+}
+
+.success-icon {
+	display: block;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	background-color: #4cd964;
+	color: #ffffff;
+	font-size: 30px;
+	border-radius: 50%;
+	margin: 0 auto 20px;
+}
+
+.success-title {
+	display: block;
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 10px;
+}
+
+.success-text {
+	display: block;
+	font-size: 14px;
+	color: #666;
+	margin-bottom: 20px;
+	line-height: 1.4;
+}
+
+.success-btn {
+	width: 100%;
+	height: 44px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 22px;
+	font-size: 16px;
+	border: none;
+}
+
+/* 响应式优化 */
+@media screen and (min-width: 768px) {
+	.bind-phone-page {
+		max-width: 500px;
+		margin: 0 auto;
+		border-left: 1px solid #e5e5e5;
+		border-right: 1px solid #e5e5e5;
+	}
+
+	.content {
+		padding: 40px;
+	}
+}
+</style>
diff --git a/pages/user/change-password.uvue b/pages/user/change-password.uvue
new file mode 100644
index 00000000..3b8584d3
--- /dev/null
+++ b/pages/user/change-password.uvue
@@ -0,0 +1,353 @@
+<template>
+	<view class="change-password-page">
+		<view class="header">
+			<view class="back-btn" @click="goBack">
+				<text class="back-icon">‹</text>
+			</view>
+			<text class="header-title">修改密码</text>
+		</view>
+
+		<view class="content">
+			<form @submit="onSubmit">
+				<!-- 当前密码 -->
+				<view class="form-item">
+					<text class="label">当前密码</text>
+					<input 
+						class="input" 
+						type="password" 
+						placeholder="请输入当前密码" 
+						v-model="form.currentPassword"
+						:disabled="loading"
+						required
+					/>
+				</view>
+
+				<!-- 新密码 -->
+				<view class="form-item">
+					<text class="label">新密码</text>
+					<input 
+						class="input" 
+						type="password" 
+						placeholder="请输入新密码（6-20位字符）" 
+						v-model="form.newPassword"
+						:disabled="loading"
+						required
+					/>
+					<text class="hint">6-20位字符，建议包含字母、数字和特殊符号</text>
+				</view>
+
+				<!-- 确认新密码 -->
+				<view class="form-item">
+					<text class="label">确认新密码</text>
+					<input 
+						class="input" 
+						type="password" 
+						placeholder="请再次输入新密码" 
+						v-model="form.confirmPassword"
+						:disabled="loading"
+						required
+					/>
+				</view>
+
+				<!-- 提交按钮 -->
+				<button 
+					class="submit-btn" 
+					form-type="submit" 
+					:disabled="loading || !isFormValid"
+					:loading="loading"
+				>
+					{{ loading ? '处理中...' : '确认修改' }}
+				</button>
+			</form>
+
+			<!-- 忘记密码提示 -->
+			<view class="forgot-password">
+				<text class="forgot-text" @click="goToForgotPassword">忘记密码？</text>
+			</view>
+		</view>
+
+		<!-- 成功提示 -->
+		<view v-if="showSuccess" class="success-modal" @click="hideSuccess">
+			<view class="success-content" @click.stop>
+				<text class="success-icon">✓</text>
+				<text class="success-title">修改成功</text>
+				<text class="success-text">密码已成功修改，请使用新密码登录</text>
+				<button class="success-btn" @click="hideSuccess">确定</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="uts">
+import { ref, computed } from 'vue'
+import supa from '@/components/supadb/aksupainstance.uts'
+
+// 表单数据
+const form = ref({
+	currentPassword: '',
+	newPassword: '',
+	confirmPassword: ''
+})
+
+const loading = ref<boolean>(false)
+const showSuccess = ref<boolean>(false)
+
+// 表单验证
+const isFormValid = computed((): boolean => {
+	const { currentPassword, newPassword, confirmPassword } = form.value
+	return currentPassword.length >= 6 && 
+		   newPassword.length >= 6 && 
+		   newPassword.length <= 20 &&
+		   newPassword === confirmPassword
+})
+
+// 提交表单
+const onSubmit = async () => {
+	if (!isFormValid.value) {
+		uni.showToast({
+			title: '请填写完整且正确的密码信息',
+			icon: 'none'
+		})
+		return
+	}
+
+	loading.value = true
+
+	try {
+		// 调用 Supabase 更新密码
+		const { error } = await supa.auth.updateUser({
+			password: form.value.newPassword
+		})
+
+		if (error !== null) {
+			throw error
+		}
+
+		// 成功
+		showSuccess.value = true
+		
+		// 清除表单
+		form.value = {
+			currentPassword: '',
+			newPassword: '',
+			confirmPassword: ''
+		}
+
+	} catch (error: any) {
+		console.error('修改密码失败:', error)
+		
+		let errorMessage = '修改密码失败'
+		if (error.message?.includes('invalid_credentials')) {
+			errorMessage = '当前密码错误'
+		} else if (error.message?.includes('password')) {
+			errorMessage = '新密码不符合要求'
+		}
+
+		uni.showToast({
+			title: errorMessage,
+			icon: 'none'
+		})
+	} finally {
+		loading.value = false
+	}
+}
+
+// 导航函数
+const goBack = () => {
+	uni.navigateBack()
+}
+
+const goToForgotPassword = () => {
+	uni.navigateTo({
+		url: '/pages/user/forgot-password'
+	})
+}
+
+const hideSuccess = () => {
+	showSuccess.value = false
+	goBack()
+}
+</script>
+
+<style>
+.change-password-page {
+	min-height: 100vh;
+	background-color: #f5f5f5;
+}
+
+.header {
+	background-color: #ffffff;
+	padding: 15px;
+	display: flex;
+	align-items: center;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.back-btn {
+	width: 40px;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-right: 10px;
+}
+
+.back-icon {
+	font-size: 24px;
+	color: #333;
+}
+
+.header-title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	flex: 1;
+}
+
+.content {
+	padding: 20px;
+}
+
+.form-item {
+	margin-bottom: 20px;
+	background-color: #ffffff;
+	border-radius: 10px;
+	padding: 15px;
+}
+
+.label {
+	display: block;
+	font-size: 16px;
+	color: #333;
+	margin-bottom: 10px;
+	font-weight: bold;
+}
+
+.input {
+	width: 100%;
+	height: 44px;
+	border: 1px solid #ddd;
+	border-radius: 8px;
+	padding: 0 15px;
+	font-size: 16px;
+	box-sizing: border-box;
+}
+
+.input:focus {
+	border-color: #007aff;
+	outline: none;
+}
+
+.input:disabled {
+	background-color: #f9f9f9;
+	color: #999;
+}
+
+.hint {
+	display: block;
+	font-size: 12px;
+	color: #999;
+	margin-top: 5px;
+}
+
+.submit-btn {
+	width: 100%;
+	height: 50px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 25px;
+	font-size: 16px;
+	font-weight: bold;
+	border: none;
+	margin-top: 30px;
+}
+
+.submit-btn:disabled {
+	background-color: #cccccc;
+}
+
+.forgot-password {
+	text-align: center;
+	margin-top: 20px;
+}
+
+.forgot-text {
+	color: #007aff;
+	font-size: 14px;
+	text-decoration: underline;
+}
+
+/* 成功提示模态框 */
+.success-modal {
+	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: 1000;
+}
+
+.success-content {
+	width: 280px;
+	background-color: #ffffff;
+	border-radius: 15px;
+	padding: 30px 20px;
+	text-align: center;
+}
+
+.success-icon {
+	display: block;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	background-color: #4cd964;
+	color: #ffffff;
+	font-size: 30px;
+	border-radius: 50%;
+	margin: 0 auto 20px;
+}
+
+.success-title {
+	display: block;
+	font-size: 18px;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 10px;
+}
+
+.success-text {
+	display: block;
+	font-size: 14px;
+	color: #666;
+	margin-bottom: 20px;
+	line-height: 1.4;
+}
+
+.success-btn {
+	width: 100%;
+	height: 44px;
+	background-color: #007aff;
+	color: #ffffff;
+	border-radius: 22px;
+	font-size: 16px;
+	border: none;
+}
+
+/* 响应式优化 */
+@media screen and (min-width: 768px) {
+	.change-password-page {
+		max-width: 500px;
+		margin: 0 auto;
+		border-left: 1px solid #e5e5e5;
+		border-right: 1px solid #e5e5e5;
+	}
+
+	.content {
+		padding: 40px;
+	}
+}
+</style>