feat(admin): 平台管理新增套餐管理(改价 / 改天数 / 上下架 / 删除)
- 后端:新增 service/admin_plan.js、controller/web/admin_plan.js, GET/POST /api/web/admin/plans、PUT/DELETE /api/web/admin/plans/:id(需平台管理员) - 套餐 code 创建后不可改(历史订单已快照 plan_code);留空按天数自动生成(如 p30) - 前端:新增 /admin/plans「套餐管理」页面,并接入「平台管理」菜单与路由 - 续期下单只按库里的售价算钱,改完即生效、不用发版 - 文档与测试同步更新 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
8949b7198c
commit
0c59bede7e
@ -75,6 +75,9 @@ packService/
|
||||
- [x] **平台管理员 + 平台管理台(2026-10-29)**:新表 `admin_members`(平台管理员名单,`INTERNAL_ADMIN_IDS` 为内置/救急入口);
|
||||
平台管理员登录后左侧菜单多出「平台管理」:**主体管理**(所有主体 + 直接改授权到期时间:选时间或顺延)、
|
||||
**订单管理**(所有订单 + 确认订单 = 支付回调的同一套后续动作)、**管理员**(成员列表 + 按账号添加/移除)
|
||||
- [x] **平台管理 · 套餐管理(2026-11-07)**:左侧「平台管理」新增**套餐管理**(`/admin/plans`):
|
||||
新增 / 改价 / 改天数 / 上下架 / 删除续期套餐;续期下单只按库里的售价算钱,改完即生效、不用发版
|
||||
(接口 `GET/POST/PUT/DELETE /api/web/admin/plans`,详见 [`backend/README.md`](backend/README.md))
|
||||
- [x] **待支付订单 2 小时自动失效(2026-10-29)**:下单后 2 小时(`PAY_ORDER_TTL`,默认 7200 秒)内未支付,
|
||||
订单自动关闭(`status=2`);之后的支付回调 / 手工确认一律 409。与微信扫码支付二维码有效期对齐,
|
||||
定时任务每分钟扫一次,详情 / 列表 / 回调读路径也会顺手收口(详见 [`backend/README.md`](backend/README.md))
|
||||
|
||||
@ -37,6 +37,7 @@ packService/backend
|
||||
│ │ │ ├── admin_member.js # /api/web/admin/members[/:id]、/me 平台管理员名单(❗需平台管理员)
|
||||
│ │ │ ├── admin_subject.js # /api/web/admin/subjects[/:id] 所有主体 + 改授权到期时间
|
||||
│ │ │ ├── admin_order.js # /api/web/admin/orders[/:orderNo/confirm] 所有订单 + 确认订单
|
||||
│ │ │ ├── admin_plan.js # /api/web/admin/plans[/:id] 续期套餐(改价 / 改天数 / 上下架)
|
||||
│ │ │ ├── admin_extension.js # /api/web/admin/extension Chrome 插件集中配置(❗需平台管理员)
|
||||
│ │ │ ├── extension.js # /api/web/extension/config 插件读取的配置(公开只读,无令牌)
|
||||
│ │ │ └── test.js # /api/web/test/{device-login,scan} 前端测试页的模拟接口(仅非生产环境注册)
|
||||
@ -1021,6 +1022,12 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
| PUT | `/api/web/admin/subjects/:id` | **改授权到期时间**:`{ expireAt: '2027-01-01T00:00:00+08:00' }` 直接设(可设成过去 = 立即到期),或 `{ extendDays: 30 }` 顺延(未过期从原到期时间算、已过期从现在算);也可顺带改 `remark` / `status` |
|
||||
| GET | `/api/web/admin/orders?page=&pageSize=&keyword=&status=&subjectId=` | **所有订单**(带主体名 / 下单人);`keyword` 模糊匹配订单号、套餐名、主体名;`status=0\|1\|2` |
|
||||
| POST | `/api/web/admin/orders/:orderNo/confirm` | **确认订单**(线下收款 / 手工补单):与支付回调走**同一套** `service.subjectOrder.payNotify()`,所以「标记已支付 + 主体顺延 + 失效主体状态缓存 + 幂等」完全一致,只是渠道记成 `manual`、流水号 `ADMIN-<时间戳>` |
|
||||
| GET | `/api/web/admin/plans` | **全部续期套餐**(含已下架)`{ list, total }`,每项带 `statusText` / `pricePerDay` |
|
||||
| POST | `/api/web/admin/plans` | 新建套餐 `{ code?, name, days, price, originalPrice?, tag?, description?, sort?, status? }`;`code` 留空按天数生成(如 `p30`),重复 409;天数 1~3650、金额非负 |
|
||||
| PUT | `/api/web/admin/plans/:id` | 修改套餐(只改传了的字段;`code` 创建后不可改);常见用法:改价 `{ price: 129 }`、上下架 `{ status: 0 }` |
|
||||
| DELETE | `/api/web/admin/plans/:id` | 删除套餐(软删)。历史订单已快照 `plan_code / plan_name / days / amount`,不受影响;只想停售用 `status=0` 下架 |
|
||||
|
||||
用户端 `GET /api/web/subject-plans` 只返回 `status=1` 的套餐,续期金额只按库里的 `price` 算 —— 所以改价 / 改天数**改完即生效、不用发版**。
|
||||
|
||||
改授权到期时间后必须失效主体状态缓存(`subjectState.invalidate`),否则设备心跳 / 上报最多要等一个 TTL 才看到新期限 —— `service/subject.js#setExpireAt()` 已经做了。
|
||||
|
||||
@ -1050,11 +1057,13 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
|---|---|---|---|
|
||||
| 主体管理 | `/admin/subjects` | `views/AdminSubjectsView.vue` | 所有主体;「改到期时间」弹窗支持**直接选时间**或**顺延 N 天**(+7 / +30 / +90 / +1 年快捷按钮) |
|
||||
| 订单管理 | `/admin/orders` | `views/AdminOrdersView.vue` | 所有订单;待支付的可以「确认订单」(二次确认后立即续期) |
|
||||
| 套餐管理 | `/admin/plans` | `views/AdminPlansView.vue` | 续期套餐的新增 / 改价 / 改天数 / 上下架 / 删除(下单只按这里的售价算钱) |
|
||||
| 管理员 | `/admin/members` | `views/AdminMembersView.vue` | 平台管理员列表 + 添加(按账号)+ 移除 |
|
||||
| 插件配置 | `/admin/extension` | `views/AdminExtensionView.vue` | Chrome 插件的单号前缀 / 生效站点 / 跳转模板 |
|
||||
|
||||
- 是否显示这组菜单靠 `GET /api/web/admin/me`(`composables/usePlatformAdmin.ts`;非管理员 403 静默当 false);
|
||||
- 路由带 `meta.platformAdmin`,不是平台管理员会被守卫踢回首页(`?denied=1`);
|
||||
- 这三个页面 `allowNoSubject: true` —— 平台管理员可能一个主体都没有,不能因为「没主体」被挡走。
|
||||
- 这些页面 `allowNoSubject: true` —— 平台管理员可能一个主体都没有,不能因为「没主体」被挡走。
|
||||
|
||||
## 主体(租户)体系(2026-10-18)
|
||||
|
||||
@ -1137,7 +1146,7 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
3. `payNotify()` 进门先判一次(含事务内兜底),避免回调与关单并发时把已失效订单续期。
|
||||
|
||||
订单会快照 `plan_id / plan_code / plan_name`,套餐后续改价或下架都不影响历史订单对账。
|
||||
套餐表 `subject_plans`(迁移 `20261021180000-create-subject-plans` 内置三档,改价直接改库、不用发版):
|
||||
套餐表 `subject_plans`(迁移 `20261021180000-create-subject-plans` 内置三档;改价 / 改天数 / 上下架走后台**平台管理 → 套餐管理**(`/api/web/admin/plans`),不用发版):
|
||||
|
||||
| code | 天数 | 价格 | 备注 |
|
||||
|---|---|---|---|
|
||||
|
||||
60
backend/app/controller/web/admin_plan.js
Normal file
60
backend/app/controller/web/admin_plan.js
Normal file
@ -0,0 +1,60 @@
|
||||
'use strict';
|
||||
|
||||
const { Controller } = require('egg');
|
||||
|
||||
/** 路径参数转正整数,非法返回 null */
|
||||
function toId(value) {
|
||||
const id = Number(value);
|
||||
return Number.isInteger(id) && id > 0 ? id : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* web 平台管理员:续期套餐维护(`/api/web/admin/plans`)
|
||||
*
|
||||
* 鉴权:`middleware.apiAuth()` + `middleware.platformAdmin()`(能进来的都是平台管理员)。
|
||||
*
|
||||
* - `GET /api/web/admin/plans` 全部套餐(含已下架,带 `statusText` / `pricePerDay`)
|
||||
* - `POST /api/web/admin/plans` 新建 `{ code?, name, days, price, originalPrice?, tag?, description?, sort?, status? }`
|
||||
* - `PUT /api/web/admin/plans/:id` 修改(只改传了的字段;`code` 不可改)
|
||||
* - `DELETE /api/web/admin/plans/:id` 删除(软删;只是想下架就用 PUT 改 `status=0`)
|
||||
*
|
||||
* 用户端 `GET /api/web/subject-plans` 只返回 `status=1` 的套餐,续期金额只按 `price` 计算。
|
||||
*/
|
||||
class WebAdminPlanController extends Controller {
|
||||
/** GET /api/web/admin/plans */
|
||||
async index() {
|
||||
const { ctx } = this;
|
||||
const list = await ctx.service.adminPlan.list();
|
||||
ctx.body = { ok: true, data: { list, total: list.length } };
|
||||
}
|
||||
|
||||
/** POST /api/web/admin/plans */
|
||||
async create() {
|
||||
const { ctx } = this;
|
||||
const data = await ctx.service.adminPlan.create(ctx.request.body || {});
|
||||
ctx.status = 201;
|
||||
ctx.body = { ok: true, data };
|
||||
}
|
||||
|
||||
/** PUT /api/web/admin/plans/:id */
|
||||
async update() {
|
||||
const { ctx } = this;
|
||||
const id = toId(ctx.params.id);
|
||||
if (!id) ctx.throw(400, 'id 必须是正整数');
|
||||
|
||||
const data = await ctx.service.adminPlan.update(id, ctx.request.body || {});
|
||||
ctx.body = { ok: true, data };
|
||||
}
|
||||
|
||||
/** DELETE /api/web/admin/plans/:id */
|
||||
async destroy() {
|
||||
const { ctx } = this;
|
||||
const id = toId(ctx.params.id);
|
||||
if (!id) ctx.throw(400, 'id 必须是正整数');
|
||||
|
||||
const data = await ctx.service.adminPlan.remove(id);
|
||||
ctx.body = { ok: true, data };
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = WebAdminPlanController;
|
||||
@ -77,6 +77,11 @@ module.exports = (app) => {
|
||||
router.get('/api/web/admin/orders', apiAuth, platformAdmin, controller.web.adminOrder.index);
|
||||
// 确认订单 = 支付回调的后续动作(同一套 payNotify:标记已支付 + 主体顺延 + 失效缓存)
|
||||
router.post('/api/web/admin/orders/:orderNo/confirm', apiAuth, platformAdmin, controller.web.adminOrder.confirm);
|
||||
// 续期套餐维护:改价 / 改天数 / 上下架(下单只按库里的价格算,改完不用发版)
|
||||
router.get('/api/web/admin/plans', apiAuth, platformAdmin, controller.web.adminPlan.index);
|
||||
router.post('/api/web/admin/plans', apiAuth, platformAdmin, controller.web.adminPlan.create);
|
||||
router.put('/api/web/admin/plans/:id', apiAuth, platformAdmin, controller.web.adminPlan.update);
|
||||
router.delete('/api/web/admin/plans/:id', apiAuth, platformAdmin, controller.web.adminPlan.destroy);
|
||||
// Chrome 插件的集中配置:只维护「前缀 / 生效站点 / 模板」,单号正则由服务端生成
|
||||
router.get('/api/web/admin/extension', apiAuth, platformAdmin, controller.web.adminExtension.show);
|
||||
router.put('/api/web/admin/extension', apiAuth, platformAdmin, controller.web.adminExtension.update);
|
||||
|
||||
217
backend/app/service/admin_plan.js
Normal file
217
backend/app/service/admin_plan.js
Normal file
@ -0,0 +1,217 @@
|
||||
'use strict';
|
||||
|
||||
const { Service } = require('egg');
|
||||
|
||||
/** 续期天数上限(10 年):防止手滑把 365 写成 3650 以外的离谱值 */
|
||||
const MAX_DAYS = 3650;
|
||||
/** DECIMAL(10,2) 能放下的最大值 */
|
||||
const MAX_MONEY = 99999999.99;
|
||||
const CODE_PATTERN = /^[A-Za-z0-9_-]{2,32}$/;
|
||||
|
||||
/**
|
||||
* 平台管理员:续期套餐维护(`/api/web/admin/plans`)
|
||||
*
|
||||
* 续期下单**只认库里的套餐价**(见 `service/subject_order.js`),所以这里改价 / 改天数不用发版。
|
||||
* - 列表带**已下架**套餐:页面要能把下架的重新上架;
|
||||
* - `code` 是稳定标识(历史订单会快照 `plan_code`),**创建后不能改**;
|
||||
* - 删除是软删;只想让用户端不再展示,用「下架」就够了(历史订单不受影响)。
|
||||
*/
|
||||
class AdminPlanService extends Service {
|
||||
get Plan() {
|
||||
return this.app.model.SubjectPlan;
|
||||
}
|
||||
|
||||
/** 全部套餐(含已下架),按 sort 升序 */
|
||||
async list() {
|
||||
const rows = await this.Plan.findAll({
|
||||
order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]],
|
||||
});
|
||||
return rows.map(row => this.present(row));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新建套餐
|
||||
* @param {object} body { code?, name, days, price, originalPrice?, tag?, description?, sort?, status? }
|
||||
*/
|
||||
async create(body = {}) {
|
||||
const payload = this.normalize(body);
|
||||
|
||||
if (payload.code) {
|
||||
await this.assertCodeFree(payload.code, null);
|
||||
} else {
|
||||
payload.code = await this.uniqueCode(payload.days);
|
||||
}
|
||||
|
||||
const row = await this.Plan.create(payload);
|
||||
this.ctx.logger.info('[admin] 新增套餐:id=%s code=%s price=%s', row.id, payload.code, payload.price);
|
||||
return this.present(row);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改套餐(只改传了的字段;`code` 不可改)
|
||||
* @param {number|string} id
|
||||
* @param {object} body
|
||||
*/
|
||||
async update(id, body = {}) {
|
||||
const row = await this.findPlan(id);
|
||||
const payload = this.normalize(body, row);
|
||||
|
||||
await row.update(payload);
|
||||
this.ctx.logger.info('[admin] 修改套餐:id=%s(%s)', row.id, JSON.stringify(payload));
|
||||
return this.present(row);
|
||||
}
|
||||
|
||||
/** 删除套餐(软删;历史订单已快照套餐信息,不受影响) */
|
||||
async remove(id) {
|
||||
const row = await this.findPlan(id);
|
||||
await row.destroy();
|
||||
this.ctx.logger.info('[admin] 删除套餐:id=%s code=%s', row.id, row.code);
|
||||
return { id: Number(row.id) };
|
||||
}
|
||||
|
||||
/** 按 id 取套餐,不存在 404 */
|
||||
async findPlan(id) {
|
||||
const planId = Number(id);
|
||||
if (!Number.isInteger(planId) || planId <= 0) this.ctx.throw(400, 'id 必须是正整数');
|
||||
|
||||
const row = await this.Plan.findByPk(planId);
|
||||
if (!row) this.ctx.throw(404, '套餐不存在');
|
||||
return row;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并整理字段
|
||||
*
|
||||
* `base` 为空 = 新建(必填项必须传齐);传了原行 = 更新(只校验 / 整理传了的字段)。
|
||||
*/
|
||||
normalize(rawBody = {}, base = null) {
|
||||
const body = Object.assign({}, rawBody);
|
||||
const has = key => Object.prototype.hasOwnProperty.call(body, key);
|
||||
const data = {};
|
||||
|
||||
// 新建时补齐可选项的默认值(更新时空缺 = 不改)
|
||||
if (!base) {
|
||||
if (body.status === undefined || body.status === null) body.status = 1;
|
||||
if (body.sort === undefined || body.sort === null) body.sort = 0;
|
||||
if (body.tag === undefined) body.tag = null;
|
||||
if (body.description === undefined) body.description = null;
|
||||
if (body.originalPrice === undefined) body.originalPrice = null;
|
||||
}
|
||||
|
||||
if (!base || has('code')) {
|
||||
const code = body.code === undefined || body.code === null ? '' : String(body.code).trim();
|
||||
if (base) {
|
||||
if (code && code !== String(base.code)) this.ctx.throw(409, '套餐编码创建后不能修改');
|
||||
} else if (code) {
|
||||
if (!CODE_PATTERN.test(code)) this.ctx.throw(422, '套餐编码只能包含字母、数字、下划线、短横线(2~32 位)');
|
||||
data.code = code;
|
||||
}
|
||||
}
|
||||
|
||||
if (!base || has('name')) {
|
||||
const name = body.name === undefined || body.name === null ? '' : String(body.name).trim();
|
||||
if (!name) this.ctx.throw(422, '请填写套餐名称');
|
||||
if (name.length > 64) this.ctx.throw(422, '套餐名称不能超过 64 个字符');
|
||||
data.name = name;
|
||||
}
|
||||
|
||||
if (!base || has('days')) {
|
||||
const days = Number(body.days);
|
||||
if (!Number.isInteger(days) || days <= 0) this.ctx.throw(422, '续期天数必须是正整数');
|
||||
if (days > MAX_DAYS) this.ctx.throw(422, `续期天数不能超过 ${MAX_DAYS} 天`);
|
||||
data.days = days;
|
||||
}
|
||||
|
||||
if (!base || has('price')) {
|
||||
data.price = this.money(body.price, '售价');
|
||||
}
|
||||
|
||||
if (!base || has('originalPrice')) {
|
||||
const raw = body.originalPrice;
|
||||
data.originalPrice = raw === undefined || raw === null || raw === '' ? null : this.money(raw, '划线原价');
|
||||
}
|
||||
|
||||
if (!base || has('tag')) {
|
||||
const tag = body.tag === undefined || body.tag === null ? '' : String(body.tag).trim();
|
||||
if (tag.length > 16) this.ctx.throw(422, '角标文案不能超过 16 个字符');
|
||||
data.tag = tag || null;
|
||||
}
|
||||
|
||||
if (!base || has('description')) {
|
||||
const description = body.description === undefined || body.description === null ? '' : String(body.description).trim();
|
||||
if (description.length > 255) this.ctx.throw(422, '副标题说明不能超过 255 个字符');
|
||||
data.description = description || null;
|
||||
}
|
||||
|
||||
if (!base || has('sort')) {
|
||||
const sort = Number(body.sort);
|
||||
if (!Number.isInteger(sort) || sort < 0) this.ctx.throw(422, '排序必须是非负整数');
|
||||
if (sort > 9999) this.ctx.throw(422, '排序不能超过 9999');
|
||||
data.sort = sort;
|
||||
}
|
||||
|
||||
if (!base || has('status')) {
|
||||
const status = Number(body.status);
|
||||
if (status !== 0 && status !== 1) this.ctx.throw(422, '状态只能是 1(上架)或 0(下架)');
|
||||
data.status = status;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
/** 金额:非负数字,保留两位小数 */
|
||||
money(value, label) {
|
||||
const num = Number(value);
|
||||
if (!Number.isFinite(num)) this.ctx.throw(422, `${label}必须是数字`);
|
||||
if (num < 0) this.ctx.throw(422, `${label}不能小于 0`);
|
||||
if (num > MAX_MONEY) this.ctx.throw(422, `${label}过大`);
|
||||
return Math.round(num * 100) / 100;
|
||||
}
|
||||
|
||||
/** 编码不能重复(含软删的行,避免撞唯一索引) */
|
||||
async assertCodeFree(code, id) {
|
||||
const existing = await this.Plan.findOne({ where: { code }, paranoid: false });
|
||||
if (existing && Number(existing.id) !== Number(id)) this.ctx.throw(409, `套餐编码「${code}」已存在`);
|
||||
}
|
||||
|
||||
/** 没填 code 时按天数生成:p30、p180…重复了就加后缀 */
|
||||
async uniqueCode(days) {
|
||||
const base = `p${days}`;
|
||||
let code = base;
|
||||
for (let i = 2; i <= 99; i++) {
|
||||
const existing = await this.Plan.findOne({ where: { code }, paranoid: false });
|
||||
if (!existing) return code;
|
||||
code = `${base}-${i}`;
|
||||
}
|
||||
this.ctx.throw(409, '同名套餐过多,请手动填写套餐编码');
|
||||
}
|
||||
|
||||
/** 展示字段(固定 camelCase) */
|
||||
present(row) {
|
||||
const price = Number(row.price);
|
||||
const original = row.originalPrice === null || row.originalPrice === undefined
|
||||
? null
|
||||
: Number(row.originalPrice);
|
||||
const status = Number(row.status) === 1 ? 1 : 0;
|
||||
const days = Number(row.days);
|
||||
|
||||
return {
|
||||
id: Number(row.id),
|
||||
code: row.code,
|
||||
name: row.name,
|
||||
days,
|
||||
price,
|
||||
originalPrice: original,
|
||||
tag: row.tag || null,
|
||||
description: row.description || null,
|
||||
sort: Number(row.sort),
|
||||
status,
|
||||
statusText: status === 1 ? '上架' : '下架',
|
||||
pricePerDay: days > 0 ? Math.round((price / days) * 100) / 100 : null,
|
||||
createdAt: row.createdAt || null,
|
||||
updatedAt: row.updatedAt || null,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = AdminPlanService;
|
||||
@ -63,6 +63,12 @@ describe('test/app/controller/admin.test.js', () => {
|
||||
async findAndCountAll() { return { rows: [], count: 0 }; },
|
||||
async findOne() { return null; },
|
||||
},
|
||||
SubjectPlan: {
|
||||
async findAll() { return []; },
|
||||
async findOne() { return null; },
|
||||
async findByPk() { return null; },
|
||||
async create(fields) { return instance(Object.assign({ id: 11 }, fields)); },
|
||||
},
|
||||
transaction: async () => ({
|
||||
LOCK: { UPDATE: 'UPDATE' },
|
||||
async commit() {},
|
||||
@ -115,6 +121,8 @@ describe('test/app/controller/admin.test.js', () => {
|
||||
await app.httpRequest().get('/api/web/admin/members').set(auth()).expect(403);
|
||||
await app.httpRequest().get('/api/web/admin/orders').set(auth()).expect(403);
|
||||
await app.httpRequest().post('/api/web/admin/orders/SO1/confirm').set(auth()).send({}).expect(403);
|
||||
await app.httpRequest().get('/api/web/admin/plans').set(auth()).expect(403);
|
||||
await app.httpRequest().post('/api/web/admin/plans').set(auth()).send({ name: '30 天', days: 30, price: 99 }).expect(403);
|
||||
});
|
||||
|
||||
it('平台管理员(表里登记):GET /api/web/admin/me 返回 admin=true', async () => {
|
||||
@ -449,4 +457,97 @@ describe('test/app/controller/admin.test.js', () => {
|
||||
'重复确认不能再加天数',
|
||||
);
|
||||
});
|
||||
|
||||
it('GET /api/web/admin/plans:全部套餐(含下架),带状态文案与折合每天单价', async () => {
|
||||
grantByTable({
|
||||
SubjectPlan: {
|
||||
async findAll() {
|
||||
return [
|
||||
instance({
|
||||
id: 1, code: 'p30', name: '30 天', days: 30, price: '99.00', originalPrice: null,
|
||||
tag: null, description: null, sort: 10, status: 1,
|
||||
}),
|
||||
instance({
|
||||
id: 2, code: 'p180', name: '180 天', days: 180, price: '499.00', originalPrice: '594.00',
|
||||
tag: '推荐', description: '半年', sort: 20, status: 0,
|
||||
}),
|
||||
];
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const res = await app.httpRequest().get('/api/web/admin/plans').set(auth()).expect(200);
|
||||
const list = res.body.data.list;
|
||||
assert(list.length === 2 && res.body.data.total === 2, JSON.stringify(res.body.data));
|
||||
assert(list[0].price === 99 && list[0].pricePerDay === 3.3, JSON.stringify(list[0]));
|
||||
assert(list[1].status === 0 && list[1].statusText === '下架', JSON.stringify(list[1]));
|
||||
assert(list[1].originalPrice === 594 && list[1].tag === '推荐', JSON.stringify(list[1]));
|
||||
});
|
||||
|
||||
it('POST /api/web/admin/plans:必填校验 / 自动生成编码 / 201', async () => {
|
||||
let created = null;
|
||||
grantByTable({
|
||||
SubjectPlan: {
|
||||
async findOne() { return null; },
|
||||
async create(fields) {
|
||||
created = fields;
|
||||
return instance(Object.assign({ id: 11, createdAt: new Date(), updatedAt: new Date() }, fields));
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await app.httpRequest().post('/api/web/admin/plans').set(auth())
|
||||
.send({ days: 30, price: 99 }).expect(422);
|
||||
await app.httpRequest().post('/api/web/admin/plans').set(auth())
|
||||
.send({ name: '30 天', days: 0, price: 99 }).expect(422);
|
||||
await app.httpRequest().post('/api/web/admin/plans').set(auth())
|
||||
.send({ name: '30 天', days: 30, price: -1 }).expect(422);
|
||||
|
||||
const res = await app.httpRequest().post('/api/web/admin/plans').set(auth())
|
||||
.send({ name: '30 天', days: 30, price: '99.5', sort: 10 }).expect(201);
|
||||
|
||||
assert(created && created.code === 'p30', `没填 code 时按天数生成:${JSON.stringify(created)}`);
|
||||
assert(created.price === 99.5 && created.status === 1 && created.sort === 10, JSON.stringify(created));
|
||||
assert(res.body.data.name === '30 天' && res.body.data.pricePerDay === 3.32, JSON.stringify(res.body.data));
|
||||
});
|
||||
|
||||
it('PUT /api/web/admin/plans/:id:改价 / 上下架;code 不可改;不存在 404', async () => {
|
||||
const plan = instance({
|
||||
id: 2, code: 'p180', name: '180 天', days: 180, price: 499,
|
||||
originalPrice: 594, tag: '推荐', description: null, sort: 20, status: 1,
|
||||
});
|
||||
grantByTable({
|
||||
SubjectPlan: {
|
||||
async findByPk(id) { return Number(id) === 2 ? plan : null; },
|
||||
},
|
||||
});
|
||||
|
||||
const res = await app.httpRequest().put('/api/web/admin/plans/2').set(auth())
|
||||
.send({ price: 459, status: 0 }).expect(200);
|
||||
assert(res.body.data.price === 459 && res.body.data.status === 0, JSON.stringify(res.body.data));
|
||||
assert(res.body.data.days === 180, '没传的字段不能被清掉');
|
||||
|
||||
await app.httpRequest().put('/api/web/admin/plans/2').set(auth())
|
||||
.send({ code: 'p365' }).expect(409);
|
||||
await app.httpRequest().put('/api/web/admin/plans/99').set(auth())
|
||||
.send({ price: 1 }).expect(404);
|
||||
});
|
||||
|
||||
it('DELETE /api/web/admin/plans/:id:软删;不存在 404', async () => {
|
||||
let destroyed = 0;
|
||||
const plan = instance({
|
||||
id: 2, code: 'p180', name: '180 天', days: 180, price: 499, status: 1, sort: 20,
|
||||
});
|
||||
plan.destroy = async () => { destroyed += 1; };
|
||||
grantByTable({
|
||||
SubjectPlan: {
|
||||
async findByPk(id) { return Number(id) === 2 ? plan : null; },
|
||||
},
|
||||
});
|
||||
|
||||
const res = await app.httpRequest().delete('/api/web/admin/plans/2').set(auth()).expect(200);
|
||||
assert(destroyed === 1 && res.body.data.id === 2, JSON.stringify(res.body));
|
||||
|
||||
await app.httpRequest().delete('/api/web/admin/plans/9').set(auth()).expect(404);
|
||||
});
|
||||
});
|
||||
|
||||
@ -153,3 +153,57 @@ export function fetchAdminOrders(params: {
|
||||
export function confirmAdminOrder(orderNo: string): Promise<{ duplicated: boolean; order: AdminOrderItem }> {
|
||||
return api.post(`/api/web/admin/orders/${encodeURIComponent(orderNo)}/confirm`, {});
|
||||
}
|
||||
|
||||
/** 续期套餐(平台视角:含已下架) */
|
||||
export interface AdminPlanItem {
|
||||
id: number;
|
||||
/** 稳定编码(历史订单会快照;创建后不可改) */
|
||||
code: string;
|
||||
name: string;
|
||||
days: number;
|
||||
price: number;
|
||||
originalPrice: number | null;
|
||||
tag: string | null;
|
||||
description: string | null;
|
||||
sort: number;
|
||||
/** 1 上架 0 下架 */
|
||||
status: number;
|
||||
statusText: string;
|
||||
/** 折合每天多少钱(展示用) */
|
||||
pricePerDay: number | null;
|
||||
createdAt?: string | null;
|
||||
updatedAt?: string | null;
|
||||
}
|
||||
|
||||
/** 套餐入参:新建要 `name/days/price`;修改只传要改的字段(`code` 不可改) */
|
||||
export interface AdminPlanInput {
|
||||
code?: string;
|
||||
name?: string;
|
||||
days?: number;
|
||||
price?: number;
|
||||
originalPrice?: number | null;
|
||||
tag?: string | null;
|
||||
description?: string | null;
|
||||
sort?: number;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
/** 全部套餐(含已下架) */
|
||||
export function fetchAdminPlans(): Promise<{ list: AdminPlanItem[]; total: number }> {
|
||||
return api.get('/api/web/admin/plans');
|
||||
}
|
||||
|
||||
/** 新建套餐(不传 `code` 时服务端按天数自动生成,如 `p30`) */
|
||||
export function createAdminPlan(body: AdminPlanInput): Promise<AdminPlanItem> {
|
||||
return api.post('/api/web/admin/plans', body);
|
||||
}
|
||||
|
||||
/** 修改套餐(只传要改的字段) */
|
||||
export function updateAdminPlan(id: number, body: AdminPlanInput): Promise<AdminPlanItem> {
|
||||
return api.put(`/api/web/admin/plans/${id}`, body);
|
||||
}
|
||||
|
||||
/** 删除套餐(软删;只想下架请用 updateAdminPlan 改 status=0) */
|
||||
export function removeAdminPlan(id: number): Promise<{ id: number }> {
|
||||
return api.del(`/api/web/admin/plans/${id}`);
|
||||
}
|
||||
|
||||
@ -55,11 +55,12 @@ const menus = computed(() => allMenus.filter(item => {
|
||||
|
||||
/**
|
||||
* 平台管理菜单:**只有平台管理员**能看到(与主体管理员是两套权限)
|
||||
* 这三个页面看的是「所有主体 / 所有订单 / 所有平台管理员」,不需要选主体。
|
||||
* 这些页面看的是「所有主体 / 所有订单 / 续期套餐 / 所有平台管理员」,不需要选主体。
|
||||
*/
|
||||
const platformMenus = [
|
||||
{ to: '/admin/subjects', label: '主体管理' },
|
||||
{ to: '/admin/orders', label: '订单管理' },
|
||||
{ to: '/admin/plans', label: '套餐管理' },
|
||||
{ to: '/admin/members', label: '管理员' },
|
||||
{ to: '/admin/extension', label: '插件配置' },
|
||||
];
|
||||
|
||||
@ -11,7 +11,7 @@ import { ensurePlatformAdmin } from '@/composables/usePlatformAdmin';
|
||||
* `meta.adminOnly = true`:业务数据页(设备 / 录像机 / 摄像头 / 工作台 / 扫码记录),
|
||||
* **只有主体管理员**能进;普通成员直接跳回首页并提示(后端同名接口也返回 403)。
|
||||
*
|
||||
* `meta.platformAdmin = true`:**平台管理员**页面(主体管理 / 订单管理 / 管理员),
|
||||
* `meta.platformAdmin = true`:**平台管理员**页面(主体管理 / 订单管理 / 套餐管理 / 管理员 / 插件配置),
|
||||
* 不看主体、不需要选主体;不是平台管理员直接跳回首页(后端同名接口返回 403)。
|
||||
*/
|
||||
const routes: RouteRecordRaw[] = [
|
||||
@ -54,6 +54,13 @@ const routes: RouteRecordRaw[] = [
|
||||
component: () => import('@/views/AdminOrdersView.vue'),
|
||||
meta: { allowNoSubject: true, platformAdmin: true },
|
||||
},
|
||||
// 续期套餐:改天数 / 改价 / 上下架(下单只认库里的价格,不用发版)
|
||||
{
|
||||
path: '/admin/plans',
|
||||
name: 'admin-plans',
|
||||
component: () => import('@/views/AdminPlansView.vue'),
|
||||
meta: { allowNoSubject: true, platformAdmin: true },
|
||||
},
|
||||
{
|
||||
path: '/admin/members',
|
||||
name: 'admin-members',
|
||||
|
||||
374
frontend/src/views/AdminPlansView.vue
Normal file
374
frontend/src/views/AdminPlansView.vue
Normal file
@ -0,0 +1,374 @@
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 平台管理 · 套餐管理(续期套餐的天数 / 定价 / 上下架)
|
||||
*
|
||||
* 接口:`GET/POST /api/web/admin/plans`、`PUT/DELETE /api/web/admin/plans/:id`
|
||||
* 鉴权:平台管理员。
|
||||
*
|
||||
* 续期下单**只按库里的 `price` 计算金额**,所以改价 / 改天数不用发版;
|
||||
* 历史订单已快照 `plan_code / plan_name / days / amount`,改价、下架、删除都不影响对账。
|
||||
*/
|
||||
import { computed, onMounted, reactive, ref } from 'vue';
|
||||
import AppLayout from '@/components/AppLayout.vue';
|
||||
import ModalBox from '@/components/ModalBox.vue';
|
||||
import { ApiError } from '@/api/client';
|
||||
import {
|
||||
createAdminPlan,
|
||||
fetchAdminPlans,
|
||||
removeAdminPlan,
|
||||
updateAdminPlan,
|
||||
type AdminPlanInput,
|
||||
type AdminPlanItem,
|
||||
} from '@/api/admin';
|
||||
|
||||
const list = ref<AdminPlanItem[]>([]);
|
||||
const loading = ref(false);
|
||||
const error = ref('');
|
||||
const ok = ref('');
|
||||
/** 正在上下架的套餐 id(按钮禁用用) */
|
||||
const busyId = ref(0);
|
||||
|
||||
async function load() {
|
||||
loading.value = true;
|
||||
error.value = '';
|
||||
try {
|
||||
const data = await fetchAdminPlans();
|
||||
list.value = data.list;
|
||||
} catch (err) {
|
||||
error.value = err instanceof ApiError ? err.message : '加载失败';
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
/** 金额展示:¥99 / ¥2.77;没有就 — */
|
||||
function money(value: number | null | undefined): string {
|
||||
if (value === null || value === undefined) return '—';
|
||||
return `¥${Number(value)}`;
|
||||
}
|
||||
|
||||
// ---------------- 新增 / 编辑 ----------------
|
||||
interface PlanForm {
|
||||
name: string;
|
||||
days: number | string;
|
||||
price: number | string;
|
||||
originalPrice: number | string;
|
||||
tag: string;
|
||||
description: string;
|
||||
sort: number | string;
|
||||
status: number;
|
||||
}
|
||||
|
||||
const formOpen = ref(false);
|
||||
/** null = 新增 */
|
||||
const editing = ref<AdminPlanItem | null>(null);
|
||||
const form = reactive<PlanForm>(blankForm());
|
||||
/** 新建时可选手填编码(留空由服务端按天数生成) */
|
||||
const codeInput = ref('');
|
||||
const saving = ref(false);
|
||||
|
||||
function blankForm(): PlanForm {
|
||||
return {
|
||||
name: '',
|
||||
days: 30,
|
||||
price: '',
|
||||
originalPrice: '',
|
||||
tag: '',
|
||||
description: '',
|
||||
sort: 0,
|
||||
status: 1,
|
||||
};
|
||||
}
|
||||
|
||||
function fillForm(row: AdminPlanItem) {
|
||||
form.name = row.name;
|
||||
form.days = row.days;
|
||||
form.price = row.price;
|
||||
form.originalPrice = row.originalPrice === null ? '' : row.originalPrice;
|
||||
form.tag = row.tag || '';
|
||||
form.description = row.description || '';
|
||||
form.sort = row.sort;
|
||||
form.status = row.status;
|
||||
}
|
||||
|
||||
function openCreate() {
|
||||
ok.value = '';
|
||||
error.value = '';
|
||||
editing.value = null;
|
||||
Object.assign(form, blankForm());
|
||||
// 新套餐默认排在最后
|
||||
form.sort = list.value.length ? Math.max(...list.value.map(item => item.sort)) + 10 : 10;
|
||||
codeInput.value = '';
|
||||
formOpen.value = true;
|
||||
}
|
||||
|
||||
function openEdit(row: AdminPlanItem) {
|
||||
ok.value = '';
|
||||
error.value = '';
|
||||
editing.value = row;
|
||||
fillForm(row);
|
||||
codeInput.value = row.code;
|
||||
formOpen.value = true;
|
||||
}
|
||||
|
||||
function closeForm() {
|
||||
if (saving.value) return;
|
||||
formOpen.value = false;
|
||||
}
|
||||
|
||||
const canSave = computed(() => {
|
||||
if (!form.name.trim()) return false;
|
||||
if (!Number.isInteger(Number(form.days)) || Number(form.days) <= 0) return false;
|
||||
if (!Number.isFinite(Number(form.price)) || Number(form.price) < 0) return false;
|
||||
if (form.originalPrice !== '' && (!Number.isFinite(Number(form.originalPrice)) || Number(form.originalPrice) < 0)) return false;
|
||||
if (!Number.isInteger(Number(form.sort)) || Number(form.sort) < 0) return false;
|
||||
return true;
|
||||
});
|
||||
|
||||
async function save() {
|
||||
if (!canSave.value) return;
|
||||
|
||||
const body: AdminPlanInput = {
|
||||
name: form.name.trim(),
|
||||
days: Number(form.days),
|
||||
price: Number(form.price),
|
||||
originalPrice: form.originalPrice === '' ? null : Number(form.originalPrice),
|
||||
tag: form.tag.trim() || null,
|
||||
description: form.description.trim() || null,
|
||||
sort: Number(form.sort),
|
||||
status: form.status,
|
||||
};
|
||||
|
||||
saving.value = true;
|
||||
error.value = '';
|
||||
ok.value = '';
|
||||
try {
|
||||
if (editing.value) {
|
||||
const updated = await updateAdminPlan(editing.value.id, body);
|
||||
ok.value = `套餐「${updated.name}」已保存`;
|
||||
} else {
|
||||
const code = codeInput.value.trim();
|
||||
if (code) body.code = code;
|
||||
const created = await createAdminPlan(body);
|
||||
ok.value = `套餐「${created.name}」已新增(编码 ${created.code})`;
|
||||
}
|
||||
formOpen.value = false;
|
||||
await load();
|
||||
} catch (err) {
|
||||
error.value = err instanceof ApiError ? err.message : '保存失败';
|
||||
} finally {
|
||||
saving.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
/** 上架 / 下架:只改 status,用户端「续期」里立刻看不到 / 重新出现 */
|
||||
async function toggleStatus(row: AdminPlanItem) {
|
||||
busyId.value = row.id;
|
||||
error.value = '';
|
||||
ok.value = '';
|
||||
try {
|
||||
const next = row.status === 1 ? 0 : 1;
|
||||
const updated = await updateAdminPlan(row.id, { status: next });
|
||||
ok.value = `套餐「${updated.name}」已${updated.status === 1 ? '上架' : '下架'}`;
|
||||
await load();
|
||||
} catch (err) {
|
||||
error.value = err instanceof ApiError ? err.message : '操作失败';
|
||||
} finally {
|
||||
busyId.value = 0;
|
||||
}
|
||||
}
|
||||
|
||||
async function remove(row: AdminPlanItem) {
|
||||
const tip = `确认删除套餐「${row.name}」?\n\n`
|
||||
+ '删除后「主体续期」里不再显示;历史订单已经快照了套餐信息,不受影响。\n'
|
||||
+ '如果只是暂时不想卖,建议用「下架」。';
|
||||
if (!window.confirm(tip)) return;
|
||||
|
||||
busyId.value = row.id;
|
||||
error.value = '';
|
||||
ok.value = '';
|
||||
try {
|
||||
await removeAdminPlan(row.id);
|
||||
ok.value = `套餐「${row.name}」已删除`;
|
||||
await load();
|
||||
} catch (err) {
|
||||
error.value = err instanceof ApiError ? err.message : '删除失败';
|
||||
} finally {
|
||||
busyId.value = 0;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AppLayout fill>
|
||||
<template #title>套餐管理</template>
|
||||
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
<div v-if="ok" class="alert alert-ok">{{ ok }}</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="toolbar toolbar-wrap">
|
||||
<button class="btn" @click="openCreate">新增套餐</button>
|
||||
<span class="hint toolbar-tip">
|
||||
续期下单只按这里的「售价」算钱,改完立刻生效(不用发版)。历史订单已快照套餐信息,改价 / 下架不影响已付款订单。
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap">
|
||||
<table class="table table-list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>套餐</th>
|
||||
<th style="width: 90px">天数</th>
|
||||
<th style="width: 130px">售价</th>
|
||||
<th style="width: 100px">划线原价</th>
|
||||
<th style="width: 100px">角标</th>
|
||||
<th style="width: 80px">排序</th>
|
||||
<th style="width: 90px">状态</th>
|
||||
<th style="width: 190px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="row in list" :key="row.id">
|
||||
<td>
|
||||
<div class="cell-main">
|
||||
<b>{{ row.name }}</b>
|
||||
<code class="muted">{{ row.code }}</code>
|
||||
</div>
|
||||
<div v-if="row.description" class="cell-sub">{{ row.description }}</div>
|
||||
</td>
|
||||
<td>{{ row.days }} 天</td>
|
||||
<td>
|
||||
<b>{{ money(row.price) }}</b>
|
||||
<span v-if="row.pricePerDay !== null" class="cell-sub">折合 {{ money(row.pricePerDay) }} / 天</span>
|
||||
</td>
|
||||
<td class="muted">{{ money(row.originalPrice) }}</td>
|
||||
<td>
|
||||
<span v-if="row.tag" class="badge badge-warn">{{ row.tag }}</span>
|
||||
<span v-else class="hint">—</span>
|
||||
</td>
|
||||
<td class="muted">{{ row.sort }}</td>
|
||||
<td>
|
||||
<span :class="['badge', row.status === 1 ? 'badge-ok' : 'badge-off']">{{ row.statusText }}</span>
|
||||
</td>
|
||||
<td>
|
||||
<button class="btn btn-ghost btn-sm" @click="openEdit(row)">编辑</button>
|
||||
<button
|
||||
class="btn btn-ghost btn-sm"
|
||||
:disabled="busyId === row.id"
|
||||
@click="toggleStatus(row)"
|
||||
>{{ row.status === 1 ? '下架' : '上架' }}</button>
|
||||
<button
|
||||
class="btn btn-danger btn-sm"
|
||||
:disabled="busyId === row.id"
|
||||
@click="remove(row)"
|
||||
>删除</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="!list.length">
|
||||
<td colspan="8" class="hint">{{ loading ? '加载中…' : '还没有套餐,点「新增套餐」创建。' }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新增 / 编辑套餐 -->
|
||||
<ModalBox :open="formOpen" :title="editing ? `编辑套餐 · ${editing.name}` : '新增套餐'" width="560px" @close="closeForm">
|
||||
<div class="form-grid">
|
||||
<label class="field span-2">
|
||||
<span>套餐名称</span>
|
||||
<input v-model="form.name" maxlength="64" placeholder="如:180 天" />
|
||||
</label>
|
||||
|
||||
<label v-if="!editing" class="field span-2">
|
||||
<span>套餐编码(留空自动生成,如 p30)</span>
|
||||
<input v-model="codeInput" maxlength="32" placeholder="可选:字母 / 数字 / _ / -,创建后不可改" />
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>续期天数</span>
|
||||
<input v-model="form.days" type="number" min="1" max="3650" />
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>排序(小的在前)</span>
|
||||
<input v-model="form.sort" type="number" min="0" max="9999" />
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>售价(元)</span>
|
||||
<input v-model="form.price" type="number" min="0" step="0.01" placeholder="下单金额只按这个算" />
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>划线原价(可选)</span>
|
||||
<input v-model="form.originalPrice" type="number" min="0" step="0.01" placeholder="留空则展示原价" />
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>角标文案(可选,≤16 字)</span>
|
||||
<input v-model="form.tag" maxlength="16" placeholder="如:推荐 / 最划算" />
|
||||
</label>
|
||||
|
||||
<label class="field">
|
||||
<span>状态</span>
|
||||
<select v-model.number="form.status">
|
||||
<option :value="1">上架</option>
|
||||
<option :value="0">下架(用户端不再显示)</option>
|
||||
</select>
|
||||
</label>
|
||||
|
||||
<label class="field span-2">
|
||||
<span>副标题说明(可选)</span>
|
||||
<input v-model="form.description" maxlength="255" placeholder="如:半年,折合 ¥2.77 / 天" />
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p v-if="editing" class="hint">套餐编码 <code>{{ editing.code }}</code> 是历史订单的快照标识,创建后不能修改。</p>
|
||||
|
||||
<template #footer>
|
||||
<button class="btn btn-ghost" :disabled="saving" @click="closeForm">取消</button>
|
||||
<button class="btn" :disabled="saving || !canSave" @click="save">{{ saving ? '保存中…' : '保存' }}</button>
|
||||
</template>
|
||||
</ModalBox>
|
||||
</AppLayout>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.toolbar-tip {
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.cell-main {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.cell-sub {
|
||||
display: block;
|
||||
margin-top: 2px;
|
||||
font-size: 12px;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.form-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 0 12px;
|
||||
}
|
||||
|
||||
.span-2 {
|
||||
grid-column: span 2;
|
||||
}
|
||||
</style>
|
||||
Loading…
x
Reference in New Issue
Block a user