79 Commits

Author SHA1 Message Date
luo
e084cdeb90 fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m14s
2026-10-26 15:00:05 +08:00
luo
b5f89b744c ci: switch production deployment to iteration/october
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m3s
2026-10-26 14:29:18 +08:00
luo
33f3b37be0 fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 12m12s
2026-10-26 14:24:59 +08:00
luo
f7cb28febf fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m16s
2026-10-14 13:40:55 +08:00
luo
131823ca12 fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 3m40s
2026-10-14 11:04:41 +08:00
luo
a7b1156ac1 fix: some 2026-10-14 09:56:09 +08:00
luo
d672dec0d0 fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m16s
2026-10-14 09:12:34 +08:00
luo
697ff9c33c fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m16s
2026-10-13 18:02:13 +08:00
luo
97dec4dc65 fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m14s
2026-10-13 16:11:02 +08:00
luo
da95a914e3 fix: some
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m59s
2026-10-13 14:53:19 +08:00
luo
77b0e25011 fix: 缓存并显示新手机号
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m23s
2026-09-28 16:30:29 +08:00
luo
dc53295e2c fix: button
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m28s
2026-09-24 14:47:29 +08:00
luo
65f997cbc3 fix: 首页弹窗收货信息优化
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m23s
2026-09-24 11:09:46 +08:00
luo
e82b0ab5da fix:微信支付
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 4m41s
2026-09-23 09:32:48 +08:00
luo
a81b403cce fix: 手机绑定状态
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m24s
2026-09-20 16:19:48 +08:00
luo
c0cc1ae6dd fix: notices
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 9m57s
2026-09-20 10:13:10 +08:00
luo
8bd9de15cd feat: new 2026-09-16 16:32:08 +08:00
luo
6a1543f9f6 feat: 套餐分层级 2026-09-08 16:12:45 +08:00
luo
010b941d0e fix: 登录兼容联通19位 2026-09-08 14:38:44 +08:00
luo
a25ea5954c Revert "feat: 套餐加油包变子"
This reverts commit 8b6ce505b5.
2026-09-08 10:53:00 +08:00
luo
8b6ce505b5 feat: 套餐加油包变子 2026-09-08 09:56:16 +08:00
luo
484a807dce fix: 修复扫码二维码进入同一个设备 2026-09-03 16:40:11 +08:00
luo
6845e97b14 merge develop into main 2026-08-24 09:27:35 +08:00
luo
d3d606b1a7 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m14s
2026-08-13 16:05:14 +08:00
luo
dfc7472ad9 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m11s
2026-08-13 15:54:06 +08:00
luo
515e7e22c8 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m11s
2026-08-13 15:39:00 +08:00
luo
84af596a65 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m16s
2026-08-13 15:25:07 +08:00
luo
e1498cb5a6 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m17s
2026-08-13 14:51:44 +08:00
luo
42d94ce290 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m14s
2026-08-13 14:22:41 +08:00
luo
c22cae9c38 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m8s
2026-08-13 12:26:21 +08:00
luo
a3fe025a88 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m10s
2026-08-13 12:16:50 +08:00
luo
61672a4d51 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m11s
2026-08-13 12:06:13 +08:00
luo
ac45a08373 feat: 通知弹窗新增立即续费按钮
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m35s
2026-08-12 11:05:21 +08:00
luo
1e649e9835 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m8s
2026-08-05 16:53:05 +08:00
luo
1451cc83ff fix: ICCID
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m12s
2026-08-05 16:44:02 +08:00
luo
9f07f9d0ef fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m10s
2026-08-05 15:23:58 +08:00
luo
1891ea1e0d fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m10s
2026-08-05 15:09:47 +08:00
luo
bf0a38c763 fix: 认证策略是先充值后实名, 首页入口
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 2m49s
2026-08-05 14:53:07 +08:00
luo
9f70a7e395 fix: 更换图标
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m3s
2026-08-05 14:24:43 +08:00
luo
d05a47ffe2 fix: 认证策略是先充值后实名, 首页入口
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m11s
2026-08-05 12:02:25 +08:00
luo
f9d8a107a4 fix: 认证策略是先充值后实名, 首页入口
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m14s
2026-08-05 10:51:23 +08:00
luo
e4278d3883 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m12s
2026-07-31 09:58:39 +08:00
luo
819d5dc2f5 fix:套餐列表
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m12s
2026-07-30 16:20:20 +08:00
luo
4c10d1f9fa fix: 跳转手机号
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m8s
2026-07-30 15:59:55 +08:00
luo
7de5efedfd fix:ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m14s
2026-07-30 15:50:04 +08:00
luo
5f8ff768e6 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m9s
2026-07-30 15:41:11 +08:00
luo
d0f032aa1c fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m8s
2026-07-30 15:01:54 +08:00
luo
c45227ba7e fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m10s
2026-07-30 14:49:39 +08:00
luo
7ecb4709c8 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m10s
2026-07-30 14:35:40 +08:00
luo
49175f8a73 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m2s
2026-07-30 14:22:20 +08:00
luo
5cc6d4349e fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m1s
2026-07-30 14:08:21 +08:00
luo
2866b889bb fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m0s
2026-07-30 13:41:32 +08:00
luo
59dde650a2 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m2s
2026-07-30 13:31:47 +08:00
luo
9d0727ad8b fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 59s
2026-07-30 13:24:57 +08:00
luo
8f1a731b2b fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m1s
2026-07-30 13:16:48 +08:00
luo
39bc9f506d fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 59s
2026-07-30 13:06:02 +08:00
luo
0bae5233b3 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m5s
2026-07-30 12:59:32 +08:00
luo
502b2723db fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m0s
2026-07-30 12:49:14 +08:00
luo
2fb95b3257 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 58s
2026-07-30 12:36:46 +08:00
luo
dfa68a6a79 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m2s
2026-07-30 12:30:50 +08:00
luo
8027916e7a fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 57s
2026-07-30 12:17:32 +08:00
luo
8ef94125b9 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m8s
2026-07-30 11:42:52 +08:00
luo
e7a7b30bc8 fix: ui
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m1s
2026-07-30 11:35:56 +08:00
luo
863a34f74c fix: 只要任意一张实名了就可以不强制跳
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 56s
2026-07-29 17:49:25 +08:00
luo
b95daedba6 fix: icons和布局
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m1s
2026-07-29 17:29:55 +08:00
luo
7136655f48 fix: 布局
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 57s
2026-07-29 16:53:19 +08:00
luo
b5e4a1259b fix: 图标
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 54s
2026-07-29 16:32:13 +08:00
luo
2166241cdb fix: icons和布局
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 55s
2026-07-29 16:26:32 +08:00
luo
6c3cf15165 fix: 只要任意一张实名了就可以不强制跳
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 59s
2026-07-29 15:48:22 +08:00
luo
34ca1c5eca fix: 立即续费不跳转
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 59s
2026-07-28 16:02:40 +08:00
luo
64bccffe28 fix: 立即续费
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m16s
2026-07-28 14:47:34 +08:00
luo
4f281da778 feat: 7月迭代
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m11s
2026-07-27 18:13:19 +08:00
luo
6a794d88af feat: 新增文档
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m2s
2026-07-27 16:21:34 +08:00
luo
861ffa371b feat: 站内通知
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 54s
2026-07-25 11:28:58 +08:00
luo
f6a33121f2 feat: 站内通知
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 59s
2026-07-25 11:22:16 +08:00
luo
133a4d18ef feat: 站内通知
Some checks failed
构建并部署前端到生产环境 / build-and-deploy (push) Has been cancelled
2026-07-25 11:21:42 +08:00
luo
9c1c296d2e feat: 站内通知
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m29s
2026-07-25 11:08:03 +08:00
luo
3929156ef4 fix: git-config
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 1m45s
2026-07-24 12:16:04 +08:00
luo
ad3c9b964d fix: git-config 2026-07-24 12:11:03 +08:00
136 changed files with 12381 additions and 1102 deletions

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
*.html linguist-detectable=false
*.vue linguist-detectable=true

View File

@@ -3,7 +3,7 @@ name: 构建并部署前端到生产环境
on:
push:
branches:
- main
- iteration/october
- dev
- test
@@ -28,7 +28,7 @@ jobs:
- name: 设置镜像标签
id: tag
run: |
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
if [ "${{ github.ref }}" = "refs/heads/iteration/october" ]; then
echo "tag=latest" >> $GITHUB_OUTPUT
elif [ "${{ github.ref }}" = "refs/heads/dev" ]; then
echo "tag=dev" >> $GITHUB_OUTPUT
@@ -52,8 +52,8 @@ jobs:
docker push ${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.tag }}
docker push ${{ env.IMAGE_NAME }}:${{ github.sha }}
- name: 部署到本地(仅 main 分支)
if: github.ref == 'refs/heads/main'
- name: 部署到本地(仅 iteration/october 分支)
if: github.ref == 'refs/heads/iteration/october'
run: |
mkdir -p ${{ env.DEPLOY_DIR }}

15
.gitignore vendored
View File

@@ -2,9 +2,22 @@
logs
*.log
npm-debug.log*
npminstall-debug.log
yarn-debug.log*
yarn-error.log*
# Common local files
dist-ssr
*.local
.cursorrules
.claude
.codex
.env.development
.env.production
.scratch
.agents
Thumbs.db
# Runtime data
pids
*.pid
@@ -91,4 +104,4 @@ dist/
# OS
.DS_Store
Thumbs.db
Thumbs.db

41
App.vue
View File

@@ -7,13 +7,18 @@
<style lang="scss">
:root {
/* 主色 */
--primary: #0A84FF;
--primary-light: #5AC8FA;
--primary-dark: #0066CC;
--primary: #55ab5c;
--primary-light: #8bc98f;
--primary-dark: #3f8f47;
--up-primary: #55ab5c;
--up-primary-light: #eaf6ec;
--up-primary-dark: #3f8f47;
/* 辅助色 */
--success: #30D158;
--success-light: rgba(48, 209, 88, 0.12);
--success: #55ab5c;
--success-light: rgba(85, 171, 92, 0.12);
--up-success: #55ab5c;
--up-success-light: #eaf6ec;
--warning: #FF9F0A;
--warning-light: rgba(255, 159, 10, 0.12);
--danger: #FF453A;
@@ -235,7 +240,7 @@
}
&.tag-primary {
background: rgba(10, 132, 255, 0.12);
background: rgba(85, 171, 92, 0.12);
color: var(--primary);
}
@@ -289,7 +294,7 @@
}
&.btn-success {
background: var(--success);
background: var(--primary);
color: var(--text-inverse);
}
@@ -328,6 +333,28 @@
}
}
.copy-button {
display: inline-flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
min-height: 40rpx;
margin: 0;
padding: 0 14rpx;
border: 1px solid var(--border-light);
border-radius: 20rpx;
background: var(--gray-100);
color: var(--primary);
font-size: 22rpx;
font-weight: 500;
line-height: 1;
white-space: nowrap;
cursor: pointer;
-webkit-tap-highlight-color: transparent;
&::after { border: none; }
}
.btn-group {
display: flex;
gap: 12rpx;

View File

@@ -9,14 +9,17 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
# 设置工作目录
WORKDIR /build
# 设置 npm 镜像源
RUN npm config set registry https://registry.npmmirror.com
# 安装 pnpm
RUN corepack enable && corepack prepare pnpm@10.15.0 --activate
# 复制 package.json(利用 Docker 缓存)
COPY package.json ./
# 设置 pnpm 镜像源
RUN pnpm config set registry https://registry.npmmirror.com
# 复制 package.json 和 pnpm-lock.yaml(利用 Docker 缓存)
COPY package.json pnpm-lock.yaml ./
# 安装所有依赖
RUN npm install --legacy-peer-deps
RUN pnpm install --frozen-lockfile
# 安装 git (用于获取 commit 信息)
RUN apk add --no-cache git
@@ -24,21 +27,18 @@ RUN apk add --no-cache git
# 复制源代码
COPY . .
# 列出文件确认复制成功
RUN ls -la
# 创建 src 目录软链接 (兼容 uni-app 新版本)
RUN mkdir -p src && \
ln -sf /build/manifest.json /build/src/manifest.json && \
ln -sf /build/pages.json /build/src/pages.json
# 构建 H5 生产版本
RUN npm run build:h5
RUN pnpm run build:h5
# ================================
# 阶段 2: 运行阶段
# ================================
FROM --platform=linux/amd64 nginx:alpine
FROM --platform=linux/amd64 nginx:1.31.2-alpine
# 使用阿里云镜像源加速
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories

View File

@@ -1,8 +1,10 @@
export { authApi } from './modules/auth.js';
export { assetApi } from './modules/asset.js';
export { assetApi, hasActiveOrPendingPackage, isAssetRealNameCompleted } from './modules/asset.js';
export { deviceApi } from './modules/device.js';
export { exchangeApi } from './modules/exchange.js';
export { orderApi } from './modules/order.js';
export { notificationApi } from './modules/notification.js';
export { popupApi } from './modules/popup.js';
export { realnameApi } from './modules/realname.js';
export { walletApi } from './modules/wallet.js';
export { wechatApi } from './modules/wechat.js';
export { wechatApi } from './modules/wechat.js';

View File

@@ -1,11 +1,97 @@
import request from '@/utils/request.js';
import { useAssetStore } from '@/store/asset.js';
import { useUserStore } from '@/store/user.js';
import { getSessionContext, isCurrentSession } from '@/utils/session-context.js';
let assetInfoRequestId = 0;
export const normalizeAssetInfo = (data = {}) => {
// 保护期已下线:不向展示和业务判断透传废弃字段,兼容 none 或字段缺失。
const { device_protect_status, ...info } = data;
return {
...info,
allowed_payment_methods: Array.isArray(data.allowed_payment_methods)
? data.allowed_payment_methods
: [],
real_name_status: data.real_name_status === undefined || data.real_name_status === null
? data.real_name_status
: Number(data.real_name_status),
realname_required: data.realname_required === undefined || data.realname_required === null
? data.realname_required
: data.realname_required === true || data.realname_required === 1,
days_until_final_expiry: data.days_until_final_expiry === null || data.days_until_final_expiry === undefined
? data.days_until_final_expiry
: Number(data.days_until_final_expiry),
is_expiring: data.is_expiring === undefined || data.is_expiring === null
? data.is_expiring
: data.is_expiring === true || data.is_expiring === 1
};
};
const normalizePackageHistoryNode = (node = {}) => ({
...node,
children: Array.isArray(node.children)
? node.children.filter(child => Number(child?.status) !== 4).map(normalizePackageHistoryNode)
: [],
expand_by_default: node.expand_by_default === true || node.expand_by_default === 1
});
export const normalizeAssetPackageHistory = (data = {}) => ({
...data,
items: Array.isArray(data.items)
? data.items.filter(node => Number(node?.status) !== 4).map(normalizePackageHistoryNode)
: [],
page: Number(data.page),
size: Number(data.size),
total: Number(data.total)
});
export const isAssetRealNameCompleted = (assetInfo = {}) => {
if (assetInfo.asset_type === 'device') {
return (assetInfo.cards || []).some((card) => Number(card?.real_name_status) === 1);
}
return Number(assetInfo.real_name_status) === 1;
};
export const hasActiveOrPendingPackage = async (identifier) => {
const [pendingData, activeData] = await Promise.all([
assetApi.getPackageHistory(identifier, 1, 1, { status: 0 }),
assetApi.getPackageHistory(identifier, 1, 1, { status: 1 })
]);
return [pendingData, activeData].some(data => Array.isArray(data?.items) && data.items.length > 0);
};
export const assetApi = {
getInfo(identifier) {
identifier = typeof identifier === 'string' ? identifier.trim() : '';
if (!identifier) {
return Promise.reject({ msg: '缺少资产标识,请重新输入或扫码登录' });
}
const context = getSessionContext();
const userStore = useUserStore();
if (userStore.state.loginPending || !context.token) {
return Promise.reject({ msg: '登录和微信配置尚未完成,请稍后重试' });
}
const phoneRevision = userStore.state.phoneRevision;
const requestId = identifier === context.identifier ? ++assetInfoRequestId : null;
return request({
url: '/api/c/v1/asset/info',
method: 'GET',
data: { identifier }
}).then((response) => {
const data = normalizeAssetInfo(response);
if (identifier === context.identifier && isCurrentSession(context)) {
const assetStore = useAssetStore();
// 替换整个快照,不合并旧轮询开关;迟到的旧请求不得覆盖新状态。
if (requestId === assetInfoRequestId) assetStore.setAssetInfo(data);
assetStore.receiveExpiryReminder(context, data.expiry_reminder);
if (phoneRevision === userStore.state.phoneRevision && typeof data.bound_phone === 'string') {
userStore.setCustomerPhone(data.bound_phone);
}
}
return data;
});
},
@@ -14,14 +100,17 @@ export const assetApi = {
url: '/api/c/v1/asset/package-history',
method: 'GET',
data: { identifier, page, page_size, ...params }
});
}).then(normalizeAssetPackageHistory);
},
getPackages(identifier) {
getPackages(identifier, packageType = '') {
return request({
url: '/api/c/v1/asset/packages',
method: 'GET',
data: { identifier }
data: {
identifier,
...(packageType ? { package_type: packageType } : {})
}
});
},
@@ -32,4 +121,4 @@ export const assetApi = {
data: { identifier }
});
}
};
};

View File

@@ -5,7 +5,8 @@ export const authApi = {
return request({
url: '/api/c/v1/auth/verify-asset',
method: 'POST',
data: { identifier }
data: { identifier },
showError: false
});
},
@@ -29,7 +30,8 @@ export const authApi = {
return request({
url: '/api/c/v1/auth/bind-phone',
method: 'POST',
data: { phone, code }
data: { phone, code },
showError: false
});
},
@@ -47,4 +49,4 @@ export const authApi = {
method: 'POST'
});
}
};
};

View File

@@ -0,0 +1,37 @@
import request from '@/utils/request.js';
export const notificationApi = {
getList(page = 1, page_size = 20, is_read) {
return request({
url: '/api/c/v1/notifications',
method: 'GET',
data: {
page,
page_size,
...(is_read === undefined ? {} : { is_read })
}
});
},
getUnreadCount() {
return request({
url: '/api/c/v1/notifications/unread-count',
method: 'GET'
});
},
markRead(id) {
return request({
url: `/api/c/v1/notifications/${id}/read`,
method: 'PUT',
data: { id }
});
},
markAllRead() {
return request({
url: '/api/c/v1/notifications/read-all',
method: 'PUT'
});
}
};

View File

@@ -22,17 +22,16 @@ export const orderApi = {
},
create(identifier, package_ids, payment_method) {
const data = { identifier, package_ids };
if (payment_method === 'alipay') {
data.payment_method = payment_method;
} else {
const data = { identifier, package_ids, payment_method };
if (payment_method === 'wechat') {
data.app_type = APP_TYPE;
}
return request({
url: '/api/c/v1/orders/create',
method: 'POST',
data
data,
showError: false
});
},
@@ -47,7 +46,8 @@ export const orderApi = {
return request({
url: `/api/c/v1/orders/${order_id}/pay`,
method: 'POST',
data
data,
showError: false
});
}
};

21
api/modules/popup.js Normal file
View File

@@ -0,0 +1,21 @@
import request from '@/utils/request.js';
export const popupApi = {
getCandidate(page, identifier) {
return request({
url: '/api/c/v1/popup-candidates',
method: 'GET',
data: { page, identifier },
// 资源不可见 / 无候选时静默处理,不弹全局错误提示
showError: false
});
},
submitRiskExchangeAddress(assetId, params) {
return request({
url: `/api/c/v1/risk-exchanges/${assetId}/address`,
method: 'POST',
data: { asset_id: assetId, ...params }
});
}
};

View File

@@ -19,7 +19,8 @@ export const walletApi = {
return request({
url: '/api/c/v1/wallet/recharge',
method: 'POST',
data
data,
showError: false
});
},

View File

@@ -18,7 +18,7 @@
<view class="info-row flex-row-sb">
<view class="info-label">
<view class="subtitle" v-if="isDevice">IMEI:{{ deviceInfo.imei || '-' }}</view>
<view class="subtitle" v-else>手机号:{{ deviceInfo.bound_phone || '-' }}</view>
<view class="subtitle" v-else>客户手机号:{{ deviceInfo.bound_phone || '-' }}</view>
</view>
</view>
</view>

View File

@@ -0,0 +1,134 @@
<template>
<view class="expiry-overlay" @tap.stop>
<view class="expiry-dialog" :class="`expiry-${reminder.level}`" role="dialog"
aria-modal="true" aria-label="套餐临期提醒" @keydown.esc="$emit('close')">
<view class="reminder-header">
<button class="reminder-close" aria-label="关闭临期提醒" @tap="$emit('close')">×</button>
<view class="clock-halo" aria-hidden="true"><view class="clock-face"></view></view>
<view class="reminder-title">套餐即将到期</view>
<view class="remaining-label">当前资产套餐剩余</view>
<view class="remaining-days"><text class="day-number">{{ reminder.remaining_days }}</text><text class="day-unit">天</text></view>
</view>
<view class="reminder-content">
<view class="expiry-details">
<text class="expiry-label">预计到期时间</text>
<text class="expiry-value">{{ formatShanghaiExpiry(reminder.expires_at) }}</text>
</view>
<view class="reminder-description">为避免套餐到期影响使用,请及时续费。</view>
<button class="reminder-confirm" @tap="$emit('renew')">立即续费</button>
<button class="reminder-later" @tap="$emit('close')">我知道了</button>
</view>
</view>
</view>
</template>
<script setup>
import { formatShanghaiExpiry } from '@/utils/expiry-reminder.js';
defineProps({ reminder: { type: Object, required: true } });
defineEmits(['close', 'renew']);
</script>
<style scoped lang="scss">
.expiry-overlay {
position: fixed;
inset: 0;
z-index: 1200;
display: flex;
align-items: center;
justify-content: center;
padding: 40rpx;
box-sizing: border-box;
background: rgba(20, 26, 36, 0.48);
backdrop-filter: blur(4px);
}
.expiry-dialog {
width: 100%;
max-width: 640rpx;
max-height: calc(100vh - 80rpx);
overflow-y: auto;
border-radius: 32rpx;
background: var(--bg-primary);
box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18);
}
.reminder-header {
position: relative;
padding: 40rpx 36rpx 28rpx;
text-align: center;
background: linear-gradient(180deg, var(--reminder-tint), var(--bg-primary));
}
.reminder-close {
position: absolute;
top: 20rpx;
right: 20rpx;
width: 56rpx;
height: 56rpx;
margin: 0;
padding: 0;
border-radius: 50%;
font-size: 40rpx;
line-height: 52rpx;
color: var(--text-tertiary);
background: transparent;
}
.reminder-close::after, .reminder-confirm::after, .reminder-later::after { border: none; }
.clock-halo {
display: flex;
align-items: center;
justify-content: center;
width: 108rpx;
height: 108rpx;
margin: 28rpx auto 22rpx;
border-radius: 50%;
background: var(--reminder-tint);
}
.clock-face {
position: relative;
width: 50rpx;
height: 50rpx;
border: 4rpx solid var(--reminder-color);
border-radius: 50%;
}
.clock-face::before, .clock-face::after {
content: '';
position: absolute;
left: 23rpx;
top: 10rpx;
width: 4rpx;
height: 17rpx;
border-radius: 4rpx;
background: var(--reminder-color);
}
.clock-face::after { top: 23rpx; height: 14rpx; transform: rotate(-55deg); transform-origin: top center; }
.reminder-title { color: var(--text-primary); font-size: 38rpx; font-weight: 700; }
.remaining-label { margin-top: 20rpx; color: var(--text-secondary); font-size: 26rpx; }
.remaining-days { margin-top: 8rpx; color: var(--reminder-color); line-height: 1.2; }
.day-number { font-size: 88rpx; font-weight: 700; letter-spacing: -3rpx; font-variant-numeric: tabular-nums; }
.day-unit { margin-left: 12rpx; font-size: 28rpx; }
.reminder-content { padding: 0 36rpx 36rpx; }
.expiry-details {
display: flex;
flex-direction: column;
gap: 10rpx;
padding: 22rpx;
border-radius: 16rpx;
text-align: center;
background: var(--bg-secondary);
}
.expiry-label { font-size: 22rpx; color: var(--text-tertiary); }
.expiry-value { font-size: 26rpx; color: var(--text-primary); font-weight: 500; }
.reminder-description { margin: 22rpx 0 28rpx; color: var(--text-secondary); font-size: 24rpx; line-height: 1.6; text-align: center; }
.reminder-confirm {
margin: 0;
padding: 24rpx;
border-radius: 16rpx;
font-size: 28rpx;
font-weight: 600;
line-height: 1;
color: #fff;
background: var(--reminder-color);
}
.expiry-red { --reminder-color: #d94040; --reminder-tint: rgba(217, 64, 64, 0.08); }
.reminder-later { margin: 12rpx 0 0; padding: 14rpx; font-size: 24rpx; line-height: 1.5; color: var(--text-tertiary); background: transparent; }
.expiry-purple { --reminder-color: #8850c4; --reminder-tint: rgba(136, 80, 196, 0.08); }
.expiry-pink { --reminder-color: #ce4878; --reminder-tint: rgba(206, 72, 120, 0.08); }
</style>

View File

@@ -42,8 +42,8 @@
gap: 20rpx;
.service-icon {
width: 60rpx;
height: 60rpx;
width: 76rpx;
height: 76rpx;
}
.service-content {
@@ -66,10 +66,10 @@
.service-btn {
padding: 16rpx 32rpx;
background: linear-gradient(135deg, var(--primary) 0%, var(--primary-light) 100%);
background: #55ab5c;
color: #fff;
font-size: 26rpx;
font-weight: 600;
border-radius: 40rpx;
}
</style>
</style>

View File

@@ -1,16 +1,10 @@
<template>
<view class="card function-card">
<view class="card-header">
<view class="title">功能菜单</view>
<!-- <view class="header-actions">
<button class="btn-apple btn-primary" @tap="$emit('sync')">运营数据同步</button>
</view> -->
</view>
<view class="function-grid">
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'authentication')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/authentication.png" mode="aspectFit" alt="实名认证"></image>
<image class="function-image icon-authentication" src="/static/authentication.png" mode="aspectFit" alt="实名认证"></image>
</view>
<view :class="['function-name', realNameStatus === '已实名' ? 'text-primary' : '']">
{{ realNameStatus || '实名认证' }}
@@ -18,92 +12,100 @@
</view>
<view class="function-item interactive card-interactive" @tap="$emit('sync')" role="button" tabindex="0">
<view class="function-icon">
<image src="/static/data.png" mode="aspectFit" alt="运营数据同步"></image>
<image class="function-image icon-data" src="/static/data.png" mode="aspectFit" alt="数据同步"></image>
</view>
<view class="function-name">运营数据同步</view>
<view class="function-name">数据同步</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'package-order')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/shop.png" mode="aspectFit" alt="套餐订购"></image>
<image class="function-image icon-shop" src="/static/shop.png" mode="aspectFit" alt="套餐订购"></image>
</view>
<view class="function-name">套餐订购</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'notifications')" role="button"
tabindex="0">
<view class="function-icon function-icon-badge">
<image class="function-image icon-notification" src="/static/notification.png" mode="aspectFit" alt="站内通知"></image>
<view v-if="unreadCount > 0" class="unread-badge">{{ unreadCount > 99 ? '99+' : unreadCount }}</view>
</view>
<view class="function-name">站内通知</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'order-list')" role="button"
tabindex="0">
<view class="function-icon">
<image src="/static/order.png" mode="aspectFit" alt="我的订单"></image>
<image class="function-image icon-order" src="/static/order.png" mode="aspectFit" alt="我的订单"></image>
</view>
<view class="function-name">我的订单</view>
</view>
<view class="function-item interactive card-interactive" v-if="isDevice" @tap="$emit('enter', 'back')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/back.png" mode="aspectFit" alt="后台管理"></image>
<image class="function-image icon-back" src="/static/back.png" mode="aspectFit" alt="后台管理"></image>
</view>
<view class="function-name">后台管理</view>
</view>
<view class="function-item interactive card-interactive" v-if="isDevice" @tap="$emit('enter', 'switch')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/change.png" mode="aspectFit" alt="切换运营商"></image>
<image class="function-image icon-change" src="/static/change.png" mode="aspectFit" alt="切换运营商"></image>
</view>
<view class="function-name">切换运营商</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'asset-package')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/asset-package-history.png" mode="aspectFit" alt="资产套餐历史"></image>
<image class="function-image icon-asset-package" src="/static/asset-package-history.png" mode="aspectFit" alt="资产套餐"></image>
</view>
<view class="function-name">资产套餐历史</view>
<view class="function-name">历史套餐</view>
</view>
<view class="function-item interactive card-interactive" @tap="handleBindPhone" role="button" tabindex="0">
<view class="function-icon">
<image src="/static/bind-phone.png" mode="aspectFit" alt="绑定手机号"></image>
<image class="function-image icon-bind-phone" src="/static/bind-phone.png" mode="aspectFit" alt="绑定手机号"></image>
</view>
<view :class="['function-name', alreadyBindPhone ? 'text-primary' : 'text-danger']">
{{ alreadyBindPhone ? '已绑定' : '未绑定' }}
<view :class="['function-name', assetPhoneBound === true && customerPhone ? 'text-primary' : '']">
{{ bindingLabel }}
</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'change-phone')" role="button"
tabindex="0">
<view class="function-icon">
<image src="/static/change-phone.png" mode="aspectFit" alt="更换手机号"></image>
<image class="function-image icon-change-phone" src="/static/change-phone.png" mode="aspectFit" alt="更换手机号"></image>
</view>
<view class="function-name">更换手机号</view>
</view>
<view class="function-item interactive card-interactive"
@tap="$emit('enter', 'device-exchange')" role="button" tabindex="0">
<view class="function-icon">
<image src="/static/change.png" mode="aspectFit" alt="换货"></image>
<image class="function-image icon-change" src="/static/change-shop.png" mode="aspectFit" alt="换货"></image>
</view>
<view class="function-name">换货</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'wallet')" role="button"
tabindex="0">
<view class="function-icon">
<image src="/static/wallet.png" mode="aspectFit" alt="钱包"></image>
<image class="function-image icon-wallet" src="/static/wallet-home.png" mode="aspectFit" alt="钱包"></image>
</view>
<view class="function-name">{{ walletText }}</view>
</view>
<view class="function-item interactive card-interactive" v-if="isDevice" @tap="$emit('enter', 'restart')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/restart.png" mode="aspectFit" alt="重启设备"></image>
<image class="function-image icon-restart" src="/static/restart.png" mode="aspectFit" alt="重启设备"></image>
</view>
<view class="function-name">重启设备</view>
</view>
<view class="function-item interactive card-interactive" v-if="isDevice" @tap="$emit('enter', 'recover')"
role="button" tabindex="0">
<view class="function-icon">
<image src="/static/recover.png" mode="aspectFit" alt="恢复出厂"></image>
<image class="function-image icon-recover" src="/static/recover.png" mode="aspectFit" alt="恢复出厂"></image>
</view>
<view class="function-name">恢复出厂</view>
</view>
<view class="function-item interactive card-interactive" @tap="$emit('enter', 'out')" role="button"
tabindex="0">
<view class="function-icon">
<image src="/static/out.png" mode="aspectFit" alt="退出登录"></image>
<image class="function-image icon-out" src="/static/out.png" mode="aspectFit" alt="退出登录"></image>
</view>
<view class="function-name">退出登录</view>
</view>
@@ -121,9 +123,13 @@
type: String,
default: ''
},
alreadyBindPhone: {
assetPhoneBound: {
type: Boolean,
default: false
default: null
},
customerPhone: {
type: String,
default: null
},
isDevice: {
type: Boolean,
@@ -132,6 +138,10 @@
walletBalance: {
type: [Number, String],
default: 0
},
unreadCount: {
type: Number,
default: 0
}
});
@@ -145,9 +155,15 @@
};
const walletText = computed(() => `钱包 (${formatWalletBalance(props.walletBalance)})`);
const bindingLabel = computed(() => {
if (props.customerPhone === '') return '绑定客户号';
if (props.assetPhoneBound === false) return '绑定资产号';
if (props.assetPhoneBound === true && props.customerPhone) return '资产已绑定';
return '绑定手机号';
});
const handleBindPhone = () => {
if (props.alreadyBindPhone) {
if (props.assetPhoneBound === true && props.customerPhone) {
return;
}
emit('enter', 'bind');
@@ -164,8 +180,8 @@
.function-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 16rpx;
grid-template-columns: repeat(4, 1fr);
gap: 12rpx;
width: 100%;
.function-item {
@@ -173,11 +189,11 @@
flex-direction: column;
align-items: center;
justify-content: center;
padding: 20rpx;
padding: 16rpx 8rpx;
.function-icon {
width: 120rpx;
height: 120rpx;
width: 64rpx;
height: 64rpx;
display: flex;
align-items: center;
justify-content: center;
@@ -186,14 +202,52 @@
width: 100%;
height: 100%;
}
.function-image {
transform-origin: center;
}
.icon-authentication,
.icon-shop,
.icon-back,
.icon-change-phone,
.icon-wallet,
.icon-restart {
transform: scale(0.9);
}
.icon-data { transform: scale(1.06); }
.icon-notification,
.icon-change,
.icon-asset-package { transform: scale(1.01); }
.icon-order,
.icon-recover { transform: scale(0.91); }
.icon-bind-phone { transform: scale(0.93); }
.icon-out { transform: scale(0.97); }
}
.function-icon-badge { position: relative; }
.unread-badge {
position: absolute;
top: -8rpx;
right: -12rpx;
min-width: 34rpx;
height: 34rpx;
padding: 0 8rpx;
border-radius: 20rpx;
background: var(--danger);
color: #fff;
font-size: 18rpx;
line-height: 34rpx;
text-align: center;
}
.function-name {
font-size: 28rpx;
font-size: 24rpx;
font-weight: 500;
color: var(--text-primary);
text-align: center;
margin-top: 15rpx;
margin-top: 12rpx;
}
}
}

View File

@@ -0,0 +1,200 @@
<template>
<view v-if="show" class="notification-popup" @tap.stop>
<view class="notification-popup-card">
<view class="popup-header">
<view class="popup-heading">新通知</view>
<view class="popup-close" role="button" aria-label="关闭" @tap="$emit('close')">×</view>
</view>
<swiper class="notification-swiper" :current="current" @change="$emit('change', $event)">
<swiper-item v-for="item in items" :key="item.id">
<view class="notification-content">
<view class="notification-title">{{ item.title || '业务通知' }}</view>
<view class="notification-severity">{{ getNotificationMeta(item) }}</view>
<view class="notification-time">{{ formatDate(item.created_at) }}</view>
<scroll-view scroll-y class="notification-body">
<text>{{ item.body || '暂无通知内容' }}</text>
</scroll-view>
<up-button v-if="item.category === 'expiry'" class="renew-button" type="primary" size="small"
@tap.stop="$emit('renew', item)">立即续费</up-button>
</view>
</swiper-item>
</swiper>
<view v-if="items.length > 1" class="popup-footer">
<view class="popup-swipe-hint" aria-label="左右滑动切换通知">
<text class="swipe-arrow">‹</text>
<text>左右滑动切换通知</text>
<text class="swipe-arrow">›</text>
</view>
<view class="popup-dots">
<view v-for="(_, index) in items" :key="index" class="popup-dot" :class="{ active: index === current }"></view>
</view>
<view class="popup-counter">{{ current + 1 }}/{{ items.length }} 左右滑动查看</view>
</view>
</view>
</view>
</template>
<script setup>
defineProps({
show: Boolean,
items: {
type: Array,
default: () => []
},
current: {
type: Number,
default: 0
}
});
defineEmits(['close', 'change', 'renew']);
const formatDate = (value) => {
if (!value) return '-';
return value.replace('T', ' ').slice(0, 16);
};
const getNotificationMeta = (item) => {
const category = {
expiry: '套餐临期',
exchange: '换货'
}[item?.category] || '业务通知';
const severity = {
info: '提示',
warning: '警告',
error: '错误',
critical: '严重'
}[item?.severity];
return severity ? `${category} · ${severity}` : category;
};
</script>
<style scoped lang="scss">
.notification-popup {
position: fixed;
z-index: 1000;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
padding: 40rpx;
background: rgba(0, 0, 0, 0.48);
}
.notification-popup-card {
width: 100%;
max-width: 640rpx;
overflow: hidden;
border-radius: 24rpx;
background: #fff;
box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.18);
}
.popup-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 30rpx 32rpx 18rpx;
}
.popup-heading {
color: var(--text-primary);
font-size: 34rpx;
font-weight: 600;
}
.popup-close {
width: 52rpx;
height: 52rpx;
color: var(--text-tertiary);
font-size: 48rpx;
font-weight: 300;
line-height: 46rpx;
text-align: center;
}
.notification-swiper { height: 430rpx; }
.notification-content {
height: 100%;
box-sizing: border-box;
padding: 18rpx 32rpx 28rpx;
}
.notification-title {
color: var(--text-primary);
font-size: 32rpx;
font-weight: 600;
line-height: 1.45;
}
.notification-severity {
margin-top: 10rpx;
color: var(--primary);
font-size: 22rpx;
}
.notification-time {
margin-top: 12rpx;
color: var(--text-tertiary);
font-size: 22rpx;
}
.notification-body {
box-sizing: border-box;
height: 180rpx;
margin-top: 28rpx;
color: var(--text-secondary);
font-size: 28rpx;
line-height: 1.7;
white-space: pre-wrap;
}
.popup-footer {
padding: 0 32rpx 28rpx;
text-align: center;
}
.renew-button {
margin-top: 20rpx;
}
.popup-swipe-hint {
display: flex;
align-items: center;
justify-content: center;
gap: 8rpx;
margin-bottom: 16rpx;
color: var(--primary);
font-size: 24rpx;
font-weight: 500;
}
.swipe-arrow {
font-size: 34rpx;
line-height: 1;
}
.popup-dots {
display: flex;
justify-content: center;
gap: 10rpx;
}
.popup-dot {
width: 12rpx;
height: 12rpx;
border-radius: 50%;
background: #d8dce3;
}
.popup-dot.active { width: 28rpx; border-radius: 8rpx; background: var(--primary); }
.popup-counter {
margin-top: 12rpx;
color: var(--text-tertiary);
font-size: 22rpx;
}
</style>

View File

@@ -0,0 +1,286 @@
<template>
<view class="card package-node" :class="{ 'package-node-child': depth > 0, 'relationship-exception': isMasterMissing }">
<view class="package-header flex-row-sb">
<view class="package-title-wrap">
<view class="package-name">{{ node.package_name }}</view>
<text v-if="packageTypeName" class="package-type">{{ packageTypeName }}</text>
</view>
<view class="tag-apple" :class="getStatusClass(node.status)">{{ node.status_name }}</view>
</view>
<view v-if="isMasterMissing" class="relationship-status">
{{ node.relationship_status_name || node.relationship_status }}
</view>
<view v-if="hasMasterUsageId" class="relationship-meta">
关联主套餐使用记录:{{ node.master_usage_id }}
</view>
<view class="package-info">
<view class="info-row flex-row-sb">
<view class="info-label">购买时间</view>
<view class="info-value">{{ formatDate(node.created_at) }}</view>
</view>
<view class="info-row flex-row-sb">
<view class="info-label">激活时间</view>
<view class="info-value">{{ formatDate(node.activated_at) }}</view>
</view>
<view class="info-row flex-row-sb">
<view class="info-label">到期时间</view>
<view class="info-value">{{ formatDate(node.expires_at) }}</view>
</view>
</view>
<view class="divider"></view>
<view class="flow-info">
<view class="flow-title">流量信息</view>
<view class="flow-stats">
<view class="flow-item">
<view class="flow-label">已使用</view>
<view class="flow-value">{{ getUsedFlow(node) }}</view>
</view>
<view class="flow-item">
<view class="flow-label">总流量</view>
<view class="flow-value">{{ getTotalFlow(node) }}</view>
</view>
<view class="flow-item">
<view class="flow-label">剩余</view>
<view class="flow-value">{{ getRemainFlow(node) }}</view>
</view>
</view>
<view class="progress-section">
<view class="progress-apple">
<view class="progress-fill" :style="{ width: getUsagePercent(node) }"></view>
</view>
</view>
</view>
<view
v-if="hasChildren"
class="expand-control"
role="button"
tabindex="0"
:aria-expanded="String(expanded)"
@tap.stop="toggleExpanded"
>
<text>{{ expanded ? '收起关联加油包' : '展开关联加油包' }}</text>
<text class="expand-count">({{ children.length }})</text>
</view>
<view v-if="expanded && hasChildren" class="child-list">
<PackageHistoryNode
v-for="(child, index) in children"
:key="getNodeKey(child, index)"
:node="child"
:depth="depth + 1"
/>
</view>
</view>
</template>
<script setup>
import { computed, ref } from 'vue';
const props = defineProps({
node: {
type: Object,
default: () => ({})
},
depth: {
type: Number,
default: 0
}
});
const children = computed(() => Array.isArray(props.node.children) ? props.node.children : []);
const hasChildren = computed(() => children.value.length > 0);
const isMasterMissing = computed(() => props.node.relationship_status === 'master_missing');
const hasMasterUsageId = computed(() => (
props.node.master_usage_id !== null && props.node.master_usage_id !== undefined
));
const packageTypeName = computed(() => ({
formal: '正式套餐',
addon: '加油包'
}[props.node.package_type] || props.node.package_type || ''));
const expanded = ref(props.node.expand_by_default === true);
const getStatusClass = (status) => ({
0: 'tag-warning',
1: 'tag-success',
2: 'tag-primary',
3: 'tag-secondary',
4: 'tag-danger'
}[Number(status)] || '');
const toNumber = (value) => {
const number = Number(value);
return Number.isFinite(number) ? number : 0;
};
const formatMB = (value) => {
const mb = toNumber(value);
if (mb >= 1024) {
return `${(mb / 1024).toFixed(2)} GB`;
}
return `${mb.toFixed(2)} MB`;
};
const getUsedAmount = (item) => item.enable_virtual_data
? toNumber(item.virtual_used_mb)
: toNumber(item.real_used_mb);
const getUsedFlow = (item) => formatMB(getUsedAmount(item));
const getTotalFlow = (item) => formatMB(item.real_total_mb);
const getRemainFlow = (item) => formatMB(Math.max(toNumber(item.real_total_mb) - getUsedAmount(item), 0));
const getUsagePercent = (item) => {
const total = toNumber(item.real_total_mb);
if (!total) return '0%';
return `${Math.min((getUsedAmount(item) / total) * 100, 100).toFixed(2)}%`;
};
const formatDate = (value) => value ? String(value).replace('T', ' ').slice(0, 19) : '-';
const getNodeKey = (item, index) => item.package_usage_id ?? `${props.depth}-${index}`;
const toggleExpanded = () => {
expanded.value = !expanded.value;
};
</script>
<style lang="scss" scoped>
.package-node {
margin-bottom: var(--space-md);
&.package-node-child {
margin: var(--space-sm) 0 0;
border-left: 6rpx solid var(--primary-light);
box-shadow: none;
}
&.relationship-exception {
border-left: 6rpx solid var(--danger);
}
}
.package-header {
align-items: flex-start;
margin-bottom: var(--space-md);
}
.package-title-wrap {
display: flex;
align-items: center;
min-width: 0;
gap: var(--space-xs);
}
.package-name {
font-size: 32rpx;
font-weight: 600;
color: var(--text-primary);
}
.package-type,
.relationship-meta {
font-size: 22rpx;
color: var(--text-tertiary);
}
.relationship-status {
margin-bottom: var(--space-sm);
padding: 12rpx 16rpx;
border-radius: var(--radius-small);
background: var(--danger-light, #fff2f0);
color: var(--danger);
font-size: 24rpx;
}
.relationship-meta {
margin-bottom: var(--space-sm);
}
.package-info .info-row {
padding: var(--space-xs) 0;
}
.info-label {
font-size: 24rpx;
color: var(--text-tertiary);
}
.info-value {
font-size: 24rpx;
color: var(--text-primary);
}
.divider {
height: 1rpx;
margin: var(--space-md) 0;
background: var(--gray-200);
}
.flow-title {
margin-bottom: var(--space-sm);
font-size: 26rpx;
font-weight: 600;
color: var(--text-primary);
}
.flow-stats {
display: flex;
justify-content: space-between;
margin-bottom: var(--space-sm);
}
.flow-item {
text-align: center;
}
.flow-label {
margin-bottom: 4rpx;
font-size: 20rpx;
color: var(--text-tertiary);
}
.flow-value {
font-size: 26rpx;
font-weight: 600;
color: var(--text-primary);
}
.progress-apple {
overflow: hidden;
width: 100%;
height: 8rpx;
border-radius: var(--radius-small);
background: var(--gray-200);
}
.progress-fill {
height: 100%;
border-radius: var(--radius-small);
background: linear-gradient(90deg, var(--primary), var(--primary-light));
}
.expand-control {
display: inline-flex;
margin-top: var(--space-md);
padding: 12rpx 16rpx;
border-radius: var(--radius-small);
background: var(--primary-light);
color: var(--primary);
font-size: 24rpx;
}
.expand-count {
margin-left: 4rpx;
}
.child-list {
margin-top: var(--space-sm);
}
.tag-secondary {
background: var(--gray-200) !important;
color: var(--gray-600) !important;
}
</style>

View File

@@ -0,0 +1,509 @@
<template>
<view v-if='visible' class='popup-candidate' @tap.stop>
<view class='popup-candidate-card'>
<template v-if='isCandidateStep'>
<view class='popup-header'>
<view class='popup-heading'>{{ candidate?.title || '提示' }}</view>
<view class='popup-close' role='button' aria-label='关闭' @tap='dismiss'>×</view>
</view>
<scroll-view scroll-y class='popup-body'>
<text>{{ candidate?.body || '' }}</text>
</scroll-view>
<view class='popup-actions'>
<up-button v-if='isRiskExchange' type='primary' @tap='goToAddress'>申请换卡</up-button>
<up-button v-else-if='actionLabel' type='primary' @tap='handleAction'>{{ actionLabel }}</up-button>
<up-button plain @tap='dismiss'>稍后处理</up-button>
</view>
</template>
<template v-else-if='isAddressStep'>
<view class='popup-header'>
<view class='popup-heading'>换货收货信息</view>
<view class='popup-close' role='button' aria-label='关闭' @tap='dismiss'>×</view>
</view>
<scroll-view scroll-y class='popup-address-form'>
<view class='form-item'>
<view class='form-label'>粘贴收货信息</view>
<up-textarea
v-model='addressForm.raw_shipping_text'
placeholder='可粘贴包含收件人、电话、地址的一整段文字'
autoHeight
:maxlength='-1'
border='surround'
/>
<view class='form-helper'>识别结果可继续手动修改</view>
<view class='paste-action-row'>
<button class='btn-apple btn-secondary paste-action-btn' @tap='clearPastedText'>清除</button>
<button class='btn-apple btn-secondary paste-action-btn' @tap='fillFromPastedText'>识别并填充</button>
</view>
</view>
<view class='form-item'>
<view class='form-label'>收件人姓名</view>
<up-input v-model='addressForm.recipient_name' placeholder='请输入收件人姓名' border='surround' maxlength='50'/>
</view>
<view class='form-item'>
<view class='form-label'>收件人电话</view>
<up-input v-model='addressForm.recipient_phone' type='number' placeholder='请输入11位手机号' border='surround' maxlength='11'/>
</view>
<view class='form-item'>
<view class='form-label'>所在地区</view>
<view class='region-trigger' @tap='openAreaPicker'>
<text class='region-trigger-text' :class='{ placeholder: !regionDisplayText }'>
{{ regionDisplayText || '请选择省 / 市 / 区' }}
</text>
</view>
</view>
<view class='form-item'>
<view class='form-label'>详细地址</view>
<up-textarea
v-model='addressForm.recipient_address_detail'
placeholder='请输入详细收货地址'
autoHeight
:maxlength='-1'
border='surround'
/>
</view>
</scroll-view>
<view class='popup-address-actions'>
<up-button plain @tap='dismiss'>取消</up-button>
<up-button type='primary' :loading='submitting' :disabled='submitting' @tap='submitAddress'>提交</up-button>
</view>
</template>
<template v-else-if='isDoneStep'>
<view class='popup-header'>
<view class='popup-heading'>申请已提交</view>
</view>
<view class='result-item'>
<view class='result-label'>换货单号</view>
<view class='result-value'>{{ exchange?.exchange_no || '-' }}</view>
</view>
<view class='result-item'>
<view class='result-label'>状态</view>
<view class='result-value'>{{ exchange?.status_name || '-' }}</view>
</view>
<view v-if='exchange?.recipient_address' class='result-item'>
<view class='result-label'>收货地址</view>
<view class='result-value'>{{ exchange.recipient_address }}</view>
</view>
<view class='popup-actions'>
<up-button type='primary' @tap='finish'>完成</up-button>
</view>
</template>
</view>
</view>
<up-picker
:show='showAreaPicker'
:columns='areaPickerColumns'
keyName='label'
title='选择所在地区'
:defaultIndex='areaPickerDefaultIndex'
closeOnClickOverlay
@confirm='confirmAreaPicker'
@change='handleAreaPickerChange'
@cancel='showAreaPicker = false'
@close='showAreaPicker = false'
/>
</template>
<script setup>
import { ref, reactive, computed, onMounted, onUnmounted } from 'vue';
import { popupApi, notificationApi } from '@/api/index.js';
import { handledPopupNotificationIds } from '@/utils/popup.js';
import {
buildRegionColumns,
composeRecipientAddress,
getRegionDisplayText,
parseShippingText
} from '@/utils/shippingAddress.js';
const PHONE_REG = /^1[3-9]\d{9}$/;
const props = defineProps({
page: {
type: String,
required: true
},
identifier: {
type: String,
default: ''
}
});
const emit = defineEmits(['close']);
const visible = ref(false);
const step = ref('candidate');
const candidate = ref(null);
const exchange = ref(null);
const submitting = ref(false);
const showAreaPicker = ref(false);
const areaPickerColumns = ref([]);
const areaPickerDefaultIndex = ref([0, 0, 0]);
const addressForm = reactive({
raw_shipping_text: '',
recipient_name: '',
recipient_phone: '',
recipient_region_codes: [],
recipient_address_detail: ''
});
const isCandidateStep = computed(() => step.value === 'candidate');
const isAddressStep = computed(() => step.value === 'address');
const isDoneStep = computed(() => step.value === 'done');
const isRiskExchange = computed(() => candidate.value?.popup_type === 'risk_exchange');
const regionDisplayText = computed(() => getRegionDisplayText(addressForm.recipient_region_codes));
const actionLabelMap = {
package_purchase: '立即购买',
asset_wallet_recharge: '立即充值'
};
const actionRouteMap = {
package_purchase: '/pages/package-order/package-order',
asset_wallet_recharge: '/pages/my-wallet/my-wallet'
};
const actionLabel = computed(() => actionLabelMap[candidate.value?.action_type] || '');
const goToAddress = () => {
step.value = 'address';
};
const resetForm = () => {
addressForm.raw_shipping_text = '';
addressForm.recipient_name = '';
addressForm.recipient_phone = '';
addressForm.recipient_region_codes = [];
addressForm.recipient_address_detail = '';
};
const syncAreaPickerState = (regionCodes = []) => {
const { columns, defaultIndex } = buildRegionColumns(regionCodes);
areaPickerColumns.value = columns;
areaPickerDefaultIndex.value = defaultIndex.map((index) => (index < 0 ? 0 : index));
};
const openAreaPicker = () => {
syncAreaPickerState(addressForm.recipient_region_codes);
showAreaPicker.value = true;
};
const handleAreaPickerChange = (event) => {
const selectedValues = event.value || [];
const selectedProvinceCode = selectedValues[0]?.value || '';
const selectedCityCode = event.columnIndex === 0 ? '' : selectedValues[1]?.value || '';
const selectedDistrictCode = event.columnIndex === 2 ? selectedValues[2]?.value || '' : '';
const { columns, defaultIndex } = buildRegionColumns([
selectedProvinceCode,
selectedCityCode,
selectedDistrictCode
]);
areaPickerColumns.value = columns;
areaPickerDefaultIndex.value = defaultIndex.map((index) => (index < 0 ? 0 : index));
};
const confirmAreaPicker = ({ value }) => {
const selectedCodes = (value || []).map((item) => item?.value).filter(Boolean);
if (selectedCodes.length === 3) {
addressForm.recipient_region_codes = selectedCodes;
syncAreaPickerState(selectedCodes);
}
showAreaPicker.value = false;
};
const fillFromPastedText = () => {
if (!addressForm.raw_shipping_text.trim()) {
uni.showToast({ title: '请先粘贴收货信息', icon: 'none' });
return;
}
const parsed = parseShippingText(addressForm.raw_shipping_text);
let updatedCount = 0;
if (parsed.recipient_name) {
addressForm.recipient_name = parsed.recipient_name;
updatedCount += 1;
}
if (parsed.recipient_phone) {
addressForm.recipient_phone = parsed.recipient_phone;
updatedCount += 1;
}
if (parsed.regionCodes.length === 3) {
addressForm.recipient_region_codes = parsed.regionCodes;
syncAreaPickerState(parsed.regionCodes);
updatedCount += 1;
}
if (parsed.detailAddress) {
addressForm.recipient_address_detail = parsed.detailAddress;
updatedCount += 1;
}
if (!updatedCount) {
uni.showToast({ title: '未识别到有效收货信息', icon: 'none' });
return;
}
uni.showToast({ title: '已识别并填充', icon: 'success' });
};
const clearPastedText = () => {
addressForm.raw_shipping_text = '';
};
const markPopupRead = async () => {
const id = candidate.value?.notification_id;
if (!id) return;
try {
await notificationApi.markRead(id);
} catch (e) {
console.error('标记弹窗通知已读失败', e);
}
};
const dismiss = () => {
visible.value = false;
showAreaPicker.value = false;
markPopupRead();
emit('close', 'dismissed');
};
const handleAction = () => {
const url = actionRouteMap[candidate.value?.action_type];
visible.value = false;
markPopupRead();
emit('close', 'action');
if (url) {
uni.navigateTo({ url });
}
};
const submitAddress = async () => {
if (submitting.value) return;
const recipientName = addressForm.recipient_name.trim();
const recipientPhone = addressForm.recipient_phone.trim();
const detailAddress = addressForm.recipient_address_detail.trim();
if (!recipientName) {
uni.showToast({ title: '请输入收件人姓名', icon: 'none' });
return;
}
if (!recipientPhone) {
uni.showToast({ title: '请输入收件人电话', icon: 'none' });
return;
}
if (!PHONE_REG.test(recipientPhone)) {
uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
return;
}
if (addressForm.recipient_region_codes.length !== 3) {
uni.showToast({ title: '请选择省市区', icon: 'none' });
return;
}
if (!detailAddress) {
uni.showToast({ title: '请输入详细收货地址', icon: 'none' });
return;
}
const recipientAddress = composeRecipientAddress(addressForm.recipient_region_codes, detailAddress);
const assetId = Number(candidate.value?.asset_id);
if (!Number.isInteger(assetId) || assetId <= 0) {
uni.showToast({ title: '资产信息无效', icon: 'none' });
return;
}
submitting.value = true;
try {
exchange.value = await popupApi.submitRiskExchangeAddress(assetId, {
recipient_name: recipientName,
recipient_phone: recipientPhone,
recipient_address: recipientAddress
});
await markPopupRead();
step.value = 'done';
} catch (e) {
console.error('提交风险换卡收货地址失败', e);
} finally {
submitting.value = false;
}
};
const finish = () => {
visible.value = false;
showAreaPicker.value = false;
emit('close', 'done');
};
let mounted = true;
onUnmounted(() => { mounted = false; });
onMounted(async () => {
if (!props.identifier) {
emit('close', 'empty');
return;
}
try {
const data = await popupApi.getCandidate(props.page, props.identifier);
if (!mounted) return;
const item = (data && data.candidate) || null;
if (!item || !item.notification_id || handledPopupNotificationIds.has(item.notification_id)) {
emit('close', 'empty');
return;
}
handledPopupNotificationIds.add(item.notification_id);
candidate.value = item;
step.value = 'candidate';
resetForm();
visible.value = true;
} catch (e) {
if (!mounted) return;
// 资源不可见(400/code=1180)与接口异常统一静默关闭,不做 UI 分支
console.error('查询弹窗候选失败', e);
emit('close', 'invisible');
}
});
</script>
<style scoped lang='scss'>
.popup-candidate {
position: fixed;
z-index: 1100;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
padding: 40rpx;
background: rgba(0, 0, 0, 0.48);
}
.popup-candidate-card {
width: 100%;
max-width: 640rpx;
max-height: calc(100vh - 80rpx);
display: flex;
flex-direction: column;
overflow: hidden;
border-radius: 24rpx;
background: #fff;
box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.18);
}
.popup-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 30rpx 32rpx 18rpx;
}
.popup-heading {
color: var(--text-primary);
font-size: 34rpx;
font-weight: 600;
}
.popup-close {
width: 52rpx;
height: 52rpx;
color: var(--text-tertiary);
font-size: 48rpx;
font-weight: 300;
line-height: 46rpx;
text-align: center;
}
.popup-body {
box-sizing: border-box;
max-height: 420rpx;
padding: 12rpx 32rpx 24rpx;
color: var(--text-secondary);
font-size: 28rpx;
line-height: 1.7;
white-space: pre-wrap;
}
.popup-actions {
display: flex;
flex-direction: column;
gap: 16rpx;
padding: 20rpx 32rpx 32rpx;
}
.form-item {
margin-bottom: 24rpx;
}
.form-label {
margin-bottom: 10rpx;
color: var(--text-primary);
font-size: 26rpx;
}
.form-helper {
margin-top: 8rpx;
font-size: 22rpx;
color: var(--text-tertiary);
}
.popup-address-form {
box-sizing: border-box;
max-height: 60vh;
padding: 0 32rpx;
}
.paste-action-row,
.popup-address-actions {
display: flex;
gap: 16rpx;
}
.paste-action-row {
margin-top: 16rpx;
.paste-action-btn {
flex: 1;
}
}
.region-trigger {
display: flex;
align-items: center;
min-height: 84rpx;
padding: 0 24rpx;
border: 2rpx solid var(--border-light);
border-radius: 12rpx;
background: #fff;
}
.region-trigger-text {
font-size: 28rpx;
color: var(--text-primary);
&.placeholder {
color: var(--text-tertiary);
}
}
.popup-address-actions {
padding: 16rpx 32rpx 32rpx;
:deep(.u-button) {
flex: 1;
}
}
.result-item {
padding: 8rpx 32rpx;
}
.result-label {
color: var(--text-tertiary);
font-size: 24rpx;
}
.result-value {
margin-top: 4rpx;
color: var(--text-primary);
font-size: 28rpx;
word-break: break-all;
}
</style>

View File

@@ -0,0 +1,522 @@
<template>
<up-popup :show="show" mode="center" @close="close">
<view class="renewal-popup">
<view class="popup-header">
<view class="popup-title">{{ popupTitle }}</view>
<view class="popup-close" @tap="close">×</view>
</view>
<view class="package-summary">
<view class="summary-name">{{ summaryName }}</view>
<view v-if="summaryPrice" class="summary-price">¥{{ summaryPrice }}</view>
</view>
<view class="payment-methods">
<view
v-for="method in paymentMethodOptions"
:key="method.value"
class="method-item"
:class="{ active: paymentMethod === method.value }"
@tap="selectPaymentMethod(method.value)"
>
<view class="method-left">
<image v-if="method.value === 'alipay'" class="method-icon" src="/static/支付宝支付.png" mode="aspectFit"></image>
<image v-else-if="method.value === 'wallet'" class="method-icon" src="/static/wallet.png" mode="aspectFit"></image>
<image v-else-if="method.value === 'wechat'" class="method-icon" src="/static/微信支付.png" mode="aspectFit"></image>
<text class="method-name">{{ method.label }}</text>
</view>
<text v-if="operationMode === 'order-payment'" class="method-locked-label">订单支付方式</text>
<view v-else class="method-radio" :class="{ checked: paymentMethod === method.value }"></view>
</view>
<view v-if="paymentMethodOptions.length === 0" class="method-empty">暂无可用支付方式</view>
</view>
<view class="popup-footer">
<button class="btn-apple btn-secondary" @tap="close">取消</button>
<button class="btn-apple btn-primary" :disabled="submitting" @tap="confirmPay">
{{ submitting ? '处理中...' : confirmText }}
</button>
</view>
</view>
</up-popup>
</template>
<script setup>
import { ref, computed, watch } from 'vue';
import { assetApi, isAssetRealNameCompleted, orderApi } from '@/api/index.js';
import {
handlePaymentError,
isValidAlipayPaymentLink,
isValidWechatPayConfig,
markPendingPaymentRefresh,
openAlipayPayment,
PAYMENT_REFRESH_TARGETS,
showPaymentToast,
wechatH5Pay
} from '@/utils/payment.js';
import { formatMoney } from '@/utils/display.js';
import { getPaymentErrorMessage, isUnknownPaymentResult } from '@/utils/payment-attempt.js';
import { getDefaultPaymentMethod, getPaymentMethodOptions, normalizePaymentMethods } from '@/utils/payment-methods.js';
const props = defineProps({
identifier: { type: String, default: '' },
paymentRefreshTarget: { type: String, default: PAYMENT_REFRESH_TARGETS.ORDER_LIST }
});
const emit = defineEmits(['completed', 'visibility-change']);
const show = ref(false);
watch(show, (value) => emit('visibility-change', value), { flush: 'sync' });
const submitting = ref(false);
const packageIds = ref([]);
const packageNames = ref([]);
const renewalPrice = ref(null);
const paymentMethod = ref('alipay');
const allowedPaymentMethods = ref([]);
const assetInfo = ref({});
const operationMode = ref('renewal');
const orderPaymentId = ref(null);
const paymentMethodOptions = computed(() => getPaymentMethodOptions(allowedPaymentMethods.value));
const packageNamesText = computed(() => packageNames.value.filter(Boolean).join('、') || '当前套餐');
const popupTitle = computed(() => operationMode.value === 'order-payment' ? '立即支付' : '立即续费');
const summaryName = computed(() => operationMode.value === 'order-payment'
? packageNamesText.value.replace(/^当前套餐$/, '当前订单')
: packageNamesText.value);
const summaryPrice = computed(() => renewalPrice.value === null || renewalPrice.value === undefined || renewalPrice.value === ''
? ''
: formatMoney(renewalPrice.value));
const confirmText = computed(() => operationMode.value === 'order-payment' ? '确认支付' : '确认续费');
const hasPreparedPaymentData = (paymentData) => {
return isValidWechatPayConfig(paymentData?.pay_config) ||
isValidAlipayPaymentLink(paymentData?.payment_link);
};
const close = () => {
if (!submitting.value) show.value = false;
};
const loadAssetInfo = async () => {
assetInfo.value = await assetApi.getInfo(props.identifier);
allowedPaymentMethods.value = normalizePaymentMethods(assetInfo.value.allowed_payment_methods);
paymentMethod.value = getDefaultPaymentMethod(allowedPaymentMethods.value);
};
const open = async (ids, names = [], price = null) => {
operationMode.value = 'renewal';
orderPaymentId.value = null;
renewalPrice.value = price;
const validIds = [...new Set((Array.isArray(ids) ? ids : [ids])
.map((value) => Number(value))
.filter((value) => Number.isInteger(value) && value > 0))];
if (!validIds.length) {
uni.showToast({ title: '当前暂无可续费套餐', icon: 'none' });
return;
}
if (!props.identifier) {
uni.showToast({ title: '未找到当前资产', icon: 'none' });
return;
}
packageIds.value = validIds;
packageNames.value = Array.isArray(names) ? names.filter(Boolean) : [];
try {
await loadAssetInfo();
} catch (error) {
console.error('加载续费支付方式失败', error);
uni.showToast({ title: error.msg || error.message || '加载支付方式失败', icon: 'none' });
return;
}
if (assetInfo.value.effective_realname_policy === 'before_order' &&
assetInfo.value.realname_required && !isAssetRealNameCompleted(assetInfo.value)) {
uni.showModal({
title: '需要实名认证',
content: '当前资产下单前需要完成实名认证',
confirmText: '去认证',
cancelText: '取消',
success: ({ confirm }) => {
if (confirm) uni.navigateTo({ url: '/pages/auth/auth' });
}
});
return;
}
if (!paymentMethodOptions.value.length) {
uni.showToast({ title: '暂无可用支付方式', icon: 'none' });
return;
}
show.value = true;
};
const openOrderPayment = (orderId, names = [], method = '') => {
if (!orderId) return;
const selectedMethod = normalizePaymentMethods([String(method || '').trim().toLowerCase()])[0];
if (!selectedMethod) {
uni.showToast({ title: '订单支付方式无效,请刷新订单后重试', icon: 'none' });
return;
}
operationMode.value = 'order-payment';
orderPaymentId.value = orderId;
renewalPrice.value = null;
packageIds.value = [];
packageNames.value = Array.isArray(names) ? names.filter(Boolean) : [];
allowedPaymentMethods.value = [selectedMethod];
paymentMethod.value = selectedMethod;
show.value = true;
};
const selectPaymentMethod = (method) => {
if (operationMode.value === 'order-payment') return;
if (paymentMethodOptions.value.some((item) => item.value === method)) {
paymentMethod.value = method;
}
};
const confirmOrderStatus = async (orderId) => {
try {
const detail = await orderApi.getDetail(orderId);
const status = detail?.payment_status ?? detail?.order?.payment_status;
showPaymentToast(status === 2, status === 2 ? '支付成功' : '支付结果确认中');
if (status === 2) emit('completed');
} catch (error) {
console.error('确认订单支付状态失败', error);
showPaymentToast(false, '支付结果确认失败,请稍后查看订单');
}
};
const handlePreparedPayment = async (paymentData, orderId = null, isRecharge = false) => {
if (isValidWechatPayConfig(paymentData?.pay_config)) {
try {
await wechatH5Pay(paymentData.pay_config);
if (orderId) {
await confirmOrderStatus(orderId);
} else {
showPaymentToast(true, isRecharge ? '充值成功,套餐将自动购买' : '支付成功');
emit('completed');
}
} catch (error) {
handlePaymentError(error);
}
return;
}
if (isValidAlipayPaymentLink(paymentData?.payment_link)) {
await openAlipayPayment(paymentData.payment_link, props.paymentRefreshTarget);
return;
}
uni.showToast({ title: '支付参数获取失败', icon: 'none' });
};
const handleRechargeOrder = async (orderResult) => {
const recharge = orderResult.recharge;
if (recharge.status === 2 || recharge.status === 3) {
uni.showToast({ title: `充值订单${recharge.status_name || '不可支付'},请重新下单`, icon: 'none' });
return;
}
if (recharge.status === 1 && !hasPreparedPaymentData(orderResult)) {
uni.showModal({
title: '提示',
content: '检测到您有待支付的充值订单,是否前往我的钱包查看?',
confirmText: '去查看',
cancelText: '取消',
success: ({ confirm }) => {
if (confirm) uni.navigateTo({ url: '/pages/my-wallet/my-wallet' });
}
});
return;
}
if (!hasPreparedPaymentData(orderResult)) {
uni.showToast({ title: '支付参数获取失败', icon: 'none' });
return;
}
const packageName = packageNamesText.value;
const rechargeAmount = orderResult.linked_package_info?.force_recharge_amount || recharge.amount;
uni.showModal({
title: '需要充值',
content: `续费${packageName}需要先充值¥${formatMoney(rechargeAmount)},充值成功后将自动购买套餐`,
confirmText: '去充值',
cancelText: '取消',
success: async ({ confirm }) => {
if (confirm) await handlePreparedPayment(orderResult, null, true);
}
});
};
const confirmPay = async () => {
if (submitting.value) return;
if (operationMode.value === 'order-payment') {
await confirmOrderPayment();
return;
}
if (!packageIds.value.length) return;
submitting.value = true;
uni.showLoading({ title: '创建订单...', mask: true });
try {
const orderResult = await orderApi.create(props.identifier, packageIds.value, paymentMethod.value);
if (orderResult?.order_type === 'recharge' && orderResult.recharge) {
uni.hideLoading();
show.value = false;
await handleRechargeOrder(orderResult);
return;
}
const orderId = orderResult?.order?.order_id;
if (!orderId) {
uni.hideLoading();
show.value = false;
uni.showToast({ title: '订单创建失败', icon: 'none' });
return;
}
uni.showLoading({ title: '准备支付...', mask: true });
// Prefer payment data returned by order creation. The fallback keeps
// compatibility with older backends without a duplicate preparation
// request when the new contract is available.
const payResult = hasPreparedPaymentData(orderResult) ||
(paymentMethod.value === 'wallet' && orderResult.order.payment_status === 2)
? orderResult
: await orderApi.pay(orderId, paymentMethod.value);
uni.hideLoading();
show.value = false;
if (paymentMethod.value === 'wallet') {
await confirmOrderStatus(orderId);
return;
}
await handlePreparedPayment(payResult, orderId);
} catch (error) {
uni.hideLoading();
show.value = false;
console.error('创建续费订单或支付失败', error);
if (isUnknownPaymentResult(error)) {
markPendingPaymentRefresh(props.paymentRefreshTarget);
}
uni.showToast({ title: getPaymentErrorMessage(error, '操作失败,请稍后重试'), icon: 'none' });
} finally {
submitting.value = false;
}
};
const confirmOrderPayment = async () => {
if (!orderPaymentId.value) return;
submitting.value = true;
uni.showLoading({ title: '准备支付...', mask: true });
try {
const payData = await orderApi.pay(orderPaymentId.value, paymentMethod.value);
uni.hideLoading();
show.value = false;
if (paymentMethod.value === 'wallet') {
await confirmOrderStatus(orderPaymentId.value);
return;
}
if (paymentMethod.value === 'wechat') {
if (!isValidWechatPayConfig(payData?.pay_config)) {
uni.showToast({ title: '支付参数获取失败', icon: 'none' });
return;
}
try {
await wechatH5Pay(payData.pay_config);
await confirmOrderStatus(orderPaymentId.value);
} catch (error) {
handlePaymentError(error);
}
return;
}
if (!isValidAlipayPaymentLink(payData?.payment_link)) {
uni.showToast({ title: '支付链接获取失败', icon: 'none' });
return;
}
await openAlipayPayment(payData.payment_link, props.paymentRefreshTarget);
} catch (error) {
uni.hideLoading();
console.error('订单支付失败', error);
if (isUnknownPaymentResult(error)) {
markPendingPaymentRefresh(props.paymentRefreshTarget);
}
uni.showToast({ title: getPaymentErrorMessage(error), icon: 'none' });
} finally {
submitting.value = false;
}
};
const payOrderDirectly = async (orderId, method = 'wallet') => {
if (!orderId || submitting.value) return;
submitting.value = true;
uni.showLoading({ title: '准备支付...', mask: true });
try {
await orderApi.pay(orderId, method);
uni.hideLoading();
if (method === 'wallet') {
await confirmOrderStatus(orderId);
}
} catch (error) {
uni.hideLoading();
console.error('直接支付订单失败', error);
if (isUnknownPaymentResult(error)) {
markPendingPaymentRefresh(props.paymentRefreshTarget);
}
uni.showToast({ title: getPaymentErrorMessage(error), icon: 'none' });
} finally {
submitting.value = false;
}
};
defineExpose({ open, openOrderPayment, payOrderDirectly });
</script>
<style scoped lang="scss">
.renewal-popup {
width: 600rpx;
max-width: calc(100vw - 80rpx);
padding: 0;
box-sizing: border-box;
background: #fff;
border-radius: 24rpx;
overflow: hidden;
}
.popup-header,
.popup-footer,
.method-left {
display: flex;
align-items: center;
}
.popup-header {
justify-content: space-between;
padding: 30rpx;
border-bottom: 1rpx solid var(--border-light);
}
.popup-title {
color: var(--text-primary);
font-size: 32rpx;
font-weight: 600;
}
.popup-close {
width: 48rpx;
height: 48rpx;
color: var(--text-tertiary);
font-size: 40rpx;
line-height: 48rpx;
text-align: center;
}
.package-summary {
padding: 32rpx 30rpx 24rpx;
background: transparent;
text-align: center;
}
.summary-name {
margin: 0;
color: var(--text-primary);
font-size: 32rpx;
font-weight: 700;
line-height: 1.4;
}
.summary-price {
margin-top: 14rpx;
color: var(--primary);
font-size: 48rpx;
font-weight: 700;
line-height: 1.2;
}
.payment-methods {
padding: 30rpx;
}
.method-item {
display: flex;
align-items: center;
justify-content: space-between;
padding: 24rpx;
margin-bottom: 20rpx;
border: 2rpx solid var(--border-light);
border-radius: var(--radius-medium);
transition: all 0.3s;
&:last-child { margin-bottom: 0; }
&.active {
border-color: var(--primary);
background: rgba(85, 171, 92, 0.05);
}
}
.method-left { gap: 20rpx; }
.method-icon {
width: 64rpx;
height: 64rpx;
}
.method-badge {
display: flex;
align-items: center;
justify-content: center;
background: #07c160;
color: #fff;
font-size: 24rpx;
font-weight: 600;
}
.method-badge-alipay { background: #1677ff; }
.method-name { color: var(--text-primary); font-size: 28rpx; }
.method-locked-label { color: var(--text-tertiary); font-size: 24rpx; white-space: nowrap; }
.method-radio {
width: 36rpx;
height: 36rpx;
border: 2rpx solid var(--gray-400);
border-radius: 50%;
position: relative;
&.checked {
border-color: var(--primary);
background: var(--primary);
&::after {
content: '✓';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
color: #fff;
font-size: 20rpx;
font-weight: 700;
}
}
}
.method-empty {
padding: 28rpx;
color: var(--text-tertiary);
font-size: 26rpx;
text-align: center;
}
.popup-footer {
display: flex;
padding: 30rpx;
gap: 20rpx;
border-top: 1rpx solid var(--border-light);
button {
flex: 1;
margin: 0;
}
}
</style>

View File

@@ -40,32 +40,23 @@
<script setup>
import {
ref,
computed,
watch
computed
} from 'vue';
import {
assetApi
} from '@/api/index.js';
import {
useUserStore
} from '@/store/index.js';
const props = defineProps({
identifier: {
type: String,
default: ''
assetInfo: {
type: Object,
default: null
}
});
const emit = defineEmits(['packageLoaded']);
const userStore = useUserStore();
// 流量数据
const usedMB = ref(0);
const totalMB = ref(0);
const remainMB = ref(0);
// 和首页共用最新资产快照,不保留只在首次进入时加载的套餐缓存。
const metrics = computed(() => props.assetInfo?.current_package_usage_id
? getTrafficMetrics(props.assetInfo)
: { used: 0, total: 0, remain: 0 });
const usedMB = computed(() => metrics.value.used);
const totalMB = computed(() => metrics.value.total);
const remainMB = computed(() => metrics.value.remain);
const toMB = (value) => Number(value) || 0;
@@ -125,39 +116,6 @@
};
};
// 加载套餐流量数据
const loadPackageData = async () => {
const identifier = props.identifier || userStore.state.identifier;
if (!identifier) return;
try {
const data = await assetApi.getInfo(identifier);
if (data.current_package_usage_id) {
const metrics = getTrafficMetrics(data);
usedMB.value = metrics.used;
totalMB.value = metrics.total;
remainMB.value = metrics.remain;
emit('packageLoaded', data);
} else {
usedMB.value = 0;
totalMB.value = 0;
remainMB.value = 0;
emit('packageLoaded', null);
}
} catch (e) {
console.error('加载套餐流量数据失败', e);
}
};
// 监听 identifier 变化
watch(() => props.identifier || userStore.state.identifier, (newVal) => {
if (newVal) {
loadPackageData();
}
}, {
immediate: true
});
</script>
<style scoped lang="scss">

View File

@@ -2,11 +2,19 @@
<view class="card user-info-card interactive">
<view class="flex-row-g20">
<view class="user-details flex-col-g8">
<view class="flex-row-g20">
<view class="info-copy-row">
<view class="title">{{ currentCardNo || '-' }}</view>
<button class="copy-button" @tap.stop="copyText(currentCardNo, '号码')" aria-label="复制号码">复制</button>
</view>
<view v-if="!isDevice" class="info-copy-row">
<view class="caption">ICCID:{{ deviceInfo.iccid || '-' }}</view>
<button class="copy-button" @tap.stop="copyText(deviceInfo.iccid, 'ICCID')" aria-label="复制ICCID">复制</button>
</view>
<view class="caption">套餐名称:{{ deviceInfo.packageName || '-' }}</view>
<view class="caption">套餐到期时间:{{ deviceInfo.expireDate || '-' }}</view>
<view class="caption" :class="{ 'expiry-warning': isExpiring }">
套餐到期时间:{{ deviceInfo.expireDate || '-' }}
<text v-if="isExpiring && expiryDays !== null">(剩余 {{ expiryDays }} 天)</text>
</view>
</view>
<view v-if="isDevice" class="tag-apple" :class="onlineStatus === '在线' ? 'tag-success' : 'tag-warning'">
{{ onlineStatus }}
@@ -15,27 +23,63 @@
{{ networkStatus == 1 ? '正常' : '停机' }}
</view>
</view>
<!-- <up-button v-if="hasPackageName" class="renew-button" type="primary" size="small"
@tap.stop="emit('renew')">立即续费</up-button> -->
</view>
</template>
<script setup>
defineProps({
import { computed } from 'vue';
const emit = defineEmits(['renew']);
const props = defineProps({
currentCardNo: { type: String, default: '' },
deviceInfo: { type: Object, default: () => ({}) },
onlineStatus: { type: String, default: '离线' },
networkStatus: { type: [String, Number], default: '离线' },
isDevice: { type: Boolean, default: true }
isDevice: { type: Boolean, default: true },
isExpiring: { type: Boolean, default: false },
expiryDays: { type: [Number, String], default: null }
});
const hasPackageName = computed(() => {
const packageName = String(props.deviceInfo?.packageName || '').trim();
return Boolean(packageName && packageName !== '-');
});
const copyText = (value, label) => {
const text = String(value || '').trim();
if (!text || text === '-') return;
uni.setClipboardData({
data: text,
success: () => uni.showToast({ title: `${label}已复制`, icon: 'success' })
});
};
</script>
<style scoped lang="scss">
.user-info-card {
color: var(--text-primary);
.expiry-warning { color: var(--danger); }
.user-details {
flex: 1;
}
.info-copy-row {
display: flex;
align-items: center;
gap: 12rpx;
}
.renew-button {
margin: 24rpx 0 0;
width: 180rpx;
margin-left: auto;
}
}
</style>

View File

@@ -3,7 +3,8 @@
<view class="card-header flex-row-sb">
<view class="title">WiFi配置</view>
<view class="btn-group">
<button class="btn-apple btn-primary btn-mini" @tap="$emit('modify')">修改</button>
<button class="btn-apple btn-primary btn-mini" @tap="copyConfig">复制配置</button>
<button class="btn-apple btn-primary btn-mini" @tap="$emit('modify')">修改配置</button>
</view>
</view>
<view class="wifi-info flex-col-g16 mt-30">
@@ -12,25 +13,27 @@
<view class="caption">网络名称</view>
<view class="subtitle">{{ deviceInfo.ssidName }}</view>
</view>
<button class="btn-apple btn-primary btn-mini" @tap="$emit('copy', deviceInfo.ssidName)">复制</button>
</view>
<view class="wifi-item flex-row-sb">
<view class="wifi-details flex-col-g8">
<view class="caption">连接密码</view>
<view class="subtitle">{{ deviceInfo.ssidPwd }}</view>
</view>
<button class="btn-apple btn-primary btn-mini" @tap="$emit('copy', deviceInfo.ssidPwd)">复制</button>
</view>
</view>
</view>
</template>
<script setup>
defineProps({
const props = defineProps({
deviceInfo: { type: Object, default: () => ({}) }
});
defineEmits(['modify', 'copy']);
const emit = defineEmits(['modify', 'copy-config']);
const copyConfig = () => {
emit('copy-config', `网络名称: ${props.deviceInfo.ssidName || ''} 连接密码: ${props.deviceInfo.ssidPwd || ''}`);
};
</script>
<style scoped lang="scss">

View File

@@ -9,6 +9,9 @@ services:
- '3003:80'
networks:
- device-voice-network
tmpfs:
- /run:rw
- /tmp:rw
healthcheck:
test: ['CMD', 'wget', '--no-verbose', '--tries=1', '--spider', 'http://127.0.0.1:80/health']
interval: 30s

View File

@@ -0,0 +1,335 @@
# 第 1 批(8-9 月迭代缺陷修复)前端对接说明
| 项目 | 内容 |
|---|---|
| 日期 | 2026-10-12 |
| 范围 | 分支 `Iteration/8-11` 上第 1 批 12 项(M1~M6、M8、M9、M12~M14、M16、M23、F1) |
| 用途 | 前端工程师对照修改:哪些接口变了、怎么变的、前端要做什么 |
| 接口细节以 | `docs/admin-openapi.yaml`(已重新生成)为准;本文来自代码与该文档的核对 |
| 环境 | 已部署测试环境,未上生产 |
> 路径前缀:后台接口为 `/api/admin/...`,H5(C 端)接口为 `/api/c/v1/...`。
> 所有改动都向后兼容:只新增字段 / 枚举值,**唯一的删除字段是 M16 的 `real_data_mb`**;唯一的校验收紧是密码规则与 CSV 表头。
---
## 一、前端必须改动的清单(速查)
| # | 项 | 端 | 动作 | 优先级 |
|---|---|---|---|---|
| 1 | M3 订单详情/列表 | 后台 | 加 3 个字段;详情加支付单列表 | 必改 |
| 2 | M8、M14 新状态「审批提交失败」 | 后台 + H5 | 5+1 个业务的状态枚举、筛选、标签、按钮显隐 | 必改 |
| 3 | M1 密码规则 | 后台 + H5 | 7 处设置密码的页面校验与提示文案 | 必改 |
| 4 | M12 换货被拒 | 后台 | 读取错误响应 `data.phone` 拼接提示 | 必改 |
| 5 | F1 绑定手机号 | H5 | 登录响应新增 2 个布尔字段,绑定流程判断改变 | 必改 |
| 6 | M9 临期提醒 | H5 | 资产详情新增 `expiry_reminder` 弹窗;通知中心已按资产过滤 | 必改 |
| 7 | M16 预警页面 | 后台 | 规则页去掉流量额度;预警列表加阈值流量 | 必改 |
| 8 | M2 批量换绑业务员 | 后台 | CSV 模板表头改名(若前端内置模板/文案) | 视情况 |
| 9 | M23 设备导入 | 后台 | 导入说明文案:IMEI 必填 | 文案 |
| 10 | M4~M6 导出补列 | — | 前端无需改动 | 无 |
---
## 二、逐项说明
### 1. M3 后台订单显示 C 端在线支付信息
**涉及接口**
| 方法 | 路径 | 变化 |
|---|---|---|
| GET | `/api/admin/orders` | 每条订单新增 3 个字段 |
| POST | `/api/admin/orders` | 返回体同为 `OrderResponse`,同样带 3 个字段 |
| GET | `/api/admin/orders/{id}` | 3 个字段 + 新增 `payments` 数组(响应类型变为 `OrderDetailResponse`) |
**新增字段(均始终返回,无值为空串)**
| 字段 | 类型 | 说明 |
|---|---|---|
| `third_party_trade_no` | string | 交易流水号 |
| `payment_channel` | string | 支付渠道:`wechat` 微信直连 v3 / `wechat_v2` 微信直连 v2 / `fuiou` 富友 |
| `payment_merchant_name` | string | 收款商户名称 |
- 只有「个人客户 + 微信或支付宝 + 已支付(含之后已退款)」的订单有值;代理购买、钱包、线下、未支付订单一律为空串。
**详情新增 `payments`(订单详情专有,列表不返回)**
仅个人客户微信/支付宝订单有数据,其余为 `[]`;按创建时间倒序(最新在前)。每项:
| 字段 | 说明 |
|---|---|
| `payment_no` | 支付单号 |
| `payment_method` | `wechat` / `alipay` |
| `payment_channel` | 同上 |
| `payment_merchant_name` | 商户名称 |
| `third_party_trade_no` | 交易流水号(未支付为空串) |
| `amount` | 金额(分) |
| `status` / `status_name` | 0 待支付 / 1 已支付 / 2 已失败 / 3 已退款 |
| `created_at` / `paid_at` / `expire_at` | 创建 / 支付 / 过期时间(后两者可为 null) |
**前端要做**:订单列表、详情加三个字段列;详情页加「支付记录」表格(可看出「付了钱没成功」、重复支付、换过支付方式)。
---
### 2. M8、M14 新状态「审批提交失败」(影响 6 个业务)
企微审批没能提交成功时,业务单不再卡在「审批中」,而是变为**终态**「审批提交失败」。各业务新增状态值如下(**数值各业务不同,不要共用一个枚举**):
| 业务 | 新状态值 | 字段 | 涉及接口 | 重新发起方式 |
|---|:-:|---|---|---|
| 核销申请(员工代收款) | **4** | `status` / `application_status` | `GET/POST /api/admin/employee-collection-applications`、`GET/PUT /api/admin/employee-collection-applications/{id}`、`GET /api/admin/employee-collection-bills/{id}` | `PUT /api/admin/employee-collection-applications/{id}`(重新提交,生成新审批) |
| 退款 | **7** | `status` | `GET/POST /api/admin/refunds`、`GET /api/admin/refunds/{id}`、`/{id}/trigger-approval`、`/{id}/offline-settlement` | `POST /api/admin/refunds/{id}/resubmit` |
| 扫码注册代理 | **3** | `status` | `GET /api/admin/agent-distribution-registrations`、`.../{id}`;H5 `POST /api/c/v1/agent-distribution-registrations` | 申请人重新申请(走原申请入口,生成新的注册申请) |
| 线下充值(代理自充) | **7** | `status` | `GET/POST /api/admin/agent-recharges`、`.../{id}`、`/{id}/offline-pay`、`/{id}/payment-status`、`/{id}/trigger-approval` | 重新发起(后端没有对原单的单独接口,前端调 `POST /api/admin/agent-recharges` 新建线下充值单) |
| 佣金提现 | **5** | `status` | `GET /api/admin/commission/withdrawal-requests`、`/{id}/approve`、`/{id}/reject`;`GET /api/admin/shops/{shop_id}/withdrawal-requests` | `PUT /api/admin/shops/{shop_id}/withdrawal-requests/{id}`(重新提交,按新金额重新冻结) |
| 提现资料资格 | **4** | `status` | `GET/POST /api/admin/shops/{shop_id}/withdrawal-qualifications` | 重新提交资料版本 |
**列表筛选参数的取值范围同步放宽**:
- 退款 `status` 查询:`min=1,max=6` → `max=7`
- 佣金提现 `status`:`max=4` → `max=5`
- 核销 `status`:`oneof 0 1 2 3` → 加 `4`
- 扫码注册代理 `status`:`oneof 0 1 2` → 加 `3`
- 提现资料资格 `status`:`oneof 0 1 2 3` → 加 `4`
- 线下充值 `status` 过滤:说明增加 `7`
**行为变化(前端按钮显隐)**
- 状态为「审批提交失败」的单据**不能再点「恢复审批」**(接口会拒绝):
- `POST /api/admin/refunds/{id}/recover-approval`
- `POST /api/admin/employee-collection-applications/{id}/recover-approval`
- `POST /api/admin/agent-distribution-registrations/{id}/recover-approval`
只显示「重新发起」。
- 「提交结果未知」不是失败,仍显示「恢复审批」,由后台任务确认。
- 佣金提现变为 5 后,**冻结金额已自动释放**;重新发起时重新冻结。
- 核销申请:释放预占金额,账单可再次核销。
**核销申请额外变化(M8)**:`approval_submission_status` 以前恒为空,现在返回真实值:
`0 待提交 / 1 提交中 / 2 已提交 / 3 提交失败 / 4 结果未知`(无审批上下文为 0)。列表与详情都有。
**前端要做**:
1. 6 处状态枚举/标签/颜色补充新值(建议红色或灰色,标注「终态」);
2. 列表筛选下拉加该选项;
3. 操作按钮:该状态隐藏「恢复审批」,保留「重新发起」;
4. 核销申请列表/详情展示「审批提交状态」。
---
### 3. M1 登录密码统一规则
**新规则(后端强制)**:长度 **8~12 位**;大写字母、小写字母、数字、特殊符号**至少包含三类**;不能有空格和中文。
例:`Abc12345` ✅,`abcd1234` ❌(只有两类)。
**涉及的 7 个入口**
| 场景 | 方法与路径 | 字段 | 旧规则 → 新规则 |
|---|---|---|---|
| 本人修改密码 | `PUT /api/auth/password` | `new_password` | 8~32 → 8~12 + 三类 |
| 创建后台账号 | `POST /api/admin/accounts` | `password` | 8~32 → 8~12 + 三类 |
| 修改账号 | `PUT /api/admin/accounts/{id}` | `password`(可选) | 同上 |
| 修改账号密码 | `PUT /api/admin/accounts/{id}/password` | `new_password` | 同上 |
| 创建店铺(含初始账号) | `POST /api/admin/shops` | `init_password` | 8~32 → 8~12 + 三类 |
| 创建企业客户 | `POST /api/admin/enterprises` | `password` | 6~20 → 8~12 + 三类 |
| 修改企业密码 | `PUT /api/admin/enterprises/{id}/password` | `password` | 6~20 → 8~12 + 三类 |
| 扫码注册代理(H5) | `POST /api/c/v1/agent-distribution-registrations` | `password` | 6~64 → 8~12 + 三类 |
**错误提示变化**:修改密码以前只返回「参数验证失败」,现在是字段级提示,直接展示 `message` 即可,例如:
- `修改密码参数不合法:新密码长度不能小于 8`
- `修改密码参数不合法:密码须包含大写字母、小写字母、数字、特殊符号中的至少三类`
**不变**:已在用的旧密码照常登录,不强制改;超级管理员操作密码、WiFi 密码不受影响。
**前端要做**:上述页面的前端校验、输入框 `maxlength`、占位/提示文案同步为新规则;错误提示直接显示后端返回的 `message`。
---
### 4. M12 换货:新资产已绑手机号时被拒
**涉及接口**
| 方法 | 路径 | 场景 |
|---|---|---|
| POST | `/api/admin/exchanges` | 创建换货单 |
| POST | `/api/admin/exchanges/{id}/complete` | 物流换货确认完成 |
**变化**
- 旧逻辑「新资产被人扫过码就拒绝」**取消**。
- 新逻辑:新资产存在**有效手机号关联**才拒绝,错误码 **1202**,`message`:
`新资产已绑定手机号,请先在后台解除该资产的手机号绑定,再重新提交换货申请`
- 完整手机号放在错误响应的 **`data.phone`**(message 与日志中都不含号码)。
- `complete` 接口被拒时,换货单停在「已发货待确认」,解除后可重新确认。
**响应示例**
```json
{
"code": 1202,
"msg": "新资产已绑定手机号,请先在后台解除该资产的手机号绑定,再重新提交换货申请",
"data": { "phone": "138xxxxxxxx" }
}
```
**前端要做**:捕获 1202 时读取 `data.phone`,弹窗提示「新资产已绑定手机号 {phone},请先到『手机号资产关联』解除后再提交」,并可跳转/引导到解除入口。解除使用已有接口(无新增):
- `DELETE /api/admin/phone-asset-associations/{id}`(单条)
- `POST /api/admin/phone-asset-associations/batch-unbind`(按资产批量)
- `POST /api/admin/phone-asset-associations/unbind-imports`(CSV)
- `GET /api/admin/phone-asset-associations`(查询)
**换货完成后的副作用(供前端提示参考)**:旧资产的手机号关联和客户绑定都被清空,原客户已打开的旧资产页面会失效,需重新扫码。
---
### 5. F1 一个资产只能绑一个手机号
**涉及接口(H5)**
| 方法 | 路径 | 变化 |
|---|---|---|
| POST | `/api/c/v1/auth/wechat-login` | 响应新增 2 个字段,`need_bind_phone` 语义改变 |
| POST | `/api/c/v1/auth/miniapp-login` | 同上 |
| POST | `/api/c/v1/auth/bind-phone` | 资产已绑其他号时返回 **1192** |
| POST | `/api/c/v1/auth/change-phone` | 只换客户手机号,不再连带改资产 |
**登录响应新增字段**
| 字段 | 说明 |
|---|---|
| `asset_phone_bound` | 当前资产是否已绑定手机号(不返回号码) |
| `asset_phone_is_own` | 资产绑定的号码是否为当前客户自己的号(不返回号码) |
| `need_bind_phone`(语义变更) | 强制绑定开关开启时:客户无手机号,**或**当前资产尚无有效手机号关联 → `true`;开关关闭恒为 `false`。仅前端提示用 |
**四种场景对应的前端流程**
| 客户 | 资产 | 前端应该 |
|---|---|---|
| 无号 | 无号 | 验证一次手机号,客户和资产都写入这个号 |
| 有号 | 无号 | 要求给资产绑号,可以和客户的号不同 |
| 无号 | 已有号 | 只要求客户绑自己的号,资产不动 |
| 有号 | 已有号 | 不用绑 |
**新错误**:`bind-phone` 资产已绑定其他号码时,返回 **1192**「该资产已绑定手机号,如需更换请联系管理员」(不含号码)。前端提示用户联系管理员,不要重试。手机号已被其他客户绑定的 **1184** 不变。
**前端要做**:绑定页根据 `asset_phone_bound` / `asset_phone_is_own` / `need_bind_phone` 决定是否展示绑定入口;处理 1192;客户换号后不要假设资产号码跟着变。
---
### 6. M9 套餐临期提醒:按资产、扫码进入时触发
**涉及接口(H5)**
| 方法 | 路径 | 变化 |
|---|---|---|
| GET | `/api/c/v1/asset/info` | 新增可选字段 `expiry_reminder` |
| GET | `/api/c/v1/notifications` | 临期提醒只返回当前资产的(入参不变) |
| GET | `/api/c/v1/notifications/unread-count` | 未读数只计当前资产的临期提醒 |
| POST | `/api/c/v1/notifications/read-all` | 其他资产的临期提醒保持未读 |
**`expiry_reminder`(可选,无则不返回该字段)**
| 字段 | 说明 |
|---|---|
| `remaining_days` | 剩余自然日(0~15,按上海时区) |
| `expires_at` | 预计最终到期时间 |
| `level` | `red`(0~3 天)/ `purple`(4~7 天)/ `pink`(8~15 天) |
| `level_name` | 等级中文名 |
**规则**:同一客户、同一资产、同一天(北京时间)**只返回一次**;返回的同时后端已写一条通知。当天再次进入不再返回。
**前端要做**:资产详情页判断到 `expiry_reminder` 存在时弹窗/横幅提醒;不要用旧的「每日推送的临期通知」做弹窗依据(已不再给个人客户发);通知中心无需改,后端已按当前资产过滤。
---
### 7. M16 真流量预警页面口径整理
| 方法 | 路径 | 变化 |
|---|---|---|
| GET | `/api/admin/package-traffic-alert-rules` | 规则列表**删除字段 `real_data_mb`** |
| GET | `/api/admin/package-traffic-alert-rules/{id}` | 规则详情**删除字段 `real_data_mb`** |
| GET | `/api/admin/package-traffic-alerts` | 预警列表新增 `threshold_mb` |
| GET | `/api/admin/package-traffic-alerts/{id}` | 预警详情新增 `threshold_mb` |
| 导出 | 预警导出任务 | 新增列「阈值流量」,放在**最后一列** |
- `threshold_mb`(float,保留两位小数)= 额度快照 × 阈值百分比 ÷ 100,口径为「主套餐 + 加油包」。
- `used_mb`、`limit_mb` 字段不变,说明改为「主套餐与加油包汇总」。
- 规则页现在只返回:`id`、`package_id`、`package_name`、`threshold_percent`、`enabled`、`enabled_name`、`remark`、`updated_at`。
**前端要做**:规则列表/详情去掉「套餐流量额度」列及相关引用(否则显示 `undefined`);预警列表/详情加「阈值流量(MB)」;已用/总量列标题可注明「含加油包」。
> 注意:`/api/admin/packages` 等套餐接口里的 `real_data_mb` 是套餐本身字段,**没有变化**,不要误删。
---
### 8. M2 批量换绑业务员 CSV 表头改名
| 方法 | 路径 |
|---|---|
| POST | `/api/admin/shops/business-owner-imports` |
- CSV 固定表头改为:`店铺编码`、`操作类型`、**`平台登录账号`**、`备注`(原为「业务员登录账号」)。
- **「平台登录账号」这一列只填手机号**;填用户名会失败,原因提示「请填写手机号」。
- 旧表头整批失败(提示表头不符),不做新旧并存。
- 失败原因分开:格式不对、手机号不存在、不是平台用户、账号已禁用、匹配到多个账号。
- 接口路径、请求体不变;逐行独立处理,成功行与失败行互不影响。
**前端要做**:如果前端内置/下载模板或有填写说明,改为新表头并注明「填写平台用户的登录手机号」;失败明细按后端返回的原因原样展示即可。
---
### 9. M23 设备导入 IMEI 必填
| 方法 | 路径 |
|---|---|
| POST | `/api/admin/devices/import` |
- 请求结构、模板列名/列数/列序**都不变**。
- `imei` 为空(含只填空格)的行**导入失败**,失败原因「设备IMEI(imei)不能为空」,出现在任务详情的 `failed_items`(带行号)。
- 同一文件内 IMEI 齐全的行照常导入;整份文件都失败时任务状态为「失败」。
- 只校验非空,不校验格式与重复。
**前端要做**:导入页说明文案标注「IMEI 必填」;任务详情照常展示 `failed_items`。
---
### 10. M4~M6 三类导出补列(前端无需改动)
| 导出 | 新增 |
|---|---|
| 订单导出 | 最后一列「操作人」 |
| IoT 卡导出 | 最后一列「套餐到期时间」(算不准留空) |
| 设备导出 | 流量表头注明「(MB)」,最后一列「设备合计(GB)」 |
只有**新建**的导出任务带新列,历史任务重新下载仍是旧表头,不会错位。
---
### 11. M13:企微拒绝/撤销/删除后退款单结束(后端修复,前端关注点)
**无接口字段变化**。修复后,企微侧「拒绝/撤销/删除」会让退款单正确变为「已拒绝」(status = 3),资产可再换货。
**前端关注**:
- 不支持在企微里「重新提交」(企微新审批单卡管不关联);已拒绝的退款单请在卡管用 `POST /api/admin/refunds/{id}/resubmit` 重新发起。
- 如页面有提示「可在企微重新提交」之类文案,请去掉。
---
## 三、新增 / 变化的错误码
| 码 | 接口 | 含义 | 前端处理 |
|---|---|---|---|
| 1202 | `POST /api/admin/exchanges`、`.../{id}/complete` | 新资产已绑定手机号 | 读 `data.phone`,引导去后台解除 |
| 1192 | `POST /api/c/v1/auth/bind-phone` | 资产已绑定其他手机号 | 提示联系管理员,不重试 |
| 参数不合法 | 密码相关 7 个入口 | 带字段级原因的 `message` | 直接展示 `message` |
---
## 四、联调自测建议
1. 订单:用 C 端微信已支付订单看详情,`payments` 有记录、三个字段与支付单一致;代理/钱包订单三个字段为空串、`payments=[]`。
2. 状态枚举:造一个提交失败的单据(缺必填控件映射可复现),检查 6 类业务列表、筛选、按钮显隐。
3. 密码:`Abc12345` 通过;`abcd1234`、`Abc1234`(7 位)、`Abc123456789X`(13 位)被拒且提示文案可读。
4. 换货:对已绑手机号的资产发起换货,应弹出含号码的提示;后台解除后重新提交成功。
5. H5:同一客户绑定两个临期资产,进入 A 只看到 A 的提醒,当天再进不再出现。
6. 预警:规则页无流量额度;预警列表有阈值流量。
## 五、不需要前端改动的内容
- C 端订单接口、H5 退款接口无变化。
- 预警判定逻辑、套餐接口(`real_data_mb` 在套餐里仍存在)无变化。
- M13 无字段变化;M4~M6 导出由后端新增列。

File diff suppressed because it is too large Load Diff

View File

@@ -376,7 +376,102 @@ data:
- wallet_balance:钱包余额(分)
## 3.2 资产套餐历史
## 3.2 资产套餐历史(当前契约)
URL:
GET /api/c/v1/asset/package-history
更新说明(2026-09-08):
* 套餐历史已改为主套餐—加油包关系组。`items` 只包含顶层关系组;关联加油包位于所属主项的 `children` 中,子项绝不会跨页返回。
* `total` 为筛选后的顶层关系组数量,分页壳使用 `page`、`size`、`total`;其中 `size` 表示每页顶层关系组数量。
* 传入 `status` 和 `package_type` 时,两项必须由同一条使用记录联合命中;主项或任一子项命中时,接口均返回完整关系组,客户端不得对组内节点二次过滤。
* 加油包通过 `master_usage_id` 标识关联主套餐使用记录。关联主套餐物理缺失时,节点以独立顶层项返回并设置 `relationship_status: "master_missing"`;关联主套餐存在但读取或展示失败时,接口按统一错误响应返回失败。
Query 参数:
- identifier(string,必填)- 资产标识符(SN/IMEI/虚拟号/ICCID/MSISDN),长度 1–50
- package_type(string,可选)- 套餐类型(formal:正式套餐;addon:加油包)
- status(integer,可选)- 套餐状态(0:待生效;1:生效中;2:已用完;3:已过期;4:已失效)
- page(integer,必填)- 页码,最小为 1
- page_size(integer,必填)- 每页顶层关系组数量,范围 1–100
成功响应:
```json
{
"code": 0,
"msg": "success",
"timestamp": "2026-09-08T00:00:00Z",
"data": {
"items": [
{
"activated_at": "2026-09-01T00:00:00Z",
"children": [
{
"children": [],
"expand_by_default": false,
"master_usage_id": 5001,
"package_id": 1002,
"package_name": "5GB加油包",
"package_type": "addon",
"package_usage_id": 5002,
"status": 1,
"status_name": "生效中"
}
],
"created_at": "2026-09-01T00:00:00Z",
"enable_virtual_data": false,
"expand_by_default": true,
"expires_at": "2026-09-30T23:59:59Z",
"master_usage_id": null,
"order_id": 0,
"package_id": 1001,
"package_name": "10GB月套餐",
"package_type": "formal",
"package_usage_id": 5001,
"priority": 1,
"real_total_mb": 10240,
"real_used_mb": 2048,
"reduction_pct": 0,
"status": 1,
"status_name": "生效中",
"usage_type": "single_card",
"virtual_total_mb": 10240,
"virtual_used_mb": 2048
}
],
"page": 1,
"size": 10,
"total": 1
}
}
```
`data.items[]` 为递归节点,所有节点均可包含以下字段:
- activated_at(date-time,可空):激活时间
- children(array):关联加油包或下级关联节点
- created_at(date-time):购买创建时间
- enable_virtual_data(boolean):是否启用虚流量
- expand_by_default(boolean):是否默认展开 `children`
- expires_at(date-time,可空):到期时间
- master_usage_id(integer,可空):关联主套餐使用记录 ID;普通主项为 `null`
- order_id(integer):历史兼容字段,始终输出零值 `0`,不填充真实订单 ID
- package_id、package_name、package_type、package_usage_id:套餐及使用记录标识;`package_type` 为 `formal` 或 `addon`
- priority:优先级
- real_total_mb、real_used_mb:真实总量和真实已用量(MB)
- virtual_total_mb、virtual_used_mb:业务停机阈值和展示已用量(MB)
- reduction_pct:展示增幅比例
- status、status_name:套餐状态及名称
- usage_type:使用类型(single_card/device)
- relationship_status、relationship_status_name:关系异常状态及名称;仅在主套餐物理缺失时返回 `master_missing`
错误响应:
- HTTP 400:请求参数错误
- HTTP 401:未认证或认证已过期
- HTTP 403:无权访问
- HTTP 500:服务器内部错误,包括关联主套餐存在但读取或展示失败
以上失败场景均使用统一 `ErrorResponse`:`code`、`msg`、`timestamp`,可选 `data`。H5 通过共享请求层展示后端返回的 `msg`;401 同时清除登录状态并跳转登录页。
## 3.2 资产套餐历史(旧版,已废弃)
URL:
GET /api/c/v1/asset/package-history

View File

@@ -0,0 +1,286 @@
# 七月迭代 H5/C 端改动说明
本文根据《七月迭代实现与接口对接说明》整理,重点说明本期 H5/C 端需要调整的页面、接口和预期效果。
## 一、改动总览
本期 H5/C 端主要涉及以下功能:
1. 店铺 C 端登录限制。
2. 实名认证流程和实名状态展示。
3. 支付方式展示与支付提交。
4. 下架套餐老客户续费。
5. 预计套餐最终到期时间展示。
6. 套餐临期提醒。
7. 换货通知提醒。
8. C 端订单字段展示调整。
## 二、具体改动说明
### 1. 店铺 C 端登录限制(#41)
#### 前端改动
资产验证后,根据接口返回结果判断是否允许登录。如果接口返回店铺已禁止 C 端登录,应直接展示后端错误提示,不继续获取或保存资产 Token。
#### 接口
```http
POST /api/c/v1/auth/verify-asset
```
#### 预期效果
- 被限制的店铺无法新登录 H5/C 端。
- 前端展示后端返回的业务错误信息。
- 已经签发的 Token 不会被强制吊销。
### 2. 实名认证流程(#62)
#### 前端改动
资产初始化时只使用后端返回的实名策略和实名状态,不要根据卡、设备或前端本地规则自行推断。
重点使用以下字段:
- `effective_realname_policy`
- `realname_required`
- `real_name_status`
#### 接口
```http
GET /api/c/v1/asset/info?identifier=...
```
#### 预期效果
- `none`:不需要实名。
- `before_order`:下单前要求实名。
- `after_order`:下单后要求实名。
- 卡和设备存在策略冲突时,以设备最终生效策略为准。
- 设备只要有一张有效绑定卡已实名,即视为设备已实名。
### 3. 支付方式展示和提交(#48)
#### 前端改动
支付按钮和支付方式列表必须使用后端返回的 `allowed_payment_methods`,不能在前端写死卡、设备的微信、支付宝或钱包规则。
下单或充值时必须将用户选择的 `payment_method` 传给后端;微信支付场景按接口要求传递 `app_type`。
#### 接口
资产初始化:
```http
GET /api/c/v1/asset/info
```
充值前校验:
```http
GET /api/c/v1/wallet/recharge-check
```
创建订单:
```http
POST /api/c/v1/orders/create
```
钱包充值:
```http
POST /api/c/v1/wallet/recharge
```
#### 预期效果
- 不同资产类型显示正确的支付方式。
- 强充和普通充值遵循后端允许的支付配置。
- 前端无法绕过后端支付限制。
- 支付方式变化后,前端无需重新发布即可按接口结果生效。
### 4. 下架套餐老客户续费(#40)
#### 前端改动
普通套餐列表中不展示下架套餐,但当前正在使用下架套餐的老客户仍可通过资产信息或历史订单获取套餐 ID,并继续调用现有创建订单接口。
创建订单时传递:
- 选中的套餐 ID;
- 资产 `identifier`;
- 当前允许的 `payment_method`。
#### 接口
获取当前资产套餐:
```http
GET /api/c/v1/asset/info
```
获取历史订单:
```http
GET /api/c/v1/orders
GET /api/c/v1/orders/:id
```
创建续费订单:
```http
POST /api/c/v1/orders/create
```
相关返回字段:
- 资产信息中的 `current_package_id`;
- 历史订单中的 `package_ids`。
#### 预期效果
- 老客户可以继续续费已下架套餐。
- 不新增专用续费接口,仍复用普通创建订单接口。
- 新客户和代理代购仍不能购买下架套餐。
- 历史订单数据不被修改。
### 5. 预计套餐最终到期时间(#46)
#### 前端改动
资产详情、资产列表等页面展示后端返回的预计最终到期时间,不要只展示当前套餐的到期时间。
重点使用:
- `estimated_final_expires_at`
- `is_expiring`
- 剩余天数及临期等级字段(如接口返回)
#### 接口
```http
GET /api/c/v1/asset/info
```
#### 预期效果
- 用户看到资产综合计算后的最终到期时间。
- 临期资产可以按后端返回的临期字段进行高亮。
- 避免因只显示当前套餐到期时间导致到期日期不准确。
### 6. 套餐临期提醒(#33)
#### 前端改动
接入 C 端现有站内通知能力,读取未读通知并在合适时机展示弹窗或提醒入口。
#### 接口
获取未读数量:
```http
GET /api/c/v1/notifications/unread-count
```
获取通知列表:
```http
GET /api/c/v1/notifications
```
标记已读:
```http
PUT /api/c/v1/notifications/:id/read
```
#### 预期效果
- 在套餐剩余 15 天、7 天、3 天时触发提醒。
- 前端可按后端返回的临期等级进行展示。
- 0~3 天的临期提醒优先级最高。
- 通知通过 C 端站内消息展示,不新增企微业务员提醒。
### 7. 换货通知提醒(#188)
#### 前端改动
继续使用现有 C 端通知接口,展示换货相关的未读通知,并支持点击后标记已读。
#### 接口
```http
GET /api/c/v1/notifications/unread-count
GET /api/c/v1/notifications
PUT /api/c/v1/notifications/:id/read
```
#### 预期效果
- 换货创建后,用户可以在 H5/C 端收到站内通知。
- 首页或通知入口能够展示未读数量。
- 用户查看后可以正常标记已读。
- 不新增营销投放、ERP 或其他业务单据。
### 8. C 端订单字段展示(#181)
#### 前端改动
订单列表和订单详情使用后端返回的订单角色及资产标识字段。
重点字段:
- `purchase_role`
- `asset_identifier`
设备资产标识的显示规则:
1. 优先显示 `VirtualNo`;
2. `VirtualNo` 为空时显示 `IMEI`;
3. 不使用 SN 冒充订单设备标识;
4. 历史空数据不需要前端伪造。
#### 接口
```http
GET /api/c/v1/orders
GET /api/c/v1/orders/:id
```
#### 预期效果
- 订单中的购买角色显示准确。
- 卡展示正确的 ICCID 或资产标识。
- 设备展示 VirtualNo,缺失时使用 IMEI。
- 订单资产标识与退款、换货等业务中的固化快照保持一致。
## 三、H5/C 端不需要改动的内容
以下事项本期明确不需要 H5/C 端新增功能或接口:
- #84 H5 首页隐藏设备下 ICCID:本期确认不做。
- #73 行业卡未实名复机:保持现有逻辑。
- #94 状态同步和运营商回调:继续读取现有资产状态字段,无新增 H5/C 端调用。
- 企业微信审批回调:H5/C 端不调用。
- 原路退款、聚水潭、跨品类换货、分销码/佣金提现:本期不做。
## 四、H5/C 端联调注意事项
- 金额接口字段默认单位为“分”,页面展示时转换为“元”,提交时仍传整数分。
- `effective_realname_policy` 和 `allowed_payment_methods` 必须以后端返回值为准。
- 企微审批业务只读展示 `approval_provider`、`approval_status`、`approval_status_name`,不能再显示旧的人工通过、驳回或线下充值确认按钮。
- 企微回调接口由企微服务器调用,H5/C 端不调用:
```http
GET/POST /api/callback/wecom/approval/:application_id
```
- 前端不要根据接口名称自行假设存在“下架套餐续费接口”,续费仍调用:
```http
POST /api/c/v1/orders/create
```

View File

@@ -0,0 +1,284 @@
# 七月迭代实现与接口对接说明
> 面向:产品、前端、测试和联调人员
> 范围:`deliver-july-iteration-confirmed-scope` 及本期确认“后端已完成,只需前端联调”的需求
> 接口细节:以 [`docs/admin-openapi.yaml`](../admin-openapi.yaml) 为准,本文只说明关键调用和字段变化。
## 一、先看这几个关键结论
1. **设备没有限速接口**:限速只允许对 IoT 卡 ICCID 操作,固定档位 `-1~8`,不通过设备绑定卡间接限速。
2. **企微模板在企微后台创建**:系统只配置应用、默认发起人、账号 userid 绑定、`template_id` 和控件映射,不在本系统设计审批节点。
3. **代理发起审批走默认发起人**:企微单据使用配置的默认成员发起,但退款、充值等本地业务单仍记录真实代理提交人。
4. **下架套餐续费不新增专用接口**:历史订单和资产信息返回稳定套餐 ID,前端仍调用现有 C 端创建订单接口生成一张新订单。
5. **实名流程由后端返回值决定**:前端使用 `effective_realname_policy`,不能按卡或设备自行推断;设备有任意一张有效绑定卡已实名即视为已实名。
6. **支付按钮由后端返回值决定**:前端使用 `allowed_payment_methods`,不要自行写死卡/设备的微信、支付宝或钱包规则。
7. **设备批量分配只复用导入任务外壳**:复用任务表、队列、进度和结果页;不会进入原 Excel 创建设备逻辑。
8. **系列套餐批量授权后端原本就支持多选**:前端把多选套餐组装为 `packages[]` 调现有接口即可,不需要新后端接口。
## 二、本期需求怎么实现
### 2.1 本期新增或修改后端的需求
| 需求 | 实现方式 | 关键口径检查 |
| --- | --- | --- |
| #189 换货后退款套餐未失效 | 退款处理不再只按旧资产查套餐,而是按原订单和换货迁移关系定位新资产上的对应套餐权益 | 只失效该退款订单产生的权益,不影响其他订单套餐;无前端改动 |
| #188 换货 C 端提醒 | 创建物流换货单时写可靠通知事件,继续走现有 C 端站内通知和未读弹窗 | 不做营销投放、ERP、自动创建其他单据 |
| #182/#44 提交人和审批展示 | 退款、代理充值、换货列表/详情批量解析提交人 ID 和名称;企微详情已具备将审批节点 userid 批量映射系统账号的内部能力 | 当前退款/充值业务 DTO 只稳定返回提交人和审批状态,尚未直接返回审批节点人员列表;如页面必须展示具体审批人,仍需把已有投影接入业务查询 |
| #181 订单渠道和资产标识 | C 端新订单保存正确 `purchase_role`;卡返回 ICCID,设备优先 VirtualNo、为空时返回 IMEI | 不用 SN 冒充订单设备标识;历史空数据不伪造 |
| #41 店铺 C 端登录限制 | 店铺增加 `client_login_disabled`;C 端验证资产后、签发短期令牌前检查所属店铺 | 只阻止新登录,不吊销已有 Token;平台库存保持原行为 |
| #53 卡/设备实名筛选 | 卡按自身实名状态过滤;设备通过有效绑定卡 `EXISTS` 实时判断 | 设备任意一张有效绑定卡已实名即为已实名;未建投影或 Worker |
| #57 退款中禁止换货 | 在现有换货创建入口前检查资产未终结退款 | 拒绝文案为“该资产存在退款申请”;不依赖企微实时接口 |
| #62 三种实名顺序 | 保留 `none/before_order/after_order`,补齐卡和设备最多 500 条批量修改,C 端返回生效策略 | 批量全成全败;设备和下卡冲突时以设备策略为准 |
| #97 主钱包低余额预警 | 消费主钱包扣款事实,余额首次从不少于 100 元跌破 100 元时通知店铺业务员 | 阈值以下不重复;恢复后再次跌破可再次提醒;无业务员不猜接收人 |
| #33 套餐临期提醒 | 每日计算 15/7/3 天节点,提供后台/代理临期列表及数量,并向个人客户发送站内通知 | 高亮为 8~15、4~7、0~3 天;0~3 天优先;不发企微业务员提醒 |
| #34 员工线下代充值 | 原充值创建入口在 `offline` 场景创建通用审批实例和企微提交事件;通过后幂等入主钱包 | 在线扫码充值后置;真实提交人、金额和凭证明文业务快照保留 |
| #35 退款企微审批 | 原退款申请关联唯一通用审批实例,企微标准终态驱动现有退款处理 | 不做原路退款;重复回调/轮询不会重复退款或失效套餐 |
| #37 企业微信审批 | 完成应用连接、通讯录同步、账号绑定、默认发起人、模板映射、提交、回调、详情查询和轮询恢复 | 模板/审批人规则由企微维护;超时结果未知不盲目重提 |
| #36 批量订购套餐 | 单列 CSV,整批选择一个套餐和支付方式,走独立异步任务,逐行复用现有订单和钱包规则 | 不选择代理,不在 CSV 中逐行指定套餐;部分失败不影响其他行 |
| #40 下架套餐老客户续费 | 普通可购列表排除下架套餐;当前使用者可用历史订单或当前资产返回的套餐 ID 调现有下单接口创建新订单 | 无专用续费接口;新客户和代理代购仍拒绝;历史订单不修改 |
| #42 六类导出 | 在现有导出任务框架新增 IoT 卡、套餐、钱包流水、代理充值、退款、换货 datasource | 按现有数据权限和字段来源导出,不建设新字段权限平台 |
| #47 卡固定档位限速 | 后台选择固定档位,按 ICCID 调用 Gateway,并记录操作审计和 Integration Log | 仅 IoT 卡;设备无接口;超时返回结果未知并人工核对 |
| #48 按资产类型配置支付方式 | `system_config` 分别保存卡、设备允许的 `wallet/wechat/alipay` 集合;C 端返回业务场景交集,订单端再次校验 | 至少保留一种;强充和普通充值剔除钱包;前端不可绕过 |
| #49 设备批量分配 | 扩展现有设备导入任务的 `operation_type`,新增分配代理和设置套餐系列两个 CSV 分支 | CSV 单列 VirtualNo/IMEI/SN;复用现有权限、分配、系列绑定和幂等规则 |
### 2.2 后端此前已经完成,主要由前端正确调用或展示
| 需求 | 后端现状 | 前端要做什么 |
| --- | --- | --- |
| #45 换货新旧资产展示/搜索 | 换货列表已分别返回新旧资产,并支持两个独立搜索参数 | 分别提供“旧资产”和“新资产”搜索框,不要继续共用一个字段 |
| #46 预计套餐到期 | 资产详情、C 端资产信息和相关列表已返回预计最终到期字段 | 展示 `estimated_final_expires_at`;按 `is_expiring` 或剩余天数高亮,不要只显示当前套餐到期时间 |
| #55 套餐分配生效条件 | 套餐和分配接口已支持默认值、覆盖值和最终生效值 | 创建/编辑套餐传 `expiry_base`;分配时传 `expiry_base_override`,展示 `effective_expiry_base` |
| #60 店铺联系电话搜索 | 店铺列表已支持 11 位联系电话精确查询 | 将输入值作为 `contact_phone` 查询参数传给店铺列表接口 |
| #86 资产换货标识和跳转 | 资产解析接口已返回 `exchange_trace.previous_asset/next_asset` 和 `can_view` | 仅 `can_view=true` 且存在资产 ID 时允许跳转;该需求前端已对接可保持现状 |
| #38 代理信用额度 | 角色默认额度、店铺实际额度、资金概况和负可用余额均已有接口 | 使用分单位字段;更新时携带钱包 `version`;余额为负数时正常展示 |
| #94 状态同步和运营商回调 | 后端回调、定时触发和原轮询链路已装配 | 通常无前端新调用;状态页面继续读取现有资产状态字段 |
| #96 店铺业务员 | 店铺创建/更新、候选人、列表/详情和筛选都已支持业务员 | 创建/编辑店铺选择 `business_owner_account_id`;列表可按该 ID 筛选并展示名称 |
| #98 换货新资产继承旧店铺 | 换货完成时后端自动继承旧资产店铺归属 | 前端继续调用原换货完成接口,不新增分配步骤 |
| #43 系列套餐批量授权 | 创建授权和管理套餐接口均支持 `packages[]`,单次 1~100 项 | 页面实现套餐多选,一次提交整个数组;删除项使用 `remove=true` |
> 注意:#44 的“提交人”已经可以直接对接;“审批人”目前不是退款、充值列表的稳定返回字段。后端已经能从企微详情快照解析并映射 userid,但当前前端不能把 `processor_id` 当作完整企微审批人列表。
### 2.3 本期明确不由后端处理
- #84 H5 首页隐藏设备下 ICCID:纯前端显示调整,但本期范围确认标记为“不做”。
- #63 授权列表滚动条和字段顺序:纯前端页面调整,需求已关闭。
- #73 行业卡未实名复机:后端保持原有行业卡放行逻辑,不改接口、不改前端。
- #99 原路退款、#52 聚水潭、#51 跨品类换货、#39 分销码/佣金提现:本期不做。
- #168、#90、#75、#64:已关闭,本期不重新修改。
## 三、需求与接口对接表
### 3.1 资产、店铺、订单和换货
| 需求 | 接口 | 参数或返回变化 / 前端调用说明 |
| --- | --- | --- |
| #41 登录限制 | `PUT /api/admin/shops/:id`;`GET /api/admin/shops`;`GET /api/admin/shops/:id` | 更新请求增加可选 `client_login_disabled`;列表/详情返回同名布尔值。C 端仍调 `POST /api/c/v1/auth/verify-asset`,受限时直接展示后端错误,不会返回资产令牌 |
| #53 实名筛选 | `GET /api/admin/iot-cards/standalone`;`GET /api/admin/devices` | 查询参数增加 `real_name_status=0|1`;响应已有 `real_name_status`、`real_name_status_name` |
| #62 实名顺序 | `PATCH /api/admin/assets/:identifier/realname-mode`;`POST /api/admin/iot-cards/batch-update-realname-policy`;`POST /api/admin/devices/batch-update-realname-policy` | 单条传 `realname_policy`;批量传 `asset_ids[] + realname_policy`,最多 500 条 |
| #62/#48 C 端初始化 | `GET /api/c/v1/asset/info?identifier=...` | 使用 `effective_realname_policy`、`realname_required`、`real_name_status`、`allowed_payment_methods`;前端不要自行覆盖 |
| #45 换货搜索 | `GET /api/admin/exchanges` | 使用 `old_asset_keyword`、`new_asset_keyword` 两个独立参数,可同时传并按 AND 组合 |
| #57/#98 换货 | `POST /api/admin/exchanges`;`POST /api/admin/exchanges/:id/complete` | 请求结构不变;存在退款时创建接口返回业务错误;完成后店铺归属由后端继承 |
| #188 换货提醒 | `GET /api/c/v1/notifications/unread-count`;`GET /api/c/v1/notifications`;`PUT /api/c/v1/notifications/:id/read` | 无新增通知接口;前端继续使用现有未读数、列表和已读接口弹窗展示 |
| #181 订单字段 | `GET /api/admin/orders`;`GET /api/admin/orders/:id`;`GET /api/c/v1/orders`;`GET /api/c/v1/orders/:id` | 返回正确 `purchase_role`、`asset_identifier`;设备标识为 VirtualNo 优先、IMEI 兜底 |
| #40 下架套餐续费 | `GET /api/c/v1/asset/info`;`GET /api/c/v1/orders`;`GET /api/c/v1/orders/:id`;`POST /api/c/v1/orders/create` | 资产信息返回 `current_package_id`,历史订单返回 `package_ids`;前端把选中的套餐 ID、资产 `identifier` 和当前允许的 `payment_method` 传给原创建订单接口 |
| #46/#86 资产展示 | `GET /api/admin/assets/resolve/:identifier`;`GET /api/c/v1/asset/info` | 返回预计最终到期字段;后台解析额外返回 `exchange_trace`,跳转前检查 `can_view` |
### 3.2 店铺业务员、信用和套餐授权
| 需求 | 接口 | 参数或返回变化 / 前端调用说明 |
| --- | --- | --- |
| #60 联系电话搜索 | `GET /api/admin/shops?contact_phone=11位号码` | 精确查询;可与店铺名称、编号等条件组合 |
| #96 店铺业务员 | `GET /api/admin/shops/business-owner-candidates`;`POST /api/admin/shops`;`PUT /api/admin/shops/:id`;`GET /api/admin/shops` | 创建/更新传 `business_owner_account_id`;列表可用同名参数筛选,响应展示账号 ID、名称和可用状态 |
| #38 信用额度 | `PUT /api/admin/roles/:id/default-credit`;`PUT /api/admin/shops/:id/credit-limit`;`GET /api/admin/shops/fund-summary` | 角色接口配置新建代理默认值;店铺接口传 `credit_enabled + credit_limit + version`;金额单位均为分 |
| #55 套餐默认生效条件 | `POST /api/admin/packages`;`PUT /api/admin/packages/:id`;`GET /api/admin/packages/:id` | 请求使用 `expiry_base=from_activation|from_purchase`;响应展示默认生效条件名称 |
| #55 分配覆盖 | `POST /api/admin/shop-package-batch-allocations`;`PATCH /api/admin/shop-package-allocations/:id/expiry-base` | 分配时使用 `expiry_base_override`;`null` 表示跟随套餐默认值 |
| #43 系列套餐多选 | `POST /api/admin/shop-series-grants`;`PUT /api/admin/shop-series-grants/:id/packages` | `packages` 是 1~100 项数组,每项包含 `package_id`、`cost_price`,删除时传 `remove=true` |
#### 3.2.1 #43 套餐价格展示和已授权/未授权区分
#43 不需要新增后端接口,前端按下面两个现有接口组合数据:
1. 调用 `GET /api/admin/packages?series_id={series_id}&page=1&page_size=100` 分页取得该系列全部套餐。列表项直接使用:
- `suggested_retail_price`:建议售价,单位分;未配置时为空。
- `cost_price`:公司成本价,单位分。
2. 编辑已有授权时,调用 `GET /api/admin/shop-series-grants/{grant_id}`,注意路径参数是授权记录 ID,不是系列 ID。
3. 将授权详情的 `packages[].package_id` 组成已授权套餐 ID 集合。
4. 套餐列表项的 `id` 在该集合中显示“已授权”,否则显示“未授权”。授权详情 `packages[].cost_price` 是该次店铺授权成本价,不要拿它替代套餐列表的公司成本价。
5. 用户提交多选结果时,创建授权调用 `POST /api/admin/shop-series-grants`;编辑授权调用 `PUT /api/admin/shop-series-grants/{grant_id}/packages`。新增/调价项传 `package_id + cost_price`,删除项传 `package_id + remove=true`。
套餐接口是分页接口;一个系列超过 100 个套餐时,前端必须继续请求后续页,再完成已授权集合标记。
### 3.3 审批、退款和员工线下代充值
| 需求 | 接口 | 参数或返回变化 / 前端调用说明 |
| --- | --- | --- |
| #181/#182/#44 退款 | `GET /api/admin/refunds`;`GET /api/admin/refunds/:id` | 新增/补齐 `asset_identifier`、`submitter_id`、`submitter_name`、`approval_provider`、`approval_status`、`approval_status_name`;资产标识是退款创建时固化的快照,卡为 ICCID,设备按 VirtualNo 优先、IMEI 兜底;历史空快照不做兼容 |
| #182/#44 充值 | `GET /api/admin/agent-recharges`;`GET /api/admin/agent-recharges/:id` | 同上;线下代充值的审批状态只读展示 |
| #44 换货 | `GET /api/admin/exchanges`;`GET /api/admin/exchanges/:id` | 新增/补齐 `submitter_id`、`submitter_name` |
| #34 员工线下代充 | `POST /api/admin/agent-recharges` | 仍用原入口;`payment_method=offline` 时传目标 `shop_id`、金额、1~5 个 `payment_voucher_key` 和备注,创建后等待企微审批 |
| #35 退款申请 | `POST /api/admin/refunds` | 仍用原入口;请求结构保持订单、实收金额、申请金额、凭证、原因等业务字段,创建后等待企微审批 |
| #34/#35 旧按钮 | `POST /api/admin/agent-recharges/:id/offline-pay`;`POST /api/admin/refunds/:id/approve|reject` | 仅兼容存量旧审批记录;企微记录前端不得显示这些操作按钮,最终按发布配置停用 |
| #37 企微应用 | `POST/GET /api/admin/wecom/applications`;`POST /api/admin/wecom/applications/:id/test` | 配置 corp_id、agent_id、Secret、回调 Token、EncodingAESKey;管理端按明文填写 |
| #37 默认发起人和成员 | `POST /api/admin/wecom/applications/:id/members/sync`;`GET /api/admin/wecom/applications/:id/members`;`PUT /api/admin/wecom/applications/:id/default-creator` | 先同步成员,再从可见成员中选择默认 `userid` |
| #37 账号绑定 | `PUT /api/admin/accounts/:id/wecom-binding` | 管理员选择应用可见成员,绑定 `(corp_id,userid)`;不做扫码绑定 |
| #37 场景模板 | `PUT /api/admin/wecom/scenes/:business_type`;`GET /api/admin/wecom/scenes` | `business_type` 为 `refund_approval` 或 `offline_recharge_approval`;传 `application_id`、`template_id`、`control_mapping[]` |
| #37 回调 | `GET/POST /api/callback/wecom/approval/:application_id` | 由企微服务器调用,前端无需调用 |
#### 3.3.1 企业微信审批 8 个接口的前端调用流程
企业微信配置页使用 8 个 `/api/admin/wecom` 接口;账号绑定属于账号模块,因此完整闭环是“8 个企微配置接口 + 1 个账号绑定接口”。应用凭据和场景写操作应只向超级管理员开放;前端收到 403 时不要降级绕过。
| 顺序 | 接口 | 页面动作与调用说明 |
| --- | --- | --- |
| 1 | `POST /api/admin/wecom/applications` | 保存应用。传 `corp_id`、`agent_id`、`name`、`secret`、`callback_token`、43 位 `encoding_aes_key`、`status=1`。相同 `corp_id + agent_id` 再次提交表示更新;保存响应中的 `id` 是后续 `application_id` |
| 2 | `GET /api/admin/wecom/applications?page=1&page_size=20` | 进入配置页或保存后刷新应用列表,展示连接时间、启用状态、默认发起人和凭据是否完整 |
| 3 | `POST /api/admin/wecom/applications/{id}/test` | 用户点击“测试连接”时调用;`data.success=true` 只表示成功取得 access_token,不表示通讯录、模板和回调均已配置完成 |
| 4 | `POST /api/admin/wecom/applications/{id}/members/sync` | 连接成功后点击“同步成员”;后端拉取该自建应用可见范围,返回 `synced_count` 和 `synced_at` |
| 5 | `GET /api/admin/wecom/applications/{id}/members?page=1&page_size=20&keyword=...` | 查询最近同步的本地成员快照,`keyword` 可按姓名或 userid 搜索;用于默认发起人和账号绑定的选择器,不要允许手输一个未同步 userid |
| 6 | `PUT /api/admin/wecom/applications/{id}/default-creator` | 从成员选择器取 `userid`,请求体为 `{"userid":"zhangsan"}`。代理等非企微账号提交业务时,企微审批由该成员代为发起,但本地业务提交人仍保持真实账号 |
| 7 | `PUT /api/admin/wecom/scenes/{business_type}` | 分别保存退款和线下代充值模板映射;后端会实时读取企微模板详情并校验控件 ID、类型、必填控件和选择项 key,校验失败时页面应保留用户输入并展示后端错误 |
| 8 | `GET /api/admin/wecom/scenes?page=1&page_size=20` | 进入场景页或保存后刷新,展示 `business_type_name`、模板名称、状态、最近校验时间和控件映射 |
应用保存请求示例:
```json
{
"corp_id": "wwxxxxxxxxxxxxxxxx",
"agent_id": 1000002,
"name": "测试环境审批应用",
"secret": "企微应用Secret",
"callback_token": "企微后台配置的回调Token",
"encoding_aes_key": "43位EncodingAESKey",
"status": 1
}
```
场景路径只支持:
- `refund_approval`:退款审批。
- `offline_recharge_approval`:员工线下代充值审批。
场景保存请求示例:
```json
{
"application_id": 1,
"template_id": "企微模板ID",
"control_mapping": [
{
"business_field": "refund_no",
"control_id": "Text-xxxxxxxx",
"control_type": "Text",
"option_mapping": {}
}
],
"status": 1
}
```
`control_mapping` 的 `control_id`、`control_type` 和选择项 key 必须来自企微后台已经创建的模板。退款可映射业务字段为 `refund_no`、`order_id`、`order_no`、`asset_identifier`、`asset_type`、`actual_received_amount`、`requested_refund_amount`、`refund_voucher_key`、`refund_reason`、`package_usage_id`、`submitter_id`、`submitter_name`;线下代充值可映射 `recharge_no`、`shop_id`、`shop_name`、`amount`、`amount_cent`、`payment_voucher_key`、`remark`、`submitter_id`、`submitter_name`。企微模板中的必填控件必须全部映射。
完成成员同步后,账号管理页还要调用:
```http
PUT /api/admin/accounts/{account_id}/wecom-binding
```
```json
{
"application_id": 1,
"userid": "zhangsan"
}
```
前端完整配置顺序为:保存应用 → 测试连接 → 同步成员 → 查询成员 → 设置默认发起人 → 给需要本人发起审批的系统账号绑定成员 → 保存两个业务场景 → 查询场景确认均已启用。应用可见范围变化后,应重新同步成员并检查默认发起人和账号绑定。
#### 3.3.2 配置完成后的业务审批流程
1. 前端继续调用原业务接口创建退款或员工线下代充值,不直接调用企微发起审批接口。
2. 后端保存业务单、通用审批实例和提交事件,并异步向企微发起审批;前端根据业务列表/详情的 `approval_provider`、`approval_status`、`approval_status_name` 只读展示进度。
3. `approval_status` 可能为:`0` 提交中、`1` 审批中、`2` 已通过、`3` 已拒绝、`4` 已撤销、`5` 通过后撤销、`6` 已删除、`7` 提交失败、`8` 提交结果未知。页面名称优先直接使用 `approval_status_name`。
4. 企微回调和 Worker 轮询共同同步最终状态;`GET/POST /api/callback/wecom/approval/{application_id}` 只由企微服务器调用,前端禁止调用。
5. `approval_provider=wecom` 或存在 `approval_instance_id` 时,前端不得显示退款通过/驳回、线下充值确认等旧人工按钮。企微通过后,退款终结或钱包入账由后端自动幂等执行。
### 3.4 通知、批量任务、导出和 Gateway
| 需求 | 接口 | 参数或返回变化 / 前端调用说明 |
| --- | --- | --- |
| #97 后台低余额通知 | `GET /api/admin/notifications/unread-count`;`GET /api/admin/notifications`;`PUT /api/admin/notifications/:id/read` | 复用现有后台通知接口;业务员账号正常展示低余额通知 |
| #33 临期列表 | `GET /api/admin/expiring-assets` | 支持资产类型、关键词、店铺、套餐、剩余天数和日期范围;响应含 `summary`、`expiry_level`、`is_priority` |
| #33 C 端提醒 | `GET /api/c/v1/notifications/unread-count`;`GET /api/c/v1/notifications` | 复用现有站内通知,前端在 15/7/3 天节点按未读通知弹窗 |
| #36 批量订购上传 | `POST /api/admin/storage/upload-url` | `purpose=batch_purchase`,上传 UTF-8 单列 CSV 后取得 `file_key` |
| #36 批量订购任务 | `POST /api/admin/asset-package-batch-orders`;`GET /api/admin/asset-package-batch-orders`;`GET /api/admin/asset-package-batch-orders/:id` | 创建传 `file_key + package_id + payment_method`,线下支付另传 `voucher_keys[]`;详情返回逐行结果 |
| #42 业务导出 | `POST /api/admin/export-tasks`;`GET /api/admin/export-tasks`;`GET /api/admin/export-tasks/:id` | `scene` 使用 `iot_card/package/agent_wallet_transaction/agent_recharge/refund/exchange`,筛选条件放 `query` |
| #47 卡限速 | `PUT /api/admin/iot-cards/:iccid/speed-tier` | 请求只传 `code=-1..8`;设备页面不要展示限速入口 |
| #48 后台支付配置 | `GET /api/admin/system-configs`;`PUT /api/admin/system-configs/:key` | Key 为 `c2b.payment.card_allowed_methods`、`c2b.payment.device_allowed_methods`;更新请求的 `value` 是 JSON 数组字符串 |
| #48 C 端支付 | `GET /api/c/v1/asset/info`;`GET /api/c/v1/wallet/recharge-check`;`POST /api/c/v1/orders/create`;`POST /api/c/v1/wallet/recharge` | 展示和提交都使用后端返回的 `allowed_payment_methods`;创建订单时 `payment_method` 必传,微信场景按接口要求传 `app_type` |
| #49 分配 CSV 上传 | `POST /api/admin/storage/upload-url` | `purpose=device_batch_allocation`,上传单列 CSV 后取得 `file_key` |
| #49 创建设备分配任务 | `POST /api/admin/devices/import/allocations` | 传 `file_key + operation_type + target_id`;`operation_type=assign_shop|assign_series` |
| #49 查询任务 | `GET /api/admin/devices/import/tasks`;`GET /api/admin/devices/import/tasks/:id` | 复用原设备导入任务页面,新增展示 `operation_type`、`operation_name`、`target_id`、`status_name` |
### 3.5 前端静态 CSV 模板
本期需要前端提供两份静态文件模板,**都是 CSV,不接受 Excel(`.xls`/`.xlsx`)**。文件使用 UTF-8 编码,允许 UTF-8 BOM,最大 10MB,最多 1000 行数据(不含表头)。每个文件只允许一列,不要添加空行、说明行或示例外的其他列。
#### 模板一:批量订购套餐
- 建议文件名:`批量订购套餐模板.csv`
- 上传用途:`purpose=batch_purchase`
- 套餐、支付方式和线下凭证由页面另外选择,不放在 CSV 中。
| 列序号 | 固定表头 | 必填 | 填写内容 |
| --- | --- | --- | --- |
| 1 | `资产标识` | 是 | 每行一个资产标识。卡支持 ICCID、VirtualNo 或 MSISDN;设备支持 VirtualNo、IMEI 或 SN |
```csv
资产标识
89860012345678901234
CARD-VIRTUAL-0001
DEVICE-VIRTUAL-0001
860123456789012
```
#### 模板二:设备批量分配
- 建议文件名:`设备批量分配模板.csv`
- 上传用途:`purpose=device_batch_allocation`
- 目标代理或套餐系列由页面另外选择,不放在 CSV 中。“分配代理”和“设置套餐系列”可以共用这一份模板。
| 列序号 | 固定表头 | 必填 | 填写内容 |
| --- | --- | --- | --- |
| 1 | `设备标识` | 是 | 每行一个设备标识,支持 VirtualNo、IMEI 或 SN |
```csv
设备标识
DEVICE-VIRTUAL-0001
860123456789012
SN202607250001
```
> 前端下载的静态模板可以只保留表头,上述数据行仅用于说明格式。资产标识必须按文本原样保存,不得转换为科学计数法、浮点数或截断前导零。
## 四、前端本期最容易漏掉的工作
- 换货列表拆成新、旧资产两个搜索参数。
- 资产预计到期展示使用“预计最终到期”,并按临期字段高亮。
- 套餐分配页面传递默认/覆盖生效条件。
- 店铺页面接入联系电话查询、业务员选择和 C 端登录限制开关。
- 系列套餐授权页面真正使用现有 `packages[]` 做多选提交。
- C 端实名流程只读取 `effective_realname_policy`。
- C 端支付按钮只读取 `allowed_payment_methods`。
- 历史订单续费继续调用原创建订单接口,不等待新续费接口。
- 企微退款和线下代充值只读展示审批状态,隐藏本地人工审批按钮。
- 卡页面提供固定档位限速;设备页面不得出现限速入口。
- 设备批量分配继续复用原设备导入任务列表/详情页面,但根据 `operation_type` 改标题和结果说明。
## 五、联调和验收边界
- 当前有两个需要在联调时明确的接口边界:
- #44:退款/充值列表已经返回提交人和审批状态,但没有直接返回企微审批节点人员列表;现有 userid 映射能力尚未接入这两个业务 DTO。
- #49:设备批量分配创建服务允许平台和代理账号,但复用的设备导入任务列表/详情 Handler 目前仍沿用“仅平台用户可查看”的旧限制。若本期只允许平台操作则前端应隐藏代理入口;若要求代理自行查看任务,需要再统一后端权限。
- OpenAPI 已生成,新增路径和 DTO 已检查;设备限速旧契约不存在。
- 本次没有执行数据库迁移、完整构建、自动化测试、LSP 或真实企微/Gateway 闭环。
- 企微、Gateway、Redis/Asynq、对象存储配置和回滚步骤见 [`七月迭代联调交付说明.md`](七月迭代联调交付说明.md)。
- 涉及金额的字段默认单位为分;前端展示时统一转换,提交时不要传浮点元金额。

View File

@@ -0,0 +1,54 @@
# 个人客户站内通知
为个人客户增加通知入口,支持查询通知、查看未读数以及标记已读。进入首页时自动查询未读通知并弹窗展示;多条通知使用左右滑动查看,弹窗打开时第一条自动标记已读,滑动查看其他通知时立即标记对应通知已读。弹窗支持关闭。所有接口均需要登录,使用 `Bearer Token` 鉴权。
## 查询通知列表
`GET /api/c/v1/notifications`
查询当前客户可见的未过期业务通知,按创建时间和通知 ID 倒序排列。
| 参数 | 必填 | 说明 |
| --- | --- | --- |
| `page` | 否 | 页码,默认 1,范围 1~10000 |
| `page_size` | 否 | 每页数量,默认 20,范围 1~50 |
| `is_read` | 否 | 已读状态;`false` 仅查询未读,`true` 仅查询已读,不传时查询全部 |
返回:包含通知列表 `items`、当前页 `page`、每页数量 `size` 和总数 `total`。通知项包含标题、正文、类型、类别、级别、关联资源、已读状态及创建/已读时间。
## 标记单条通知已读
`PUT /api/c/v1/notifications/{id}/read`
将当前客户可见的指定通知标记为已读。通知不存在、属于其他客户或已经已读时,也返回成功,接口幂等。
返回:`{ "success": true }`
## 全部标记已读
`PUT /api/c/v1/notifications/read-all`
将当前客户可见的未过期未读业务通知全部标记为已读,重复调用幂等。
返回:`{ "updated_count": 3 }`
## 查询未读数
`GET /api/c/v1/notifications/unread-count`
查询当前客户未过期业务通知的未读数量;平台同步和系统运维通知不计入结果。
返回:`{ "count": 3, "display_count": "3" }`,数量超过 99 时 `display_count` 为 `99+`。
## 首页未读通知弹窗
- 用户进入首页后,调用 `GET /api/c/v1/notifications`,传入 `is_read=false`、`page=1`、`page_size=50`,只展示当前未读通知。
- 有多条未读通知时默认展示第一条,弹窗打开后立即调用单条已读接口标记第一条。
- 用户左右滑动切换到其他通知时,视为已查看并立即调用单条已读接口标记当前通知。
- 点击关闭图标只关闭弹窗,不会将未查看的其他通知批量标记为已读;下次进入首页仍可继续展示剩余未读通知。
- 通知的 `ref_type`、`ref_id`、`ref_key` 仅用于资源定位或展示,不直接拼接页面路由。
## 通用约定
- 所有接口均使用 `Bearer Token` 鉴权。
- 未登录、参数错误、无权访问和服务异常沿用统一错误响应。

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,277 @@
# C 端所需接口文档
## 1. 通用约定
- 测试环境:`https://cmp-api.boss160.cn`
- 鉴权:除特别说明外,所有接口都需要登录后的 JWT。
```http
Authorization: Bearer <token>
Content-Type: application/json
```
- `identifier`:资产标识符,可传 SN、IMEI、虚拟号、ICCID 或 MSISDN,长度 1~50。
- 金额单位:分。页面展示时转换为元,提交时仍传整数分。
- 成功响应:`code = 0`。
- 错误响应:`400` 参数错误、`401` 未认证或过期、`403` 无权访问、`500` 服务端错误。
通用成功响应格式:
```json
{
"code": 0,
"data": {},
"msg": "success",
"timestamp": "2026-07-27T10:00:00+08:00"
}
```
错误响应格式:
```json
{
"code": 1001,
"data": {},
"msg": "参数验证失败",
"timestamp": "2026-07-27T10:00:00+08:00"
}
```
## 2. 接口清单
| 用途 | 方法 | 路径 |
| --- | --- | --- |
| 获取资产信息 | GET | `/api/c/v1/asset/info` |
| 充值前校验 | GET | `/api/c/v1/wallet/recharge-check` |
| 创建套餐订单 | POST | `/api/c/v1/orders/create` |
| 创建充值订单 | POST | `/api/c/v1/wallet/recharge` |
| 订单列表 | GET | `/api/c/v1/orders` |
| 订单详情 | GET | `/api/c/v1/orders/{id}` |
## 3. 获取资产信息
### 请求
```http
GET /api/c/v1/asset/info?identifier=1234567890
```
| 参数 | 类型 | 必填 | 说明 |
| --- | --- | --- | --- |
| `identifier` | string | 是 | 资产标识符,1~50 个字符 |
### `data` 关键返回字段
| 字段 | 类型 | 说明 |
| --- | --- | --- |
| `asset_id` | integer | 资产 ID |
| `asset_type` | string | `card` 卡、`device` 设备 |
| `identifier` | string | 当前资产标识符 |
| `iccid` / `msisdn` | string | 卡 ICCID / 手机号 |
| `sn` / `imei` / `virtual_no` | string | 设备序列号 / IMEI / 虚拟号 |
| `device_name` / `device_model` | string | 设备名称 / 型号 |
| `carrier_name` / `carrier_type` | string | 运营商名称 / 类型(`CMCC`、`CUCC`、`CTCC`、`CBN`) |
| `status` / `status_name` | integer / string | 资产归属状态:`1` 在库、`2` 已分销;卡沿用卡状态枚举 |
| `activation_status` / `activation_status_name` | integer / string | 激活状态:`0` 未激活、`1` 已激活 |
| `network_status` / `network_status_name` | integer / string | 网络状态:`0` 停机、`1` 开机 |
| `real_name_status` / `real_name_status_name` | integer / string | 实名状态:`0` 未实名、`1` 已实名 |
| `realname_policy` | string | 实名策略:`none`、`before_order`、`after_order` |
| `effective_realname_policy` | string | 当前实际生效的实名策略 |
| `realname_required` | boolean | 当前资产是否需要实名 |
| `allowed_payment_methods` | string[] | 允许的支付方式:`wallet`、`wechat`、`alipay` |
| `wallet_balance` | integer | 钱包余额,单位为分 |
| `current_package_id` | integer | 当前主套餐 ID;无套餐时为 `0`,可用于续费 |
| `current_package` | string | 当前套餐名称,无套餐时为空 |
| `current_package_activated_at` | datetime / null | 当前主套餐开始时间 |
| `current_package_expires_at` | datetime / null | 当前主套餐到期时间 |
| `estimated_final_expires_at` | datetime / null | 预计最终到期时间 |
| `days_until_final_expiry` | integer/null | 距预计最终到期的上海自然日天数 |
| `expiry_estimate_status` | string | `exact` 精确、`waiting_activation` 待激活、`none` 无套餐、`invalid_data` 数据异常 |
| `is_expiring` | boolean | 是否临期(精确推算且剩余 0~15 天) |
| `enable_virtual_data` | boolean | 当前主套餐是否启用虚流量 |
| `real_total_mb` / `real_used_mb` | integer | 真实总量 / 真实已用量,单位 MB |
| `virtual_total_mb` / `virtual_used_mb` | integer / number | 业务停机阈值 / 展示已用量,单位 MB |
| `reduction_pct` | number | 展示增幅比例:`real_total_mb / virtual_total_mb - 1` |
| `cards` | object[] | 设备绑定卡列表,包含 ICCID、MSISDN、网络状态、实名状态、插槽位置等 |
| `device_realtime` | object/null | 设备实时信息,包含在线状态、电量、信号、WiFi、客户端数等 |
页面流量展示建议:总量使用 `real_total_mb`;已用量在 `enable_virtual_data = true` 时使用 `virtual_used_mb`,否则使用 `real_used_mb`。
## 4. 充值前校验
### 请求
```http
GET /api/c/v1/wallet/recharge-check?identifier=1234567890
```
| 参数 | 类型 | 必填 | 说明 |
| --- | --- | --- | --- |
| `identifier` | string | 是 | 资产标识符 |
### `data` 返回字段
| 字段 | 类型 | 说明 |
| --- | --- | --- |
| `allowed_payment_methods` | string[]/null | 当前允许的支付方式:`wallet`、`wechat`、`alipay` |
| `need_force_recharge` | boolean | 是否必须先完成强制充值 |
| `force_recharge_amount` | integer | 强制充值金额,单位为分 |
| `min_amount` | integer | 最小充值金额,单位为分 |
| `max_amount` | integer | 最大充值金额,单位为分 |
| `message` | string | 页面提示信息 |
| `trigger_type` | string | 强制充值触发类型 |
## 5. 创建套餐订单
### 请求
```http
POST /api/c/v1/orders/create
```
```json
{
"identifier": "1234567890",
"package_ids": [1001, 1002],
"payment_method": "wechat",
"app_type": "miniapp"
}
```
| 参数 | 类型 | 必填 | 说明 |
| --- | --- | --- | --- |
| `identifier` | string | 是 | 资产标识符 |
| `package_ids` | integer[] | 是 | 套餐 ID 列表 |
| `payment_method` | string | 是 | `wallet`、`wechat`、`alipay` |
| `app_type` | string | 微信支付时是 | `official_account` 公众号、`miniapp` 小程序 |
### `data` 返回字段
| 字段 | 类型 | 说明 |
| --- | --- | --- |
| `idempotent` | boolean | 是否返回了已存在的待支付订单 |
| `order_type` | string | `package` 套餐订单、`recharge` 充值订单 |
| `order` | object | 订单信息,见下表 |
| `linked_package_info` | object | 关联套餐和强制充值信息 |
| `recharge` | object/null | 自动充值信息 |
| `pay_config` | object/null | 微信支付参数 |
| `payment_link` | object/null | 支付宝或其他网页支付链接 |
`order` 主要字段:`order_id`、`order_no`、`created_at`、`payment_method`、`payment_status`、`payment_status_name`、`total_amount`。
- `payment_status`:`1` 待支付、`2` 已支付、`3` 已取消、`4` 已退款。
- `linked_package_info`:`force_recharge_amount`、`package_names`、`total_package_amount`、`wallet_credit`,金额均为分。
- `recharge`:`recharge_id`、`recharge_no`、`amount`、`status`、`status_name`、`auto_purchase_status`。
- `pay_config`:`app_id`、`nonce_str`、`package`、`pay_sign`、`sign_type`、`timestamp`。
- `payment_link`:`copy_link`、`qr_link`、`payment_no`、`pay_expire_at`。
## 6. 创建充值订单
### 请求
```http
POST /api/c/v1/wallet/recharge
```
```json
{
"amount": 1000,
"identifier": "1234567890",
"payment_method": "wechat",
"app_type": "miniapp"
}
```
| 参数 | 类型 | 必填 | 说明 |
| --- | --- | --- | --- |
| `amount` | integer | 是 | 充值金额,1~10000000 分 |
| `identifier` | string | 是 | 资产标识符 |
| `payment_method` | string | 是 | `wechat` 微信支付、`alipay` 支付宝 |
| `app_type` | string | 微信支付时是 | `official_account` 或 `miniapp` |
### `data` 返回字段
| 字段 | 类型 | 说明 |
| --- | --- | --- |
| `recharge` | object | 充值信息:`recharge_id`、`recharge_no`、`amount`、`status` |
| `pay_config` | object/null | 微信支付参数:`app_id`、`nonce_str`、`package`、`pay_sign`、`sign_type`、`timestamp` |
| `payment_link` | object/null | 支付链接:`copy_link`、`qr_link`、`payment_no`、`pay_expire_at` |
`recharge.status`:`0` 待支付、`1` 已支付、`2` 已关闭。
## 7. 订单列表
### 请求
```http
GET /api/c/v1/orders?identifier=1234567890&page=1&page_size=10
```
| 参数 | 类型 | 必填 | 说明 |
| --- | --- | --- | --- |
| `identifier` | string | 是 | 资产标识符 |
| `payment_status` | integer | 否 | `1` 待支付、`2` 已支付、`3` 已取消、`4` 已退款 |
| `page` | integer | 是 | 页码,从 1 开始 |
| `page_size` | integer | 是 | 每页数量,1~100 |
### `data` 返回字段
```json
{
"items": [],
"page": 1,
"size": 10,
"total": 0
}
```
`items[]` 字段:
| 字段 | 类型 | 说明 |
| --- | --- | --- |
| `order_id` / `order_no` | integer / string | 订单 ID / 订单号 |
| `asset_id` / `asset_type` | integer / string | 资产 ID / `card` 或 `device` |
| `asset_identifier` | string | 下单时资产标识快照;设备优先虚拟号,其次 IMEI |
| `package_ids` / `package_names` | array | 套餐 ID / 名称列表 |
| `payment_method` | string | `wallet`、`wechat`、`alipay` |
| `payment_status` / `payment_status_name` | integer / string | 支付状态及中文名称 |
| `total_amount` | integer | 订单总金额,单位为分 |
| `created_at` | string | 创建时间 |
## 8. 订单详情
### 请求
```http
GET /api/c/v1/orders/{id}
```
| 参数 | 类型 | 必填 | 说明 |
| --- | --- | --- | --- |
| `id` | integer | 是 | 订单 ID,放在 URL 路径中 |
### `data` 返回字段
| 字段 | 类型 | 说明 |
| --- | --- | --- |
| `order_id` / `order_no` | integer / string | 订单 ID / 订单号 |
| `asset_id` / `asset_type` | integer / string | 资产 ID / `card` 或 `device` |
| `asset_identifier` | string | 下单时资产标识快照 |
| `packages` | object[] | 订单套餐明细 |
| `payment_method` | string | 支付方式 |
| `payment_status` / `payment_status_name` | integer / string | 支付状态及中文名称 |
| `total_amount` | integer | 订单总金额,单位为分 |
| `created_at` | string | 创建时间 |
| `paid_at` | string/null | 支付时间 |
| `completed_at` | string/null | 完成时间 |
`packages[]` 字段:`package_id`、`package_name`、`package_type`(`formal` 正式套餐、`addon` 加油包)、`price`(分)、`quantity`。
## 9. 前端调用流程
1. 登录后保存 JWT,后续请求统一携带 `Authorization: Bearer <token>`。
2. 进入资产页面调用资产信息接口,并使用返回的 `allowed_payment_methods` 渲染支付方式。
3. 充值先调用充值前校验;若 `need_force_recharge = true`,使用后端返回的强制充值金额和提示。
4. 套餐购买或续费调用创建订单接口,`package_ids` 使用当前资产的 `current_package_id` 或历史订单的 `package_ids`。
5. 充值调用创建充值订单接口。微信支付时必须传 `app_type`。
6. 页面展示支付链接或支付参数后,支付结果通过订单详情等查询接口确认;不要仅根据前端跳转结果判断已支付。

View File

@@ -0,0 +1,28 @@
## Why
The August iteration adds backend-driven H5 popups. `GET /api/c/v1/popup-candidates` returns at most one candidate (risk-exchange or operation) for the current page and asset; risk-exchange candidates require the user to submit a shipping address through `POST /api/c/v1/risk-exchanges/{asset_id}/address`. Popups are persisted as personal notifications, so the existing notification contracts change: list items gain `popup_snapshot` and two new `type` values, unread count includes popups, and a popup is only dismissed by marking its notification read (`PUT /api/c/v1/notifications/{id}/read`). The current H5 client-side priority re-sort contradicts the new fixed backend ordering and must be removed.
## What Changes
- Query `GET /api/c/v1/popup-candidates` once per page entry on `home` (index), `package_purchase` (package-order), and `asset_wallet_recharge` (my-wallet); `asset_detail` is explicitly out of scope
- Render the returned candidate (title/body) in a shared `PopupCandidate` component and keep the popup silent when no candidate exists
- Map `action_type` with a frontend whitelist only: `package_purchase` -> package-order page, `asset_wallet_recharge` -> my-wallet page; empty value shows no action
- Dismiss or act on a popup only by marking the notification read through `PUT /api/c/v1/notifications/{id}/read`
- Risk-exchange popups show a shipping address form and submit it with the candidate `asset_id` (never derived from the H5 identifier); success shows the exchange number and status
- Treat invisible assets (HTTP 400 / `code=1180`) uniformly as resource-invisible with no UI branching
- Keep the backend-fixed notification ordering (remove client-side priority re-sort); honor the unread badge contract; include the notification id in mark-read requests
- Never use `read-all` inside the popup display chain
## Capabilities
### New Capabilities
- `h5-popup-candidate`: Define once-per-entry popup candidate query, rendering, whitelist action mapping, and read-mark dismissal
- `h5-risk-exchange-address`: Define the risk-exchange shipping address form and idempotent submission
### Modified Capabilities
- `personal-notification-list`: Align the personal notification list/unread contracts with popup notifications
## Impact
- Affected code: new `api/modules/popup.js`, new `components/PopupCandidate.vue`, `pages/index/index.vue`, `pages/package-order/package-order.vue`, `pages/my-wallet/my-wallet.vue`, `pages/notifications/notifications.vue`, `api/modules/notification.js`
- Backend contracts: C-end popup/risk-exchange/notification endpoints only; admin endpoints are out of scope

View File

@@ -0,0 +1,52 @@
## ADDED Requirements
### Requirement: H5 SHALL query popup candidates once per page entry
The system SHALL call `GET /api/c/v1/popup-candidates` exactly once per page entry with the current page and asset identifier, and SHALL render the returned candidate or stay silent when none exists. The query SHALL NOT be prefetched, polled, or repeated inside one entry.
#### Scenario: Candidate exists on page entry
- **WHEN** the user enters `home`, `package_purchase`, or `asset_wallet_recharge` and the backend returns a candidate
- **THEN** the system SHALL show the candidate title/body popup
#### Scenario: No candidate on page entry
- **WHEN** the backend returns an empty candidate
- **THEN** the system SHALL show no popup
- **AND** the page SHALL continue its normal flow
#### Scenario: Same notification id within one day
- **WHEN** a later page entry returns the same `notification_id` already handled this session
- **THEN** the system SHALL NOT re-popup the same notification
### Requirement: Popup actions SHALL use a frontend whitelist
The system SHALL map `action_type` through a frontend whitelist only and SHALL NOT accept URLs or routes from the backend. `package_purchase` routes to the package purchase page, `asset_wallet_recharge` routes to the wallet page, and an empty value shows no action.
#### Scenario: package_purchase action
- **WHEN** the candidate `action_type` is `package_purchase`
- **THEN** the popup SHALL navigate to the package purchase page
#### Scenario: asset_wallet_recharge action
- **WHEN** the candidate `action_type` is `asset_wallet_recharge`
- **THEN** the popup SHALL navigate to the asset wallet page
#### Scenario: No action
- **WHEN** `action_type` is empty
- **THEN** the popup SHALL show no action button
### Requirement: Popup dismissal SHALL mark the notification read
The system SHALL call `PUT /api/c/v1/notifications/{id}/read` with the candidate `notification_id` when the popup is dismissed or when its action is taken. Popup closing and action-taking SHALL NOT use `read-all`.
#### Scenario: User closes the popup
- **WHEN** the user closes the popup
- **THEN** the notification SHALL be marked read
#### Scenario: User takes the popup action
- **WHEN** the user taps the action button
- **THEN** the notification SHALL be marked read
- **AND** the mapped page SHALL open
### Requirement: Resource-invisible responses SHALL be silent
The system SHALL treat HTTP 400 / `code=1180` responses uniformly as resource-invisible and SHALL NOT branch UI, show special prompts, or distinguish asset-missing from not-owned states.
#### Scenario: Invisible asset on popup query
- **WHEN** the popup query returns an invisible-asset error
- **THEN** the system SHALL show no popup
- **AND** the page SHALL continue its normal flow

View File

@@ -0,0 +1,28 @@
## ADDED Requirements
### Requirement: Risk-exchange popup SHALL collect a shipping address
The system SHALL present a shipping address form when the candidate `popup_type` is `risk_exchange`, collecting recipient name, recipient phone, and full address, and SHALL submit them to `POST /api/c/v1/risk-exchanges/{asset_id}/address` using the candidate `asset_id` (never derived from the H5 identifier).
#### Scenario: Valid address submission
- **WHEN** the user fills the required fields and submits
- **THEN** the risk-exchange request SHALL be submitted with the candidate `asset_id`
- **AND** the system SHALL show the returned exchange number and status
#### Scenario: Invalid or incomplete fields
- **WHEN** the user submits empty or invalid fields
- **THEN** the system SHALL block submission and prompt for the missing fields
### Requirement: Address submission SHALL be idempotent
The system SHALL NOT provide an edit-address UI. Repeated or concurrent submissions return the first-created exchange order and address without overwriting.
#### Scenario: Repeated submission
- **WHEN** the user submits the address again for the same asset
- **THEN** the system SHALL return the first-created exchange order and address
### Requirement: Risk-exchange failures SHALL keep the user in place
The system SHALL keep the address form open on failure and treat invisible-asset failures uniformly without UI branching.
#### Scenario: Submission failure
- **WHEN** the address submission fails
- **THEN** the system SHALL keep the form open
- **AND** the user SHALL be able to retry

View File

@@ -0,0 +1,36 @@
## MODIFIED Requirements
### Requirement: Personal notification list SHALL preserve backend ordering
The system SHALL display personal notifications in the backend-fixed order (created time and notification id descending) and SHALL NOT re-sort items client-side by severity or priority.
#### Scenario: Backend returns a fixed order
- **WHEN** the notification list is loaded
- **THEN** the items SHALL be rendered in the returned order
### Requirement: Notification items SHALL pass through popup fields and types
The system SHALL render items with the new `type` values `h5.popup.risk_exchange` and `h5.popup.operation` (category `system`) and SHALL keep `popup_snapshot` available for popup-related actions without treating it as a route.
#### Scenario: List contains a popup notification
- **WHEN** an item has `type` `h5.popup.risk_exchange` or `h5.popup.operation`
- **THEN** the item SHALL render as a normal system-category notification
### Requirement: Unread badge SHALL reflect popup notifications
The system SHALL count popup notifications in the unread badge and collapse the badge to `99+` above 99 per the `display_count` contract.
#### Scenario: Popup notification unread
- **WHEN** a popup notification is unread
- **THEN** the unread badge SHALL increase accordingly
### Requirement: Mark-read SHALL include the notification id and be idempotent
The system SHALL send the notification `id` in the mark-read request body and SHALL treat success responses idempotently.
#### Scenario: Mark-read an already-read notification
- **WHEN** the notification is already read or owned by another customer
- **THEN** the request SHALL still succeed
### Requirement: read-all SHALL NOT close popups implicitly in the popup chain
The system SHALL NOT call `read-all` from any popup display path because it also marks today's popup notifications read.
#### Scenario: Popup display flow
- **WHEN** the popup candidate flow runs
- **THEN** the system SHALL NOT call `read-all`

View File

@@ -0,0 +1,36 @@
## 1. API Layer
- [ ] 1.1 Add `popupApi.getCandidate(page, identifier)` for `GET /api/c/v1/popup-candidates`
- [ ] 1.2 Add `popupApi.submitRiskExchangeAddress(assetId, params)` for `POST /api/c/v1/risk-exchanges/{asset_id}/address`
- [ ] 1.3 Include the notification `id` in the mark-read request body (R3)
## 2. PopupCandidate Component
- [ ] 2.1 Query the candidate once per mount and emit `empty` when none exists
- [ ] 2.2 Render title/body and hide silently on resource-invisible responses
- [ ] 2.3 Map `action_type` through the whitelist and navigate from the mapped page
- [ ] 2.4 Mark the notification read on dismiss and on action (R3)
- [ ] 2.5 Deduplicate by `notification_id` within a session so same-day repeats do not re-popup
- [ ] 2.6 Provide the risk-exchange address form, submission, and result view
## 3. Page Wiring
- [ ] 3.1 Wire `home` in `pages/index/index.vue` with priority over the legacy unread-notification popup
- [ ] 3.2 Wire `package_purchase` in `pages/package-order/package-order.vue`
- [ ] 3.3 Wire `asset_wallet_recharge` in `pages/my-wallet/my-wallet.vue`
- [ ] 3.4 Leave `asset_detail` unwired
## 4. Notification Contract Alignment
- [ ] 4.1 Remove client-side priority re-sort and rely on the backend ordering
- [ ] 4.2 Align the category label map with `approval/expiry/sync/system`
- [ ] 4.3 Keep the unread badge consistent with popup counting and `99+` display
- [ ] 4.4 Keep `read-all` out of the popup display chain
## 5. Regression Verification
- [ ] 5.1 Operation popup with action navigates to the mapped page and marks read
- [ ] 5.2 Risk-exchange popup submits the address and shows the exchange number
- [ ] 5.3 Repeat entry with the same `notification_id` does not re-popup
- [ ] 5.4 Invisible asset shows no popup and no error branch
- [ ] 5.5 Notification center renders new `h5.popup.*` types without layout breakage

View File

@@ -0,0 +1,19 @@
# Change: Retry 19-digit ICCID login with a Luhn check digit
## Why
Some IoT cards are entered or scanned as a 19-digit ICCID prefix. The asset-verification endpoint requires the 20-digit ICCID, so the first verification cannot return an asset token even though the identifier can be deterministically completed.
## What Changes
- When a login identifier is exactly 19 numeric characters and starts with `89`, call `/api/c/v1/auth/verify-asset` with the entered value first.
- If that first request fails or does not return `asset_token`, compute the twentieth digit with the ISO/IEC 7812 Luhn (mod-10) check-digit algorithm and retry verification once using the completed ICCID.
- Keep the first failure entirely silent to the customer. Only the retry failure is handled by the existing login error flow.
- Persist and use the successful 20-digit ICCID for the authenticated session without mutating the text in the input field during the silent retry.
## Impact
- Affected capability: `iccid-login-check-digit-retry` (new)
- Affected code: `pages/login/login.vue`
- Affected API: `POST /api/c/v1/auth/verify-asset`
- No backend API, request payload shape, or shared error handling is changed.

View File

@@ -0,0 +1,31 @@
## ADDED Requirements
### Requirement: Silent 19-digit ICCID verification retry
When an asset login identifier matches `^89\\d{17}$`, the H5 client SHALL first verify the entered 19-digit value. If that attempt fails or does not return a non-empty `asset_token`, it SHALL calculate the ISO/IEC 7812 Luhn mod-10 check digit, append it as the twentieth digit, and verify the completed ICCID exactly once.
#### Scenario: Completed ICCID succeeds
- **WHEN** a customer enters a 19-digit numeric identifier beginning with `89`
- **AND** the initial verification does not provide an asset token
- **AND** verification of the Luhn-completed 20-digit ICCID returns an asset token
- **THEN** the customer continues through login without seeing an error from the first verification
- **AND** the authenticated session uses the 20-digit ICCID
#### Scenario: Initial verification succeeds
- **WHEN** a customer enters a 19-digit numeric identifier beginning with `89`
- **AND** initial verification returns an asset token
- **THEN** the client SHALL not calculate or submit a second identifier
#### Scenario: Completed ICCID fails
- **WHEN** the Luhn-completed retry does not return an asset token
- **THEN** the client SHALL invoke the existing login failure presentation once using the retry failure
#### Scenario: Identifier is not a 19-digit ICCID prefix
- **WHEN** an identifier does not match `^89\\d{17}$`
- **AND** verification fails or does not return an asset token
- **THEN** the client SHALL not issue a retry
- **AND** SHALL retain the existing login failure presentation

View File

@@ -0,0 +1,10 @@
## 1. Login fallback
- [x] 1.1 Add a pure ISO/IEC 7812 Luhn mod-10 check-digit helper for a 19-digit ICCID prefix.
- [x] 1.2 Retry asset verification once and silently only when the initial identifier matches `^89\\d{17}$` and the first verification fails or lacks `asset_token`.
- [x] 1.3 Persist the completed ICCID only after the retry succeeds; retain the existing visible error path for all final failures and non-matching identifiers.
## 2. Verification
- [x] 2.1 Verify known Luhn vectors plus first-attempt success, fallback success, fallback failure, and non-ICCID failure behavior.
- [x] 2.2 Run the H5 production build.

View File

@@ -0,0 +1,19 @@
# Change: Add personal customer notifications
## Why
个人客户缺少统一的站内通知入口,无法查看业务通知、获取未读数量或管理通知已读状态。
## What Changes
- 增加个人客户通知列表查询接口,支持分页和固定倒序排列。
- 增加单条通知已读和全部通知已读接口。
- 增加个人客户通知未读数查询接口。
- 限制通知数据仅返回当前认证客户可见且未过期的业务通知。
- 统一返回通知内容、关联资源、通知级别、已读状态及时间信息。
## Impact
- Affected specs: `personal-notifications`
- Affected code: 个人客户通知 API、通知列表入口、未读数展示和已读状态处理
- No breaking changes to existing APIs

View File

@@ -0,0 +1,56 @@
## ADDED Requirements
### Requirement: Personal customers SHALL be able to query notifications
The system SHALL provide `GET /api/c/v1/notifications` for authenticated personal customers. The endpoint SHALL return only visible, unexpired business notifications for the current customer, ordered by creation time descending and notification ID descending.
#### Scenario: Query the first notification page
- **WHEN** an authenticated customer requests the notification list without pagination parameters
- **THEN** the system SHALL return page 1 with up to 20 notifications
- **AND** the response SHALL include `items`, `page`, `size`, and `total`
#### Scenario: Apply valid pagination
- **WHEN** the request includes `page` from 1 to 10000 and `page_size` from 1 to 50
- **THEN** the system SHALL return the requested page and page size
#### Scenario: Reject invalid pagination
- **WHEN** `page` or `page_size` is outside its allowed range
- **THEN** the system SHALL return a parameter validation error
### Requirement: Notification items SHALL expose client-readable status and metadata
Each notification item SHALL include `id`, `title`, `body`, `type`, `category`, `severity`, `ref_type`, `ref_id`, `ref_key`, `is_read`, `created_at`, and nullable `read_at`.
#### Scenario: Return an unread notification
- **WHEN** a visible notification has not been read by the current customer
- **THEN** the system SHALL return `is_read: false` and `read_at: null`
### Requirement: Personal customers SHALL be able to mark one notification as read
The system SHALL provide `PUT /api/c/v1/notifications/{id}/read` for authenticated personal customers. The operation SHALL be idempotent and SHALL only update a notification visible to the current customer.
#### Scenario: Mark a visible unread notification
- **WHEN** the customer marks a visible unread notification as read
- **THEN** the system SHALL set its read state and return `{ "success": true }`
#### Scenario: Mark an unavailable or already-read notification
- **WHEN** the notification does not exist, belongs to another customer, or is already read
- **THEN** the system SHALL return `{ "success": true }` without exposing ownership information
### Requirement: Personal customers SHALL be able to mark all notifications as read
The system SHALL provide `PUT /api/c/v1/notifications/read-all` to mark all visible, unexpired, unread business notifications for the current customer as read.
#### Scenario: Mark all unread notifications
- **WHEN** the customer calls the mark-all-read endpoint
- **THEN** the system SHALL return the number of notifications actually updated in `updated_count`
- **AND** repeated calls SHALL remain successful and return zero when nothing needs updating
### Requirement: Personal customers SHALL be able to query unread count
The system SHALL provide `GET /api/c/v1/notifications/unread-count`. The count SHALL include only visible, unexpired business notifications and SHALL exclude platform sync and system operations notifications.
#### Scenario: Return unread count and badge text
- **WHEN** an authenticated customer queries the unread count
- **THEN** the system SHALL return numeric `count` and string `display_count`
- **AND** `display_count` SHALL be `99+` when `count` exceeds 99

View File

@@ -0,0 +1,26 @@
## 1. API and Data Contract
- [x] 1.1 Define the client-side personal notification item and paginated list contract
- [x] 1.2 Define the client-side unread count and read-operation contracts
- [x] 1.3 Add authenticated notification API wrappers
## 2. Notification Behavior
- [ ] 2.1 Return only current customer's visible, unexpired business notifications
- [ ] 2.2 Apply creation-time and notification-ID descending ordering
- [ ] 2.3 Support idempotent single-read and read-all operations
- [ ] 2.4 Exclude platform sync and system operations notifications from unread count
## 3. Client Entry
- [x] 3.1 Add the personal notification list entry and pagination handling
- [x] 3.2 Add unread-count display and refresh behavior
- [x] 3.3 Mark notifications read from list actions and support mark-all-read
## 4. Verification
- [ ] 4.1 Test authentication, pagination limits, ordering, and visibility isolation
- [ ] 4.2 Test idempotent read behavior and unread-count updates
- [x] 4.3 Verify the H5 build and unified success/error response handling
> Note: The repository contains the H5 client only. Tasks 2.1-2.4 and 4.1-4.2 require implementation and verification in the backend service repository.

View File

@@ -0,0 +1,63 @@
## Context
本次迭代同时调整认证入口、资产初始化、套餐购买、钱包充值、订单查询和站内通知入口。后端已经通过资产信息、充值校验、订单和通知接口返回策略与业务状态,H5/C 端需要消费这些结果,而不是复制后端规则。当前仓库已经存在部分支付、实名和通知页面,因此提案以增量收敛行为为主。
接口约定以 `docs/所需接口文档/new-api.md` 为准;登录限制接口和通知接口的调用路径同时以 `docs/产品迭代7月份/七月迭代H5_C端改动说明.md` 中列出的既有路径为准。
## Goals / Non-Goals
- Goals: 让登录限制、实名策略、支付方式、强充约束、下架套餐续费、预计到期时间、临期/换货通知及订单标识展示均以后端返回为准。
- Goals: 保持现有 H5/C API 路径和支付入口,完成前端参数和展示规则收敛。
- Non-Goals: 不新增后端接口,不修改订单历史快照,不由 H5/C 调用企微审批回调,也不实现七月说明中列出的排除项。
## Decisions
### 1. Backend is the source of truth
资产初始化统一读取 `effective_realname_policy`、`realname_required`、`real_name_status`、`allowed_payment_methods`、`estimated_final_expires_at`、`days_until_final_expiry`、`expiry_estimate_status` 和 `is_expiring`。前端不再根据 `asset_type`、卡/设备组合或本地枚举推导实名和支付规则;设备是否已实名也以服务端最终状态为准。
### 2. Keep login failure before token persistence
`POST /api/c/v1/auth/verify-asset` 成功后才允许进入后续微信登录,并保存本次返回的 `asset_token`。业务失败时直接展示后端 `msg`,当前登录尝试不得继续获取或覆盖资产 Token;Token 的签发和吊销仍由服务端负责。
### 3. Normalize payment payloads at the API boundary
订单和充值页面只提交用户从后端允许列表中选择的 `payment_method`。仅在 `payment_method = wechat` 时提交接口要求的 `app_type`;钱包和支付宝不添加无关的微信字段。金额在 UI 层转换为元,在请求层保持整数分。
支付创建成功后,根据 `pay_config` 或 `payment_link` 进入既有支付处理;返回页面或支付完成后使用订单详情/状态查询确认结果,不能仅凭前端跳转成功判定已支付。
### 4. Separate catalog visibility from renewal eligibility
普通套餐列表继续只展示可售套餐。老客户续费使用资产信息中的 `current_package_id` 或历史订单中的 `package_ids` 作为已知套餐 ID,复用 `POST /api/c/v1/orders/create`,不创建“下架套餐续费”专用接口。前端不得修改历史订单数据或把下架套餐重新放入普通新客购买列表。
### 5. Display the final expiry estimate
资产页面优先展示 `estimated_final_expires_at`,并用 `expiry_estimate_status` 判断其是否可展示,用 `days_until_final_expiry` 和 `is_expiring` 控制剩余天数及临期样式。前端不根据当前套餐到期时间自行累加计算最终日期;无可用估算时显示明确的空状态。
### 6. Reuse the existing customer notification entry
首页或通知入口读取未读数,通知页面读取列表,用户查看/点击通知后调用单条已读接口。套餐临期的 15/7/3 天触发和 0~3 天的优先级由后端通知数据表达,前端只负责按等级排序/展示和更新未读数。换货通知沿用同一套入口,不新增营销、ERP 或业务员提醒通道。
本提案依赖进行中的 `add-personal-notifications` 变更提供通知数据的可见性、分页和幂等已读语义;本提案只定义 H5/C 的消费方式。
### 7. Preserve server snapshots in order views
订单列表和详情使用后端返回的 `purchase_role` 与 `asset_identifier`。设备显示优先使用 `virtual_no`,为空时使用 `imei`,绝不以 `sn` 代替;缺失数据保持空占位,不由前端伪造。金额继续按分转元展示。
## Risks / Trade-offs
- 后端字段缺失或为空时,页面可能无法给出策略或到期日期;通过统一空状态和错误提示避免前端猜测。
- 同一支付入口可能同时收到 `pay_config` 与 `payment_link` 为空的结果;前端必须保留既有错误处理并允许通过订单状态查询恢复。
- `add-personal-notifications` 与本提案同时推进时,需要先确认通知 API 的返回字段和分页参数一致;本提案不重复修改该服务契约。
- 下架套餐续费依赖资产或历史订单提供合法的套餐 ID;若两者均不存在,应明确提示不可续费,而不是从普通列表猜测套餐。
## Migration Plan
1. 先更新 API 封装和数据归一化,再逐个接入登录、资产、支付、套餐、通知和订单页面。
2. 使用接口模拟数据覆盖策略冲突、支付方式变化、强充、临期等级、下架套餐和空标识场景。
3. 联调确认支付结果查询、通知已读幂等性及历史订单快照后发布。
4. 若任一后端字段未上线,回退对应 UI 展示入口,不回退到前端硬编码业务规则。
## Open Questions
- None. The proposal follows the July change description and the provided API document; backend response details not listed there remain opaque to the client and are displayed through existing generic error handling.

View File

@@ -0,0 +1,41 @@
# Change: Update July H5/C iteration behavior
## Why
七月迭代要求 H5/C 端将登录、实名、支付、套餐续费、到期提醒、站内通知和订单展示统一切换为以后端业务结果为准。当前页面和 API 封装仍存在按资产类型或前端本地规则判断的逻辑,部分订单提交也没有始终传递用户选择的支付方式,容易造成错误引导、支付参数不完整和订单信息展示失真。
## What Changes
- 在资产校验登录流程中处理店铺 C 端登录限制;被限制时展示后端业务错误,不保存或继续使用本次登录的资产 Token。
- 使用资产信息接口返回的 `effective_realname_policy`、`realname_required` 和 `real_name_status` 驱动实名状态展示及下单前后的实名流程。
- 使用 `allowed_payment_methods` 渲染支付方式,并在套餐下单、强充校验和钱包充值时按后端规则提交 `payment_method`;微信支付按要求提交 `app_type`。
- 普通套餐列表隐藏下架套餐,同时允许正在使用下架套餐的老客户通过 `current_package_id` 或历史订单 `package_ids` 复用 `/api/c/v1/orders/create` 续费。
- 在资产详情、资产列表等页面展示后端计算的 `estimated_final_expires_at`,并使用临期字段进行高亮。
- 接入 C 端站内通知的未读数、列表和单条已读接口,展示套餐临期和换货通知,并按后端临期等级处理提醒优先级。
- 在订单列表和详情展示后端返回的 `purchase_role` 与 `asset_identifier`;设备标识按 `virtual_no` 优先、`imei` 兜底,不使用 SN 冒充。
- 保持金额接口以分传输、页面以元展示,并在支付参数或支付链接返回后通过订单状态查询确认支付结果。
本提案不包含首页隐藏设备 ICCID、行业卡未实名复机、状态同步/运营商回调、企微审批回调、原路退款、跨品类换货、分销码或佣金提现等明确排除项。H5/C 端不调用企微审批回调接口。
## Capabilities
### New Capabilities
- `c-login-access`: Enforce the shop-level C-end login restriction during asset verification
- `asset-realname-flow`: Drive real-name behavior from backend asset policy and status
- `asset-expiry-display`: Display the estimated final package expiry and expiry state
- `backend-driven-payment`: Render and submit payment methods from backend policy
- `legacy-package-renewal`: Allow eligible existing customers to renew discontinued packages
- `c-notification-reminders`: Surface expiry and exchange notifications in the H5/C client
- `order-display-fields`: Render order role and server-provided asset identifier snapshots
### Modified Capabilities
- `personal-notifications`: This change consumes the notification endpoints and does not redefine their backend visibility, pagination, or read-state contract. Coordinate with the existing `add-personal-notifications` change.
## Impact
- Affected code: `pages/login/login.vue`, `pages/index/index.vue`, `pages/auth/auth.vue`, `pages/switch/switch.vue`, `pages/package-order/package-order.vue`, `pages/my-wallet/my-wallet.vue`, `pages/order-list/order-list.vue`, `pages/notifications/notifications.vue`, related notification/payment components, and `api/modules/{auth,asset,order,wallet,notification}.js`
- Affected APIs: `/api/c/v1/auth/verify-asset`, `/api/c/v1/asset/info`, `/api/c/v1/wallet/recharge-check`, `/api/c/v1/orders/create`, `/api/c/v1/wallet/recharge`, `/api/c/v1/orders`, `/api/c/v1/orders/{id}`, `/api/c/v1/notifications/unread-count`, `/api/c/v1/notifications`, and `/api/c/v1/notifications/{id}/read`
- No new backend endpoint is required; the client adopts the response fields and request rules described in `docs/所需接口文档/new-api.md` and the July H5/C change description.
- Existing WeChat payment parameter handling, Alipay payment-link handling, wallet payment, payment submit guards, and notification list APIs must remain compatible.

View File

@@ -0,0 +1,23 @@
## ADDED Requirements
### Requirement: Asset views SHALL display the estimated final package expiry
Asset detail and summary views using `/api/c/v1/asset/info` SHALL prefer `estimated_final_expires_at` over `current_package_expires_at` for the user-facing final expiry. The client SHALL use `expiry_estimate_status`, `days_until_final_expiry`, and `is_expiring` when those fields are returned, and SHALL NOT calculate a replacement final expiry locally.
#### Scenario: Exact final expiry is available
- **WHEN** `expiry_estimate_status = exact` and `estimated_final_expires_at` is present
- **THEN** the client SHALL display the estimated final expiry date
- **AND** the client SHALL display the returned remaining-day value when available
#### Scenario: Asset is approaching final expiry
- **WHEN** `is_expiring = true` or the backend returns an applicable expiry level
- **THEN** the client SHALL apply the existing expiry highlight/reminder presentation
- **AND** the client SHALL use the backend value rather than recalculating the threshold
#### Scenario: Final expiry cannot be estimated
- **WHEN** `expiry_estimate_status` is `none`, `waiting_activation`, or `invalid_data`, or the estimated date is null
- **THEN** the client SHALL show the corresponding empty/pending state
- **AND** the client SHALL not present `current_package_expires_at` as if it were the final calculated expiry

View File

@@ -0,0 +1,37 @@
## ADDED Requirements
### Requirement: Real-name behavior SHALL use the effective backend asset policy
The H5/C client SHALL use `GET /api/c/v1/asset/info?identifier=...` as the source of truth for real-name behavior. It SHALL consume `effective_realname_policy`, `realname_required`, and `real_name_status` and SHALL NOT infer policy or final device real-name status from asset type, card type, device type, or frontend-only rules.
#### Scenario: Asset does not require real name
- **WHEN** asset information returns `effective_realname_policy = none` or `realname_required = false`
- **THEN** the client SHALL show the asset as not requiring real-name completion
- **AND** the client SHALL not block the normal order flow for real-name completion
#### Scenario: Real name is required before ordering
- **WHEN** asset information returns `effective_realname_policy = before_order`, `realname_required = true`, and `real_name_status` as not completed
- **THEN** the client SHALL show the real-name requirement
- **AND** the client SHALL prevent package order submission until the existing real-name flow completes
#### Scenario: Real name is required after ordering
- **WHEN** the effective real-name policy is `after_order`
- **AND** `/api/c/v1/device/cards` returns no card with completed real-name authentication
- **AND** package history contains neither a pending package (`status = 0`) nor an active package (`status = 1`)
- **THEN** selecting a real-name entry on the homepage or operator-switch page SHALL block direct real-name authentication
- **AND** the client SHALL show a confirmation prompt that can navigate to package ordering
#### Scenario: Post-order real-name requirement is satisfied
- **WHEN** the effective real-name policy is `after_order`
- **AND** `/api/c/v1/device/cards` returns at least one authenticated card, or package history contains a pending or active package
- **THEN** the homepage and operator-switch real-name entries SHALL retain the existing real-name authentication flow
#### Scenario: Device status is resolved from server output
- **WHEN** a device has cards with different local-looking real-name states but the asset info response returns the effective device `real_name_status`
- **THEN** the client SHALL display and use that returned effective status
- **AND** the client SHALL not replace it with a card/device inference

View File

@@ -0,0 +1,70 @@
## ADDED Requirements
### Requirement: Payment options SHALL be rendered from backend permissions
The H5/C client SHALL use `allowed_payment_methods` from asset information and the recharge-check response to determine which payment methods are visible and selectable. It SHALL support the backend values `wallet`, `wechat`, and `alipay` where returned, and SHALL not hard-code a card/device payment-method matrix.
#### Scenario: Asset payment methods are returned
- **WHEN** asset information returns a non-empty `allowed_payment_methods` list
- **THEN** the package payment UI SHALL render exactly the methods allowed by that list
- **AND** the client SHALL not offer a method absent from the list
#### Scenario: Recharge permissions differ from asset permissions
- **WHEN** `/api/c/v1/wallet/recharge-check` returns its own `allowed_payment_methods` value
- **THEN** the wallet recharge UI SHALL use the recharge-check value for that recharge attempt
- **AND** the client SHALL not reuse a stale package-payment method list
### Requirement: Payment creation SHALL submit the selected method and the required WeChat app type
The client SHALL submit `identifier`, the relevant package or amount fields, and the user-selected `payment_method` to the applicable creation endpoint. It SHALL submit `app_type` only when `payment_method = wechat`, using the endpoint-defined value `official_account` or `miniapp`.
#### Scenario: Create a package order
- **WHEN** the user submits an allowed package payment method
- **THEN** the client SHALL call `POST /api/c/v1/orders/create` with `identifier`, `package_ids`, and the selected `payment_method`
- **AND** the client SHALL include `app_type` for WeChat payment as required
#### Scenario: Create a wallet recharge
- **WHEN** the user submits an allowed recharge method and an amount within backend limits
- **THEN** the client SHALL call `POST /api/c/v1/wallet/recharge` with the integer amount in cents, identifier, and selected payment method
- **AND** the client SHALL include `app_type` only for WeChat payment
#### Scenario: User-facing currency conversion
- **WHEN** an amount is returned by an API in cents
- **THEN** the client SHALL display the corresponding yuan value
- **AND** the client SHALL submit the original integer-cent representation to the API
### Requirement: Recharge submission SHALL honor the backend pre-check
The client SHALL call `GET /api/c/v1/wallet/recharge-check?identifier=...` before starting a recharge. When `need_force_recharge = true`, it SHALL use `force_recharge_amount`, `min_amount`, `max_amount`, and `message` from the response to guide or block the recharge flow.
#### Scenario: Force recharge is required
- **WHEN** recharge-check returns `need_force_recharge = true`
- **THEN** the client SHALL present the backend force-recharge amount and message
- **AND** the client SHALL not submit a normal recharge that violates the returned requirement
#### Scenario: Recharge is permitted normally
- **WHEN** recharge-check returns `need_force_recharge = false` and the amount is within the returned range
- **THEN** the client SHALL allow the user to select an allowed method and submit the recharge order
### Requirement: Payment results SHALL be confirmed by backend order state
After order creation, the client SHALL preserve existing handling for `pay_config` and `payment_link`, and SHALL use an order or recharge status query to confirm completion. A successful frontend redirect or payment-link return alone SHALL not be treated as proof of payment.
#### Scenario: Backend returns WeChat payment parameters
- **WHEN** a creation response contains `pay_config`
- **THEN** the client SHALL invoke the existing WeChat payment flow
- **AND** the client SHALL refresh backend payment status after the flow returns
#### Scenario: Backend returns a web payment link
- **WHEN** a creation response contains `payment_link`
- **THEN** the client SHALL use the existing payment-link presentation/handling
- **AND** the client SHALL confirm the resulting order or recharge state through the backend

View File

@@ -0,0 +1,23 @@
## ADDED Requirements
### Requirement: C-end login SHALL honor asset verification access decisions
The H5/C client SHALL call `POST /api/c/v1/auth/verify-asset` before continuing the asset login flow. A business failure or C-end login restriction returned by the endpoint SHALL be shown using the backend business message, and the client SHALL NOT continue to obtain, persist, or use an asset token for that login attempt.
#### Scenario: Asset verification allows login
- **WHEN** asset verification succeeds and returns an asset token
- **THEN** the client SHALL persist the identifier and returned asset token and continue the existing login flow
#### Scenario: Shop forbids a new C-end login
- **WHEN** asset verification returns a business failure indicating that the shop has forbidden C-end login
- **THEN** the client SHALL display the backend error message
- **AND** the client SHALL stop the current login flow before WeChat authorization or token persistence
- **AND** the client SHALL not revoke an already-issued token as a side effect
#### Scenario: Asset verification fails without a usable token
- **WHEN** the verification request returns an error response or no usable asset token
- **THEN** the client SHALL display the existing request/business error
- **AND** the client SHALL leave the current login attempt unauthenticated

View File

@@ -0,0 +1,66 @@
## ADDED Requirements
### Requirement: H5/C SHALL surface unread customer notifications
The H5/C client SHALL use `GET /api/c/v1/notifications/unread-count` for the homepage or notification-entry badge and `GET /api/c/v1/notifications` for the notification list. It SHALL consume the existing personal-notification contract and SHALL not add a separate API for expiry or exchange reminders.
#### Scenario: Unread notifications exist
- **WHEN** the unread-count endpoint returns a positive count
- **THEN** the homepage or notification entry SHALL display the unread indicator using that count
- **AND** the notification list entry SHALL remain available
#### Scenario: No unread notifications exist
- **WHEN** the unread-count endpoint returns zero
- **THEN** the client SHALL clear the unread indicator
- **AND** the notification entry SHALL not show a stale count
### Requirement: Expiry and exchange notices SHALL use the shared notification channel
The client SHALL display package-expiry and exchange-related notifications returned for the authenticated customer through the shared notification list or reminder popup. The backend notification data SHALL determine the expiry trigger and severity; the client SHALL not create independent timers that send business notifications.
#### Scenario: Package reaches a reminder threshold
- **WHEN** the notification service returns an unread package-expiry notice for the 15-day, 7-day, or 3-day threshold
- **THEN** the client SHALL display it through the existing H5/C notification entry or popup
- **AND** the client SHALL use the returned expiry level for presentation
#### Scenario: Critical expiry notice has highest priority
- **WHEN** unread expiry notices include a notice for 0 to 3 remaining days
- **THEN** the client SHALL give that notice the highest reminder priority
- **AND** the client SHALL not downgrade it based on a client-side date calculation
#### Scenario: Exchange notification is returned
- **WHEN** an exchange-related unread notice is returned after an exchange is created
- **THEN** the notification entry/list SHALL display the notice
- **AND** the client SHALL not call a separate marketing, ERP, or salesperson notification endpoint
### Requirement: Viewing a notification SHALL support marking it read
When the user views or activates a notification, the client SHALL call `PUT /api/c/v1/notifications/{id}/read` for that notification and reconcile the local unread count after a successful response. Repeated read actions SHALL remain safe according to the existing notification API contract.
#### Scenario: User reads an unread notice
- **WHEN** the user opens or advances to an unread expiry or exchange notification
- **THEN** the client SHALL mark that notification read through the existing endpoint
- **AND** the badge/list state SHALL reflect the read result
#### Scenario: Notification read request fails
- **WHEN** marking a notification read fails
- **THEN** the client SHALL retain the unread state or refresh it from the backend
- **AND** the failure SHALL not prevent the user from viewing other asset or notification content
### Requirement: Multi-notification popup SHALL communicate horizontal navigation
When the homepage notification popup contains more than one notification, the client SHALL make the horizontal swipe interaction visible to the user and SHALL retain the current-position indicator.
#### Scenario: User opens multiple unread notifications
- **WHEN** the homepage popup contains two or more notifications
- **THEN** the popup SHALL display an explicit `左右滑动切换通知` hint
- **AND** the user SHALL be able to move between notifications by swiping horizontally
- **AND** the popup SHALL display the current notification position

View File

@@ -0,0 +1,59 @@
## ADDED Requirements
### Requirement: Discontinued packages SHALL remain renewable only for eligible existing customers
The H5/C client SHALL keep discontinued packages out of the ordinary package catalog shown to new customers and agents. An eligible existing customer SHALL be able to use a valid `current_package_id` from asset info or `package_ids` from a historical order to continue a package renewal.
#### Scenario: New customer opens the package catalog
- **WHEN** the package catalog contains a discontinued package that is not the customer's current package
- **THEN** the client SHALL not display that package as an ordinary purchase option
#### Scenario: Existing customer is using a discontinued current package
- **WHEN** asset info returns a discontinued package through `current_package_id`
- **THEN** the client SHALL expose that ID only in the eligible renewal context
- **AND** the client SHALL allow the customer to continue through the existing standard order/payment flow without navigating to the package catalog
#### Scenario: Existing customer renews from a historical order
- **WHEN** a historical order returns one or more valid `package_ids`
- **THEN** the client SHALL use those IDs for the renewal selection when the order-list renewal entry is used
- **AND** the client SHALL preserve the historical order data unchanged
### Requirement: Renewal SHALL reuse the standard order creation contract
The client SHALL create a renewal by calling `POST /api/c/v1/orders/create` with the selected package ID or IDs, the asset `identifier`, and a currently allowed `payment_method`. It SHALL not invent or call a dedicated discontinued-package renewal endpoint.
#### Scenario: Submit a discontinued-package renewal
- **WHEN** an eligible customer confirms a renewal with an allowed payment method
- **THEN** the client SHALL submit the selected package IDs, identifier, and payment method to the standard order endpoint
- **AND** the client SHALL follow the standard payment response handling
#### Scenario: No eligible package ID is available
- **WHEN** neither asset info nor the relevant historical order supplies a valid package ID
- **THEN** the client SHALL show that renewal is unavailable
- **AND** the client SHALL not guess an ID from the ordinary package catalog
### Requirement: Renewal buttons SHALL be limited to the homepage and order list
The client SHALL show an `立即续费` button in the homepage asset summary and in every order card in the order list. The client SHALL NOT show a renewal button in the order detail page, package catalog, package-order page, or other pages.
#### Scenario: Customer renews from the homepage
- **WHEN** the homepage asset summary is displayed
- **THEN** the client SHALL show an `立即续费` button
- **AND** tapping it SHALL directly start the standard order/payment flow for the asset's current package ID when one is available
#### Scenario: Customer renews from an order card
- **WHEN** an order is displayed in the order list
- **THEN** the client SHALL show an `立即续费` button for that order
- **AND** tapping it SHALL directly start the standard order/payment flow for that order's package IDs without navigating to the package-order page
#### Scenario: Customer views another page
- **WHEN** the customer views any page other than the homepage or order list
- **THEN** the client SHALL NOT show an `立即续费` button

View File

@@ -0,0 +1,47 @@
## ADDED Requirements
### Requirement: Order views SHALL display backend role and asset snapshots
The H5/C client SHALL use `GET /api/c/v1/orders` and `GET /api/c/v1/orders/{id}` as the source of truth for order display. Order list and detail views SHALL display the backend `purchase_role` and `asset_identifier` values when present.
#### Scenario: Order includes a purchase role
- **WHEN** an order response returns `purchase_role`
- **THEN** the order list and detail view SHALL render that role
- **AND** the client SHALL not infer the role from the current user or asset type
#### Scenario: Card order includes an asset identifier
- **WHEN** a card order returns an `asset_identifier` snapshot
- **THEN** the client SHALL display the returned card identifier, such as ICCID, without replacing it with a current asset lookup
### Requirement: Device order identifiers SHALL prefer virtual number over IMEI
For device orders, the client SHALL display `virtual_no`/`VirtualNo` when it is non-empty, and SHALL use `imei` only when the virtual number is empty. The client SHALL not use `sn` as a substitute for the order asset identifier.
#### Scenario: Device has a virtual number
- **WHEN** a device order response contains a non-empty virtual number and an IMEI
- **THEN** the client SHALL display the virtual number
- **AND** the client SHALL not display SN as the order device identifier
#### Scenario: Device virtual number is empty
- **WHEN** a device order response has an empty virtual number and a non-empty IMEI
- **THEN** the client SHALL display the IMEI
#### Scenario: Historical identifier data is empty
- **WHEN** both the virtual number and IMEI are absent or empty
- **THEN** the client SHALL show the existing empty placeholder
- **AND** the client SHALL not fabricate an identifier from SN or a new asset-info request
### Requirement: Order amounts SHALL use the common currency display rule
Order list and detail views SHALL display `total_amount` and package prices converted from integer cents to yuan while preserving the integer-cent values in API requests and response state.
#### Scenario: Display an order amount
- **WHEN** an order response returns an amount in cents
- **THEN** the client SHALL render the corresponding yuan value
- **AND** the client SHALL not expose the raw cent value as the user-facing amount

View File

@@ -0,0 +1,51 @@
## 1. API adapters and shared rules
- [x] 1.1 Update asset/auth adapters and login handling for `verify-asset` business failures before asset-token persistence
- [x] 1.2 Normalize asset response fields for real-name policy/status, allowed payment methods, expiry estimate, and device/card identifiers
- [x] 1.3 Update order and wallet adapters so every create request includes the selected `payment_method`, and only WeChat requests include `app_type`
- [x] 1.4 Preserve cent-based request payloads and provide one shared yuan display formatter for amounts
- [x] 1.5 Confirm notification adapter parameters and response handling against the pending `add-personal-notifications` change
## 2. Login and asset state
- [x] 2.1 Show the backend business error and stop the current login flow when C-end login is forbidden
- [x] 2.2 Drive real-name prompts, status labels, and order gates from `effective_realname_policy`, `realname_required`, and `real_name_status`
- [x] 2.3 Remove local card/device real-name policy inference while preserving the existing real-name link flow
- [x] 2.4 Replace current-package-only expiry display with `estimated_final_expires_at` and apply backend expiry status/highlight fields
- [x] 2.5 Gate homepage and operator-switch real-name entries for `after_order` using device card real-name states and pending/active package history
## 3. Package purchase and renewal
- [x] 3.1 Render payment options from `allowed_payment_methods` on package purchase and prevent unavailable methods from being selected
- [x] 3.2 Keep discontinued packages out of the ordinary package catalog for new customers and agents
- [x] 3.3 Add the eligible existing-customer renewal path using `current_package_id` or historical `package_ids`
- [x] 3.4 Reuse `POST /api/c/v1/orders/create` for renewal and preserve selected identifier, package IDs, payment method, and existing payment result handling
- [x] 3.5 Show `立即续费` only on the homepage asset summary and every order-list card, with direct order/payment handling
## 4. Wallet recharge and payment completion
- [x] 4.1 Call `/api/c/v1/wallet/recharge-check` before recharge and enforce backend force-recharge/min/max guidance in the UI
- [x] 4.2 Render recharge payment methods from the recharge-check response and submit the selected method
- [x] 4.3 Preserve existing WeChat `pay_config`, Alipay/other `payment_link`, wallet payment, and submit-guard behaviors
- [x] 4.4 Refresh and confirm order/recharge status from the backend after payment return or link completion
## 5. Customer notifications
- [x] 5.1 Refresh unread count at the homepage or notification entry using `/api/c/v1/notifications/unread-count`
- [x] 5.2 Display expiry and exchange notifications from `/api/c/v1/notifications`, including backend severity/expiry level
- [x] 5.3 Mark an item read with `/api/c/v1/notifications/{id}/read` when the user views or activates it, then reconcile the unread badge
- [x] 5.4 Keep notification failures non-blocking for asset loading and do not add WeCom, marketing, or ERP calls
## 6. Order display
- [x] 6.1 Render `purchase_role` from order list/detail responses
- [x] 6.2 Render `asset_identifier` snapshots, using device `virtual_no` first and `imei` second, never SN as a substitute
- [x] 6.3 Preserve blank historical data as an empty-state placeholder and format order amounts from cents to yuan
## 7. Verification
- [ ] 7.1 Add or update tests for login denial, all real-name policies, backend payment-method variations, and WeChat `app_type`
- [ ] 7.2 Add or update tests for force recharge, discontinued-package renewal, expiry estimate states, notification priority/read flow, and order identifier fallback
- [x] 7.3 Run the H5 compiler build and repository consistency checks; manual API fixture verification remains an integration follow-up
> Note: This H5 repository has no test script or test suite. Tasks 7.1 and 7.2 remain unchecked and require adding a test harness or backend/API fixture environment before they can be completed.

View File

@@ -0,0 +1,58 @@
# 第 1 批 H5 对接实施与验证记录
2026-10-13:客户端功能已实现。仅对接 `/api/c/v1`;不处理代理注册、密码规则和后台接口。真实微信授权、短信绑定及后端 A/B 资产通知范围尚需测试环境联调,未部署或提交代码。
## 已实现
- 客户手机号、资产是否绑号、号码归属、绑定提示分别保存;登录字段按当前令牌和资产隔离,退出/过期/切换时清理,旧 phoneBindStatus 不再作为权威状态。
- 四种绑定模式使用原 bind-phone 入参;资产首次绑号可输入与客户号不同的号码,1192 提示管理员并禁用当前提交,1184 保留后端错误。按用户最新确认,强制绑定成功保留有效 token 和资产标识,直接进入首页,不再要求重登。
- 客户换号只更新后端确认的客户号码,不改资产关联;归属事实失效,下一次真实登录重新确认。换号的原号来源不再放进 URL。
- asset/info 的共享返回入口接收一次性临期提醒,首页按最新要求使用居中、可关闭弹窗,已移除旧横幅组件。0 天正常显示,使用服务器等级和上海时区;与风险换货/运营候选、普通通知依次展示。绑定页预填收到的提醒留在当前会话,进入首页展示。
- 旧首页通知弹窗排除临期项,通知中心保留。全部已读按用户 2026-10-14 最新确认恢复为 PUT,单条已读也保持 PUT;成功后重新读取列表和计数,失败不乐观清空,延迟响应不能覆盖新的资产上下文。
- 临期弹窗不再展示等级文字标签,仅使用等级配色;新增“立即续费”,先关闭提醒再打开首页原有续费窗口,复用当前套餐 ID/名称/价格和全部原有支付校验,准备和展示期间暂停其他通知。
- 通知卡片移除左侧未读强调边框和小圆点,标题右侧显示“未读/已读”小按钮。点击卡片或按钮成功标记后更新,失败仍显示未读。
## 验证证据
| 证据 | 结果 | 说明 |
|---|---|---|
| `npm run test:h5-integration` | 19/19 通过 | 实际 store/API 模块及页面 setup,使用 Vue 响应性;原生 API、生命周期和后端响应为模拟 |
| `npm run build:h5` | 通过 | uni-app H5 开发配置构建 |
| `npm run build:h5:production` | 通过 | uni-app H5 生产配置构建 |
| `openspec validate update-october-batch1-h5-integration --strict` | 通过 | 提案、需求和场景结构校验 |
| `git diff --check` | 通过 | 默认 Git 换行配置下未发现补丁空白错误;Windows 换行提示不影响构建 |
| 本地浏览器,390×844 / 320×640 | 通过 | 居中临期弹窗、0 天/上海时间、关闭、通知标题右侧未读按钮、点击卡片变已读;此前绑定表单及 1192 检查保留,无页面运行错误 |
测试文件:[tests/october-h5.test.mjs](../../../tests/october-h5.test.mjs)。覆盖绑定模式/成功后的分类更新、登录提示开关、状态持久化/隔离、换号不迁移资产、1192/1184、强制绑定直接进入首页且 token/客户信息/提醒保留、预填失败、共享接收/并发、0~15 天/上海边界、旧弹窗过滤、PUT 已读请求、通知失败与切换、模拟 A/B 全部已读、401 状态清理以及临期弹窗续费复用/队列暂停。
本次修订删除了绑定成功后的登录态清理和“绑定手机号成功,请重新登录”提示,替代旧手动重登提案;真正的退出或 401 登录过期处理不变。
最新界面修订:`ExpiryReminderPopup.vue` 替代横幅;候选请求结束后才消费临期弹窗,普通通知显示时收到临期提醒会排队。候选组件卸载后的延迟响应不再影响新页面。`notifications.vue` 标题右侧使用阅读状态按钮,原标记接口不变。
本地渲染复验:先完成生产构建,再运行以下命令。使用独立浏览器会话和虚构号码,所有业务接口改写到本地模拟服务。
```powershell
node tests/mock-h5-preview.mjs
```
另开一个终端:
```powershell
agent-browser --session october-h5-ui --headed false --init-script ./tests/mock-h5-browser-init.js open http://127.0.0.1:48138/pages/index/index
agent-browser --session october-h5-ui set viewport 390 844
agent-browser --session october-h5-ui snapshot -i
agent-browser --session october-h5-ui close
```
模拟服务固定在 `127.0.0.1:48138`,init 脚本仅在该地址注入;检查后使用 Ctrl+C 停止服务。该模拟接口故意重复返回提醒用于检查前端防重复,不能证明后端每日一次规则。
需要复验通知按钮时,在启动服务的终端先设置 `$env:H5_MOCK_NOTIFICATIONS='1'`;进入首页关闭临期弹窗,再点击站内通知。模拟通知初始为未读,点击卡片后服务端模拟状态变已读。
## 仍需真实联调
1. 微信公众号真实登录应返回三个布尔字段;尤其验证客户无号/资产有号时只给客户绑定,以及客户已有号时资产可绑定不同号码。
2. 确认 asset/info.bound_phone 仍表示当前客户手机号,与登录布尔事实区分;换号后资产号码保持原值。若实际响应与对接文档冲突,先确认契约,不猜测接口。
3. 同客户 A/B 两个临期资产分别扫码进入,确认服务器每天只返回一次、临期列表/未读数仅计当前资产,以及 A 上 PUT 全部已读不改变 B 的临期通知。
4. 完整回归真实支付、实名认证、套餐订购以及运营/风险换货候选弹窗。本次没有修改这些接口或候选组件,构建成功不替代真实业务验收。
完成结果已按实际验证范围回写 [tasks.md](tasks.md),真实联调项保留未勾选;不归档历史提案。

View File

@@ -0,0 +1,98 @@
## Context
项目为 Vue 3 / uni-app H5。`openspec/specs` 当前没有已归档基线,因此本提案在现有相关 capability 名称下使用 `ADDED Requirements` 建立本次需求,不对不存在的基线使用 `MODIFIED`。`phone-change-migration` 保留历史 capability 名称以便追踪,但行为明确改为“只更换客户手机号”,不表示仍支持迁移。
接口行为以 2026-10-12 的第 1 批对接说明和用户 2026-10-13 的答复为准。仓库未提供说明中引用的 `docs/admin-openapi.yaml`,不因此回退旧的换号或全部已读约定。
| 代码证据 | 问题 | 处理方向 |
|---|---|---|
| `pages/login/login.vue` 只读取 `need_bind_phone` | 登录的资产绑定事实未保存 | 保存三个布尔字段,按当前登录资产隔离 |
| `pages/index/index.vue` 用本地手机号优先覆盖 `bound_phone`,并据此计算 `alreadyBindPhone` | 客户手机号与资产关联混为一体,旧缓存可覆盖服务端 | 拆分客户手机号、资产绑定/归属、是否需要提示 |
| `pages/bind/bind.vue` 成功后无条件 `setPhoneBindStatus` | 只给客户绑号也可能被记为资产换号 | 按本次绑定对象刷新,不推断资产号码 |
| `pages/change-phone/change-phone.vue` 把 `newPhone` 写入资产缓存 | 与新文档“只换客户手机号”冲突 | 仅更新客户手机号,保留资产关联 |
| 首页、TrafficCard、绑定页等分别请求 `asset/info` | 一次性提醒可能先被非展示调用方取走 | 在 API 返回入口集中接收,再由资产信息区展示 |
| 首页 `loadUnreadNotifications` 展示所有未读项 | 仍以旧临期通知触发弹窗 | 从旧弹窗来源排除临期项,通知中心不删除 |
| `api/modules/notification.js` 的 `markAllRead` 方法约定曾冲突 | 用户最新确认应为 PUT | 保持 PUT,不采用此前 POST 约定 |
## Goals / Non-Goals
- Goals:正确区分客户与资产绑定、支持文档四种流程、客户换号不改变资产关联、一次性临期提醒不丢失/不重复、通知全部已读方法正确。
- Non-Goals:代理注册及密码规则、后台接口、全局通知重构、新增登录方式、重新设计支付或实名流程。
## Decisions
### 1. 分离客户与资产手机号状态
`asset_phone_bound` 只表示当前资产存在有效手机号关联,`asset_phone_is_own` 只表示该关联是否属于当前客户;二者不提供号码。`need_bind_phone` 是后端计算的提示开关,不能由前端用手机号为空、归属为 false 或本地缓存重新计算。
现有八月份接口定义 `docs/产品迭代8月份/11.md` 将 `asset/info.bound_phone` 描述为“当前登录用户绑定的手机号”。新对接说明声明字段为兼容性新增、未改变该字段,故保留其客户手机号用途:可作为绑定预填和更换客户手机号的原号来源,但不能作为资产关联是否存在的证据。若实施联调的实际响应与这一未变字段约定冲突,先向用户说明并确认,不猜测新增字段或号码。
在用户状态中记录当前登录资产的三个布尔字段;在退出、切换账号或资产时清理/更换。原 `phoneBindStatus` 不再作为服务端资产事实或客户原手机号的权威来源,不能让历史的 `bound: true` 绕过当前状态,也不能跨客户复用。未获取新字段时保持“未知”,不把缺失默认为已绑定,也不新增 OAuth 自动重登来刷新事实。
### 2. 按四种场景处理绑定
| 客户手机号 | 资产手机号 | 表单与成功后的处理 |
|---|---|---|
| 无 | 无 | 验证一次输入号码,由后端同时写入客户与资产 |
| 有 | 无 | 提示“给当前资产绑定手机号”;客户号码可预填且可编辑,允许提交不同号码,不据此改客户手机号 |
| 无 | 有 | 提示“绑定客户手机号”;仍使用既有 bind-phone 请求,成功后只更新客户状态,不覆盖资产关联 |
| 有 | 有 | 不要求绑定;资产号码属于他人也不要求改绑或暴露号码 |
是否触发登录后的绑定提示仍取决于 `need_bind_phone`;关闭强制开关时不产生自动跳转。首页功能入口分别展示资产绑定状态与客户换号能力,不能因客户已有手机号就禁用资产首次绑号。
对于 `1192`,展示联系管理员的明确提示,停止再次提交当前资产改绑请求;不自动重试、不换接口解除、不显示资产号码。`1184` 等其他错误按返回消息提示,失败不更新状态。请求仍使用 `{ phone, code }`,不凭空新增绑定对象参数。
用户最新确认绑定手机号不会让 token 失效。强制绑定成功后保留 token、identifier 及客户信息,直接进入首页;不清除登录态、不进行自动 OAuth 或要求手动重登。普通绑定成功返回上一页。成功后的状态更新必须对应本次实际绑定对象,不能用“请求成功”统一代表客户号和资产号均已修改。
强制与普通绑定页均可使用 asset/info 预填客户手机号:本次会话不变,共享接收的一次性提醒保留到首页展示。`asset_phone_bound=true` 且 `need_bind_phone=true` 明确对应“只给客户绑号”。预填失败时不阻塞输入;已知资产原本无号时,绑定成功更新资产已绑号,但客户号码和归属未知时不猜测,首页后续 asset/info 读取客户手机号。
### 3. 客户换号不迁移资产
保留原/新手机号和验证码的现有表单以及 `change_phone_old`、`change_phone_new` 场景。成功后只更新服务端确认的客户手机号,不调用 `setPhoneBindStatus(identifier, newPhone)`,不显示“全部资产换绑成功”或旧事务迁移文案。
原资产仍可保持已绑定,但其号码可能不再属于客户;例如原 `asset_phone_is_own=true` 在客户改成不同号码后可能为 false。若响应不提供更新后的归属事实,不能把旧 true 留作最新事实,应失效该归属状态,等下一次真实登录响应确认;不借此要求资产改绑。
### 4. 一次性临期提醒使用弹窗及共享接收
首页就是当前 H5 的资产信息展示页,本次不新增资产详情路由。按用户最新要求,移除横幅,使用 `ExpiryReminderPopup` 居中弹窗:等级配色、小型时钟图形、突出显示剩余天数和预计到期时间;不展示 level_name 标签。提供“立即续费”、右上关闭及“我知道了”操作。
首页按现有风险换货/运营候选 → 临期提醒 → 普通通知的顺序展示,一次只显示一个。asset/info 和候选请求未完成时不消费待展示提醒;通知已显示时才收到临期提醒,则等通知关闭后显示。候选按钮立即导航时保持提醒待展示;候选组件卸载后的异步响应不得回调新页面。临期关闭不再占首页布局,也不因此创建新的业务请求。
原样保留 `expiry_reminder.remaining_days`、`expires_at`、`level`、`level_name`;使用服务端等级映射 red / purple / pink 的样式,保留文本提示,不能只靠颜色传达紧急程度。`remaining_days=0` 必须正常展示。日期展示遵循 Asia/Shanghai,不能用客户端当前时区重算剩余自然日或等级。
“立即续费”先关闭临期弹窗且不推进其他通知,再调用与首页按钮相同的 startHomepageRenewal,使用当前套餐 ID、名称和续费价格。续费窗口准备中/可见时暂停其他提醒,关闭后继续排队。无可续费套餐或无支付方式时沿用原提示,不新增下单接口,也不在点击提醒按钮时自动创建订单。
`assetApi.getInfo` 成功返回处集中接收非空提醒并交给共享状态,同次资产进入期间的并发响应不允许用“未返回字段”的响应覆盖已经接收的提醒。共享状态隔离当前客户上下文与 identifier,避免切换资产/退出后显示旧资产或他人的提醒。提醒到达时若资产信息区尚不可见,应先暂存,待对应资产可见时再展示,不能静默丢弃。
后端负责“客户 + 资产 + 上海自然日”的每日一次;前端只防止同一次接收被多个组件重复展示,不增加每日定时推送、补发请求或长期缓存复播。关闭/已展示的提醒在当天后续无字段响应时不得重新出现。审核所有 `asset/info` 调用方,特别是绑定前预填及首页 TrafficCard 的请求顺序;绑定成功使用同一 token,提醒无需跨登录传递。真实退出、登录过期或切换上下文仍清理旧提醒。
临期弹窗展示/关闭不自动标记通知已读:提醒不含 notification_id,不能按标题、日期或列表位置猜测 ID,也不能调用 read-all 消掉新通知。临期通知继续由通知中心管理阅读状态。
### 5. 通知仅调整临期来源与全部已读方法
从首页旧通知弹窗来源排除临期项,沿用既有 `category=expiry` 识别方式;不删除通知中心临期项,不改变其他未读通知的顺序和展示。`popup-candidates` 的风险换货/运营链路不受影响。
列表、未读数保持原入参,不增加文档未定义的 identifier/asset_id;后端基于当前认证资产过滤临期通知,并非所有通知都只属于当前资产。切换资产后刷新列表和计数,不将 A 的未读结果拼接到 B。
全部已读按用户最新确认使用 PUT,保留通知中心主动触发;失败不提前清除未读状态。成功后以刷新结果对齐本地列表/未读数,不能把其他资产的临期通知置已读。单条已读继续 PUT。风险换货、运营及临期弹窗均不得自动调用全部已读。
通知卡片保留常规边框,移除左侧未读强调边框和小圆点。标题右侧显示绿色“未读”或灰色“已读”小按钮;点击整张卡片或状态按钮调用现有单条 PUT,成功后显示“已读”并刷新计数,失败保留“未读”。按钮阻止事件冒泡,避免一次点击触发两次标记。
## Risks / Trade-offs
- 一次性提醒在任何 asset/info 读取时就可能被后端消费:集中接收并回归首页并发、绑定预填、其他页面进入,不能只给首页 getInfo 的响应加判断。
- 客户号码与资产号码不同:服务端布尔事实和客户号分离,历史本地缓存不再覆盖服务端。
- 没有最新 YAML:按已确认的新文档实施;如实际契约缺字段或与四场景不符,提供响应结构差异(不含真实号码/令牌)并先询问用户。
- 尚未归档的旧提案仍含相反规则:本提案显式声明覆盖范围,不顺带改写或归档历史提案。
## Migration Plan
1. 提案批准后,先完成状态拆分及旧缓存失效,再调整绑定/换号行为。
2. 加入临期提醒共享接收和居中弹窗及排队显示,排除首页旧临期通知弹窗来源,调整通知阅读状态按钮。
3. 保持全部已读为 PUT,回归当前资产的列表与未读数。
4. 完成任务中的场景验证及 H5 构建,记录实际结果;不以静态构建代替真实接口联调。
5. 需要回退时只回退本次前端改动;服务端新契约不变,不能恢复“客户换号即资产迁移”的旧假设作为兼容策略。
## Open Questions
提案范围和优先契约已由用户确认,无需再次决定代理注册或 read-all 方法。实施前仍应检查接口是否实际提供所需字段及一次性提醒跨页面传递条件;只在发现具体矛盾时报告并询问,不擅自扩展接口。

View File

@@ -0,0 +1,63 @@
# Change: 对接十月份第 1 批 H5 接口变更
本提案仅覆盖 `/api/c/v1` 的现有 H5 功能。用户于 2026-10-13 批准执行;实现和验证结果见 [IMPLEMENTATION.md](IMPLEMENTATION.md)。
## Why
[第 1 批前端对接说明](../../../docs/10月份修改/第1批-8-9月迭代前端对接说明.md)中的 F1、M9 改变了手机号关联和临期提醒的行为。当前代码仍混用客户手机号与资产绑定状态、在客户换号后覆盖资产本地手机号,并从未读通知触发临期弹窗,可能出现错误的绑定提示和重复提醒。
## What Changes
- 接收并保存公众号登录返回的 `asset_phone_bound`、`asset_phone_is_own`、`need_bind_phone`,区分客户手机号与当前资产手机号关联,不能再用一个“已绑定”缓存表达两者。
- 按 F1 的四种场景调整绑定页文案、绑定入口及提交后的状态处理;客户已有手机号、资产无号时,允许给资产绑定不同号码。
- 对 `bind-phone` 的 `1192` 提示“该资产已绑定手机号,如需更换请联系管理员”,不提供重试当前绑定请求的操作;保留 `1184` 的既有错误处理。
- 绑定成功保留有效 token 和资产标识;登录引导的绑定页直接进入首页,不再清除登录态、提示或要求重新登录。普通绑定成功仍返回上一页。
- **BREAKING(替代旧前端假设)**:`change-phone` 只修改客户手机号,不更新任何资产手机号关联;停止将新客户手机号写入资产绑定缓存。
- 接收 `asset/info.expiry_reminder`,在首页展示居中、可关闭的临期弹窗,显示剩余天数、到期时间及等级配色,不显示等级名称标签;“立即续费”复用首页已有续费流程。无字段时不自行计算或补发提醒。
- 统一接收各 `asset/info` 调用返回的一次性提醒,防止首页子组件或其他调用方先获得字段后将其丢弃;不为提醒新增轮询或额外请求。
- 首页旧未读通知弹窗不再以临期通知作为弹窗依据;临期通知仍保留在通知中心,其他通知和既有运营/风险换货弹窗不变。
- 临期弹窗与风险换货/运营、普通通知弹窗依次展示,不叠加;通知卡片去掉左侧未读边框,标题右侧使用“未读/已读”小按钮,点击卡片或按钮后按单条已读响应更新。
- 全部已读保持 `PUT /api/c/v1/notifications/read-all`,以用户 2026-10-14 最新确认覆盖此前 POST 约定;通知列表和未读数沿用现有入参,由后端过滤当前资产的临期通知。
## Scope and confirmed decisions
用户确认:不处理代理注册;手机号行为以当前对接说明为准。全部已读以 2026-10-14 最新确认的 `PUT` 为准,不采用此前文档中的 POST。
后续用户补充确认:绑定手机号不会使 token 失效,绑定成功不得再跳转登录页。本次修订覆盖旧强制绑定后手动重登流程。
后续界面修订:临期提醒必须使用弹窗而非横幅;通知卡片用标题右侧的小按钮表达“未读/已读”,点击卡片完成已读。
| 接口 | 本次处理 | 不变部分 |
|---|---|---|
| `POST /api/c/v1/auth/wechat-login` | 消费两个资产绑定布尔字段及新的绑定提示语义 | OAuth、令牌、资产校验流程 |
| `POST /api/c/v1/auth/bind-phone` | 四种绑定场景、1192、成功后的分类状态更新 | `{ phone, code }`、验证码接口与场景 |
| `POST /api/c/v1/auth/change-phone` | 客户换号,不再假设资产关联迁移 | 原/新手机号及验证码表单、接口入参 |
| `GET /api/c/v1/asset/info` | 接收一次性 `expiry_reminder`,区分手机号用途 | 原资产、套餐、实名、支付字段 |
| `GET /api/c/v1/notifications` | 回归当前资产临期通知的可见性 | 分页、排序、通知中心展示 |
| `GET /api/c/v1/notifications/unread-count` | 使用后端当前上下文计数 | 原请求参数、未读入口 |
| `PUT /api/c/v1/notifications/read-all` | 保持 PUT,撤销此前 POST 改动 | 用户主动点击“全部已读”的入口 |
明确排除:
- 代理注册页面、接口封装、密码新规则及注册 `status=3`。
- 所有 `/api/admin`、`/api/auth` 的变更,以及后台订单、审批、换货、导入、预警、导出功能。
- 新增小程序登录入口;`miniapp-login` 的同名字段仅作为后端共用契约背景,本 H5 继续使用公众号登录。
- 修改 C 端订单、退款接口、WiFi 密码规则、支付路由及实名流程。
- 新增后端接口、手机号关联解除/迁移接口,或从布尔字段推测资产实际号码。
## Impact
- Affected specs: `index-phone-bind-gate`、`phone-bind-association-prefill`、`phone-change-migration`、`c-notification-reminders`、`personal-notifications`。
- Affected code: `pages/login/login.vue`、`pages/index/index.vue`、`pages/bind/bind.vue`、`pages/change-phone/change-phone.vue`、`components/FunctionCard.vue`、`components/DeviceStatusCard.vue`、`api/modules/asset.js`、`api/modules/notification.js`、`store/user.js`、`store/asset.js`、`utils/phone-bind.js`。
- 检查但不预设必须修改:`components/TrafficCard.vue`、`components/RenewalPaymentPopup.vue`、其他 `assetApi.getInfo` 调用方及通知中心的刷新逻辑。
- 不增加依赖,不执行后端或数据迁移。
## Existing change conflicts
- [update-phone-bind-association-flow](../update-phone-bind-association-flow/proposal.md):其“不同于客户主号则拒绝”“换号迁移全部资产关联”“用 bound_phone 判断资产关联”的旧约定,被本提案的 F1 约定替代;不覆盖其历史文件及完成标记。
- [update-post-bind-wechat-login-recheck](../update-post-bind-wechat-login-recheck/proposal.md):根据用户最新确认,替代其“强制绑定后清除 token 并要求手动重登”的约定;改为保留登录态直接进入首页,不改写历史提案。
- [update-july-h5-c-iteration](../update-july-h5-c-iteration/proposal.md):仅替代临期通知作为首页弹窗来源的约定,保留通知中心、其他通知和套餐到期信息展示。
- [add-personal-notifications](../add-personal-notifications/proposal.md):保持单条/全部已读的 PUT,遵循当前资产临期通知范围及最新卡片样式。
- [add-h5-popup-candidate-flow](../add-h5-popup-candidate-flow/proposal.md):保留候选弹窗与单条已读链路;候选结束后再显示临期弹窗,不调用全部已读来关闭任何弹窗。
技术选择、字段依据及风险见 [design.md](design.md),执行及验收清单见 [tasks.md](tasks.md)。

View File

@@ -0,0 +1,92 @@
## ADDED Requirements
### Requirement: Expiry reminders SHALL use the optional asset-info response
H5 SHALL 仅以 `GET /api/c/v1/asset/info` 返回的可选 `expiry_reminder` 作为本次临期主动提醒来源,在首页展示居中、可关闭的临期弹窗,而不是内联横幅。剩余天数、到期时间及配色 SHALL 使用 `remaining_days`、`expires_at`、`level`;SHALL NOT 展示 level_name 等级标签,也 SHALL NOT 用旧未读临期通知或客户端计算补发提醒。
#### Scenario: Asset info includes a reminder
- **WHEN** 当前资产响应含有效 expiry_reminder
- **THEN** H5 SHALL 展示该资产临期弹窗及后端提供的提醒信息
#### Scenario: Asset info omits the optional field
- **WHEN** 响应无 expiry_reminder,且当前进入没有已接收的待展示提醒
- **THEN** H5 SHALL 不显示临期弹窗,也不从 is_expiring 或通知列表补发
### Requirement: Reminder presentation SHALL preserve server calendar and levels
H5 SHALL 正确显示 0~15 天,按后端 `red`(0~3)、`purple`(4~7)、`pink`(8~15)设置视觉等级,并提供文字信息。到期时间 SHALL 按 Asia/Shanghai 展示,SHALL NOT 按客户端日期重新判定等级或剩余自然日。
#### Scenario: Zero remaining days
- **WHEN** 后端返回 remaining_days=0、level=red
- **THEN** H5 SHALL 正常展示 0 天及红色等级,不能把 0 当作缺失
#### Scenario: Client timezone differs from Shanghai
- **WHEN** 用户设备的本地时区不是 Asia/Shanghai
- **THEN** H5 SHALL 保留后端天数和等级,到期时间使用上海时区呈现
### Requirement: One-time reminder delivery SHALL survive competing asset-info consumers
H5 SHALL 在 asset/info 的共享成功返回入口接收一次性提醒,按当前客户上下文及资产隔离并暂存至对应资产可见。后端负责每日一次,前端 SHALL 防止同次接收被重复展示,SHALL NOT 因并发空字段响应覆盖已接收提醒、使用额外轮询或在关闭后复播。
#### Scenario: Child component receives the only reminder response
- **WHEN** TrafficCard 等调用方先获得 expiry_reminder,首页后续响应未返回该字段
- **THEN** H5 SHALL 通过共享接收状态在当前资产信息区展示该提醒,不将其丢弃
#### Scenario: Same asset is re-entered after dismissal
- **WHEN** 用户关闭提醒后再次进入同一资产,后端不再返回字段
- **THEN** H5 SHALL 不重播先前已展示提醒
#### Scenario: User switches customer or asset
- **WHEN** 用户退出、切换客户或进入另一资产
- **THEN** H5 SHALL 不显示旧上下文提醒;其他资产有新提醒时 SHALL 独立处理
### Requirement: Expiry notifications SHALL remain in the notification center without driving popups
H5 SHALL 从首页旧未读通知弹窗来源排除临期项,同时保留通知中心临期列表、未读数和既有阅读操作。临期弹窗展示或关闭 SHALL NOT 自动标记通知已读,其他通知及候选弹窗链路 SHALL 保持不变。
#### Scenario: Unread expiry notification exists without a new reminder
- **WHEN** 通知列表返回未读临期项,但 asset/info 无本次提醒
- **THEN** H5 SHALL 不以该项触发旧首页临期弹窗
- **AND** 通知中心 SHALL 仍可展示和阅读该项
#### Scenario: User closes an expiry popup
- **WHEN** 用户关闭临期弹窗
- **THEN** H5 SHALL 不猜测 notification_id、不发送自动单条已读或全部已读请求
### Requirement: Home popups SHALL display sequentially without overlapping
H5 SHALL 在风险换货/运营候选结束后展示待处理临期提醒,再继续既有普通通知流程,一次只显示一个弹窗。提醒 SHALL 仅在实际显示时标记本次已展示;导航或其他弹窗占用时 SHALL 保持待展示状态。
#### Scenario: Candidate and expiry reminder are both present
- **WHEN** 候选弹窗尚未结束且已收到 expiry_reminder
- **THEN** H5 SHALL 先展示候选,关闭后再展示临期提醒,不能叠加两个弹窗
#### Scenario: Notification is already open when reminder arrives
- **WHEN** 普通通知弹窗正在显示,随后收到 expiry_reminder
- **THEN** H5 SHALL 暂存临期提醒,等通知关闭后再展示
### Requirement: Expiry popup renewal SHALL reuse the homepage renewal flow
H5 SHALL 在临期弹窗提供“立即续费”,点击后先关闭提醒,再调用首页已有续费入口,使用当前套餐 ID、名称及价格。续费窗口准备/展示期间 SHALL 暂停其他通知弹窗,窗口关闭后再恢复;SHALL NOT 在提醒中另建下单或支付实现。
#### Scenario: User taps renew in an expiry popup
- **WHEN** 当前资产有可续费套餐,用户点击临期弹窗“立即续费”
- **THEN** 临期弹窗 SHALL 关闭,首页原有续费窗口 SHALL 打开
- **AND** 其他排队通知 SHALL 不与续费窗口重叠
#### Scenario: Current asset has no renewable package
- **WHEN** 用户点击“立即续费”,但当前套餐 ID 或名称无效
- **THEN** H5 SHALL 使用首页原有“当前资产暂无可续费套餐”提示,不创建订单

View File

@@ -0,0 +1,36 @@
## ADDED Requirements
### Requirement: Phone guidance SHALL use the current login asset facts
H5 SHALL 保存 `POST /api/c/v1/auth/wechat-login` 的 `asset_phone_bound`、`asset_phone_is_own`、`need_bind_phone`,分别表达资产是否绑号、号码归属和是否提示绑定。状态 SHALL 按当前账号及资产隔离;客户 `bound_phone` 和旧本地缓存 SHALL NOT 替代资产布尔事实。
#### Scenario: Customer has a phone but the asset is unbound
- **WHEN** 客户有手机号,登录返回 `asset_phone_bound=false` 和 `need_bind_phone=true`
- **THEN** H5 SHALL 引导用户给资产绑定号码
- **AND** SHALL NOT 因客户手机号非空或旧缓存 bound=true 跳过提示
#### Scenario: Asset belongs to another phone and guidance is not required
- **WHEN** 登录返回 `asset_phone_bound=true`、`asset_phone_is_own=false`、`need_bind_phone=false`
- **THEN** H5 SHALL 认为资产已有手机号,不要求重新绑定
- **AND** SHALL NOT 推测或显示关联号码
#### Scenario: Account or asset context changes
- **WHEN** 用户退出、切换账号或切换资产
- **THEN** H5 SHALL 清理或更换绑定事实,不能复用上一上下文的布尔值或手机号缓存
### Requirement: Automatic binding guidance SHALL follow need_bind_phone
H5 SHALL 仅按后端 `need_bind_phone` 触发自动绑定提示,SHALL NOT 根据手机号为空或 `asset_phone_is_own=false` 擅自增加自动跳转;缺失字段 SHALL 保持未知而非视为绑定成功。
#### Scenario: Force binding is disabled
- **WHEN** 强制绑定关闭,登录返回 `need_bind_phone=false`
- **THEN** H5 SHALL 正常进入首页,不自动跳转绑定页
#### Scenario: Guidance is required
- **WHEN** 登录返回 `need_bind_phone=true`
- **THEN** H5 SHALL 进入现有强制绑定流程,并按资产事实区分给客户绑号与给资产绑号

View File

@@ -0,0 +1,55 @@
## ADDED Requirements
### Requirement: Notification queries SHALL preserve backend current-asset expiry scope
H5 SHALL 保持 `GET /api/c/v1/notifications` 与 `GET /api/c/v1/notifications/unread-count` 的现有入参,使用后端返回的当前资产临期通知及未读计数。H5 SHALL NOT 扩大范围查询所有资产、为这些接口新增未声明参数,或将普通通知一并误过滤为仅当前资产。
#### Scenario: Customer views asset A
- **WHEN** 客户在资产 A 的认证上下文读取列表和未读数
- **THEN** H5 SHALL 展示后端结果,其中临期提醒按 A 过滤
- **AND** SHALL NOT 混入资产 B 的旧列表或计数
#### Scenario: Current asset changes
- **WHEN** 当前认证资产由 A 切换为 B
- **THEN** H5 SHALL 刷新列表和未读数,防止 A 的延迟响应覆盖 B
### Requirement: Mark-all-read SHALL use PUT and preserve other assets' expiry notifications
H5 SHALL 在用户主动点击通知中心“全部已读”时调用 `PUT /api/c/v1/notifications/read-all`,SHALL NOT 发送 POST 或用不同方法重试。其他资产的临期通知 SHALL 由后端保留未读;客户端成功后 SHALL 按服务端刷新结果更新当前视图,失败 SHALL 保留未读状态。单条已读 SHALL 继续使用 `PUT /api/c/v1/notifications/{id}/read`。
#### Scenario: User marks all notifications read on asset A
- **WHEN** 客户在 A 上主动执行全部已读
- **THEN** H5 SHALL 发送 PUT 并对齐当前视图
- **AND** 资产 B 的临期通知 SHALL 保持未读
#### Scenario: Mark-all-read fails
- **WHEN** PUT 全部已读请求失败
- **THEN** H5 SHALL 不提前清空未读计数或把本地项全部标成已读,也不改用 POST 重试
#### Scenario: User reads one notification
- **WHEN** 用户执行单条已读操作
- **THEN** H5 SHALL 继续发送对应通知的 PUT 请求
#### Scenario: Reminder or popup is displayed
- **WHEN** 临期、运营候选或风险换货弹窗展示或关闭
- **THEN** H5 SHALL 不自动调用 read-all 来结束展示链路
### Requirement: Notification cards SHALL show a right-aligned read-status button
H5 SHALL 在通知标题右侧显示小型“未读/已读”按钮,SHALL NOT 用左侧强调边框或小圆点表示未读。点击卡片或按钮 SHALL 对未读项调用现有单条已读 PUT,成功后切换为“已读”并刷新计数;失败 SHALL 保留未读状态,已读项不重复请求。
#### Scenario: User taps an unread card
- **WHEN** 用户点击未读通知卡片或标题右侧“未读”按钮,标记接口成功
- **THEN** 小按钮 SHALL 切换为“已读”,卡片不新增左侧边框
#### Scenario: Mark-read fails
- **WHEN** 点击未读通知后标记接口失败
- **THEN** 小按钮 SHALL 保持“未读”,用户仍可再次操作

View File

@@ -0,0 +1,60 @@
## ADDED Requirements
### Requirement: Binding SHALL distinguish customer and asset phone targets
H5 SHALL 按 F1 四种场景组织绑定表单,继续使用 `POST /api/c/v1/auth/bind-phone` 的 `{ phone, code }` 与既有验证码场景。客户号码预填 SHALL 可编辑,SHALL NOT 要求未绑定资产只能绑定客户主号,也 SHALL NOT 用资产布尔字段推导实际号码。
#### Scenario: Neither the customer nor the asset has a phone
- **WHEN** 客户和资产都无手机号,用户输入号码并成功验证
- **THEN** H5 SHALL 按后端同时绑定客户和资产的结果完成流程
#### Scenario: Only the customer has a phone
- **WHEN** 客户已有号码,资产未关联号码
- **THEN** H5 SHALL 提示给当前资产绑号,允许提交与客户号码不同的号码
- **AND** 成功后 SHALL NOT 把输入的资产号码当成客户的新号码
#### Scenario: Only the asset has a phone
- **WHEN** 客户无号码,资产已有号码,用户成功提交客户绑定
- **THEN** H5 SHALL 仅更新客户手机号状态,不覆盖或改变资产关联
#### Scenario: Both the customer and the asset have phones
- **WHEN** 客户和资产都已有号码
- **THEN** H5 SHALL 不要求绑定,无论资产号码是否属于当前客户
### Requirement: Asset phone conflicts SHALL direct the user to an administrator
H5 SHALL 对 `bind-phone` 的 `code=1192` 提示“该资产已绑定手机号,如需更换请联系管理员”,SHALL NOT 重试当前资产改绑请求、暴露号码或调用后台解除接口。其他错误 SHALL 保留后端消息,失败 SHALL NOT 更新绑定成功状态。
#### Scenario: Binding returns 1192
- **WHEN** 后端拒绝资产改绑并返回 1192
- **THEN** H5 SHALL 显示联系管理员提示并停止当前改绑操作,不提供同请求重试
#### Scenario: Phone is owned by another customer
- **WHEN** 绑定返回既有 1184 错误
- **THEN** H5 SHALL 保留相应后端错误提示,不误报为绑定成功或转换成 1192
### Requirement: Binding completion SHALL retain the valid session
H5 SHALL 在绑定成功后保留有效 token、identifier 和客户信息;强制绑定成功 SHALL 直接进入首页,普通绑定成功 SHALL 返回上一页。H5 SHALL NOT 因绑定成功清除登录态、跳转登录页或要求自动/手动重新登录。状态更新 SHALL 对应本次客户/资产实际绑定对象,SHALL NOT 一律将输入号码写入资产缓存。
#### Scenario: Mandatory binding succeeds
- **WHEN** 用户从强制绑定入口成功提交
- **THEN** H5 SHALL 直接进入首页并保留当前 token、identifier 和客户信息
- **AND** SHALL 清理旧版本的绑定后重登提示标记,不发送新的 OAuth 登录请求
#### Scenario: Ordinary binding succeeds
- **WHEN** 用户从首页普通入口成功提交
- **THEN** H5 SHALL 返回上一页,按后端结果更新相关状态,不强制返回登录页
#### Scenario: Prefill received a one-time reminder before binding
- **WHEN** 绑定页预填请求收到 expiry_reminder,随后用户绑定成功
- **THEN** H5 SHALL 保留同一会话下的共享提醒,进入对应资产首页后展示

View File

@@ -0,0 +1,27 @@
## ADDED Requirements
### Requirement: Customer phone changes SHALL leave asset phone associations unchanged
H5 SHALL 按当前 F1 契约调用 `POST /api/c/v1/auth/change-phone`,只更换客户手机号。原/新号码及验证码入参、`change_phone_old` / `change_phone_new` 场景 SHALL 保持不变;H5 SHALL NOT 将客户新号写入资产关联缓存或宣称所有资产关联已迁移。
#### Scenario: Customer changes to a different phone
- **WHEN** 客户换号成功,后端确认新客户手机号
- **THEN** H5 SHALL 更新客户手机号及后续换号的原号来源
- **AND** SHALL 保持资产关联不变,不调用新号写入资产绑定缓存的逻辑
#### Scenario: Asset ownership fact becomes stale
- **WHEN** 客户更换为不同号码,原归属事实为 true,响应未返回最新资产归属
- **THEN** H5 SHALL 失效旧 `asset_phone_is_own` 事实,等真实登录响应确认
- **AND** SHALL NOT 将资产误标为未绑定或要求重新绑定
### Requirement: Customer phone change failures SHALL preserve existing state
H5 SHALL 在换号失败时展示后端错误并留在表单,保留原客户及资产状态;SHALL NOT 套用旧“全部资产事务迁移/回滚”的假设或固定文案。
#### Scenario: Change-phone returns a business error
- **WHEN** 换号请求失败
- **THEN** H5 SHALL 显示实际错误消息并留在页面
- **AND** SHALL NOT 更新客户号码、资产号码或缓存

View File

@@ -0,0 +1,48 @@
## 1. 状态拆分与绑定入口
- [x] 1.1 保存登录的 asset_phone_bound / asset_phone_is_own / need_bind_phone,按当前账号与资产隔离,在退出/切换时清理。
- [x] 1.2 区分客户手机号、资产关联和提示状态;bound_phone 只沿用客户手机号用途,不用它推断资产关联。
- [x] 1.3 移除首页对旧 phoneBindStatus 的优先信任,确保历史缓存不能覆盖服务端状态或跨客户复用。
- [x] 1.4 调整首页手机号展示和 FunctionCard 绑定入口:客户有号但资产无号仍可绑定;资产归属 false 不表示未绑定。
- [x] 1.5 保留 need_bind_phone 驱动的登录提示,强制开关关闭时不额外自动跳转。
## 2. 绑定与客户换号
- [x] 2.1 实现 F1 四种绑定场景的表单文案、可编辑预填、成功后的分类状态更新;不新增请求字段。
- [x] 2.2 对 1192 显示联系管理员提示并停止当前改绑重试,保留 1184 及其他后端错误提示;失败不更新绑定缓存。
- [x] 2.3 按用户最新确认,强制绑定成功保留有效 token、identifier 和客户信息,直接进入首页;移除旧重登提示,普通绑定成功仍返回上一页。
- [x] 2.4 换号只更新客户手机号,删除新号写入资产缓存的行为;不再声明全部关联迁移/事务回滚。
- [x] 2.5 换号后更新客户原号来源并失效可能过期的 asset_phone_is_own;不将原资产标记未绑定,不自动要求改绑。
## 3. 临期提醒
- [x] 3.1 保留 expiry_reminder 的可选语义及四个字段,并在 assetApi.getInfo 的共同返回入口接收一次性提醒。
- [x] 3.2 实现当前账号/资产隔离的临时共享提醒状态;同次进入的后续空字段响应不能覆盖已接收的提醒。
- [x] 3.3 按最新要求,在首页显示可关闭的居中临期弹窗,按后端 red / purple / pink 展示,正确处理 0 天及上海时区的到期时间;与其他弹窗排队展示。
- [x] 3.4 检查 TrafficCard、绑定预填、RenewalPaymentPopup 及其他 getInfo 调用方;绑定页恢复 asset/info 预填,提醒保留在同一有效会话内,进入首页展示。
- [x] 3.5 从首页旧通知弹窗来源排除临期通知,通知中心保留;不影响其他通知及风险换货/运营弹窗。
- [x] 3.6 不为临期提醒新增轮询、每日补发、无字段补弹或自动已读请求。
## 4. 当前资产通知与全部已读
- [x] 4.1 按用户最新确认,将 markAllRead 恢复为 PUT /api/c/v1/notifications/read-all,不发送 POST;单条已读继续 PUT。
- [x] 4.2 保持列表/未读数入参不变,切换资产后刷新相关结果,禁止旧资产结果覆盖新资产。
- [x] 4.3 全部已读成功后按服务端结果对齐当前列表/计数,失败保留未读状态;不在任何提醒/弹窗展示链路调用 read-all。
## 5. 验证与交付
- [x] 5.1 通过自动/模拟测试验证四种绑定模式及强制开关关闭;真实微信授权验收另见 IMPLEMENTATION.md。
- [x] 5.2 通过模拟测试和本地浏览器验证不同号码输入、1192 联系管理员且不重试、1184 提示、失败状态不变。
- [x] 5.3 通过自动/模拟测试验证换号只更新客户、资产关联保持、归属失效及旧缓存/账号/资产隔离。
- [x] 5.4 通过自动/模拟测试验证字段缺省、0/3/4/7/8/15 天及等级、上海日期边界、重复进入和 A/B 上下文;浏览器检查 0 天弹窗及关闭行为。
- [x] 5.5 通过共享接收和首页脚本测试验证并发/其他调用方先返回提醒不丢失,以及旧首页弹窗只排除临期通知。
- [ ] 5.6 用同一客户的 A/B 两资产验证列表、未读数与 A 上 PUT 全部已读;B 的临期通知仍保持未读,普通通知范围不被前端扩大过滤。
- [ ] 5.7 验证单条已读仍 PUT、read-all 失败不提前清空、运营/风险换货弹窗和支付/实名/套餐展示不回归。
- [x] 5.8 执行 npm run build:h5、npm run build:h5:production,均通过;实施记录明确区分模拟验证与待真实联调场景。
- [x] 5.9 执行 openspec validate update-october-batch1-h5-integration --strict,校验通过;仅按实际完成结果更新本任务清单。
- [x] 5.10 新增并执行 npm run test:h5-integration,19 组自动/模拟测试通过,覆盖强制绑定、token 保留、弹窗排队、续费复用、PUT 全部已读及通知状态。
- [x] 5.11 使用本地模拟预览检查移动端居中临期弹窗、绑定表单预填/不同号输入及 1192 弹窗/禁用操作;不发送真实业务请求。
- [x] 5.12 去掉通知卡片左侧未读边框,改为标题右侧未读/已读小按钮;验证点击卡片成功后更新、失败不提前显示已读。
- [x] 5.13 移除临期弹窗等级文字标签,新增“立即续费”并复用首页入口;续费窗口打开时不推进其他通知。
5.6 的客户端 A/B 隔离逻辑、5.7 的单条 PUT 和失败不提前清空均已模拟测试通过;真实后端范围及完整支付/实名/候选弹窗回归未完成,不勾选。

View File

@@ -0,0 +1,33 @@
## Context
The August backend change is intentionally compatible at the HTTP surface: the two C端 payment creation paths remain unchanged, while merchant selection and retry semantics move to a stricter merchant-pool policy. The H5 client already has separate WeChat, Alipay, and wallet result handling, submit guards, and post-payment status refreshes; this change must tighten creation-attempt boundaries without changing those payment contracts.
## Goals / Non-Goals
- Goals: make one accepted user submission correspond to one payment-creation attempt; prevent client-side merchant failover and duplicate creation; preserve backend error semantics; keep status reconciliation read-only.
- Goals: make the attempt-count implication explicit so UI retries and polling do not silently exceed payment limits.
- Non-Goals: changing endpoint paths, adding merchant credentials/IDs to the client, redesigning payment pages, or changing WeChat/Alipay payment invocation contracts.
## Decisions
- Decision: merchant selection is opaque to the client. The client sends the documented request payload and never chooses or rotates a merchant.
- Decision: classify an API-declared pre-order failure as terminal for that attempt. The UI reports the backend error and exits the submit flow.
- Decision: classify timeout/network interruption as unknown rather than failed-success. The client does not create a replacement payment automatically; it refreshes status where supported and leaves any retry to an explicit user action.
- Decision: status polling and page refresh use read-only order/recharge queries. They must not call either payment creation endpoint.
- Decision: treat every invocation of a payment creation endpoint as an attempt for quota/count semantics, regardless of the eventual payment result.
## Risks / Trade-offs
- A user may need to retry manually after a transient network problem. This is intentional to avoid duplicate payment creation; provide clear “check status/retry” feedback.
- A delayed backend result can leave the UI temporarily indeterminate. Reconciliation through existing status APIs reduces this risk without creating another payment.
## Migration Plan
1. Audit API adapters and all payment callers for hidden retries or merchant parameters.
2. Add/adjust terminal and unknown-result branches while retaining existing result handlers.
3. Verify read-only status refresh and submit guards across package and wallet flows.
4. Roll back the client branch if backend rollout is delayed; endpoint contracts remain backward compatible.
## Open Questions
- Which order/recharge status endpoint and polling window should be used for an unknown creation result in each deployment environment?

View File

@@ -0,0 +1,29 @@
# Change: Align C端 payment flows with merchant-pool routing policy
## Why
The August payment iteration keeps the existing C端 payment creation endpoints, but changes how the backend routes payment creation through its merchant pool. The client must stop assuming that a failed or unknown payment-creation result can be retried against another merchant, otherwise one user action can create duplicate payment attempts and consume payment limits unexpectedly.
## What Changes
- Keep `POST /api/c/v1/orders/create` and `POST /api/c/v1/wallet/recharge` as the payment creation endpoints; do not add a merchant ID to client requests.
- Treat merchant selection as backend-owned and preserve the selected payment method and existing request fields (`identifier`, package IDs or amount, and WeChat-only `app_type`).
- Treat an explicit payment pre-order failure as the terminal result for the current attempt; surface the API error without automatically switching merchants or creating another payment.
- Treat timeout, connection interruption, and other unknown payment-creation results as indeterminate; do not automatically switch merchants or repeat payment creation. Any retry must be a deliberate, user-visible action after the applicable order/payment status is reconciled.
- Ensure payment-limit and attempt-count behavior is modeled as “every payment creation attempt counts”, rather than “only successful payments count”; client polling/status refresh must never create another payment.
- Continue to use the API-defined error codes and messages as the source of truth.
## Capabilities
### New Capabilities
- `payment-routing-policy`: Apply merchant-pool routing, terminal-failure, unknown-result, and payment-attempt accounting rules to C端 payment creation.
### Modified Capabilities
## Impact
- Affected API adapters: `api/modules/order.js`, `api/modules/wallet.js`.
- Affected payment callers: package order, wallet recharge, order-list payment, and shared payment-result/status refresh flows.
- No endpoint path or client merchant-selection configuration changes.
- Existing WeChat `pay_config`, Alipay `payment_link`, wallet payment, submit guards, and backend status reconciliation remain compatible.

View File

@@ -0,0 +1,90 @@
## ADDED Requirements
### Requirement: Payment creation SHALL use the stable C端 API contract
The client SHALL create package/strong-recharge orders through `POST /api/c/v1/orders/create` and wallet recharge orders through `POST /api/c/v1/wallet/recharge`. It SHALL submit the documented identifier, package or amount fields, and selected `payment_method`; it SHALL submit `app_type` only when required for WeChat payment and SHALL NOT submit a merchant ID.
#### Scenario: Package order creation uses the stable route
- **WHEN** a customer confirms a package or strong-recharge order
- **THEN** the client SHALL call `POST /api/c/v1/orders/create`
- **AND** the request SHALL not contain a client-selected merchant ID
#### Scenario: Wallet recharge creation uses the stable route
- **WHEN** a customer confirms a wallet recharge
- **THEN** the client SHALL call `POST /api/c/v1/wallet/recharge`
- **AND** the request SHALL contain the selected payment method and amount in the documented unit
### Requirement: Merchant selection SHALL remain backend-owned
The system SHALL rely on the backend merchant pool to select a payment merchant. The client SHALL not rotate merchants, expose merchant selection, or retry the same creation request against another merchant automatically.
#### Scenario: Payment creation is accepted
- **WHEN** the backend receives a valid payment creation request
- **THEN** the client SHALL use the returned payment preparation data (`pay_config`, `payment_link`, or wallet result) without attempting merchant selection locally
### Requirement: Explicit pre-order failure SHALL be terminal for the current attempt
When a payment creation endpoint returns an explicit failure, the client SHALL treat that attempt as failed, display the API-defined error code/message, and SHALL NOT automatically switch merchants or create another payment.
#### Scenario: Package order pre-order fails
- **WHEN** `/api/c/v1/orders/create` returns an error response before payment preparation succeeds
- **THEN** the current package/strong-recharge attempt SHALL end as failed
- **AND** the client SHALL surface the backend error without an automatic second creation request
#### Scenario: Wallet recharge pre-order fails
- **WHEN** `/api/c/v1/wallet/recharge` returns an error response before payment preparation succeeds
- **THEN** the current recharge attempt SHALL end as failed
- **AND** the client SHALL not switch merchants or silently create a replacement recharge order
### Requirement: Unknown payment-creation results SHALL not create duplicates
Timeouts, connection interruptions, and other results where the creation outcome is unknown SHALL be treated as indeterminate. The client SHALL not automatically switch merchants or repeat payment creation, and any status refresh SHALL be read-only.
#### Scenario: Creation request times out
- **WHEN** a payment creation request times out or the connection is interrupted before a definitive response is received
- **THEN** the client SHALL make no automatic replacement creation request
- **AND** the client SHALL allow the existing status-reconciliation flow to determine whether an order or recharge was created
#### Scenario: Status polling follows an unknown result
- **WHEN** the client polls or refreshes order/recharge status after an unknown result
- **THEN** it SHALL call only read-only status APIs
- **AND** it SHALL not count the refresh as a new payment creation attempt or invoke either creation endpoint
### Requirement: Payment attempt accounting SHALL include every creation attempt
The client SHALL behave consistently with the backend rule that amount/attempt limits count every invocation of a payment creation endpoint, regardless of whether the resulting payment later succeeds. It SHALL not loop until success or assume a failed/unknown attempt is free.
#### Scenario: Explicit failure consumes an attempt
- **WHEN** a payment creation request is sent and the backend returns an explicit failure
- **THEN** the client SHALL finish the current flow without automatic repetition
- **AND** subsequent creation SHALL require a new deliberate user action
#### Scenario: Successful payment follows one creation attempt
- **WHEN** a payment creation request returns valid payment preparation data
- **THEN** the client SHALL proceed with the existing WeChat, Alipay, or wallet flow
- **AND** status polling or payment-link return handling SHALL not create an additional payment
### Requirement: Existing payment result contracts SHALL remain compatible
The routing-policy change SHALL preserve existing WeChat `pay_config`, Alipay `payment_link`, wallet payment, submit-guard, and backend status-reconciliation behavior. API-defined error codes and messages SHALL remain authoritative.
#### Scenario: WeChat or Alipay preparation succeeds
- **WHEN** the backend returns valid `pay_config` or `payment_link`
- **THEN** the client SHALL invoke the existing corresponding payment flow
- **AND** it SHALL determine final success from the existing backend status refresh rather than from a routing decision
#### Scenario: Backend returns a documented error
- **WHEN** the API returns a documented error code and message
- **THEN** the client SHALL preserve and present that error according to the existing error-handling behavior
- **AND** it SHALL not replace it with a merchant-specific or generic retry result

View File

@@ -0,0 +1,19 @@
## 1. Request contract and routing
- [x] 1.1 Audit order and wallet payment creation adapters to keep the documented endpoint paths and required fields unchanged.
- [x] 1.2 Ensure no payment creation request accepts or forwards a merchant ID; keep `app_type` conditional on WeChat payment only.
- [x] 1.3 Document the backend-owned merchant-pool selection and the fact that the client must issue one creation request per accepted user action.
## 2. Failure and unknown-result handling
- [x] 2.1 Handle explicit pre-order failures as terminal for the current attempt and display the backend-provided error code/message.
- [x] 2.2 Ensure timeout, connection interruption, and other unknown creation results do not trigger merchant switching or a second automatic creation request.
- [x] 2.3 Keep status polling/refresh flows read-only; they must reconcile order or recharge state without creating another payment.
- [x] 2.4 Provide a deliberate, user-visible retry path only after the current order/payment state can be safely reconciled, preserving existing submit guards.
## 3. Attempt accounting and regression verification
- [x] 3.1 Verify client behavior does not treat a failed or unknown attempt as free and does not loop until payment succeeds.
- [x] 3.2 Verify package order creation and wallet recharge each make at most one payment-creation call per accepted submission.
- [x] 3.3 Verify WeChat, Alipay, and wallet result handling remains unchanged after routing-policy updates.
- [x] 3.4 Verify API error codes/messages are passed through according to the interface documentation.

View File

@@ -0,0 +1,37 @@
## Why
The August 2026 customer API document (`docs/产品迭代8月份/11.md`) freezes the customer-side authentication contracts used by H5. The behavioral contract changes are:
- `need_bind_phone` widens to a three-state decision: no main phone, or main phone exists but the current asset is unassociated -> `true`; already associated -> `false`; global switch off -> always `false`. The frontend still uses it only to decide whether to guide the user into phone verification.
- `POST /api/c/v1/auth/bind-phone` becomes idempotent: when the account already has a main phone, submitting the same main phone plus a valid code creates the association instead of rejecting it.
- `POST /api/c/v1/auth/change-phone` migrates all valid phone-asset associations in one transaction and rolls back the whole operation on the 10-asset limit or an existing same-asset relation.
The current H5 bind page starts with an empty phone input and has no prefill. Existing users who have a main phone but whose current asset is unassociated are guided to verify, yet every submitted number is rejected - a deadlock. Homepage-gate and login routing must also follow the widened `need_bind_phone` semantics instead of raw bound-phone presence.
## What Changes
- Bind page prefills the phone input with the account main phone from `GET /api/c/v1/asset/info` -> `bound_phone` and allows sending a `bind_phone` verification code to that number
- Bind submission treats `bind-phone` as idempotent for the account main phone; other numbers show the backend `msg` and keep the user on the page
- Keep the existing bind-completion flow: ordinary entry returns back, mandatory login-gate entry triggers the manual re-login flow
- `change-phone` keeps the old/new phone and verification-code inputs with the `change_phone_old` / `change_phone_new` send-code scenes; failures show backend rollback copy (10-item limit and same-asset conflict) and keep the user on the page
- Login and homepage entry keep `need_bind_phone` as the only phone-verification guide signal and follow the three-state semantic
- `send-code` request/response stays unchanged (`cooldown_seconds`); the new `verify-asset` fields `miniapp_app_id` / `oa_app_id` are a backend confirm item, not consumed yet
## Capabilities
### New Capabilities
- `phone-bind-association-prefill`: Define bind-page prefill of the account main phone and idempotent bind submission behavior
- `phone-change-migration`: Define change-phone transaction-migration behavior and backend rollback copy display
### Modified Capabilities
- `index-phone-bind-gate`: Widen the bind-phone gate to the three-state `need_bind_phone` semantic
## Impact
- Affected code: `pages/bind/bind.vue`, `pages/change-phone/change-phone.vue`, `pages/index/index.vue`, `pages/login/login.vue`
- API module: `api/modules/auth.js` unchanged - endpoints and response shapes already match `11.md`
- Backend contract deltas (per `11.md`): bind-phone idempotency, change-phone transactional migration, three-state `need_bind_phone`
- Backend decisions (confirmed 2026-09-15):
- `need_bind_phone` stays wechat-login-only; `asset/info` and `verify-asset` do not add the field. The homepage gate keeps evaluating the per-entry association state via `asset/info.bound_phone`.
- No new prefill field: bind-page prefill keeps using `asset/info.bound_phone`.
- `verify-asset`'s new `miniapp_app_id` / `oa_app_id` are not consumed; H5 login keeps using `/api/c/v1/wechat/appid`, and `/api/c/v1/auth/wechat-login` remains the login authority.

View File

@@ -0,0 +1,23 @@
## MODIFIED Requirements
### Requirement: Index entry SHALL enforce the bind-phone gate from the asset association state
The system SHALL determine whether phone-verification guidance is required whenever the homepage is entered, using the current asset association state returned by `GET /api/c/v1/asset/info` -> `bound_phone` (empty means the asset is not associated and binding is required). The widened `need_bind_phone` decision stays wechat-login-only: no main phone -> required; main phone exists but the current asset is unassociated -> required; already associated -> not required; global switch off -> never required. The frontend still uses the signal only to decide whether to guide the user, and the backend does not block any business interface on the missing relation.
#### Scenario: User has no main phone
- **WHEN** the account has no main phone and the user enters `pages/index/index`
- **THEN** the system SHALL treat phone verification as required
- **AND** the system SHALL route the user into the bind-phone guide
#### Scenario: User has a main phone but the current asset is unassociated
- **WHEN** the account has a main phone but the current asset is not associated with it
- **THEN** the system SHALL treat phone verification as required
- **AND** the bind page SHALL prefill the account main phone from `asset/info.bound_phone`
#### Scenario: User is already associated
- **WHEN** the current asset is already associated with the account main phone
- **THEN** the system SHALL keep the user on the homepage
- **AND** the system SHALL NOT route the user into the bind-phone guide
#### Scenario: Global switch off
- **WHEN** the global phone-bind switch is off
- **THEN** the system SHALL never route the user into the bind-phone guide regardless of account state

View File

@@ -0,0 +1,36 @@
## ADDED Requirements
### Requirement: Bind page SHALL prefill the account main phone
The system SHALL prefill the bind-phone input with the logged-in account's main phone when one exists, using `GET /api/c/v1/asset/info` -> `bound_phone`, and SHALL allow sending a `bind_phone` verification code to that number.
#### Scenario: Existing account with a main phone enters the bind page
- **WHEN** the account already has a main phone and the user enters `pages/bind/bind`
- **THEN** the phone input SHALL be prefilled with the main phone
- **AND** the user SHALL be able to request a `bind_phone` verification code for that number without being rejected
#### Scenario: New account without a main phone enters the bind page
- **WHEN** the account has no main phone
- **THEN** the phone input SHALL remain empty
- **AND** the user SHALL enter a new number and follow the normal bind flow
### Requirement: Bind submission SHALL be idempotent for the account main phone
When `POST /api/c/v1/auth/bind-phone` is submitted with the account main phone and a valid code, the system SHALL treat it as a successful idempotent association instead of rejecting because the phone is already in use.
#### Scenario: Main phone plus valid code
- **WHEN** the submitted phone equals the account main phone and the code is valid
- **THEN** the bind request SHALL succeed
- **AND** the response SHALL keep the existing shape (`phone`, `bound_at`)
- **AND** the existing bind-completion routing SHALL apply unchanged
#### Scenario: Number different from the main phone
- **WHEN** the submitted phone differs from the account main phone
- **THEN** the bind request SHALL be rejected
- **AND** the system SHALL display the backend `msg` and keep the user on the bind page
### Requirement: Bind failures SHALL display backend messages
The system SHALL present the backend-provided error message for all bind-phone failures instead of a generic failure text, and SHALL keep the user on the bind page.
#### Scenario: Backend rejection with message
- **WHEN** `bind-phone` returns a business error
- **THEN** the bind page SHALL show the returned `msg`
- **AND** the page SHALL NOT navigate away

View File

@@ -0,0 +1,29 @@
## ADDED Requirements
### Requirement: Change-phone SHALL follow transactional full migration
The system SHALL rely on `POST /api/c/v1/auth/change-phone` to migrate all valid phone-asset associations in one transaction, and SHALL treat any failure as a rollback of the whole operation.
#### Scenario: Successful migration
- **WHEN** the old-phone code and the new-phone code are valid and no limit or conflict occurs
- **THEN** the change request SHALL succeed
- **AND** the response SHALL keep the existing shape (`phone`, `changed_at`)
- **AND** the user SHALL return to the previous page and the homepage SHALL refresh the bound state
#### Scenario: New number exceeds the association limit
- **WHEN** the new number would exceed 10 valid associated assets
- **THEN** the whole operation SHALL be rolled back
- **AND** the system SHALL display the backend copy: 该手机号最多关联10项有效资产
#### Scenario: New number conflicts with an existing same-asset relation
- **WHEN** the new number already has a valid association with an asset being migrated
- **THEN** the whole operation SHALL be rolled back
- **AND** the system SHALL display the backend copy: 新手机号已存在与待迁移资产相同的有效关联,换绑已回滚
### Requirement: Change-phone failures SHALL keep the user on the page
The system SHALL stay on the change-phone page and show the backend error message when migration fails so the user can correct the input and retry.
#### Scenario: Migration failure with message
- **WHEN** `change-phone` returns a business error
- **THEN** the page SHALL show the returned `msg`
- **AND** the page SHALL NOT navigate away

View File

@@ -0,0 +1,29 @@
## 1. Bind Page Prefill and Idempotent Bind
- [x] 1.1 Load the account main phone on bind-page mount via `assetApi.getInfo` and prefill the phone input when present
- [x] 1.2 Allow sending a `bind_phone` verification code to the prefilled main phone
- [x] 1.3 Keep ordinary bind success returning to the previous page
- [x] 1.4 Keep mandatory login-gate bind success returning to the login page for manual re-login
- [x] 1.5 Show backend `msg` on bind rejection and stay on the page
## 2. Change-Phone Transactional Migration Display
- [x] 2.1 Keep old/new phone and verification-code inputs with `change_phone_old` / `change_phone_new` scenes
- [x] 2.2 Show backend rollback copy for the 10-item limit and the same-asset conflict
- [x] 2.3 Stay on the change-phone page on failure
- [x] 2.4 Refresh the homepage bound state after success (existing `onShow` reload)
## 3. Three-State Need-Bind-Phone Routing
- [x] 3.1 Keep `need_bind_phone` as the only phone-verification guide signal in login success
- [x] 3.2 Evaluate the three-state semantic in the homepage bind gate
- [x] 3.3 Re-check the binding state on every homepage entry, not only after login
- [x] 3.4 Confirm the homepage gate signal source with backend - decision: keep `asset/info.bound_phone`; `need_bind_phone` stays wechat-login-only
## 4. Regression Verification
- [ ] 4.1 New user without a main phone still binds a fresh number
- [ ] 4.2 Existing user with a main phone and an unassociated asset can prefill, send code, and bind idempotently
- [ ] 4.3 Bind with a number different from the main phone shows the backend rejection message
- [ ] 4.4 Change-phone limit/conflict errors show the fixed backend copy
- [ ] 4.5 Global-switch-off keeps the bind guide hidden

View File

@@ -2,7 +2,8 @@
"scripts": {
"dev:h5": "uni",
"build:h5": "cross-env UNI_INPUT_DIR=. uni build -p h5 --mode development",
"build:h5:production": "cross-env UNI_INPUT_DIR=. uni build -p h5 --mode production"
"build:h5:production": "cross-env UNI_INPUT_DIR=. uni build -p h5 --mode production",
"test:h5-integration": "node --experimental-vm-modules --test tests/october-h5.test.mjs"
},
"devDependencies": {
"@dcloudio/types": "3.4.19",

View File

@@ -44,6 +44,12 @@
"navigationBarTitleText": "我的订单"
}
},
{
"path": "pages/notifications/notifications",
"style": {
"navigationBarTitleText": "站内通知"
}
},
{
"path": "pages/bind/bind",
"style": {

View File

@@ -95,7 +95,7 @@
min-height: 100vh;
box-sizing: border-box;
padding: 28rpx 24rpx 48rpx;
background: linear-gradient(180deg, #eaf4ff 0%, var(--bg-secondary) 42%);
background: linear-gradient(180deg, #eaf6ec 0%, var(--bg-secondary) 42%);
}
.pay-content {
@@ -108,8 +108,8 @@
background: var(--bg-primary);
border-radius: 28rpx;
padding: 32rpx;
box-shadow: 0 16rpx 40rpx rgba(10, 132, 255, 0.08);
border: 1rpx solid rgba(10, 132, 255, 0.08);
box-shadow: 0 16rpx 40rpx rgba(85, 171, 92, 0.08);
border: 1rpx solid rgba(85, 171, 92, 0.08);
}
.qr-desc {
@@ -144,7 +144,7 @@
.browser-tip {
padding: 22rpx 24rpx;
border-radius: 18rpx;
background: rgba(10, 132, 255, 0.08);
background: rgba(85, 171, 92, 0.08);
color: var(--primary);
font-size: 28rpx;
font-weight: 600;
@@ -167,7 +167,7 @@
padding: 28rpx;
border-radius: 24rpx;
background: #fff;
border: 1rpx dashed rgba(10, 132, 255, 0.24);
border: 1rpx dashed rgba(85, 171, 92, 0.24);
}
</style>

View File

@@ -1,173 +1,90 @@
<template>
<view class="container">
<!-- 空状态提示 -->
<view v-if="packageList.length === 0 && !loading" class="empty-state">
<view class="empty-icon">📦</view>
<view v-if="!historyLoaded || (loading && packageList.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="packageList.length === 0" class="empty-state">
<image class="empty-icon" src="/static/asset-package-history.png" mode="aspectFit" alt="资产套餐历史"></image>
<view class="empty-title">暂无套餐记录</view>
<view class="empty-desc">当前账号下暂无套餐历史信息</view>
</view>
<!-- 套餐列表 -->
<view v-else class="card package-card" v-for="(item, index) in packageList" :key="index">
<view class="package-header flex-row-sb">
<view class="package-name">{{ item.package_name }}</view>
<view class="tag-apple" :class="getStatusClass(item.status)">{{ item.status_name }}</view>
</view>
<view class="package-info">
<view class="info-row flex-row-sb">
<view class="info-label">激活时间</view>
<view class="info-value">{{ item.activated_at || '-' }}</view>
</view>
<view class="info-row flex-row-sb">
<view class="info-label">到期时间</view>
<view class="info-value">{{ item.expires_at || '-' }}</view>
</view>
</view>
<view class="divider"></view>
<view class="flow-info">
<view class="flow-title">流量信息</view>
<view class="flow-stats">
<view class="flow-item">
<view class="flow-label">已使用</view>
<view class="flow-value">{{ getUsedFlow(item) }}</view>
</view>
<view class="flow-item">
<view class="flow-label">总流量</view>
<view class="flow-value">{{ getTotalFlow(item) }}</view>
</view>
<view class="flow-item">
<view class="flow-label">剩余</view>
<view class="flow-value">{{ getRemainFlow(item) }}</view>
</view>
</view>
<view class="progress-section">
<view class="progress-apple">
<view class="progress-fill" :style="{width: getUsagePercent(item) + '%'}"></view>
</view>
</view>
</view>
<view v-else>
<PackageHistoryNode
v-for="(item, index) in packageList"
:key="getGroupKey(item, index)"
:node="item"
/>
</view>
<!-- 加载更多 -->
<view class="load-more" v-if="packageList.length > 0">
<view v-if="packageList.length > 0" class="load-more">
<text v-if="loading">加载中...</text>
<text v-else-if="noMore">没有更多了</text>
<text v-else @tap="loadMore">点击加载更多</text>
<text v-else-if="noMore">没有更多套餐</text>
<text v-else role="button" tabindex="0" @tap="loadMore">点击加载更多</text>
</view>
</view>
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue';
import { ref, onMounted } from 'vue';
import { assetApi } from '@/api/index.js';
import PackageHistoryNode from '@/components/PackageHistoryNode.vue';
import { useUserStore } from '@/store/index.js';
const userStore = useUserStore();
let packageList = reactive([]);
let loading = ref(false);
let noMore = ref(false);
let page = ref(1);
const packageList = ref([]);
const loading = ref(false);
const historyLoaded = ref(false);
const noMore = ref(false);
const page = ref(1);
const total = ref(0);
const pageSize = 10;
const getStatusClass = (status) => {
const classMap = {
'0': 'tag-warning',
'1': 'tag-success',
'2': 'tag-primary',
'3': 'tag-secondary',
'4': 'tag-danger'
};
return classMap[status] || '';
};
const formatMB = (mb) => {
if (!mb && mb !== 0) return '0 MB';
if (mb >= 1024) {
return (mb / 1024).toFixed(2) + ' GB';
}
return mb.toFixed(2) + ' MB';
};
// 获取已使用流量
const getUsedFlow = (item) => {
if (item.enable_virtual_data) {
return formatMB(item.virtual_used_mb || 0);
} else {
return formatMB(item.real_used_mb || 0);
}
};
// 获取总流量
const getTotalFlow = (item) => {
return formatMB(item.real_total_mb || 0);
};
// 获取剩余流量
const getRemainFlow = (item) => {
const total = item.real_total_mb || 0;
const used = item.enable_virtual_data ? (item.virtual_used_mb || 0) : (item.real_used_mb || 0);
const remain = Math.max(total - used, 0);
return formatMB(remain);
};
// 获取使用百分比
const getUsagePercent = (item) => {
const used = item.real_used_mb || 0;
const total = item.real_total_mb || 0;
if (!total) return 0;
return Math.min((used / total) * 100, 100).toFixed(2);
};
const formatDate = (dateStr) => {
if (!dateStr) return '-';
return dateStr.split('T').join(' ').slice(0, 19);
};
const getGroupKey = (item, index) => item.package_usage_id ?? `group-${index}`;
const loadPackageList = async (append = false) => {
if (loading.value || noMore.value) return;
if (loading.value || (append && noMore.value)) return;
loading.value = true;
try {
const data = await assetApi.getPackageHistory(
userStore.state.identifier,
page.value,
pageSize
);
const newData = (data.items || []).map(item => ({
...item,
activated_at: item.activated_at ? formatDate(item.activated_at) : '',
created_at: formatDate(item.created_at),
expires_at: item.expires_at ? formatDate(item.expires_at) : ''
}));
let groups;
do {
const requestedPage = page.value;
const data = await assetApi.getPackageHistory(
userStore.state.identifier,
requestedPage,
pageSize
);
groups = data.items;
const responsePage = Number.isInteger(data.page) && data.page > 0
? Math.max(data.page, requestedPage)
: requestedPage;
const responseSize = Number.isInteger(data.size) && data.size > 0
? data.size
: pageSize;
total.value = Number.isFinite(data.total) && data.total >= 0 ? data.total : 0;
// Total and pagination describe the unfiltered backend pages. Skip a
// page containing only invalidated records so later records stay reachable.
noMore.value = responsePage * responseSize >= total.value;
page.value = responsePage + 1;
} while (groups.length === 0 && !noMore.value);
if (append) {
packageList.push(...newData);
packageList.value.push(...groups);
} else {
packageList.splice(0, packageList.length, ...newData);
packageList.value = groups;
}
if (newData.length < pageSize) {
noMore.value = true;
} else {
page.value++;
}
} catch (e) {
console.error('加载套餐历史失败', e);
} catch (error) {
// The shared request layer handles the API's unified error response and authentication errors.
console.error('加载套餐历史失败', error);
} finally {
loading.value = false;
historyLoaded.value = true;
}
loading.value = false;
};
const loadMore = () => {
if (!noMore.value) {
loadPackageList(true);
}
};
const loadMore = () => loadPackageList(true);
onMounted(() => {
loadPackageList();
@@ -175,76 +92,46 @@
</script>
<style lang="scss" scoped>
.container {
.empty-state {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 120rpx 40rpx;
min-height: 400rpx;
.empty-icon { font-size: 120rpx; margin-bottom: 30rpx; opacity: 0.6; }
.empty-title { font-size: 32rpx; font-weight: 600; color: var(--text-primary); margin-bottom: 16rpx; }
.empty-desc { font-size: 26rpx; color: var(--text-tertiary); text-align: center; }
.loading-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 500rpx;
}
.empty-state {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
min-height: 400rpx;
padding: 120rpx 40rpx;
.empty-icon {
width: 120rpx;
height: 120rpx;
margin-bottom: 30rpx;
opacity: 0.6;
}
.package-card {
margin-bottom: var(--space-md);
.package-header {
margin-bottom: var(--space-md);
.package-name { font-size: 32rpx; font-weight: 600; color: var(--text-primary); }
}
.package-info {
.info-row {
padding: var(--space-xs) 0;
.info-label { font-size: 24rpx; color: var(--text-tertiary); }
.info-value { font-size: 24rpx; color: var(--text-primary); }
}
}
.divider {
height: 1rpx;
background: var(--gray-200);
margin: var(--space-md) 0;
}
.flow-info {
.flow-title { font-size: 26rpx; font-weight: 600; color: var(--text-primary); margin-bottom: var(--space-sm); }
.flow-stats {
display: flex;
justify-content: space-between;
margin-bottom: var(--space-sm);
.flow-item {
text-align: center;
.flow-label { font-size: 20rpx; color: var(--text-tertiary); margin-bottom: 4rpx; }
.flow-value { font-size: 26rpx; font-weight: 600; color: var(--text-primary); }
}
}
.progress-section {
.progress-apple {
width: 100%;
height: 8rpx;
background: var(--gray-200);
border-radius: var(--radius-small);
overflow: hidden;
.progress-fill {
height: 100%;
background: linear-gradient(90deg, var(--primary), var(--primary-light));
border-radius: var(--radius-small);
}
}
}
}
.empty-title {
margin-bottom: 16rpx;
font-size: 32rpx;
font-weight: 600;
color: var(--text-primary);
}
.load-more {
text-align: center;
padding: var(--space-lg);
.empty-desc {
font-size: 26rpx;
color: var(--text-tertiary);
font-size: 24rpx;
text-align: center;
}
}
.tag-secondary { background: var(--gray-200) !important; color: var(--gray-600) !important; }
.load-more {
padding: var(--space-lg);
font-size: 24rpx;
color: var(--text-tertiary);
text-align: center;
}
</style>

View File

@@ -1,27 +1,34 @@
<template>
<view class="container">
<view v-if="list.length === 0 && !loading" class="empty-state">
<view class="empty-icon">📇</view>
<view v-if="!cardsLoaded || (loading && list.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="list.length === 0" class="empty-state">
<image class="empty-icon" src="/static/authentication.png" mode="aspectFit" alt="实名认证"></image>
<view class="empty-title">认证列表为空</view>
<view class="empty-desc">当前账号下暂无可实名的卡片</view>
</view>
<view class="card" v-for="item in list" :key="item.iccid">
<view class="flex-row-g20">
<view class="logo">
<image :src="getCarrier(item.carrier_type).logo" mode="aspectFit"></image>
<view class="card carrier-card" v-for="item in list" :key="item.iccid">
<view class="carrier-main">
<view class="logo-stack">
<image class="carrier-logo" :src="getCarrier(item.carrier_type).logo" mode="aspectFit"></image>
</view>
<view class="flex-col-g20">
<view class="iccid">ICCID: {{ item.iccid }}</view>
<view class="operator">运营商: {{ getCarrier(item.carrier_type).name }}</view>
<view v-if="item.isDevice" class="slot">卡槽位: {{ item.slot_position || '-' }}</view>
<view class="carrier-details">
<view class="carrier-heading">
<view class="carrier-name">{{ getCarrier(item.carrier_type).name }}</view>
<image v-if="item.isDevice" class="slot-badge" :src="getSlotIcon(item.slot_position)" mode="aspectFit"></image>
</view>
<view class="carrier-iccid">
<text class="iccid-value-text">{{ item.iccid }}</text>
<button class="copy-button" @tap.stop="copyIccid(item.iccid)" aria-label="复制ICCID">复制</button>
</view>
<view class="card-actions">
<button v-if="item.isRealName" class="btn-apple btn-primary action-button" disabled>已实名</button>
<button v-else class="btn-apple btn-primary action-button" @tap="toReal(item)">去实名</button>
</view>
</view>
</view>
<view class="btn mt-30 flex-col-g20">
<up-button class="btn-apple btn-primary" v-if="item.isRealName" type="primary">已实名</up-button>
<up-button class="btn-apple btn-success" v-else type="success" @tap="toReal(item)">去实名</up-button>
</view>
</view>
<view class="modal-overlay" v-if="showIccidModal" @tap="closeModal">
@@ -41,34 +48,56 @@
import { ref, reactive, onMounted } from 'vue';
import { assetApi, realnameApi } from '@/api/index.js';
import { useUserStore } from '@/store/index.js';
import slot1Icon from '@/static/卡槽1.jpeg';
import slot2Icon from '@/static/卡槽2.jpeg';
import slot3Icon from '@/static/卡槽3.jpeg';
import cmccLogo from '@/static/中国移动.png';
import cuccLogo from '@/static/中国联通.png';
import ctccLogo from '@/static/中国电信.png';
import cbnLogo from '@/static/中国广电.png';
const userStore = useUserStore();
let list = reactive([]);
let loading = ref(false);
let cardsLoaded = ref(false);
let showIccidModal = ref(false);
let currentModalIccid = ref('');
let currentCard = ref(null);
const carrierMap = {
CMCC: '中国移动',
CUCC: '中国联通',
CTCC: '中国电信',
CBN: '中国广电'
CMCC: { name: '中国移动', logo: cmccLogo },
CUCC: { name: '中国联通', logo: cuccLogo },
CTCC: { name: '中国电信', logo: ctccLogo },
CBN: { name: '中国广电', logo: cbnLogo }
};
const carrierLogoMap = {
CMCC: 'https://img2.baidu.com/it/u=915783975,1594870591&fm=253&fmt=auto&app=120&f=PNG?w=182&h=182',
CUCC: 'https://img1.baidu.com/it/u=2816777816,1756344384&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500',
CTCC: 'https://img2.baidu.com/it/u=139558247,3893370039&fm=253&fmt=auto?w=529&h=500',
CBN: 'https://img1.baidu.com/it/u=3160680953,3401650303&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500'
const slotIconMap = {
1: slot1Icon,
2: slot2Icon,
3: slot3Icon
};
const getCarrier = (carrierType) => {
return {
name: carrierMap[carrierType] || '-',
logo: carrierLogoMap[carrierType] || carrierLogoMap.CMCC
};
return carrierMap[carrierType] || { name: '-', logo: '' };
};
const getSlotIcon = (slotPosition) => slotIconMap[Number(slotPosition)] || slotIconMap[1];
const sortBySlotPosition = (cards) => cards.sort((left, right) => {
const leftSlot = Number(left.slot_position);
const rightSlot = Number(right.slot_position);
const normalizedLeft = Number.isFinite(leftSlot) && leftSlot > 0 ? leftSlot : Number.MAX_SAFE_INTEGER;
const normalizedRight = Number.isFinite(rightSlot) && rightSlot > 0 ? rightSlot : Number.MAX_SAFE_INTEGER;
return normalizedLeft - normalizedRight;
});
const copyIccid = (value) => {
if (!value) return;
uni.setClipboardData({
data: String(value),
success: () => uni.showToast({ title: 'ICCID已复制', icon: 'success' })
});
};
const loadCards = async () => {
@@ -77,13 +106,14 @@
const assetData = await assetApi.getInfo(userStore.state.identifier);
if (assetData.asset_type === 'device') {
list.splice(0, list.length, ...(assetData.cards || []).map(card => ({
const cards = (assetData.cards || []).map(card => ({
iccid: card.iccid,
carrier_type: card.carrier_type,
slot_position: card.slot_position,
isDevice: true,
isRealName: card.real_name_status === 1
})));
}));
list.splice(0, list.length, ...sortBySlotPosition(cards));
} else if (assetData.iccid) {
list.splice(0, list.length, {
iccid: assetData.iccid,
@@ -98,6 +128,7 @@
console.error('加载卡列表失败', e);
}
loading.value = false;
cardsLoaded.value = true;
};
const toReal = async (card) => {
@@ -140,15 +171,87 @@
<style lang="scss" scoped>
.container {
.card {
.logo {
width: 80rpx;
height: 80rpx;
border-radius: 120rpx;
border: 1rpx solid var(--primary);
overflow: hidden;
image { width: 100%; height: 100%; }
}
.carrier-card {
padding: 28rpx;
}
.carrier-main {
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 24rpx;
}
.logo-stack {
width: 88rpx;
height: 88rpx;
margin-top: 12rpx;
flex-shrink: 0;
box-sizing: border-box;
}
.carrier-logo {
width: 88rpx;
height: 88rpx;
flex-shrink: 0;
}
.slot-badge {
width: 32rpx;
height: 32rpx;
flex-shrink: 0;
}
.carrier-details {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
}
.carrier-name {
color: var(--text-primary);
font-size: 30rpx;
font-weight: 600;
line-height: 1.3;
}
.carrier-heading {
display: flex;
align-items: center;
gap: 10rpx;
}
.carrier-iccid {
display: flex;
align-items: center;
gap: 10rpx;
margin-top: 14rpx;
min-width: 0;
}
.iccid-value-text {
flex: 0 1 auto;
min-width: 0;
color: var(--text-secondary);
font-size: 24rpx;
line-height: 1.35;
word-break: break-all;
}
.card-actions {
width: 100%;
margin-top: 20rpx;
}
.action-button {
width: 100%;
height: 64rpx;
padding: 0 16rpx;
font-size: 26rpx;
line-height: 64rpx;
box-sizing: border-box;
&::after { border: none; }
}
}
@@ -243,8 +346,15 @@
justify-content: center;
padding: 120rpx 40rpx;
min-height: 400rpx;
.empty-icon { font-size: 120rpx; margin-bottom: 30rpx; opacity: 0.6; }
.empty-icon { width: 120rpx; height: 120rpx; margin-bottom: 30rpx; opacity: 0.6; }
.empty-title { font-size: 32rpx; font-weight: 600; color: var(--text-primary); margin-bottom: 16rpx; }
.empty-desc { font-size: 26rpx; color: var(--text-tertiary); text-align: center; }
}
.loading-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 500rpx;
}
</style>

View File

@@ -5,12 +5,14 @@
<view class="navbar-back" @tap="goBack">
<image class="back-icon" src="../../static/left.png" mode="aspectFit" />
</view>
<view class="navbar-title">绑定手机号</view>
<view class="navbar-title">{{ bindingTitle }}</view>
<view class="navbar-placeholder"></view>
</view>
<view class="container" :style="{ paddingTop: fromLogin ? '0' : '0' }">
<view class="card flex-col-g20">
<view class="binding-description">{{ bindingDescription }}</view>
<view v-if="assetConflict" class="binding-conflict">该资产已绑定手机号,如需更换请联系管理员</view>
<view class="flex-row-g20">
<label for="">手机号:</label>
<up-input placeholder="请输入绑定的手机号" border="surround" v-model="bind.phone" />
@@ -20,13 +22,13 @@
<label for="">验证码:</label>
<up-input placeholder="验证码" v-model="bind.code">
<template #suffix>
<up-button @tap="getCode" :text="codeText" type="success" :disabled="cooldown > 0"></up-button>
<up-button @tap="getCode" :text="codeText" type="success" :disabled="cooldown > 0 || assetConflict || initializing || bindingMode === 'none'"></up-button>
</template>
</up-input>
</view>
<view class="btn">
<up-button type="primary" @tap="bindPhone">绑定手机号</up-button>
<up-button type="primary" @tap="bindPhone" :loading="submitting" :disabled="initializing || submitting || assetConflict || bindingMode === 'none'">{{ bindingTitle }}</up-button>
</view>
<!-- 如果从登录页面跳转过来,显示退出按钮 -->
@@ -39,13 +41,29 @@
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue';
import { authApi } from '@/api/index.js';
import { ref, reactive, computed, onMounted, onUnmounted } from 'vue';
import { authApi, assetApi } from '@/api/index.js';
import { useUserStore } from '@/store/index.js';
const POST_BIND_RELOGIN_NOTICE_KEY = 'postBindReloginNotice';
import { getPhoneBindingMode } from '@/utils/phone-bind.js';
import { getSessionContext, isCurrentSession } from '@/utils/session-context.js';
const userStore = useUserStore();
const initializing = ref(true);
const submitting = ref(false);
const assetConflict = ref(false);
const bindingMode = computed(() => getPhoneBindingMode(userStore.state.customerPhone, userStore.state.assetPhoneBound));
const bindingTitle = computed(() => {
if (bindingMode.value === 'customer') return '绑定客户手机号';
if (bindingMode.value === 'asset') return '给资产绑定手机号';
return '绑定手机号';
});
const bindingDescription = computed(() => ({
customer: '请绑定您自己的手机号,当前资产的手机号关联不会改变。',
asset: '请给当前资产绑定手机号,可使用与您的客户手机号不同的号码。',
'customer-asset': '验证一次手机号,将同时绑定您的客户账号和当前资产。',
none: '您的客户账号和当前资产均已绑定手机号,无需重复绑定。',
unknown: '请验证手机号。客户与资产的绑定将由系统按当前状态处理,已有的资产手机号不会被替换。'
}[bindingMode.value]));
let bind = reactive({
phone: '',
@@ -57,32 +75,41 @@
let timer = null;
let fromLogin = ref(false);
onMounted(() => {
onMounted(async () => {
// 获取页面参数,判断是否从登录页面跳转过来
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
const options = currentPage.options;
fromLogin.value = options.fromLogin === 'true';
if (userStore.state.customerPhone) bind.phone = userStore.state.customerPhone;
// Binding keeps the current session. Any one-time expiry reminder from
// this prefill request is retained by the shared receiver for the homepage.
const token = uni.getStorageSync('token');
const identifier = userStore.state.identifier || uni.getStorageSync('identifier') || '';
if (!token || !identifier) {
initializing.value = false;
return;
}
const context = getSessionContext();
try {
const data = await assetApi.getInfo(identifier);
if (!isCurrentSession(context)) return;
const mainPhone = data?.bound_phone || '';
if (mainPhone) {
bind.phone = mainPhone;
}
} catch (e) {
// 预填失败不阻塞绑定流程,用户仍可手动输入手机号
console.error('预填客户手机号失败');
} finally {
initializing.value = false;
}
});
const prepareManualRelogin = () => {
const preservedIdentifier = userStore.state.identifier || uni.getStorageSync('identifier') || '';
userStore.clearUser();
if (preservedIdentifier) {
userStore.setIdentifier(preservedIdentifier);
}
uni.setStorageSync(POST_BIND_RELOGIN_NOTICE_KEY, '1');
// #ifdef H5
if (typeof sessionStorage !== 'undefined') {
sessionStorage.removeItem('assetToken');
}
// #endif
};
const getCode = async () => {
if (cooldown.value > 0 || initializing.value || assetConflict.value || bindingMode.value === 'none') return;
if (!bind.phone) {
uni.showToast({ title: '请输入手机号', icon: 'none' });
return;
@@ -93,8 +120,10 @@
return;
}
const context = getSessionContext();
try {
const data = await authApi.sendCode(bind.phone, 'bind_phone');
if (!isCurrentSession(context)) return;
cooldown.value = data.cooldown_seconds || 60;
codeText.value = `${cooldown.value}s`;
@@ -115,27 +144,46 @@
};
const bindPhone = async () => {
if (initializing.value || submitting.value || assetConflict.value || bindingMode.value === 'none') return;
if (!bind.phone || !bind.code) {
uni.showToast({ title: '手机号和验证码都不能为空', icon: 'none' });
return;
}
if (!/^1[3-9]\d{9}$/.test(bind.phone)) {
uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
return;
}
const context = getSessionContext();
const mode = bindingMode.value;
const submittedPhone = bind.phone;
submitting.value = true;
try {
await authApi.bindPhone(bind.phone, bind.code);
await authApi.bindPhone(submittedPhone, bind.code);
if (!isCurrentSession(context)) return;
userStore.completePhoneBinding(submittedPhone, mode);
if (fromLogin.value) {
prepareManualRelogin();
uni.reLaunch({ url: '/pages/login/login' });
uni.removeStorageSync('postBindReloginNotice');
uni.reLaunch({ url: '/pages/index/index' });
return;
}
uni.showToast({ title: '绑定成功', icon: 'success' });
setTimeout(() => {
// 从其他页面过来的,返回上一页
uni.navigateBack();
if (isCurrentSession(context)) uni.navigateBack();
}, 1500);
} catch (e) {
console.error('绑定手机号失败', e);
if (!isCurrentSession(context)) return;
if (Number(e?.code) === 1192) {
assetConflict.value = true;
uni.showModal({ title: '无法更换资产手机号', content: '该资产已绑定手机号,如需更换请联系管理员', showCancel: false });
} else {
uni.showToast({ title: e?.msg || e?.message || '绑定失败,请稍后重试', icon: 'none' });
}
} finally {
submitting.value = false;
}
};
@@ -145,12 +193,14 @@
content: '确定要退出登录吗?',
success: (res) => {
if (res.confirm) {
userStore.clearUser();
uni.clearStorageSync();
uni.reLaunch({ url: '/pages/login/login' });
}
}
});
};
onUnmounted(() => clearInterval(timer));
const goBack = () => {
uni.navigateTo({
@@ -217,4 +267,6 @@
.container {
padding: var(--space-md);
}
.binding-description { color: var(--text-secondary); font-size: 26rpx; line-height: 1.6; }
.binding-conflict { color: var(--danger); font-size: 26rpx; line-height: 1.6; }
</style>

View File

@@ -1,6 +1,7 @@
<template>
<view class="container">
<view class="card">
<view class="caption mb-md">仅更换您的客户手机号,资产已绑定的手机号不会改变。</view>
<view class="form-item">
<view class="label">原手机号</view>
<up-input placeholder="请输入原手机号" border="surround" v-model="form.oldPhone" disabled/>
@@ -30,15 +31,20 @@
</view>
<view class="btn-wrapper">
<up-button type="primary" @click="submit">确认更换</up-button>
<up-button type="primary" :loading="submitting" :disabled="submitting" @click="submit">确认更换</up-button>
</view>
</view>
</view>
</template>
<script setup>
import { reactive, ref, onMounted } from 'vue';
import { authApi } from '@/api/index.js';
import { reactive, ref, onMounted, onUnmounted } from 'vue';
import { authApi, assetApi } from '@/api/index.js';
import { useUserStore } from '@/store/index.js';
import { getSessionContext, isCurrentSession } from '@/utils/session-context.js';
const userStore = useUserStore();
const submitting = ref(false);
const form = reactive({
oldPhone: '',
@@ -47,14 +53,18 @@
newCode: ''
});
onMounted(() => {
// 获取 URL 参数中的原手机号
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
const options = currentPage.options;
if (options.oldPhone) {
form.oldPhone = options.oldPhone;
onMounted(async () => {
form.oldPhone = userStore.state.customerPhone || '';
const context = getSessionContext();
const revision = userStore.state.phoneRevision;
try {
const data = await assetApi.getInfo(context.identifier);
if (isCurrentSession(context)) {
form.oldPhone = revision === userStore.state.phoneRevision
? data.bound_phone || '' : userStore.state.customerPhone || '';
}
} catch (e) {
console.error('加载客户手机号失败');
}
});
@@ -122,6 +132,7 @@
};
const submit = async () => {
if (submitting.value) return;
if (!form.oldPhone || !form.oldCode) {
uni.showToast({ title: '请填写原手机号信息', icon: 'none' });
return;
@@ -130,17 +141,34 @@
uni.showToast({ title: '请填写新手机号信息', icon: 'none' });
return;
}
if (!/^1[3-9]\d{9}$/.test(form.newPhone)) {
uni.showToast({ title: '请输入正确的新手机号', icon: 'none' });
return;
}
const context = getSessionContext();
submitting.value = true;
try {
await authApi.changePhone(form.oldPhone, form.oldCode, form.newPhone, form.newCode);
const data = await authApi.changePhone(form.oldPhone, form.oldCode, form.newPhone, form.newCode);
if (!isCurrentSession(context)) return;
if (typeof data?.phone === 'string') {
userStore.completeCustomerPhoneChange(data.phone);
form.oldPhone = data.phone;
}
uni.showToast({ title: '更换成功', icon: 'success' });
setTimeout(() => {
uni.navigateBack();
if (isCurrentSession(context)) uni.navigateBack();
}, 1500);
} catch (e) {
console.error('更换手机号失败', e);
} finally {
submitting.value = false;
}
};
onUnmounted(() => {
clearInterval(oldTimer);
clearInterval(newTimer);
});
</script>
<style lang="scss" scoped>
@@ -160,4 +188,4 @@
}
}
}
</style>
</style>

View File

@@ -1,7 +1,10 @@
<template>
<view class="container">
<view v-if="!exchangeData && !loading" class="empty-state">
<view class="empty-icon"></view>
<view v-if="!exchangeLoaded || (loading && !exchangeData)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="!exchangeData" class="empty-state">
<image class="empty-icon" src="/static/change-shop.png" mode="aspectFit" alt="换货"></image>
<view class="empty-title">暂无换货记录</view>
<view class="empty-desc">当前账号下暂无换货记录</view>
</view>
@@ -91,7 +94,9 @@
<view class="form-label">收件人电话</view>
<up-input
v-model="form.recipient_phone"
placeholder="请输入收件人电话"
placeholder="请输入11位手机号"
type="number"
maxlength="11"
border="surround"
/>
</view>
@@ -156,6 +161,7 @@
const exchangeData = ref(null);
const loading = ref(false);
const exchangeLoaded = ref(false);
const showPopup = ref(false);
const showAreaPicker = ref(false);
const areaPickerColumns = ref([]);
@@ -188,6 +194,24 @@
return String(time).split('T').join(' ').slice(0, 19);
};
const getRecipientPhone = () => String(form.recipient_phone || '').trim();
const validateRecipientPhone = () => {
const phone = getRecipientPhone();
if (!phone) {
uni.showToast({ title: '请输入收件人电话', icon: 'none' });
return '';
}
if (!PHONE_REG.test(phone)) {
uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
return '';
}
return phone;
};
const syncAreaPickerState = (regionCodes = []) => {
const { columns, defaultIndex } = buildRegionColumns(regionCodes);
areaPickerColumns.value = columns;
@@ -204,6 +228,7 @@
exchangeData.value = null;
} finally {
loading.value = false;
exchangeLoaded.value = true;
}
};
@@ -307,15 +332,8 @@
return;
}
if (!form.recipient_phone.trim()) {
uni.showToast({ title: '请输入收件人电话', icon: 'none' });
return;
}
if (!PHONE_REG.test(form.recipient_phone.trim())) {
uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
return;
}
const recipientPhone = validateRecipientPhone();
if (!recipientPhone) return;
if (form.recipient_region_codes.length !== 3) {
uni.showToast({ title: '请选择省市区', icon: 'none' });
@@ -336,7 +354,7 @@
await exchangeApi.submitShippingInfo(
exchangeData.value.id,
form.recipient_name.trim(),
form.recipient_phone.trim(),
recipientPhone,
recipientAddress
);
uni.showToast({ title: '提交成功', icon: 'success' });
@@ -355,6 +373,13 @@
<style lang="scss" scoped>
.container {
.loading-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 500rpx;
}
.empty-state {
display: flex;
flex-direction: column;
@@ -364,7 +389,8 @@
min-height: 60vh;
.empty-icon {
font-size: 120rpx;
width: 120rpx;
height: 120rpx;
margin-bottom: 30rpx;
opacity: 0.6;
}

View File

@@ -1,7 +1,8 @@
<template>
<view class="container">
<UserInfoCard :currentCardNo="currentCardNo" :deviceInfo="deviceInfo" :onlineStatus="onlineStatus"
:isDevice="userInfo.isDevice" :networkStatus="deviceInfo.network_status" />
:isDevice="userInfo.isDevice" :networkStatus="deviceInfo.network_status"
:isExpiring="deviceInfo.isExpiring" :expiryDays="deviceInfo.expiryDays" @renew="startHomepageRenewal" />
<DeviceStatusCard v-if="userInfo.isDevice" :deviceInfo="deviceInfo" :isRealName="isRealName"
:isDevice="userInfo.isDevice" @authentication="enterDetail('authentication')" />
@@ -9,19 +10,22 @@
<!-- <VoiceCard v-if="!userInfo.isDevice" :voiceStats="voiceStats" :dateRangeText="dateRangeText"
@openDatePicker="openDateRangePicker" /> -->
<TrafficCard :identifier="currentCardNo" />
<TrafficCard :assetInfo="assetStore.state.assetInfo" />
<!-- <WhitelistCard v-if="!userInfo.isDevice" :whitelistData="whitelistData" @refresh="refreshWhitelist"
@add="showAddWhitelistDialog" @showSms="showSmsCodeDialog" /> -->
<WifiCard v-if="userInfo.isDevice" :deviceInfo="deviceInfo" @modify="modifyWifi" @copy="copy" />
<WifiCard v-if="userInfo.isDevice" :deviceInfo="deviceInfo" @modify="modifyWifi"
@copy-config="copyWifiConfig" />
<FunctionCard :realNameStatus="realNameStatus" :alreadyBindPhone="alreadyBindPhone"
:isDevice="userInfo.isDevice" :walletBalance="deviceInfo.walletBalance" @enter="enterDetail" @sync="onSync">
<!-- 修改WIFI弹窗 -->
<FunctionCard :realNameStatus="realNameStatus" :assetPhoneBound="userStore.state.assetPhoneBound"
:customerPhone="userStore.state.customerPhone"
:isDevice="userInfo.isDevice" :walletBalance="deviceInfo.walletBalance" :unreadCount="notificationUnreadCount"
@enter="enterDetail" @sync="onSync">
<!-- 修改配置弹窗 -->
<up-popup :show="showModifyWifi" mode="center" @close="showModifyWifi=false">
<view class="wifi-popup">
<view class="title mb-md">修改WIFI</view>
<view class="title mb-md">修改配置</view>
<view class="flex-col-g20">
<view class="flex-col-g8">
<label class="caption">名称:</label>
@@ -93,6 +97,18 @@
</FunctionCard>
<view class="bottom-spacer"></view>
<ExpiryReminderPopup v-if="visibleExpiryReminder" :reminder="visibleExpiryReminder"
@close="closeExpiryReminder" @renew="renewFromExpiryReminder" />
<NotificationPopup :show="notificationPopupShow" :items="notificationItems"
:current="notificationPopupCurrent" @change="onNotificationChange" @close="closeNotificationPopup"
@renew="startHomepageRenewal" />
<RenewalPaymentPopup ref="renewalPopupRef" :identifier="userStore.state.identifier"
paymentRefreshTarget="home" @completed="loadAssetInfo" @visibility-change="onRenewalVisibilityChange" />
<PopupCandidate v-if='popupCandidateShow' page='home' :identifier='userStore.state.identifier'
@close='onPopupCandidateClose' />
<!-- 日期选择器弹窗 -->
<up-datetime-picker v-if="!userInfo.isDevice" :show="showStartDatePicker" v-model="startDateTimestamp"
@@ -111,9 +127,10 @@
ref,
reactive,
onMounted,
computed
computed,
watch
} from 'vue';
import { onShow } from '@dcloudio/uni-app';
import { onShow, onHide } from '@dcloudio/uni-app';
import UserInfoCard from '@/components/UserInfoCard.vue';
import DeviceStatusCard from '@/components/DeviceStatusCard.vue';
import VoiceCard from '@/components/VoiceCard.vue';
@@ -122,21 +139,74 @@
import WifiCard from '@/components/WifiCard.vue';
import FunctionCard from '@/components/FunctionCard.vue';
import FloatingButton from '@/components/FloatingButton.vue';
import NotificationPopup from '@/components/NotificationPopup.vue';
import ExpiryReminderPopup from '@/components/ExpiryReminderPopup.vue';
import RenewalPaymentPopup from '@/components/RenewalPaymentPopup.vue';
import PopupCandidate from '@/components/PopupCandidate.vue';
import {
assetApi,
deviceApi
deviceApi,
hasActiveOrPendingPackage,
notificationApi
} from '@/api/index.js';
import {
useUserStore
useUserStore,
useAssetStore
} from '@/store/index.js';
import { consumePendingPaymentRefresh, PAYMENT_REFRESH_TARGETS } from '@/utils/payment.js';
import { getSessionContext, isCurrentSession } from '@/utils/session-context.js';
import { getShanghaiDay } from '@/utils/expiry-reminder.js';
const userStore = useUserStore();
const assetStore = useAssetStore();
const homeActive = ref(false);
const shownExpiryReminder = ref(null);
const awaitingHomeReminders = ref(false);
const renewalOpening = ref(false);
const renewalVisible = ref(false);
let notificationFallbackPending = false;
let notificationQueued = false;
let homeEntryId = 0;
const visibleExpiryReminder = computed(() => {
const entry = shownExpiryReminder.value;
return homeActive.value && entry && isCurrentSession(entry) && entry.day === getShanghaiDay()
? entry.reminder : null;
});
const showPendingExpiryReminder = () => {
const entry = assetStore.state.expiryReminder;
if (!homeActive.value || awaitingHomeReminders.value || renewalOpening.value || renewalVisible.value || popupCandidateShow.value || notificationPopupShow.value ||
visibleExpiryReminder.value || !entry || entry.shown || !isCurrentSession(entry) || entry.day !== getShanghaiDay()) return;
shownExpiryReminder.value = { ...entry };
assetStore.markExpiryReminderShown();
};
const closeExpiryReminder = (resumeQueue = true) => {
shownExpiryReminder.value = null;
assetStore.dismissExpiryReminder();
if (resumeQueue) advanceHomePopupQueue();
};
const advanceHomePopupQueue = () => {
if (!homeActive.value || awaitingHomeReminders.value || renewalOpening.value || renewalVisible.value || popupCandidateShow.value ||
visibleExpiryReminder.value || notificationPopupShow.value) return;
showPendingExpiryReminder();
if (visibleExpiryReminder.value) return;
if (notificationQueued) {
notificationQueued = false;
notificationPopupShow.value = true;
markNotificationRead(notificationItems.value[0]);
} else if (notificationFallbackPending) {
notificationFallbackPending = false;
loadUnreadNotifications();
}
};
watch(() => assetStore.state.expiryReminder, advanceHomePopupQueue);
let showModifyWifi = ref(false);
let restartShow = ref(false);
let recoverShow = ref(false);
let logoutShow = ref(false);
let loading = ref(false);
let syncing = ref(false);
let assetRequestId = 0;
let userInfo = reactive({
isDevice: true,
@@ -149,7 +219,12 @@
network_status: 1,
status: 1,
packageName: '-',
currentPackageId: 0,
renewalPrice: null,
expireDate: '-',
isExpiring: false,
expiryDays: null,
expiryEstimateStatus: 'none',
walletBalance: 0,
iccid: '-',
currentIccid: '-',
@@ -175,9 +250,11 @@
});
let isRealName = ref(false);
let alreadyBindPhone = ref(false);
let boundPhone = ref('');
const boundPhone = computed(() => userStore.state.customerPhone || '');
watch(boundPhone, (phone) => { deviceInfo.bound_phone = phone; });
let realNameStatus = ref('');
let effectiveRealnamePolicy = ref('none');
let realnameEntryChecking = ref(false);
let wifi_info = reactive({
ssid: '',
pwd: ''
@@ -209,7 +286,13 @@
let showSmsCode = ref(false);
let smsCodePhone = ref('');
let smsCode = ref('');
let indexEntryChecking = ref(false);
let notificationUnreadCount = ref(0);
let notificationPopupShow = ref(false);
let notificationItems = ref([]);
let notificationPopupCurrent = ref(0);
let renewalPopupRef = ref(null);
const notificationReadPending = new Set();
let popupCandidateShow = ref(false);
const formatDate = (dateStr) => {
if (!dateStr) return '-';
@@ -223,12 +306,16 @@
};
const loadAssetInfo = async () => {
const identifier = userStore.state.identifier;
const identifier = String(userStore.state.identifier || uni.getStorageSync('identifier') || '').trim();
if (!identifier) return;
if (userStore.state.identifier !== identifier) userStore.setIdentifier(identifier);
const context = getSessionContext();
const requestId = ++assetRequestId;
loading.value = true;
try {
const data = await assetApi.getInfo(identifier);
if (!isCurrentSession(context) || requestId !== assetRequestId) return null;
// 基本信息
userInfo.isDevice = data.asset_type === 'device';
@@ -236,19 +323,24 @@
deviceInfo.network_status = data.network_status;
deviceInfo.status = data.status;
deviceInfo.imei = data.imei || '-';
deviceInfo.asset_type = data.asset_type || 'device';
deviceInfo.bound_phone = data.bound_phone || '';
deviceInfo.packageName = data.current_package || '-';
deviceInfo.expireDate = formatDate(data.current_package_expires_at);
deviceInfo.asset_type = data.asset_type || 'device';
deviceInfo.bound_phone = userStore.state.customerPhone || '';
deviceInfo.packageName = data.current_package || '-';
deviceInfo.currentPackageId = Number(data.current_package_id || 0);
deviceInfo.renewalPrice = data.renewal_price ?? null;
deviceInfo.expireDate = formatDate(data.estimated_final_expires_at);
deviceInfo.isExpiring = data.is_expiring === true;
deviceInfo.expiryDays = data.days_until_final_expiry ?? null;
deviceInfo.expiryEstimateStatus = data.expiry_estimate_status || 'none';
deviceInfo.iccid = data.iccid || '-';
deviceInfo.walletBalance = data.wallet_balance ?? 0;
const currentCard = resolveCurrentCard(data.cards || []);
isRealName.value = !!currentCard?.real_name_at || currentCard?.real_name_status === 1 || data.real_name_status === 1;
isRealName.value = Number(data.real_name_status) === 1;
realNameStatus.value = isRealName.value ? '已实名' : '未实名';
boundPhone.value = data.bound_phone || '';
alreadyBindPhone.value = !!data.bound_phone;
effectiveRealnamePolicy.value = data.effective_realname_policy || 'none';
userStore.setRealNameStatus(data.real_name_status);
// 流量信息已由 TrafficCard 组件独立获取,这里不再处理
// 流量卡片消费同一次 asset/info 快照,支付和有效期变化后一起更新。
// 当前卡信息
if (data.cards && data.cards.length > 0) {
@@ -301,46 +393,59 @@
deviceInfo.signal_bad_reason = '';
}
// 到期时间由 TrafficCard 组件获取套餐信息时一并返回
// 最终到期时间和临期状态均以后端 asset/info 返回值为准。
return data;
} catch (e) {
console.error('加载资产信息失败', e);
return null;
} finally {
loading.value = false;
if (requestId === assetRequestId) loading.value = false;
}
};
const handleIndexEntry = async () => {
if (userStore.state.loginPending) return;
const token = uni.getStorageSync('token');
if (!token) {
const identifier = String(userStore.state.identifier || uni.getStorageSync('identifier') || '').trim();
if (!token || !identifier) {
if (token && !identifier) {
userStore.clearUser();
uni.showToast({ title: '缺少资产标识,请重新输入或扫码登录', icon: 'none' });
}
uni.reLaunch({ url: '/pages/login/login' });
return;
}
if (userStore.state.identifier !== identifier) userStore.setIdentifier(identifier);
if (indexEntryChecking.value) return;
indexEntryChecking.value = true;
try {
const data = await loadAssetInfo();
if (data && !data.bound_phone) {
uni.redirectTo({ url: '/pages/bind/bind?fromLogin=true' });
}
} finally {
indexEntryChecking.value = false;
}
await loadAssetInfo();
};
// 处理套餐加载完成事件(从 TrafficCard 组件传递过来)
const handlePackageLoaded = (activePackage) => {
if (activePackage && activePackage.expires_at) {
// 格式化到期时间
const date = new Date(activePackage.expires_at);
deviceInfo.expireDate =
`${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
} else {
deviceInfo.expireDate = '-';
const onRenewalVisibilityChange = (visible) => {
renewalVisible.value = visible;
if (!visible) advanceHomePopupQueue();
};
const startHomepageRenewal = async () => {
if (renewalOpening.value || renewalVisible.value) return;
const packageId = Number(deviceInfo.currentPackageId || 0);
const packageName = String(deviceInfo.packageName || '').trim();
if (!packageId || !packageName || packageName === '-') {
uni.showToast({ title: '当前资产暂无可续费套餐', icon: 'none' });
return;
}
renewalOpening.value = true;
try {
await renewalPopupRef.value?.open([packageId], [packageName], deviceInfo.renewalPrice);
} finally {
renewalOpening.value = false;
advanceHomePopupQueue();
}
};
const renewFromExpiryReminder = async () => {
if (!visibleExpiryReminder.value || renewalOpening.value || renewalVisible.value) return;
closeExpiryReminder(false);
await startHomepageRenewal();
advanceHomePopupQueue();
};
const modifyWifi = () => {
@@ -483,16 +588,6 @@
restartShow.value = false;
};
const copy = (content) => {
uni.setClipboardData({
data: content,
success: () => uni.showToast({
title: '复制成功',
icon: 'none'
})
});
};
const YesRecover = async () => {
try {
await deviceApi.factoryReset(userStore.state.identifier);
@@ -506,6 +601,7 @@
recoverShow.value = false;
};
const YesLogout = () => {
userStore.clearUser();
uni.clearStorageSync();
uni.reLaunch({
url: '/pages/login/login'
@@ -637,6 +733,7 @@
};
const onSync = async () => {
if (syncing.value) return;
const identifier = userStore.state.identifier;
if (!identifier) {
uni.showToast({
@@ -646,11 +743,13 @@
return;
}
const context = getSessionContext();
uni.showModal({
title: '确认同步',
content: '确定要同步运营商数据吗?',
content: '确定要同步运营商数据吗?受理不代表同步或停复机已执行完成,结果以稍后读取的实际状态为准。',
success: (res) => {
if (!res.confirm) return;
if (!res.confirm || syncing.value || !isCurrentSession(context)) return;
syncing.value = true;
uni.showLoading({
title: '同步中...',
mask: true
@@ -658,17 +757,19 @@
assetApi.refresh(identifier).then((data) => {
uni.hideLoading();
if (!isCurrentSession(context)) return;
if (data.accepted) {
if (data?.accepted === true || data?.accepted === 1) {
const refreshTypeText = data.refresh_type === 'device' ? '设备' : '卡';
uni.showToast({
title: `${refreshTypeText}数据同步成功`,
icon: 'success',
duration: 2000
title: `${refreshTypeText}同步请求已受理,请稍后查看状态`,
icon: 'none',
duration: 3000
});
loadAssetInfo();
setTimeout(() => {
loadAssetInfo();
if (homeActive.value && isCurrentSession(context)) loadAssetInfo();
}, 2000);
} else {
uni.showToast({
@@ -678,6 +779,7 @@
}
}).catch((e) => {
uni.hideLoading();
if (!isCurrentSession(context)) return;
console.error('同步数据失败', e);
if (e.msg && e.msg.includes('冷却')) {
@@ -692,13 +794,63 @@
icon: 'none'
});
}
});
}).finally(() => { syncing.value = false; });
}
});
};
const shouldRedirectRealnameToPackageOrder = async () => {
if (effectiveRealnamePolicy.value !== 'after_order') return false;
const identifier = userStore.state.identifier;
let cards = [{ real_name_status: isRealName.value ? 1 : 0 }];
if (userInfo.isDevice) {
const data = await deviceApi.getCards(identifier);
cards = Array.isArray(data?.cards) ? data.cards : [];
}
if (cards.some(card => Number(card?.real_name_status) === 1)) return false;
return !(await hasActiveOrPendingPackage(identifier));
};
const openRealnameEntry = async () => {
if (realnameEntryChecking.value) return;
realnameEntryChecking.value = true;
uni.showLoading({ title: '校验中...', mask: true });
try {
const shouldRedirect = await shouldRedirectRealnameToPackageOrder();
uni.hideLoading();
if (!shouldRedirect) {
uni.navigateTo({ url: '/pages/auth/auth' });
return;
}
uni.showModal({
title: '提示',
content: '当前设备所有卡均未实名,且暂无生效中或待生效套餐。请先订购套餐,再进行实名认证。',
confirmText: '去订购',
cancelText: '取消',
success: ({ confirm }) => {
if (confirm) uni.navigateTo({ url: '/pages/package-order/package-order' });
}
});
} catch (error) {
uni.hideLoading();
console.error('校验实名入口条件失败', error);
uni.showToast({ title: '实名条件校验失败,请稍后重试', icon: 'none' });
} finally {
realnameEntryChecking.value = false;
}
};
const enterDetail = (name) => {
switch (name) {
case 'notifications':
uni.navigateTo({
url: '/pages/notifications/notifications'
});
break;
case 'package-order':
uni.navigateTo({
url: '/pages/package-order/package-order'
@@ -737,7 +889,7 @@
return;
}
uni.navigateTo({
url: `/pages/change-phone/change-phone?oldPhone=${boundPhone.value}`
url: '/pages/change-phone/change-phone'
});
break;
case 'device-exchange':
@@ -751,9 +903,7 @@
});
break;
case 'authentication':
uni.navigateTo({
url: '/pages/auth/auth'
});
openRealnameEntry();
break;
case 'recover':
recoverShow.value = true;
@@ -767,12 +917,134 @@
}
};
const loadNotificationUnreadCount = async () => {
const context = getSessionContext();
try {
const data = await notificationApi.getUnreadCount();
if (!isCurrentSession(context)) return;
notificationUnreadCount.value = Number(data?.count || 0);
} catch (error) {
console.error('加载通知未读数失败', error);
}
};
const markNotificationRead = async (item) => {
if (!item || item.is_read || notificationReadPending.has(item.id)) return;
notificationReadPending.add(item.id);
const context = getSessionContext();
try {
await notificationApi.markRead(item.id);
if (!isCurrentSession(context)) return;
item.is_read = true;
item.read_at = new Date().toISOString();
notificationUnreadCount.value = Math.max(notificationUnreadCount.value - 1, 0);
} catch (error) {
console.error('标记首页通知已读失败', error);
} finally {
notificationReadPending.delete(item.id);
}
};
const loadUnreadNotifications = async () => {
const context = getSessionContext();
const entryId = homeEntryId;
try {
const data = await notificationApi.getList(1, 50, false);
if (!homeActive.value || entryId !== homeEntryId || !isCurrentSession(context)) return;
const items = (data?.items || [])
.filter(item => !item.is_read && item.category !== 'expiry');
if (!items.length) return;
notificationItems.value = items;
notificationPopupCurrent.value = 0;
notificationQueued = true;
advanceHomePopupQueue();
} catch (error) {
console.error('加载首页未读通知失败', error);
}
};
const copyWifiConfig = (content) => {
uni.setClipboardData({
data: content,
success: () => uni.showToast({ title: '配置已复制', icon: 'none' })
});
};
const onNotificationChange = (event) => {
const index = Number(event?.detail?.current ?? event?.current ?? 0);
notificationPopupCurrent.value = index;
markNotificationRead(notificationItems.value[index]);
};
const closeNotificationPopup = () => {
notificationPopupShow.value = false;
advanceHomePopupQueue();
};
const runPopupCandidate = () => {
popupCandidateShow.value = true;
};
const onPopupCandidateClose = (reason) => {
if (!homeActive.value) return;
popupCandidateShow.value = false;
// The candidate action navigates away immediately. Keep any unshown
// expiry reminder pending rather than consuming it before that navigation.
if (reason === 'action') return;
if (reason === 'empty' || reason === 'invisible') {
notificationFallbackPending = true;
}
advanceHomePopupQueue();
loadNotificationUnreadCount();
};
onMounted(() => {
initCurrentMonth();
});
onShow(() => {
handleIndexEntry();
onShow(async () => {
const entryId = ++homeEntryId;
homeActive.value = true;
shownExpiryReminder.value = null;
awaitingHomeReminders.value = true;
notificationFallbackPending = false;
notificationQueued = false;
if (userStore.state.loginPending) {
awaitingHomeReminders.value = false;
return;
}
if (!getSessionContext().token || !String(userStore.state.identifier || uni.getStorageSync('identifier') || '').trim()) {
awaitingHomeReminders.value = false;
handleIndexEntry();
return;
}
// 每次返回首页都重新读取实际状态,支付返回不再重复发起两次请求。
consumePendingPaymentRefresh(PAYMENT_REFRESH_TARGETS.HOME);
loadNotificationUnreadCount();
runPopupCandidate();
await handleIndexEntry();
if (!homeActive.value || entryId !== homeEntryId) return;
awaitingHomeReminders.value = false;
advanceHomePopupQueue();
});
onHide(() => {
homeEntryId++;
assetRequestId++;
homeActive.value = false;
shownExpiryReminder.value = null;
notificationPopupShow.value = false;
popupCandidateShow.value = false;
notificationQueued = false;
notificationFallbackPending = false;
});
watch(() => [userStore.state.token, userStore.state.identifier], () => {
shownExpiryReminder.value = null;
notificationItems.value = [];
notificationUnreadCount.value = 0;
notificationPopupShow.value = false;
notificationQueued = false;
notificationFallbackPending = false;
});
</script>

View File

@@ -71,9 +71,14 @@
import { useUserStore } from '@/store/index.js';
import { initWxConfig, wxScan, isInWechat } from '@/utils/wxsdk.js';
const POST_BIND_RELOGIN_NOTICE_KEY = 'postBindReloginNotice';
const WECHAT_LOGIN_CONTEXT_KEY = 'wechatLoginContext';
const userStore = useUserStore();
// Close the asset-request gate synchronously, before cached homepage
// components can react to the callback's old token or saved identifier.
if (new URLSearchParams(window.location.search).get('code') && sessionStorage.getItem('assetToken')) {
userStore.setLoginPending(true);
}
const identifier = ref(uni.getStorageSync('identifier') || '');
const loading = ref(false);
const agreed = ref(true);
@@ -84,17 +89,60 @@
const resetLoadingState = () => {
loading.value = false;
};
const initializeLoginSdk = async () => {
if (isInWechat()) await initWxConfig();
};
const resumeStoredSession = async (assetIdentifier) => {
userStore.setLoginPending(true);
loading.value = true;
try {
userStore.setIdentifier(assetIdentifier);
await initializeLoginSdk();
sessionStorage.removeItem('assetToken');
sessionStorage.removeItem(WECHAT_LOGIN_CONTEXT_KEY);
userStore.setLoginPending(false);
uni.reLaunch({ url: '/pages/index/index' });
} catch (e) {
uni.showToast({ title: e?.msg || e?.message || '微信初始化失败,请重新登录', icon: 'none' });
loading.value = false;
}
};
onMounted(async () => {
// Remove the obsolete post-bind re-login notice from older client builds.
uni.removeStorageSync('postBindReloginNotice');
const urlIdentifier = getPathDeviceId();
const token = uni.getStorageSync('token');
if (token) {
uni.reLaunch({ url: '/pages/index/index' });
const storedIdentifier = uni.getStorageSync('identifier') || '';
// Complete OAuth first. An existing token or the callback's identifier
// must not bypass the callback or start another authorization round.
if (getCode() && sessionStorage.getItem('assetToken')) {
await handleWechatCallback();
return;
}
showPostBindReloginNotice();
handleWechatCallback();
getPathDeviceId();
// 从外部链接进入时,链接中的资产标识优先于本地登录态。
// 只有相同资产才能复用已登录的会话,避免将上一台设备的数据带到新链接中。
if (urlIdentifier) {
identifier.value = urlIdentifier;
if (token && urlIdentifier === storedIdentifier) {
await resumeStoredSession(urlIdentifier);
return;
}
if (token || storedIdentifier) {
userStore.clearUser();
}
await doLogin();
return;
}
if (token && storedIdentifier.trim()) {
await resumeStoredSession(storedIdentifier.trim());
return;
}
if (token) userStore.clearUser();
// 初始化微信 SDK (仅在微信浏览器内执行)
// #ifdef H5
@@ -121,19 +169,6 @@
resetLoadingState();
});
const showPostBindReloginNotice = () => {
if (uni.getStorageSync(POST_BIND_RELOGIN_NOTICE_KEY) !== '1') {
return;
}
uni.removeStorageSync(POST_BIND_RELOGIN_NOTICE_KEY);
uni.showToast({
title: '绑定手机号成功,请重新登录',
icon: 'none',
duration: 2500
});
};
const getCode = () => {
const params = new URLSearchParams(window.location.search);
return params.get('code');
@@ -158,10 +193,13 @@
return wechatAppId.value;
};
const redirectToWxAuth = async (assetToken) => {
const redirectToWxAuth = async (assetToken, assetIdentifier) => {
sessionStorage.setItem('assetToken', assetToken);
sessionStorage.setItem(WECHAT_LOGIN_CONTEXT_KEY, JSON.stringify({ assetToken, identifier: assetIdentifier }));
const appId = await getWechatAppId();
const redirectUri = encodeURIComponent(window.location.origin + window.location.pathname);
const callbackUrl = new URL(window.location.pathname, window.location.origin);
callbackUrl.searchParams.set('identifier', assetIdentifier);
const redirectUri = encodeURIComponent(callbackUrl.toString());
const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_userinfo&state=wechat_auth#wechat_redirect`;
window.location.href = url;
};
@@ -236,23 +274,78 @@
const getPathDeviceId = () => {
const params = new URLSearchParams(window.location.search);
const idf = params.get('identifier');
if (idf) {
identifier.value = idf;
handleLogin();
return (params.get('identifier') || '').trim();
};
const isNineteenDigitIccidPrefix = (value) => /^89\d{17}$/.test(value);
const appendIccidLuhnCheckDigit = (prefix) => {
let sum = 0;
for (let index = prefix.length - 1, offset = 0; index >= 0; index--, offset++) {
let digit = Number(prefix[index]);
if (offset % 2 === 0) {
digit *= 2;
if (digit > 9) digit -= 9;
}
sum += digit;
}
return `${prefix}${(10 - (sum % 10)) % 10}`;
};
const verifyAssetToken = async (assetIdentifier) => {
const verifyData = await authApi.verifyAsset(assetIdentifier);
if (!verifyData?.asset_token) {
throw { msg: '资产校验未返回有效登录凭证' };
}
return verifyData;
};
const verifyAssetWithIccidRetry = async (enteredIdentifier) => {
try {
return {
verifyData: await verifyAssetToken(enteredIdentifier),
verifiedIdentifier: enteredIdentifier
};
} catch (firstError) {
if (!isNineteenDigitIccidPrefix(enteredIdentifier)) {
throw firstError;
}
const completedIccid = appendIccidLuhnCheckDigit(enteredIdentifier);
return {
verifyData: await verifyAssetToken(completedIccid),
verifiedIdentifier: completedIccid
};
}
};
const doLogin = async () => {
loading.value = true;
userStore.setLoginPending(true);
// 丢弃上一轮未完成授权留下的临时凭证,避免校验失败时继续复用。
if (typeof sessionStorage !== 'undefined') {
sessionStorage.removeItem('assetToken');
sessionStorage.removeItem(WECHAT_LOGIN_CONTEXT_KEY);
}
try {
const verifyData = await authApi.verifyAsset(identifier.value);
userStore.setAssetToken(verifyData.asset_token);
userStore.setIdentifier(identifier.value);
const enteredIdentifier = String(identifier.value || '').trim();
if (!enteredIdentifier) throw { msg: '请输入有效的资产标识' };
const { verifyData, verifiedIdentifier } = await verifyAssetWithIccidRetry(enteredIdentifier);
await redirectToWxAuth(verifyData.asset_token);
userStore.setAssetToken(verifyData.asset_token);
userStore.setIdentifier(verifiedIdentifier);
await redirectToWxAuth(verifyData.asset_token, verifiedIdentifier);
} catch (e) {
userStore.setLoginPending(false);
console.error('登录失败', e);
uni.showToast({
title: e?.msg || e?.message || '资产校验失败,请稍后重试',
icon: 'none',
duration: 2500
});
loading.value = false;
}
};
@@ -262,14 +355,38 @@
const assetToken = sessionStorage.getItem('assetToken');
if (!code || !assetToken) return;
userStore.setLoginPending(true);
let loginContext = null;
try {
loginContext = JSON.parse(sessionStorage.getItem(WECHAT_LOGIN_CONTEXT_KEY) || 'null');
} catch (e) {
// Old clients may only have the legacy assetToken and saved identifier.
}
const contextIdentifier = loginContext?.assetToken === assetToken && typeof loginContext.identifier === 'string'
? loginContext.identifier.trim() : '';
const loginIdentifier = contextIdentifier || getPathDeviceId() ||
String(uni.getStorageSync('identifier') || userStore.state.identifier || identifier.value || '').trim();
if (!loginIdentifier) {
clearCode();
sessionStorage.removeItem('assetToken');
sessionStorage.removeItem(WECHAT_LOGIN_CONTEXT_KEY);
userStore.clearUser();
uni.showToast({ title: '缺少资产标识,请重新输入或扫码登录', icon: 'none' });
loading.value = false;
return;
}
loading.value = true;
clearCode();
try {
const loginData = await authApi.wechatLogin(assetToken, code);
// Restore the verified identifier before publishing the login state or
// mounting homepage components that immediately request asset/info.
userStore.setIdentifier(loginIdentifier);
userStore.setToken(loginData.token);
uni.setStorageSync('identifier', userStore.state.identifier);
userStore.setLoginPhoneState(loginData);
identifier.value = loginIdentifier;
// #ifdef H5
if (loginData.user_info) {
@@ -280,7 +397,14 @@
}
// #endif
if (loginData.need_bind_phone) {
// Keep the gate closed while JSSDK config/ready is still pending.
// Homepage and bind-page asset/info requests only start afterwards.
await initializeLoginSdk();
sessionStorage.removeItem('assetToken');
sessionStorage.removeItem(WECHAT_LOGIN_CONTEXT_KEY);
userStore.setLoginPending(false);
if (userStore.state.needBindPhone === true) {
uni.redirectTo({ url: '/pages/bind/bind?fromLogin=true' });
} else {
uni.redirectTo({ url: '/pages/index/index' });
@@ -355,7 +479,7 @@
.input-wrap.focus {
background: var(--bg-primary);
border-color: var(--primary);
box-shadow: 0 0 0 4rpx rgba(10, 132, 255, 0.1);
box-shadow: 0 0 0 4rpx rgba(85, 171, 92, 0.1);
}
.input {
@@ -406,7 +530,7 @@
align-items: center;
justify-content: center;
transition: all 0.3s ease;
box-shadow: 0 4rpx 12rpx rgba(10, 132, 255, 0.2);
box-shadow: 0 4rpx 12rpx rgba(85, 171, 92, 0.2);
}
.btn-login.disabled {
@@ -417,7 +541,7 @@
.btn-login:active:not(.disabled) {
transform: translateY(2rpx);
box-shadow: 0 2rpx 8rpx rgba(10, 132, 255, 0.2);
box-shadow: 0 2rpx 8rpx rgba(85, 171, 92, 0.2);
}
.btn-scan {
@@ -438,7 +562,7 @@
}
.btn-scan:active {
background: rgba(10, 132, 255, 0.05);
background: rgba(85, 171, 92, 0.05);
}
.scan-icon {

View File

@@ -37,8 +37,11 @@
>
<swiper-item class="swiper-item-content">
<scroll-view scroll-y class="list-content" @scrolltolower="loadMoreRecharge">
<view v-if="rechargeList.length === 0 && !rechargeLoading" class="empty-state">
<view class="empty-icon">RCG</view>
<view v-if="!rechargeLoaded || (rechargeLoading && rechargeList.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="rechargeList.length === 0" class="empty-state">
<image class="empty-icon" src="/static/wallet.png" mode="aspectFit" alt="钱包"></image>
<view class="empty-title">暂无充值订单</view>
</view>
@@ -55,10 +58,6 @@
<view class="info-label">充值金额</view>
<view class="info-value text-danger">+¥{{ formatMoney(item.amount) }}</view>
</view>
<view class="info-row flex-row-sb">
<view class="info-label">支付方式</view>
<view class="info-value">{{ formatPaymentMethod(item.payment_method) }}</view>
</view>
<view v-if="hasAutoPurchaseStatus(item)" class="info-row flex-row-sb">
<view class="info-label">自动购包</view>
<view class="info-value">{{ getAutoPurchaseStatusText(item.auto_purchase_status) }}</view>
@@ -89,8 +88,11 @@
<swiper-item class="swiper-item-content">
<scroll-view scroll-y class="list-content" @scrolltolower="loadMoreTransaction">
<view v-if="transactionList.length === 0 && !transactionLoading" class="empty-state">
<view class="empty-icon">WAL</view>
<view v-if="!transactionLoaded || (transactionLoading && transactionList.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="transactionList.length === 0" class="empty-state">
<image class="empty-icon" src="/static/wallet.png" mode="aspectFit" alt="钱包"></image>
<view class="empty-title">暂无钱包流水</view>
</view>
@@ -155,21 +157,17 @@
</view>
<view class="payment-methods">
<view v-if="isDeviceAsset" class="method-item" :class="{ active: rechargePaymentMethod === 'wechat' }" @tap="selectRechargePaymentMethod('wechat')">
<view v-for="method in paymentMethodOptions" :key="method.value" class="method-item"
:class="{ active: rechargePaymentMethod === method.value }" @tap="selectRechargePaymentMethod(method.value)">
<view class="method-left">
<image class="method-icon" src="/static/wechat.png" mode="aspectFit"></image>
<text class="method-name">微信支付</text>
<image v-if="method.value === 'alipay'" class="method-icon" src="/static/支付宝支付.png" mode="aspectFit"></image>
<image v-else-if="method.value === 'wechat'" class="method-icon" src="/static/微信支付.png" mode="aspectFit"></image>
<image v-else class="method-icon" src="/static/wallet.png" mode="aspectFit"></image>
<text class="method-name">{{ method.label }}</text>
</view>
<view class="method-radio" :class="{ checked: rechargePaymentMethod === 'wechat' }"></view>
</view>
<view class="method-item" :class="{ active: rechargePaymentMethod === 'alipay' }" @tap="selectRechargePaymentMethod('alipay')">
<view class="method-left">
<view class="method-icon method-badge method-badge-alipay">支</view>
<text class="method-name">支付宝支付</text>
</view>
<view class="method-radio" :class="{ checked: rechargePaymentMethod === 'alipay' }"></view>
<view class="method-radio" :class="{ checked: rechargePaymentMethod === method.value }"></view>
</view>
<view v-if="paymentMethodOptions.length === 0" class="method-empty">暂无可用支付方式</view>
</view>
<view class="popup-footer">
@@ -177,31 +175,85 @@
<button class="btn-apple btn-primary" :disabled="rechargeSubmitting" @tap="confirmRecharge">
{{ rechargeSubmitting ? '处理中...' : '确认充值' }}
</button>
</view>
</view>
</up-popup>
<up-popup :show="showRechargeOrderPaymentModal" mode="center" @close="closeRechargeOrderPaymentModal">
<view class="recharge-popup recharge-order-payment-popup">
<view class="popup-header">
<view class="popup-title">选择支付方式</view>
<view class="popup-close" @tap="closeRechargeOrderPaymentModal">×</view>
</view>
<view class="package-summary">
<view class="summary-name">{{ selectedRechargeOrder?.recharge_order_no || selectedRechargeOrder?.recharge_no || '-' }}</view>
<view class="summary-price">¥{{ formatMoney(selectedRechargeOrder?.amount) }}</view>
</view>
<view class="payment-methods">
<view
v-for="method in paymentMethodOptions"
:key="method.value"
class="method-item"
:class="{ active: rechargePaymentMethod === method.value }"
@tap="selectRechargePaymentMethod(method.value)"
>
<view class="method-left">
<image v-if="method.value === 'alipay'" class="method-icon" src="/static/支付宝支付.png" mode="aspectFit"></image>
<image v-else-if="method.value === 'wechat'" class="method-icon" src="/static/微信支付.png" mode="aspectFit"></image>
<image v-else class="method-icon" src="/static/wallet.png" mode="aspectFit"></image>
<text class="method-name">{{ method.label }}</text>
</view>
<view class="method-radio" :class="{ checked: rechargePaymentMethod === method.value }"></view>
</view>
<view v-if="paymentMethodOptions.length === 0" class="method-empty">暂无可用支付方式</view>
</view>
<view class="popup-footer">
<button class="btn-apple btn-secondary" @tap="closeRechargeOrderPaymentModal">取消</button>
<button class="btn-apple btn-primary" :disabled="rechargeOrderSubmittingKey !== null" @tap="confirmRechargeOrderPayment">
{{ rechargeOrderSubmittingKey !== null ? '处理中...' : '确认支付' }}
</button>
</view>
</view>
</up-popup>
</view>
</view>
</view>
<PopupCandidate v-if='popupCandidateShow' page='asset_wallet_recharge'
:identifier='userStore.state.identifier' @close='onPopupCandidateClose' />
</template>
<script setup>
import { ref, reactive, onMounted, computed } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import { assetApi, walletApi } from '@/api/index.js';
import { walletApi } from '@/api/index.js';
import { useUserStore } from '@/store/index.js';
import PopupCandidate from '@/components/PopupCandidate.vue';
import {
consumePendingPaymentRefresh,
handlePaymentError,
isValidAlipayPaymentLink,
isValidWechatPayConfig,
markPendingPaymentRefresh,
openAlipayPayment,
PAYMENT_REFRESH_TARGETS,
showPaymentToast,
wechatH5Pay
} from '@/utils/payment.js';
import { getPaymentErrorMessage, isUnknownPaymentResult } from '@/utils/payment-attempt.js';
import { formatMoney } from '@/utils/display.js';
import { getDefaultPaymentMethod, getPaymentMethodOptions, normalizePaymentMethods } from '@/utils/payment-methods.js';
const userStore = useUserStore();
const popupCandidateShow = ref(false);
const onPopupCandidateClose = () => {
popupCandidateShow.value = false;
};
const currentTab = ref(0);
const walletDetail = reactive({
@@ -212,29 +264,29 @@
const rechargeList = reactive([]);
const rechargeLoading = ref(false);
const rechargeLoaded = ref(false);
const rechargeNoMore = ref(false);
const rechargePage = ref(1);
const rechargePageSize = 5;
const transactionList = reactive([]);
const transactionLoading = ref(false);
const transactionLoaded = ref(false);
const transactionNoMore = ref(false);
const transactionPage = ref(1);
const transactionPageSize = 5;
const showRechargeModal = ref(false);
const selectedAmount = ref(null);
const showRechargeOrderPaymentModal = ref(false);
const selectedRechargeOrder = ref(null);
const selectedAmount = ref(10000);
const isCustomAmount = ref(false);
const customAmount = ref('');
const rechargePaymentMethod = ref('alipay');
const rechargeSubmitting = ref(false);
const rechargeOrderSubmittingKey = ref(null);
const isDeviceAsset = ref(true);
let assetTypePromise = null;
const paymentMethodOptions = computed(() => [
...(isDeviceAsset.value ? [{ label: '微信支付', value: 'wechat' }] : []),
{ label: '支付宝支付', value: 'alipay' }
]);
const rechargeAllowedPaymentMethods = ref([]);
const paymentMethodOptions = computed(() => getPaymentMethodOptions(rechargeAllowedPaymentMethods.value));
const rechargeAmounts = [
{ value: 1000, label: '10' },
{ value: 2000, label: '20' },
@@ -252,25 +304,11 @@
currentTab.value = e.detail.current;
};
const formatMoney = (amount) => {
if (!amount && amount !== 0) return '0.00';
return (amount / 100).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
const formatDisplayMoney = (amount) => {
if (!amount && amount !== 0) return '0';
return parseFloat(amount).toFixed(0).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
const formatPaymentMethod = (method) => {
const labelMap = {
wechat: '微信支付',
alipay: '支付宝支付',
wallet: '钱包支付'
};
return labelMap[method] || method || '-';
};
const getRechargeStatusClass = (status) => {
const classMap = {
0: 'tag-warning',
@@ -307,34 +345,13 @@
return rechargeOrderSubmittingKey.value === getRechargeOrderSubmitKey(rechargeOrder);
};
const getDefaultRechargePaymentMethod = () => 'alipay';
const normalizeRechargePaymentMethod = () => {
const defaultMethod = getDefaultRechargePaymentMethod();
if (rechargePaymentMethod.value !== defaultMethod) {
const defaultMethod = getDefaultPaymentMethod(rechargeAllowedPaymentMethods.value);
if (!paymentMethodOptions.value.some((item) => item.value === rechargePaymentMethod.value)) {
rechargePaymentMethod.value = defaultMethod;
}
};
const loadAssetType = async () => {
if (!userStore.state.identifier) return;
if (assetTypePromise) return assetTypePromise;
assetTypePromise = assetApi.getInfo(userStore.state.identifier)
.then((data) => {
isDeviceAsset.value = data.asset_type === 'device';
normalizeRechargePaymentMethod();
})
.catch((error) => {
console.error('加载资产类型失败', error);
})
.finally(() => {
assetTypePromise = null;
});
return assetTypePromise;
};
const resetRechargeListAndLoad = () => {
rechargePage.value = 1;
rechargeNoMore.value = false;
@@ -348,7 +365,6 @@
};
const syncWalletStatus = () => {
loadAssetType();
loadWalletDetail();
resetRechargeListAndLoad();
resetTransactionListAndLoad();
@@ -368,10 +384,33 @@
}, 3000);
};
const applyRechargeCheck = (data) => {
if (Array.isArray(data?.allowed_payment_methods)) {
rechargeAllowedPaymentMethods.value = normalizePaymentMethods(data.allowed_payment_methods);
} else {
rechargeAllowedPaymentMethods.value = [];
}
normalizeRechargePaymentMethod();
};
const openRechargeModal = async () => {
await loadAssetType();
rechargePaymentMethod.value = getDefaultRechargePaymentMethod();
showRechargeModal.value = true;
try {
const data = await walletApi.rechargeCheck(userStore.state.identifier);
applyRechargeCheck(data);
if (!paymentMethodOptions.value.length) {
uni.showToast({ title: '暂无可用支付方式', icon: 'none' });
return;
}
rechargePaymentMethod.value = getDefaultPaymentMethod(
rechargeAllowedPaymentMethods.value
);
selectedAmount.value = 10000;
isCustomAmount.value = false;
customAmount.value = '';
showRechargeModal.value = true;
} catch (error) {
console.error('充值前校验失败', error);
}
};
const selectAmount = (value) => {
@@ -390,6 +429,12 @@
rechargePaymentMethod.value = method;
};
const closeRechargeOrderPaymentModal = () => {
if (rechargeOrderSubmittingKey.value !== null) return;
showRechargeOrderPaymentModal.value = false;
selectedRechargeOrder.value = null;
};
const loadWalletDetail = async () => {
try {
const data = await walletApi.getDetail(userStore.state.identifier);
@@ -466,6 +511,7 @@
}
rechargeLoading.value = false;
rechargeLoaded.value = true;
};
const normalizeTransactionItem = (item) => {
@@ -510,9 +556,16 @@
}
transactionLoading.value = false;
transactionLoaded.value = true;
};
const handleRechargeResult = async (rechargeData, paymentMethod) => {
if (paymentMethod === 'wallet') {
showPaymentToast(true, '充值成功');
setTimeout(() => syncWalletStatus(), 1500);
return;
}
if (paymentMethod === 'wechat') {
if (!isValidWechatPayConfig(rechargeData?.pay_config)) {
uni.showToast({
@@ -586,23 +639,31 @@
try {
const checkData = await walletApi.rechargeCheck(userStore.state.identifier);
applyRechargeCheck(checkData);
if (!paymentMethodOptions.value.some((item) => item.value === rechargePaymentMethod.value)) {
throw { msg: '当前支付方式不可用,请重新选择' };
}
if (checkData.need_force_recharge && amount < checkData.force_recharge_amount) {
const forceAmount = Number(checkData.force_recharge_amount || 0);
const minAmount = Number(checkData.min_amount || 0);
const maxAmount = Number(checkData.max_amount || Number.MAX_SAFE_INTEGER);
if (checkData.need_force_recharge && amount < forceAmount) {
uni.hideLoading();
uni.showModal({
title: '提示',
content: `${checkData.message || '当前需先充值最低金额'} ¥${(checkData.force_recharge_amount / 100).toFixed(2)}`,
content: `${checkData.message || '当前需先充值最低金额'} ¥${formatMoney(forceAmount)}`,
showCancel: false
});
return;
}
if (amount < checkData.min_amount || amount > checkData.max_amount) {
if (amount < minAmount || amount > maxAmount) {
uni.hideLoading();
showRechargeModal.value = false;
setTimeout(() => {
uni.showToast({
title: `充值金额范围:¥${(checkData.min_amount / 100).toFixed(2)} - ¥${(checkData.max_amount / 100).toFixed(2)}`,
title: `充值金额范围:¥${formatMoney(minAmount)} - ¥${formatMoney(maxAmount)}`,
icon: 'none',
duration: 2500
});
@@ -624,9 +685,12 @@
uni.hideLoading();
console.error('充值失败', error);
showRechargeModal.value = false;
if (isUnknownPaymentResult(error)) {
markPendingPaymentRefresh(PAYMENT_REFRESH_TARGETS.MY_WALLET);
}
setTimeout(() => {
uni.showToast({
title: error.msg || error.message || '充值失败,请稍后重试',
title: getPaymentErrorMessage(error, '充值失败,请稍后重试'),
icon: 'none'
});
}, 50);
@@ -637,18 +701,31 @@
const showRechargePaymentMethods = async (rechargeOrder) => {
if (rechargeOrderSubmittingKey.value !== null) return;
await loadAssetType();
const options = paymentMethodOptions.value;
try {
applyRechargeCheck(await walletApi.rechargeCheck(userStore.state.identifier));
} catch (error) {
console.error('加载充值支付方式失败', error);
uni.showToast({ title: error.msg || error.message || '加载支付方式失败', icon: 'none' });
return;
}
if (!paymentMethodOptions.value.length) {
uni.showToast({ title: '暂无可用支付方式', icon: 'none' });
return;
}
rechargePaymentMethod.value = getDefaultPaymentMethod(rechargeAllowedPaymentMethods.value);
selectedRechargeOrder.value = rechargeOrder;
showRechargeOrderPaymentModal.value = true;
};
uni.showActionSheet({
itemList: options.map((item) => item.label),
success: ({ tapIndex }) => {
const selectedMethod = options[tapIndex]?.value;
if (selectedMethod) {
handleRechargePayment(rechargeOrder, selectedMethod);
}
}
});
const confirmRechargeOrderPayment = async () => {
if (!selectedRechargeOrder.value || rechargeOrderSubmittingKey.value !== null) return;
const rechargeOrder = selectedRechargeOrder.value;
const paymentMethod = rechargePaymentMethod.value;
showRechargeOrderPaymentModal.value = false;
await handleRechargePayment(rechargeOrder, paymentMethod);
if (rechargeOrderSubmittingKey.value === null) {
selectedRechargeOrder.value = null;
}
};
const handleRechargePayment = async (rechargeOrder, paymentMethod) => {
@@ -672,8 +749,11 @@
} catch (error) {
uni.hideLoading();
console.error('获取支付配置失败', error);
if (isUnknownPaymentResult(error)) {
markPendingPaymentRefresh(PAYMENT_REFRESH_TARGETS.MY_WALLET);
}
uni.showToast({
title: error.msg || error.message || '支付失败,请稍后重试',
title: getPaymentErrorMessage(error),
icon: 'none'
});
} finally {
@@ -703,6 +783,7 @@
onMounted(() => {
syncWalletStatus();
popupCandidateShow.value = true;
});
</script>
@@ -933,10 +1014,10 @@
padding: 120rpx 40rpx;
.empty-icon {
font-size: 56rpx;
width: 120rpx;
height: 120rpx;
margin-bottom: 24rpx;
opacity: 0.5;
letter-spacing: 4rpx;
}
.empty-title {
@@ -1004,7 +1085,7 @@
&.active {
border-color: var(--primary);
background: rgba(0, 122, 255, 0.05);
background: rgba(85, 171, 92, 0.05);
.amount-value {
color: var(--primary);
@@ -1049,7 +1130,7 @@
&.active {
border-color: var(--primary);
background: rgba(0, 122, 255, 0.05);
background: rgba(85, 171, 92, 0.05);
}
.method-left {
@@ -1144,4 +1225,39 @@
}
}
}
.loading-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 360rpx;
}
.recharge-order-payment-popup {
.package-summary {
padding: 40rpx 30rpx 30rpx;
text-align: center;
background: transparent;
.summary-name {
margin: 0 0 20rpx;
font-size: 32rpx;
font-weight: 700;
line-height: 1.4;
color: var(--text-primary);
}
.summary-price {
margin: 0;
font-size: 56rpx;
font-weight: 700;
letter-spacing: -1rpx;
color: var(--primary);
}
}
.payment-methods {
padding: 30rpx;
}
}
</style>

View File

@@ -0,0 +1,190 @@
<template>
<view class="container">
<view class="toolbar flex-row-sb">
<view class="summary">共 {{ total }} 条通知</view>
<button class="btn-apple btn-secondary mark-all" :disabled="unreadCount === 0 || markingAll" @tap="markAllRead">
全部已读
</button>
</view>
<view v-if="!notificationsLoaded || (loading && notifications.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="notifications.length === 0" class="empty-state">
<image src="/static/notification.png" mode="aspectFit" class="empty-icon" />
<view class="empty-title">暂无通知</view>
<view class="empty-desc">当前没有可查看的业务通知</view>
</view>
<view v-else class="notification-list">
<view v-for="item in notifications" :key="item.id" class="card notification-card" @tap="markItemRead(item)">
<view class="notification-header flex-row-sb">
<view class="notification-title">{{ item.title || '业务通知' }}</view>
<button class="read-status" :class="item.is_read ? 'status-read' : 'status-unread'"
@tap.stop="markItemRead(item)">{{ item.is_read ? '已读' : '未读' }}</button>
</view>
<view class="notification-body">{{ item.body || '-' }}</view>
<view class="notification-footer flex-row-sb">
<view class="notification-meta">{{ getCategoryText(item.category) }} · {{ getSeverityText(item.severity) }}</view>
<view class="notification-time">{{ formatDate(item.created_at) }}</view>
</view>
</view>
</view>
<view v-if="notifications.length > 0" class="load-more" @tap="loadMore">
<text v-if="loading">加载中...</text>
<text v-else-if="noMore">没有更多了</text>
<text v-else>点击加载更多</text>
</view>
</view>
</template>
<script setup>
import { ref, reactive } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import { notificationApi } from '@/api/index.js';
import { getSessionContext, isCurrentSession } from '@/utils/session-context.js';
const pageSize = 20;
const notifications = reactive([]);
const page = ref(1);
const total = ref(0);
const unreadCount = ref(0);
const loading = ref(false);
const notificationsLoaded = ref(false);
const noMore = ref(false);
const markingAll = ref(false);
let listRequestId = 0;
let countRequestId = 0;
const readPending = new Set();
const formatDate = (value) => {
if (!value) return '-';
return value.replace('T', ' ').slice(0, 16);
};
const getCategoryText = (category) => ({
approval: '审批',
expiry: '临期',
sync: '同步',
system: '系统'
}[category] || '通知');
const getSeverityText = (severity) => ({
info: '提示',
warning: '警告',
error: '错误',
critical: '严重'
}[severity] || '提示');
const loadUnreadCount = async () => {
const context = getSessionContext();
const requestId = ++countRequestId;
try {
const data = await notificationApi.getUnreadCount();
if (!isCurrentSession(context) || requestId !== countRequestId) return;
unreadCount.value = Number(data?.count || 0);
} catch (error) {
console.error('加载通知未读数失败', error);
}
};
const loadNotifications = async (append = false) => {
if (append && (loading.value || noMore.value)) return;
const context = getSessionContext();
const requestId = ++listRequestId;
const requestedPage = append ? page.value : 1;
loading.value = true;
try {
const data = await notificationApi.getList(requestedPage, pageSize);
if (!isCurrentSession(context) || requestId !== listRequestId) return;
const items = (data?.items || []);
if (append) {
notifications.push(...items);
} else {
notifications.splice(0, notifications.length, ...items);
}
total.value = Number(data?.total || 0);
noMore.value = notifications.length >= total.value || items.length < pageSize;
page.value = requestedPage + 1;
} catch (error) {
console.error('加载通知列表失败', error);
} finally {
if (isCurrentSession(context) && requestId === listRequestId) {
loading.value = false;
notificationsLoaded.value = true;
}
}
};
const markItemRead = async (item) => {
if (item.is_read || readPending.has(item.id) || markingAll.value) return;
const context = getSessionContext();
readPending.add(item.id);
try {
await notificationApi.markRead(item.id);
if (!isCurrentSession(context)) return;
item.is_read = true;
item.read_at = new Date().toISOString();
await loadUnreadCount();
} catch (error) {
console.error('标记通知已读失败', error);
} finally {
readPending.delete(item.id);
}
};
const markAllRead = async () => {
if (!unreadCount.value || markingAll.value) return;
const context = getSessionContext();
markingAll.value = true;
try {
await notificationApi.markAllRead();
if (!isCurrentSession(context)) return;
await Promise.all([loadNotifications(), loadUnreadCount()]);
if (!isCurrentSession(context)) return;
uni.showToast({ title: '已全部标记为已读', icon: 'success' });
} catch (error) {
console.error('全部标记通知已读失败', error);
} finally {
markingAll.value = false;
}
};
const loadMore = () => {
if (!noMore.value) loadNotifications(true);
};
onShow(async () => {
notifications.splice(0);
total.value = 0;
unreadCount.value = 0;
page.value = 1;
noMore.value = false;
notificationsLoaded.value = false;
await Promise.all([loadNotifications(), loadUnreadCount()]);
});
</script>
<style lang="scss" scoped>
.container { padding-bottom: 40rpx; }
.toolbar { margin-bottom: var(--space-md); }
.summary { color: var(--text-tertiary); font-size: 24rpx; }
.mark-all { margin: 0; padding: 0 24rpx; height: 64rpx; line-height: 64rpx; font-size: 24rpx; }
.notification-card { margin-bottom: var(--space-md); }
.notification-header { margin-bottom: var(--space-sm); gap: 20rpx; align-items: flex-start; }
.notification-title { color: var(--text-primary); font-size: 30rpx; font-weight: 600; flex: 1; }
.read-status { flex-shrink: 0; margin: 0; padding: 6rpx 18rpx; border-radius: 999rpx; font-size: 22rpx; font-weight: 500; line-height: 1.5; }
.read-status::after { border: none; }
.status-unread { color: var(--primary-dark); background: var(--success-light); }
.status-read { color: var(--text-tertiary); background: var(--gray-100); }
.notification-body { color: var(--text-secondary); font-size: 26rpx; line-height: 1.6; white-space: pre-wrap; }
.notification-footer { margin-top: var(--space-md); }
.notification-meta, .notification-time { color: var(--text-tertiary); font-size: 22rpx; }
.empty-state { display: flex; flex-direction: column; align-items: center; padding: 140rpx 40rpx; }
.loading-state { display: flex; align-items: center; justify-content: center; min-height: 400rpx; }
.empty-icon { width: 100rpx; height: 100rpx; opacity: 0.6; margin-bottom: 24rpx; }
.empty-title { color: var(--text-primary); font-size: 30rpx; font-weight: 600; }
.empty-desc { color: var(--text-tertiary); font-size: 24rpx; margin-top: 12rpx; }
.load-more { padding: var(--space-lg); color: var(--text-tertiary); text-align: center; font-size: 24rpx; }
</style>

View File

@@ -1,6 +1,7 @@
<template>
<view class="container">
<view class="filter-tabs">
<view class="filter-tab-indicator" :style="filterIndicatorStyle"></view>
<view
v-for="(item, index) in filterOptions"
:key="index"
@@ -9,13 +10,14 @@
@tap="onFilterChange(index)"
>
{{ item.label }}
<view v-if="filterIndex === index" class="tab-line"></view>
</view>
</view>
<scroll-view scroll-y class="scroll-container" @scrolltolower="loadMore">
<view v-if="orderList.length === 0 && !loading" class="empty-state">
<view class="empty-icon">ORD</view>
<view v-if="!ordersLoaded || (loading && orderList.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="orderList.length === 0" class="empty-state">
<image class="empty-icon" src="/static/order.png" mode="aspectFit" alt="我的订单"></image>
<view class="empty-title">暂无订单</view>
<view class="empty-desc">当前账号下暂无订单信息</view>
</view>
@@ -23,11 +25,9 @@
<view v-else class="order-list">
<view class="order-card" v-for="item in orderList" :key="item.order_id">
<view class="card-header">
<view class="header-left">
<view class="header-row">
<text class="field-tag">订单号</text>
<text class="order-no">{{ item.order_no }}</text>
</view>
<view class="order-number" @tap.stop="copyOrderNo(item.order_no)">
<text class="order-no">{{ item.order_no || '-' }}</text>
<button class="copy-button" @tap.stop="copyOrderNo(item.order_no)" aria-label="复制订单号">复制</button>
</view>
<view class="status-badge" :class="getStatusClass(item.payment_status)">
{{ item.payment_status_name }}
@@ -35,29 +35,26 @@
</view>
<view class="card-body">
<view class="info-grid">
<view class="info-item">
<view class="info-label">套餐名称</view>
<view class="info-value">
<view class="package-item" v-for="(pkgName, pkgIndex) in item.package_names" :key="pkgIndex">
<text class="package-name">{{ pkgName }}</text>
</view>
</view>
</view>
<view class="info-item">
<view class="info-label">订单金额</view>
<view class="info-value amount">¥{{ formatMoney(item.total_amount) }}</view>
</view>
<view class="info-item">
<view class="info-label">下单时间</view>
<view class="info-value">{{ item.created_at }}</view>
<view class="package-row">
<view class="package-content">
<view class="package-name">{{ getPackageNamesText(item) }}</view>
<view class="package-desc">高速流量 · 全国通用 · 不限速</view>
</view>
<view class="order-amount">¥{{ formatMoney(item.total_amount) }}</view>
</view>
<view v-if="item.payment_status === 1" class="card-footer">
<button class="btn-pay" :disabled="orderPayingId !== null" @tap="showOrderPaymentMethods(item)">
{{ isOrderPaying(item) ? '处理中...' : '立即支付' }}
</button>
<view class="card-divider"></view>
<view class="card-footer">
<view class="created-time">下单时间:{{ item.created_at || '-' }}</view>
<view class="order-actions">
<button v-if="item.payment_status === 1" class="order-action-button primary-action-button"
@tap.stop="showOrderPaymentMethods(item)">
立即支付
</button>
<button v-if="item.payment_status === 2" class="order-action-button primary-action-button"
@tap.stop="startOrderRenewal(item)">立即续费</button>
</view>
</view>
</view>
</view>
@@ -68,42 +65,34 @@
<text v-else>上拉加载更多</text>
</view>
</view>
</scroll-view>
<RenewalPaymentPopup ref="renewalPopupRef" :identifier="userStore.state.identifier"
paymentRefreshTarget="order-list" @completed="refreshOrderState" />
</view>
</template>
<script setup>
import { ref, reactive, onMounted, computed } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import { ref, reactive, computed } from 'vue';
import { onReachBottom, onShow } from '@dcloudio/uni-app';
import { assetApi, orderApi } from '@/api/index.js';
import RenewalPaymentPopup from '@/components/RenewalPaymentPopup.vue';
import { useUserStore } from '@/store/index.js';
import {
consumePendingPaymentRefresh,
handlePaymentError,
isValidAlipayPaymentLink,
isValidWechatPayConfig,
openAlipayPayment,
PAYMENT_REFRESH_TARGETS,
showPaymentToast,
wechatH5Pay
PAYMENT_REFRESH_TARGETS
} from '@/utils/payment.js';
import { formatMoney } from '@/utils/display.js';
const userStore = useUserStore();
const orderList = reactive([]);
const loading = ref(false);
const ordersLoaded = ref(false);
const noMore = ref(false);
const page = ref(1);
const orderPayingId = ref(null);
const renewalPopupRef = ref(null);
const pageSize = 10;
const filterIndex = ref(0);
const isDeviceAsset = ref(true);
let assetTypePromise = null;
const paymentMethodOptions = computed(() => [
...(isDeviceAsset.value ? [{ label: '微信支付', value: 'wechat' }] : []),
{ label: '支付宝支付', value: 'alipay' },
{ label: '钱包支付', value: 'wallet' }
]);
const filterOptions = [
{ label: '全部', value: null },
{ label: '待支付', value: 1 },
@@ -112,10 +101,9 @@
{ label: '已退款', value: 4 }
];
const formatMoney = (amount) => {
if (!amount && amount !== 0) return '0.00';
return (amount / 100).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
};
const filterIndicatorStyle = computed(() => ({
left: `calc(${filterIndex.value * 20}% + 8rpx)`
}));
const getStatusClass = (status) => {
const classMap = {
@@ -127,45 +115,36 @@
return classMap[status] || '';
};
const loadAssetType = async () => {
if (!userStore.state.identifier) return;
if (assetTypePromise) return assetTypePromise;
assetTypePromise = assetApi.getInfo(userStore.state.identifier)
.then((data) => {
isDeviceAsset.value = data.asset_type === 'device';
})
.catch((error) => {
console.error('加载资产类型失败', error);
})
.finally(() => {
assetTypePromise = null;
});
return assetTypePromise;
};
const resetOrderListAndLoad = () => {
page.value = 1;
noMore.value = false;
loadOrderList();
};
const refreshOrderState = () => {
resetOrderListAndLoad();
// 订单支付、退款及套餐生效后,读取后端实际轮询状态,不推测已恢复。
return assetApi.getInfo(userStore.state.identifier).catch(error => {
console.error('刷新订单关联资产状态失败', error);
});
};
const scheduleOrderStatusRefresh = () => {
uni.showToast({
title: '正在同步支付状态',
icon: 'none'
});
resetOrderListAndLoad();
refreshOrderState();
setTimeout(() => {
resetOrderListAndLoad();
}, 1500);
setTimeout(() => {
resetOrderListAndLoad();
refreshOrderState();
}, 3000);
};
const onFilterChange = (index) => {
if (filterIndex.value === index) return;
filterIndex.value = index;
resetOrderListAndLoad();
};
@@ -214,6 +193,7 @@
}
loading.value = false;
ordersLoaded.value = true;
};
const loadMore = () => {
@@ -222,116 +202,68 @@
}
};
const isOrderPaying = (order) => orderPayingId.value === order.order_id;
const getPackageNamesText = (order) => {
const packageNames = Array.isArray(order?.package_names)
? order.package_names.filter(Boolean)
: [];
return packageNames.join('、') || '-';
};
const showOrderPaymentMethods = async (order) => {
if (orderPayingId.value !== null || !order?.order_id) return;
await loadAssetType();
const options = paymentMethodOptions.value;
uni.showActionSheet({
itemList: options.map((item) => item.label),
success: ({ tapIndex }) => {
const selectedMethod = options[tapIndex]?.value;
if (selectedMethod) {
handleOrderPayment(order, selectedMethod);
}
}
const copyOrderNo = (orderNo) => {
if (!orderNo) return;
uni.setClipboardData({
data: String(orderNo),
success: () => uni.showToast({ title: '订单号已复制', icon: 'success' })
});
};
const handleOrderPayment = async (order, paymentMethod) => {
if (orderPayingId.value !== null || !order?.order_id) return;
orderPayingId.value = order.order_id;
uni.showLoading({
title: '处理中...',
mask: true
});
try {
const payData = await orderApi.pay(order.order_id, paymentMethod);
uni.hideLoading();
if (paymentMethod === 'wallet') {
showPaymentToast(true, '支付成功');
setTimeout(() => {
resetOrderListAndLoad();
}, 1500);
return;
}
if (paymentMethod === 'wechat') {
if (!isValidWechatPayConfig(payData?.pay_config)) {
uni.showToast({
title: '支付参数获取失败',
icon: 'none'
});
return;
}
try {
await wechatH5Pay(payData.pay_config);
showPaymentToast(true, '支付成功');
setTimeout(() => {
resetOrderListAndLoad();
}, 1500);
} catch (error) {
handlePaymentError(error);
}
return;
}
if (!isValidAlipayPaymentLink(payData?.payment_link)) {
uni.showToast({
title: '支付链接获取失败',
icon: 'none'
});
return;
}
await openAlipayPayment(payData.payment_link, PAYMENT_REFRESH_TARGETS.ORDER_LIST);
} catch (error) {
uni.hideLoading();
console.error('订单支付失败', error);
uni.showToast({
title: error.msg || error.message || '支付失败,请稍后重试',
icon: 'none'
});
} finally {
orderPayingId.value = null;
const startOrderRenewal = (order) => {
const packageIds = Array.isArray(order?.package_ids) ? order.package_ids.filter(Boolean) : [];
if (!packageIds.length) {
uni.showToast({ title: '当前订单暂无可续费套餐', icon: 'none' });
return;
}
const packageNames = Array.isArray(order.package_names) ? order.package_names : [];
renewalPopupRef.value?.open(packageIds, packageNames);
};
const showOrderPaymentMethods = (order) => {
if (!order?.order_id) return;
const packageNames = Array.isArray(order.package_names) ? order.package_names : [];
const paymentMethod = String(order.payment_method || '').trim().toLowerCase();
if (paymentMethod === 'wallet') {
renewalPopupRef.value?.payOrderDirectly(order.order_id, 'wallet');
return;
}
renewalPopupRef.value?.openOrderPayment(order.order_id, packageNames, paymentMethod);
};
onShow(() => {
if (!consumePendingPaymentRefresh(PAYMENT_REFRESH_TARGETS.ORDER_LIST)) {
refreshOrderState();
return;
}
scheduleOrderStatusRefresh();
});
onMounted(() => {
loadAssetType();
loadOrderList();
onReachBottom(() => {
loadMore();
});
</script>
<style lang="scss" scoped>
.container {
position: fixed;
top: var(--window-top);
left: 0;
right: 0;
bottom: 0;
display: flex;
flex-direction: column;
gap: 0;
background: var(--bg-secondary);
max-width: 750rpx;
margin: 0 auto;
width: 100%;
box-sizing: border-box;
padding-top: 0;
min-height: 100vh;
padding: 0 0 48rpx;
}
.filter-tabs {
@@ -340,7 +272,7 @@
border-radius: 20rpx;
z-index: 100;
flex-shrink: 0;
margin-top: 20rpx;
margin: 20rpx 24rpx 0;
box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
.tab-item {
@@ -365,17 +297,12 @@
transform: translateX(-50%);
width: 48rpx;
height: 6rpx;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
background: var(--primary);
border-radius: 3rpx;
}
}
}
.scroll-container {
flex: 1;
height: 100%;
}
.empty-state {
display: flex;
flex-direction: column;
@@ -384,10 +311,10 @@
padding: 200rpx 40rpx;
.empty-icon {
font-size: 56rpx;
width: 120rpx;
height: 120rpx;
margin-bottom: 30rpx;
opacity: 0.6;
letter-spacing: 4rpx;
}
.empty-title {
@@ -451,19 +378,26 @@
.info-grid {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 20rpx;
grid-template-columns: 1fr;
gap: 16rpx;
.info-item {
display: flex;
align-items: baseline;
gap: 8rpx;
.info-label {
font-size: 22rpx;
color: #999;
margin-bottom: 8rpx;
flex-shrink: 0;
}
.info-value {
font-size: 26rpx;
color: #333;
flex: 1;
min-width: 0;
word-break: break-all;
&.amount {
color: #ff6b6b;
@@ -474,40 +408,28 @@
}
}
.package-item {
display: flex;
align-items: center;
padding: 8rpx 0;
}
.package-name {
font-size: 26rpx;
color: #333;
}
.card-footer {
margin-top: 24rpx;
padding-top: 24rpx;
border-top: 1rpx solid #f0f0f0;
display: flex;
justify-content: flex-end;
flex-direction: column;
gap: 16rpx;
.btn-pay {
background: #1890ff;
color: #fff;
border: none;
border-radius: 20rpx;
padding: 16rpx 40rpx;
font-size: 26rpx;
font-weight: 500;
.order-action-button {
width: 100%;
min-width: 0;
margin: 0;
}
&[disabled] {
opacity: 0.7;
}
.payment-action-buttons {
display: flex;
width: 100%;
gap: 16rpx;
&::after {
border: none;
.order-action-button {
flex: 1;
width: 0;
}
}
}
@@ -526,8 +448,8 @@
}
&.tag-success {
background: #e6f7ff;
color: #1890ff;
background: #eaf6ec;
color: var(--primary);
}
&.tag-secondary {
@@ -547,4 +469,289 @@
color: #999;
font-size: 24rpx;
}
.loading-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 500rpx;
}
/* Screenshot-aligned order list skin */
.container {
position: fixed;
top: 88rpx;
right: 0;
bottom: 0;
left: 0;
background: #f8f9fb;
padding: 0;
gap: 0;
padding-top: 0;
height: auto;
min-height: 0;
overflow: hidden;
}
.filter-tabs {
display: flex;
align-items: stretch;
flex-shrink: 0;
margin-top: 0;
padding: 0 20rpx;
background: #fff;
border-radius: 0;
border-bottom: 1rpx solid #f0f1f3;
box-shadow: none;
overflow: hidden;
}
.filter-tabs .tab-item {
position: relative;
flex: 1;
min-width: 128rpx;
padding: 28rpx 12rpx 24rpx;
color: #777b84;
font-size: 28rpx;
text-align: center;
white-space: nowrap;
box-sizing: border-box;
}
.filter-tabs .tab-item.active {
color: var(--primary);
font-size: 28rpx;
font-weight: 600;
}
.filter-tabs .tab-line {
bottom: 0;
width: 42rpx;
height: 6rpx;
background: var(--primary);
border-radius: 8rpx;
}
.container .filter-tabs {
position: relative;
margin-top: 0;
padding: 8rpx;
background: #fff;
border: 0;
border-radius: 16rpx;
overflow: hidden;
}
.container .filter-tabs .tab-item {
position: relative;
z-index: 1;
min-width: 0;
padding: 20rpx 4rpx;
color: var(--text-tertiary);
font-size: 26rpx;
transition: color 0.3s;
}
.container .filter-tabs .tab-item.active {
background: transparent;
color: #fff;
font-size: 26rpx;
font-weight: 600;
}
.filter-tab-indicator {
position: absolute;
top: 8rpx;
width: calc(20% - 16rpx);
height: calc(100% - 16rpx);
background: var(--primary);
border-radius: 12rpx;
transition: left 0.3s ease;
z-index: 0;
}
.order-list {
padding: 20rpx 24rpx 48rpx;
box-sizing: border-box;
}
.order-card {
margin-bottom: 20rpx;
padding: 0 32rpx;
background: #fff;
border: 1rpx solid #f0f1f3;
border-radius: 18rpx;
box-shadow: 0 6rpx 18rpx rgba(31, 35, 41, 0.04);
box-sizing: border-box;
}
.order-card .card-header {
align-items: center;
padding: 32rpx 0 24rpx;
border-bottom: 0;
}
.order-number {
display: flex;
align-items: center;
min-width: 0;
color: #777b84;
font-size: 26rpx;
}
.order-no {
max-width: 410rpx;
overflow: hidden;
color: #777b84;
font-size: 26rpx;
text-overflow: ellipsis;
white-space: nowrap;
}
.order-card .card-body {
padding: 0 0 28rpx;
}
.package-row {
display: flex;
align-items: center;
min-width: 0;
gap: 20rpx;
}
.package-content {
min-width: 0;
flex: 1;
}
.package-name {
color: #16181c;
font-size: 30rpx;
font-weight: 600;
line-height: 1.25;
word-break: break-all;
}
.package-desc {
margin-top: 14rpx;
color: #8b9099;
font-size: 23rpx;
line-height: 1.35;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.order-amount {
align-self: center;
color: #ff302f;
font-size: 30rpx;
font-weight: 600;
white-space: nowrap;
}
.card-divider {
height: 1rpx;
margin: 28rpx 0 20rpx;
background: #edf0f2;
}
.order-card .card-footer {
display: flex;
align-items: stretch;
justify-content: flex-start;
gap: 16rpx;
margin-top: 0;
padding: 0 0 28rpx;
border-top: 0;
flex-direction: column;
}
.order-card .card-body .card-footer {
display: flex;
flex-direction: column;
align-items: stretch;
justify-content: flex-start;
gap: 16rpx;
margin-top: 0;
padding: 0 0 28rpx;
border-top: 0;
}
.created-time {
width: 100%;
min-width: 0;
flex: none;
color: #777b84;
font-size: 24rpx;
line-height: 1.3;
text-align: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.order-actions {
display: flex;
align-items: center;
justify-content: flex-end;
width: 100%;
gap: 16rpx;
margin-left: 0;
align-self: flex-end;
flex-shrink: 0;
}
.order-card .order-action-button {
width: 180rpx;
height: 58rpx;
min-width: 0;
margin: 0;
padding: 0 16rpx;
border: 1rpx solid transparent;
border-radius: 12rpx;
font-size: 25rpx;
font-weight: 500;
line-height: 56rpx;
box-sizing: border-box;
white-space: nowrap;
-webkit-tap-highlight-color: transparent;
&::after { border: none; }
}
.order-card .card-body .card-footer .order-action-button {
width: 180rpx;
height: 58rpx;
min-width: 0;
margin: 0;
padding: 0 16rpx;
line-height: 56rpx;
}
.primary-action-button {
border-color: var(--primary);
background: var(--primary);
color: #fff;
}
.order-card .status-badge {
padding: 0 0 0 16rpx;
background: transparent;
border-radius: 0;
font-size: 25rpx;
font-weight: 500;
white-space: nowrap;
}
.order-card .status-badge.tag-warning { color: #f08a00; }
.order-card .status-badge.tag-success { color: var(--primary); }
.order-card .status-badge.tag-secondary { color: #7d828b; }
.order-card .status-badge.tag-info { color: #666d78; }
.load-more {
padding: 24rpx 32rpx 40rpx;
color: #9aa0aa;
font-size: 23rpx;
}
</style>

File diff suppressed because it is too large Load Diff

View File

@@ -1,47 +1,45 @@
<template>
<view class="container">
<view v-if="mchList.length === 0 && !loading" class="empty-state">
<view class="empty-icon">📡</view>
<view v-if="!cardsLoaded || (loading && mchList.length === 0)" class="loading-state">
<up-loading-icon text="加载中" size="30"></up-loading-icon>
</view>
<view v-else-if="mchList.length === 0" class="empty-state">
<image class="empty-icon" src="/static/change.png" mode="aspectFit" alt="切换运营商"></image>
<view class="empty-title">运营商列表为空</view>
<view class="empty-desc">当前设备暂无可切换的运营商</view>
</view>
<view class="card" v-for="item in mchList" :key="item.iccid">
<view class="flex-row-sb mt-30">
<view class="flex-row-g20">
<view class="logo">
<image :src="getCarrier(item.carrier_type).logo" mode="aspectFit"></image>
<view class="card carrier-card" v-for="item in mchList" :key="item.iccid">
<view class="carrier-main">
<view class="logo-stack">
<image class="carrier-logo" :src="getCarrier(item.carrier_type).logo" mode="aspectFit"></image>
</view>
<view class="carrier-details">
<view class="carrier-heading">
<view class="carrier-name">{{ getCarrier(item.carrier_type).name }}</view>
<image class="slot-badge" :src="getSlotIcon(item.slot_position)" mode="aspectFit"></image>
<view class="carrier-statuses">
<up-tag :type="item.real_name_status === 1 ? 'primary' : 'success'" size="mini">
{{ item.real_name_status === 1 ? '已实名' : '未实名' }}
</up-tag>
<up-tag v-if="item.network_status" type="info" size="mini">{{ item.network_status }}</up-tag>
</view>
</view>
<view class="flex-col-g20">
<view class="flex-row-g20">
<view class="iccid">{{ item.iccid }}</view>
<view class="operator">
<up-tag type="success" size="mini">{{ getCarrier(item.carrier_type).name }}</up-tag>
</view>
</view>
<view class="flex-row-g20">
<view class="operator">
<up-tag :type="item.real_name_status === 1 ? 'primary' : 'success'" size="mini">{{ item.real_name_status === 1 ? '已实名' : '未实名' }}</up-tag>
</view>
<view v-if="item.network_status" class="operator">
<up-tag type="info" size="mini">{{ item.network_status }}</up-tag>
</view>
</view>
<view class="slot">卡槽位: {{ item.slot_position || '-' }}</view>
<view class="carrier-iccid">
<text class="iccid-value-text">{{ item.iccid }}</text>
<button class="copy-button" @tap.stop="copyIccid(item.iccid)" aria-label="复制ICCID">复制</button>
</view>
<view class="card-actions">
<button v-if="item.is_current" class="btn-apple btn-primary action-button" disabled>当前使用</button>
<button v-else class="btn-apple btn-primary action-button" :disabled="switching" @tap="switchOperator(item)">
切换此运营商
</button>
<button v-if="item.real_name_status !== 1" class="btn-apple btn-secondary action-button" @tap="toReal(item)">
去实名
</button>
</view>
</view>
</view>
<view class="btn flex-row-g20 mt-30">
<up-button class="btn-apple btn-primary" v-if="item.is_current" type="primary" disabled>
当前使用
</up-button>
<up-button class="btn-apple btn-success" v-else type="success" @tap="switchOperator(item)" :loading="switching">
切换此运营商
</up-button>
<up-button class="btn-apple btn-success" v-if="item.real_name_status !== 1" type="success" @tap="toReal(item)">
去实名
</up-button>
</view>
</view>
<view class="modal-overlay" v-if="showIccidModal" @tap="closeModal">
@@ -59,36 +57,59 @@
<script setup>
import { reactive, ref, onMounted } from 'vue';
import { assetApi, deviceApi, realnameApi } from '@/api/index.js';
import { assetApi, deviceApi, hasActiveOrPendingPackage, realnameApi } from '@/api/index.js';
import { useUserStore } from '@/store/index.js';
import slot1Icon from '@/static/卡槽1.jpeg';
import slot2Icon from '@/static/卡槽2.jpeg';
import slot3Icon from '@/static/卡槽3.jpeg';
import cmccLogo from '@/static/中国移动.png';
import cuccLogo from '@/static/中国联通.png';
import ctccLogo from '@/static/中国电信.png';
import cbnLogo from '@/static/中国广电.png';
const userStore = useUserStore();
let mchList = reactive([]);
let loading = ref(false);
let cardsLoaded = ref(false);
let switching = ref(false);
let showIccidModal = ref(false);
let currentModalIccid = ref('');
let realnameEntryChecking = ref(false);
const carrierMap = {
CMCC: '中国移动',
CUCC: '中国联通',
CTCC: '中国电信',
CBN: '中国广电'
CMCC: { name: '中国移动', logo: cmccLogo },
CUCC: { name: '中国联通', logo: cuccLogo },
CTCC: { name: '中国电信', logo: ctccLogo },
CBN: { name: '中国广电', logo: cbnLogo }
};
const carrierLogoMap = {
CMCC: 'https://img2.baidu.com/it/u=915783975,1594870591&fm=253&fmt=auto&app=120&f=PNG?w=182&h=182',
CUCC: 'https://img1.baidu.com/it/u=2816777816,1756344384&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500',
CTCC: 'https://img2.baidu.com/it/u=139558247,3893370039&fm=253&fmt=auto?w=529&h=500',
CBN: 'https://img1.baidu.com/it/u=3160680953,3401650303&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500'
const slotIconMap = {
1: slot1Icon,
2: slot2Icon,
3: slot3Icon
};
const getCarrier = (carrierType) => {
return {
name: carrierMap[carrierType] || '-',
logo: carrierLogoMap[carrierType] || carrierLogoMap.CMCC
};
return carrierMap[carrierType] || { name: '-', logo: '' };
};
const getSlotIcon = (slotPosition) => slotIconMap[Number(slotPosition)] || slotIconMap[1];
const sortBySlotPosition = (cards) => cards.sort((left, right) => {
const leftSlot = Number(left.slot_position);
const rightSlot = Number(right.slot_position);
const normalizedLeft = Number.isFinite(leftSlot) && leftSlot > 0 ? leftSlot : Number.MAX_SAFE_INTEGER;
const normalizedRight = Number.isFinite(rightSlot) && rightSlot > 0 ? rightSlot : Number.MAX_SAFE_INTEGER;
return normalizedLeft - normalizedRight;
});
const copyIccid = (value) => {
if (!value) return;
uni.setClipboardData({
data: String(value),
success: () => uni.showToast({ title: 'ICCID已复制', icon: 'success' })
});
};
const loadCards = async () => {
@@ -101,15 +122,17 @@
// 是设备,调用设备卡列表接口
const data = await deviceApi.getCards(userStore.state.identifier);
if (data.cards && data.cards.length > 0) {
mchList.splice(0, mchList.length, ...data.cards.map(card => ({
const cards = data.cards.map(card => ({
iccid: card.iccid,
carrier_type: card.carrier_type,
carrier_name: card.carrier_name,
is_current: card.is_active,
real_name_status: card.real_name_status,
realname_policy: card.realname_policy,
network_status: card.network_status,
slot_position: card.slot_position
})));
}));
mchList.splice(0, mchList.length, ...sortBySlotPosition(cards));
}
} else {
// 不是设备(单卡),直接使用 asset info 数据,只有一个卡
@@ -129,13 +152,27 @@
console.error('加载卡列表失败', e);
}
loading.value = false;
cardsLoaded.value = true;
};
const switchOperator = async (item) => {
const switchOperator = (item) => {
if (switching.value) return;
uni.showModal({
title: '确认切换',
content: `确定要切换到${getCarrier(item.carrier_type).name}吗?切换后预计 3-5 分钟生效。`,
cancelText: '取消',
confirmText: '确认切换',
success: ({ confirm }) => {
if (confirm) executeSwitch(item);
}
});
};
const executeSwitch = async (item) => {
switching.value = true;
try {
await deviceApi.switchCard(userStore.state.identifier, item.iccid);
uni.showToast({ title: '切换成功,3-5分钟后生效', icon: 'success' });
uni.showToast({ title: '切换成功,3-5分钟后生效', icon: 'none' });
loadCards();
} catch (e) {
console.error('切换运营商失败', e);
@@ -143,11 +180,52 @@
switching.value = false;
};
const toReal = (card) => {
currentModalIccid.value = card.iccid;
const openRealnameModal = (iccid) => {
currentModalIccid.value = iccid;
showIccidModal.value = true;
};
const toReal = async (card) => {
if (realnameEntryChecking.value) return;
if (card.realname_policy !== 'after_order') {
openRealnameModal(card.iccid);
return;
}
realnameEntryChecking.value = true;
uni.showLoading({ title: '校验中...', mask: true });
try {
const data = await deviceApi.getCards(userStore.state.identifier);
const cards = Array.isArray(data?.cards) ? data.cards : [];
const currentCard = cards.find(item => item.iccid === card.iccid) || card;
const hasRealNamedCard = cards.some(item => Number(item?.real_name_status) === 1);
if (currentCard.realname_policy !== 'after_order' || hasRealNamedCard ||
await hasActiveOrPendingPackage(userStore.state.identifier)) {
uni.hideLoading();
openRealnameModal(card.iccid);
return;
}
uni.hideLoading();
uni.showModal({
title: '提示',
content: '当前设备所有卡均未实名,且暂无生效中或待生效套餐。请先订购套餐,再进行实名认证。',
confirmText: '去订购',
cancelText: '取消',
success: ({ confirm }) => {
if (confirm) uni.navigateTo({ url: '/pages/package-order/package-order' });
}
});
} catch (error) {
uni.hideLoading();
console.error('校验切换运营商实名条件失败', error);
uni.showToast({ title: '实名条件校验失败,请稍后重试', icon: 'none' });
} finally {
realnameEntryChecking.value = false;
}
};
const closeModal = () => {
showIccidModal.value = false;
};
@@ -182,15 +260,101 @@
<style lang="scss" scoped>
.container {
.card {
.logo {
width: 80rpx;
height: 80rpx;
border-radius: 120rpx;
border: 1rpx solid var(--primary);
overflow: hidden;
image { width: 100%; height: 100%; }
}
.carrier-card {
padding: 28rpx;
}
.carrier-main {
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 24rpx;
}
.logo-stack {
width: 88rpx;
height: 88rpx;
margin-top: 12rpx;
flex-shrink: 0;
box-sizing: border-box;
}
.carrier-logo {
width: 88rpx;
height: 88rpx;
flex-shrink: 0;
}
.slot-badge {
width: 32rpx;
height: 32rpx;
flex-shrink: 0;
}
.carrier-details {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
}
.carrier-name {
color: var(--text-primary);
font-size: 30rpx;
font-weight: 600;
line-height: 1.3;
}
.carrier-heading {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 12rpx;
}
.carrier-iccid {
display: flex;
align-items: center;
gap: 10rpx;
margin-top: 14rpx;
min-width: 0;
}
.iccid-value-text {
flex: 0 1 auto;
min-width: 0;
color: var(--text-secondary);
font-size: 24rpx;
line-height: 1.35;
word-break: break-all;
}
.carrier-statuses {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 10rpx;
margin-top: 0;
}
.card-actions {
width: 100%;
margin-top: 20rpx;
display: flex;
flex-direction: row;
gap: 12rpx;
}
.action-button {
flex: 1 1 0;
width: auto;
min-width: 0;
height: 64rpx;
padding: 0 12rpx;
font-size: 24rpx;
line-height: 64rpx;
box-sizing: border-box;
&::after { border: none; }
}
}
@@ -292,8 +456,15 @@
justify-content: center;
padding: 120rpx 40rpx;
min-height: 400rpx;
.empty-icon { font-size: 120rpx; margin-bottom: 30rpx; opacity: 0.6; }
.empty-icon { width: 120rpx; height: 120rpx; margin-bottom: 30rpx; opacity: 0.6; }
.empty-title { font-size: 32rpx; font-weight: 600; color: var(--text-primary); margin-bottom: 16rpx; }
.empty-desc { font-size: 26rpx; color: var(--text-tertiary); text-align: center; }
}
.loading-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 500rpx;
}
</style>

2
qt2.md Normal file
View File

@@ -0,0 +1,2 @@
<view class="bottom-spacer"></view>
<view class="plain"></view>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 241 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 223 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 296 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 266 KiB

BIN
static/change-shop.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 359 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 292 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 KiB

BIN
static/notification.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

Some files were not shown because too many files have changed in this diff Show More