登录注册

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

@@ -0,0 +1,218 @@
+# 会员注册登录 — 前端技术方案（C 端 · shop-app）
+
+> **依据：** 《会员注册登录技术方案.md》v1.2  
+> **关联：** 《商品详情内页前端技术方案》（加购登录引导）、《搜索页前端技术方案》  
+> **范围：** 消费者 APP **会员注册、登录、服务协议勾选**；**不** 改后端、**不** 实现短信验证码、忘记密码、资料/地址编辑（另册）。  
+> **实现状态：** 页面与 API 已落地，待与 `/api/member/**` 联调。
+
+---
+
+## 1. 技术栈与约定
+
+| 项 | 说明 |
+|----|------|
+| 框架 | uni-app **Vue 3** + **uview-plus** |
+| 请求 | `@/utils/request`；成功 `code=200`，业务数据在 `data` |
+| Token | `config` → `TOKEN_KEY = shop-Admin-Token`；请求头 `Authorization: Bearer {token}` |
+| 登录账号 | **手机号** 或 **会员名称**（`memberCode`，产品所称「会员 ID」） |
+| 注册 | **无短信验证码**；`mobile + password + confirmPassword` |
+| 样式 | 登录/注册共用 `styles/auth.scss` |
+
+---
+
+## 2. 页面与路由
+
+| 页面 | 路径 | 主包/分包 | 入口 |
+|------|------|-----------|------|
+| 会员登录 | `pages/login/index` | **主包** | 我的、加购拦截、401 |
+| 会员注册 | `subpackage/account/register` | **分包** | 登录页「立即注册」、我的 |
+
+**Query：**
+
+| 页面 | 参数 | 说明 |
+|------|------|------|
+| login | `account`（可选） | 注册成功或记住账号预填 |
+| register | `mobile`（可选） | 从登录页带手机号 |
+
+**路径常量：** `utils/pageRoute.js` → `PAGE_LOGIN`、`PAGE_REGISTER`
+
+---
+
+## 3. 文件清单
+
+| 类型 | 路径 | 说明 |
+|------|------|------|
+| 登录页 | `shop-app/pages/login/index.vue` | 账号+密码+协议+记住账号 |
+| 注册页 | `shop-app/subpackage/account/register.vue` | 手机号注册表单 |
+| 协议块 | `shop-app/components/account/AgreementBlock.vue` | 勾选 + 弹窗 **`rich-text`** 渲染（同商品详情） |
+| HTML 预处理 | `shop-app/utils/htmlContent.js` | 实体解码、图片 URL、空 `<p>` 清理 |
+| API | `shop-app/api/member.js` | register / login / serviceAgreement / profile |
+| 状态 | `shop-app/store/user.js` | 登录态、资料缓存 |
+| 协议加载 | `shop-app/utils/memberAgreement.js` | 初始化协议配置 |
+| 校验 | `shop-app/utils/memberValidate.js` | 手机号、密码 |
+| 登录引导 | `shop-app/utils/apiAuth.js` | `ensureApiToken` → 登录页 |
+| 样式 | `shop-app/styles/auth.scss` | 登录/注册卡片样式 |
+| 我的 | `shop-app/pages/mine/index.vue` | 登录/注册入口、退出 |
+
+> `api/login.js`（`/login`、`/captchaImage`）已 **废弃**，勿再用于 C 端。
+
+---
+
+## 4. 接口封装
+
+**模块：** `shop-app/api/member.js`
+
+| 方法 | HTTP | 路径 | 鉴权 |
+|------|------|------|------|
+| `memberRegister(data)` | POST | `/api/member/register` | 匿名 |
+| `memberLogin(data)` | POST | `/api/member/login` | 匿名 |
+| `getMemberServiceAgreement()` | GET | `/api/member/serviceAgreement` | 匿名 |
+| `getMemberProfile()` | GET | `/api/member/profile` | Token |
+
+### 4.1 注册 Body
+
+| 字段 | 必填 | 前端 |
+|------|:----:|------|
+| mobile | 是 | 11 位手机号校验 |
+| password | 是 | 至少 6 位 |
+| confirmPassword | 是 | 与 password 一致 |
+| memberCode | 否 | 会员名称，空则后端自动生成 |
+| agreementAccepted | 条件 | 协议 `enabled` 时须勾选 |
+
+### 4.2 登录 Body
+
+| 字段 | 必填 | 前端 |
+|------|:----:|------|
+| account | 是 | 手机号或会员名称 |
+| password | 是 | — |
+| agreementAccepted | 条件 | `requireAgreementOnLogin` 为 true 时须勾选 |
+
+**成功 `data`：** `{ token, memberId }`（`memberId` 为系统主键，**不能**当登录账号）。
+
+### 4.3 服务协议 `data` 要点
+
+| 字段 | 用途 |
+|------|------|
+| enabled | 是否展示协议勾选与正文 |
+| registrationOpen | 注册页是否开放 |
+| requireAgreementOnLogin | 登录是否须勾选 |
+| checkboxLabel / content | 勾选文案、弹窗 HTML |
+
+---
+
+## 5. 页面结构
+
+### 5.1 登录 `pages/login/index`
+
+```text
+顶栏品牌区
+└── 卡片
+    ├── 账号（手机号或会员名称）
+    ├── 密码
+    ├── 记住账号（localStorage: shop_login_account）
+    ├── AgreementBlock（协议启用且 requireAgreementOnLogin 时显示）
+    ├── 登录按钮 → memberLogin → fetchUserInfo → switchTab 首页
+    └── 立即注册 → subpackage/account/register
+```
+
+| 规则 | 实现 |
+|------|------|
+| RL3 | 单输入框 `account` |
+| RL4 | 错误文案由后端统一返回，前端 Toast `msg` |
+| RL6 | `needAgreement` 计算属性控制勾选 |
+| 已登录进页 | 有 Token 直接 `switchTab` 首页 |
+
+### 5.2 注册 `subpackage/account/register`
+
+```text
+顶栏「会员注册」
+└── 卡片
+    ├── registrationOpen=false → 展示关闭提示
+    └── 开放时：
+        ├── 手机号、密码、确认密码
+        ├── 会员名称（选填）
+        ├── AgreementBlock（协议 enabled 时）
+        ├── 注册 → 成功 Toast → 带 mobile 跳转登录页
+        └── 去登录
+```
+
+| 规则 | 实现 |
+|------|------|
+| RL1 | **无** 验证码表单项 |
+| RL2 | 前端校验两次密码一致 |
+| 注册关闭 | 展示 `agreement.message` 或默认文案 |
+
+### 5.3 我的 `pages/mine/index`
+
+| 状态 | UI |
+|------|-----|
+| 未登录 | 「登录」「注册会员」 |
+| 已登录 | 昵称/会员名、手机号、`/api/member/profile` 头像、退出 |
+
+---
+
+## 6. 登录态与跳转
+
+```text
+memberLogin 成功
+    → setToken(token)
+    → getMemberProfile() 写入 store
+    → 业务请求带 Authorization
+
+ensureApiToken() 无 Token
+    → Toast「请先登录」
+    → navigateTo PAGE_LOGIN
+
+request 401（需登录接口）
+    → fedLogOut + reLaunch 登录页
+```
+
+**退出：** 仅本地 `fedLogOut`（后端无 C 端 logout 接口）。
+
+---
+
+## 7. 业务规则对照
+
+| 编号 | 前端落实 |
+|------|----------|
+| RL1 | 注册页无验证码 |
+| RL2 | 确认密码前端校验 |
+| RL3 | 登录 `account` 字段 |
+| RL4 | 不区分「用户不存在/密码错误」展示 |
+| RL6 | `AgreementBlock` + 提交前校验 |
+| RL8 | UI 提示「会员名称」；`memberId` 仅展示在资料区（若有） |
+
+---
+
+## 8. 联调检查清单
+
+- [ ] `GET /api/member/serviceAgreement` 返回开关与正文
+- [ ] `POST /api/member/register` 成功 → 登录页预填手机号
+- [ ] `POST /api/member/login` 手机号 / 会员名称均可登录
+- [ ] 协议未勾选时注册/登录被后端拒绝且 Toast 文案正确
+- [ ] 登录后 `GET /api/member/profile` 我的页展示昵称/手机号
+- [ ] 商品详情加购无 Token 跳转登录页
+- [ ] Token 过期 401 跳转登录且本地 Token 清除
+
+---
+
+## 9. 非本期
+
+| 项 | 说明 |
+|----|------|
+| 短信验证码 | 不做 |
+| 忘记密码 / 换绑手机 | 不做 |
+| 资料编辑 / 地址管理 | 另册；接口已存在 `/profile`、`/address/**` |
+| 微信 OAuth | 不做 |
+
+---
+
+## 10. 修订记录
+
+| 版本 | 说明 |
+|------|------|
+| **v1.0** | 首版：会员登录改造、注册分包页、协议组件、我的页入口 |
+
+---
+
+*文档版本：v1.0 · 关联《会员注册登录技术方案.md》v1.2*

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

@@ -298,7 +298,7 @@ MemberAppServiceImpl.login
 | `POST /login`（account：手机号/会员名称） | **已实现** |
 | `BizMemberMapper.selectByMemberCode` | **已实现** |
 | `POST /sms/send` | **保留代码、非本期** |
-| C 端注册/登录 **前端** | **未实现** |
+| C 端注册/登录 **前端** | **已实现**（见《会员注册登录前端技术方案.md》） |
 
 ---
 

shop-app/PAGES.md

@@ -15,6 +15,8 @@ pages/
 
 ```
 subpackage/
+├── account/             # 会员
+│   └── register.vue
 ├── category/            # 分类子页
 │   ├── level1.vue
 │   └── goods-list.vue
@@ -49,5 +51,6 @@ subpackage/
 | `PAGE_HOME` | `/pages/index/index` |
 | `PAGE_GOODS_DETAIL` | `/subpackage/goods/detail` |
 | `PAGE_SEARCH_INDEX` | `/subpackage/search/index` |
+| `PAGE_REGISTER` | `/subpackage/account/register` |
 
 配置详见 `pages.json` 中 `subPackages` 与 `preloadRule`。

shop-app/api/login.js

@@ -1,6 +1,9 @@
+/**
+ * @deprecated C 端会员请使用 @/api/member.js（/api/member/login、/profile）
+ * 本文件保留仅为历史引用，新代码勿再使用 /login、/getInfo、/captchaImage。
+ */
 import request from '@/utils/request'
 
-/** 会员/用户登录 */
 export function login(username, password, code, uuid) {
   return request({
     url: '/login',
@@ -10,7 +13,6 @@ export function login(username, password, code, uuid) {
   })
 }
 
-/** 获取当前登录用户信息 */
 export function getInfo() {
   return request({
     url: '/getInfo',
@@ -18,7 +20,6 @@ export function getInfo() {
   })
 }
 
-/** 退出登录 */
 export function logout() {
   return request({
     url: '/logout',
@@ -26,7 +27,6 @@ export function logout() {
   })
 }
 
-/** 图形验证码 */
 export function getCodeImg() {
   return request({
     url: '/captchaImage',

shop-app/api/member.js

@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+/** 会员注册（匿名） */
+export function memberRegister(data) {
+  return request({
+    url: '/api/member/register',
+    method: 'POST',
+    header: { isToken: false, repeatSubmit: false },
+    data
+  })
+}
+
+/** 会员登录（匿名） */
+export function memberLogin(data) {
+  return request({
+    url: '/api/member/login',
+    method: 'POST',
+    header: { isToken: false, repeatSubmit: false },
+    data
+  })
+}
+
+/** 买家服务协议（注册/登录页初始化） */
+export function getMemberServiceAgreement() {
+  return request({
+    url: '/api/member/serviceAgreement',
+    method: 'GET',
+    header: { isToken: false },
+    silent: true
+  })
+}
+
+/** 会员资料（须登录） */
+export function getMemberProfile() {
+  return request({
+    url: '/api/member/profile',
+    method: 'GET'
+  })
+}

shop-app/components/account/AgreementBlock.vue

@@ -0,0 +1,190 @@
+<template>
+	<view v-if="visible" class="agreement-card">
+		<view class="agreement-card__inner" @click="toggle">
+			<view :class="['agreement-card__box', { 'agreement-card__box--on': modelValue }]">
+				<u-icon v-if="modelValue" name="checkmark" color="#fff" size="12" />
+			</view>
+			<view class="agreement-card__text">
+				<template v-if="useStructured">
+					<text class="agreement-card__plain">我已阅读并同意</text>
+					<text
+						v-if="hasContent"
+						class="agreement-card__link"
+						@click.stop="openPopup"
+					>《{{ agreementTitle }}》</text>
+					<!-- <text v-if="displayVersion" class="agreement-card__ver">{{ displayVersion }}</text> -->
+				</template>
+				<text v-else class="agreement-card__fallback">{{ checkboxLabel }}</text>
+			</view>
+		</view>
+		<!-- <text v-if="hasContent && useStructured" class="agreement-card__action" @click="openPopup">
+			查看全文
+		</text> -->
+
+		<u-popup :show="popupShow" mode="bottom" round="16" @close="popupShow = false">
+			<view class="agreement-popup">
+				<view class="agreement-popup__head">
+					<text class="agreement-popup__title">{{ agreementTitle || '服务协议' }}</text>
+					<u-icon name="close" size="20" @click="popupShow = false" />
+				</view>
+				<scroll-view v-if="popupShow" class="agreement-popup__scroll" scroll-y>
+					<rich-text class="agreement-rich" :nodes="richHtml" />
+				</scroll-view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { prepareRichHtml } from '@/utils/htmlContent'
+
+const props = defineProps({
+	modelValue: { type: Boolean, default: false },
+	checkboxLabel: { type: String, default: '我已阅读并同意相关服务协议' },
+	agreementTitle: { type: String, default: '' },
+	versionLabel: { type: String, default: '' },
+	content: { type: String, default: '' },
+	enabled: { type: Boolean, default: true }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const popupShow = ref(false)
+
+const visible = computed(() => props.enabled)
+const hasContent = computed(() => !!(props.content || '').trim())
+/** 有协议标题时用分行排版，避免整段 checkboxLabel 撑破布局 */
+const useStructured = computed(() => !!(props.agreementTitle || '').trim())
+
+/**
+ * 与商品详情一致用 rich-text 渲染 HTML（平台 Quill 输出）
+ * up-parse 在 Vue3 下内部仍用 this.$set，易出现标签被当纯文本显示
+ */
+const richHtml = computed(() => prepareRichHtml(props.content))
+
+function toggle() {
+	emit('update:modelValue', !props.modelValue)
+}
+
+function openPopup() {
+	if (hasContent.value) {
+		popupShow.value = true
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.agreement-card {
+	margin-top: 24rpx;
+	// padding: 20rpx 24rpx;
+	background: #f5faf6;
+	border: 1rpx solid #e8f5e9;
+	border-radius: 12rpx;
+	box-sizing: border-box;
+}
+
+.agreement-card__inner {
+	display: flex;
+	align-items: flex-start;
+}
+
+.agreement-card__box {
+	width: 36rpx;
+	height: 36rpx;
+	margin-top: 2rpx;
+	margin-right: 16rpx;
+	border: 2rpx solid #a5d6a7;
+	border-radius: 8rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	background: #fff;
+}
+
+.agreement-card__box--on {
+	background: #2e7d32;
+	border-color: #2e7d32;
+}
+
+.agreement-card__text {
+	flex: 1;
+	min-width: 0;
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	line-height: 40rpx;
+}
+
+.agreement-card__plain,
+.agreement-card__ver {
+	font-size: 24rpx;
+	color: #666;
+}
+
+.agreement-card__ver {
+	margin-left: 4rpx;
+}
+
+.agreement-card__link {
+	font-size: 24rpx;
+	color: #2e7d32;
+	font-weight: 500;
+	text-decoration: underline;
+}
+
+.agreement-card__fallback {
+	font-size: 24rpx;
+	color: #666;
+	line-height: 1.6;
+	word-break: break-all;
+	white-space: normal;
+}
+
+.agreement-card__action {
+	display: block;
+	margin-top: 12rpx;
+	margin-left: 52rpx;
+	font-size: 24rpx;
+	color: #43a047;
+}
+
+.agreement-popup {
+	max-height: 70vh;
+	display: flex;
+	flex-direction: column;
+}
+
+.agreement-popup__head {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 28rpx 32rpx;
+	border-bottom: 1rpx solid #eee;
+}
+
+.agreement-popup__title {
+	flex: 1;
+	margin-right: 16rpx;
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
+}
+
+.agreement-popup__scroll {
+	max-height: 60vh;
+	padding: 24rpx 32rpx 48rpx;
+	box-sizing: border-box;
+}
+
+.agreement-rich {
+	display: block;
+	width: 100%;
+	font-size: 28rpx;
+	color: #444;
+	line-height: 1.7;
+	word-break: break-word;
+}
+
+</style>

shop-app/config/index.js

@@ -52,4 +52,7 @@ export function joinApiUrl(path) {
 
 /** 交易市场项目专用，与 ruoyi-ui-app 的 Admin-Token 隔离，避免同端登录态串用 */
 export const TOKEN_KEY = 'shop-Admin-Token'
-export const REMEMBER_USERNAME_KEY = 'shop_login_username'
+/** 登录页「记住账号」（手机号或会员名称） */
+export const REMEMBER_ACCOUNT_KEY = 'shop_login_account'
+/** @deprecated 请用 REMEMBER_ACCOUNT_KEY */
+export const REMEMBER_USERNAME_KEY = REMEMBER_ACCOUNT_KEY

shop-app/pages.json

@@ -42,6 +42,18 @@
 		}
 	],
 	"subPackages": [
+		{
+			"root": "subpackage/account",
+			"name": "pkg-account",
+			"pages": [
+				{
+					"path": "register",
+					"style": {
+						"navigationBarTitleText": "会员注册"
+					}
+				}
+			]
+		},
 		{
 			"root": "subpackage/category",
 			"name": "pkg-category",

shop-app/pages/login/index.vue

@@ -1,422 +1,222 @@
 <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 class="auth-page">
+		<view class="auth-hero">
+			<view class="auth-hero__brand">
+				<text class="auth-hero__app">巴青农资商城</text>
+				<text class="auth-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="auth-body">
+			<view class="auth-card">
+				<text class="auth-card__title">会员登录</text>
+				<text class="auth-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>
+				<view class="auth-field">
+					<view class="auth-field__box">
+						<u-icon name="account" color="#6b7f72" size="22" />
 						<input
-							v-model="form.username"
-							class="login-field__input"
+							v-model="form.account"
+							class="auth-field__input"
 							type="text"
-							placeholder="请输入账号"
-							placeholder-class="login-field__placeholder"
+							placeholder="手机号或会员名称"
+							placeholder-class="auth-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>
+				<view class="auth-field">
+					<view class="auth-field__box">
+						<u-icon name="lock" color="#6b7f72" size="22" />
 						<input
 							v-model="form.password"
-							class="login-field__input"
+							class="auth-field__input"
 							type="password"
 							placeholder="请输入密码"
-							placeholder-class="login-field__placeholder"
+							placeholder-class="auth-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 }]">
+				<view class="auth-remember" @click="form.rememberMe = !form.rememberMe">
+					<view :class="['auth-remember__check', { 'auth-remember__check--on': form.rememberMe }]">
 						<u-icon v-if="form.rememberMe" name="checkmark" color="#ffffff" size="14" />
 					</view>
-					<text class="login-remember__txt">记住账号</text>
+					<text class="auth-remember__txt">记住账号</text>
 				</view>
 
+				<agreement-block
+					v-model="form.agreementAccepted"
+					:enabled="needAgreement"
+					:checkbox-label="agreement.checkboxLabel"
+					:agreement-title="agreement.agreementTitle"
+					:version-label="agreement.versionLabel"
+					:content="agreement.content"
+				/>
+
 				<view
-					:class="['login-btn', { 'login-btn--loading': loading }]"
+					:class="['auth-btn', { 'auth-btn--loading': loading }]"
 					@click="handleLogin"
 				>
-					<text class="login-btn__txt">{{ loading ? '登录中…' : '登 录' }}</text>
+					<text class="auth-btn__txt">{{ loading ? '登录中…' : '登 录' }}</text>
+				</view>
+
+				<view class="auth-switch">
+					<text>还没有账号？</text>
+					<text class="auth-switch__link" @click="goRegister">立即注册</text>
 				</view>
 			</view>
 
-			<text class="login-footer">巴青农资商城 · 消费者端</text>
+			<text class="auth-footer">巴青农资商城</text>
 		</view>
 	</view>
 </template>
 
-<script>
-import { getCodeImg } from '@/api/login'
+<script setup>
+import { ref, reactive, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
 import { getToken } from '@/utils/auth'
+import { REMEMBER_ACCOUNT_KEY } from '@/config'
 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
-				})
-		}
-	}
+import { loadServiceAgreement } from '@/utils/memberAgreement'
+import { PAGE_HOME, PAGE_REGISTER } from '@/utils/pageRoute'
+import AgreementBlock from '@/components/account/AgreementBlock.vue'
+
+const loading = ref(false)
+const agreement = reactive({
+  enabled: false,
+  requireAgreementOnLogin: false,
+  agreementTitle: '',
+  versionLabel: '',
+  content: '',
+  checkboxLabel: ''
+})
+
+const form = reactive({
+  account: '',
+  password: '',
+  rememberMe: false,
+  agreementAccepted: false
+})
+
+const needAgreement = computed(
+  () => agreement.enabled && agreement.requireAgreementOnLogin
+)
+
+onLoad(async (options) => {
+  if (getToken()) {
+    goHome()
+    return
+  }
+  const cfg = await loadServiceAgreement()
+  Object.assign(agreement, cfg)
+  if (options && options.account) {
+    form.account = decodeURIComponent(options.account)
+  }
+  loadRememberedAccount()
+})
+
+function loadRememberedAccount() {
+  const saved =
+    uni.getStorageSync(REMEMBER_ACCOUNT_KEY) || uni.getStorageSync('shop_login_username')
+  if (saved) {
+    form.account = saved
+    form.rememberMe = true
+  }
+}
+
+function goHome() {
+  uni.switchTab({ url: PAGE_HOME })
+}
+
+function goRegister() {
+  const q = form.account ? `?mobile=${encodeURIComponent(form.account.trim())}` : ''
+  uni.navigateTo({ url: `${PAGE_REGISTER}${q}` })
+}
+
+function validateForm() {
+  if (!(form.account || '').trim()) {
+    uni.showToast({ title: '请输入账号', icon: 'none' })
+    return false
+  }
+  if (!form.password) {
+    uni.showToast({ title: '请输入密码', icon: 'none' })
+    return false
+  }
+  if (needAgreement.value && !form.agreementAccepted) {
+    uni.showToast({ title: '请先阅读并同意服务协议', icon: 'none' })
+    return false
+  }
+  return true
+}
+
+function handleLogin() {
+  if (!validateForm() || loading.value) {
+    return
+  }
+  const account = form.account.trim()
+  if (form.rememberMe) {
+    uni.setStorageSync(REMEMBER_ACCOUNT_KEY, account)
+  } else {
+    uni.removeStorageSync(REMEMBER_ACCOUNT_KEY)
+  }
+  loading.value = true
+  const userStore = useUserStore()
+  userStore.fedLogOut()
+  userStore
+    .login({
+      account,
+      password: form.password,
+      agreementAccepted: needAgreement.value ? form.agreementAccepted : true
+    })
+    .then(() => userStore.fetchUserInfo())
+    .then(() => goHome())
+    .catch(() => {})
+    .finally(() => {
+      loading.value = 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;
-}
+@import '@/styles/auth.scss';
 
-.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 {
+.auth-remember {
 	display: flex;
-	flex-direction: row;
 	align-items: center;
-	gap: 16rpx;
+	margin-top: 8rpx;
 }
 
-.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);
+.auth-remember__check {
+	width: 32rpx;
+	height: 32rpx;
+	margin-right: 12rpx;
+	border: 2rpx solid #c8e6c9;
+	border-radius: 6rpx;
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	background: #fff;
 }
 
-.login-btn--loading {
-	opacity: 0.75;
+.auth-remember__check--on {
+	background: #2e7d32;
+	border-color: #2e7d32;
 }
 
-.login-btn__txt {
-	font-size: 32rpx;
-	font-weight: 600;
-	color: #ffffff;
-	letter-spacing: 4rpx;
+.auth-remember__txt {
+	font-size: 26rpx;
+	color: #666;
 }
 
-.login-footer {
+.auth-footer {
 	display: block;
-	margin-top: 40rpx;
+	margin-top: 48rpx;
 	text-align: center;
 	font-size: 24rpx;
-	color: $morandi-text-soft;
-	line-height: 1.5;
+	color: #aaa;
 }
 </style>

shop-app/pages/mine/index.vue

@@ -1,105 +1,165 @@
 <template>
 	<view class="page">
-		<view v-if="loggedIn" class="user-box">
-			<text class="user-name">{{ displayName }}</text>
+		<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>
+			</view>
 			<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>
+			<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>
 	</view>
 </template>
 
-<script>
+<script setup>
+import { ref } 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'
 
-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() || '会员'
+const loggedIn = ref(false)
+const displayName = ref('会员')
+const mobileText = ref('')
+const memberCodeText = ref('')
+const avatarUrl = ref('/static/logo.png')
+
+const userStore = useUserStore()
+
+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'
+		})
+	}
+})
+
+function goLogin() {
+	uni.navigateTo({ url: PAGE_LOGIN })
+}
+
+function goRegister() {
+	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' })
 				})
 			}
 		}
-	},
-	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>
-	.page {
-		min-height: 100vh;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background-color: #f5f5f5;
-	}
-	.tip {
-		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;
-	}
+.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;
+}
+.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;
+}
 </style>

shop-app/store/user.js

@@ -1,16 +1,16 @@
 import { reactive } from 'vue'
-import { login as loginApi, logout as logoutApi, getInfo } from '@/api/login'
+import { memberLogin, getMemberProfile } from '@/api/member'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { joinApiUrl } from '@/config'
 
 const state = reactive({
   token: getToken(),
-  id: '',
+  memberId: '',
   name: '',
   nickName: '',
+  mobile: '',
   avatar: '',
-  roles: [],
-  permissions: []
+  memberCode: ''
 })
 
 function isHttp(url) {
@@ -24,70 +24,56 @@ function resolveAvatar(path) {
 }
 
 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)
+  /** 会员登录：account = 手机号或会员名称 */
+  const login = (payload) => {
+    const account = (payload.account || payload.username || '').trim()
+    const password = payload.password
+    const agreementAccepted = !!payload.agreementAccepted
+    return memberLogin({ account, password, agreementAccepted }).then((res) => {
+      const data = res.data || {}
+      const token = data.token
       if (!token) {
         return Promise.reject(new Error('登录失败，未返回令牌'))
       }
       setToken(token)
       state.token = token
+      state.memberId = data.memberId || ''
       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 getMemberProfile().then((res) => {
+      const m = res.data || {}
+      state.memberId = m.memberId
+      state.memberCode = m.memberCode || ''
+      state.name = m.memberCode || ''
+      state.nickName = m.nickName || ''
+      state.mobile = m.mobile || ''
+      state.avatar = resolveAvatar(m.avatar)
       return res
     })
   }
 
+  /** 本地退出（C 端会员暂无 logout 接口） */
   const logOut = () => {
-    return logoutApi()
-      .catch(() => {})
-      .finally(() => {
-        state.token = ''
-        state.roles = []
-        state.permissions = []
-        state.id = ''
-        state.name = ''
-        state.nickName = ''
-        state.avatar = ''
-        removeToken()
-      })
+    return fedLogOut()
   }
 
   const fedLogOut = () => {
     state.token = ''
-    state.roles = []
-    state.permissions = []
-    state.id = ''
+    state.memberId = ''
     state.name = ''
     state.nickName = ''
+    state.mobile = ''
     state.avatar = ''
+    state.memberCode = ''
     removeToken()
     return Promise.resolve()
   }
 
-  const displayName = () => state.nickName || state.name || ''
+  const displayName = () => state.nickName || state.memberCode || state.mobile || '会员'
 
   const isLoggedIn = () => !!state.token
 

shop-app/styles/auth.scss

@@ -0,0 +1,120 @@
+@import '@/styles/morandi.scss';
+
+.auth-page {
+	min-height: 100%;
+	display: flex;
+	flex-direction: column;
+	background: $morandi-bg-page;
+}
+
+.auth-hero {
+	flex-shrink: 0;
+	min-height: 320rpx;
+	padding: 80rpx 48rpx 100rpx;
+	background: linear-gradient(145deg, #3d9b6e 0%, #22c55e 42%, #86efac 100%);
+}
+
+.auth-hero__app {
+	display: block;
+	font-size: 40rpx;
+	font-weight: 700;
+	color: #fff;
+}
+
+.auth-hero__welcome {
+	display: block;
+	margin-top: 12rpx;
+	font-size: 28rpx;
+	color: rgba(255, 255, 255, 0.9);
+}
+
+.auth-body {
+	flex: 1;
+	margin-top: -60rpx;
+	padding: 0 32rpx 48rpx;
+}
+
+.auth-card {
+	padding: 40rpx 32rpx 32rpx;
+	background: #fff;
+	border-radius: 24rpx;
+	box-shadow: 0 8rpx 32rpx rgba(46, 125, 50, 0.08);
+}
+
+.auth-card__title {
+	font-size: 36rpx;
+	font-weight: 600;
+	color: #333;
+}
+
+.auth-card__sub {
+	display: block;
+	margin-top: 8rpx;
+	margin-bottom: 32rpx;
+	font-size: 24rpx;
+	color: #999;
+}
+
+.auth-closed {
+	padding: 48rpx 0;
+	text-align: center;
+	font-size: 28rpx;
+	color: #999;
+}
+
+.auth-field {
+	margin-bottom: 24rpx;
+}
+
+.auth-field__box {
+	display: flex;
+	align-items: center;
+	height: 88rpx;
+	padding: 0 24rpx;
+	background: #f5faf6;
+	border: 1rpx solid #e0e0e0;
+	border-radius: 16rpx;
+}
+
+.auth-field__input {
+	flex: 1;
+	margin-left: 16rpx;
+	font-size: 28rpx;
+	color: #333;
+}
+
+.auth-field__placeholder {
+	color: #bbb;
+}
+
+.auth-btn {
+	margin-top: 32rpx;
+	height: 88rpx;
+	line-height: 88rpx;
+	text-align: center;
+	background: linear-gradient(135deg, #43a047 0%, #2e7d32 100%);
+	border-radius: 44rpx;
+}
+
+.auth-btn--loading {
+	opacity: 0.7;
+}
+
+.auth-btn__txt {
+	font-size: 32rpx;
+	color: #fff;
+	font-weight: 500;
+	letter-spacing: 4rpx;
+}
+
+.auth-switch {
+	margin-top: 32rpx;
+	text-align: center;
+	font-size: 26rpx;
+	color: #999;
+}
+
+.auth-switch__link {
+	margin-left: 8rpx;
+	color: #2e7d32;
+}

shop-app/subpackage/account/register.vue

@@ -0,0 +1,190 @@
+<template>
+	<view class="auth-page">
+		<view class="auth-hero">
+			<view class="auth-hero__brand">
+				<text class="auth-hero__app">巴青农资商城</text>
+				<text class="auth-hero__welcome">会员注册</text>
+			</view>
+		</view>
+
+		<view class="auth-body">
+			<view class="auth-card">
+				<text class="auth-card__title">手机号注册</text>
+				<text class="auth-card__sub">无需短信验证码，设置密码即可注册</text>
+
+				<view v-if="!agreement.registrationOpen" class="auth-closed">
+					<text>{{ agreement.message || '会员注册暂未开放' }}</text>
+				</view>
+
+				<template v-else>
+					<view class="auth-field">
+						<view class="auth-field__box">
+							<u-icon name="phone" color="#6b7f72" size="22" />
+							<input
+								v-model="form.mobile"
+								class="auth-field__input"
+								type="number"
+								maxlength="11"
+								placeholder="请输入手机号"
+								placeholder-class="auth-field__placeholder"
+							/>
+						</view>
+					</view>
+
+					<view class="auth-field">
+						<view class="auth-field__box">
+							<u-icon name="lock" color="#6b7f72" size="22" />
+							<input
+								v-model="form.password"
+								class="auth-field__input"
+								type="password"
+								placeholder="请设置登录密码（至少6位）"
+								placeholder-class="auth-field__placeholder"
+							/>
+						</view>
+					</view>
+
+					<view class="auth-field">
+						<view class="auth-field__box">
+							<u-icon name="lock-fill" color="#6b7f72" size="22" />
+							<input
+								v-model="form.confirmPassword"
+								class="auth-field__input"
+								type="password"
+								placeholder="请再次输入密码"
+								placeholder-class="auth-field__placeholder"
+							/>
+						</view>
+					</view>
+
+					<view class="auth-field">
+						<view class="auth-field__box">
+							<u-icon name="account" color="#6b7f72" size="22" />
+							<input
+								v-model="form.memberCode"
+								class="auth-field__input"
+								type="text"
+								placeholder="会员名称（选填，不填则自动生成）"
+								placeholder-class="auth-field__placeholder"
+							/>
+						</view>
+					</view>
+
+					<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
+						:class="['auth-btn', { 'auth-btn--loading': loading }]"
+						@click="handleRegister"
+					>
+						<text class="auth-btn__txt">{{ loading ? '提交中…' : '注 册' }}</text>
+					</view>
+				</template>
+
+				<view class="auth-switch">
+					<text>已有账号？</text>
+					<text class="auth-switch__link" @click="goLogin">去登录</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { memberRegister } from '@/api/member'
+import { loadServiceAgreement } from '@/utils/memberAgreement'
+import { validateMobile, validatePassword } from '@/utils/memberValidate'
+import { PAGE_LOGIN } from '@/utils/pageRoute'
+import AgreementBlock from '@/components/account/AgreementBlock.vue'
+
+const loading = ref(false)
+const agreement = reactive({
+  enabled: false,
+  registrationOpen: true,
+  requireAgreementOnLogin: false,
+  message: '',
+  agreementTitle: '',
+  versionLabel: '',
+  content: '',
+  checkboxLabel: ''
+})
+
+const form = reactive({
+  mobile: '',
+  password: '',
+  confirmPassword: '',
+  memberCode: '',
+  agreementAccepted: false
+})
+
+onLoad(async (options) => {
+  const cfg = await loadServiceAgreement()
+  Object.assign(agreement, cfg)
+  if (options && options.mobile) {
+    form.mobile = decodeURIComponent(options.mobile)
+  }
+})
+
+function goLogin() {
+  const q = form.mobile ? `?account=${encodeURIComponent(form.mobile.trim())}` : ''
+  uni.navigateTo({ url: `${PAGE_LOGIN}${q}` })
+}
+
+function validateForm() {
+  const mobileMsg = validateMobile(form.mobile)
+  if (mobileMsg) {
+    uni.showToast({ title: mobileMsg, icon: 'none' })
+    return false
+  }
+  const pwdMsg = validatePassword(form.password)
+  if (pwdMsg) {
+    uni.showToast({ title: pwdMsg, icon: 'none' })
+    return false
+  }
+  if (form.password !== form.confirmPassword) {
+    uni.showToast({ title: '两次输入的密码不一致', icon: 'none' })
+    return false
+  }
+  if (agreement.enabled && !form.agreementAccepted) {
+    uni.showToast({ title: '请先阅读并同意服务协议', icon: 'none' })
+    return false
+  }
+  return true
+}
+
+function handleRegister() {
+  if (!agreement.registrationOpen || loading.value || !validateForm()) {
+    return
+  }
+  loading.value = true
+  memberRegister({
+    mobile: form.mobile.trim(),
+    password: form.password,
+    confirmPassword: form.confirmPassword,
+    memberCode: (form.memberCode || '').trim() || undefined,
+    agreementAccepted: agreement.enabled ? form.agreementAccepted : true
+  })
+    .then(() => {
+      uni.showToast({ title: '注册成功，请登录', icon: 'none', duration: 2000 })
+      setTimeout(() => {
+        goLogin()
+      }, 1500)
+    })
+    .catch(() => {})
+    .finally(() => {
+      loading.value = false
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/styles/auth.scss';
+</style>

shop-app/subpackage/search/index.vue

@@ -2,7 +2,7 @@
 	<view class="page-search">
 		<view class="search-header">
 			<view class="search-header__bar">
-				<u-icon name="arrow-left" size="20" color="#333" @click="onBack" />
+				<!-- <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
@@ -58,7 +58,7 @@ import {
   removeSearchHistoryItem,
   clearSearchHistory
 } from '@/utils/searchHistory'
-import { goSearchResult } from '@/utils/searchNav'
+import { goSearchResult, navigateBackFromSearchIndex } from '@/utils/searchNav'
 
 const placeholder = SEARCH_PLACEHOLDER
 const keyword = ref('')
@@ -70,7 +70,7 @@ function refreshHistory() {
 }
 
 function onBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
+  navigateBackFromSearchIndex()
 }
 
 function submitSearch() {

shop-app/subpackage/search/result.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-result">
 		<view class="result-header" @click="onReSearch">
-			<u-icon name="arrow-left" size="20" color="#333" @click.stop="onBack" />
+			<!-- <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>
@@ -277,14 +277,15 @@ onLoad((options) => {
 .page-result {
 	display: flex;
 	flex-direction: column;
-	min-height: 100vh;
+	height: calc(100vh - 100rpx);
 	background: #f5f6f8;
 }
 .result-header {
 	display: flex;
 	align-items: center;
 	padding: 16rpx 24rpx;
-	background: #fff;
+	background: #e8f5e9;
+	border-bottom: 1rpx solid #c8e6c9;
 }
 .result-header__keyword {
 	flex: 1;
@@ -293,7 +294,8 @@ onLoad((options) => {
 	height: 64rpx;
 	margin-left: 16rpx;
 	padding: 0 20rpx;
-	background: #f5f6f8;
+	background: #fff;
+	border: 1rpx solid #a5d6a7;
 	border-radius: 32rpx;
 }
 .result-header__text {
@@ -306,6 +308,8 @@ onLoad((options) => {
 }
 .result-scroll {
 	flex: 1;
+  box-sizing: border-box;
+  padding: 10rpx;
 }
 .result-loading {
 	padding: 80rpx 0;

shop-app/utils/apiAuth.js

@@ -1,6 +1,8 @@
 import { getToken } from '@/utils/auth'
 
-const LOGIN_URL = '/pages/login/index'
+import { PAGE_LOGIN } from '@/utils/pageRoute'
+
+const LOGIN_URL = PAGE_LOGIN
 
 /** 避免连续触发多次跳转登录页 */
 let loginRedirecting = false

shop-app/utils/htmlContent.js

@@ -0,0 +1,58 @@
+import { resolveFileUrl } from '@/utils/image'
+
+/**
+ * 解码常见 HTML 实体（后台若存了 <p> 会原样显示标签）
+ */
+export function decodeHtmlEntities(html) {
+  if (!html || typeof html !== 'string') {
+    return ''
+  }
+  let s = html
+  if (!/&(?:lt|gt|amp|quot|nbsp|#)/i.test(s)) {
+    return s
+  }
+  s = s.replace(/ /gi, '\u00A0')
+  s = s.replace(/&lt;/gi, '<')
+  s = s.replace(/&gt;/gi, '>')
+  s = s.replace(/&amp;/gi, '&')
+  s = s.replace(/&quot;/gi, '"')
+  s = s.replace(/&#39;/g, "'")
+  s = s.replace(/&#(\d+);/g, (_, code) => {
+    const n = Number(code)
+    return Number.isNaN(n) ? '' : String.fromCharCode(n)
+  })
+  s = s.replace(/&#x([0-9a-f]+);/gi, (_, hex) => {
+    const n = parseInt(hex, 16)
+    return Number.isNaN(n) ? '' : String.fromCharCode(n)
+  })
+  return s
+}
+
+/** 富文本 img 相对路径转完整 URL */
+export function fixHtmlImageSrc(html) {
+  if (!html) return ''
+  return html.replace(/src=(["'])([^"']+)\1/gi, (match, quote, src) => {
+    const full = resolveFileUrl(src)
+    return full ? `src=${quote}${full}${quote}` : match
+  })
+}
+
+/** 去掉 Quill 常见空段落，避免占高度 */
+export function trimEmptyParagraphs(html) {
+  if (!html) return ''
+  return html
+    .replace(/<p>(\s|&nbsp;|<br\s*\/?>)*<\/p>/gi, '')
+    .replace(/<p><\/p>/gi, '')
+}
+
+/**
+ * 协议/商品详情等富文本统一预处理（供 rich-text :nodes 使用）
+ */
+export function prepareRichHtml(html) {
+  let s = (html || '').trim()
+  if (!s) return ''
+  s = decodeHtmlEntities(s)
+  s = fixHtmlImageSrc(s)
+  s = trimEmptyParagraphs(s)
+  return s
+}

shop-app/utils/memberAgreement.js

@@ -0,0 +1,32 @@
+import { getMemberServiceAgreement } from '@/api/member'
+
+const defaultAgreement = () => ({
+  enabled: false,
+  registrationOpen: true,
+  requireAgreementOnLogin: false,
+  message: '',
+  agreementTitle: '',
+  versionLabel: '',
+  content: '',
+  checkboxLabel: '我已阅读并同意相关服务协议'
+})
+
+/** 拉取服务协议配置（注册/登录页共用） */
+export async function loadServiceAgreement() {
+  try {
+    const res = await getMemberServiceAgreement()
+    const data = res.data || {}
+    return {
+      enabled: !!data.enabled,
+      registrationOpen: data.registrationOpen !== false,
+      requireAgreementOnLogin: !!data.requireAgreementOnLogin,
+      message: data.message || '',
+      agreementTitle: data.agreementTitle || '',
+      versionLabel: data.versionLabel || '',
+      content: data.content || '',
+      checkboxLabel: data.checkboxLabel || defaultAgreement().checkboxLabel
+    }
+  } catch (e) {
+    return defaultAgreement()
+  }
+}

shop-app/utils/memberValidate.js

@@ -0,0 +1,27 @@
+/** 大陆 11 位手机号 */
+export const MOBILE_REG = /^1\d{10}$/
+
+export function isMobile(value) {
+  return MOBILE_REG.test(String(value || '').trim())
+}
+
+export function validateMobile(mobile) {
+  const text = (mobile || '').trim()
+  if (!text) {
+    return '请输入手机号'
+  }
+  if (!isMobile(text)) {
+    return '请输入正确的手机号'
+  }
+  return ''
+}
+
+export function validatePassword(password, label = '密码') {
+  if (!password) {
+    return `请输入${label}`
+  }
+  if (password.length < 6) {
+    return `${label}至少 6 位`
+  }
+  return ''
+}

shop-app/utils/pageRoute.js

@@ -19,6 +19,10 @@ export const PAGE_MINE = '/pages/mine/index'
 /** 登录 */
 export const PAGE_LOGIN = '/pages/login/index'
 
+// —— 分包：会员账号 ——
+
+export const PAGE_REGISTER = '/subpackage/account/register'
+
 // —— 分包：分类 ——
 
 export const PAGE_CATEGORY_LEVEL1 = '/subpackage/category/level1'

shop-app/utils/request.js

@@ -7,7 +7,9 @@ import { useUserStore } from '@/store/user'
 export const isRelogin = { show: false }
 
 const SESSION_EXPIRED_MSG = '登录过期，即将登录'
-const LOGIN_PAGE_URL = '/pages/login/index'
+import { PAGE_LOGIN } from '@/utils/pageRoute'
+
+const LOGIN_PAGE_URL = PAGE_LOGIN
 const LOGIN_REDIRECT_DELAY_MS = 400
 
 /** 与 ruoyi-ui tansParams 一致：null / undefined / 空字符串不参与序列化 */

shop-app/utils/searchNav.js

@@ -1,11 +1,38 @@
 import { PAGE_SEARCH_INDEX, PAGE_SEARCH_RESULT } from '@/utils/pageRoute'
 
+/** 当前页路由（如 subpackage/search/result） */
+function getCurrentRoute() {
+  const pages = getCurrentPages()
+  const page = pages[pages.length - 1]
+  return (page && page.route) || ''
+}
+
+function isSearchResultRoute(route) {
+  return route.includes('search/result')
+}
+
+function isSearchIndexRoute(route) {
+  return route.includes('search/index')
+}
+
 /** 跳转搜索输入页 A */
 export function goSearchInput(keyword) {
   const text = (keyword || '').trim()
   const url = text
     ? `${PAGE_SEARCH_INDEX}?keyword=${encodeURIComponent(text)}`
     : PAGE_SEARCH_INDEX
+
+  const route = getCurrentRoute()
+  // 从结果页「重新搜索」：替换当前页，避免栈变成 result → index 导致返回循环
+  if (isSearchResultRoute(route)) {
+    uni.redirectTo({ url })
+    return
+  }
+  // 已在输入页：仅刷新当前页参数
+  if (isSearchIndexRoute(route)) {
+    uni.redirectTo({ url })
+    return
+  }
   uni.navigateTo({ url })
 }
 
@@ -13,7 +40,31 @@ export function goSearchInput(keyword) {
 export function goSearchResult(keyword) {
   const text = (keyword || '').trim()
   if (!text) return
-  uni.navigateTo({
-    url: `${PAGE_SEARCH_RESULT}?keyword=${encodeURIComponent(text)}`
+  const url = `${PAGE_SEARCH_RESULT}?keyword=${encodeURIComponent(text)}`
+
+  const route = getCurrentRoute()
+  // 已在结果页：改关键词时用替换，不叠一层
+  if (isSearchResultRoute(route)) {
+    uni.redirectTo({ url })
+    return
+  }
+  uni.navigateTo({ url })
+}
+
+/** 输入页返回：若栈里下层仍是结果页，多退一层，防止 index ↔ result 循环 */
+export function navigateBackFromSearchIndex() {
+  const pages = getCurrentPages()
+  if (pages.length >= 2) {
+    const prev = pages[pages.length - 2]
+    const prevRoute = (prev && prev.route) || ''
+    if (isSearchResultRoute(prevRoute)) {
+      uni.navigateBack({ delta: 2 })
+      return
+    }
+  }
+  uni.navigateBack({
+    fail: () => {
+      uni.switchTab({ url: '/pages/index/index' })
+    }
   })
 }