123

doc/消费者APP/确认订单页（单商品）（取消支付前）/确认订单页（单商品）前端技术方案.md

@@ -3,7 +3,7 @@
 > **依据：** 《确认订单页（单商品）功能需求.md》v1.0、《确认订单页（单商品）技术方案.md》v1.0  
 > **关联：** 《商品详情内页前端技术方案》v1.0、《我的服务前端技术方案》、《确认订单页（多商品）技术方案》v1.1（接口同源）  
 > **范围：** 消费者 APP **`shop-app`** 立即购买确认页、支付结果交互；**不** 改后端、**不** 实现购物车合单页、**不** 实现我的订单列表。  
-> **实现状态：** **待建设**；商品详情 `doBuyNow` 当前为占位 Toast。
+> **实现状态：** 页面与 API 已落地（v1.1）；支付为 **Mock 弹窗** + `pay`/`cancel` 接口，待联调。
 
 ---
 
@@ -47,26 +47,28 @@ export const PAGE_PAY_RESULT = '/subpackage/order/pay-result'
 
 ---
 
-## 3. 文件清单（规划）
+## 3. 文件清单
 
 | 类型 | 路径 | 说明 |
 |------|------|------|
-| 确认页 | `shop-app/subpackage/order/checkout.vue` | 地址 + 商品 + 金额 + 备注 + 提交 |
-| 支付结果 | `shop-app/subpackage/order/pay-result.vue` | 成功/关闭文案（可选） |
-| 地址条 | `shop-app/components/order/AddressBar.vue` | 展示/切换地址 |
-| 商品行 | `shop-app/components/order/CheckoutGoodsRow.vue` | 单商品展示 + 改量 |
+| 确认页 | `shop-app/subpackage/order/checkout.vue` | 地址 + 商品 + 金额 + 备注 + 提交 + Mock 支付弹窗 |
+| 支付结果 | `shop-app/subpackage/order/pay-result.vue` | 成功/关闭结果页 |
+| 地址条 | `shop-app/components/order/AddressBar.vue` | 展示/点击切换 |
+| 商品行 | `shop-app/components/order/CheckoutGoodsRow.vue` | 单商品 + 规格列表 + 改量 |
 | API | `shop-app/api/checkout.js` | preview / submit |
 | API | `shop-app/api/order.js` | pay / cancel / detail |
 | 映射 | `shop-app/utils/checkoutDisplay.js` | preview VO → 页面模型 |
-| 常量 | `shop-app/constants/checkout.js` | `SOURCE_BUY_NOW`、错误文案 |
+| 常量 | `shop-app/constants/checkout.js` | `SOURCE_BUY_NOW`、`PAY_TYPE=1`、备注上限 |
 
-**需改上游：**
+**已改上游：**
 
 | 文件 | 改动 |
 |------|------|
-| `subpackage/goods/detail.vue` | `doBuyNow` → `navigateTo` checkout 带参 |
-| `pages.json` | 注册 `subpackage/order/*` |
-| `utils/goodsDetail.js` | 已有 `formatSpecDisplayText` |
+| `subpackage/goods/detail.vue` | `doBuyNow` → `PAGE_CHECKOUT` 带 `goodsId/quantity/specText` |
+| `pages.json` | 分包 `pkg-order` |
+| `utils/pageRoute.js` | `PAGE_CHECKOUT`、`PAGE_PAY_RESULT` |
+| `utils/goodsDetail.js` | `formatSpecDisplayText`（`§` 分隔规格） |
+| `utils/cartSpec.js` | `parseCartSpecText` 确认页规格展示复用 |
 
 ---
 
@@ -295,7 +297,8 @@ async function doBuyNow() {
 | 版本 | 说明 |
 |------|------|
 | **v1.0** | 首版：BUY_NOW 确认页路由、checkout/order API、详情跳转、支付取消闭环 |
+| **v1.1** | 落地 checkout/pay-result 页面与组件；规格展示复用 `parseCartSpecText` |
 
 ---
 
-*文档版本：v1.0 · 工程目录 `shop-app` · 关联《确认订单页（单商品）功能需求.md》v1.0、《确认订单页（单商品）技术方案.md》v1.0*
+*文档版本：v1.1 · 工程目录 `shop-app` · 不修改《确认订单页（单商品）技术方案.md》（后端方案）*

doc/消费者APP/确认订单页（多商品）/确认订单页（多商品）前端技术方案.md

@@ -0,0 +1,328 @@
+# 确认订单页（多商品）— 前端技术方案（C 端 · shop-app）
+
+> **依据：** 《确认订单页（多商品）功能需求.md》v1.1、《确认订单页（多商品）技术方案.md》v1.1  
+> **关联：** 《购物车前端技术方案》、《确认订单页（单商品）前端技术方案》v1.1（接口同源）  
+> **范围：** 消费者 APP **`shop-app`** 购物车 **同店去结算** 确认页、支付结果交互；**不** 改后端、**不** 实现我的订单列表。  
+> **实现状态：** 页面与 API 已落地（v1.0）；支付为 **Mock 弹窗** + `pay`/`cancel` 接口，待联调。
+
+---
+
+## 1. 技术栈与约定
+
+| 项 | 说明 |
+|----|------|
+| 框架 | uni-app **Vue 3** + **uview-plus** |
+| 请求 | `@/utils/request`；须会员 Token |
+| 鉴权 | 进入页 **`ensureApiToken()`**；无 Token → 引导登录 |
+| 规格 v1 | **统一规格**；`specText` 读购物车快照，展示用 `parseCartSpecText` |
+| 数据源 | **`source=CART`**；preview/submit 带 **cartItemIds** + **items 多行** |
+| 与单商品分工 | 单商品走 `checkout.vue`（`BUY_NOW`）；本页 **独立路由** `checkout-cart.vue` |
+| 参考 | `subpackage/order/checkout.vue`（地址/金额/支付）、`pages/cart/index.vue`（去结算入口） |
+
+---
+
+## 2. 页面与路由
+
+| 页面 | 路径 | 入口 |
+|------|------|------|
+| 确认订单（多商品） | `subpackage/order/checkout-cart` | 购物车 Tab · **去结算** |
+| 支付结果（共用） | `subpackage/order/pay-result` | 支付成功/关闭后跳转 |
+
+**Query / 入参：**
+
+| 参数 | 必填 | 说明 |
+|------|:----:|------|
+| cartItemIds | ✓ | 逗号分隔的购物车行 ID，如 `12,34,56` |
+
+> **兜底：** 同时写入 `uni.setStorageSync('cart_checkout_item_ids')`；query 缺失时从 storage 读取。
+
+**路径常量：**
+
+```javascript
+// utils/pageRoute.js
+export const PAGE_CHECKOUT_CART = '/subpackage/order/checkout-cart'
+export const PAGE_PAY_RESULT = '/subpackage/order/pay-result'
+```
+
+**分包注册：** `pages.json` → `pkg-order` 增加 `checkout-cart`；`preloadRule` 为 `pages/cart/index` 预加载 `pkg-order`。
+
+---
+
+## 3. 文件清单
+
+| 类型 | 路径 | 说明 |
+|------|------|------|
+| 确认页 | `shop-app/subpackage/order/checkout-cart.vue` | 地址 + 多商品 + 金额 + 行备注 + 提交 + Mock 支付 |
+| 支付结果 | `shop-app/subpackage/order/pay-result.vue` | 与单商品共用 |
+| 地址条 | `shop-app/components/order/AddressBar.vue` | 展示/点击切换（复用） |
+| 多商品行 | `shop-app/components/order/CheckoutMultiGoodsRow.vue` | 规格列表 + 改量 + **行备注** |
+| 导航 | `shop-app/utils/checkoutNav.js` | `goCartCheckout(cartItemIds)` |
+| API | `shop-app/api/checkout.js` | preview / submit |
+| API | `shop-app/api/cart.js` | `prepareCartCheckout`（进页前门禁） |
+| API | `shop-app/api/order.js` | pay / cancel |
+| 映射 | `shop-app/utils/checkoutDisplay.js` | `mapCheckoutPreviewCart`、`mapGoodsItem` |
+| 常量 | `shop-app/constants/checkout.js` | `SOURCE_CART`、`CART_CHECKOUT_IDS_KEY`、备注上限 |
+
+**已改上游：**
+
+| 文件 | 改动 |
+|------|------|
+| `pages/cart/index.vue` | `onCheckout`：`prepareCartCheckout` → `goCartCheckout(ids)` |
+| `pages.json` | 注册 `checkout-cart`；购物车预加载 `pkg-order` |
+| `utils/pageRoute.js` | `PAGE_CHECKOUT_CART` |
+
+---
+
+## 4. 接口封装
+
+### 4.1 进页前门禁 `api/cart.js`
+
+| 方法 | HTTP | 路径 | 说明 |
+|------|------|------|------|
+| `prepareCartCheckout(cartItemIds)` | POST | `/api/cart/checkout/prepare` | 同店、四条件、库存等轻量校验 |
+
+购物车 **去结算** 先调此接口，成功后再跳转确认页。
+
+### 4.2 确认页 `api/checkout.js`
+
+| 方法 | HTTP | 路径 | 说明 |
+|------|------|------|------|
+| `previewCheckout(data)` | POST | `/api/checkout/preview` | 进入/改量/换地址 |
+| `submitCheckout(data)` | POST | `/api/checkout/submit` | 提交订单 |
+
+**preview Body（CART）：**
+
+```javascript
+{
+  source: 'CART',
+  addressId: 123,              // 可选；不传用默认地址
+  cartItemIds: [12, 34, 56],
+  items: [                     // 改量时带上最新 quantity
+    { cartItemId: 12, goodsId: 1, quantity: 2 },
+    { cartItemId: 34, goodsId: 2, quantity: 1 }
+  ]
+}
+```
+
+**submit Body（CART）：**
+
+```javascript
+{
+  source: 'CART',
+  addressId: 123,              // 必填
+  payType: '1',                // 微信支付
+  cartItemIds: [12, 34, 56],
+  items: [
+    {
+      cartItemId: 12,
+      goodsId: 1,
+      quantity: 2,
+      buyerRemark: '尽快发货'   // 每行独立备注
+    },
+    { cartItemId: 34, goodsId: 2, quantity: 1, buyerRemark: '' }
+  ]
+}
+```
+
+### 4.3 支付 `api/order.js`（复用单商品）
+
+| 方法 | HTTP | 路径 | 说明 |
+|------|------|------|------|
+| `payOrder(orderId)` | POST | `/api/order/{orderId}/pay` | v1 Mock 直接成功 |
+| `cancelPay(orderId)` | POST | `/api/order/{orderId}/pay/cancel` | 用户取消收银台 |
+
+### 4.4 地址（复用）
+
+| 方法 | HTTP | 路径 |
+|------|------|------|
+| `getAddressList` | GET | `/api/member/address/list` |
+
+维护地址 → 跳转 `subpackage/account/address-edit?mode=add`。
+
+---
+
+## 5. 页面结构（checkout-cart.vue）
+
+```text
+确认订单 checkout-cart.vue
+├── 导航栏「确认订单」
+├── AddressBar（整单统一地址）
+├── 店铺头（avatar + shopName，一单同店）
+├── goods-card
+│     └── CheckoutMultiGoodsRow × N
+│           ├── 主图、名称、specList、serviceDesc
+│           ├── 单价、数量 stepper（1～maxStock）
+│           ├── 行小计
+│           └── 行备注 input（≤200 字）
+├── 金额区
+│     ├── 商品总价 goodsAmountText
+│     ├── 运费 freightAmountText + freightDesc
+│     └── （应付在底栏展示）
+├── 支付方式（微信支付，固定选中）
+└── 底栏：应付 payAmountText + 「提交订单」
+```
+
+与单商品页差异：**无整单备注区**；备注在 **每个商品行** 内填写。
+
+---
+
+## 6. 交互流程
+
+### 6.1 购物车 → 确认页
+
+```text
+cart · 去结算
+    → 校验：至少勾选 1 件可购商品、且仅 1 家店（跨店 Toast）
+    → prepareCartCheckout(cartItemIds)
+    → goCartCheckout(ids)
+         · setStorage cart_checkout_item_ids
+         · navigateTo PAGE_CHECKOUT_CART?cartItemIds=12,34
+checkout-cart onLoad
+    → 解析 cartItemIds（query 或 storage）
+checkout-cart onShow
+    → previewCheckout({ source: 'CART', cartItemIds, items? })
+    → mapCheckoutPreviewCart → 渲染 address / shop / goodsList / 金额
+```
+
+### 6.2 改数量
+
+```text
+用户在某行 +/- quantity
+    → 本地更新该行 quantity（≥1，≤ maxStock）
+    → debounce 300ms → previewCheckout（带 addressId + 全量 items 数量）
+    → 刷新各行 subtotal、goodsAmount / freight / payAmount
+```
+
+### 6.3 行备注
+
+```text
+用户在行内 input 输入 buyerRemark
+    → 仅更新本地 preview.goodsList[].buyerRemark
+    → **不** 触发 preview（提交时一并带上）
+    → preview 刷新时通过 remarkMap 保留已输入备注
+```
+
+### 6.4 切换地址
+
+```text
+点击 AddressBar
+    → 弹层 getAddressList()
+    → 选择 addressId → debounce preview
+    → 运费可能变化，刷新应付
+无地址
+    → 展示空态 / submit 拦截「请选择收货地址」
+    → 引导跳转新增地址
+```
+
+### 6.5 提交与支付
+
+```text
+点击「提交订单」
+    → 校验 addressId
+    → submitCheckout（每行 buyerRemark）
+    → 成功得 orderId → Mock 支付弹窗
+        ├── 确认支付 → payOrder → pay-result?status=success
+        │     → 清除 cart_checkout_item_ids storage
+        └── 取消支付 → cancelPay → pay-result?status=closed
+```
+
+| 规则 | 前端 |
+|------|------|
+| 防重复提交 | submit/pay 中 loading + 按钮 disabled |
+| 取消关闭订单 | 弹窗「取消支付」→ cancelPay |
+| 库存/下架失败 | 展示后端 `msg`；不生成订单 |
+| 支付成功删购物车行 | **后端** 处理；前端支付成功后返回购物车 Tab 将看到行已消失 |
+
+---
+
+## 7. 数据映射 `checkoutDisplay.js`
+
+```javascript
+/** preview data → 多商品页面模型 */
+export function mapCheckoutPreviewCart(data, remarkMap = {}) {
+  const base = mapShopAndAddress(data)  // shop、address、金额文案
+  const goodsList = (data.items || []).map((row) => {
+    const item = mapGoodsItem(row)      // specList、priceText、maxStock…
+    if (item.cartItemId && remarkMap[item.cartItemId] != null) {
+      item.buyerRemark = remarkMap[item.cartItemId]  // 保留用户已填备注
+    }
+    return item
+  }).filter(Boolean)
+  return { ...base, goodsList }
+}
+```
+
+`mapGoodsItem` 内 `parseCartSpecText(specText)` 将 `§` 分隔规格拆成列表展示。
+
+---
+
+## 8. 导航工具 `checkoutNav.js`
+
+```javascript
+import { PAGE_CHECKOUT_CART } from '@/utils/pageRoute'
+import { CART_CHECKOUT_IDS_KEY } from '@/constants/checkout'
+
+export function goCartCheckout(cartItemIds) {
+  const ids = (cartItemIds || []).filter(Boolean)
+  if (!ids.length) return
+  uni.setStorageSync(CART_CHECKOUT_IDS_KEY, ids)
+  uni.navigateTo({
+    url: `${PAGE_CHECKOUT_CART}?cartItemIds=${ids.join(',')}`
+  })
+}
+```
+
+---
+
+## 9. 与单商品确认页分工
+
+| 项 | 单商品 `checkout` | 多商品 `checkout-cart` |
+|----|---------------------|------------------------|
+| 入口 | 商品详情 · 立即购买 | 购物车 · 去结算 |
+| source | `BUY_NOW` | `CART` |
+| 入参 | `goodsId/quantity/specText` | `cartItemIds` |
+| 商品行 | 1 行 `CheckoutGoodsRow` | N 行 `CheckoutMultiGoodsRow` |
+| 备注 | **整单一条** textarea | **每商品一行** input |
+| 进页门禁 | 详情 `ensureCanPurchase` | `prepareCartCheckout` |
+| 支付结果 | 共用 `pay-result` | 同上 |
+
+---
+
+## 10. 联调检查清单
+
+| # | 项 |
+|---|-----|
+| 1 | 未登录点去结算 → 引导登录 |
+| 2 | 跨店勾选 → Toast「请选择同一店铺的商品结算」 |
+| 3 | prepare 失败（下架/库存不足）→ 不跳转确认页 |
+| 4 | preview 返回多行、默认地址、同店 shop 头 |
+| 5 | 改某行数量后总价/运费/应付刷新 |
+| 6 | 换地址后模版运费变化 |
+| 7 | 各行备注提交后写入订单（后端校验） |
+| 8 | submit → pay → 待发货；购物车对应行清除 |
+| 9 | cancelPay → 订单已关闭 |
+| 10 | cartItemIds 缺失 → 提示并返回 |
+
+---
+
+## 11. 非本期
+
+| 项 | 说明 |
+|----|------|
+| 微信 JSAPI 真实唤起 | Mock pay 接口 |
+| 我的订单列表续付 | 另册 |
+| 跨店合单 | 业务不支持 |
+| 整单备注（多商品） | 需求为 **行备注** |
+| 单页合并 checkout + mode | v1 独立路由，后续可合并 |
+
+---
+
+## 12. 修订记录
+
+| 版本 | 说明 |
+|------|------|
+| **v1.0** | 首版：checkout-cart 页面、CheckoutMultiGoodsRow、购物车跳转、CART preview/submit、前端技术方案 |
+
+---
+
+*文档版本：v1.0 · 工程目录 `shop-app` · 不修改《确认订单页（多商品）技术方案.md》（后端方案）*

shop-app/PAGES.md

@@ -37,6 +37,10 @@ subpackage/
 └── shop/                # 店铺主页
     ├── index.vue
     └── search.vue
+└── order/               # 订单确认与支付结果
+    ├── checkout.vue         # 立即购买 · 单商品
+    ├── checkout-cart.vue    # 购物车 · 多商品同店
+    └── pay-result.vue
 ```
 
 后续示例（待建）：
@@ -61,6 +65,9 @@ subpackage/
 | `PAGE_HOME` | `/pages/index/index` |
 | `PAGE_GOODS_DETAIL` | `/subpackage/goods/detail` |
 | `PAGE_SEARCH_INDEX` | `/subpackage/search/index` |
+| `PAGE_CHECKOUT` | `/subpackage/order/checkout` |
+| `PAGE_CHECKOUT_CART` | `/subpackage/order/checkout-cart` |
+| `PAGE_PAY_RESULT` | `/subpackage/order/pay-result` |
 | `PAGE_SHOP_FOLLOW_LIST` | `/subpackage/account/shop-follow-list` |
 | `PAGE_SHOP_HOME` | `/subpackage/shop/index` |
 | `PAGE_SHOP_SEARCH` | `/subpackage/shop/search` |

shop-app/api/checkout.js

@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+/** 确认订单预览（进入/改量/换地址） */
+export function previewCheckout(data) {
+  return request({
+    url: '/api/checkout/preview',
+    method: 'POST',
+    data,
+    header: { repeatSubmit: false }
+  })
+}
+
+/** 提交订单 */
+export function submitCheckout(data) {
+  return request({
+    url: '/api/checkout/submit',
+    method: 'POST',
+    data,
+    header: { repeatSubmit: false }
+  })
+}

shop-app/api/order.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+/** 支付订单（v1 Mock 直接成功） */
+export function payOrder(orderId) {
+  return request({
+    url: `/api/order/${orderId}/pay`,
+    method: 'POST',
+    header: { repeatSubmit: false }
+  })
+}
+
+/** 取消支付（订单关闭） */
+export function cancelPay(orderId) {
+  return request({
+    url: `/api/order/${orderId}/pay/cancel`,
+    method: 'POST',
+    header: { repeatSubmit: false }
+  })
+}
+
+/** 订单详情 */
+export function getOrderDetail(orderId) {
+  return request({
+    url: `/api/order/${orderId}`,
+    method: 'GET'
+  })
+}

shop-app/components/order/AddressBar.vue

@@ -0,0 +1,78 @@
+<template>
+	<view class="addr-bar" @click="emit('click')">
+		<u-icon name="map" color="#2e7d32" size="22" />
+		<view v-if="address" class="addr-bar__body">
+			<view class="addr-bar__head">
+				<text class="addr-bar__name">{{ address.consigneeName }}</text>
+				<text class="addr-bar__mobile">{{ address.mobile }}</text>
+				<text v-if="address.isDefault" class="addr-bar__tag">默认</text>
+			</view>
+			<text class="addr-bar__detail">{{ address.fullAddress }}</text>
+		</view>
+		<view v-else class="addr-bar__empty">
+			<text>请添加收货地址</text>
+		</view>
+		<u-icon name="arrow-right" color="#ccc" size="16" />
+	</view>
+</template>
+
+<script setup>
+defineProps({
+	address: {
+		type: Object,
+		default: null
+	}
+})
+const emit = defineEmits(['click'])
+</script>
+
+<style lang="scss" scoped>
+.addr-bar {
+	display: flex;
+	align-items: center;
+	padding: 24rpx;
+	margin: 16rpx 24rpx;
+	background: #fff;
+	border-radius: 12rpx;
+}
+.addr-bar__body {
+	flex: 1;
+	margin: 0 16rpx;
+	min-width: 0;
+}
+.addr-bar__head {
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 12rpx;
+}
+.addr-bar__name {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
+}
+.addr-bar__mobile {
+	font-size: 28rpx;
+	color: #666;
+}
+.addr-bar__tag {
+	font-size: 22rpx;
+	color: #2e7d32;
+	background: #e8f5e9;
+	padding: 4rpx 10rpx;
+	border-radius: 6rpx;
+}
+.addr-bar__detail {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 26rpx;
+	color: #666;
+	line-height: 1.5;
+}
+.addr-bar__empty {
+	flex: 1;
+	margin: 0 16rpx;
+	font-size: 28rpx;
+	color: #999;
+}
+</style>

shop-app/components/order/CheckoutGoodsRow.vue

@@ -0,0 +1,133 @@
+<template>
+	<view class="checkout-goods">
+		<image class="checkout-goods__pic" :src="goods.displayPic" mode="aspectFill" />
+		<view class="checkout-goods__info">
+			<text class="checkout-goods__name">{{ goods.goodsName }}</text>
+			<view v-if="goods.specList && goods.specList.length" class="checkout-goods__specs">
+				<text
+					v-for="(spec, index) in goods.specList"
+					:key="index"
+					class="checkout-goods__spec"
+				>{{ spec }}</text>
+			</view>
+			<text v-if="goods.serviceDesc" class="checkout-goods__service">{{ goods.serviceDesc }}</text>
+			<view class="checkout-goods__price-row">
+				<text class="checkout-goods__price">¥{{ goods.priceText }}</text>
+				<view class="checkout-goods__qty">
+					<view class="qty-btn" @click="onMinus">-</view>
+					<text class="qty-num">{{ goods.quantity }}</text>
+					<view class="qty-btn" @click="onPlus">+</view>
+				</view>
+			</view>
+			<text class="checkout-goods__subtotal">小计 ¥{{ goods.subtotalText }}</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+const props = defineProps({
+	goods: {
+		type: Object,
+		required: true
+	}
+})
+
+const emit = defineEmits(['quantity-change'])
+
+function onMinus() {
+	const next = Math.max(1, props.goods.quantity - 1)
+	if (next !== props.goods.quantity) {
+		emit('quantity-change', next)
+	}
+}
+
+function onPlus() {
+	const max = props.goods.maxStock || 999999
+	const next = props.goods.quantity + 1
+	if (next > max) {
+		uni.showToast({ title: '库存不足', icon: 'none' })
+		return
+	}
+	emit('quantity-change', next)
+}
+</script>
+
+<style lang="scss" scoped>
+.checkout-goods {
+	display: flex;
+	padding: 20rpx 24rpx;
+	background: #fff;
+}
+.checkout-goods__pic {
+	width: 160rpx;
+	height: 160rpx;
+	border-radius: 8rpx;
+	background: #eee;
+	flex-shrink: 0;
+}
+.checkout-goods__info {
+	flex: 1;
+	margin-left: 16rpx;
+	min-width: 0;
+}
+.checkout-goods__name {
+	font-size: 28rpx;
+	color: #333;
+	line-height: 1.4;
+}
+.checkout-goods__specs {
+	margin-top: 8rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 4rpx;
+}
+.checkout-goods__spec {
+	font-size: 24rpx;
+	color: #999;
+}
+.checkout-goods__service {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 22rpx;
+	color: #2e7d32;
+}
+.checkout-goods__price-row {
+	margin-top: 12rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.checkout-goods__price {
+	font-size: 30rpx;
+	color: #e53935;
+	font-weight: 600;
+}
+.checkout-goods__qty {
+	display: flex;
+	align-items: center;
+	border: 1rpx solid #e0e0e0;
+	border-radius: 8rpx;
+	overflow: hidden;
+}
+.qty-btn {
+	width: 52rpx;
+	height: 52rpx;
+	line-height: 52rpx;
+	text-align: center;
+	font-size: 32rpx;
+	color: #333;
+	background: #f5f5f5;
+}
+.qty-num {
+	min-width: 56rpx;
+	text-align: center;
+	font-size: 26rpx;
+}
+.checkout-goods__subtotal {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	color: #666;
+	text-align: right;
+}
+</style>

shop-app/components/order/CheckoutMultiGoodsRow.vue

@@ -0,0 +1,170 @@
+<template>
+	<view class="multi-goods-row">
+		<image class="multi-goods-row__pic" :src="item.displayPic" mode="aspectFill" />
+		<view class="multi-goods-row__main">
+			<text class="multi-goods-row__name">{{ item.goodsName }}</text>
+			<view v-if="item.specList && item.specList.length" class="multi-goods-row__specs">
+				<text
+					v-for="(spec, index) in item.specList"
+					:key="index"
+					class="multi-goods-row__spec"
+				>{{ spec }}</text>
+			</view>
+			<text v-if="item.serviceDesc" class="multi-goods-row__service">{{ item.serviceDesc }}</text>
+			<view class="multi-goods-row__price-row">
+				<text class="multi-goods-row__price">¥{{ item.priceText }}</text>
+				<view class="multi-goods-row__qty">
+					<view class="qty-btn" @click="onMinus">-</view>
+					<text class="qty-num">{{ item.quantity }}</text>
+					<view class="qty-btn" @click="onPlus">+</view>
+				</view>
+			</view>
+			<text class="multi-goods-row__subtotal">小计 ¥{{ item.subtotalText }}</text>
+			<view class="multi-goods-row__remark">
+				<text class="multi-goods-row__remark-label">备注</text>
+				<input
+					class="multi-goods-row__remark-input"
+					:value="item.buyerRemark"
+					:maxlength="remarkMax"
+					placeholder="选填"
+					@input="onRemarkInput"
+				/>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { CHECKOUT_REMARK_MAX } from '@/constants/checkout'
+
+const props = defineProps({
+	item: {
+		type: Object,
+		required: true
+	}
+})
+
+const emit = defineEmits(['quantity-change', 'remark-change'])
+const remarkMax = CHECKOUT_REMARK_MAX
+
+function onMinus() {
+	const next = Math.max(1, props.item.quantity - 1)
+	if (next !== props.item.quantity) {
+		emit('quantity-change', next)
+	}
+}
+
+function onPlus() {
+	const max = props.item.maxStock || 999999
+	const next = props.item.quantity + 1
+	if (next > max) {
+		uni.showToast({ title: '库存不足', icon: 'none' })
+		return
+	}
+	emit('quantity-change', next)
+}
+
+function onRemarkInput(e) {
+	const val = (e && e.detail && e.detail.value) || ''
+	emit('remark-change', val)
+}
+</script>
+
+<style lang="scss" scoped>
+.multi-goods-row {
+	display: flex;
+	padding: 20rpx 24rpx;
+	border-bottom: 1rpx solid #f5f5f5;
+}
+.multi-goods-row__pic {
+	width: 160rpx;
+	height: 160rpx;
+	border-radius: 8rpx;
+	background: #eee;
+	flex-shrink: 0;
+}
+.multi-goods-row__main {
+	flex: 1;
+	margin-left: 16rpx;
+	min-width: 0;
+}
+.multi-goods-row__name {
+	font-size: 28rpx;
+	color: #333;
+	line-height: 1.4;
+}
+.multi-goods-row__specs {
+	margin-top: 8rpx;
+	display: flex;
+	flex-direction: column;
+	gap: 4rpx;
+}
+.multi-goods-row__spec {
+	font-size: 24rpx;
+	color: #999;
+}
+.multi-goods-row__service {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 22rpx;
+	color: #2e7d32;
+}
+.multi-goods-row__price-row {
+	margin-top: 12rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.multi-goods-row__price {
+	font-size: 30rpx;
+	color: #e53935;
+	font-weight: 600;
+}
+.multi-goods-row__qty {
+	display: flex;
+	align-items: center;
+	border: 1rpx solid #e0e0e0;
+	border-radius: 8rpx;
+	overflow: hidden;
+}
+.qty-btn {
+	width: 52rpx;
+	height: 52rpx;
+	line-height: 52rpx;
+	text-align: center;
+	font-size: 32rpx;
+	color: #333;
+	background: #f5f5f5;
+}
+.qty-num {
+	min-width: 56rpx;
+	text-align: center;
+	font-size: 26rpx;
+}
+.multi-goods-row__subtotal {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	color: #666;
+	text-align: right;
+}
+.multi-goods-row__remark {
+	margin-top: 12rpx;
+	display: flex;
+	align-items: center;
+}
+.multi-goods-row__remark-label {
+	font-size: 24rpx;
+	color: #999;
+	margin-right: 12rpx;
+	flex-shrink: 0;
+}
+.multi-goods-row__remark-input {
+	flex: 1;
+	height: 56rpx;
+	padding: 0 16rpx;
+	font-size: 24rpx;
+	background: #f9f9f9;
+	border-radius: 8rpx;
+}
+</style>

shop-app/constants/checkout.js

@@ -0,0 +1,14 @@
+/** 立即购买确认单 */
+export const CHECKOUT_SOURCE_BUY_NOW = 'BUY_NOW'
+
+/** 购物车同店结算 */
+export const CHECKOUT_SOURCE_CART = 'CART'
+
+/** 购物车结算 cartItemIds 缓存键 */
+export const CART_CHECKOUT_IDS_KEY = 'cart_checkout_item_ids'
+
+/** 提交订单支付方式：微信支付（与 OrderConstants.PAY_TYPE_WECHAT 一致） */
+export const CHECKOUT_PAY_TYPE_WECHAT = '1'
+
+/** 买家备注最大字数 */
+export const CHECKOUT_REMARK_MAX = 200

shop-app/pages.json

@@ -160,6 +160,30 @@
 				}
 			]
 		},
+		{
+			"root": "subpackage/order",
+			"name": "pkg-order",
+			"pages": [
+				{
+					"path": "checkout",
+					"style": {
+						"navigationBarTitleText": "确认订单"
+					}
+				},
+				{
+					"path": "checkout-cart",
+					"style": {
+						"navigationBarTitleText": "确认订单"
+					}
+				},
+				{
+					"path": "pay-result",
+					"style": {
+						"navigationBarTitleText": "支付结果"
+					}
+				}
+			]
+		},
 		{
 			"root": "subpackage/shop",
 			"name": "pkg-shop",
@@ -191,6 +215,14 @@
 		"pages/mine/index": {
 			"network": "all",
 			"packages": ["pkg-account"]
+		},
+		"subpackage/goods/detail": {
+			"network": "all",
+			"packages": ["pkg-order"]
+		},
+		"pages/cart/index": {
+			"network": "all",
+			"packages": ["pkg-order"]
 		}
 	},
 	"globalStyle": {

shop-app/pages/cart/index.vue

@@ -84,7 +84,7 @@ import {
 	getCheckedPurchasableIds,
 	getAllPurchasableItems
 } from '@/utils/cartDisplay'
-import { saveCheckoutPrepare } from '@/utils/cartCheckout'
+import { goCartCheckout } from '@/utils/checkoutNav'
 import { CART_EMPTY_TEXT, CART_MSG_CROSS_SHOP } from '@/constants/cart'
 import { goGoodsDetail } from '@/utils/goodsDetail'
 import { goShopHome } from '@/utils/shopNav'
@@ -280,9 +280,8 @@ async function onCheckout() {
 		return
 	}
 	try {
-		const res = await prepareCartCheckout(ids)
-		saveCheckoutPrepare(res.data)
-		uni.showToast({ title: '确认订单功能开发中', icon: 'none' })
+		await prepareCartCheckout(ids)
+		goCartCheckout(ids)
 	} catch (e) {
 		// request 已提示
 	}

shop-app/subpackage/goods/detail.vue

@@ -182,7 +182,7 @@ import {
 } from '@/utils/goodsDetail'
 import { ensureCanPurchase } from '@/utils/purchaseAction'
 import { addCartItem } from '@/api/cart'
-import { PAGE_GOODS_REVIEWS } from '@/utils/pageRoute'
+import { PAGE_GOODS_REVIEWS, PAGE_CHECKOUT } from '@/utils/pageRoute'
 import { goShopHome } from '@/utils/shopNav'
 import ReviewCard from '@/components/goods/ReviewCard.vue'
 import DetailBottomBar from '@/components/goods/DetailBottomBar.vue'
@@ -343,7 +343,17 @@ async function onBuyNow() {
 async function doBuyNow() {
 	const ok = await ensureCanPurchase(goodsId.value, detail.value?.purchase?.reason)
 	if (!ok) return
-	uni.showToast({ title: '确认订单功能开发中', icon: 'none' })
+	const spec = formatSpecDisplayText(detail.value?.specDisplay)
+	const parts = [
+		`goodsId=${goodsId.value}`,
+		`quantity=${quantity.value}`
+	]
+	if (spec && spec !== '默认') {
+		parts.push(`specText=${encodeURIComponent(spec)}`)
+	}
+	uni.navigateTo({
+		url: `${PAGE_CHECKOUT}?${parts.join('&')}`
+	})
 }
 
 function showBlockReason() {

shop-app/subpackage/order/checkout-cart.vue

@@ -0,0 +1,559 @@
+<template>
+	<view class="checkout-page">
+		<view v-if="pageLoading" class="checkout-page__loading">
+			<u-loading-icon mode="circle" />
+		</view>
+
+		<view v-else-if="pageError" class="checkout-page__error">
+			<u-empty mode="page" :text="pageError" icon-size="80" />
+			<u-button type="primary" text="重试" size="small" custom-style="margin-top:24rpx" @click="loadPreview" />
+			<u-button plain text="返回" size="small" custom-style="margin-top:16rpx" @click="onBack" />
+		</view>
+
+		<template v-else-if="preview">
+			<scroll-view class="checkout-scroll" scroll-y :style="{ height: scrollHeight }">
+				<address-bar :address="preview.address" @click="onAddressTap" />
+
+				<view class="shop-head">
+					<image class="shop-head__avatar" :src="preview.shop.shopAvatar" mode="aspectFill" />
+					<text class="shop-head__name">{{ preview.shop.shopName }}</text>
+				</view>
+
+				<view class="goods-card">
+					<checkout-multi-goods-row
+						v-for="item in preview.goodsList"
+						:key="item.cartItemId"
+						:item="item"
+						@quantity-change="(qty) => onQuantityChange(item.cartItemId, qty)"
+						@remark-change="(text) => onRemarkChange(item.cartItemId, text)"
+					/>
+				</view>
+
+				<view class="amount-card">
+					<view class="amount-row">
+						<text class="amount-row__label">商品总价</text>
+						<text class="amount-row__val">¥{{ preview.goodsAmountText }}</text>
+					</view>
+					<view class="amount-row">
+						<text class="amount-row__label">运费</text>
+						<view class="amount-row__right">
+							<text class="amount-row__val">¥{{ preview.freightAmountText }}</text>
+							<text v-if="preview.freightDesc" class="amount-row__desc">{{ preview.freightDesc }}</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="pay-card">
+					<text class="pay-card__label">支付方式</text>
+					<view class="pay-card__item">
+						<u-icon name="weixin-fill" color="#09bb07" size="22" />
+						<text class="pay-card__text">微信支付</text>
+						<u-icon name="checkbox-mark" color="#2e7d32" size="18" />
+					</view>
+				</view>
+			</scroll-view>
+
+			<view class="checkout-footer">
+				<view class="checkout-footer__sum">
+					<text class="checkout-footer__label">应付：</text>
+					<text class="checkout-footer__price">¥{{ preview.payAmountText }}</text>
+				</view>
+				<button class="checkout-footer__btn" :disabled="submitting" @click="onSubmit">
+					{{ submitting ? '提交中...' : '提交订单' }}
+				</button>
+			</view>
+		</template>
+
+		<u-popup :show="addressPopupShow" mode="bottom" round="16" @close="addressPopupShow = false">
+			<view class="addr-popup">
+				<view class="addr-popup__head">
+					<text class="addr-popup__title">选择收货地址</text>
+					<text class="addr-popup__add" @click="goAddAddress">新增地址</text>
+				</view>
+				<scroll-view scroll-y class="addr-popup__list">
+					<view
+						v-for="item in addressOptions"
+						:key="item.addressId"
+						class="addr-option"
+						:class="{ 'addr-option--on': item.addressId === selectedAddressId }"
+						@click="onSelectAddress(item)"
+					>
+						<view class="addr-option__head">
+							<text class="addr-option__name">{{ item.consigneeName }}</text>
+							<text class="addr-option__mobile">{{ item.mobile }}</text>
+							<text v-if="item.isDefault" class="addr-option__tag">默认</text>
+						</view>
+						<text class="addr-option__detail">{{ item.fullAddress }}</text>
+					</view>
+					<view v-if="!addressOptions.length" class="addr-popup__empty">
+						<text>暂无收货地址，请先新增</text>
+					</view>
+				</scroll-view>
+			</view>
+		</u-popup>
+
+		<u-modal
+			:show="payModalShow"
+			title="微信支付"
+			:content="payModalContent"
+			show-cancel-button
+			confirm-text="确认支付"
+			cancel-text="取消支付"
+			@confirm="onConfirmPay"
+			@cancel="onCancelPay"
+			@close="payModalShow = false"
+		/>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import { previewCheckout, submitCheckout } from '@/api/checkout'
+import { payOrder, cancelPay } from '@/api/order'
+import { getAddressList } from '@/api/member'
+import { mapCheckoutPreviewCart, mapAddressOption } from '@/utils/checkoutDisplay'
+import {
+	CHECKOUT_SOURCE_CART,
+	CHECKOUT_PAY_TYPE_WECHAT,
+	CART_CHECKOUT_IDS_KEY
+} from '@/constants/checkout'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { PAGE_ADDRESS_EDIT, PAGE_PAY_RESULT } from '@/utils/pageRoute'
+import AddressBar from '@/components/order/AddressBar.vue'
+import CheckoutMultiGoodsRow from '@/components/order/CheckoutMultiGoodsRow.vue'
+
+const cartItemIds = ref([])
+const selectedAddressId = ref(null)
+const preview = ref(null)
+const pageLoading = ref(true)
+const pageError = ref('')
+const submitting = ref(false)
+const previewing = ref(false)
+const scrollHeight = ref('600px')
+
+const addressPopupShow = ref(false)
+const addressOptions = ref([])
+
+const payModalShow = ref(false)
+const payModalContent = ref('')
+const pendingOrderId = ref(null)
+const paying = ref(false)
+
+let previewTimer = null
+
+function getRemarkMap() {
+	const map = {}
+	;(preview.value?.goodsList || []).forEach((row) => {
+		if (row.cartItemId) {
+			map[row.cartItemId] = row.buyerRemark || ''
+		}
+	})
+	return map
+}
+
+function buildLineItems() {
+	return (preview.value?.goodsList || []).map((row) => ({
+		cartItemId: row.cartItemId,
+		goodsId: row.goodsId,
+		quantity: row.quantity
+	}))
+}
+
+function buildPreviewBody() {
+	return {
+		source: CHECKOUT_SOURCE_CART,
+		addressId: selectedAddressId.value || undefined,
+		cartItemIds: cartItemIds.value,
+		items: buildLineItems()
+	}
+}
+
+function buildSubmitBody() {
+	return {
+		source: CHECKOUT_SOURCE_CART,
+		addressId: selectedAddressId.value,
+		payType: CHECKOUT_PAY_TYPE_WECHAT,
+		cartItemIds: cartItemIds.value,
+		items: (preview.value?.goodsList || []).map((row) => ({
+			cartItemId: row.cartItemId,
+			goodsId: row.goodsId,
+			quantity: row.quantity,
+			buyerRemark: (row.buyerRemark || '').trim()
+		}))
+	}
+}
+
+function calcScrollHeight() {
+	try {
+		const sys = uni.getSystemInfoSync()
+		scrollHeight.value = `${(sys.windowHeight || 600) - 56}px`
+	} catch (e) {
+		scrollHeight.value = '600px'
+	}
+}
+
+async function loadPreview() {
+	if (!cartItemIds.value.length || previewing.value) return
+	previewing.value = true
+	pageLoading.value = !preview.value
+	pageError.value = ''
+	try {
+		const res = await previewCheckout(buildPreviewBody())
+		const mapped = mapCheckoutPreviewCart(res.data, getRemarkMap())
+		if (!mapped || !mapped.goodsList.length) {
+			throw new Error('订单预览数据异常')
+		}
+		preview.value = mapped
+		if (mapped.address && mapped.address.addressId) {
+			selectedAddressId.value = mapped.address.addressId
+		}
+	} catch (e) {
+		pageError.value = (e && e.msg) || (e && e.message) || '加载失败'
+		if (!preview.value) {
+			preview.value = null
+		}
+	} finally {
+		pageLoading.value = false
+		previewing.value = false
+	}
+}
+
+function schedulePreview() {
+	if (previewTimer) clearTimeout(previewTimer)
+	previewTimer = setTimeout(() => {
+		loadPreview()
+	}, 300)
+}
+
+function onQuantityChange(cartItemId, qty) {
+	const list = preview.value?.goodsList || []
+	const row = list.find((item) => item.cartItemId === cartItemId)
+	if (row) {
+		row.quantity = qty
+		schedulePreview()
+	}
+}
+
+function onRemarkChange(cartItemId, text) {
+	const list = preview.value?.goodsList || []
+	const row = list.find((item) => item.cartItemId === cartItemId)
+	if (row) {
+		row.buyerRemark = text
+	}
+}
+
+async function onAddressTap() {
+	try {
+		const res = await getAddressList()
+		addressOptions.value = (res.data || []).map(mapAddressOption).filter(Boolean)
+	} catch (e) {
+		addressOptions.value = []
+	}
+	addressPopupShow.value = true
+}
+
+function onSelectAddress(item) {
+	selectedAddressId.value = item.addressId
+	addressPopupShow.value = false
+	schedulePreview()
+}
+
+function goAddAddress() {
+	addressPopupShow.value = false
+	uni.navigateTo({ url: `${PAGE_ADDRESS_EDIT}?mode=add` })
+}
+
+async function onSubmit() {
+	if (!selectedAddressId.value) {
+		uni.showToast({ title: '请选择收货地址', icon: 'none' })
+		return
+	}
+	if (submitting.value) return
+	submitting.value = true
+	try {
+		const res = await submitCheckout(buildSubmitBody())
+		const data = res.data || {}
+		pendingOrderId.value = data.orderId
+		payModalContent.value = `订单号：${data.orderNo || '—'}\n应付金额：¥${data.payAmount != null ? data.payAmount : preview.value?.payAmountText || '—'}`
+		payModalShow.value = true
+	} catch (e) {
+		// request 已 Toast
+	} finally {
+		submitting.value = false
+	}
+}
+
+async function onConfirmPay() {
+	if (!pendingOrderId.value || paying.value) return
+	paying.value = true
+	payModalShow.value = false
+	try {
+		await payOrder(pendingOrderId.value)
+		try {
+			uni.removeStorageSync(CART_CHECKOUT_IDS_KEY)
+		} catch (e) {
+			// ignore
+		}
+		uni.redirectTo({
+			url: `${PAGE_PAY_RESULT}?status=success&orderId=${pendingOrderId.value}`
+		})
+	} catch (e) {
+		// request 已 Toast
+	} finally {
+		paying.value = false
+	}
+}
+
+async function onCancelPay() {
+	if (!pendingOrderId.value || paying.value) return
+	paying.value = true
+	payModalShow.value = false
+	try {
+		await cancelPay(pendingOrderId.value)
+		uni.redirectTo({
+			url: `${PAGE_PAY_RESULT}?status=closed&orderId=${pendingOrderId.value}`
+		})
+	} catch (e) {
+		// request 已 Toast
+	} finally {
+		paying.value = false
+	}
+}
+
+function onBack() {
+	uni.navigateBack()
+}
+
+function parseCartItemIds(options) {
+	const fromQuery = (options.cartItemIds || '')
+		.split(',')
+		.map((id) => id.trim())
+		.filter(Boolean)
+	if (fromQuery.length) {
+		return fromQuery
+	}
+	try {
+		const stored = uni.getStorageSync(CART_CHECKOUT_IDS_KEY)
+		if (Array.isArray(stored) && stored.length) {
+			return stored.map(String)
+		}
+	} catch (e) {
+		// ignore
+	}
+	return []
+}
+
+onLoad((options) => {
+	calcScrollHeight()
+	cartItemIds.value = parseCartItemIds(options)
+	if (!cartItemIds.value.length) {
+		pageError.value = '结算商品信息缺失'
+		pageLoading.value = false
+		setTimeout(() => onBack(), 800)
+	}
+})
+
+onShow(() => {
+	if (!ensureApiToken(false)) return
+	if (!cartItemIds.value.length) return
+	loadPreview()
+})
+</script>
+
+<style lang="scss" scoped>
+.checkout-page {
+	min-height: 100vh;
+	background: #f5f6f8;
+	padding-bottom: env(safe-area-inset-bottom);
+}
+.checkout-page__loading,
+.checkout-page__error {
+	padding: 120rpx 48rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.checkout-scroll {
+	box-sizing: border-box;
+}
+.shop-head {
+	display: flex;
+	align-items: center;
+	padding: 16rpx 24rpx;
+	margin: 0 24rpx 2rpx;
+	background: #fff;
+	border-radius: 12rpx 12rpx 0 0;
+}
+.shop-head__avatar {
+	width: 48rpx;
+	height: 48rpx;
+	border-radius: 8rpx;
+	background: #eee;
+}
+.shop-head__name {
+	margin-left: 12rpx;
+	font-size: 28rpx;
+	color: #333;
+	font-weight: 500;
+}
+.goods-card {
+	margin: 0 24rpx;
+	background: #fff;
+	border-radius: 0 0 12rpx 12rpx;
+	overflow: hidden;
+}
+.amount-card,
+.pay-card {
+	margin: 16rpx 24rpx;
+	padding: 24rpx;
+	background: #fff;
+	border-radius: 12rpx;
+}
+.amount-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	padding: 12rpx 0;
+}
+.amount-row__label {
+	font-size: 28rpx;
+	color: #666;
+}
+.amount-row__right {
+	text-align: right;
+}
+.amount-row__val {
+	font-size: 28rpx;
+	color: #333;
+}
+.amount-row__desc {
+	display: block;
+	margin-top: 4rpx;
+	font-size: 22rpx;
+	color: #999;
+}
+.pay-card__label {
+	font-size: 28rpx;
+	color: #333;
+	font-weight: 500;
+}
+.pay-card__item {
+	margin-top: 16rpx;
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+}
+.pay-card__text {
+	flex: 1;
+	font-size: 28rpx;
+	color: #333;
+}
+.checkout-footer {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	align-items: center;
+	padding: 16rpx 24rpx;
+	padding-bottom: calc(16rpx + env(safe-area-inset-bottom));
+	background: #fff;
+	border-top: 1rpx solid #eee;
+	z-index: 10;
+}
+.checkout-footer__sum {
+	flex: 1;
+}
+.checkout-footer__label {
+	font-size: 26rpx;
+	color: #333;
+}
+.checkout-footer__price {
+	font-size: 36rpx;
+	color: #e53935;
+	font-weight: 600;
+}
+.checkout-footer__btn {
+	min-width: 220rpx;
+	height: 72rpx;
+	line-height: 72rpx;
+	padding: 0 32rpx;
+	background: linear-gradient(135deg, #43a047 0%, #2e7d32 100%);
+	color: #fff;
+	font-size: 28rpx;
+	border-radius: 36rpx;
+	border: none;
+}
+.checkout-footer__btn[disabled] {
+	opacity: 0.6;
+}
+.addr-popup {
+	padding: 24rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
+	max-height: 70vh;
+}
+.addr-popup__head {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 16rpx;
+}
+.addr-popup__title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
+}
+.addr-popup__add {
+	font-size: 26rpx;
+	color: #2e7d32;
+}
+.addr-popup__list {
+	max-height: 50vh;
+}
+.addr-option {
+	padding: 20rpx;
+	margin-bottom: 12rpx;
+	background: #f9f9f9;
+	border-radius: 12rpx;
+	border: 2rpx solid transparent;
+}
+.addr-option--on {
+	border-color: #2e7d32;
+	background: #f1f8f2;
+}
+.addr-option__head {
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 12rpx;
+}
+.addr-option__name {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #333;
+}
+.addr-option__mobile {
+	font-size: 26rpx;
+	color: #666;
+}
+.addr-option__tag {
+	font-size: 22rpx;
+	color: #2e7d32;
+	background: #e8f5e9;
+	padding: 4rpx 10rpx;
+	border-radius: 6rpx;
+}
+.addr-option__detail {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	color: #666;
+	line-height: 1.5;
+}
+.addr-popup__empty {
+	padding: 48rpx;
+	text-align: center;
+	color: #999;
+	font-size: 26rpx;
+}
+</style>

shop-app/subpackage/order/checkout.vue

@@ -0,0 +1,542 @@
+<template>
+	<view class="checkout-page">
+		<view v-if="pageLoading" class="checkout-page__loading">
+			<u-loading-icon mode="circle" />
+		</view>
+
+		<view v-else-if="pageError" class="checkout-page__error">
+			<u-empty mode="page" :text="pageError" icon-size="80" />
+			<u-button type="primary" text="重试" size="small" custom-style="margin-top:24rpx" @click="loadPreview" />
+			<u-button plain text="返回" size="small" custom-style="margin-top:16rpx" @click="onBack" />
+		</view>
+
+		<template v-else-if="preview">
+			<scroll-view class="checkout-scroll" scroll-y :style="{ height: scrollHeight }">
+				<address-bar :address="preview.address" @click="onAddressTap" />
+
+				<view class="shop-head">
+					<image class="shop-head__avatar" :src="preview.shop.shopAvatar" mode="aspectFill" />
+					<text class="shop-head__name">{{ preview.shop.shopName }}</text>
+				</view>
+
+				<checkout-goods-row
+					v-if="preview.goods"
+					:goods="preview.goods"
+					@quantity-change="onQuantityChange"
+				/>
+
+				<view class="amount-card">
+					<view class="amount-row">
+						<text class="amount-row__label">商品总价</text>
+						<text class="amount-row__val">¥{{ preview.goodsAmountText }}</text>
+					</view>
+					<view class="amount-row">
+						<text class="amount-row__label">运费</text>
+						<view class="amount-row__right">
+							<text class="amount-row__val">¥{{ preview.freightAmountText }}</text>
+							<text v-if="preview.freightDesc" class="amount-row__desc">{{ preview.freightDesc }}</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="remark-card">
+					<text class="remark-card__label">买家备注</text>
+					<textarea
+						class="remark-card__input"
+						v-model="buyerRemark"
+						:maxlength="remarkMax"
+						placeholder="选填，可填写给商家的留言"
+						:auto-height="true"
+					/>
+					<text class="remark-card__count">{{ buyerRemark.length }}/{{ remarkMax }}</text>
+				</view>
+
+				<view class="pay-card">
+					<text class="pay-card__label">支付方式</text>
+					<view class="pay-card__item">
+						<u-icon name="weixin-fill" color="#09bb07" size="22" />
+						<text class="pay-card__text">微信支付</text>
+						<u-icon name="checkbox-mark" color="#2e7d32" size="18" />
+					</view>
+				</view>
+			</scroll-view>
+
+			<view class="checkout-footer">
+				<view class="checkout-footer__sum">
+					<text class="checkout-footer__label">应付：</text>
+					<text class="checkout-footer__price">¥{{ preview.payAmountText }}</text>
+				</view>
+				<button class="checkout-footer__btn" :disabled="submitting" @click="onSubmit">
+					{{ submitting ? '提交中...' : '提交订单' }}
+				</button>
+			</view>
+		</template>
+
+		<!-- 地址选择 -->
+		<u-popup :show="addressPopupShow" mode="bottom" round="16" @close="addressPopupShow = false">
+			<view class="addr-popup">
+				<view class="addr-popup__head">
+					<text class="addr-popup__title">选择收货地址</text>
+					<text class="addr-popup__add" @click="goAddAddress">新增地址</text>
+				</view>
+				<scroll-view scroll-y class="addr-popup__list">
+					<view
+						v-for="item in addressOptions"
+						:key="item.addressId"
+						class="addr-option"
+						:class="{ 'addr-option--on': item.addressId === selectedAddressId }"
+						@click="onSelectAddress(item)"
+					>
+						<view class="addr-option__head">
+							<text class="addr-option__name">{{ item.consigneeName }}</text>
+							<text class="addr-option__mobile">{{ item.mobile }}</text>
+							<text v-if="item.isDefault" class="addr-option__tag">默认</text>
+						</view>
+						<text class="addr-option__detail">{{ item.fullAddress }}</text>
+					</view>
+					<view v-if="!addressOptions.length" class="addr-popup__empty">
+						<text>暂无收货地址，请先新增</text>
+					</view>
+				</scroll-view>
+			</view>
+		</u-popup>
+
+		<!-- v1 Mock 微信支付 -->
+		<u-modal
+			:show="payModalShow"
+			title="微信支付"
+			:content="payModalContent"
+			show-cancel-button
+			confirm-text="确认支付"
+			cancel-text="取消支付"
+			@confirm="onConfirmPay"
+			@cancel="onCancelPay"
+			@close="payModalShow = false"
+		/>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import { previewCheckout, submitCheckout } from '@/api/checkout'
+import { payOrder, cancelPay } from '@/api/order'
+import { getAddressList } from '@/api/member'
+import { mapCheckoutPreview, mapAddressOption } from '@/utils/checkoutDisplay'
+import {
+	CHECKOUT_SOURCE_BUY_NOW,
+	CHECKOUT_PAY_TYPE_WECHAT,
+	CHECKOUT_REMARK_MAX
+} from '@/constants/checkout'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { PAGE_ADDRESS_EDIT, PAGE_PAY_RESULT } from '@/utils/pageRoute'
+import AddressBar from '@/components/order/AddressBar.vue'
+import CheckoutGoodsRow from '@/components/order/CheckoutGoodsRow.vue'
+
+const goodsId = ref('')
+const quantity = ref(1)
+const specText = ref('')
+const selectedAddressId = ref(null)
+const buyerRemark = ref('')
+const preview = ref(null)
+const pageLoading = ref(true)
+const pageError = ref('')
+const submitting = ref(false)
+const previewing = ref(false)
+const scrollHeight = ref('600px')
+const remarkMax = CHECKOUT_REMARK_MAX
+
+const addressPopupShow = ref(false)
+const addressOptions = ref([])
+
+const payModalShow = ref(false)
+const payModalContent = ref('')
+const pendingOrderId = ref(null)
+const paying = ref(false)
+
+let previewTimer = null
+
+function calcScrollHeight() {
+	try {
+		const sys = uni.getSystemInfoSync()
+		scrollHeight.value = `${(sys.windowHeight || 600) - 56}px`
+	} catch (e) {
+		scrollHeight.value = '600px'
+	}
+}
+
+function buildPreviewBody() {
+	return {
+		source: CHECKOUT_SOURCE_BUY_NOW,
+		addressId: selectedAddressId.value || undefined,
+		items: [
+			{
+				goodsId: goodsId.value,
+				quantity: quantity.value,
+				specText: specText.value || undefined
+			}
+		]
+	}
+}
+
+function buildSubmitBody() {
+	return {
+		source: CHECKOUT_SOURCE_BUY_NOW,
+		addressId: selectedAddressId.value,
+		payType: CHECKOUT_PAY_TYPE_WECHAT,
+		items: [
+			{
+				goodsId: goodsId.value,
+				quantity: quantity.value,
+				specText: specText.value || undefined,
+				buyerRemark: (buyerRemark.value || '').trim()
+			}
+		]
+	}
+}
+
+async function loadPreview() {
+	if (!goodsId.value || previewing.value) return
+	previewing.value = true
+	pageLoading.value = !preview.value
+	pageError.value = ''
+	try {
+		const res = await previewCheckout(buildPreviewBody())
+		const mapped = mapCheckoutPreview(res.data)
+		if (!mapped || !mapped.goods) {
+			throw new Error('订单预览数据异常')
+		}
+		preview.value = mapped
+		quantity.value = mapped.goods.quantity
+		if (mapped.address && mapped.address.addressId) {
+			selectedAddressId.value = mapped.address.addressId
+		}
+	} catch (e) {
+		pageError.value = (e && e.msg) || (e && e.message) || '加载失败'
+		if (!preview.value) {
+			preview.value = null
+		}
+	} finally {
+		pageLoading.value = false
+		previewing.value = false
+	}
+}
+
+function schedulePreview() {
+	if (previewTimer) clearTimeout(previewTimer)
+	previewTimer = setTimeout(() => {
+		loadPreview()
+	}, 300)
+}
+
+function onQuantityChange(nextQty) {
+	quantity.value = nextQty
+	schedulePreview()
+}
+
+async function onAddressTap() {
+	try {
+		const res = await getAddressList()
+		addressOptions.value = (res.data || []).map(mapAddressOption).filter(Boolean)
+	} catch (e) {
+		addressOptions.value = []
+	}
+	addressPopupShow.value = true
+}
+
+function onSelectAddress(item) {
+	selectedAddressId.value = item.addressId
+	addressPopupShow.value = false
+	schedulePreview()
+}
+
+function goAddAddress() {
+	addressPopupShow.value = false
+	uni.navigateTo({ url: `${PAGE_ADDRESS_EDIT}?mode=add` })
+}
+
+async function onSubmit() {
+	if (!selectedAddressId.value) {
+		uni.showToast({ title: '请选择收货地址', icon: 'none' })
+		return
+	}
+	if (submitting.value) return
+	submitting.value = true
+	try {
+		const res = await submitCheckout(buildSubmitBody())
+		const data = res.data || {}
+		pendingOrderId.value = data.orderId
+		payModalContent.value = `订单号：${data.orderNo || '—'}\n应付金额：¥${data.payAmount != null ? data.payAmount : preview.value?.payAmountText || '—'}`
+		payModalShow.value = true
+	} catch (e) {
+		// request 已 Toast
+	} finally {
+		submitting.value = false
+	}
+}
+
+async function onConfirmPay() {
+	if (!pendingOrderId.value || paying.value) return
+	paying.value = true
+	payModalShow.value = false
+	try {
+		await payOrder(pendingOrderId.value)
+		uni.redirectTo({
+			url: `${PAGE_PAY_RESULT}?status=success&orderId=${pendingOrderId.value}`
+		})
+	} catch (e) {
+		// request 已 Toast
+	} finally {
+		paying.value = false
+	}
+}
+
+async function onCancelPay() {
+	if (!pendingOrderId.value || paying.value) return
+	paying.value = true
+	payModalShow.value = false
+	try {
+		await cancelPay(pendingOrderId.value)
+		uni.redirectTo({
+			url: `${PAGE_PAY_RESULT}?status=closed&orderId=${pendingOrderId.value}`
+		})
+	} catch (e) {
+		// request 已 Toast
+	} finally {
+		paying.value = false
+	}
+}
+
+function onBack() {
+	uni.navigateBack()
+}
+
+onLoad((options) => {
+	calcScrollHeight()
+	goodsId.value = options.goodsId || ''
+	quantity.value = Math.max(1, Number(options.quantity) || 1)
+	const st = options.specText ? decodeURIComponent(options.specText) : ''
+	specText.value = (st || '').trim()
+	if (!goodsId.value) {
+		pageError.value = '商品信息缺失'
+		pageLoading.value = false
+		setTimeout(() => onBack(), 800)
+	}
+})
+
+onShow(() => {
+	if (!ensureApiToken(false)) return
+	if (!goodsId.value) return
+	loadPreview()
+})
+</script>
+
+<style lang="scss" scoped>
+.checkout-page {
+	min-height: 100vh;
+	background: #f5f6f8;
+	padding-bottom: env(safe-area-inset-bottom);
+}
+.checkout-page__loading,
+.checkout-page__error {
+	padding: 120rpx 48rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.checkout-scroll {
+	box-sizing: border-box;
+}
+.shop-head {
+	display: flex;
+	align-items: center;
+	padding: 16rpx 24rpx;
+	margin: 0 24rpx 2rpx;
+	background: #fff;
+	border-radius: 12rpx 12rpx 0 0;
+}
+.shop-head__avatar {
+	width: 48rpx;
+	height: 48rpx;
+	border-radius: 8rpx;
+	background: #eee;
+}
+.shop-head__name {
+	margin-left: 12rpx;
+	font-size: 28rpx;
+	color: #333;
+	font-weight: 500;
+}
+.amount-card,
+.remark-card,
+.pay-card {
+	margin: 16rpx 24rpx;
+	padding: 24rpx;
+	background: #fff;
+	border-radius: 12rpx;
+}
+.amount-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	padding: 12rpx 0;
+}
+.amount-row__label {
+	font-size: 28rpx;
+	color: #666;
+}
+.amount-row__right {
+	text-align: right;
+}
+.amount-row__val {
+	font-size: 28rpx;
+	color: #333;
+}
+.amount-row__desc {
+	display: block;
+	margin-top: 4rpx;
+	font-size: 22rpx;
+	color: #999;
+}
+.remark-card__label,
+.pay-card__label {
+	font-size: 28rpx;
+	color: #333;
+	font-weight: 500;
+}
+.remark-card__input {
+	width: 100%;
+	min-height: 120rpx;
+	margin-top: 16rpx;
+	padding: 16rpx;
+	font-size: 26rpx;
+	background: #f9f9f9;
+	border-radius: 8rpx;
+	box-sizing: border-box;
+}
+.remark-card__count {
+	display: block;
+	margin-top: 8rpx;
+	text-align: right;
+	font-size: 22rpx;
+	color: #bbb;
+}
+.pay-card__item {
+	margin-top: 16rpx;
+	display: flex;
+	align-items: center;
+	gap: 12rpx;
+}
+.pay-card__text {
+	flex: 1;
+	font-size: 28rpx;
+	color: #333;
+}
+.checkout-footer {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	align-items: center;
+	padding: 16rpx 24rpx;
+	padding-bottom: calc(16rpx + env(safe-area-inset-bottom));
+	background: #fff;
+	border-top: 1rpx solid #eee;
+	z-index: 10;
+}
+.checkout-footer__sum {
+	flex: 1;
+}
+.checkout-footer__label {
+	font-size: 26rpx;
+	color: #333;
+}
+.checkout-footer__price {
+	font-size: 36rpx;
+	color: #e53935;
+	font-weight: 600;
+}
+.checkout-footer__btn {
+	min-width: 220rpx;
+	height: 72rpx;
+	line-height: 72rpx;
+	padding: 0 32rpx;
+	background: linear-gradient(135deg, #43a047 0%, #2e7d32 100%);
+	color: #fff;
+	font-size: 28rpx;
+	border-radius: 36rpx;
+	border: none;
+}
+.checkout-footer__btn[disabled] {
+	opacity: 0.6;
+}
+.addr-popup {
+	padding: 24rpx 24rpx calc(24rpx + env(safe-area-inset-bottom));
+	max-height: 70vh;
+}
+.addr-popup__head {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 16rpx;
+}
+.addr-popup__title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
+}
+.addr-popup__add {
+	font-size: 26rpx;
+	color: #2e7d32;
+}
+.addr-popup__list {
+	max-height: 50vh;
+}
+.addr-option {
+	padding: 20rpx;
+	margin-bottom: 12rpx;
+	background: #f9f9f9;
+	border-radius: 12rpx;
+	border: 2rpx solid transparent;
+}
+.addr-option--on {
+	border-color: #2e7d32;
+	background: #f1f8f2;
+}
+.addr-option__head {
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 12rpx;
+}
+.addr-option__name {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #333;
+}
+.addr-option__mobile {
+	font-size: 26rpx;
+	color: #666;
+}
+.addr-option__tag {
+	font-size: 22rpx;
+	color: #2e7d32;
+	background: #e8f5e9;
+	padding: 4rpx 10rpx;
+	border-radius: 6rpx;
+}
+.addr-option__detail {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	color: #666;
+	line-height: 1.5;
+}
+.addr-popup__empty {
+	padding: 48rpx;
+	text-align: center;
+	color: #999;
+	font-size: 26rpx;
+}
+</style>

shop-app/subpackage/order/pay-result.vue

@@ -0,0 +1,96 @@
+<template>
+	<view class="pay-result">
+		<u-icon
+			:name="isSuccess ? 'checkmark-circle-fill' : 'close-circle-fill'"
+			:color="isSuccess ? '#2e7d32' : '#999'"
+			size="80"
+		/>
+		<text class="pay-result__title">{{ title }}</text>
+		<text v-if="orderNo" class="pay-result__sub">订单号：{{ orderNo }}</text>
+		<text class="pay-result__tip">{{ tip }}</text>
+		<button v-if="isSuccess" class="pay-result__btn" @click="goHome">返回首页</button>
+		<button v-else class="pay-result__btn" @click="goBackDetail">返回继续购买</button>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getOrderDetail } from '@/api/order'
+import { PAGE_HOME } from '@/utils/pageRoute'
+
+const status = ref('')
+const orderId = ref('')
+const orderNo = ref('')
+
+const isSuccess = computed(() => status.value === 'success')
+
+const title = computed(() => (isSuccess.value ? '支付成功' : '订单已关闭'))
+
+const tip = computed(() =>
+	isSuccess.value
+		? '商家将尽快为您发货'
+		: '您已取消支付，可返回商品详情重新购买'
+)
+
+function goHome() {
+	uni.switchTab({ url: PAGE_HOME })
+}
+
+function goBackDetail() {
+	uni.navigateBack({ delta: 2 })
+}
+
+onLoad(async (options) => {
+	status.value = options.status || ''
+	orderId.value = options.orderId || ''
+	if (orderId.value) {
+		try {
+			const res = await getOrderDetail(orderId.value)
+			orderNo.value = (res.data && res.data.orderNo) || ''
+		} catch (e) {
+			// ignore
+		}
+	}
+})
+</script>
+
+<style lang="scss" scoped>
+.pay-result {
+	min-height: 100vh;
+	padding: 120rpx 48rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	background: #f5f6f8;
+}
+.pay-result__title {
+	margin-top: 32rpx;
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333;
+}
+.pay-result__sub {
+	margin-top: 16rpx;
+	font-size: 26rpx;
+	color: #666;
+}
+.pay-result__tip {
+	margin-top: 24rpx;
+	font-size: 26rpx;
+	color: #999;
+	text-align: center;
+	line-height: 1.6;
+}
+.pay-result__btn {
+	margin-top: 64rpx;
+	width: 320rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	background: linear-gradient(135deg, #43a047 0%, #2e7d32 100%);
+	color: #fff;
+	font-size: 28rpx;
+	border-radius: 40rpx;
+	border: none;
+}
+</style>

shop-app/utils/checkoutDisplay.js

@@ -0,0 +1,111 @@
+import { resolveFileUrl } from '@/utils/image'
+import { formatPrice } from '@/utils/format'
+import { parseCartSpecText } from '@/utils/cartSpec'
+
+const GOODS_PLACEHOLDER = '/static/logo.png'
+const SHOP_PLACEHOLDER = '/static/logo.png'
+
+function formatAddress(addr) {
+  if (!addr) return ''
+  const region = (addr.regionName || '').replace(/\//g, '')
+  return `${region}${addr.detailAddress || ''}`.trim()
+}
+
+export function mapGoodsItem(item) {
+  if (!item) return null
+  const specText = item.specText || '默认'
+  return {
+    cartItemId: item.cartItemId,
+    goodsId: item.goodsId,
+    goodsName: item.goodsName || '',
+    displayPic: resolveFileUrl(item.mainPic) || GOODS_PLACEHOLDER,
+    specText,
+    specList: parseCartSpecText(specText),
+    serviceDesc: item.serviceDesc || '',
+    salePrice: item.salePrice,
+    priceText: formatPrice(item.salePrice),
+    quantity: Number(item.quantity) || 1,
+    maxStock: Number(item.maxStock) || 1,
+    subtotal: item.subtotal,
+    subtotalText: formatPrice(item.subtotal),
+    freightType: item.freightType,
+    freightDesc: item.freightDesc || '',
+    buyerRemark: item.buyerRemark || ''
+  }
+}
+
+function mapShopAndAddress(data) {
+  const shop = data.shop || {}
+  const addr = data.address || null
+  return {
+    shop: {
+      shopId: shop.shopId,
+      shopName: shop.shopName || '',
+      shopAvatar: resolveFileUrl(shop.shopAvatar) || SHOP_PLACEHOLDER,
+      shopStatus: shop.shopStatus
+    },
+    address: addr
+      ? {
+          addressId: addr.addressId,
+          consigneeName: addr.consigneeName || '',
+          mobile: addr.mobile || '',
+          regionName: addr.regionName || '',
+          detailAddress: addr.detailAddress || '',
+          fullAddress: formatAddress(addr),
+          isDefault: addr.isDefault === '1'
+        }
+      : null,
+    goodsAmount: data.goodsAmount,
+    freightAmount: data.freightAmount,
+    freightDesc: data.freightDesc || '',
+    payAmount: data.payAmount,
+    goodsAmountText: formatPrice(data.goodsAmount),
+    freightAmountText: formatPrice(data.freightAmount),
+    payAmountText: formatPrice(data.payAmount),
+    payType: data.payType || 'WECHAT'
+  }
+}
+
+/** preview 接口 data → 单商品页面模型 */
+export function mapCheckoutPreview(data) {
+  if (!data) return null
+  const base = mapShopAndAddress(data)
+  return {
+    ...base,
+    goods: mapGoodsItem((data.items || [])[0])
+  }
+}
+
+/** preview 接口 data → 购物车多商品页面模型 */
+export function mapCheckoutPreviewCart(data, remarkMap = {}) {
+  if (!data) return null
+  const base = mapShopAndAddress(data)
+  const goodsList = (data.items || [])
+    .map((row) => {
+      const item = mapGoodsItem(row)
+      if (!item) return null
+      if (item.cartItemId && remarkMap[item.cartItemId] != null) {
+        item.buyerRemark = remarkMap[item.cartItemId]
+      }
+      return item
+    })
+    .filter(Boolean)
+  return {
+    ...base,
+    goodsList
+  }
+}
+
+/** 会员地址列表行 → 选择弹层 */
+export function mapAddressOption(row) {
+  if (!row) return null
+  const region = (row.regionName || '').replace(/\//g, '')
+  const full = row.fullAddress || `${region}${row.detailAddress || ''}`
+  return {
+    addressId: row.addressId,
+    consigneeName: row.consigneeName || '',
+    mobile: row.mobile || '',
+    fullAddress: full,
+    isDefault: row.isDefault === '1'
+  }
+}

shop-app/utils/checkoutNav.js

@@ -0,0 +1,16 @@
+import { PAGE_CHECKOUT_CART } from '@/utils/pageRoute'
+import { CART_CHECKOUT_IDS_KEY } from '@/constants/checkout'
+
+/** 购物车同店去结算 → 多商品确认页 */
+export function goCartCheckout(cartItemIds) {
+  const ids = (cartItemIds || []).filter(Boolean)
+  if (!ids.length) return
+  try {
+    uni.setStorageSync(CART_CHECKOUT_IDS_KEY, ids)
+  } catch (e) {
+    // ignore
+  }
+  uni.navigateTo({
+    url: `${PAGE_CHECKOUT_CART}?cartItemIds=${ids.join(',')}`
+  })
+}

shop-app/utils/pageRoute.js

@@ -61,6 +61,14 @@ export const PAGE_SHOP_HOME = '/subpackage/shop/index'
 /** 店内搜索 */
 export const PAGE_SHOP_SEARCH = '/subpackage/shop/search'
 
-// —— 分包：待建模块（示例，落地后注册 pages.json）——
+// —— 分包：订单 ——
+
+/** 确认订单（立即购买 · 单商品） */
+export const PAGE_CHECKOUT = '/subpackage/order/checkout'
+/** 确认订单（购物车 · 多商品同店） */
+export const PAGE_CHECKOUT_CART = '/subpackage/order/checkout-cart'
+/** 支付结果 */
+export const PAGE_PAY_RESULT = '/subpackage/order/pay-result'
+
+// —— 分包：待建模块 ——
 // export const PAGE_ORDER_LIST = '/subpackage/order/list'
-// export const PAGE_ORDER_CONFIRM = '/subpackage/order/confirm'