123

doc/消费者APP/会员注册登录/会员注册登录前端技术方案.md

@@ -53,7 +53,7 @@
 | 校验 | `shop-app/utils/memberValidate.js` | 手机号、密码 |
 | 登录引导 | `shop-app/utils/apiAuth.js` | `ensureApiToken` → 登录页 |
 | 样式 | `shop-app/styles/auth.scss` | 登录/注册卡片样式 |
-| 我的 | `shop-app/pages/mine/index.vue` | 登录/注册入口、退出 |
+| 我的 | `shop-app/pages/mine/index.vue` | 登录/注册入口；**我的服务**菜单见《我的服务前端技术方案》 |
 
 > `api/login.js`（`/login`、`/captchaImage`）已 **废弃**，勿再用于 C 端。
 

doc/消费者APP/我的服务/我的服务前端技术方案.md

@@ -0,0 +1,214 @@
+# 我的服务 — 前端技术方案（C 端 · shop-app）
+
+> **依据：** 《我的服务功能需求.md》v1.0、《我的服务技术方案.md》v1.1  
+> **关联：** 《会员注册登录前端技术方案.md》（登录前置）、后续《订单管理》等（地址被结算引用）  
+> **范围：** C 端 **个人资料、修改密码、收货地址、商家入驻**；**不** 改后端、**不** 实现我的订单/消息中心/换绑手机。  
+> **实现状态：** 我的 Tab 入口 + 分包页面已落地，待与 `/api/member/**`、`/api/merchant/entry/**` 联调。
+
+---
+
+## 1. 技术栈与约定
+
+| 项 | 说明 |
+|----|------|
+| 框架 | uni-app **Vue 3** + **uview-plus** |
+| 请求 | `@/utils/request`；须登录接口默认带 `Authorization: Bearer {token}` |
+| 登录前置 | **MS0**：子功能经 `ensureApiToken` / `navigateMinePage` 拦截，引导 `PAGE_LOGIN` |
+| 上传 | `@/utils/upload` → `POST /common/upload`，返回 `url` 写入表单 |
+| 样式 | `styles/mine.scss`（与登录页绿色主色一致） |
+| 路由 | 业务页在 **`subpackage/account/`**；Tab 仍在 **`pages/mine/index`** |
+
+---
+
+## 2. 页面与路由
+
+| 页面 | 路径 | 包 | 入口 |
+|------|------|-----|------|
+| 我的（服务入口） | `pages/mine/index` | 主包 Tab | TabBar「我的」 |
+| 个人资料 | `subpackage/account/profile` | 分包 | 我的 → 编辑个人资料 / 点头像 |
+| 修改密码 | `subpackage/account/password` | 分包 | 我的 → 修改密码 |
+| 收货地址列表 | `subpackage/account/address-list` | 分包 | 我的 → 收货地址 |
+| 地址编辑 | `subpackage/account/address-edit` | 分包 | 列表新增/编辑 |
+| 商家入驻 | `subpackage/account/entry-apply` | 分包 | 我的 → 我要入驻 |
+| 我的入驻申请 | `subpackage/account/entry-list` | 分包 | 我的 → 我的入驻申请 |
+| 申请详情 | `subpackage/account/entry-detail` | 分包 | 列表项 |
+
+**Query：**
+
+| 页面 | 参数 | 说明 |
+|------|------|------|
+| address-edit | `mode=add\|edit`、`id` | 编辑时传 `addressId` |
+
+**路径常量：** `utils/pageRoute.js` → `PAGE_PROFILE`、`PAGE_PASSWORD`、`PAGE_ADDRESS_*`、`PAGE_ENTRY_*`
+
+---
+
+## 3. 文件清单
+
+| 类型 | 路径 | 说明 |
+|------|------|------|
+| 我的 Tab | `shop-app/pages/mine/index.vue` | 登录态、菜单分区、退出 |
+| 资料 | `shop-app/subpackage/account/profile.vue` | 只读 ID/手机号/会员名 + 可编辑项 |
+| 密码 | `shop-app/subpackage/account/password.vue` | 旧密码 + 新密码 + 确认 |
+| 地址列表 | `shop-app/subpackage/account/address-list.vue` | 默认置顶、设默认、删改 |
+| 地址编辑 | `shop-app/subpackage/account/address-edit.vue` | 省市区手填 + 详细地址 |
+| 入驻申请 | `shop-app/subpackage/account/entry-apply.vue` | 分步：类型→主体→经营→店铺→提交 |
+| 入驻列表 | `shop-app/subpackage/account/entry-list.vue` | 状态、驳回原因摘要 |
+| 入驻详情 | `shop-app/subpackage/account/entry-detail.vue` | 公示期、驳回、完成说明 |
+| 会员 API | `shop-app/api/member.js` | profile / password / address |
+| 入驻 API | `shop-app/api/merchantEntry.js` | agreement / apply / my |
+| 导航 | `shop-app/utils/mineNav.js` | 登录后 `navigateTo` |
+| 入驻常量 | `shop-app/utils/entryConstants.js` | 状态文案、阻塞判断 |
+| 入驻表单 | `shop-app/utils/entryForm.js` | 空白表单、分步校验、提交体 |
+| 图片上传 | `shop-app/components/mine/ImageUpload.vue` | 头像/证件/Logo |
+| 地区 | `shop-app/components/mine/RegionFields.vue` | 省市区三栏（code=name 拼接） |
+| 入驻字段块 | `shop-app/components/mine/entry/*.vue` | 个人/企业分步表单项 |
+| 协议 | `shop-app/components/account/AgreementBlock.vue` | 入驻提交勾选 |
+
+---
+
+## 4. 接口封装
+
+### 4.1 会员 `/api/member`（须 Token）
+
+| 方法 | HTTP | 路径 |
+|------|------|------|
+| `getMemberProfile` | GET | `/profile` |
+| `updateMemberProfile` | PUT | `/profile` |
+| `changeMemberPassword` | PUT | `/password` |
+| `getAddressList` | GET | `/address/list` |
+| `addAddress` | POST | `/address` |
+| `updateAddress` | PUT | `/address` |
+| `deleteAddress` | DELETE | `/address/{id}` |
+| `setDefaultAddress` | PUT | `/address/{id}/default` |
+
+**资料可写字段：** `nickName`、`avatar`、`email`、`sex`、`birthday`（`memberId`/`mobile`/`memberCode` 只读）。
+
+**密码 Body：** `oldPassword`、`newPassword`、`confirmPassword`。
+
+**地址 Body：** `consigneeName`、`mobile`、`province`、`city`、`district`、`detailAddress`、`isDefault`（`0`/`1`）。
+
+### 4.2 入驻 `/api/merchant/entry`
+
+| 方法 | HTTP | 路径 | 鉴权 |
+|------|------|------|------|
+| `getEntryAgreement` | GET | `/agreement` | 匿名 |
+| `getEntryStatus` | GET | `/status` | 匿名 |
+| `submitEntryApply` | POST | `/apply` | Token |
+| `getMyEntryApplies` | GET | `/my` | Token |
+
+**提交 Body：**
+
+```json
+{
+  "subject": { "merchantType": "1", "...": "个人或企业主体字段" },
+  "biz": { "merchantType": "1", "...": "经营信息" },
+  "shop": { "shopName", "shopAvatar", "shopPhone", "shopDesc" },
+  "agreementAccepted": true
+}
+```
+
+**申请状态（C 端展示）：**
+
+| applyStatus | 含义 |
+|-------------|------|
+| `0` | 待审核 |
+| `3` | 公示中 |
+| `1` | 已完成入驻 |
+| `2` | 审核未通过（展示 `rejectReason`，可重新申请） |
+
+**阻塞新申请：** 存在 status `0` 或 `3` 时，入驻页提示先去列表查看（**MS-E6**）。
+
+---
+
+## 5. 我的 Tab 结构（`pages/mine/index`）
+
+```text
+顶栏（绿渐变）
+├── 未登录：提示 + 登录 / 注册
+└── 已登录：头像、昵称、手机号 → 点击进个人资料
+
+账号管理
+├── 编辑个人资料
+└── 修改密码
+
+收货地址
+└── 收货地址
+
+商家入驻
+├── 我要入驻（分步表单）
+└── 我的入驻申请
+
+退出登录（仅本地 fedLogOut）
+```
+
+---
+
+## 6. 关键交互与规则
+
+| 规则 | 前端落实 |
+|------|----------|
+| MS0 | 子页 `onLoad` / `onShow` 调 `ensureApiToken` |
+| MS-P1～P4 | 资料页只读项；昵称必填；头像上传 |
+| MS-W1～W3 | 密码页前端校验；调 `PUT /password` |
+| MS-A1～A3 | 列表默认置顶；设默认调专用接口；删除二次确认 |
+| MS-A4 | 删默认后 **不** 自动设新默认（与需求建议一致） |
+| MS-E5～E7 | 提交须勾选协议；待审/公示中阻塞新单；驳回后可 `entry-apply` |
+| MS-E9 | 提交前 `showModal` 二次确认；提交后 `redirectTo` 列表 |
+
+**入驻表单：** 个人 `merchantType=1` / 企业 `merchantType=2`；分 5 步；省市区用 `RegionFields`（`code`=`省|市|区`，`name` 空格拼接）；影像字段存上传返回 URL。
+
+**地区说明：** 本期未接省市区数据字典，采用 **手填省/市/区** 满足后端 `bizRegionCode`/`bizRegionName` 非空校验；后续可换级联组件。
+
+---
+
+## 7. 登录态
+
+```text
+我的 Tab onShow
+    → getToken ?
+        → 是：展示菜单；必要时 getMemberProfile 刷新 store
+        → 否：仅展示登录/注册
+
+子页保存资料成功
+    → userStore.fetchUserInfo() 同步 Tab 展示
+```
+
+---
+
+## 8. 联调检查清单
+
+- [ ] 未登录点击「收货地址」→ Toast + 跳转登录
+- [ ] `GET/PUT /api/member/profile` 资料读写
+- [ ] `PUT /api/member/password` 旧密码错误 / 成功
+- [ ] 地址增删改、设默认、列表排序（默认在上）
+- [ ] `GET /api/merchant/entry/agreement` + 关闭时不可提交
+- [ ] `POST /api/merchant/entry/apply` 个人/企业完整字段
+- [ ] 待审中单存在时不可再进申请页提交
+- [ ] `GET /api/merchant/entry/my` 列表与详情状态、驳回原因、公示时间
+- [ ] 图片上传 Token 与 `/common/upload` 返回 URL 可访问
+
+---
+
+## 9. 非本期
+
+| 项 | 说明 |
+|----|------|
+| 我的订单、购物车正式页 | 另模块 |
+| 手机号换绑、注销 | — |
+| 站内消息列表 | 另册 |
+| 入驻草稿、待审撤销/改资料 | — |
+| 省市区全国级联数据 | 可后续接字典 API |
+| 会员名称在线修改 | 需求未列 |
+
+---
+
+## 10. 修订记录
+
+| 版本 | 说明 |
+|------|------|
+| **v1.0** | 首版：我的 Tab 服务菜单、资料/密码/地址/入驻分包页与 API |
+
+---
+
+*文档版本：v1.0 · 关联《我的服务技术方案.md》v1.1、《我的服务功能需求.md》v1.0*

doc/消费者APP/我的服务/我的服务技术方案.md

@@ -448,7 +448,7 @@ submitApply(memberId, dto)
 | 地址 CRUD + 默认互斥 | **已实现** | |
 | 入驻协议 GET | **已实现** | |
 | POST `/apply`、GET `/my` | **已实现** | 含公示时间 |
-| C 端前端 | **未实现** | |
+| C 端前端 | **已实现**（见《我的服务前端技术方案.md》） | |
 
 ---
 

shop-app/PAGES.md

@@ -7,7 +7,7 @@ pages/
 ├── index/index.vue      # 首页 Tab
 ├── category/index.vue   # 分类 Tab
 ├── cart/index.vue       # 购物车 Tab（待正式开发）
-├── mine/index.vue       # 我的 Tab（待正式开发）
+├── mine/index.vue       # 我的 Tab（我的服务入口）
 └── login/index.vue      # 登录
 ```
 
@@ -15,8 +15,15 @@ pages/
 
 ```
 subpackage/
-├── account/             # 会员
-│   └── register.vue
+├── account/             # 会员 · 我的服务
+│   ├── register.vue
+│   ├── profile.vue
+│   ├── password.vue
+│   ├── address-list.vue
+│   ├── address-edit.vue
+│   ├── entry-apply.vue
+│   ├── entry-list.vue
+│   └── entry-detail.vue
 ├── category/            # 分类子页
 │   ├── level1.vue
 │   └── goods-list.vue

shop-app/api/member.js

@@ -40,3 +40,64 @@ export function getMemberProfile() {
     method: 'GET'
   })
 }
+
+/** 更新个人资料 */
+export function updateMemberProfile(data) {
+  return request({
+    url: '/api/member/profile',
+    method: 'PUT',
+    data
+  })
+}
+
+/** 修改密码 */
+export function changeMemberPassword(data) {
+  return request({
+    url: '/api/member/password',
+    method: 'PUT',
+    data,
+    header: { repeatSubmit: false }
+  })
+}
+
+/** 收货地址列表 */
+export function getAddressList() {
+  return request({
+    url: '/api/member/address/list',
+    method: 'GET'
+  })
+}
+
+/** 新增收货地址 */
+export function addAddress(data) {
+  return request({
+    url: '/api/member/address',
+    method: 'POST',
+    data
+  })
+}
+
+/** 修改收货地址 */
+export function updateAddress(data) {
+  return request({
+    url: '/api/member/address',
+    method: 'PUT',
+    data
+  })
+}
+
+/** 删除收货地址 */
+export function deleteAddress(addressId) {
+  return request({
+    url: `/api/member/address/${addressId}`,
+    method: 'DELETE'
+  })
+}
+
+/** 设为默认地址 */
+export function setDefaultAddress(addressId) {
+  return request({
+    url: `/api/member/address/${addressId}/default`,
+    method: 'PUT'
+  })
+}

shop-app/api/merchantEntry.js

@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+/** 入驻协议正文（匿名） */
+export function getEntryAgreement() {
+  return request({
+    url: '/api/merchant/entry/agreement',
+    method: 'GET',
+    header: { isToken: false },
+    silent: true
+  })
+}
+
+/** 入驻是否开放（匿名） */
+export function getEntryStatus() {
+  return request({
+    url: '/api/merchant/entry/status',
+    method: 'GET',
+    header: { isToken: false },
+    silent: true
+  })
+}
+
+/** 提交入驻申请 */
+export function submitEntryApply(data) {
+  return request({
+    url: '/api/merchant/entry/apply',
+    method: 'POST',
+    data,
+    header: { repeatSubmit: false }
+  })
+}
+
+/** 我的入驻申请列表 */
+export function getMyEntryApplies() {
+  return request({
+    url: '/api/merchant/entry/my',
+    method: 'GET'
+  })
+}

shop-app/components/mine/ImageUpload.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="img-upload">
+		<text v-if="label" class="img-upload__label">{{ label }}</text>
+		<view class="img-upload__box" @click="chooseImage">
+			<image
+				v-if="displayUrl"
+				class="img-upload__preview"
+				:src="displayUrl"
+				mode="aspectFill"
+			/>
+			<view v-else class="img-upload__placeholder">
+				<u-icon name="camera-fill" color="#9a938c" size="40" />
+				<text class="img-upload__tip">{{ placeholder }}</text>
+			</view>
+			<view v-if="uploading" class="img-upload__mask">
+				<text>上传中…</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { joinApiUrl } from '@/config'
+import { uploadFile } from '@/utils/upload'
+
+const props = defineProps({
+	modelValue: { type: String, default: '' },
+	label: { type: String, default: '' },
+	placeholder: { type: String, default: '点击上传' }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const uploading = ref(false)
+
+const displayUrl = computed(() => {
+  const v = props.modelValue || ''
+  if (!v) return ''
+  if (/^https?:\/\//i.test(v)) return v
+  return joinApiUrl(v)
+})
+
+function chooseImage() {
+  if (uploading.value) return
+  uni.chooseImage({
+    count: 1,
+    sizeType: ['compressed'],
+    success: (res) => {
+      const path = res.tempFilePaths && res.tempFilePaths[0]
+      if (!path) return
+      uploading.value = true
+      uploadFile(path)
+        .then((url) => {
+          emit('update:modelValue', url)
+        })
+        .catch((e) => {
+          uni.showToast({ title: e.message || '上传失败', icon: 'none' })
+        })
+        .finally(() => {
+          uploading.value = false
+        })
+    }
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.img-upload {
+  padding: 16rpx 0;
+}
+.img-upload__label {
+  display: block;
+  margin-bottom: 12rpx;
+  font-size: 28rpx;
+  color: #5c5652;
+}
+.img-upload__box {
+  position: relative;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+  background: #f5f2ef;
+  overflow: hidden;
+}
+.img-upload__preview {
+  width: 100%;
+  height: 100%;
+}
+.img-upload__placeholder {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8rpx;
+}
+.img-upload__tip {
+  font-size: 22rpx;
+  color: #9a938c;
+}
+.img-upload__mask {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(0, 0, 0, 0.45);
+  color: #fff;
+  font-size: 24rpx;
+}
+</style>

shop-app/components/mine/RegionFields.vue

@@ -0,0 +1,87 @@
+<template>
+	<view class="region-fields">
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">省份</text>
+			<input
+				v-model="province"
+				class="form-row__input"
+				placeholder="如：青海省"
+				@input="emitChange"
+			/>
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">城市</text>
+			<input
+				v-model="city"
+				class="form-row__input"
+				placeholder="如：西宁市"
+				@input="emitChange"
+			/>
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">区县</text>
+			<input
+				v-model="district"
+				class="form-row__input"
+				placeholder="如：城西区"
+				@input="emitChange"
+			/>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+
+const props = defineProps({
+	modelValue: {
+		type: Object,
+		default: () => ({ code: '', name: '', province: '', city: '', district: '' })
+	}
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const province = ref('')
+const city = ref('')
+const district = ref('')
+
+watch(
+  () => props.modelValue,
+  (v) => {
+    if (!v) return
+    province.value = v.province || ''
+    city.value = v.city || ''
+    district.value = v.district || ''
+    if (!province.value && v.name) {
+      const parts = String(v.name).split(/\s+/)
+      province.value = parts[0] || ''
+      city.value = parts[1] || ''
+      district.value = parts[2] || ''
+    }
+  },
+  { immediate: true, deep: true }
+)
+
+function emitChange() {
+  const p = (province.value || '').trim()
+  const c = (city.value || '').trim()
+  const d = (district.value || '').trim()
+  const name = [p, c, d].filter(Boolean).join(' ')
+  const code = [p, c, d].filter(Boolean).join('|')
+  emit('update:modelValue', {
+    province: p,
+    city: c,
+    district: d,
+    name,
+    code
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+.region-fields .form-row:last-child {
+  border-bottom: none;
+}
+</style>

shop-app/components/mine/entry/EntryEnterpriseBiz.vue

@@ -0,0 +1,26 @@
+<template>
+	<view>
+		<region-fields :model-value="region" @update:model-value="$emit('update:region', $event)" />
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">经营详细地址</text>
+			<input v-model="biz.bizDetailAddress" class="form-row__input" />
+		</view>
+		<image-upload v-model="biz.businessLicense" label="营业执照电子版" />
+	</view>
+</template>
+
+<script setup>
+import RegionFields from '@/components/mine/RegionFields.vue'
+import ImageUpload from '@/components/mine/ImageUpload.vue'
+
+defineProps({
+  biz: { type: Object, required: true },
+  region: { type: Object, required: true }
+})
+
+defineEmits(['update:region'])
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/components/mine/entry/EntryEnterpriseSubject.vue

@@ -0,0 +1,144 @@
+<template>
+	<view>
+		<text class="section-title">企业信息</text>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">企业名称</text>
+			<input v-model="subject.companyName" class="form-row__input" />
+		</view>
+		<region-fields :model-value="regionReg" @update:model-value="$emit('update:regionReg', $event)" />
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">注册详细地址</text>
+			<input v-model="subject.companyDetailAddress" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">经营范围</text>
+			<input v-model="subject.businessScope" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">信用代码</text>
+			<input v-model="subject.creditCode" class="form-row__input" />
+		</view>
+		<valid-period-row
+			v-model:valid-type="subject.licenseValidType"
+			v-model:start="subject.licenseValidStart"
+			v-model:end="subject.licenseValidEnd"
+		/>
+
+		<text class="section-title">法定代表人</text>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">法人姓名</text>
+			<input v-model="subject.legalName" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">法人性别</text>
+			<picker :range="genderLabels" :value="legalGenderIdx" @change="onLegalGender">
+				<view class="form-row__picker">
+					<text>{{ legalGenderIdx >= 0 ? genderLabels[legalGenderIdx] : '请选择' }}</text>
+				</view>
+			</picker>
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">法人出生日期</text>
+			<picker mode="date" :value="subject.legalBirthDate" @change="onLegalBirthDate">
+				<view class="form-row__picker">
+					<text :class="{ 'form-row__placeholder': !subject.legalBirthDate }">
+						{{ subject.legalBirthDate || '请选择' }}
+					</text>
+				</view>
+			</picker>
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">法人证件号</text>
+			<input v-model="subject.legalIdCardNo" class="form-row__input" />
+		</view>
+		<valid-period-row
+			v-model:valid-type="subject.legalIdValidType"
+			v-model:start="subject.legalIdValidStart"
+			v-model:end="subject.legalIdValidEnd"
+		/>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">法人居住地址</text>
+			<input v-model="subject.legalResidence" class="form-row__input" />
+		</view>
+		<image-upload v-model="subject.legalIdCardFront" label="法人证件正面" />
+		<image-upload v-model="subject.legalIdCardBack" label="法人证件反面" />
+
+		<text class="section-title">联系与结算</text>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">联系人</text>
+			<input v-model="subject.contactName" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">联系人手机</text>
+			<input v-model="subject.contactPhone" class="form-row__input" type="number" maxlength="11" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">邮箱</text>
+			<input v-model="subject.contactEmail" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">开户银行</text>
+			<input v-model="subject.bankName" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">开户支行</text>
+			<input v-model="subject.bankBranch" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">银行账号</text>
+			<input v-model="subject.bankAccount" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">对公账号</text>
+			<input v-model="subject.corpBankAccount" class="form-row__input" />
+		</view>
+		<image-upload v-model="subject.accountPermit" label="开户许可证" />
+	</view>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import { GENDER_OPTIONS } from '@/utils/entryConstants'
+import ImageUpload from '@/components/mine/ImageUpload.vue'
+import RegionFields from '@/components/mine/RegionFields.vue'
+import ValidPeriodRow from '@/components/mine/entry/ValidPeriodRow.vue'
+
+const props = defineProps({
+  subject: { type: Object, required: true },
+  regionReg: { type: Object, required: true }
+})
+
+defineEmits(['update:regionReg'])
+
+const genderLabels = GENDER_OPTIONS.map((g) => g.label)
+const legalGenderIdx = ref(-1)
+
+watch(
+  () => props.subject.legalGender,
+  (v) => {
+    legalGenderIdx.value = GENDER_OPTIONS.findIndex((g) => g.value === v)
+  },
+  { immediate: true }
+)
+
+function onLegalGender(e) {
+  const idx = Number(e.detail.value)
+  legalGenderIdx.value = idx
+  props.subject.legalGender = GENDER_OPTIONS[idx]?.value || ''
+}
+
+function onLegalBirthDate(e) {
+  props.subject.legalBirthDate = e.detail.value
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+.section-title {
+  display: block;
+  padding: 24rpx 0 8rpx;
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #2e7d32;
+}
+</style>

shop-app/components/mine/entry/EntryPersonBiz.vue

@@ -0,0 +1,32 @@
+<template>
+	<view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">商户名称</text>
+			<input v-model="biz.merchantName" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">客服电话</text>
+			<input v-model="biz.servicePhone" class="form-row__input" />
+		</view>
+		<region-fields :model-value="region" @update:model-value="$emit('update:region', $event)" />
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">详细地址</text>
+			<input v-model="biz.bizDetailAddress" class="form-row__input" placeholder="街道门牌" />
+		</view>
+	</view>
+</template>
+
+<script setup>
+import RegionFields from '@/components/mine/RegionFields.vue'
+
+defineProps({
+  biz: { type: Object, required: true },
+  region: { type: Object, required: true }
+})
+
+defineEmits(['update:region'])
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/components/mine/entry/EntryPersonSubject.vue

@@ -0,0 +1,105 @@
+<template>
+	<view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">姓名</text>
+			<input v-model="subject.personName" class="form-row__input" placeholder="请输入" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">性别</text>
+			<picker :range="genderLabels" :value="genderIdx" @change="onGender">
+				<view class="form-row__picker">
+					<text :class="{ 'form-row__placeholder': genderIdx < 0 }">
+						{{ genderIdx >= 0 ? genderLabels[genderIdx] : '请选择' }}
+					</text>
+				</view>
+			</picker>
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">出生日期</text>
+			<picker mode="date" :value="subject.birthDate" :end="today" @change="onBirthDate">
+				<view class="form-row__picker">
+					<text :class="{ 'form-row__placeholder': !subject.birthDate }">{{ subject.birthDate || '请选择' }}</text>
+				</view>
+			</picker>
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">证件号码</text>
+			<input v-model="subject.idCardNo" class="form-row__input" placeholder="身份证号" />
+		</view>
+		<valid-period-row
+			v-model:valid-type="subject.idValidType"
+			v-model:start="subject.idValidStart"
+			v-model:end="subject.idValidEnd"
+		/>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">居住地址</text>
+			<input v-model="subject.residenceAddress" class="form-row__input" placeholder="详细地址" />
+		</view>
+		<image-upload v-model="subject.idCardFront" label="证件照正面" />
+		<image-upload v-model="subject.idCardBack" label="证件照反面" />
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">联系人</text>
+			<input v-model="subject.contactName" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">联系人手机</text>
+			<input v-model="subject.contactPhone" class="form-row__input" type="number" maxlength="11" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">邮箱</text>
+			<input v-model="subject.contactEmail" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">开户银行</text>
+			<input v-model="subject.bankName" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">开户支行</text>
+			<input v-model="subject.bankBranch" class="form-row__input" />
+		</view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">银行账号</text>
+			<input v-model="subject.bankAccount" class="form-row__input" />
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed, watch } from 'vue'
+import { GENDER_OPTIONS } from '@/utils/entryConstants'
+import ImageUpload from '@/components/mine/ImageUpload.vue'
+import ValidPeriodRow from '@/components/mine/entry/ValidPeriodRow.vue'
+
+const props = defineProps({
+  subject: { type: Object, required: true }
+})
+
+const genderLabels = GENDER_OPTIONS.map((g) => g.label)
+const genderIdx = ref(-1)
+const today = computed(() => {
+  const d = new Date()
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+})
+
+watch(
+  () => props.subject.gender,
+  (v) => {
+    genderIdx.value = GENDER_OPTIONS.findIndex((g) => g.value === v)
+  },
+  { immediate: true }
+)
+
+function onGender(e) {
+  const idx = Number(e.detail.value)
+  genderIdx.value = idx
+  props.subject.gender = GENDER_OPTIONS[idx]?.value || ''
+}
+
+function onBirthDate(e) {
+  props.subject.birthDate = e.detail.value
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/components/mine/entry/EntryShopFields.vue

@@ -0,0 +1,44 @@
+<template>
+	<view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">店铺名称</text>
+			<input v-model="shop.shopName" class="form-row__input" />
+		</view>
+		<image-upload v-model="shop.shopAvatar" label="店铺 Logo" />
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">联系电话</text>
+			<input v-model="shop.shopPhone" class="form-row__input" />
+		</view>
+		<view class="form-row form-row--col">
+			<text class="form-row__label">店铺简介</text>
+			<textarea
+				v-model="shop.shopDesc"
+				class="shop-desc"
+				placeholder="选填"
+				maxlength="500"
+			/>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import ImageUpload from '@/components/mine/ImageUpload.vue'
+
+defineProps({
+  shop: { type: Object, required: true }
+})
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+.shop-desc {
+  width: 100%;
+  min-height: 160rpx;
+  margin-top: 12rpx;
+  padding: 16rpx;
+  font-size: 28rpx;
+  background: #f5f2ef;
+  border-radius: 8rpx;
+  box-sizing: border-box;
+}
+</style>

shop-app/components/mine/entry/ValidPeriodRow.vue

@@ -0,0 +1,71 @@
+<template>
+	<view>
+		<view class="form-row">
+			<text class="form-row__label form-row__label--req">有效期类型</text>
+			<picker :range="validLabels" :value="validIndex" @change="onValidType">
+				<view class="form-row__picker">
+					<text>{{ validLabels[validIndex] || '请选择' }}</text>
+				</view>
+			</picker>
+		</view>
+		<view v-if="validType === VALID_RANGE" class="form-row">
+			<text class="form-row__label form-row__label--req">开始日期</text>
+			<picker mode="date" :value="start" @change="onStart">
+				<view class="form-row__picker">
+					<text :class="{ 'form-row__placeholder': !start }">{{ start || '请选择' }}</text>
+				</view>
+			</picker>
+		</view>
+		<view v-if="validType === VALID_RANGE" class="form-row">
+			<text class="form-row__label form-row__label--req">结束日期</text>
+			<picker mode="date" :value="end" @change="onEnd">
+				<view class="form-row__picker">
+					<text :class="{ 'form-row__placeholder': !end }">{{ end || '请选择' }}</text>
+				</view>
+			</picker>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, watch, computed } from 'vue'
+import { VALID_TYPE_OPTIONS, VALID_RANGE } from '@/utils/entryConstants'
+
+const props = defineProps({
+	validType: { type: String, default: '1' },
+	start: { type: String, default: '' },
+	end: { type: String, default: '' }
+})
+
+const emit = defineEmits(['update:validType', 'update:start', 'update:end'])
+
+const validLabels = VALID_TYPE_OPTIONS.map((o) => o.label)
+const validIndex = ref(0)
+
+watch(
+  () => props.validType,
+  (v) => {
+    const idx = VALID_TYPE_OPTIONS.findIndex((o) => o.value === v)
+    validIndex.value = idx >= 0 ? idx : 0
+  },
+  { immediate: true }
+)
+
+function onValidType(e) {
+  const idx = Number(e.detail.value)
+  validIndex.value = idx
+  emit('update:validType', VALID_TYPE_OPTIONS[idx].value)
+}
+
+function onStart(e) {
+  emit('update:start', e.detail.value)
+}
+
+function onEnd(e) {
+  emit('update:end', e.detail.value)
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/pages.json

@@ -51,6 +51,48 @@
 					"style": {
 						"navigationBarTitleText": "会员注册"
 					}
+				},
+				{
+					"path": "profile",
+					"style": {
+						"navigationBarTitleText": "个人资料"
+					}
+				},
+				{
+					"path": "password",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+					}
+				},
+				{
+					"path": "address-list",
+					"style": {
+						"navigationBarTitleText": "收货地址"
+					}
+				},
+				{
+					"path": "address-edit",
+					"style": {
+						"navigationBarTitleText": "编辑地址"
+					}
+				},
+				{
+					"path": "entry-apply",
+					"style": {
+						"navigationBarTitleText": "商家入驻"
+					}
+				},
+				{
+					"path": "entry-list",
+					"style": {
+						"navigationBarTitleText": "我的入驻申请"
+					}
+				},
+				{
+					"path": "entry-detail",
+					"style": {
+						"navigationBarTitleText": "申请详情"
+					}
 				}
 			]
 		},
@@ -117,6 +159,10 @@
 		"pages/category/index": {
 			"network": "all",
 			"packages": ["pkg-category", "pkg-goods"]
+		},
+		"pages/mine/index": {
+			"network": "all",
+			"packages": ["pkg-account"]
 		}
 	},
 	"globalStyle": {

shop-app/pages/mine/index.vue

@@ -1,165 +1,169 @@
 <template>
-	<view class="page">
-		<view v-if="loggedIn" class="user-panel">
-			<view class="user-panel__head">
-				<image
-					class="user-panel__avatar"
-					:src="avatarUrl"
-					mode="aspectFill"
-				/>
-				<view class="user-panel__info">
-					<text class="user-panel__name">{{ displayName }}</text>
-					<text v-if="mobileText" class="user-panel__sub">{{ mobileText }}</text>
-					<text v-if="memberCodeText" class="user-panel__sub">会员名称：{{ memberCodeText }}</text>
+	<view class="mine-page">
+		<view class="mine-header" @click="onHeaderClick">
+			<view class="mine-header__row">
+				<image class="mine-header__avatar" :src="avatarUrl" mode="aspectFill" />
+				<view class="mine-header__info">
+					<text class="mine-header__name">{{ headerTitle }}</text>
+					<text v-if="loggedIn && mobileText" class="mine-header__sub">{{ mobileText }}</text>
+					<text v-else-if="!loggedIn" class="mine-header__sub">登录后管理资料与地址</text>
 				</view>
+				<u-icon v-if="loggedIn" name="arrow-right" color="#fff" size="18" class="mine-header__arrow" />
 			</view>
-			<button class="btn-outline" @click="handleLogout">退出登录</button>
 		</view>
-		<view v-else class="guest-box">
-			<text class="guest-box__title">登录后享受完整购物服务</text>
-			<text class="guest-box__tip">下单、加购需登录会员账号</text>
-			<button class="btn-primary" @click="goLogin">登录</button>
-			<button class="btn-outline" @click="goRegister">注册会员</button>
+
+		<view class="mine-body">
+			<view v-if="!loggedIn" class="mine-guest">
+				<text class="mine-guest__title">登录后享受完整购物服务</text>
+				<text class="mine-guest__tip">下单、加购需登录会员账号</text>
+				<view class="mine-guest__btns">
+					<button class="mine-btn-primary" @click="goLogin">登录</button>
+					<button class="mine-btn-outline" @click="goRegister">注册会员</button>
+				</view>
+			</view>
+
+			<template v-else>
+				<view v-for="section in menuSections" :key="section.title" class="mine-card">
+					<text class="mine-card__title">{{ section.title }}</text>
+					<view
+						v-for="item in section.items"
+						:key="item.path"
+						class="mine-menu-item"
+						@click="goPage(item.path)"
+					>
+						<u-icon :name="item.icon" color="#5c5652" size="22" />
+						<text class="mine-menu-item__label">{{ item.label }}</text>
+						<u-icon name="arrow-right" color="#ccc" size="16" />
+					</view>
+				</view>
+
+				<view class="mine-logout">
+					<button class="mine-btn-outline" @click="handleLogout">退出登录</button>
+				</view>
+			</template>
 		</view>
 	</view>
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { getToken } from '@/utils/auth'
 import { useUserStore } from '@/store/user'
-import { PAGE_LOGIN, PAGE_REGISTER } from '@/utils/pageRoute'
+import { navigateMinePage } from '@/utils/mineNav'
+import {
+  PAGE_LOGIN,
+  PAGE_REGISTER,
+  PAGE_PROFILE,
+  PAGE_PASSWORD,
+  PAGE_ADDRESS_LIST,
+  PAGE_ENTRY_APPLY,
+  PAGE_ENTRY_LIST
+} from '@/utils/pageRoute'
 
 const loggedIn = ref(false)
-const displayName = ref('会员')
+const displayName = ref('点击登录')
 const mobileText = ref('')
-const memberCodeText = ref('')
 const avatarUrl = ref('/static/logo.png')
 
 const userStore = useUserStore()
 
+const headerTitle = computed(() => {
+  if (!loggedIn.value) return '未登录'
+  return displayName.value
+})
+
+/** 我的服务菜单（对齐功能需求 §3） */
+const menuSections = [
+  {
+    title: '账号管理',
+    items: [
+      { label: '编辑个人资料', path: PAGE_PROFILE, icon: 'account' },
+      { label: '修改密码', path: PAGE_PASSWORD, icon: 'lock' }
+    ]
+  },
+  {
+    title: '收货地址',
+    items: [{ label: '收货地址', path: PAGE_ADDRESS_LIST, icon: 'map' }]
+  },
+  {
+    title: '商家入驻',
+    items: [
+      { label: '我要入驻', path: PAGE_ENTRY_APPLY, icon: 'home' },
+      { label: '我的入驻申请', path: PAGE_ENTRY_LIST, icon: 'list' }
+    ]
+  }
+]
+
 onShow(() => {
-	loggedIn.value = !!getToken()
-	if (!loggedIn.value) {
-		return
-	}
-	displayName.value = userStore.displayName() || '会员'
-	mobileText.value = userStore.state.mobile || ''
-	memberCodeText.value = userStore.state.memberCode || ''
-	avatarUrl.value = userStore.state.avatar || '/static/logo.png'
-	if (!userStore.state.memberId) {
-		userStore.fetchUserInfo().then(() => {
-			displayName.value = userStore.displayName() || '会员'
-			mobileText.value = userStore.state.mobile || ''
-			memberCodeText.value = userStore.state.memberCode || ''
-			avatarUrl.value = userStore.state.avatar || '/static/logo.png'
-		})
-	}
+  loggedIn.value = !!getToken()
+  if (!loggedIn.value) {
+    displayName.value = '点击登录'
+    mobileText.value = ''
+    avatarUrl.value = '/static/logo.png'
+    return
+  }
+  refreshUser()
 })
 
+function refreshUser() {
+  displayName.value = userStore.displayName() || '会员'
+  mobileText.value = userStore.state.mobile || ''
+  avatarUrl.value = userStore.state.avatar || '/static/logo.png'
+  if (!userStore.state.memberId) {
+    userStore.fetchUserInfo().then(() => {
+      displayName.value = userStore.displayName() || '会员'
+      mobileText.value = userStore.state.mobile || ''
+      avatarUrl.value = userStore.state.avatar || '/static/logo.png'
+    })
+  }
+}
+
+function onHeaderClick() {
+  if (!loggedIn.value) {
+    goLogin()
+    return
+  }
+  navigateMinePage(PAGE_PROFILE)
+}
+
+function goPage(path) {
+  navigateMinePage(path)
+}
+
 function goLogin() {
-	uni.navigateTo({ url: PAGE_LOGIN })
+  uni.navigateTo({ url: PAGE_LOGIN })
 }
 
 function goRegister() {
-	uni.navigateTo({ url: PAGE_REGISTER })
+  uni.navigateTo({ url: PAGE_REGISTER })
 }
 
 function handleLogout() {
-	uni.showModal({
-		title: '提示',
-		content: '确定退出当前账号吗？',
-		success: (res) => {
-			if (res.confirm) {
-				userStore.logOut().then(() => {
-					loggedIn.value = false
-					displayName.value = '会员'
-					mobileText.value = ''
-					memberCodeText.value = ''
-					uni.showToast({ title: '已退出', icon: 'none' })
-				})
-			}
-		}
-	})
+  uni.showModal({
+    title: '提示',
+    content: '确定退出当前账号吗？',
+    success: (res) => {
+      if (res.confirm) {
+        userStore.logOut().then(() => {
+          loggedIn.value = false
+          displayName.value = '点击登录'
+          mobileText.value = ''
+          uni.showToast({ title: '已退出', icon: 'none' })
+        })
+      }
+    }
+  })
 }
 </script>
 
-<style scoped>
-.page {
-	min-height: 100vh;
-	padding: 48rpx 32rpx;
-	background: linear-gradient(180deg, #e8f5e9 0%, #f5f6f8 40%);
-	box-sizing: border-box;
-}
-.user-panel,
-.guest-box {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	gap: 32rpx;
-}
-.user-panel__head {
-	width: 100%;
-	display: flex;
-	align-items: center;
-	padding: 32rpx;
-	background: #fff;
-	border-radius: 16rpx;
-	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
-}
-.user-panel__avatar {
-	width: 120rpx;
-	height: 120rpx;
-	border-radius: 60rpx;
-	background: #eee;
-	flex-shrink: 0;
-}
-.user-panel__info {
-	flex: 1;
-	margin-left: 24rpx;
-}
-.user-panel__name {
-	display: block;
-	font-size: 36rpx;
-	font-weight: 600;
-	color: #333;
-}
-.user-panel__sub {
-	display: block;
-	margin-top: 8rpx;
-	font-size: 26rpx;
-	color: #999;
-}
-.guest-box__title {
-	font-size: 32rpx;
-	font-weight: 600;
-	color: #333;
-}
-.guest-box__tip {
-	font-size: 26rpx;
-	color: #999;
-}
-.btn-primary {
-	width: 100%;
-	max-width: 480rpx;
-	height: 88rpx;
-	line-height: 88rpx;
-	background: #2e7d32;
-	color: #fff;
-	font-size: 30rpx;
-	border-radius: 44rpx;
-	border: none;
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+
+.mine-menu-item u-icon:first-child {
+  margin-right: 16rpx;
 }
-.btn-outline {
-	width: 100%;
-	max-width: 480rpx;
-	height: 80rpx;
-	line-height: 80rpx;
-	background: #fff;
-	color: #2e7d32;
-	font-size: 28rpx;
-	border-radius: 40rpx;
-	border: 1rpx solid #2e7d32;
+.mine-menu-item {
+  gap: 16rpx;
 }
 </style>

shop-app/styles/mine.scss

@@ -0,0 +1,230 @@
+@import '@/styles/morandi.scss';
+
+.mine-page {
+  min-height: 100vh;
+  padding-bottom: 48rpx;
+  background: $morandi-bg-page;
+  box-sizing: border-box;
+}
+
+.mine-header {
+  padding: 48rpx 32rpx 64rpx;
+  background: linear-gradient(145deg, #3d9b6e 0%, #22c55e 55%, #86efac 100%);
+}
+
+.mine-header__row {
+  display: flex;
+  align-items: center;
+}
+
+.mine-header__avatar {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 60rpx;
+  background: rgba(255, 255, 255, 0.35);
+  border: 4rpx solid rgba(255, 255, 255, 0.6);
+  flex-shrink: 0;
+}
+
+.mine-header__info {
+  flex: 1;
+  margin-left: 24rpx;
+}
+
+.mine-header__name {
+  display: block;
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #fff;
+}
+
+.mine-header__sub {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: rgba(255, 255, 255, 0.88);
+}
+
+.mine-header__arrow {
+  margin-left: 8rpx;
+}
+
+.mine-body {
+  margin-top: -40rpx;
+  padding: 0 24rpx;
+}
+
+.mine-card {
+  margin-bottom: 24rpx;
+  padding: 8rpx 0;
+  background: #fff;
+  border-radius: 20rpx;
+  box-shadow: 0 4rpx 20rpx rgba(74, 69, 66, 0.06);
+}
+
+.mine-card__title {
+  padding: 20rpx 28rpx 8rpx;
+  font-size: 24rpx;
+  color: $morandi-text-muted;
+}
+
+.mine-menu-item {
+  display: flex;
+  align-items: center;
+  padding: 28rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.mine-menu-item:last-child {
+  border-bottom: none;
+}
+
+.mine-menu-item__label {
+  flex: 1;
+  font-size: 30rpx;
+  color: $morandi-text;
+}
+
+.mine-guest {
+  margin: 24rpx;
+  padding: 48rpx 32rpx;
+  text-align: center;
+  background: #fff;
+  border-radius: 20rpx;
+}
+
+.mine-guest__title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: $morandi-text;
+}
+
+.mine-guest__tip {
+  display: block;
+  margin-top: 12rpx;
+  font-size: 26rpx;
+  color: $morandi-text-muted;
+}
+
+.mine-guest__btns {
+  margin-top: 40rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+}
+
+.mine-btn-primary {
+  height: 88rpx;
+  line-height: 88rpx;
+  background: #2e7d32;
+  color: #fff;
+  font-size: 30rpx;
+  border-radius: 44rpx;
+  border: none;
+}
+
+.mine-btn-outline {
+  height: 80rpx;
+  line-height: 80rpx;
+  background: #fff;
+  color: #2e7d32;
+  font-size: 28rpx;
+  border-radius: 40rpx;
+  border: 1rpx solid #2e7d32;
+}
+
+.mine-logout {
+  margin: 16rpx 24rpx 0;
+}
+
+/* 表单页通用 */
+.form-page {
+  min-height: 100vh;
+  padding: 24rpx;
+  padding-bottom: 160rpx;
+  background: $morandi-bg-page;
+  box-sizing: border-box;
+}
+
+.form-card {
+  padding: 8rpx 24rpx;
+  background: #fff;
+  border-radius: 16rpx;
+}
+
+.form-row {
+  display: flex;
+  align-items: center;
+  min-height: 96rpx;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+
+.form-row:last-child {
+  border-bottom: none;
+}
+
+.form-row--col {
+  flex-direction: column;
+  align-items: stretch;
+  padding: 20rpx 0;
+}
+
+.form-row__label {
+  width: 200rpx;
+  flex-shrink: 0;
+  font-size: 28rpx;
+  color: $morandi-text-secondary;
+}
+
+.form-row__label--req::before {
+  content: '*';
+  color: #d32f2f;
+  margin-right: 4rpx;
+}
+
+.form-row__input {
+  flex: 1;
+  font-size: 28rpx;
+  color: $morandi-text;
+}
+
+.form-row__readonly {
+  flex: 1;
+  font-size: 28rpx;
+  color: $morandi-text-muted;
+}
+
+.form-row__picker {
+  flex: 1;
+  font-size: 28rpx;
+  color: $morandi-text;
+}
+
+.form-row__placeholder {
+  color: $morandi-text-soft;
+}
+
+.form-footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 24rpx 32rpx;
+  padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.06);
+}
+
+.form-footer__btn {
+  height: 88rpx;
+  line-height: 88rpx;
+  background: #2e7d32;
+  color: #fff;
+  font-size: 30rpx;
+  border-radius: 44rpx;
+  border: none;
+}
+
+.form-footer__btn[disabled] {
+  opacity: 0.6;
+}

shop-app/subpackage/account/address-edit.vue

@@ -0,0 +1,155 @@
+<template>
+	<view class="form-page">
+		<view class="form-card">
+			<view class="form-row">
+				<text class="form-row__label form-row__label--req">收货人</text>
+				<input v-model="form.consigneeName" class="form-row__input" placeholder="请输入收货人" />
+			</view>
+			<view class="form-row">
+				<text class="form-row__label form-row__label--req">手机号</text>
+				<input
+					v-model="form.mobile"
+					class="form-row__input"
+					type="number"
+					maxlength="11"
+					placeholder="11 位手机号"
+				/>
+			</view>
+			<region-fields v-model="region" />
+			<view class="form-row form-row--col">
+				<text class="form-row__label form-row__label--req">详细地址</text>
+				<input
+					v-model="form.detailAddress"
+					class="form-row__input"
+					placeholder="街道、门牌号等"
+				/>
+			</view>
+			<view class="form-row" @click="form.isDefault = form.isDefault === '1' ? '0' : '1'">
+				<text class="form-row__label">设为默认</text>
+				<switch :checked="form.isDefault === '1'" color="#2e7d32" @change="onDefaultChange" />
+			</view>
+		</view>
+		<view class="form-footer">
+			<button class="form-footer__btn" :disabled="saving" @click="handleSave">
+				{{ saving ? '保存中…' : '保 存' }}
+			</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getAddressList, addAddress, updateAddress } from '@/api/member'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { validateMobile } from '@/utils/memberValidate'
+import RegionFields from '@/components/mine/RegionFields.vue'
+
+const mode = ref('add')
+const addressId = ref(null)
+const saving = ref(false)
+
+const form = reactive({
+  consigneeName: '',
+  mobile: '',
+  province: '',
+  city: '',
+  district: '',
+  detailAddress: '',
+  isDefault: '0'
+})
+
+const region = ref({ code: '', name: '', province: '', city: '', district: '' })
+
+onLoad((options) => {
+  if (!ensureApiToken()) return
+  mode.value = options.mode === 'edit' ? 'edit' : 'add'
+  if (options.id) {
+    addressId.value = Number(options.id)
+    uni.setNavigationBarTitle({ title: '编辑地址' })
+    loadDetail()
+  } else {
+    uni.setNavigationBarTitle({ title: '新增地址' })
+  }
+})
+
+function loadDetail() {
+  getAddressList().then((res) => {
+    const rows = res.data || []
+    const item = rows.find((r) => r.addressId === addressId.value)
+    if (!item) return
+    form.consigneeName = item.consigneeName || ''
+    form.mobile = item.mobile || ''
+    form.province = item.province || ''
+    form.city = item.city || ''
+    form.district = item.district || ''
+    form.detailAddress = item.detailAddress || ''
+    form.isDefault = item.isDefault === '1' ? '1' : '0'
+    region.value = {
+      province: form.province,
+      city: form.city,
+      district: form.district,
+      name: [form.province, form.city, form.district].filter(Boolean).join(' '),
+      code: [form.province, form.city, form.district].filter(Boolean).join('|')
+    }
+  })
+}
+
+function onDefaultChange(e) {
+  form.isDefault = e.detail.value ? '1' : '0'
+}
+
+function validate() {
+  if (!(form.consigneeName || '').trim()) {
+    uni.showToast({ title: '请输入收货人', icon: 'none' })
+    return false
+  }
+  const m = validateMobile(form.mobile)
+  if (m) {
+    uni.showToast({ title: m, icon: 'none' })
+    return false
+  }
+  if (!region.value.name) {
+    uni.showToast({ title: '请填写所在地区', icon: 'none' })
+    return false
+  }
+  if (!(form.detailAddress || '').trim()) {
+    uni.showToast({ title: '请输入详细地址', icon: 'none' })
+    return false
+  }
+  return true
+}
+
+function buildPayload() {
+  const parts = region.value
+  return {
+    addressId: mode.value === 'edit' ? addressId.value : undefined,
+    consigneeName: form.consigneeName.trim(),
+    mobile: form.mobile.trim(),
+    province: parts.province,
+    city: parts.city,
+    district: parts.district,
+    detailAddress: form.detailAddress.trim(),
+    isDefault: form.isDefault
+  }
+}
+
+function handleSave() {
+  if (saving.value || !validate()) return
+  saving.value = true
+  const api = mode.value === 'edit' ? updateAddress : addAddress
+  api(buildPayload())
+    .then(() => {
+      uni.showToast({ title: '保存成功', icon: 'none' })
+      setTimeout(() => uni.navigateBack(), 600)
+    })
+    .catch(() => {})
+    .finally(() => {
+      saving.value = false
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/subpackage/account/address-list.vue

@@ -0,0 +1,195 @@
+<template>
+	<view class="addr-page">
+		<view v-if="loading" class="addr-page__loading">
+			<text>加载中…</text>
+		</view>
+		<view v-else-if="list.length === 0" class="addr-empty">
+			<text class="addr-empty__txt">暂无收货地址，请添加</text>
+			<button class="mine-btn-primary addr-empty__btn" @click="goAdd">新增地址</button>
+		</view>
+		<view v-else class="addr-list">
+			<view v-for="item in list" :key="item.addressId" class="addr-card">
+				<view class="addr-card__head">
+					<text class="addr-card__name">{{ item.consigneeName }}</text>
+					<text class="addr-card__mobile">{{ item.mobile }}</text>
+					<text v-if="item.isDefault === '1'" class="addr-card__tag">默认</text>
+				</view>
+				<text class="addr-card__addr">{{ item.fullAddress || formatAddr(item) }}</text>
+				<view class="addr-card__actions">
+					<text
+						v-if="item.isDefault !== '1'"
+						class="addr-card__act"
+						@click="setDefault(item)"
+					>设为默认</text>
+					<text class="addr-card__act" @click="goEdit(item)">编辑</text>
+					<text class="addr-card__act addr-card__act--danger" @click="remove(item)">删除</text>
+				</view>
+			</view>
+		</view>
+		<view v-if="list.length > 0" class="addr-footer">
+			<button class="form-footer__btn" @click="goAdd">新增地址</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { getAddressList, deleteAddress, setDefaultAddress } from '@/api/member'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { PAGE_ADDRESS_EDIT } from '@/utils/pageRoute'
+
+const list = ref([])
+const loading = ref(true)
+
+onShow(() => {
+  if (!ensureApiToken(false)) return
+  loadList()
+})
+
+function loadList() {
+  loading.value = true
+  getAddressList()
+    .then((res) => {
+      const rows = res.data || []
+      list.value = rows.sort((a, b) => {
+        if (a.isDefault === '1' && b.isDefault !== '1') return -1
+        if (b.isDefault === '1' && a.isDefault !== '1') return 1
+        return 0
+      })
+    })
+    .catch(() => {
+      list.value = []
+    })
+    .finally(() => {
+      loading.value = false
+    })
+}
+
+function formatAddr(item) {
+  return [item.province, item.city, item.district, item.detailAddress].filter(Boolean).join('')
+}
+
+function goAdd() {
+  uni.navigateTo({ url: `${PAGE_ADDRESS_EDIT}?mode=add` })
+}
+
+function goEdit(item) {
+  uni.navigateTo({
+    url: `${PAGE_ADDRESS_EDIT}?mode=edit&id=${item.addressId}`
+  })
+}
+
+function setDefault(item) {
+  setDefaultAddress(item.addressId)
+    .then(() => {
+      uni.showToast({ title: '已设为默认', icon: 'none' })
+      loadList()
+    })
+    .catch(() => {})
+}
+
+function remove(item) {
+  uni.showModal({
+    title: '提示',
+    content: '确定删除该收货地址吗？',
+    success: (res) => {
+      if (!res.confirm) return
+      deleteAddress(item.addressId)
+        .then(() => {
+          uni.showToast({ title: '已删除', icon: 'none' })
+          loadList()
+        })
+        .catch(() => {})
+    }
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+
+.addr-page {
+  min-height: 100vh;
+  padding: 24rpx;
+  padding-bottom: 160rpx;
+  background: #f0ebe5;
+  box-sizing: border-box;
+}
+.addr-empty {
+  padding: 120rpx 48rpx;
+  text-align: center;
+  background: #fff;
+  border-radius: 16rpx;
+}
+.addr-empty__txt {
+  font-size: 28rpx;
+  color: #9a938c;
+}
+.addr-empty__btn {
+  margin-top: 40rpx;
+  width: 100%;
+}
+.addr-card {
+  margin-bottom: 20rpx;
+  padding: 28rpx;
+  background: #fff;
+  border-radius: 16rpx;
+}
+.addr-card__head {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 12rpx;
+}
+.addr-card__name {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+}
+.addr-card__mobile {
+  font-size: 28rpx;
+  color: #666;
+}
+.addr-card__tag {
+  padding: 4rpx 12rpx;
+  font-size: 22rpx;
+  color: #2e7d32;
+  background: #e8f5e9;
+  border-radius: 6rpx;
+}
+.addr-card__addr {
+  display: block;
+  margin-top: 12rpx;
+  font-size: 26rpx;
+  color: #666;
+  line-height: 1.5;
+}
+.addr-card__actions {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: flex-end;
+  gap: 32rpx;
+}
+.addr-card__act {
+  font-size: 26rpx;
+  color: #2e7d32;
+}
+.addr-card__act--danger {
+  color: #d32f2f;
+}
+.addr-footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 24rpx 32rpx;
+  padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+  background: #fff;
+}
+.addr-page__loading {
+  padding: 80rpx;
+  text-align: center;
+  color: #999;
+}
+</style>

shop-app/subpackage/account/entry-apply.vue

@@ -0,0 +1,303 @@
+<template>
+	<view class="entry-apply-page">
+		<view v-if="!entryOpen" class="entry-closed">
+			<text>{{ agreement.message || '商家入驻暂未开放' }}</text>
+		</view>
+		<view v-else-if="blocked" class="entry-closed">
+			<text>您有待审核或公示中的申请，请先在「我的入驻申请」查看进度</text>
+			<button class="mine-btn-outline entry-closed__btn" @click="goList">查看申请</button>
+		</view>
+		<template v-else>
+			<view class="entry-steps">
+				<text
+					v-for="(s, i) in stepTitles"
+					:key="s"
+					:class="['entry-steps__item', { 'entry-steps__item--on': stepIndex === i }]"
+				>{{ s }}</text>
+			</view>
+			<scroll-view class="entry-scroll" scroll-y>
+				<!-- 主体类型 -->
+				<view v-if="currentStep === 'type'" class="form-card">
+					<view
+						:class="['type-card', { 'type-card--on': form.merchantType === '1' }]"
+						@click="selectType('1')"
+					>
+						<text class="type-card__title">个人入驻</text>
+						<text class="type-card__sub">身份证 + 个人账户</text>
+					</view>
+					<view
+						:class="['type-card', { 'type-card--on': form.merchantType === '2' }]"
+						@click="selectType('2')"
+					>
+						<text class="type-card__title">企业入驻</text>
+						<text class="type-card__sub">法人 + 企业对公账户</text>
+					</view>
+				</view>
+
+				<!-- 个人：主体信息 -->
+				<view v-else-if="isPerson && currentStep === 'subject'" class="form-card">
+					<entry-person-subject :subject="form.subject" />
+				</view>
+				<view v-else-if="isPerson && currentStep === 'biz'" class="form-card">
+					<entry-person-biz :biz="form.biz" :region="regionBiz" @update:region="onBizRegion" />
+				</view>
+
+				<!-- 企业 -->
+				<view v-else-if="!isPerson && currentStep === 'subject'" class="form-card">
+					<entry-enterprise-subject
+						:subject="form.subject"
+						:region-reg="regionReg"
+						@update:region-reg="onRegRegion"
+					/>
+				</view>
+				<view v-else-if="!isPerson && currentStep === 'biz'" class="form-card">
+					<entry-enterprise-biz :biz="form.biz" :region="regionBiz" @update:region="onBizRegion" />
+				</view>
+
+				<!-- 店铺 -->
+				<view v-else-if="currentStep === 'shop'" class="form-card">
+					<entry-shop-fields :shop="form.shop" />
+				</view>
+
+				<!-- 提交 -->
+				<view v-else-if="currentStep === 'submit'" class="form-card">
+					<text class="submit-tip">请确认信息无误后勾选协议并提交</text>
+					<agreement-block
+						v-model="form.agreementAccepted"
+						:enabled="agreement.enabled"
+						:checkbox-label="agreement.checkboxLabel"
+						:agreement-title="agreement.agreementTitle"
+						:version-label="agreement.versionLabel"
+						:content="agreement.content"
+					/>
+				</view>
+			</scroll-view>
+			<view class="entry-actions">
+				<button v-if="stepIndex > 0" class="mine-btn-outline entry-actions__prev" @click="prevStep">
+					上一步
+				</button>
+				<button class="form-footer__btn entry-actions__next" :disabled="submitting" @click="nextStep">
+					{{ nextBtnText }}
+				</button>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script setup>
+import { ref, reactive, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getEntryAgreement, getEntryStatus, getMyEntryApplies, submitEntryApply } from '@/api/merchantEntry'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { hasBlockingApply } from '@/utils/entryConstants'
+import { createEntryForm, validateEntryStep, buildEntrySubmitPayload, applyRegion, applyRegRegion } from '@/utils/entryForm'
+import { MERCHANT_TYPE_PERSON } from '@/utils/entryConstants'
+import AgreementBlock from '@/components/account/AgreementBlock.vue'
+import EntryPersonSubject from '@/components/mine/entry/EntryPersonSubject.vue'
+import EntryPersonBiz from '@/components/mine/entry/EntryPersonBiz.vue'
+import EntryEnterpriseSubject from '@/components/mine/entry/EntryEnterpriseSubject.vue'
+import EntryEnterpriseBiz from '@/components/mine/entry/EntryEnterpriseBiz.vue'
+import EntryShopFields from '@/components/mine/entry/EntryShopFields.vue'
+import { PAGE_ENTRY_LIST } from '@/utils/pageRoute'
+
+const form = reactive(createEntryForm(MERCHANT_TYPE_PERSON))
+const agreement = reactive({
+  enabled: false,
+  message: '',
+  agreementTitle: '',
+  versionLabel: '',
+  content: '',
+  checkboxLabel: '我已阅读并同意《商城入驻协议》'
+})
+
+const stepIndex = ref(0)
+const submitting = ref(false)
+const entryOpen = ref(true)
+const blocked = ref(false)
+const regionBiz = ref({ code: '', name: '', province: '', city: '', district: '' })
+const regionReg = ref({ code: '', name: '', province: '', city: '', district: '' })
+
+const stepKeys = computed(() => ['type', 'subject', 'biz', 'shop', 'submit'])
+const stepTitles = ['类型', '主体', '经营', '店铺', '提交']
+const currentStep = computed(() => stepKeys.value[stepIndex.value])
+const isPerson = computed(() => form.merchantType === MERCHANT_TYPE_PERSON)
+const nextBtnText = computed(() => {
+  if (submitting.value) return '提交中…'
+  return currentStep.value === 'submit' ? '提交申请' : '下一步'
+})
+
+onLoad(() => {
+  if (!ensureApiToken()) return
+  initPage()
+})
+
+function initPage() {
+  Promise.all([getEntryAgreement(), getEntryStatus(), getMyEntryApplies()])
+    .then(([agRes, stRes, myRes]) => {
+      const ag = agRes.data || {}
+      agreement.enabled = !!ag.enabled
+      agreement.message = ag.message || ''
+      agreement.agreementTitle = ag.agreementTitle || '商城入驻协议'
+      agreement.versionLabel = ag.versionLabel || ''
+      agreement.content = ag.content || ''
+      agreement.checkboxLabel = ag.checkboxLabel || agreement.checkboxLabel
+      entryOpen.value = stRes.data?.entryOpen !== false && agreement.enabled
+      blocked.value = hasBlockingApply(myRes.data || [])
+    })
+    .catch(() => {})
+}
+
+function selectType(type) {
+  form.merchantType = type
+  const next = createEntryForm(type)
+  form.subject = next.subject
+  form.biz = next.biz
+  form.shop = next.shop
+  form.agreementAccepted = false
+  regionBiz.value = { code: '', name: '', province: '', city: '', district: '' }
+  regionReg.value = { code: '', name: '', province: '', city: '', district: '' }
+}
+
+function onBizRegion(v) {
+  regionBiz.value = v
+  applyRegion(form.biz, v)
+}
+
+function onRegRegion(v) {
+  regionReg.value = v
+  applyRegRegion(form.subject, v)
+}
+
+function prevStep() {
+  if (stepIndex.value > 0) stepIndex.value -= 1
+}
+
+function nextStep() {
+  const key = currentStep.value
+  const err = validateEntryStep(form, key)
+  if (err) {
+    uni.showToast({ title: err, icon: 'none' })
+    return
+  }
+  if (key === 'submit') {
+    doSubmit()
+    return
+  }
+  if (stepIndex.value < stepKeys.value.length - 1) {
+    stepIndex.value += 1
+  }
+}
+
+function doSubmit() {
+  uni.showModal({
+    title: '确认提交',
+    content: '提交后不可修改，是否确认？',
+    success: (res) => {
+      if (!res.confirm) return
+      submitting.value = true
+      submitEntryApply(buildEntrySubmitPayload(form))
+        .then(() => {
+          uni.showToast({ title: '提交成功，请等待审核', icon: 'none', duration: 2500 })
+          setTimeout(() => {
+            uni.redirectTo({ url: PAGE_ENTRY_LIST })
+          }, 1500)
+        })
+        .catch(() => {})
+        .finally(() => {
+          submitting.value = false
+        })
+    }
+  })
+}
+
+function goList() {
+  uni.navigateTo({ url: PAGE_ENTRY_LIST })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+
+.entry-apply-page {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f0ebe5;
+}
+.entry-closed {
+  padding: 80rpx 40rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #666;
+}
+.entry-closed__btn {
+  margin-top: 32rpx;
+  width: 100%;
+}
+.entry-steps {
+  display: flex;
+  padding: 20rpx 16rpx;
+  background: #fff;
+}
+.entry-steps__item {
+  flex: 1;
+  text-align: center;
+  font-size: 24rpx;
+  color: #999;
+}
+.entry-steps__item--on {
+  color: #2e7d32;
+  font-weight: 600;
+}
+.entry-scroll {
+  flex: 1;
+  height: 0;
+  padding: 24rpx;
+  box-sizing: border-box;
+}
+.entry-actions {
+  display: flex;
+  gap: 20rpx;
+  padding: 20rpx 24rpx;
+  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+  background: #fff;
+}
+.entry-actions__prev {
+  flex: 1;
+  height: 88rpx;
+  line-height: 88rpx;
+}
+.entry-actions__next {
+  flex: 2;
+  height: 88rpx;
+  line-height: 88rpx;
+}
+.type-card {
+  margin-bottom: 20rpx;
+  padding: 32rpx;
+  border: 2rpx solid #e5ded6;
+  border-radius: 16rpx;
+}
+.type-card--on {
+  border-color: #2e7d32;
+  background: #f1f8f4;
+}
+.type-card__title {
+  display: block;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+}
+.type-card__sub {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #999;
+}
+.submit-tip {
+  display: block;
+  padding: 16rpx 0 24rpx;
+  font-size: 26rpx;
+  color: #666;
+}
+</style>

shop-app/subpackage/account/entry-detail.vue

@@ -0,0 +1,161 @@
+<template>
+	<view class="form-page" v-if="detail">
+		<view class="form-card detail-card">
+			<view class="detail-row">
+				<text class="detail-row__label">申请单号</text>
+				<text class="detail-row__val">{{ detail.applyNo }}</text>
+			</view>
+			<view class="detail-row">
+				<text class="detail-row__label">状态</text>
+				<text class="detail-row__val" :style="{ color: statusInfo.color }">{{ statusInfo.label }}</text>
+			</view>
+			<view class="detail-row">
+				<text class="detail-row__label">申请时间</text>
+				<text class="detail-row__val">{{ detail.applyTime || '—' }}</text>
+			</view>
+			<view v-if="detail.auditTime" class="detail-row">
+				<text class="detail-row__label">审核时间</text>
+				<text class="detail-row__val">{{ detail.auditTime }}</text>
+			</view>
+			<view
+				v-if="detail.applyStatus === APPLY_STATUS_PUBLICITY"
+				class="detail-publicity"
+			>
+				<text class="detail-publicity__title">公示期</text>
+				<text>{{ detail.publicityStartTime || '—' }} 至 {{ detail.publicityEndTime || '—' }}</text>
+				<text class="detail-publicity__tip">公示结束后将完成开店建档</text>
+			</view>
+			<view
+				v-if="detail.applyStatus === APPLY_STATUS_REJECT && detail.rejectReason"
+				class="detail-reject"
+			>
+				<text class="detail-reject__title">驳回原因</text>
+				<text>{{ detail.rejectReason }}</text>
+			</view>
+			<view v-if="detail.applyStatus === APPLY_STATUS_DONE" class="detail-done">
+				<text>入驻已完成，请使用经营账号登录商家后台进行发品与店铺经营。</text>
+				<text v-if="detail.merchantId" class="detail-done__sub">商户 ID：{{ detail.merchantId }}</text>
+			</view>
+		</view>
+		<view v-if="detail.applyStatus === APPLY_STATUS_REJECT && canReapply" class="form-footer">
+			<button class="form-footer__btn" @click="goReapply">重新申请</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getMyEntryApplies, getEntryStatus } from '@/api/merchantEntry'
+import { ensureApiToken } from '@/utils/apiAuth'
+import {
+  formatApplyStatus,
+  APPLY_STATUS_REJECT,
+  APPLY_STATUS_PUBLICITY,
+  APPLY_STATUS_DONE,
+  canSubmitNewApply
+} from '@/utils/entryConstants'
+import { PAGE_ENTRY_APPLY } from '@/utils/pageRoute'
+
+const applyId = ref(null)
+const detail = ref(null)
+const entryOpen = ref(true)
+const listCache = ref([])
+
+const statusInfo = computed(() => formatApplyStatus(detail.value?.applyStatus))
+
+const canReapply = computed(() => canSubmitNewApply(listCache.value, entryOpen.value))
+
+onLoad((options) => {
+  if (!ensureApiToken()) return
+  applyId.value = Number(options.applyId)
+  loadDetail()
+})
+
+function loadDetail() {
+  Promise.all([getMyEntryApplies(), getEntryStatus()])
+    .then(([myRes, stRes]) => {
+      listCache.value = myRes.data || []
+      entryOpen.value = stRes.data?.entryOpen !== false
+      detail.value = listCache.value.find((x) => x.applyId === applyId.value) || null
+      if (!detail.value) {
+        uni.showToast({ title: '申请不存在', icon: 'none' })
+      }
+    })
+    .catch(() => {})
+}
+
+function goReapply() {
+  uni.navigateTo({ url: PAGE_ENTRY_APPLY })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+
+.detail-card {
+  padding: 16rpx 24rpx;
+}
+.detail-row {
+  display: flex;
+  padding: 20rpx 0;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+.detail-row__label {
+  width: 180rpx;
+  font-size: 28rpx;
+  color: #9a938c;
+}
+.detail-row__val {
+  flex: 1;
+  font-size: 28rpx;
+  color: #4a4542;
+}
+.detail-reject {
+  margin-top: 24rpx;
+  padding: 20rpx;
+  background: #ffebee;
+  border-radius: 12rpx;
+  color: #c62828;
+  font-size: 26rpx;
+  line-height: 1.5;
+}
+.detail-reject__title {
+  display: block;
+  font-weight: 600;
+  margin-bottom: 8rpx;
+}
+.detail-publicity {
+  margin-top: 24rpx;
+  padding: 20rpx;
+  background: #e3f2fd;
+  border-radius: 12rpx;
+  font-size: 26rpx;
+  color: #1565c0;
+  line-height: 1.5;
+}
+.detail-publicity__title {
+  display: block;
+  font-weight: 600;
+  margin-bottom: 8rpx;
+}
+.detail-publicity__tip {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+}
+.detail-done {
+  margin-top: 24rpx;
+  padding: 20rpx;
+  background: #e8f5e9;
+  border-radius: 12rpx;
+  font-size: 26rpx;
+  color: #2e7d32;
+  line-height: 1.5;
+}
+.detail-done__sub {
+  display: block;
+  margin-top: 8rpx;
+  font-size: 24rpx;
+}
+</style>

shop-app/subpackage/account/entry-list.vue

@@ -0,0 +1,150 @@
+<template>
+	<view class="entry-list-page">
+		<view v-if="loading" class="entry-list-page__loading">加载中…</view>
+		<view v-else-if="list.length === 0" class="entry-empty">
+			<text>暂无入驻申请记录</text>
+			<button class="mine-btn-primary entry-empty__btn" @click="goApply">我要入驻</button>
+		</view>
+		<view v-else>
+			<view
+				v-for="item in list"
+				:key="item.applyId"
+				class="entry-card"
+				@click="goDetail(item)"
+			>
+				<view class="entry-card__row">
+					<text class="entry-card__no">{{ item.applyNo }}</text>
+					<text class="entry-card__status" :style="{ color: statusStyle(item).color }">
+						{{ statusStyle(item).label }}
+					</text>
+				</view>
+				<text class="entry-card__time">申请时间：{{ item.applyTime || '—' }}</text>
+				<text
+					v-if="item.applyStatus === '2' && item.rejectReason"
+					class="entry-card__reject"
+				>{{ item.rejectReason }}</text>
+			</view>
+		</view>
+		<view v-if="canApply" class="entry-list-footer">
+			<button class="form-footer__btn" @click="goApply">发起新申请</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { getMyEntryApplies } from '@/api/merchantEntry'
+import { getEntryStatus } from '@/api/merchantEntry'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { formatApplyStatus, canSubmitNewApply } from '@/utils/entryConstants'
+import { PAGE_ENTRY_APPLY, PAGE_ENTRY_DETAIL } from '@/utils/pageRoute'
+
+const list = ref([])
+const loading = ref(true)
+const entryOpen = ref(true)
+const canApply = ref(false)
+
+onShow(() => {
+  if (!ensureApiToken(false)) return
+  loadData()
+})
+
+function statusStyle(item) {
+  return formatApplyStatus(item.applyStatus)
+}
+
+function loadData() {
+  loading.value = true
+  Promise.all([getMyEntryApplies(), getEntryStatus()])
+    .then(([myRes, stRes]) => {
+      list.value = myRes.data || []
+      entryOpen.value = stRes.data?.entryOpen !== false
+      canApply.value = canSubmitNewApply(list.value, entryOpen.value)
+    })
+    .catch(() => {
+      list.value = []
+    })
+    .finally(() => {
+      loading.value = false
+    })
+}
+
+function goDetail(item) {
+  uni.navigateTo({
+    url: `${PAGE_ENTRY_DETAIL}?applyId=${item.applyId}`
+  })
+}
+
+function goApply() {
+  uni.navigateTo({ url: PAGE_ENTRY_APPLY })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+
+.entry-list-page {
+  min-height: 100vh;
+  padding: 24rpx;
+  padding-bottom: 160rpx;
+  background: #f0ebe5;
+}
+.entry-empty {
+  padding: 100rpx 40rpx;
+  text-align: center;
+  background: #fff;
+  border-radius: 16rpx;
+  color: #999;
+  font-size: 28rpx;
+}
+.entry-empty__btn {
+  margin-top: 40rpx;
+  width: 100%;
+}
+.entry-card {
+  margin-bottom: 20rpx;
+  padding: 28rpx;
+  background: #fff;
+  border-radius: 16rpx;
+}
+.entry-card__row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.entry-card__no {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+}
+.entry-card__status {
+  font-size: 26rpx;
+}
+.entry-card__time {
+  display: block;
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  color: #999;
+}
+.entry-card__reject {
+  display: block;
+  margin-top: 12rpx;
+  font-size: 24rpx;
+  color: #d32f2f;
+}
+.entry-list-footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 24rpx 32rpx;
+  padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+  background: #fff;
+}
+.entry-list-page__loading {
+  padding: 80rpx;
+  text-align: center;
+  color: #999;
+}
+</style>

shop-app/subpackage/account/password.vue

@@ -0,0 +1,101 @@
+<template>
+	<view class="form-page">
+		<view class="form-card">
+			<view class="form-row">
+				<text class="form-row__label form-row__label--req">旧密码</text>
+				<input
+					v-model="form.oldPassword"
+					class="form-row__input"
+					type="password"
+					placeholder="请输入当前密码"
+				/>
+			</view>
+			<view class="form-row">
+				<text class="form-row__label form-row__label--req">新密码</text>
+				<input
+					v-model="form.newPassword"
+					class="form-row__input"
+					type="password"
+					placeholder="至少 6 位"
+				/>
+			</view>
+			<view class="form-row">
+				<text class="form-row__label form-row__label--req">确认密码</text>
+				<input
+					v-model="form.confirmPassword"
+					class="form-row__input"
+					type="password"
+					placeholder="再次输入新密码"
+				/>
+			</view>
+		</view>
+		<view class="form-footer">
+			<button class="form-footer__btn" :disabled="saving" @click="handleSave">
+				{{ saving ? '提交中…' : '确认修改' }}
+			</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { changeMemberPassword } from '@/api/member'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { validatePassword } from '@/utils/memberValidate'
+
+const form = reactive({
+  oldPassword: '',
+  newPassword: '',
+  confirmPassword: ''
+})
+
+const saving = ref(false)
+
+onLoad(() => {
+  ensureApiToken()
+})
+
+function validate() {
+  if (!form.oldPassword) {
+    uni.showToast({ title: '请输入旧密码', icon: 'none' })
+    return false
+  }
+  const p1 = validatePassword(form.newPassword, '新密码')
+  if (p1) {
+    uni.showToast({ title: p1, icon: 'none' })
+    return false
+  }
+  if (form.newPassword !== form.confirmPassword) {
+    uni.showToast({ title: '两次输入的密码不一致', icon: 'none' })
+    return false
+  }
+  if (form.oldPassword === form.newPassword) {
+    uni.showToast({ title: '新密码不能与旧密码相同', icon: 'none' })
+    return false
+  }
+  return true
+}
+
+function handleSave() {
+  if (saving.value || !validate()) return
+  saving.value = true
+  changeMemberPassword({
+    oldPassword: form.oldPassword,
+    newPassword: form.newPassword,
+    confirmPassword: form.confirmPassword
+  })
+    .then(() => {
+      uni.showToast({ title: '修改成功', icon: 'none' })
+      setTimeout(() => uni.navigateBack(), 800)
+    })
+    .catch(() => {})
+    .finally(() => {
+      saving.value = false
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/subpackage/account/profile.vue

@@ -0,0 +1,172 @@
+<template>
+	<view class="form-page">
+		<view class="form-card">
+			<view class="form-row">
+				<text class="form-row__label">用户 ID</text>
+				<text class="form-row__readonly">{{ profile.memberId || '—' }}</text>
+			</view>
+			<view class="form-row">
+				<text class="form-row__label">会员名称</text>
+				<text class="form-row__readonly">{{ profile.memberCode || '—' }}</text>
+			</view>
+			<view class="form-row">
+				<text class="form-row__label">手机号</text>
+				<text class="form-row__readonly">{{ profile.mobile || '—' }}</text>
+			</view>
+			<view class="form-row form-row--col">
+				<text class="form-row__label form-row__label--req">头像</text>
+				<image-upload v-model="form.avatar" placeholder="上传头像" />
+			</view>
+			<view class="form-row">
+				<text class="form-row__label form-row__label--req">昵称</text>
+				<input v-model="form.nickName" class="form-row__input" placeholder="请输入昵称" />
+			</view>
+			<view class="form-row">
+				<text class="form-row__label">邮箱</text>
+				<input v-model="form.email" class="form-row__input" placeholder="选填" />
+			</view>
+			<view class="form-row">
+				<text class="form-row__label">性别</text>
+				<picker :range="genderLabels" :value="genderIndex" @change="onGenderChange">
+					<view class="form-row__picker">
+						<text :class="{ 'form-row__placeholder': genderIndex < 0 }">
+							{{ genderIndex >= 0 ? genderLabels[genderIndex] : '请选择' }}
+						</text>
+					</view>
+				</picker>
+			</view>
+			<view class="form-row">
+				<text class="form-row__label">出生日期</text>
+				<picker mode="date" :value="form.birthday" :end="today" @change="onBirthdayChange">
+					<view class="form-row__picker">
+						<text :class="{ 'form-row__placeholder': !form.birthday }">
+							{{ form.birthday || '请选择' }}
+						</text>
+					</view>
+				</picker>
+			</view>
+		</view>
+		<view class="form-footer">
+			<button class="form-footer__btn" :disabled="saving" @click="handleSave">
+				{{ saving ? '保存中…' : '保 存' }}
+			</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, reactive, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getMemberProfile, updateMemberProfile } from '@/api/member'
+import { useUserStore } from '@/store/user'
+import { ensureApiToken } from '@/utils/apiAuth'
+import { GENDER_OPTIONS } from '@/utils/entryConstants'
+import ImageUpload from '@/components/mine/ImageUpload.vue'
+
+const profile = reactive({
+  memberId: '',
+  memberCode: '',
+  mobile: ''
+})
+
+const form = reactive({
+  nickName: '',
+  avatar: '',
+  email: '',
+  sex: '',
+  birthday: ''
+})
+
+const saving = ref(false)
+const genderLabels = GENDER_OPTIONS.map((g) => g.label)
+const genderIndex = ref(-1)
+const today = computed(() => {
+  const d = new Date()
+  const m = `${d.getMonth() + 1}`.padStart(2, '0')
+  const day = `${d.getDate()}`.padStart(2, '0')
+  return `${d.getFullYear()}-${m}-${day}`
+})
+
+const userStore = useUserStore()
+
+onLoad(() => {
+  if (!ensureApiToken()) return
+  loadProfile()
+})
+
+function syncGenderIndex() {
+  const idx = GENDER_OPTIONS.findIndex((g) => g.value === form.sex)
+  genderIndex.value = idx >= 0 ? idx : -1
+}
+
+function loadProfile() {
+  getMemberProfile()
+    .then((res) => {
+      const m = res.data || {}
+      profile.memberId = m.memberId
+      profile.memberCode = m.memberCode
+      profile.mobile = m.mobile
+      form.nickName = m.nickName || ''
+      form.avatar = m.avatar || ''
+      form.email = m.email || ''
+      form.sex = m.sex != null ? String(m.sex) : ''
+      form.birthday = m.birthday ? String(m.birthday).slice(0, 10) : ''
+      syncGenderIndex()
+    })
+    .catch(() => {})
+}
+
+function onGenderChange(e) {
+  const idx = Number(e.detail.value)
+  genderIndex.value = idx
+  form.sex = GENDER_OPTIONS[idx]?.value || ''
+}
+
+function onBirthdayChange(e) {
+  form.birthday = e.detail.value
+}
+
+function validate() {
+  if (!(form.nickName || '').trim()) {
+    uni.showToast({ title: '请输入昵称', icon: 'none' })
+    return false
+  }
+  const email = (form.email || '').trim()
+  if (email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+    uni.showToast({ title: '邮箱格式不正确', icon: 'none' })
+    return false
+  }
+  if (form.birthday && form.birthday > today.value) {
+    uni.showToast({ title: '出生日期不能为未来', icon: 'none' })
+    return false
+  }
+  return true
+}
+
+function handleSave() {
+  if (saving.value || !validate()) return
+  saving.value = true
+  updateMemberProfile({
+    nickName: form.nickName.trim(),
+    avatar: form.avatar,
+    email: (form.email || '').trim(),
+    sex: form.sex,
+    birthday: form.birthday || null
+  })
+    .then(() => {
+      uni.showToast({ title: '保存成功', icon: 'none' })
+      return userStore.fetchUserInfo()
+    })
+    .then(() => {
+      setTimeout(() => uni.navigateBack(), 800)
+    })
+    .catch(() => {})
+    .finally(() => {
+      saving.value = false
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/mine.scss';
+</style>

shop-app/utils/entryConstants.js

@@ -0,0 +1,58 @@
+/** 商户类型 */
+export const MERCHANT_TYPE_PERSON = '1'
+export const MERCHANT_TYPE_ENTERPRISE = '2'
+
+/** 证件类型 */
+export const ID_TYPE_MAINLAND = '1'
+export const ID_TYPE_HK_PASS = '2'
+
+/** 有效期类型 */
+export const VALID_RANGE = '1'
+export const VALID_LONG = '2'
+
+/** 申请状态 */
+export const APPLY_STATUS_PENDING = '0'
+export const APPLY_STATUS_DONE = '1'
+export const APPLY_STATUS_REJECT = '2'
+export const APPLY_STATUS_PUBLICITY = '3'
+
+export const APPLY_STATUS_MAP = {
+  [APPLY_STATUS_PENDING]: { label: '待审核', color: '#ed6a0c' },
+  [APPLY_STATUS_DONE]: { label: '已完成入驻', color: '#2e7d32' },
+  [APPLY_STATUS_REJECT]: { label: '审核未通过', color: '#d32f2f' },
+  [APPLY_STATUS_PUBLICITY]: { label: '公示中', color: '#1976d2' }
+}
+
+export const GENDER_OPTIONS = [
+  { label: '男', value: '0' },
+  { label: '女', value: '1' },
+  { label: '保密', value: '2' }
+]
+
+export const ID_TYPE_OPTIONS = [
+  { label: '大陆身份证', value: ID_TYPE_MAINLAND },
+  { label: '来往内地通行证', value: ID_TYPE_HK_PASS }
+]
+
+export const VALID_TYPE_OPTIONS = [
+  { label: '区间有效', value: VALID_RANGE },
+  { label: '长期有效', value: VALID_LONG }
+]
+
+export function formatApplyStatus(status) {
+  return APPLY_STATUS_MAP[status] || { label: '未知', color: '#999' }
+}
+
+/** 是否存在阻塞中的申请（待审 / 公示中） */
+export function hasBlockingApply(list) {
+  if (!Array.isArray(list)) return false
+  return list.some((item) =>
+    item.applyStatus === APPLY_STATUS_PENDING || item.applyStatus === APPLY_STATUS_PUBLICITY
+  )
+}
+
+/** 是否可重新申请（仅驳回或未通过场景由入口引导） */
+export function canSubmitNewApply(list, entryOpen) {
+  if (!entryOpen) return false
+  return !hasBlockingApply(list)
+}

shop-app/utils/entryForm.js

@@ -0,0 +1,237 @@
+import {
+  MERCHANT_TYPE_PERSON,
+  MERCHANT_TYPE_ENTERPRISE,
+  VALID_RANGE
+} from '@/utils/entryConstants'
+import { isMobile } from '@/utils/memberValidate'
+
+const EMAIL_REG = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+
+function emptyPersonSubject() {
+  return {
+    merchantType: MERCHANT_TYPE_PERSON,
+    personName: '',
+    idCardType: '1',
+    idCardNo: '',
+    birthDate: '',
+    idValidType: '1',
+    idValidStart: '',
+    idValidEnd: '',
+    residenceAddress: '',
+    gender: '',
+    idCardFront: '',
+    idCardBack: '',
+    contactName: '',
+    contactPhone: '',
+    contactEmail: '',
+    bankName: '',
+    bankBranch: '',
+    bankAccount: ''
+  }
+}
+
+function emptyPersonBiz() {
+  return {
+    merchantType: MERCHANT_TYPE_PERSON,
+    merchantName: '',
+    servicePhone: '',
+    bizRegionCode: '',
+    bizRegionName: '',
+    bizDetailAddress: ''
+  }
+}
+
+function emptyEnterpriseSubject() {
+  return {
+    merchantType: MERCHANT_TYPE_ENTERPRISE,
+    companyName: '',
+    regRegionCode: '',
+    regRegionName: '',
+    companyDetailAddress: '',
+    businessScope: '',
+    creditCode: '',
+    licenseValidType: '1',
+    licenseValidStart: '',
+    licenseValidEnd: '',
+    legalName: '',
+    legalResidence: '',
+    legalGender: '',
+    legalBirthDate: '',
+    legalIdCardType: '1',
+    legalIdCardNo: '',
+    legalIdValidType: '1',
+    legalIdValidStart: '',
+    legalIdValidEnd: '',
+    legalIdCardFront: '',
+    legalIdCardBack: '',
+    contactName: '',
+    contactPhone: '',
+    contactEmail: '',
+    bankName: '',
+    bankBranch: '',
+    bankAccount: '',
+    corpBankAccount: '',
+    accountPermit: ''
+  }
+}
+
+function emptyEnterpriseBiz() {
+  return {
+    merchantType: MERCHANT_TYPE_ENTERPRISE,
+    bizRegionCode: '',
+    bizRegionName: '',
+    bizDetailAddress: '',
+    businessLicense: ''
+  }
+}
+
+function emptyShop() {
+  return {
+    shopName: '',
+    shopAvatar: '',
+    shopPhone: '',
+    shopDesc: ''
+  }
+}
+
+/** 创建空白入驻表单 */
+export function createEntryForm(merchantType = MERCHANT_TYPE_PERSON) {
+  const isPerson = merchantType === MERCHANT_TYPE_PERSON
+  return {
+    merchantType,
+    subject: isPerson ? emptyPersonSubject() : emptyEnterpriseSubject(),
+    biz: isPerson ? emptyPersonBiz() : emptyEnterpriseBiz(),
+    shop: emptyShop(),
+    agreementAccepted: false
+  }
+}
+
+/** 省市区写入 biz/reg 字段 */
+export function applyRegion(target, region) {
+  if (!target || !region) return
+  target.bizRegionCode = region.code || ''
+  target.bizRegionName = region.name || ''
+}
+
+export function applyRegRegion(target, region) {
+  if (!target || !region) return
+  target.regRegionCode = region.code || ''
+  target.regRegionName = region.name || ''
+}
+
+function requireText(value, msg) {
+  if (!(value || '').trim()) return msg
+  return ''
+}
+
+function requireEmail(value) {
+  const t = (value || '').trim()
+  if (!t) return '请输入常用邮箱'
+  if (!EMAIL_REG.test(t)) return '邮箱格式不正确'
+  return ''
+}
+
+function checkValidPeriod(label, type, start, end) {
+  if (!type) return `请选择${label}有效期类型`
+  if (type === VALID_RANGE && (!start || !end)) {
+    return `请填写${label}有效期`
+  }
+  return ''
+}
+
+/** 前端分步校验，返回错误文案或空 */
+export function validateEntryStep(form, stepKey) {
+  const { merchantType, subject, biz, shop } = form
+  const isPerson = merchantType === MERCHANT_TYPE_PERSON
+
+  if (stepKey === 'type') {
+    return merchantType ? '' : '请选择主体类型'
+  }
+
+  if (isPerson) {
+    if (stepKey === 'subject') {
+      return (
+        requireText(subject.personName, '请输入姓名') ||
+        requireText(subject.residenceAddress, '请输入居住地址') ||
+        requireText(subject.gender, '请选择性别') ||
+        requireText(subject.birthDate, '请选择出生日期') ||
+        requireText(subject.idCardNo, '请输入证件号码') ||
+        checkValidPeriod('证件', subject.idValidType, subject.idValidStart, subject.idValidEnd) ||
+        requireText(subject.idCardFront, '请上传证件照正面') ||
+        requireText(subject.idCardBack, '请上传证件照反面') ||
+        requireText(subject.contactName, '请输入联系人姓名') ||
+        (!isMobile(subject.contactPhone) ? '请输入正确的联系人手机' : '') ||
+        requireEmail(subject.contactEmail) ||
+        requireText(subject.bankName, '请输入开户银行') ||
+        requireText(subject.bankBranch, '请输入开户支行') ||
+        requireText(subject.bankAccount, '请输入银行账号')
+      )
+    }
+    if (stepKey === 'biz') {
+      return (
+        requireText(biz.merchantName, '请输入商户名称') ||
+        requireText(biz.servicePhone, '请输入客服电话') ||
+        requireText(biz.bizRegionName, '请选择经营地址') ||
+        requireText(biz.bizDetailAddress, '请输入经营详细地址')
+      )
+    }
+  } else {
+    if (stepKey === 'subject') {
+      return (
+        requireText(subject.companyName, '请输入企业名称') ||
+        requireText(subject.regRegionName, '请选择注册地址') ||
+        requireText(subject.companyDetailAddress, '请输入注册详细地址') ||
+        requireText(subject.businessScope, '请输入经营范围') ||
+        requireText(subject.creditCode, '请输入统一社会信用代码') ||
+        checkValidPeriod('营业', subject.licenseValidType, subject.licenseValidStart, subject.licenseValidEnd) ||
+        requireText(subject.legalName, '请输入法人姓名') ||
+        requireText(subject.legalResidence, '请输入法人居住地址') ||
+        requireText(subject.legalGender, '请选择法人性别') ||
+        requireText(subject.legalBirthDate, '请选择法人出生日期') ||
+        requireText(subject.legalIdCardNo, '请输入法人证件号码') ||
+        checkValidPeriod('法人证件', subject.legalIdValidType, subject.legalIdValidStart, subject.legalIdValidEnd) ||
+        requireText(subject.legalIdCardFront, '请上传法人证件照正面') ||
+        requireText(subject.legalIdCardBack, '请上传法人证件照反面') ||
+        requireText(subject.contactName, '请输入联系人姓名') ||
+        (!isMobile(subject.contactPhone) ? '请输入正确的联系人手机' : '') ||
+        requireEmail(subject.contactEmail) ||
+        requireText(subject.bankName, '请输入开户银行') ||
+        requireText(subject.bankBranch, '请输入开户支行') ||
+        requireText(subject.bankAccount, '请输入银行账号') ||
+        requireText(subject.corpBankAccount, '请输入对公银行账号') ||
+        requireText(subject.accountPermit, '请上传开户许可证')
+      )
+    }
+    if (stepKey === 'biz') {
+      return (
+        requireText(biz.bizRegionName, '请选择经营地址') ||
+        requireText(biz.bizDetailAddress, '请输入经营详细地址') ||
+        requireText(biz.businessLicense, '请上传营业执照')
+      )
+    }
+  }
+
+  if (stepKey === 'shop') {
+    return (
+      requireText(shop.shopName, '请输入店铺名称') ||
+      requireText(shop.shopPhone, '请输入联系电话') ||
+      requireText(shop.shopAvatar, '请上传店铺 Logo')
+    )
+  }
+
+  if (stepKey === 'submit') {
+    if (!form.agreementAccepted) return '请先阅读并同意入驻协议'
+  }
+
+  return ''
+}
+
+/** 提交前组装 DTO */
+export function buildEntrySubmitPayload(form) {
+  return {
+    subject: { ...form.subject, merchantType: form.merchantType },
+    biz: { ...form.biz, merchantType: form.merchantType },
+    shop: { ...form.shop },
+    agreementAccepted: !!form.agreementAccepted
+  }
+}

shop-app/utils/mineNav.js

@@ -0,0 +1,18 @@
+import { ensureApiToken } from '@/utils/apiAuth'
+
+/**
+ * 我的服务子页：须登录再跳转
+ * @param {string} url 完整路径，如 PAGE_PROFILE
+ */
+export function navigateMinePage(url) {
+  if (!ensureApiToken()) {
+    return false
+  }
+  uni.navigateTo({
+    url,
+    fail: () => {
+      uni.showToast({ title: '页面打开失败', icon: 'none' })
+    }
+  })
+  return true
+}

shop-app/utils/pageRoute.js

@@ -14,7 +14,7 @@ export const PAGE_HOME = '/pages/index/index'
 export const PAGE_CATEGORY_TAB = '/pages/category/index'
 /** 购物车 Tab（占位，正式功能待开发） */
 export const PAGE_CART = '/pages/cart/index'
-/** 我的 Tab（占位，正式功能待开发） */
+/** 我的 Tab */
 export const PAGE_MINE = '/pages/mine/index'
 /** 登录 */
 export const PAGE_LOGIN = '/pages/login/index'
@@ -22,6 +22,20 @@ export const PAGE_LOGIN = '/pages/login/index'
 // —— 分包：会员账号 ——
 
 export const PAGE_REGISTER = '/subpackage/account/register'
+/** 编辑个人资料 */
+export const PAGE_PROFILE = '/subpackage/account/profile'
+/** 修改密码 */
+export const PAGE_PASSWORD = '/subpackage/account/password'
+/** 收货地址列表 */
+export const PAGE_ADDRESS_LIST = '/subpackage/account/address-list'
+/** 新增/编辑地址 */
+export const PAGE_ADDRESS_EDIT = '/subpackage/account/address-edit'
+/** 商家入驻申请 */
+export const PAGE_ENTRY_APPLY = '/subpackage/account/entry-apply'
+/** 我的入驻申请列表 */
+export const PAGE_ENTRY_LIST = '/subpackage/account/entry-list'
+/** 入驻申请详情 */
+export const PAGE_ENTRY_DETAIL = '/subpackage/account/entry-detail'
 
 // —— 分包：分类 ——