商品详情页

doc/消费者APP/商品分类/商品分类前端技术方案.md

@@ -19,20 +19,40 @@
 
 ---
 
-## 2. 页面与路由
+## 2. 目录与分包
+
+```text
+shop-app/
+├── pages/                    # 主包（Tab + 登录）
+│   ├── index/index.vue
+│   ├── category/index.vue    # 分类 Tab
+│   ├── cart/index.vue
+│   ├── mine/index.vue
+│   └── login/index.vue
+└── subpackage/               # 分包页面
+    ├── category/level1.vue、goods-list.vue
+    ├── goods/detail.vue、reviews.vue
+    └── search/index.vue、result.vue
+```
+
+路径常量见 `utils/pageRoute.js`；`pages.json` 中 `subPackages[].root` 与上表 `subpackage/*` 一致。
+
+---
+
+## 3. 页面与路由
 
 | 页面 | 需求代号 | 路径 | 入口 |
 |------|----------|------|------|
 | 全部分类（Tab） | **A** | `pages/category/index` | 底部 Tab「分类」；首页「更多」`switchTab` |
-| 一级分类商品 | **B** | `pages/category/level1` | 首页点击一级类目 `navigateTo` + `level1Id` |
-| 二级商品列表 | **C** | `pages/category/goods-list` | A 页点击二级 `navigateTo` + `categoryId` |
+| 一级分类商品 | **B** | `subpackage/category/level1` | 首页点击一级类目 `navigateTo` + `level1Id` |
+| 二级商品列表 | **C** | `subpackage/category/goods-list` | A 页点击二级 `navigateTo` + `categoryId` |
 
 **`pages.json` 注册：**
 
 ```text
 pages/category/index        → navigationBarTitleText: 分类
-pages/category/level1       → 动态 setNavigationBarTitle(level1Name)
-pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
+subpackage/category/level1       → 动态 setNavigationBarTitle(level1Name)
+subpackage/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 ```
 
 **路由参数：**
@@ -44,13 +64,13 @@ pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 
 ---
 
-## 3. 文件清单
+## 4. 文件清单
 
 | 类型 | 路径 | 说明 |
 |------|------|------|
 | A 页 | `shop-app/pages/category/index.vue` | 左一级 / 右二级 |
-| B 页 | `shop-app/pages/category/level1.vue` | 搜索 + Tab + 列表 |
-| C 页 | `shop-app/pages/category/goods-list.vue` | 搜索 + 面包屑 + 列表 |
+| B 页 | `shop-app/subpackage/category/level1.vue` | 搜索 + Tab + 列表 |
+| C 页 | `shop-app/subpackage/category/goods-list.vue` | 搜索 + 面包屑 + 列表 |
 | 列表块 | `shop-app/components/category/GoodsListBlock.vue` | 排序 + 分页列表（B/C 共用） |
 | 搜索入口 | `shop-app/components/mall/SearchEntry.vue` | 占位「搜索兽药、饲料、店铺」 |
 | 商品网格 | `shop-app/components/mall/GoodsGrid.vue` | 双列卡片 |
@@ -62,7 +82,7 @@ pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 
 ---
 
-## 4. 接口封装
+## 5. 接口封装
 
 **模块：** `shop-app/api/category.js`
 
@@ -85,9 +105,9 @@ pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 
 ---
 
-## 5. 页面结构
+## 6. 页面结构
 
-### 5.1 A — 全部分类 `pages/category/index`
+### 6.1 A — 全部分类 `pages/category/index`
 
 ```text
 全部分类（Tab）
@@ -106,7 +126,7 @@ pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 | 切换一级 | 仅刷新右侧 `children`，不跳转 |
 | 空树 | `u-empty`「暂无分类」 |
 
-### 5.2 B — 一级分类商品 `pages/category/level1`
+### 6.2 B — 一级分类商品 `subpackage/category/level1`
 
 ```text
 一级分类商品页
@@ -124,7 +144,7 @@ pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 | 排序 | Tab 切换 **保留** `sortBy`（父组件 state 不变） |
 | 商品点击 | 暂 Toast「商品详情开发中」 |
 
-### 5.3 C — 二级列表 `pages/category/goods-list`
+### 6.3 C — 二级列表 `subpackage/category/goods-list`
 
 ```text
 二级商品列表页
@@ -138,7 +158,7 @@ pages/category/goods-list   → 动态 setNavigationBarTitle(level2Name)
 | 无 Tab | 仅展示当前二级商品 |
 | 返回 | 系统返回栈 → A 页 |
 
-### 5.4 商品列表块 `GoodsListBlock`（B/C 共用 §7）
+### 6.4 商品列表块 `GoodsListBlock`（B/C 共用 §7）
 
 ```text
 GoodsListBlock
@@ -158,18 +178,18 @@ GoodsListBlock
 
 ---
 
-## 6. 与商城首页协作
+## 7. 与商城首页协作
 
 | 首页操作 | 前端跳转 |
 |----------|----------|
-| 点击一级类目 | `navigateTo` `/pages/category/level1?level1Id=&level1Name=` |
+| 点击一级类目 | `navigateTo` `/subpackage/category/level1?level1Id=&level1Name=` |
 | 点击「更多」 | `switchTab` `/pages/category/index` |
 
 **勿混用接口：** 首页横向导航用 `/api/home/categories`（仅一级）；分类模块用 `/api/category/**`。
 
 ---
 
-## 7. 业务规则映射（前端）
+## 8. 业务规则映射（前端）
 
 | 规则 | 前端实现 |
 |------|----------|
@@ -187,7 +207,7 @@ GoodsListBlock
 
 ---
 
-## 8. 联调检查清单
+## 9. 联调检查清单
 
 | # | 项 |
 |---|-----|
@@ -200,7 +220,7 @@ GoodsListBlock
 
 ---
 
-## 9. 待建设（非本方案）
+## 10. 待建设（非本方案）
 
 | 项 | 说明 |
 |----|------|
@@ -210,7 +230,7 @@ GoodsListBlock
 
 ---
 
-## 10. 修订记录
+## 11. 修订记录
 
 | 版本 | 说明 |
 |------|------|

doc/消费者APP/商品详情内页/商品详情内页前端技术方案.md

@@ -0,0 +1,168 @@
+# 商品详情内页 — 前端技术方案（C 端 · shop-app）
+
+> **依据：** 《商品详情内页功能需求.md》v1.0、《商品详情内页技术方案.md》v1.4  
+> **关联：** 《商城首页前端技术方案》（热销跳转）、《商品分类前端技术方案》（列表跳转）  
+> **范围：** 消费者 APP **`shop-app`** 商品详情页、全部评价页；**不** 改后端、**不** 实现购物车 POST / 确认订单 / 店铺主页 / 评价发表。  
+> **实现状态：** 页面与 API 封装已落地，待与 `/api/goods/**` 联调。
+
+---
+
+## 1. 技术栈与约定
+
+| 项 | 说明 |
+|----|------|
+| 框架 | uni-app **Vue 3** + **uview-plus** |
+| 请求 | `@/utils/request`；详情/可购为 `data`；评价为 `rows`/`total` |
+| 鉴权 | 读接口 **`isToken: false`**；加购/购买前 **`getToken()`** 校验登录 |
+| 规格 | **v1 统一规格**：仅 **数量** 选择；`specDisplay` **只读展示** |
+| 参考 | `pages/index/index.vue`（价格卡片）、`components/mall/GoodsGrid.vue` |
+
+---
+
+## 2. 页面与路由
+
+| 页面 | 路径 | 入口 |
+|------|------|------|
+| 商品详情 | `subpackage/goods/detail` | 首页热销、分类列表等带 `goodsId` |
+| 全部评价 | `subpackage/goods/reviews` | 详情页「查看全部」 |
+
+**Query：**
+
+| 页面 | 参数 |
+|------|------|
+| detail | `goodsId`（必填） |
+| reviews | `goodsId`（必填） |
+
+**统一跳转：** `goGoodsDetail(goodsId)` — `utils/goodsDetail.js`
+
+---
+
+## 3. 文件清单
+
+| 类型 | 路径 | 说明 |
+|------|------|------|
+| 详情页 | `shop-app/subpackage/goods/detail.vue` | 主页面（§3.1 结构） |
+| 评价页 | `shop-app/subpackage/goods/reviews.vue` | 评价分页列表 |
+| 底栏 | `shop-app/components/goods/DetailBottomBar.vue` | 店铺 / 加购 / 购买 |
+| 评价卡 | `shop-app/components/goods/ReviewCard.vue` | 单条评价展示 |
+| API | `shop-app/api/goods.js` | detail / can-purchase / reviews |
+| 映射 | `shop-app/utils/goodsDetail.js` | VO 映射、图片 URL、售后文案 |
+| 交易校验 | `shop-app/utils/purchaseAction.js` | 登录 + `/can-purchase` |
+
+---
+
+## 4. 接口封装
+
+**模块：** `shop-app/api/goods.js`
+
+| 方法 | HTTP | 路径 | 响应 |
+|------|------|------|------|
+| `getGoodsDetail(goodsId)` | GET | `/api/goods/{goodsId}` | `data: GoodsDetailAppVO` |
+| `getGoodsCanPurchase(goodsId)` | GET | `/api/goods/{goodsId}/can-purchase` | `data: { allowed, reason }` |
+| `getGoodsReviews(goodsId, params)` | GET | `/api/goods/{goodsId}/reviews` | `rows`, `total` |
+
+**详情核心字段（前端使用）：**
+
+| 字段 | UI 区块 |
+|------|---------|
+| pics[] | 轮播（主图+副图，URL 经 `resolveFileUrl`） |
+| salePrice / goodsName / goodsBrief | 价格区 |
+| stock / salesCount / categoryPath | 元信息 |
+| goodsStatus / purchase | 状态条、底栏是否可点 |
+| attributes / specDisplay | 商品参数 / 规格信息（只读） |
+| logistics | 物流说明（有值才展示） |
+| services | 服务说明 |
+| detailContent | 图文详情 `rich-text` |
+| shop | 进店区 |
+| afterSalePhone | 售后服务文案 |
+
+---
+
+## 5. 详情页结构（自上而下）
+
+```text
+商品详情 detail.vue
+├── 图片轮播 swiper（点击 previewImage）
+├── 状态提示条（下架 / 不可购 / 库存不足等）
+├── 价格与名称、简述、分类路径、库存、销量
+├── 数量（点击弹出 u-popup + u-number-box）
+├── 商品参数 attributes
+├── 规格信息 specDisplay（只读，v1）
+├── 物流说明 logistics（有字段才显示）
+├── 服务说明 services
+├── 评价摘要（GET reviews pageSize=2）+ 查看全部
+├── 售后服务（固定模板 + 客服电话）
+├── 图文详情 rich-text
+├── 店铺入口（进店）
+└── 固定底栏 DetailBottomBar
+```
+
+---
+
+## 6. 交互与业务规则（前端）
+
+| 规则 | 实现 |
+|------|------|
+| GD4 轮播 | `pics` 数组 swiper |
+| GD10 不可购 | `purchase.allowed`、`goodsStatus`、库存 → `canOperate` 控制底栏 |
+| 底栏置灰 | `:disabled="!canOperate"` |
+| 加购 / 购买 | 先登录 → 可选数量弹层 → `getCanPurchase` → Toast 待建设模块 |
+| 立即购买 | 打开数量弹层后确认 → 同上 |
+| 进店 | Toast「店铺主页开发中」 |
+| 评价 2 条 | `pageSize=2`；无数据「暂无评价」 |
+| 全部评价 | `navigateTo` reviews 页，`pageSize=10` 上拉加载 |
+| v1 统一规格 | 无 SKU 矩阵；仅数量 1～stock |
+
+**可购校验顺序（后端 Facade，前端点击前重调）：**
+
+商品存在 → 出售中 → 库存>0 → 店铺开业 → 分类可见
+
+---
+
+## 7. 上游入口改造
+
+| 来源 | 改动 |
+|------|------|
+| `pages/index/index.vue` | 热销卡片 `goGoodsDetail` |
+| `subpackage/category/level1.vue` | 列表 `@goods-click` |
+| `subpackage/category/goods-list.vue` | 同上 |
+| `GoodsListBlock.vue` | 继续 `emit('goods-click', item)` |
+
+---
+
+## 8. 联调检查清单
+
+| # | 项 |
+|---|-----|
+| 1 | `GET /api/goods/{id}` 返回 pics 至少 1 张 |
+| 2 | 非出售中商品详情 200 但底栏不可点、有提示文案 |
+| 3 | `purchase.allowed=false` 时展示 `reason` |
+| 4 | 点击加购未登录提示「请先登录」 |
+| 5 | 登录后加购调 `/can-purchase` 失败展示后端 `reason` |
+| 6 | 评价接口空列表显示「暂无评价」 |
+| 7 | 图文详情 HTML 在 H5/小程序渲染正常 |
+
+---
+
+## 9. 待建设（非本方案）
+
+| 项 | 说明 |
+|----|------|
+| POST 加入购物车 | 购物车模块 |
+| 立即购买 → 确认订单 | 订单模块 |
+| 店铺主页 | 店铺模块 |
+| 登录/注册页 | 会员模块 |
+| 多规格 SKU 选择 | `biz_goods_sku` 落地后扩展 |
+| 评价发表 | 订单完成链 |
+
+---
+
+## 10. 修订记录
+
+| 版本 | 说明 |
+|------|------|
+| **v1.0** | 首版：详情页 + 全部评价页；三读接口封装；上游入口打通 |
+
+---
+
+*文档版本：v1.0 · 工程目录 `shop-app` · 关联《商品详情内页功能需求.md》v1.0、《商品详情内页技术方案.md》v1.4*

doc/消费者APP/商品详情内页/商品详情内页技术方案.md

@@ -507,7 +507,7 @@ GoodsAppServiceImpl
 | `BizGoodsPicMapper`（goods 模块） | **已实现**（C 端读复用） |
 | `BizGoodsReviewMapper` | **待创建**（表落地后） |
 | 单元/API 测试 | **已通过**（`GoodsAppServiceImplTest`、`GoodsAppControllerTest`、`GoodsPicSupportTest`） |
-| C 端详情前端 | **未实现** |
+| C 端详情前端 | **已实现**（见《商品详情内页前端技术方案.md》v1.0） |
 
 ---
 

doc/消费者APP/搜索页/搜索页前端技术方案.md

@@ -0,0 +1,220 @@
+# 搜索页 — 前端技术方案（C 端 · shop-app）
+
+> **依据：** 《搜索页功能需求.md》v1.0、《搜索页技术方案.md》v1.2  
+> **关联：** 《商城首页前端技术方案》、《商品分类前端技术方案》、《商品详情内页前端技术方案》  
+> **范围：** 消费者 APP **`shop-app`** 搜索输入页（A）、搜索结果页（B）；**不** 改后端、**不** 实现店铺主页、店铺内搜索、联想/热搜。  
+> **实现状态：** 页面与 API 封装已落地，待与 `GET /api/search` 联调。
+
+---
+
+## 1. 技术栈与约定
+
+| 项 | 说明 |
+|----|------|
+| 框架 | uni-app **Vue 3** + **uview-plus** |
+| 请求 | `@/utils/request`；搜索聚合结果为 `data.goods` / `data.shops` |
+| 鉴权 | **`header: { isToken: false }`**（`@Anonymous`） |
+| 历史 | **仅本地** `uni.setStorageSync`，键 `shop_search_history`，最多 **20** 条 |
+| 占位文案 | **「搜索兽药、饲料、店铺」**（SRH15，与首页/分类一致） |
+| 参考 | `components/mall/GoodsGrid.vue`、`components/category/GoodsListBlock.vue` |
+
+---
+
+## 2. 页面与路由
+
+| 页面 | 需求代号 | 路径 | 入口 |
+|------|----------|------|------|
+| 搜索输入 | **A** | `subpackage/search/index` | 首页顶栏搜索、分类页 `SearchEntry` |
+| 搜索结果 | **B** | `subpackage/search/result` | A 页提交搜索；B 页「重新搜索」回 A 并带关键词 |
+
+**`pages.json`：**
+
+```text
+subpackage/search/index   → navigationBarTitleText: 搜索
+subpackage/search/result  → navigationBarTitleText: 搜索结果
+```
+
+**Query：**
+
+| 页面 | 参数 | 说明 |
+|------|------|------|
+| A | `keyword`（可选） | B 页「重新搜索」预填 |
+| B | `keyword`（必填） | trim 后检索；空则 Toast 并返回 |
+
+**跳转工具：** `utils/searchNav.js`
+
+| 方法 | 行为 |
+|------|------|
+| `goSearchInput(keyword?)` | `navigateTo` A 页 |
+| `goSearchResult(keyword)` | `navigateTo` B 页（内部 trim，空不跳） |
+
+---
+
+## 3. 文件清单
+
+| 类型 | 路径 | 说明 |
+|------|------|------|
+| A 页 | `shop-app/subpackage/search/index.vue` | 输入 + 历史 |
+| B 页 | `shop-app/subpackage/search/result.vue` | 重新搜索条 + Tab + 列表 |
+| Tab | `shop-app/components/search/SearchResultTabs.vue` | 按销量 / 按价格 / 店铺 |
+| 店铺列表 | `shop-app/components/search/ShopList.vue` | 店铺卡片 |
+| 商品网格 | `shop-app/components/mall/GoodsGrid.vue` | 与分类/首页共用 |
+| 搜索入口 | `shop-app/components/mall/SearchEntry.vue` | 跳转 A 页 |
+| API | `shop-app/api/search.js` | `searchAll` |
+| 常量 | `shop-app/constants/search.js` | Tab、价序、分页大小 |
+| 历史 | `shop-app/utils/searchHistory.js` | 增删清空、去重置顶 |
+| 导航 | `shop-app/utils/searchNav.js` | A/B 路由 |
+| 路径常量 | `shop-app/utils/pageRoute.js` | 主包 + 分包路径统一维护 |
+| 商品映射 | `shop-app/utils/goodsDisplay.js` | `mapGoodsCardList` |
+| 店铺映射 | `shop-app/utils/shopDisplay.js` | `mapShopCardList` |
+
+---
+
+## 4. 接口封装
+
+**模块：** `shop-app/api/search.js`
+
+| 方法 | HTTP | 路径 | 响应 |
+|------|------|------|------|
+| `searchAll(params)` | GET | `/api/search` | `data: { goods: { total, rows }, shops: { total, rows } }` |
+
+**Query：**
+
+| 参数 | 默认 | 说明 |
+|------|------|------|
+| keyword | 必填 | trim 后非空（空搜在 A 页拦截，不调接口） |
+| sortBy | `sales_desc` | 仅影响 **商品** 排序 |
+| goodsPageNum | 1 | 商品分页 |
+| goodsPageSize | 10 | 与 `SEARCH_PAGE_SIZE` 一致 |
+| shopPageNum | 1 | 店铺分页 |
+| shopPageSize | 10 | 同上 |
+
+**sortBy 与 UI Tab：**
+
+| Tab | sortBy |
+|-----|--------|
+| 按销量 | `sales_desc` |
+| 按价格 · 从低到高 | `price_asc` |
+| 按价格 · 从高到低 | `price_desc` |
+| 店铺 | 请求仍带 sortBy，后端 **只查店铺** 列表 |
+
+**错误处理：** `silent: true`；失败当前 Tab **空态** +「点击重试」，不 Toast 刷屏（对齐 §8.2）。
+
+---
+
+## 5. 搜索历史（本地 SRH4）
+
+**存储键：** `shop_search_history`  
+**结构：** `[{ keyword, time }]`，展示按 `time` **倒序**。
+
+| 行为 | 实现 |
+|------|------|
+| 写入时机 | **成功进入 B 页**（A 提交、B 页 onLoad） |
+| 空关键词 | 不写历史、不调接口 |
+| 去重 | 同词再次搜索 → 更新 `time` 并 **置顶** |
+| 单条删除 | 历史行右侧关闭图标 |
+| 全部清空 | 标题栏「清空」+ 二次确认 |
+| 无历史 | 文案「暂无搜索历史」 |
+
+---
+
+## 6. 页面结构
+
+### 6.1 A — 搜索输入 `subpackage/search/index`
+
+```text
+搜索输入页
+├── 顶栏：返回 + 输入框 + 清空 +「搜索」
+├── 键盘回车 / 搜索按钮 → 校验非空 → 写历史 → B 页
+└── 搜索历史（有则展示，无则空态文案）
+```
+
+| 规则 | 实现 |
+|------|------|
+| SRH3 空搜 | Toast「请输入搜索内容」，不跳转 |
+| 预填 | `?keyword=` 来自 B 页重新搜索 |
+
+### 6.2 B — 搜索结果 `subpackage/search/result`
+
+```text
+搜索结果页
+├── 顶栏：返回 + 可点搜索条（当前关键词）→ A 页预填
+├── SearchResultTabs（三 Tab；按价格下再选升/降序）
+└── scroll-view 列表
+    ├── 按销量 / 按价格 → GoodsGrid + 上拉加载 goodsPageNum
+    ├── 店铺 → ShopList + 上拉加载 shopPageNum
+    └── 空态「暂无相关」；失败可重试
+```
+
+| 行为 | 实现 |
+|------|------|
+| 默认 Tab | **按销量**（SRH8） |
+| 切 Tab | 商品 Tab 重置 `goodsPageNum` 并请求；店铺 Tab **优先用** 同次搜索已返回的 `shops` 缓存 |
+| 价序切换 | 仅「按价格」Tab 下；改 `sortBy` 后重置商品列表 |
+| 商品点击 | `goGoodsDetail(goodsId)`（SRH11） |
+| 店铺点击 | Toast「店铺主页开发中」（SRH12，待店铺主页模块） |
+| rating/fansCount | 后端为 null 时 **不展示** 对应行 |
+
+---
+
+## 7. 入口改造
+
+| 位置 | 改动 |
+|------|------|
+| `pages/index/index.vue` | `onSearchTap` → `/subpackage/search/index` |
+| `components/mall/SearchEntry.vue` | 点击 → `goSearchInput()` |
+| 分类 A/B/C 页 | 已引用 `SearchEntry`，无需再改 |
+
+---
+
+## 8. 业务规则对照（前端）
+
+| 编号 | 前端落实 |
+|------|----------|
+| SRH2 | 首页/分类搜索栏 → A 页 |
+| SRH3 | A 页空关键词拦截 |
+| SRH4 | `searchHistory.js` 本地存储 |
+| SRH5 | B 顶栏点击 → A 带 `keyword` |
+| SRH7 | 列表 **不** 做四条件过滤（后端浏览层） |
+| SRH8～SRH9 | 三 Tab + 价格升/降 |
+| SRH11 | 商品 → 详情 |
+| SRH12 | 店铺 → 占位 Toast |
+| SRH13 | 空态「暂无相关」 |
+| SRH14 | 不在搜索页加购/下单 |
+| SRH15 | 占位文案常量 `SEARCH_PLACEHOLDER` |
+
+---
+
+## 9. 联调检查清单
+
+- [ ] `GET /api/search?keyword=兽药` 返回 `data.goods.rows`、`data.shops.rows`
+- [ ] 按销量 / 按价格 / 店铺 三 Tab 列表与空态独立
+- [ ] 商品上拉加载 `goodsPageNum` 递增
+- [ ] 店铺上拉 `shopPageNum` 递增（首屏已从聚合接口缓存时从第 2 页请求）
+- [ ] 空关键词、仅空格：A 页 Toast，不进 B
+- [ ] 历史去重、清空、单删
+- [ ] 从首页、分类页点击搜索栏进入 A 页
+
+---
+
+## 10. 非本期（前端不实现）
+
+| 项 | 说明 |
+|----|------|
+| 店铺主页 | 店铺卡片暂 Toast |
+| 店铺内搜索 | 店铺主页专册 |
+| 联想 / 热搜 / 语音 | — |
+| 历史云端同步 | 仅 localStorage |
+| 关键词高亮 | UI 可选增强 |
+
+---
+
+## 11. 修订记录
+
+| 版本 | 说明 |
+|------|------|
+| **v1.0** | 首版：A/B 两页、统一搜索接口封装、本地历史、入口打通 |
+
+---
+
+*文档版本：v1.0 · 关联《搜索页功能需求.md》v1.0、《搜索页技术方案.md》v1.2*

shop-app/PAGES.md

@@ -0,0 +1,53 @@
+# shop-app 页面目录约定
+
+## 主包 `pages/`（仅 5 页）
+
+```
+pages/
+├── index/index.vue      # 首页 Tab
+├── category/index.vue   # 分类 Tab
+├── cart/index.vue       # 购物车 Tab（待正式开发）
+├── mine/index.vue       # 我的 Tab（待正式开发）
+└── login/index.vue      # 登录
+```
+
+## 分包 `subpackage/`（其它业务页一律放这里）
+
+```
+subpackage/
+├── category/            # 分类子页
+│   ├── level1.vue
+│   └── goods-list.vue
+├── goods/               # 商品
+│   ├── detail.vue
+│   └── reviews.vue
+└── search/              # 搜索
+    ├── index.vue
+    └── result.vue
+```
+
+后续示例（待建）：
+
+```
+subpackage/
+├── shop/                # 店铺主页
+├── order/               # 订单、确认订单
+├── cart/                # 购物车子页（Tab 仍在 pages/cart）
+└── user/                # 地址、设置等（Tab 仍在 pages/mine）
+```
+
+## 新建页面三步
+
+1. **建文件**：`subpackage/{模块}/{页面}.vue`
+2. **注册路由**：`pages.json` → `subPackages`（勿写入顶部 `pages` 主包列表）
+3. **路径常量**：`utils/pageRoute.js` 增加 `PAGE_*`，跳转时引用
+
+## 路由示例
+
+| 常量（pageRoute.js） | 完整路径 |
+|----------------------|----------|
+| `PAGE_HOME` | `/pages/index/index` |
+| `PAGE_GOODS_DETAIL` | `/subpackage/goods/detail` |
+| `PAGE_SEARCH_INDEX` | `/subpackage/search/index` |
+
+配置详见 `pages.json` 中 `subPackages` 与 `preloadRule`。

shop-app/api/goods.js

@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+/** 商品详情聚合（匿名） */
+export function getGoodsDetail(goodsId) {
+  return request({
+    url: `/api/goods/${goodsId}`,
+    method: 'GET',
+    header: { isToken: false },
+    silent: true
+  })
+}
+
+/** 可购四条件校验（加购/购买前可重调） */
+export function getGoodsCanPurchase(goodsId) {
+  return request({
+    url: `/api/goods/${goodsId}/can-purchase`,
+    method: 'GET',
+    header: { isToken: false },
+    silent: true
+  })
+}
+
+/** 商品评价分页 */
+export function getGoodsReviews(goodsId, params) {
+  return request({
+    url: `/api/goods/${goodsId}/reviews`,
+    method: 'GET',
+    params,
+    header: { isToken: false },
+    silent: true
+  })
+}

shop-app/api/login.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+/** 会员/用户登录 */
+export function login(username, password, code, uuid) {
+  return request({
+    url: '/login',
+    method: 'POST',
+    header: { isToken: false, repeatSubmit: false },
+    data: { username, password, code, uuid }
+  })
+}
+
+/** 获取当前登录用户信息 */
+export function getInfo() {
+  return request({
+    url: '/getInfo',
+    method: 'GET'
+  })
+}
+
+/** 退出登录 */
+export function logout() {
+  return request({
+    url: '/logout',
+    method: 'POST'
+  })
+}
+
+/** 图形验证码 */
+export function getCodeImg() {
+  return request({
+    url: '/captchaImage',
+    method: 'GET',
+    header: { isToken: false },
+    timeout: 20000
+  })
+}

shop-app/api/search.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+/**
+ * 全站搜索（商品 + 店铺一次返回）
+ * @param {Object} params keyword, sortBy, goodsPageNum, goodsPageSize, shopPageNum, shopPageSize
+ * @returns {Promise<{ goods: { total, rows }, shops: { total, rows } }>}
+ */
+export function searchAll(params) {
+  return request({
+    url: '/api/search',
+    method: 'GET',
+    params,
+    header: { isToken: false },
+    silent: true
+  }).then((res) => res.data || { goods: { total: 0, rows: [] }, shops: { total: 0, rows: [] } })
+}

shop-app/components/goods/DetailBottomBar.vue

@@ -0,0 +1,80 @@
+<template>
+	<view class="bottom-bar">
+		<view class="bottom-bar__shop" @click="emit('shop')">
+			<u-icon name="home" size="22" color="#666" />
+			<text class="bottom-bar__shop-text">店铺</text>
+		</view>
+		<view class="bottom-bar__actions">
+			<button class="btn btn-cart" :disabled="disabled" @click="emit('cart')">加入购物车</button>
+			<button class="btn btn-buy" :disabled="disabled" @click="emit('buy')">立即购买</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+defineProps({
+	disabled: {
+		type: Boolean,
+		default: false
+	}
+})
+const emit = defineEmits(['cart', 'buy', 'shop'])
+</script>
+
+<style lang="scss" scoped>
+.bottom-bar {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 100;
+	display: flex;
+	align-items: center;
+	padding: 12rpx 24rpx;
+	padding-bottom: calc(12rpx + env(safe-area-inset-bottom));
+	background: #fff;
+	box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
+}
+.bottom-bar__shop {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	width: 100rpx;
+	flex-shrink: 0;
+}
+.bottom-bar__shop-text {
+	margin-top: 4rpx;
+	font-size: 22rpx;
+	color: #666;
+}
+.bottom-bar__actions {
+	flex: 1;
+	display: flex;
+	margin-left: 16rpx;
+	gap: 16rpx;
+}
+.btn {
+	flex: 1;
+	height: 80rpx;
+	line-height: 80rpx;
+	margin: 0;
+	padding: 0;
+	font-size: 28rpx;
+	border-radius: 40rpx;
+	border: none;
+}
+.btn-cart {
+	background: #fff5e6;
+	color: #ff6f00;
+}
+.btn-cart[disabled] {
+	opacity: 0.5;
+}
+.btn-buy {
+	background: linear-gradient(90deg, #2e7d32, #4caf50);
+	color: #fff;
+}
+.btn-buy[disabled] {
+	opacity: 0.5;
+}
+</style>

shop-app/components/goods/ReviewCard.vue

@@ -0,0 +1,123 @@
+<template>
+	<view class="review-card">
+		<view class="review-card__head">
+			<image class="review-card__avatar" :src="avatarSrc" mode="aspectFill" />
+			<view class="review-card__meta">
+				<text class="review-card__name">{{ item.memberNickName }}</text>
+				<view v-if="item.score" class="review-card__stars">
+					<text v-for="n in 5" :key="n" class="star" :class="{ on: n <= item.score }">★</text>
+				</view>
+			</view>
+			<text v-if="item.createTime" class="review-card__time">{{ item.createTime }}</text>
+		</view>
+		<text class="review-card__content">{{ item.content }}</text>
+		<view v-if="item.pics && item.pics.length" class="review-card__pics">
+			<image
+				v-for="(pic, idx) in item.pics"
+				:key="idx"
+				class="review-card__pic"
+				:src="pic"
+				mode="aspectFill"
+				@click="previewPics(idx)"
+			/>
+		</view>
+		<view v-if="item.replyContent" class="review-card__reply">
+			<text class="review-card__reply-label">商家回复：</text>
+			<text>{{ item.replyContent }}</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+	item: {
+		type: Object,
+		required: true
+	}
+})
+
+const avatarSrc = computed(() => props.item.memberAvatar || '/static/logo.png')
+
+function previewPics(index) {
+	const urls = props.item.pics || []
+	if (!urls.length) return
+	uni.previewImage({ urls, current: urls[index] })
+}
+</script>
+
+<style lang="scss" scoped>
+.review-card {
+	padding: 24rpx 0;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+.review-card__head {
+	display: flex;
+	align-items: flex-start;
+}
+.review-card__avatar {
+	width: 64rpx;
+	height: 64rpx;
+	border-radius: 50%;
+	background: #eee;
+	flex-shrink: 0;
+}
+.review-card__meta {
+	flex: 1;
+	margin-left: 16rpx;
+	min-width: 0;
+}
+.review-card__name {
+	font-size: 26rpx;
+	color: #333;
+	font-weight: 500;
+}
+.review-card__stars {
+	margin-top: 4rpx;
+}
+.star {
+	font-size: 22rpx;
+	color: #ddd;
+	margin-right: 2rpx;
+}
+.star.on {
+	color: #ff9800;
+}
+.review-card__time {
+	font-size: 22rpx;
+	color: #999;
+	flex-shrink: 0;
+}
+.review-card__content {
+	display: block;
+	margin-top: 16rpx;
+	font-size: 28rpx;
+	color: #444;
+	line-height: 1.5;
+}
+.review-card__pics {
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 16rpx;
+	gap: 12rpx;
+}
+.review-card__pic {
+	width: 160rpx;
+	height: 160rpx;
+	border-radius: 8rpx;
+	background: #f5f5f5;
+}
+.review-card__reply {
+	margin-top: 16rpx;
+	padding: 16rpx;
+	background: #f8f8f8;
+	border-radius: 8rpx;
+	font-size: 24rpx;
+	color: #666;
+	line-height: 1.5;
+}
+.review-card__reply-label {
+	color: #2e7d32;
+}
+</style>

shop-app/components/mall/SearchEntry.vue

@@ -1,29 +1,79 @@
 <template>
-	<view class="search-entry" @click="onTap">
-		<u-icon name="search" color="#999" size="18" />
-		<text class="search-entry__text">搜索兽药、饲料、店铺</text>
+	<view class="search-entry-wrap">
+		<view class="search-entry" @click="onTap">
+			<view class="search-entry__icon">
+				<u-icon name="search" color="#2e7d32" size="20" />
+			</view>
+			<text class="search-entry__placeholder">搜索兽药、饲料、店铺</text>
+			<view class="search-entry__btn">
+				<text>搜索</text>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
+import { goSearchInput } from '@/utils/searchNav'
+
 function onTap() {
-	uni.showToast({ title: '搜索功能开发中', icon: 'none' })
+	goSearchInput()
 }
 </script>
 
 <style lang="scss" scoped>
+.search-entry-wrap {
+	padding: 16rpx 24rpx;
+	background: #e8f5e9;
+}
+
 .search-entry {
 	display: flex;
 	align-items: center;
-	height: 72rpx;
-	margin: 16rpx 24rpx;
-	padding: 0 24rpx;
-	background: #f5f6f8;
-	border-radius: 36rpx;
+	height: 76rpx;
+	padding: 0 8rpx 0 20rpx;
+	background: #f5faf6;
+	border: 2rpx solid #a5d6a7;
+	border-radius: 40rpx;
+	box-shadow: 0 4rpx 16rpx rgba(46, 125, 50, 0.08);
 }
-.search-entry__text {
-	margin-left: 12rpx;
+
+.search-entry__icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 48rpx;
+	height: 48rpx;
+	margin-right: 12rpx;
+	background: rgba(46, 125, 50, 0.1);
+	border-radius: 50%;
+	flex-shrink: 0;
+}
+
+.search-entry__placeholder {
+	flex: 1;
 	font-size: 28rpx;
 	color: #999;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.search-entry__btn {
+	flex-shrink: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 60rpx;
+	padding: 0 28rpx;
+	margin-left: 12rpx;
+	background: linear-gradient(135deg, #43a047 0%, #2e7d32 100%);
+	border-radius: 30rpx;
+}
+
+.search-entry__btn text {
+	font-size: 26rpx;
+	color: #fff;
+	font-weight: 500;
+	letter-spacing: 2rpx;
 }
 </style>

shop-app/components/search/SearchResultTabs.vue

@@ -0,0 +1,98 @@
+<template>
+	<view class="result-tabs">
+		<view class="result-tabs__row">
+			<text
+				v-for="item in tabOptions"
+				:key="item.value"
+				class="result-tabs__item"
+				:class="{ 'result-tabs__item--active': modelValue === item.value }"
+				@click="onTab(item.value)"
+			>
+				{{ item.label }}
+			</text>
+		</view>
+		<view v-if="modelValue === priceTab" class="result-tabs__price">
+			<text
+				v-for="item in priceOptions"
+				:key="item.value"
+				class="result-tabs__price-item"
+				:class="{ 'result-tabs__price-item--active': priceOrder === item.value }"
+				@click="onPriceOrder(item.value)"
+			>
+				{{ item.label }}
+			</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import {
+  SEARCH_TAB_OPTIONS,
+  SEARCH_TAB_PRICE,
+  PRICE_ORDER_OPTIONS
+} from '@/constants/search'
+
+defineProps({
+  modelValue: {
+    type: String,
+    default: 'sales'
+  },
+  priceOrder: {
+    type: String,
+    default: 'price_asc'
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'update:priceOrder', 'change', 'price-change'])
+
+const tabOptions = SEARCH_TAB_OPTIONS
+const priceOptions = PRICE_ORDER_OPTIONS
+const priceTab = SEARCH_TAB_PRICE
+
+function onTab(value) {
+  emit('update:modelValue', value)
+  emit('change', value)
+}
+
+function onPriceOrder(value) {
+  emit('update:priceOrder', value)
+  emit('price-change', value)
+}
+</script>
+
+<style lang="scss" scoped>
+.result-tabs {
+	background: #fff;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+.result-tabs__row {
+	display: flex;
+	align-items: center;
+	padding: 16rpx 24rpx;
+}
+.result-tabs__item {
+	margin-right: 40rpx;
+	font-size: 28rpx;
+	color: #666;
+}
+.result-tabs__item--active {
+	color: #2e7d32;
+	font-weight: 600;
+}
+.result-tabs__price {
+	display: flex;
+	padding: 0 24rpx 16rpx;
+}
+.result-tabs__price-item {
+	margin-right: 24rpx;
+	font-size: 24rpx;
+	color: #999;
+	padding: 8rpx 20rpx;
+	background: #f5f6f8;
+	border-radius: 24rpx;
+}
+.result-tabs__price-item--active {
+	color: #2e7d32;
+	background: rgba(46, 125, 50, 0.1);
+}
+</style>

shop-app/components/search/ShopList.vue

@@ -0,0 +1,75 @@
+<template>
+	<view class="shop-list">
+		<view
+			v-for="item in list"
+			:key="item.shopId"
+			class="shop-card"
+			@click="emit('item-click', item)"
+		>
+			<image class="shop-card__avatar" :src="item.displayAvatar" mode="aspectFill" />
+			<view class="shop-card__body">
+				<text class="shop-card__name">{{ item.shopName }}</text>
+				<view v-if="item.showRating || item.showFans" class="shop-card__meta">
+					<text v-if="item.showRating" class="shop-card__meta-item">评分 {{ item.rating }}</text>
+					<text v-if="item.showFans" class="shop-card__meta-item">粉丝 {{ item.fansCount }}</text>
+				</view>
+			</view>
+			<u-icon name="arrow-right" color="#ccc" size="16" />
+		</view>
+	</view>
+</template>
+
+<script setup>
+defineProps({
+	list: {
+		type: Array,
+		default: () => []
+	}
+})
+const emit = defineEmits(['item-click'])
+</script>
+
+<style lang="scss" scoped>
+.shop-list {
+	padding: 0 24rpx;
+}
+.shop-card {
+	display: flex;
+	align-items: center;
+	padding: 24rpx;
+	margin-bottom: 16rpx;
+	background: #fff;
+	border-radius: 12rpx;
+	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+}
+.shop-card__avatar {
+	width: 96rpx;
+	height: 96rpx;
+	border-radius: 12rpx;
+	background: #eee;
+	flex-shrink: 0;
+}
+.shop-card__body {
+	flex: 1;
+	margin: 0 20rpx;
+	min-width: 0;
+}
+.shop-card__name {
+	font-size: 30rpx;
+	color: #333;
+	font-weight: 500;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.shop-card__meta {
+	margin-top: 8rpx;
+	display: flex;
+	flex-wrap: wrap;
+	gap: 16rpx;
+}
+.shop-card__meta-item {
+	font-size: 24rpx;
+	color: #999;
+}
+</style>

shop-app/constants/search.js

@@ -0,0 +1,34 @@
+/** 搜索占位文案（与首页、分类一致 SRH15） */
+export const SEARCH_PLACEHOLDER = '搜索兽药、饲料、店铺'
+
+/** 本地历史存储键 */
+export const SEARCH_HISTORY_KEY = 'shop_search_history'
+
+/** 历史条数上限 */
+export const SEARCH_HISTORY_MAX = 20
+
+/** 结果页 Tab */
+export const SEARCH_TAB_SALES = 'sales'
+export const SEARCH_TAB_PRICE = 'price'
+export const SEARCH_TAB_SHOP = 'shop'
+
+export const SEARCH_TAB_OPTIONS = [
+  { label: '按销量', value: SEARCH_TAB_SALES },
+  { label: '按价格', value: SEARCH_TAB_PRICE },
+  { label: '店铺', value: SEARCH_TAB_SHOP }
+]
+
+/** 按价格 Tab 下的价序 */
+export const PRICE_ORDER_ASC = 'price_asc'
+export const PRICE_ORDER_DESC = 'price_desc'
+
+export const PRICE_ORDER_OPTIONS = [
+  { label: '从低到高', value: PRICE_ORDER_ASC },
+  { label: '从高到低', value: PRICE_ORDER_DESC }
+]
+
+/** 默认商品排序（按销量 Tab / 首次进 B 页） */
+export const DEFAULT_GOODS_SORT = 'sales_desc'
+
+/** 列表每页条数 */
+export const SEARCH_PAGE_SIZE = 10

shop-app/manifest.json

@@ -68,5 +68,12 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : ""
+        },
+        "title" : "农资商城"
+    }
 }

shop-app/pages.json

@@ -22,30 +22,91 @@
 			}
 		},
 		{
-			"path": "pages/category/level1",
+			"path": "pages/cart/index",
 			"style": {
-				"navigationBarTitleText": "分类商品"
+				"navigationBarTitleText": "购物车"
 			}
 		},
 		{
-			"path": "pages/category/goods-list",
+			"path": "pages/mine/index",
 			"style": {
-				"navigationBarTitleText": "商品列表"
+				"navigationBarTitleText": "我的"
 			}
 		},
 		{
-			"path": "pages/cart/index",
+			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "购物车"
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
 			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "subpackage/category",
+			"name": "pkg-category",
+			"pages": [
+				{
+					"path": "level1",
+					"style": {
+						"navigationBarTitleText": "分类商品"
+					}
+				},
+				{
+					"path": "goods-list",
+					"style": {
+						"navigationBarTitleText": "商品列表"
+					}
+				}
+			]
 		},
 		{
-			"path": "pages/mine/index",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
+			"root": "subpackage/goods",
+			"name": "pkg-goods",
+			"pages": [
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "reviews",
+					"style": {
+						"navigationBarTitleText": "全部评价"
+					}
+				}
+			]
+		},
+		{
+			"root": "subpackage/search",
+			"name": "pkg-search",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "搜索"
+					}
+				},
+				{
+					"path": "result",
+					"style": {
+						"navigationBarTitleText": "搜索结果"
+					}
+				}
+			]
 		}
 	],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": ["pkg-category", "pkg-goods", "pkg-search"]
+		},
+		"pages/category/index": {
+			"network": "all",
+			"packages": ["pkg-category", "pkg-goods"]
+		}
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "农资商城",

shop-app/pages/category/index.vue

@@ -47,6 +47,7 @@ import { onShow } from '@dcloudio/uni-app'
 import { getCategoryTree } from '@/api/category'
 import { mapCategoryTree } from '@/utils/categoryDisplay'
 import SearchEntry from '@/components/mall/SearchEntry.vue'
+import { PAGE_CATEGORY_GOODS_LIST } from '@/utils/pageRoute'
 
 const treeList = ref([])
 const selectedIndex = ref(0)
@@ -84,8 +85,7 @@ function onLevel2Tap(child) {
 	if (!level1) return
 	uni.navigateTo({
 		url:
-			'/pages/category/goods-list' +
-			`?categoryId=${child.categoryId}` +
+			`${PAGE_CATEGORY_GOODS_LIST}?categoryId=${child.categoryId}` +
 			`&level1Id=${level1.categoryId}` +
 			`&level1Name=${encodeURIComponent(level1.categoryName || '')}` +
 			`&level2Name=${encodeURIComponent(child.categoryName || '')}`

shop-app/pages/index/index.vue

@@ -126,6 +126,8 @@ import { onShow } from '@dcloudio/uni-app'
 import { listHomeBanners, listHomeCategories, listHomeHotGoods } from '@/api/home'
 import { resolveFileUrl } from '@/utils/image'
 import { formatPrice } from '@/utils/format'
+import { goGoodsDetail } from '@/utils/goodsDetail'
+import { PAGE_SEARCH_INDEX, PAGE_CATEGORY_LEVEL1, PAGE_CATEGORY_TAB } from '@/utils/pageRoute'
 
 const CATEGORY_PLACEHOLDER = '/static/logo.png'
 const GOODS_PLACEHOLDER = '/static/logo.png'
@@ -232,7 +234,7 @@ function onScroll(e) {
 }
 
 function onSearchTap() {
-	uni.showToast({ title: '搜索功能开发中', icon: 'none' })
+	uni.navigateTo({ url: PAGE_SEARCH_INDEX })
 }
 
 function onBannerPreview(index) {
@@ -244,14 +246,13 @@ function onBannerPreview(index) {
 function onCategoryTap(item) {
 	uni.navigateTo({
 		url:
-			'/pages/category/level1' +
-			`?level1Id=${item.categoryId}` +
+			`${PAGE_CATEGORY_LEVEL1}?level1Id=${item.categoryId}` +
 			`&level1Name=${encodeURIComponent(item.categoryName || '')}`
 	})
 }
 
 function onMoreCategoryTap() {
-	uni.switchTab({ url: '/pages/category/index' })
+	uni.switchTab({ url: PAGE_CATEGORY_TAB })
 }
 
 function onCategoryImgError(item) {
@@ -259,10 +260,7 @@ function onCategoryImgError(item) {
 }
 
 function onGoodsTap(item) {
-	uni.showToast({
-		title: '商品详情开发中',
-		icon: 'none'
-	})
+	goGoodsDetail(item.goodsId)
 }
 
 onMounted(() => {

shop-app/pages/login/index.vue

@@ -0,0 +1,422 @@
+<template>
+	<view class="login-page">
+		<!-- 顶部品牌区 -->
+		<view class="login-hero">
+			<view class="login-hero__orb login-hero__orb--1" />
+			<view class="login-hero__orb login-hero__orb--2" />
+			<view class="login-hero__orb login-hero__orb--3" />
+			<view class="login-hero__brand">
+				<text class="login-hero__app">{{ appName }}</text>
+				<text class="login-hero__welcome">欢迎登录农资商城</text>
+			</view>
+		</view>
+
+		<!-- 表单卡片 -->
+		<view class="login-body">
+			<view class="login-card">
+				<text class="login-card__title">账号登录</text>
+				<text class="login-card__sub">登录后即可浏览商品、加入购物车</text>
+
+				<view class="login-field">
+					<view class="login-field__box">
+						<view class="login-field__icon">
+							<u-icon name="account" color="#6b7f72" size="22" />
+						</view>
+						<input
+							v-model="form.username"
+							class="login-field__input"
+							type="text"
+							placeholder="请输入账号"
+							placeholder-class="login-field__placeholder"
+							confirm-type="next"
+						/>
+					</view>
+				</view>
+
+				<view class="login-field">
+					<view class="login-field__box">
+						<view class="login-field__icon">
+							<u-icon name="lock" color="#6b7f72" size="22" />
+						</view>
+						<input
+							v-model="form.password"
+							class="login-field__input"
+							type="password"
+							placeholder="请输入密码"
+							placeholder-class="login-field__placeholder"
+							confirm-type="done"
+							@confirm="handleLogin"
+						/>
+					</view>
+				</view>
+
+				<view v-if="captchaEnabled" class="login-field login-captcha">
+					<view class="login-field__box login-captcha__input-wrap">
+						<view class="login-field__icon">
+							<u-icon name="order" color="#6b7f72" size="22" />
+						</view>
+						<input
+							v-model="form.code"
+							class="login-field__input"
+							type="text"
+							placeholder="请输入验证码"
+							placeholder-class="login-field__placeholder"
+						/>
+					</view>
+					<image
+						v-if="codeUrl"
+						class="login-captcha__img"
+						:src="codeUrl"
+						mode="aspectFit"
+						@click="loadCaptcha"
+					/>
+				</view>
+
+				<view class="login-remember" @click="form.rememberMe = !form.rememberMe">
+					<view :class="['login-remember__check', { 'login-remember__check--on': form.rememberMe }]">
+						<u-icon v-if="form.rememberMe" name="checkmark" color="#ffffff" size="14" />
+					</view>
+					<text class="login-remember__txt">记住账号</text>
+				</view>
+
+				<view
+					:class="['login-btn', { 'login-btn--loading': loading }]"
+					@click="handleLogin"
+				>
+					<text class="login-btn__txt">{{ loading ? '登录中…' : '登 录' }}</text>
+				</view>
+			</view>
+
+			<text class="login-footer">巴青农资商城 · 消费者端</text>
+		</view>
+	</view>
+</template>
+
+<script>
+import { getCodeImg } from '@/api/login'
+import { getToken } from '@/utils/auth'
+import { useUserStore } from '@/store/user'
+import { REMEMBER_USERNAME_KEY } from '@/config'
+
+const HOME_URL = '/pages/index/index'
+
+export default {
+	data() {
+		return {
+			appName: '巴青农资商城',
+			loading: false,
+			captchaEnabled: false,
+			codeUrl: '',
+			form: {
+				username: '',
+				password: '',
+				code: '',
+				uuid: '',
+				rememberMe: false
+			}
+		}
+	},
+	onLoad() {
+		if (getToken()) {
+			this.goHome()
+			return
+		}
+		this.loadRememberedUsername()
+		this.loadCaptcha()
+	},
+	methods: {
+		loadCaptcha() {
+			getCodeImg()
+				.then((res) => {
+					this.captchaEnabled =
+						res.captchaEnabled === undefined ? true : !!res.captchaEnabled
+					if (this.captchaEnabled && res.img) {
+						this.codeUrl = 'data:image/gif;base64,' + res.img
+						this.form.uuid = res.uuid || ''
+					}
+				})
+				.catch(() => {
+					this.captchaEnabled = false
+				})
+		},
+		loadRememberedUsername() {
+			const saved = uni.getStorageSync(REMEMBER_USERNAME_KEY)
+			if (saved) {
+				this.form.username = saved
+				this.form.rememberMe = true
+			}
+		},
+		goHome() {
+			uni.switchTab({ url: HOME_URL })
+		},
+		validateForm() {
+			if (!(this.form.username || '').trim()) {
+				uni.showToast({ title: '请输入账号', icon: 'none' })
+				return false
+			}
+			if (!this.form.password) {
+				uni.showToast({ title: '请输入密码', icon: 'none' })
+				return false
+			}
+			if (this.captchaEnabled && !(this.form.code || '').trim()) {
+				uni.showToast({ title: '请输入验证码', icon: 'none' })
+				return false
+			}
+			return true
+		},
+		handleLogin() {
+			if (!this.validateForm() || this.loading) {
+				return
+			}
+			if (this.form.rememberMe) {
+				uni.setStorageSync(REMEMBER_USERNAME_KEY, this.form.username.trim())
+			} else {
+				uni.removeStorageSync(REMEMBER_USERNAME_KEY)
+			}
+			this.loading = true
+			const userStore = useUserStore()
+			userStore.fedLogOut()
+			const payload = {
+				username: this.form.username.trim(),
+				password: this.form.password,
+				code: this.captchaEnabled ? (this.form.code || '').trim() : '',
+				uuid: this.captchaEnabled ? this.form.uuid : ''
+			}
+			userStore
+				.login(payload)
+				.then(() => userStore.fetchUserInfo())
+				.then(() => {
+					this.goHome()
+				})
+				.catch(() => {
+					if (this.captchaEnabled) {
+						this.loadCaptcha()
+					}
+				})
+				.finally(() => {
+					this.loading = false
+				})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/morandi.scss';
+
+.login-page {
+	min-height: 100%;
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+	background: $morandi-bg-page;
+}
+
+.login-hero {
+	position: relative;
+	flex-shrink: 0;
+	min-height: 420rpx;
+	padding: 80rpx 48rpx 120rpx;
+	box-sizing: border-box;
+	overflow: hidden;
+	background: linear-gradient(145deg, #3d9b6e 0%, #22c55e 42%, #86efac 100%);
+}
+
+.login-hero__orb {
+	position: absolute;
+	border-radius: 50%;
+	background: rgba(255, 255, 255, 0.12);
+}
+
+.login-hero__orb--1 {
+	width: 320rpx;
+	height: 320rpx;
+	top: -80rpx;
+	right: -60rpx;
+}
+
+.login-hero__orb--2 {
+	width: 200rpx;
+	height: 200rpx;
+	bottom: 40rpx;
+	left: -40rpx;
+}
+
+.login-hero__orb--3 {
+	width: 120rpx;
+	height: 120rpx;
+	top: 120rpx;
+	left: 60%;
+	background: rgba(255, 255, 255, 0.08);
+}
+
+.login-hero__brand {
+	position: relative;
+	z-index: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	gap: 16rpx;
+}
+
+.login-hero__app {
+	font-size: 44rpx;
+	font-weight: 700;
+	color: #ffffff;
+	line-height: 1.3;
+}
+
+.login-hero__welcome {
+	font-size: 28rpx;
+	color: rgba(255, 255, 255, 0.88);
+	line-height: 1.5;
+}
+
+.login-body {
+	flex: 1;
+	margin-top: 24px;
+	padding: 0 40rpx 48rpx;
+	box-sizing: border-box;
+}
+
+.login-card {
+	display: flex;
+	flex-direction: column;
+	gap: 28rpx;
+	padding: 48rpx 40rpx 44rpx;
+	border-radius: 32rpx;
+	background: $morandi-bg-card;
+	border: 1rpx solid rgba(255, 255, 255, 0.8);
+	box-shadow: 0 16rpx 48rpx rgba(74, 69, 66, 0.08);
+	box-sizing: border-box;
+}
+
+.login-card__title {
+	font-size: 36rpx;
+	font-weight: 600;
+	color: $morandi-text;
+}
+
+.login-card__sub {
+	font-size: 26rpx;
+	color: $morandi-text-muted;
+	line-height: 1.55;
+	margin-top: -12rpx;
+	margin-bottom: 8rpx;
+}
+
+.login-field__box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 16rpx;
+	padding: 8rpx 24rpx 8rpx 20rpx;
+	border-radius: 20rpx;
+	background: $morandi-composer;
+	border: 1rpx solid $morandi-border-soft;
+	box-sizing: border-box;
+}
+
+.login-field__icon {
+	flex-shrink: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.login-field__input {
+	flex: 1;
+	min-width: 0;
+	min-height: 72rpx;
+	font-size: 30rpx;
+	color: $morandi-text;
+}
+
+.login-field__placeholder {
+	color: $morandi-text-soft;
+	font-size: 28rpx;
+}
+
+.login-captcha {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 16rpx;
+}
+
+.login-captcha__input-wrap {
+	flex: 1;
+	min-width: 0;
+}
+
+.login-captcha__img {
+	flex-shrink: 0;
+	width: 200rpx;
+	height: 72rpx;
+	border-radius: 12rpx;
+	border: 1rpx solid $morandi-border-soft;
+	background: $morandi-bg-card-inner;
+}
+
+.login-remember {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 16rpx;
+	padding: 4rpx 0;
+}
+
+.login-remember__check {
+	flex-shrink: 0;
+	width: 36rpx;
+	height: 36rpx;
+	border-radius: 10rpx;
+	border: 2rpx solid $morandi-border-strong;
+	background: $morandi-bg-card-inner;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+}
+
+.login-remember__check--on {
+	background: #22c55e;
+	border-color: #22c55e;
+}
+
+.login-remember__txt {
+	font-size: 28rpx;
+	color: $morandi-text-secondary;
+}
+
+.login-btn {
+	margin-top: 12rpx;
+	padding: 28rpx 32rpx;
+	border-radius: 48rpx;
+	background: linear-gradient(90deg, #16a34a 0%, #22c55e 50%, #4ade80 100%);
+	box-shadow: 0 12rpx 32rpx rgba(34, 197, 94, 0.35);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.login-btn--loading {
+	opacity: 0.75;
+}
+
+.login-btn__txt {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #ffffff;
+	letter-spacing: 4rpx;
+}
+
+.login-footer {
+	display: block;
+	margin-top: 40rpx;
+	text-align: center;
+	font-size: 24rpx;
+	color: $morandi-text-soft;
+	line-height: 1.5;
+}
+</style>

shop-app/pages/mine/index.vue

@@ -1,11 +1,61 @@
 <template>
 	<view class="page">
-		<text class="tip">我的（待开发）</text>
+		<view v-if="loggedIn" class="user-box">
+			<text class="user-name">{{ displayName }}</text>
+			<button class="btn-outline" @click="handleLogout">退出登录</button>
+		</view>
+		<view v-else class="guest-box">
+			<text class="tip">登录后享受完整购物服务</text>
+			<button class="btn-primary" @click="goLogin">去登录</button>
+		</view>
 	</view>
 </template>
 
 <script>
-	export default {}
+import { getToken } from '@/utils/auth'
+import { useUserStore } from '@/store/user'
+
+export default {
+	data() {
+		return {
+			loggedIn: false,
+			displayName: ''
+		}
+	},
+	onShow() {
+		const userStore = useUserStore()
+		this.loggedIn = !!getToken()
+		if (this.loggedIn) {
+			this.displayName = userStore.displayName() || '会员'
+			if (!userStore.state.name && !userStore.state.nickName) {
+				userStore.fetchUserInfo().then(() => {
+					this.displayName = userStore.displayName() || '会员'
+				})
+			}
+		}
+	},
+	methods: {
+		goLogin() {
+			uni.navigateTo({ url: '/pages/login/index' })
+		},
+		handleLogout() {
+			const userStore = useUserStore()
+			uni.showModal({
+				title: '提示',
+				content: '确定退出当前账号吗？',
+				success: (res) => {
+					if (res.confirm) {
+						userStore.logOut().then(() => {
+							this.loggedIn = false
+							this.displayName = ''
+							uni.showToast({ title: '已退出', icon: 'none' })
+						})
+					}
+				}
+			})
+		}
+	}
+}
 </script>
 
 <style scoped>
@@ -20,4 +70,36 @@
 		font-size: 28rpx;
 		color: #999;
 	}
+	.user-box,
+	.guest-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 32rpx;
+	}
+	.user-name {
+		font-size: 36rpx;
+		font-weight: 600;
+		color: #333;
+	}
+	.btn-primary {
+		padding: 0 64rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		background: #2e7d32;
+		color: #fff;
+		font-size: 30rpx;
+		border-radius: 40rpx;
+		border: none;
+	}
+	.btn-outline {
+		padding: 0 48rpx;
+		height: 72rpx;
+		line-height: 72rpx;
+		background: #fff;
+		color: #2e7d32;
+		font-size: 28rpx;
+		border-radius: 36rpx;
+		border: 1rpx solid #2e7d32;
+	}
 </style>

shop-app/store/user.js

@@ -1,14 +1,103 @@
-import { removeToken } from '@/utils/auth'
+import { reactive } from 'vue'
+import { login as loginApi, logout as logoutApi, getInfo } from '@/api/login'
+import { getToken, setToken, removeToken } from '@/utils/auth'
+import { joinApiUrl } from '@/config'
+
+const state = reactive({
+  token: getToken(),
+  id: '',
+  name: '',
+  nickName: '',
+  avatar: '',
+  roles: [],
+  permissions: []
+})
+
+function isHttp(url) {
+  return /^https?:\/\//i.test(url || '')
+}
+
+function resolveAvatar(path) {
+  if (!path) return ''
+  if (isHttp(path)) return path
+  return joinApiUrl(path)
+}
 
-/** 简易用户 store（登录模块完善后可替换为 pinia） */
 export function useUserStore() {
+  const login = (userInfo) => {
+    const username = (userInfo.username || '').trim()
+    const password = userInfo.password
+    const code = userInfo.code
+    const uuid = userInfo.uuid
+    return loginApi(username, password, code, uuid).then((res) => {
+      const token = res.token || (res.data && res.data.token)
+      if (!token) {
+        return Promise.reject(new Error('登录失败，未返回令牌'))
+      }
+      setToken(token)
+      state.token = token
+      return res
+    })
+  }
+
+  const fetchUserInfo = () => {
+    return getInfo().then((res) => {
+      const user = res.user || (res.data && res.data.user) || {}
+      const roles = res.roles || (res.data && res.data.roles)
+      const permissions = res.permissions || (res.data && res.data.permissions)
+      if (roles && roles.length > 0) {
+        state.roles = roles
+        state.permissions = permissions || []
+      } else {
+        state.roles = ['ROLE_DEFAULT']
+        state.permissions = []
+      }
+      state.id = user.userId
+      state.name = user.userName
+      state.nickName = user.nickName
+      state.avatar = resolveAvatar(user.avatar)
+      return res
+    })
+  }
+
+  const logOut = () => {
+    return logoutApi()
+      .catch(() => {})
+      .finally(() => {
+        state.token = ''
+        state.roles = []
+        state.permissions = []
+        state.id = ''
+        state.name = ''
+        state.nickName = ''
+        state.avatar = ''
+        removeToken()
+      })
+  }
+
+  const fedLogOut = () => {
+    state.token = ''
+    state.roles = []
+    state.permissions = []
+    state.id = ''
+    state.name = ''
+    state.nickName = ''
+    state.avatar = ''
+    removeToken()
+    return Promise.resolve()
+  }
+
+  const displayName = () => state.nickName || state.name || ''
+
+  const isLoggedIn = () => !!state.token
+
   return {
-    state: {
-      token: ''
-    },
-    fedLogOut() {
-      removeToken()
-      return Promise.resolve()
-    }
+    state,
+    login,
+    fetchUserInfo,
+    logOut,
+    fedLogOut,
+    displayName,
+    isLoggedIn
   }
 }

shop-app/styles/morandi.scss

@@ -0,0 +1,13 @@
+/**
+ * 莫兰迪色系（与 ruoyi-ui-app 登录页视觉对齐）
+ */
+$morandi-bg-page: #f0ebe5;
+$morandi-bg-card: #faf8f6;
+$morandi-bg-card-inner: #fdfcfa;
+$morandi-border-soft: #e5ded6;
+$morandi-border-strong: #ddd4c8;
+$morandi-text: #4a4542;
+$morandi-text-secondary: #5c5652;
+$morandi-text-muted: #9a938c;
+$morandi-text-soft: #b5aea6;
+$morandi-composer: #f5f2ef;

shop-app/pages/category/goods-list.vue

@@ -20,6 +20,7 @@ import { onLoad } from '@dcloudio/uni-app'
 import { DEFAULT_SORT_BY } from '@/constants/categorySort'
 import SearchEntry from '@/components/mall/SearchEntry.vue'
 import GoodsListBlock from '@/components/category/GoodsListBlock.vue'
+import { goGoodsDetail } from '@/utils/goodsDetail'
 
 const categoryId = ref('')
 const level1Name = ref('')
@@ -44,8 +45,8 @@ function calcScrollHeight() {
 	}
 }
 
-function onGoodsClick() {
-	uni.showToast({ title: '商品详情开发中', icon: 'none' })
+function onGoodsClick(item) {
+	goGoodsDetail(item.goodsId)
 }
 
 onLoad((options) => {

shop-app/pages/category/level1.vue

@@ -45,6 +45,7 @@ import { mapLevel2Tabs } from '@/utils/categoryDisplay'
 import { DEFAULT_SORT_BY } from '@/constants/categorySort'
 import SearchEntry from '@/components/mall/SearchEntry.vue'
 import GoodsListBlock from '@/components/category/GoodsListBlock.vue'
+import { goGoodsDetail } from '@/utils/goodsDetail'
 
 const level1Id = ref('')
 const level1Name = ref('')
@@ -97,8 +98,8 @@ function onTabChange(index) {
 	scrollTopKey.value += 1
 }
 
-function onGoodsClick() {
-	uni.showToast({ title: '商品详情开发中', icon: 'none' })
+function onGoodsClick(item) {
+	goGoodsDetail(item.goodsId)
 }
 
 onLoad((options) => {

shop-app/subpackage/goods/detail.vue

@@ -0,0 +1,597 @@
+<template>
+	<view class="detail-page">
+		<view v-if="pageLoading" class="detail-loading">
+			<u-loading-icon mode="circle" text="加载中" />
+		</view>
+		<view v-else-if="loadFailed" class="detail-loading">
+			<u-empty mode="data" text="商品不存在或已失效" icon-size="80" />
+		</view>
+		<template v-else-if="detail">
+			<scroll-view class="detail-scroll" scroll-y :style="{ height: scrollHeight }">
+				<!-- 图片轮播 -->
+				<swiper
+					class="pic-swiper"
+					:indicator-dots="detail.pics.length > 1"
+					indicator-color="rgba(255,255,255,0.5)"
+					indicator-active-color="#fff"
+					:circular="detail.pics.length > 1"
+				>
+					<swiper-item v-for="(pic, idx) in detail.pics" :key="idx">
+						<image class="pic-swiper__img" :src="pic" mode="aspectFill" @click="previewPics(idx)" />
+					</swiper-item>
+				</swiper>
+
+				<!-- 状态提示 -->
+				<view v-if="statusTip" class="status-tip">
+					<text>{{ statusTip }}</text>
+				</view>
+
+				<!-- 基本信息 -->
+				<view class="card price-card">
+					<view class="price-row">
+						<text class="price-symbol">¥</text>
+						<text class="price-num">{{ detail.priceText }}</text>
+					</view>
+					<text class="goods-name">{{ detail.goodsName }}</text>
+					<text v-if="detail.goodsBrief" class="goods-brief">{{ detail.goodsBrief }}</text>
+					<view class="meta-row">
+						<text v-if="detail.categoryPath" class="meta-item">{{ detail.categoryPath }}</text>
+						<text class="meta-item">库存 {{ detail.stock }}</text>
+						<text class="meta-item">销量 {{ detail.salesCount != null ? detail.salesCount : '—' }}</text>
+					</view>
+				</view>
+
+				<!-- 数量选择（v1 统一规格） -->
+				<view class="card cell-row" @click="openQtyPopup">
+					<text class="cell-label">数量</text>
+					<text class="cell-value">{{ quantity }} 件</text>
+					<u-icon name="arrow-right" color="#ccc" size="14" />
+				</view>
+
+				<!-- 商品参数 -->
+				<view v-if="detail.attributes.length" class="card section-card">
+					<view class="section-title">商品参数</view>
+					<view v-for="(attr, i) in detail.attributes" :key="i" class="attr-row">
+						<text class="attr-name">{{ attr.itemName }}</text>
+						<text class="attr-val">{{ formatAttrValues(attr.values) }}</text>
+					</view>
+				</view>
+
+				<!-- 展示规格（只读，v1 不参与 SKU） -->
+				<view v-if="detail.specDisplay.length" class="card section-card">
+					<view class="section-title">规格信息</view>
+					<view v-for="(spec, i) in detail.specDisplay" :key="'s' + i" class="attr-row">
+						<text class="attr-name">{{ spec.itemName }}</text>
+						<text class="attr-val">{{ formatAttrValues(spec.values) }}</text>
+					</view>
+				</view>
+
+				<!-- 物流说明 -->
+				<view v-if="hasLogistics" class="card section-card">
+					<view class="section-title">物流说明</view>
+					<view v-if="detail.logistics.shipPromise" class="info-line">
+						<text class="info-label">发货承诺</text>
+						<text>{{ detail.logistics.shipPromise }}</text>
+					</view>
+					<view v-if="detail.logistics.freightDesc" class="info-line">
+						<text class="info-label">运费</text>
+						<text>{{ detail.logistics.freightDesc }}</text>
+					</view>
+					<view v-if="detail.logistics.shipCity" class="info-line">
+						<text class="info-label">发货地</text>
+						<text>{{ detail.logistics.shipCity }}</text>
+					</view>
+				</view>
+
+				<!-- 服务说明 -->
+				<view v-if="detail.services.length" class="card section-card">
+					<view class="section-title">服务说明</view>
+					<view v-for="svc in detail.services" :key="svc.serviceId" class="service-item">
+						<image v-if="svc.serviceIcon" class="service-icon" :src="svc.serviceIcon" mode="aspectFit" />
+						<view class="service-body">
+							<text class="service-name">{{ svc.serviceName }}</text>
+							<text v-if="svc.serviceIntro" class="service-intro">{{ svc.serviceIntro }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 评价摘要 -->
+				<view class="card section-card">
+					<view class="section-head">
+						<text class="section-title">商品评价</text>
+						<text v-if="reviewTotal > 0" class="section-more" @click="goAllReviews">查看全部 ></text>
+					</view>
+					<view v-if="reviewLoading" class="review-loading">
+						<u-loading-icon mode="circle" size="18" />
+					</view>
+					<template v-else-if="reviewPreview.length">
+						<review-card v-for="r in reviewPreview" :key="r.reviewId" :item="r" />
+					</template>
+					<text v-else class="empty-text">暂无评价</text>
+				</view>
+
+				<!-- 售后服务 -->
+				<view class="card section-card">
+					<view class="section-title">售后服务</view>
+					<text class="after-sale-text">{{ afterSaleText }}</text>
+				</view>
+
+				<!-- 图文详情 -->
+				<view class="card section-card">
+					<view class="section-title">图文详情</view>
+					<view v-if="detail.detailContent" class="rich-wrap">
+						<rich-text :nodes="detail.detailContent" />
+					</view>
+					<text v-else class="empty-text">暂无详情</text>
+				</view>
+
+				<!-- 店铺入口 -->
+				<view class="card shop-card" @click="onEnterShop">
+					<image class="shop-avatar" :src="detail.shop.shopAvatar" mode="aspectFill" />
+					<view class="shop-info">
+						<text class="shop-name">{{ detail.shop.shopName || '—' }}</text>
+						<text class="shop-enter">进店逛逛 ></text>
+					</view>
+				</view>
+
+				<view class="scroll-bottom-gap" />
+			</scroll-view>
+
+			<detail-bottom-bar
+				:disabled="!canOperate"
+				@shop="onEnterShop"
+				@cart="onAddCart"
+				@buy="onBuyNow"
+			/>
+		</template>
+
+		<!-- 数量弹层 -->
+		<u-popup :show="qtyPopupShow" mode="bottom" round="16" @close="qtyPopupShow = false">
+			<view class="qty-popup">
+				<view class="qty-popup__head">
+					<image class="qty-popup__pic" :src="detail?.pics?.[0]" mode="aspectFill" />
+					<view>
+						<text class="qty-popup__price">¥ {{ detail?.priceText }}</text>
+						<text class="qty-popup__stock">库存 {{ detail?.stock }}</text>
+					</view>
+				</view>
+				<view class="qty-popup__row">
+					<text>购买数量</text>
+					<u-number-box
+						v-model="quantity"
+						:min="1"
+						:max="maxQuantity"
+						integer
+					/>
+				</view>
+				<button class="qty-popup__btn" @click="confirmQty">确定</button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getGoodsDetail, getGoodsReviews } from '@/api/goods'
+import {
+	mapGoodsDetail,
+	mapReviewList,
+	buildAfterSaleText
+} from '@/utils/goodsDetail'
+import { ensureCanPurchase } from '@/utils/purchaseAction'
+import { PAGE_GOODS_REVIEWS } from '@/utils/pageRoute'
+import ReviewCard from '@/components/goods/ReviewCard.vue'
+import DetailBottomBar from '@/components/goods/DetailBottomBar.vue'
+
+const goodsId = ref('')
+const detail = ref(null)
+const pageLoading = ref(true)
+const loadFailed = ref(false)
+const scrollHeight = ref('600px')
+const quantity = ref(1)
+const qtyPopupShow = ref(false)
+const pendingAction = ref('')
+
+const reviewPreview = ref([])
+const reviewTotal = ref(0)
+const reviewLoading = ref(false)
+
+const maxQuantity = computed(() => {
+	const s = detail.value?.stock
+	return s > 0 ? s : 1
+})
+
+const afterSaleText = computed(() => {
+	if (!detail.value) return ''
+	return buildAfterSaleText(detail.value.afterSalePhone)
+})
+
+const hasLogistics = computed(() => {
+	const l = detail.value?.logistics
+	if (!l) return false
+	return !!(l.shipPromise || l.freightDesc || l.shipCity)
+})
+
+const statusTip = computed(() => {
+	if (!detail.value) return ''
+	if (detail.value.isOffShelf) return '商品已下架'
+	if (!detail.value.isOnSale) return detail.value.goodsStatusLabel || '商品不可购买'
+	if (!detail.value.purchase.allowed && detail.value.purchase.reason) {
+		return detail.value.purchase.reason
+	}
+	if (detail.value.stock <= 0) return '当前商品库存不足'
+	return ''
+})
+
+const canOperate = computed(() => {
+	if (!detail.value) return false
+	if (!detail.value.isOnSale || detail.value.isOffShelf) return false
+	if (detail.value.stock <= 0) return false
+	if (!detail.value.purchase.allowed) return false
+	return true
+})
+
+function calcScrollHeight() {
+	try {
+		const sys = uni.getSystemInfoSync()
+		const h = sys.windowHeight || 600
+		scrollHeight.value = `${h - 56}px`
+	} catch (e) {
+		scrollHeight.value = '600px'
+	}
+}
+
+function formatAttrValues(values) {
+	if (!values || !values.length) return '—'
+	return values.join('、')
+}
+
+async function loadDetail() {
+	pageLoading.value = true
+	loadFailed.value = false
+	try {
+		const res = await getGoodsDetail(goodsId.value)
+		detail.value = mapGoodsDetail(res.data)
+		if (!detail.value) {
+			loadFailed.value = true
+		}
+	} catch (e) {
+		loadFailed.value = true
+		detail.value = null
+	} finally {
+		pageLoading.value = false
+	}
+}
+
+async function loadReviewPreview() {
+	reviewLoading.value = true
+	try {
+		const res = await getGoodsReviews(goodsId.value, { pageNum: 1, pageSize: 2 })
+		reviewPreview.value = mapReviewList(res.rows || [])
+		reviewTotal.value = Number(res.total) || reviewPreview.value.length
+	} catch (e) {
+		reviewPreview.value = []
+		reviewTotal.value = 0
+	} finally {
+		reviewLoading.value = false
+	}
+}
+
+function previewPics(index) {
+	const urls = detail.value?.pics || []
+	uni.previewImage({ urls, current: urls[index] })
+}
+
+function openQtyPopup() {
+	if (!detail.value) return
+	qtyPopupShow.value = true
+}
+
+function confirmQty() {
+	qtyPopupShow.value = false
+	const action = pendingAction.value
+	pendingAction.value = ''
+	if (action === 'cart') {
+		doAddCart()
+	} else if (action === 'buy') {
+		doBuyNow()
+	}
+}
+
+async function onAddCart() {
+	if (!canOperate.value) {
+		showBlockReason()
+		return
+	}
+	pendingAction.value = 'cart'
+	if (quantity.value > 1) {
+		openQtyPopup()
+		return
+	}
+	await doAddCart()
+}
+
+async function doAddCart() {
+	const ok = await ensureCanPurchase(goodsId.value, detail.value?.purchase?.reason)
+	if (!ok) return
+	uni.showToast({ title: '购物车功能开发中', icon: 'none' })
+}
+
+async function onBuyNow() {
+	if (!canOperate.value) {
+		showBlockReason()
+		return
+	}
+	pendingAction.value = 'buy'
+	openQtyPopup()
+}
+
+async function doBuyNow() {
+	const ok = await ensureCanPurchase(goodsId.value, detail.value?.purchase?.reason)
+	if (!ok) return
+	uni.showToast({ title: '确认订单功能开发中', icon: 'none' })
+}
+
+function showBlockReason() {
+	const msg =
+		statusTip.value ||
+		detail.value?.purchase?.reason ||
+		'暂不可购买'
+	uni.showToast({ title: msg, icon: 'none' })
+}
+
+function onEnterShop() {
+	uni.showToast({ title: '店铺主页开发中', icon: 'none' })
+}
+
+function goAllReviews() {
+	uni.navigateTo({
+		url: `${PAGE_GOODS_REVIEWS}?goodsId=${goodsId.value}`
+	})
+}
+
+onLoad((options) => {
+	goodsId.value = options.goodsId || ''
+	calcScrollHeight()
+	if (!goodsId.value) {
+		loadFailed.value = true
+		pageLoading.value = false
+		return
+	}
+	loadDetail().then(() => loadReviewPreview())
+})
+</script>
+
+<style lang="scss" scoped>
+.detail-page {
+	min-height: 100vh;
+	background: #f5f6f8;
+}
+.detail-loading {
+	min-height: 60vh;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.pic-swiper {
+	height: 750rpx;
+	background: #fff;
+}
+.pic-swiper__img {
+	width: 100%;
+	height: 750rpx;
+}
+.status-tip {
+	padding: 16rpx 24rpx;
+	background: #fff3e0;
+	color: #e65100;
+	font-size: 26rpx;
+}
+.card {
+	margin: 16rpx 24rpx;
+	padding: 24rpx;
+	background: #fff;
+	border-radius: 16rpx;
+}
+.price-card .price-row {
+	color: #e53935;
+	font-weight: 700;
+}
+.price-symbol {
+	font-size: 28rpx;
+}
+.price-num {
+	font-size: 48rpx;
+}
+.goods-name {
+	display: block;
+	margin-top: 16rpx;
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #222;
+	line-height: 1.4;
+}
+.goods-brief {
+	display: block;
+	margin-top: 12rpx;
+	font-size: 26rpx;
+	color: #888;
+}
+.meta-row {
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 16rpx;
+	gap: 16rpx;
+}
+.meta-item {
+	font-size: 24rpx;
+	color: #999;
+}
+.cell-row {
+	display: flex;
+	align-items: center;
+}
+.cell-label {
+	font-size: 28rpx;
+	color: #333;
+}
+.cell-value {
+	flex: 1;
+	text-align: right;
+	margin-right: 8rpx;
+	font-size: 28rpx;
+	color: #666;
+}
+.section-title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #222;
+	margin-bottom: 16rpx;
+}
+.section-head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 8rpx;
+}
+.section-more {
+	font-size: 24rpx;
+	color: #2e7d32;
+}
+.attr-row {
+	display: flex;
+	padding: 12rpx 0;
+	font-size: 26rpx;
+	border-bottom: 1rpx solid #f5f5f5;
+}
+.attr-name {
+	width: 180rpx;
+	color: #999;
+	flex-shrink: 0;
+}
+.attr-val {
+	flex: 1;
+	color: #333;
+}
+.info-line {
+	display: flex;
+	padding: 10rpx 0;
+	font-size: 26rpx;
+	color: #444;
+}
+.info-label {
+	width: 140rpx;
+	color: #999;
+	flex-shrink: 0;
+}
+.service-item {
+	display: flex;
+	padding: 16rpx 0;
+	border-bottom: 1rpx solid #f5f5f5;
+}
+.service-icon {
+	width: 48rpx;
+	height: 48rpx;
+	margin-right: 16rpx;
+}
+.service-name {
+	font-size: 28rpx;
+	color: #333;
+}
+.service-intro {
+	display: block;
+	margin-top: 6rpx;
+	font-size: 24rpx;
+	color: #999;
+}
+.after-sale-text {
+	font-size: 26rpx;
+	color: #666;
+	line-height: 1.6;
+}
+.rich-wrap {
+	font-size: 28rpx;
+	color: #444;
+	overflow: hidden;
+}
+.empty-text {
+	font-size: 26rpx;
+	color: #999;
+}
+.shop-card {
+	display: flex;
+	align-items: center;
+}
+.shop-avatar {
+	width: 88rpx;
+	height: 88rpx;
+	border-radius: 50%;
+	background: #eee;
+}
+.shop-info {
+	margin-left: 20rpx;
+}
+.shop-name {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
+}
+.shop-enter {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	color: #2e7d32;
+}
+.review-loading {
+	padding: 24rpx 0;
+	display: flex;
+	justify-content: center;
+}
+.scroll-bottom-gap {
+	height: 140rpx;
+}
+.qty-popup {
+	padding: 32rpx 24rpx 48rpx;
+}
+.qty-popup__head {
+	display: flex;
+	align-items: center;
+	margin-bottom: 32rpx;
+}
+.qty-popup__pic {
+	width: 160rpx;
+	height: 160rpx;
+	border-radius: 12rpx;
+	margin-right: 20rpx;
+	background: #f5f5f5;
+}
+.qty-popup__price {
+	display: block;
+	font-size: 36rpx;
+	color: #e53935;
+	font-weight: 600;
+}
+.qty-popup__stock {
+	display: block;
+	margin-top: 8rpx;
+	font-size: 24rpx;
+	color: #999;
+}
+.qty-popup__row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 32rpx;
+	font-size: 28rpx;
+}
+.qty-popup__btn {
+	height: 88rpx;
+	line-height: 88rpx;
+	background: #2e7d32;
+	color: #fff;
+	font-size: 30rpx;
+	border-radius: 44rpx;
+	border: none;
+}
+</style>

shop-app/subpackage/goods/reviews.vue

@@ -0,0 +1,123 @@
+<template>
+	<view class="reviews-page">
+		<scroll-view
+			class="reviews-scroll"
+			scroll-y
+			:style="{ height: scrollHeight }"
+			@scrolltolower="onLoadMore"
+		>
+			<view v-if="loading && !list.length" class="reviews-loading">
+				<u-loading-icon mode="circle" text="加载中" />
+			</view>
+			<view v-else-if="list.length" class="reviews-list">
+				<review-card v-for="item in list" :key="item.reviewId" :item="item" />
+			</view>
+			<view v-else class="reviews-empty">
+				<u-empty mode="list" text="暂无评价" icon-size="80" />
+			</view>
+			<view v-if="list.length" class="reviews-footer">
+				<text v-if="loadingMore">加载中...</text>
+				<text v-else-if="finished">没有更多了</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getGoodsReviews } from '@/api/goods'
+import { mapReviewList } from '@/utils/goodsDetail'
+import ReviewCard from '@/components/goods/ReviewCard.vue'
+
+const goodsId = ref('')
+const list = ref([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const finished = ref(false)
+const pageNum = ref(1)
+const pageSize = 10
+const scrollHeight = ref('600px')
+
+function calcScrollHeight() {
+	try {
+		const sys = uni.getSystemInfoSync()
+		scrollHeight.value = `${sys.windowHeight || 600}px`
+	} catch (e) {
+		scrollHeight.value = '600px'
+	}
+}
+
+async function fetchPage(isReset) {
+	if (!goodsId.value) return
+	if (isReset) {
+		loading.value = true
+		pageNum.value = 1
+		finished.value = false
+	} else {
+		if (finished.value || loadingMore.value) return
+		loadingMore.value = true
+	}
+	try {
+		const res = await getGoodsReviews(goodsId.value, {
+			pageNum: pageNum.value,
+			pageSize
+		})
+		const rows = mapReviewList(res.rows || [])
+		const total = Number(res.total) || 0
+		if (isReset) {
+			list.value = rows
+		} else {
+			list.value = list.value.concat(rows)
+		}
+		finished.value =
+			rows.length < pageSize || (total > 0 && list.value.length >= total)
+		if (!finished.value) {
+			pageNum.value += 1
+		}
+	} catch (e) {
+		if (isReset) list.value = []
+	} finally {
+		loading.value = false
+		loadingMore.value = false
+	}
+}
+
+function onLoadMore() {
+	if (!loading.value && !loadingMore.value && !finished.value) {
+		fetchPage(false)
+	}
+}
+
+onLoad((options) => {
+	goodsId.value = options.goodsId || ''
+	calcScrollHeight()
+	fetchPage(true)
+})
+</script>
+
+<style lang="scss" scoped>
+.reviews-page {
+	min-height: 100vh;
+	background: #fff;
+}
+.reviews-scroll {
+	box-sizing: border-box;
+}
+.reviews-list {
+	padding: 0 24rpx;
+}
+.reviews-loading,
+.reviews-empty {
+	min-height: 50vh;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.reviews-footer {
+	padding: 24rpx;
+	text-align: center;
+	font-size: 24rpx;
+	color: #999;
+}
+</style>

shop-app/subpackage/search/index.vue

@@ -0,0 +1,198 @@
+<template>
+	<view class="page-search">
+		<view class="search-header">
+			<view class="search-header__bar">
+				<u-icon name="arrow-left" size="20" color="#333" @click="onBack" />
+				<view class="search-header__input-wrap">
+					<u-icon name="search" color="#999" size="18" />
+					<input
+						class="search-header__input"
+						v-model="keyword"
+						:placeholder="placeholder"
+						confirm-type="search"
+						:focus="inputFocus"
+						@confirm="onSubmit"
+					/>
+					<u-icon
+						v-if="keyword"
+						name="close-circle-fill"
+						color="#ccc"
+						size="18"
+						@click="keyword = ''"
+					/>
+				</view>
+				<text class="search-header__btn" @click="onSubmit">搜索</text>
+			</view>
+		</view>
+
+		<view v-if="historyList.length" class="history">
+			<view class="history__head">
+				<text class="history__title">搜索历史</text>
+				<text class="history__clear" @click="onClearAll">清空</text>
+			</view>
+			<view class="history__list">
+				<view v-for="item in historyList" :key="item.keyword" class="history__item">
+					<text class="history__text" @click="onHistoryTap(item.keyword)">{{ item.keyword }}</text>
+					<u-icon
+						name="close"
+						color="#bbb"
+						size="14"
+						@click.stop="onRemoveOne(item.keyword)"
+					/>
+				</view>
+			</view>
+		</view>
+		<view v-else class="history-empty">
+			<text>暂无搜索历史</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import { SEARCH_PLACEHOLDER } from '@/constants/search'
+import {
+  getSearchHistory,
+  addSearchHistory,
+  removeSearchHistoryItem,
+  clearSearchHistory
+} from '@/utils/searchHistory'
+import { goSearchResult } from '@/utils/searchNav'
+
+const placeholder = SEARCH_PLACEHOLDER
+const keyword = ref('')
+const historyList = ref([])
+const inputFocus = ref(false)
+
+function refreshHistory() {
+  historyList.value = getSearchHistory()
+}
+
+function onBack() {
+  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
+}
+
+function submitSearch() {
+  const text = (keyword.value || '').trim()
+  if (!text) {
+    uni.showToast({ title: '请输入搜索内容', icon: 'none' })
+    return
+  }
+  addSearchHistory(text)
+  goSearchResult(text)
+}
+
+function onSubmit() {
+  submitSearch()
+}
+
+function onHistoryTap(text) {
+  keyword.value = text
+  submitSearch()
+}
+
+function onRemoveOne(text) {
+  removeSearchHistoryItem(text)
+  refreshHistory()
+}
+
+function onClearAll() {
+  uni.showModal({
+    title: '提示',
+    content: '确定清空全部搜索历史吗？',
+    success: (res) => {
+      if (res.confirm) {
+        clearSearchHistory()
+        refreshHistory()
+      }
+    }
+  })
+}
+
+onLoad((options) => {
+  if (options && options.keyword) {
+    keyword.value = decodeURIComponent(options.keyword)
+  }
+  inputFocus.value = !keyword.value
+})
+
+onShow(() => {
+  refreshHistory()
+})
+</script>
+
+<style lang="scss" scoped>
+.page-search {
+	height: calc(100vh - 100rpx);
+	background: #f5f6f8;
+}
+.search-header {
+	background: #fff;
+	padding: 16rpx 24rpx 24rpx;
+}
+.search-header__bar {
+	display: flex;
+	align-items: center;
+}
+.search-header__input-wrap {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	height: 72rpx;
+	margin: 0 16rpx;
+	padding: 0 20rpx;
+	background: #f5f6f8;
+	border-radius: 36rpx;
+}
+.search-header__input {
+	flex: 1;
+	margin: 0 12rpx;
+	font-size: 28rpx;
+	color: #333;
+}
+.search-header__btn {
+	font-size: 28rpx;
+	color: #2e7d32;
+	font-weight: 500;
+	flex-shrink: 0;
+}
+.history {
+	margin-top: 16rpx;
+	padding: 24rpx;
+	background: #fff;
+}
+.history__head {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 20rpx;
+}
+.history__title {
+	font-size: 28rpx;
+	color: #333;
+	font-weight: 600;
+}
+.history__clear {
+	font-size: 26rpx;
+	color: #999;
+}
+.history__item {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 20rpx 0;
+	border-bottom: 1rpx solid #f5f5f5;
+}
+.history__text {
+	flex: 1;
+	font-size: 28rpx;
+	color: #666;
+}
+.history-empty {
+	padding: 80rpx 24rpx;
+	text-align: center;
+	font-size: 26rpx;
+	color: #bbb;
+}
+</style>

shop-app/subpackage/search/result.vue

@@ -0,0 +1,332 @@
+<template>
+	<view class="page-result">
+		<view class="result-header" @click="onReSearch">
+			<u-icon name="arrow-left" size="20" color="#333" @click.stop="onBack" />
+			<view class="result-header__keyword">
+				<u-icon name="search" color="#999" size="16" />
+				<text class="result-header__text">{{ keyword }}</text>
+			</view>
+		</view>
+
+		<search-result-tabs
+			:model-value="activeTab"
+			:price-order="priceOrder"
+			@update:model-value="activeTab = $event"
+			@update:price-order="priceOrder = $event"
+			@change="onTabChange"
+			@price-change="onPriceOrderChange"
+		/>
+
+		<scroll-view
+			class="result-scroll"
+			scroll-y
+			:style="{ height: scrollHeight }"
+			:scroll-top="listScrollTop"
+			@scrolltolower="onLoadMore"
+		>
+			<view v-if="loading && !displayList.length" class="result-loading">
+				<u-loading-icon mode="circle" />
+			</view>
+
+			<template v-else-if="isShopTab">
+				<shop-list v-if="shopList.length" :list="shopList" @item-click="onShopClick" />
+				<view v-else class="result-empty">
+					<u-empty mode="search" :text="emptyText" icon-size="80" />
+					<text v-if="loadFailed" class="result-retry" @click="reloadAll">点击重试</text>
+				</view>
+			</template>
+
+			<template v-else>
+				<goods-grid v-if="goodsList.length" :list="goodsList" @item-click="onGoodsClick" />
+				<view v-else class="result-empty">
+					<u-empty mode="search" :text="emptyText" icon-size="80" />
+					<text v-if="loadFailed" class="result-retry" @click="reloadAll">点击重试</text>
+				</view>
+			</template>
+
+			<view v-if="displayList.length" class="result-footer">
+				<text v-if="loadingMore">加载中...</text>
+				<text v-else-if="finished">没有更多了</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { searchAll } from '@/api/search'
+import { mapGoodsCardList } from '@/utils/goodsDisplay'
+import { mapShopCardList } from '@/utils/shopDisplay'
+import { addSearchHistory } from '@/utils/searchHistory'
+import { goSearchInput } from '@/utils/searchNav'
+import { goGoodsDetail } from '@/utils/goodsDetail'
+import {
+  SEARCH_TAB_SALES,
+  SEARCH_TAB_PRICE,
+  SEARCH_TAB_SHOP,
+  DEFAULT_GOODS_SORT,
+  PRICE_ORDER_ASC,
+  SEARCH_PAGE_SIZE
+} from '@/constants/search'
+import SearchResultTabs from '@/components/search/SearchResultTabs.vue'
+import GoodsGrid from '@/components/mall/GoodsGrid.vue'
+import ShopList from '@/components/search/ShopList.vue'
+
+const keyword = ref('')
+const activeTab = ref(SEARCH_TAB_SALES)
+const priceOrder = ref(PRICE_ORDER_ASC)
+
+const goodsList = ref([])
+const shopList = ref([])
+const goodsTotal = ref(0)
+const shopTotal = ref(0)
+const goodsPageNum = ref(1)
+const shopPageNum = ref(1)
+
+const loading = ref(false)
+const loadingMore = ref(false)
+const finished = ref(false)
+const loadFailed = ref(false)
+const listScrollTop = ref(0)
+const scrollHeight = ref('600px')
+
+const emptyText = '暂无相关'
+
+const isShopTab = computed(() => activeTab.value === SEARCH_TAB_SHOP)
+
+const displayList = computed(() => (isShopTab.value ? shopList.value : goodsList.value))
+
+const goodsSortBy = computed(() => {
+  if (activeTab.value === SEARCH_TAB_SALES) {
+    return DEFAULT_GOODS_SORT
+  }
+  if (activeTab.value === SEARCH_TAB_PRICE) {
+    return priceOrder.value
+  }
+  return DEFAULT_GOODS_SORT
+})
+
+function calcScrollHeight() {
+  try {
+    const sys = uni.getSystemInfoSync()
+    const h = sys.windowHeight || 600
+    scrollHeight.value = `${h - 120}px`
+  } catch (e) {
+    scrollHeight.value = '500px'
+  }
+}
+
+function resetScrollTop() {
+  listScrollTop.value = listScrollTop.value === 0 ? 0.1 : 0
+}
+
+async function fetchSearch(reset) {
+  const kw = (keyword.value || '').trim()
+  if (!kw) return
+
+  if (reset) {
+    loading.value = true
+    loadFailed.value = false
+    finished.value = false
+    if (isShopTab.value) {
+      shopPageNum.value = 1
+    } else {
+      goodsPageNum.value = 1
+    }
+  } else {
+    if (finished.value || loadingMore.value) return
+    loadingMore.value = true
+  }
+
+  try {
+    const params = {
+      keyword: kw,
+      sortBy: goodsSortBy.value,
+      goodsPageNum: goodsPageNum.value,
+      goodsPageSize: SEARCH_PAGE_SIZE,
+      shopPageNum: shopPageNum.value,
+      shopPageSize: SEARCH_PAGE_SIZE
+    }
+    const data = await searchAll(params)
+    const goodsRows = mapGoodsCardList((data.goods && data.goods.rows) || [])
+    const shopRows = mapShopCardList((data.shops && data.shops.rows) || [])
+    const gTotal = Number((data.goods && data.goods.total) || 0)
+    const sTotal = Number((data.shops && data.shops.total) || 0)
+
+    if (isShopTab.value) {
+      if (reset) {
+        shopList.value = shopRows
+      } else {
+        shopList.value = shopList.value.concat(shopRows)
+      }
+      shopTotal.value = sTotal
+      finished.value =
+        shopRows.length < SEARCH_PAGE_SIZE || (sTotal > 0 && shopList.value.length >= sTotal)
+      if (!finished.value) {
+        shopPageNum.value += 1
+      }
+    } else {
+      if (reset) {
+        goodsList.value = goodsRows
+      } else {
+        goodsList.value = goodsList.value.concat(goodsRows)
+      }
+      goodsTotal.value = gTotal
+      finished.value =
+        goodsRows.length < SEARCH_PAGE_SIZE || (gTotal > 0 && goodsList.value.length >= gTotal)
+      if (!finished.value) {
+        goodsPageNum.value += 1
+      }
+      // 同一次请求顺带更新店铺缓存，切「店铺」Tab 可直接展示
+      if (reset && shopPageNum.value === 1) {
+        shopList.value = shopRows
+        shopTotal.value = sTotal
+        if (shopRows.length > 0) {
+          shopPageNum.value = 2
+        }
+      }
+    }
+  } catch (e) {
+    loadFailed.value = true
+    if (reset) {
+      if (isShopTab.value) {
+        shopList.value = []
+      } else {
+        goodsList.value = []
+      }
+    }
+  } finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function reloadAll() {
+  resetScrollTop()
+  if (isShopTab.value) {
+    shopPageNum.value = 1
+  } else {
+    goodsPageNum.value = 1
+  }
+  fetchSearch(true)
+}
+
+function onTabChange() {
+  resetScrollTop()
+  finished.value = false
+  if (isShopTab.value) {
+    if (shopList.value.length > 0) {
+      finished.value = shopTotal.value > 0 && shopList.value.length >= shopTotal.value
+      return
+    }
+    shopPageNum.value = 1
+    fetchSearch(true)
+  } else {
+    goodsPageNum.value = 1
+    fetchSearch(true)
+  }
+}
+
+function onPriceOrderChange() {
+  if (activeTab.value !== SEARCH_TAB_PRICE) return
+  resetScrollTop()
+  goodsPageNum.value = 1
+  fetchSearch(true)
+}
+
+function onLoadMore() {
+  if (!loading.value && !loadingMore.value && !finished.value) {
+    fetchSearch(false)
+  }
+}
+
+function onBack() {
+  uni.navigateBack()
+}
+
+function onReSearch() {
+  goSearchInput(keyword.value)
+}
+
+function onGoodsClick(item) {
+  if (item && item.goodsId) {
+    goGoodsDetail(item.goodsId)
+  }
+}
+
+function onShopClick() {
+  uni.showToast({ title: '店铺主页开发中', icon: 'none' })
+}
+
+onLoad((options) => {
+  calcScrollHeight()
+  const kw = options && options.keyword ? decodeURIComponent(options.keyword) : ''
+  keyword.value = (kw || '').trim()
+  if (!keyword.value) {
+    uni.showToast({ title: '请输入搜索内容', icon: 'none' })
+    setTimeout(() => uni.navigateBack(), 500)
+    return
+  }
+  addSearchHistory(keyword.value)
+  fetchSearch(true)
+})
+</script>
+
+<style lang="scss" scoped>
+.page-result {
+	display: flex;
+	flex-direction: column;
+	min-height: 100vh;
+	background: #f5f6f8;
+}
+.result-header {
+	display: flex;
+	align-items: center;
+	padding: 16rpx 24rpx;
+	background: #fff;
+}
+.result-header__keyword {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	height: 64rpx;
+	margin-left: 16rpx;
+	padding: 0 20rpx;
+	background: #f5f6f8;
+	border-radius: 32rpx;
+}
+.result-header__text {
+	margin-left: 12rpx;
+	font-size: 28rpx;
+	color: #333;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.result-scroll {
+	flex: 1;
+}
+.result-loading {
+	padding: 80rpx 0;
+	display: flex;
+	justify-content: center;
+}
+.result-empty {
+	padding: 60rpx 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.result-retry {
+	margin-top: 24rpx;
+	font-size: 28rpx;
+	color: #2e7d32;
+}
+.result-footer {
+	padding: 24rpx;
+	text-align: center;
+	font-size: 24rpx;
+	color: #999;
+}
+</style>

shop-app/utils/goodsDetail.js

@@ -0,0 +1,112 @@
+import { resolveFileUrl } from '@/utils/image'
+import { formatPrice } from '@/utils/format'
+import { PAGE_GOODS_DETAIL } from '@/utils/pageRoute'
+
+const GOODS_PLACEHOLDER = '/static/logo.png'
+const SHOP_AVATAR_PLACEHOLDER = '/static/logo.png'
+
+/** 跳转商品详情 */
+export function goGoodsDetail(goodsId) {
+  if (!goodsId) return
+  uni.navigateTo({
+    url: `${PAGE_GOODS_DETAIL}?goodsId=${goodsId}`
+  })
+}
+
+export function mapDetailPics(pics) {
+  if (!Array.isArray(pics) || !pics.length) {
+    return [GOODS_PLACEHOLDER]
+  }
+  return pics.map((p) => resolveFileUrl(p) || GOODS_PLACEHOLDER).filter(Boolean)
+}
+
+/** 详情接口 data → 页面模型 */
+export function mapGoodsDetail(data) {
+  if (!data) return null
+  const logistics = data.logistics || {}
+  const shop = data.shop || {}
+  const purchase = data.purchase || {}
+  return {
+    goodsId: data.goodsId,
+    goodsSn: data.goodsSn,
+    goodsName: data.goodsName,
+    goodsBrief: data.goodsBrief,
+    pics: mapDetailPics(data.pics),
+    salePrice: data.salePrice,
+    priceText: formatPrice(data.salePrice),
+    stock: Number(data.stock) || 0,
+    salesCount: data.salesCount,
+    goodsStatus: data.goodsStatus,
+    goodsStatusLabel: data.goodsStatusLabel,
+    categoryPath: data.categoryPath,
+    detailContent: data.detailContent || '',
+    attributes: data.attributes || [],
+    specDisplay: data.specDisplay || [],
+    services: (data.services || []).map(mapService),
+    logistics: {
+      shipPromise: logistics.shipPromise,
+      freightDesc: logistics.freightDesc,
+      shipCity: logistics.shipCity
+    },
+    shop: {
+      shopId: shop.shopId,
+      shopName: shop.shopName,
+      shopAvatar: resolveFileUrl(shop.shopAvatar) || SHOP_AVATAR_PLACEHOLDER,
+      shopStatus: shop.shopStatus,
+      shopPhone: shop.shopPhone,
+      rating: shop.rating,
+      fansCount: shop.fansCount
+    },
+    purchase: {
+      allowed: !!purchase.allowed,
+      reason: purchase.reason || ''
+    },
+    afterSalePhone: data.afterSalePhone || shop.shopPhone || '',
+    isOnSale: String(data.goodsStatus) === '2',
+    isOffShelf: String(data.goodsStatus) === '4'
+  }
+}
+
+function mapService(row) {
+  return {
+    serviceId: row.serviceId,
+    serviceName: row.serviceName,
+    serviceIntro: row.serviceIntro,
+    serviceIcon: resolveFileUrl(row.serviceIcon)
+  }
+}
+
+export function mapReviewRow(row) {
+  if (!row) return null
+  let pics = row.pics
+  if (typeof pics === 'string' && pics) {
+    pics = pics.split(',').map((s) => s.trim()).filter(Boolean)
+  }
+  if (!Array.isArray(pics)) {
+    pics = []
+  }
+  return {
+    reviewId: row.reviewId,
+    memberNickName: row.memberNickName || '匿名用户',
+    memberAvatar: resolveFileUrl(row.memberAvatar),
+    content: row.content,
+    pics: pics.map((p) => resolveFileUrl(p)).filter(Boolean),
+    score: row.score,
+    goodsMainPic: resolveFileUrl(row.goodsMainPic),
+    goodsSpec: row.goodsSpec,
+    replyContent: row.replyContent,
+    replyTime: row.replyTime,
+    createTime: row.createTime
+  }
+}
+
+export function mapReviewList(list) {
+  if (!Array.isArray(list)) return []
+  return list.map(mapReviewRow).filter(Boolean)
+}
+
+/** 售后服务说明文案 */
+export function buildAfterSaleText(phone) {
+  const contact = phone ? `【${phone}】` : '【平台客服】'
+  return `售后无忧有保障，让您购物更放心！签收后若遇任何问题，随时联系我们${contact}，专业售后团队为您妥善处理！`
+}

shop-app/utils/pageRoute.js

@@ -0,0 +1,40 @@
+/**
+ * 页面路径（主包 pages/ + 分包 subpackage/）
+ *
+ * 【约定】仅 Tab 五页 + 登录 在主包；其余业务页一律在 subpackage/ 下，
+ * 新建页面须在本文件增加常量，并在 pages.json 的 subPackages 注册。
+ * 详见 shop-app/PAGES.md 与 .cursor/rules/10-shop-app-subpackage.mdc
+ */
+
+// —— 主包：Tab + 登录（勿随意新增主包页面）——
+
+/** 首页 Tab */
+export const PAGE_HOME = '/pages/index/index'
+/** 分类 Tab */
+export const PAGE_CATEGORY_TAB = '/pages/category/index'
+/** 购物车 Tab（占位，正式功能待开发） */
+export const PAGE_CART = '/pages/cart/index'
+/** 我的 Tab（占位，正式功能待开发） */
+export const PAGE_MINE = '/pages/mine/index'
+/** 登录 */
+export const PAGE_LOGIN = '/pages/login/index'
+
+// —— 分包：分类 ——
+
+export const PAGE_CATEGORY_LEVEL1 = '/subpackage/category/level1'
+export const PAGE_CATEGORY_GOODS_LIST = '/subpackage/category/goods-list'
+
+// —— 分包：商品 ——
+
+export const PAGE_GOODS_DETAIL = '/subpackage/goods/detail'
+export const PAGE_GOODS_REVIEWS = '/subpackage/goods/reviews'
+
+// —— 分包：搜索 ——
+
+export const PAGE_SEARCH_INDEX = '/subpackage/search/index'
+export const PAGE_SEARCH_RESULT = '/subpackage/search/result'
+
+// —— 分包：待建模块（示例，落地后取消注释并注册 pages.json）——
+// export const PAGE_SHOP_HOME = '/subpackage/shop/index'
+// export const PAGE_ORDER_LIST = '/subpackage/order/list'
+// export const PAGE_ORDER_CONFIRM = '/subpackage/order/confirm'

shop-app/utils/purchaseAction.js

@@ -0,0 +1,27 @@
+import { ensureApiToken } from '@/utils/apiAuth'
+import { getGoodsCanPurchase } from '@/api/goods'
+
+/** 加购/购买前：登录 + 可购校验 */
+export async function ensureCanPurchase(goodsId, fallbackReason) {
+  if (!ensureApiToken(true)) {
+    return false
+  }
+  try {
+    const res = await getGoodsCanPurchase(goodsId)
+    const data = res.data || {}
+    if (!data.allowed) {
+      uni.showToast({
+        title: data.reason || fallbackReason || '暂不可购买',
+        icon: 'none'
+      })
+      return false
+    }
+    return true
+  } catch (e) {
+    uni.showToast({
+      title: fallbackReason || '校验失败，请稍后重试',
+      icon: 'none'
+    })
+    return false
+  }
+}

shop-app/utils/searchHistory.js

@@ -0,0 +1,55 @@
+import { SEARCH_HISTORY_KEY, SEARCH_HISTORY_MAX } from '@/constants/search'
+
+function readRaw() {
+  try {
+    const raw = uni.getStorageSync(SEARCH_HISTORY_KEY)
+    if (!raw) return []
+    const list = typeof raw === 'string' ? JSON.parse(raw) : raw
+    return Array.isArray(list) ? list : []
+  } catch (e) {
+    return []
+  }
+}
+
+function writeRaw(list) {
+  try {
+    uni.setStorageSync(SEARCH_HISTORY_KEY, JSON.stringify(list))
+  } catch (e) {
+    // 存储失败不影响搜索
+  }
+}
+
+/** 历史列表：{ keyword, time }[]，按 time 倒序 */
+export function getSearchHistory() {
+  return readRaw()
+    .filter((item) => item && item.keyword)
+    .sort((a, b) => (b.time || 0) - (a.time || 0))
+}
+
+/** 成功进入结果页后写入；同词去重并置顶 */
+export function addSearchHistory(keyword) {
+  const text = (keyword || '').trim()
+  if (!text) return
+  const now = Date.now()
+  let list = readRaw().filter((item) => item.keyword !== text)
+  list.unshift({ keyword: text, time: now })
+  if (list.length > SEARCH_HISTORY_MAX) {
+    list = list.slice(0, SEARCH_HISTORY_MAX)
+  }
+  writeRaw(list)
+}
+
+export function removeSearchHistoryItem(keyword) {
+  const text = (keyword || '').trim()
+  if (!text) return
+  const list = readRaw().filter((item) => item.keyword !== text)
+  writeRaw(list)
+}
+
+export function clearSearchHistory() {
+  try {
+    uni.removeStorageSync(SEARCH_HISTORY_KEY)
+  } catch (e) {
+    writeRaw([])
+  }
+}

shop-app/utils/searchNav.js

@@ -0,0 +1,19 @@
+import { PAGE_SEARCH_INDEX, PAGE_SEARCH_RESULT } from '@/utils/pageRoute'
+
+/** 跳转搜索输入页 A */
+export function goSearchInput(keyword) {
+  const text = (keyword || '').trim()
+  const url = text
+    ? `${PAGE_SEARCH_INDEX}?keyword=${encodeURIComponent(text)}`
+    : PAGE_SEARCH_INDEX
+  uni.navigateTo({ url })
+}
+
+/** 跳转搜索结果页 B */
+export function goSearchResult(keyword) {
+  const text = (keyword || '').trim()
+  if (!text) return
+  uni.navigateTo({
+    url: `${PAGE_SEARCH_RESULT}?keyword=${encodeURIComponent(text)}`
+  })
+}

shop-app/utils/shopDisplay.js

@@ -0,0 +1,24 @@
+import { resolveFileUrl } from '@/utils/image'
+
+const SHOP_PLACEHOLDER = '/static/logo.png'
+
+/** 搜索店铺卡片 */
+export function mapShopCard(row) {
+  if (!row) return null
+  return {
+    shopId: row.shopId,
+    shopName: row.shopName,
+    shopAvatar: row.shopAvatar,
+    displayAvatar: resolveFileUrl(row.shopAvatar) || SHOP_PLACEHOLDER,
+    shopStatus: row.shopStatus,
+    rating: row.rating,
+    fansCount: row.fansCount,
+    showRating: row.rating != null && row.rating !== '',
+    showFans: row.fansCount != null && row.fansCount !== ''
+  }
+}
+
+export function mapShopCardList(list) {
+  if (!Array.isArray(list)) return []
+  return list.map(mapShopCard).filter(Boolean)
+}