前端:接入旧页面的样式体系(登录面板 / 折角切换 / 列表填充高度)
从后端模板迁过来的样式现在真正用上了,并修掉两处不一致:
- 登录页:.panel-switch + .pane-account / .pane-wechat + 右上角 .corner-toggle 三角形切换;
字段改成无 label 的 .field-plain + 悬浮 .tip;验证码用 .input-row 与按钮同行。
- 找回 / 重置密码页:同样换成 .field-plain 紧凑字段。
- 列表页(设备管理 / 扫码记录):AppLayout 支持 fill → 内容区加 .content-fill,
表格包进 .table-wrap → 卡片撑满剩余高度、表头吸顶、只有表格内部滚动、分页贴底。
- 卡片间距交给 .card + .card;测试页结果区改用全局 .json-box 与 .sub-title。
- ⚠️ 修 bug:「注册」标签下注册面板不显示 —— 登录与注册共用 .pane-account,
但 CSS 只写了 .is-login .pane-account / .is-register .pane-register(后者没有对应元素);
同时给 .is-register 补上 padding-top,避免折角三角形压住第一个输入框。
- 顺带去掉不再需要的内联 margin。
验证:vue-tsc + vite build 通过;浏览器实测三个面板都能切换(注册面板 5 个字段可见、
三角形不压输入框),两个列表页 content-fill 生效、整页不滚动、表格内部滚动且表头 sticky。
This commit is contained in:
parent
bd2363bf00
commit
19f1daf7db
26
README.md
26
README.md
@ -49,6 +49,32 @@ packService/
|
||||
|
||||
后端接口细节见 [`backend/README.md`](backend/README.md),扩展用法见 [`extension/README.md`](extension/README.md)。
|
||||
|
||||
## 前端页面风格约定(`frontend/`)
|
||||
|
||||
页面的样式规则集中在 `frontend/src/styles/main.css`,各页只写自己的局部样式。**新增页面请照下面这套来**(都是前端迁移时逐条定下来的):
|
||||
|
||||
- **登录 / 注册 / 找回密码 / 重置密码 / 扫码确认**这类「裸页」:居中卡片(`.bare-page` + `.bare-card`,宽 360px)。
|
||||
- ⚠️ 外层**不要用 `align-items: center`**:卡片比视口高时顶部会被裁掉且滚不上去 —— 用 `.bare-card { margin: auto }` 让它在容器里自己居中,`overflow-y: auto` 兜底;
|
||||
- **表单字段不用 `<label>`**(会把卡片撑高):字段名写进 `placeholder`,「必填 + 说明」用**悬浮气泡** `.field-plain > .tip`(`position: absolute` + `opacity/visibility`,hover 或聚焦时才显示,**不参与布局**,所以显不显示都不改变页面高度);
|
||||
- **登录页版面**:顶部「登录 / 注册」两个 tab;**扫码**面板由右上角三角形 `.corner-toggle` 切换,三角形挂在 `.panel-switch` 容器上(与输入框右边缘对齐),容器 `padding-top: 38px` 给它留位;`.is-login` / `.is-wechat` 用 `min-height: 300px` 定成**同高** → 来回切卡片高度与位置不变;
|
||||
- 扫码面板**只放二维码 + 返回入口**,不要写说明文字;二维码是后端本地画的 SVG(`/api/wechat/qrcode.svg?code=…`,**没有任何外链资源**);
|
||||
- 三角形只在自己那块折角区域可点(`clip-path` 把命中区一起裁了)→ 自动化点击要点在折角内(如 right-10 / top+10),点元素中心会落空;
|
||||
- **注册字段顺序固定**:用户名 → 邮箱 → 邮箱验证码(右侧「获取验证码」按钮,同一行 `.input-row`)→ 密码 → 重复密码;单列排布、没有步骤小标题、不收昵称/手机号;
|
||||
- **后台页(测试页 / 个人中心)的表单**保留 `label + placeholder` 的写法(字段多、需要一直可见),列表页与表单页共用 `.card`(卡片间距由 `.card + .card` 统一);
|
||||
- **列表页**(设备管理 / 扫码记录)用 `<AppLayout fill>`:内容区不滚动、卡片吃掉剩余高度、只有 `.table-wrap` 内部滚动(表头 `position: sticky` 吸顶、分页条贴在卡片底部);表单/详情页不传 `fill`,滚动落在内容区,侧边栏底部始终可见;
|
||||
- **接口调用**一律走 `api/client.ts`(自动带 `Authorization: Bearer`、401 自动清令牌)+ `api/web.ts`;**不用 cookie/session,也就不需要 CSRF**;
|
||||
- **扫码头像期**:前端要自己设客户端超时(服务端挂 60s,客户端 70s),切走面板 / 离开页面(`pagehide`)时要 `abort()` 长轮询 —— 后端会立刻停止等待(见 `backend/README.md` 长轮询一节)。
|
||||
|
||||
### 前端常用命令
|
||||
|
||||
```bash
|
||||
cd frontend
|
||||
npm run dev # 7301(VITE_PORT 可覆盖)
|
||||
npm run typecheck # vue-tsc --noEmit
|
||||
npm run build # typecheck + vite build(产物 dist/,后端生产模式托管)
|
||||
```
|
||||
|
||||
|
||||
## 常用环境变量
|
||||
|
||||
| 变量 | 默认值 | 作用 |
|
||||
|
||||
@ -545,7 +545,7 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
- 邮件正文由 `service.mail.sendResetLink()` 生成(与验证码同一套开发模式/SMTP 逻辑:未配 `SMTP_HOST` 时链接写日志 + 接口返回 `url`,前端直接给个可点链接,方便本地点开);
|
||||
- 链接地址默认取当前请求的 host,正式部署建议配 `SITE_URL`(有反代/多域名时更可靠);
|
||||
- 待加固(按需):JWT 是无状态的,重置密码后**旧令牌在过期前仍然有效**(要立即失效可给 `users` 加 `password_changed_at`,鉴权中间件里比对);
|
||||
- **扫码登录**(`app/service/wechat_login.js`):前端登录页在「账号密码 / 注册 / 扫码」三个 tab 之间切(扫码 tab 里就是二维码 + 提示):
|
||||
- **扫码登录**(`app/service/wechat_login.js`):前端登录页顶部是「登录 / 注册」两个 tab,**扫码**用右上角的三角形切换(挂在一个 `.panel-switch` 容器上,和输入框右边缘对齐;登录/扫码面板定成同高,切换时卡片高度不变):
|
||||
- **串码**:服务端生成 **6 位数字 + 字母**随机串码(`WECHAT_CODE_LENGTH`,字符集去掉了 0/O/1/I 等易混字符),写进 Redis `packs:wechat:state:<code>` = `pending`(TTL `WECHAT_STATE_TTL`);
|
||||
- **二维码内容 = 本站地址**:`http://<域名>/wechat?spm=1.0.<code>.1`(spm 格式由 `WECHAT_SPM_PATTERN` 决定);二维码图片本身用零依赖的 `qrcode-generator` 现场画成 **SVG**(`GET /api/wechat/qrcode.svg?code=…`)——**不需要任何外链资源**;
|
||||
- **完整时序**(都是我们自己的接口,不需要第三方 JS/iframe):
|
||||
|
||||
@ -3,6 +3,12 @@
|
||||
import { useRouter } from 'vue-router';
|
||||
import { clearToken, currentUser, displayName } from '@/composables/useAuth';
|
||||
|
||||
/**
|
||||
* fill = true:列表页用 —— 内容区不滚动,卡片吃掉剩余高度,只有表格内部滚动(表头吸顶、分页贴底)
|
||||
* 默认 false:表单/详情页 —— 滚动落在内容区
|
||||
*/
|
||||
withDefaults(defineProps<{ fill?: boolean }>(), { fill: false });
|
||||
|
||||
const router = useRouter();
|
||||
|
||||
const menus = [
|
||||
@ -37,7 +43,7 @@ function logout() {
|
||||
<slot name="title">控制台</slot>
|
||||
<span class="muted">云仓视频溯源系统</span>
|
||||
</header>
|
||||
<section class="content">
|
||||
<section :class="['content', { 'content-fill': fill }]">
|
||||
<slot />
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@ -125,20 +125,136 @@ select:focus {
|
||||
}
|
||||
|
||||
/* 登录/找回密码这类「裸页」:居中卡片 */
|
||||
/* ⚠️ 不要用 align-items:center:卡片比视口高时顶部会被裁掉且滚不上去 → 用 margin:auto 把卡片推居中 */
|
||||
.bare-page {
|
||||
min-height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 24px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.bare-card {
|
||||
width: 380px;
|
||||
width: 360px;
|
||||
max-width: 100%;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
/* 业务页布局:左侧菜单 + 内容区 */
|
||||
/* ---------------- 登录页的面板切换(账号密码 ↔ 微信扫码) ----------------
|
||||
· 面板都放在同一个 .panel-switch 容器里,靠 is-login / is-register / is-wechat 决定显示哪个;
|
||||
· 登录与扫码用 padding-top + min-height 定成同高 → 切换时卡片高度/位置不变;
|
||||
· 右上角的三角形 .corner-toggle 挂在容器上,和输入框右边缘对齐(不是页面右上角)。 */
|
||||
.panel-switch {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* 登录(含注册)与扫码面板都要给右上角三角形留出 38px,登录/扫码再定成同高 */
|
||||
.panel-switch.is-login,
|
||||
.panel-switch.is-register,
|
||||
.panel-switch.is-wechat {
|
||||
padding-top: 38px;
|
||||
}
|
||||
|
||||
.panel-switch.is-login,
|
||||
.panel-switch.is-wechat {
|
||||
min-height: 300px;
|
||||
}
|
||||
|
||||
.pane {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* ⚠️ 登录与注册共用同一个 .pane-account(面板内再用 tab 切表单),所以 is-register 也要显示它;
|
||||
如果只按「账号面板 / 注册面板」两套元素写选择器,点「注册」会一片空白(那个元素并不存在) */
|
||||
.panel-switch.is-login .pane-account,
|
||||
.panel-switch.is-register .pane-account,
|
||||
.panel-switch.is-wechat .pane-wechat {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* 三角形只在自己那块折角区域内可点(clip-path 会把命中区一起裁掉) */
|
||||
.corner-toggle {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
width: 38px;
|
||||
height: 38px;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
cursor: pointer;
|
||||
background: #eef2ff;
|
||||
color: var(--brand);
|
||||
clip-path: polygon(100% 0, 100% 100%, 0 0);
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.corner-toggle:hover {
|
||||
background: #e0e7ff;
|
||||
}
|
||||
|
||||
.corner-toggle svg {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
margin: 5px 5px 0 0;
|
||||
fill: currentColor;
|
||||
}
|
||||
|
||||
/* ---------------- 无 label 的紧凑字段(登录 / 注册 / 找回 / 重置) ----------------
|
||||
字段名写进 placeholder;「必填 + 说明」用悬浮气泡 —— 绝对定位、hover 或聚焦才显示,
|
||||
显示/移除都不参与布局,所以不会把卡片撑高。 */
|
||||
.field-plain {
|
||||
position: relative;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.field-plain input {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.field-plain .tip {
|
||||
position: absolute;
|
||||
top: -17px;
|
||||
right: 2px;
|
||||
max-width: 100%;
|
||||
padding: 2px 8px;
|
||||
border-radius: 999px;
|
||||
background: #fff;
|
||||
border: 1px solid var(--border);
|
||||
box-shadow: 0 2px 8px rgba(15, 23, 42, 0.08);
|
||||
color: var(--text-muted);
|
||||
font-size: 12px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
transition: opacity 0.12s ease;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.field-plain:hover .tip,
|
||||
.field-plain:focus-within .tip {
|
||||
opacity: 1;
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.field-plain .required {
|
||||
color: var(--danger);
|
||||
}
|
||||
|
||||
/* 输入框 + 右侧按钮(如「获取验证码」)同一行 */
|
||||
.input-row {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.input-row input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* ---------------- 业务页布局:左侧菜单 + 内容区 ---------------- */
|
||||
.layout {
|
||||
display: flex;
|
||||
height: 100%;
|
||||
@ -310,3 +426,63 @@ th {
|
||||
background: #fef2f2;
|
||||
border-color: #fecaca;
|
||||
}
|
||||
|
||||
/* ---------------- 列表页:占满高度,滚动只在表格内部(整页不滚动) ----------------
|
||||
AppLayout 传 fill 时给内容区加 .content-fill:
|
||||
卡片撑满剩余高度(只有一两条数据也撑满)→ 表头吸顶、分页固定在卡片底部。 */
|
||||
.content-fill {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.content-fill > .card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.content-fill .table-wrap {
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.table-wrap > .table {
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
/* border-collapse:collapse 下 sticky 会丢边框 → 用 box-shadow 补一条 */
|
||||
.table-wrap > .table > thead th {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 2;
|
||||
background: #f9fafb;
|
||||
box-shadow: inset 0 -1px 0 var(--border);
|
||||
}
|
||||
|
||||
/* ---------------- 卡片间距与 JSON 输出 ---------------- */
|
||||
.card + .card {
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.sub-title {
|
||||
margin: 18px 0 4px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.json-box {
|
||||
margin: 12px 0 0;
|
||||
max-height: 320px;
|
||||
overflow: auto;
|
||||
padding: 12px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
background: #f9fafb;
|
||||
color: var(--text);
|
||||
font: 12px/1.6 ui-monospace, SFMono-Regular, Consolas, monospace;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
@ -95,7 +95,7 @@ onMounted(() => load(1));
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AppLayout>
|
||||
<AppLayout fill>
|
||||
<template #title>设备管理</template>
|
||||
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
@ -108,6 +108,7 @@ onMounted(() => load(1));
|
||||
<span class="hint">共 {{ total }} 台</span>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap">
|
||||
<table class="table table-list">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -168,6 +169,7 @@ onMounted(() => load(1));
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="pager">
|
||||
<button class="btn btn-ghost btn-sm" :disabled="page <= 1 || loading" @click="load(page - 1)">上一页</button>
|
||||
|
||||
@ -35,32 +35,45 @@ async function submit() {
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
|
||||
<template v-if="!sent">
|
||||
<p class="hint" style="margin-top: 0">填写注册邮箱,我们会发一条重置链接(30 分钟内有效)</p>
|
||||
<form @submit.prevent="submit">
|
||||
<label class="field">
|
||||
<span>邮箱</span>
|
||||
<input v-model="email" type="email" placeholder="you@example.com" />
|
||||
</label>
|
||||
<button class="btn" style="width: 100%" :disabled="busy">发送重置链接</button>
|
||||
<div class="field-plain">
|
||||
<span class="tip">必填 · 注册时使用的邮箱</span>
|
||||
<input v-model="email" type="email" autocomplete="email" placeholder="邮箱" />
|
||||
</div>
|
||||
<button class="btn btn-block" :disabled="busy">发送重置链接</button>
|
||||
</form>
|
||||
</template>
|
||||
|
||||
<template v-else>
|
||||
<div class="alert alert-ok">如果该邮箱已注册,重置链接已经发出,请查收邮件。</div>
|
||||
<p v-if="devUrl" class="hint" style="word-break: break-all">
|
||||
<div class="alert alert-ok">如果该邮箱已注册,重置链接已经发出,请查收(30 分钟内有效)。</div>
|
||||
<p v-if="devUrl" class="hint break-all">
|
||||
开发模式(未配 SMTP),直接点这里:<a :href="devUrl">打开重置页</a>
|
||||
</p>
|
||||
</template>
|
||||
|
||||
<p class="hint"><RouterLink :to="{ name: 'login' }">返回登录</RouterLink></p>
|
||||
<p class="hint center"><RouterLink :to="{ name: 'login' }">返回登录</RouterLink></p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.title {
|
||||
margin: 0 0 12px;
|
||||
margin: 0 0 14px;
|
||||
font-size: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.btn-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
margin: 12px 0 0;
|
||||
}
|
||||
|
||||
/* 开发模式回显的重置链接很长,允许断行,否则会撑破卡片 */
|
||||
.break-all {
|
||||
word-break: break-all;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -49,7 +49,7 @@ onMounted(async () => {
|
||||
</RouterLink>
|
||||
</div>
|
||||
|
||||
<div class="card" style="margin-top: 16px">
|
||||
<div class="card">
|
||||
<h3>最近一次扫码</h3>
|
||||
<table v-if="stats.latestRecord" class="table">
|
||||
<tbody>
|
||||
|
||||
@ -1,10 +1,16 @@
|
||||
<script setup lang="ts">
|
||||
/**
|
||||
* 登录页:账号密码登录 / 注册(邮箱验证码)/ 微信扫码登录
|
||||
* 登录页:账号密码 / 注册(邮箱验证码)/ 微信扫码
|
||||
*
|
||||
* 全部走 JSON 接口(`/api/web/auth/*`、`/api/wechat/*`),登录成功把令牌存本地,不带 cookie。
|
||||
* 版面按既定风格:
|
||||
* - 顶部「登录 / 注册」两个 tab 切换;
|
||||
* - **扫码** 用右上角三角形 `.corner-toggle` 切换(挂在 `.panel-switch` 容器上,和输入框右边缘对齐);
|
||||
* - 登录与扫码面板定成**同高**,来回切卡片高度/位置不变;扫码面板只留二维码 + 返回入口,不放多余说明;
|
||||
* - 字段**不用 label**:字段名写进 placeholder,「必填 + 说明」用悬浮气泡(绝对定位,不占布局)。
|
||||
*
|
||||
* 全部走 JSON 接口,登录成功把令牌存本地(`Authorization: Bearer`,不带 cookie)。
|
||||
*/
|
||||
import { onBeforeUnmount, onMounted, reactive, ref } from 'vue';
|
||||
import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { api, ApiError } from '@/api/client';
|
||||
import { setSession, type CurrentUser } from '@/composables/useAuth';
|
||||
@ -12,6 +18,7 @@ import { setSession, type CurrentUser } from '@/composables/useAuth';
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
||||
/** 账号密码面板(登录 / 注册)与扫码面板,靠右上角三角形切换 */
|
||||
type Tab = 'login' | 'register' | 'wechat';
|
||||
const tab = ref<Tab>('login');
|
||||
const busy = ref(false);
|
||||
@ -22,6 +29,11 @@ const loginForm = reactive({ account: '', password: '' });
|
||||
const registerForm = reactive({ username: '', email: '', code: '', password: '', confirmPassword: '' });
|
||||
const codeSent = ref(false);
|
||||
|
||||
/** 面板 class:交给 CSS 决定显示哪个(`.panel-switch.is-xxx .pane-xxx`) */
|
||||
const paneClass = computed(() =>
|
||||
tab.value === 'wechat' ? 'is-wechat' : tab.value === 'register' ? 'is-register' : 'is-login',
|
||||
);
|
||||
|
||||
function go() {
|
||||
const target = typeof route.query.redirect === 'string' ? route.query.redirect : '/';
|
||||
router.replace(target.startsWith('/') && !target.startsWith('//') ? target : '/');
|
||||
@ -96,19 +108,18 @@ async function doRegister() {
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- 扫码登录(长轮询) ----------------
|
||||
// ---------------- 扫码登录(长轮询,60s 挂起 + 客户端 70s 超时) ----------------
|
||||
const qrUrl = ref('');
|
||||
const qrCode = ref('');
|
||||
const qrTip = ref('');
|
||||
let polling = false;
|
||||
let abort: AbortController | null = null;
|
||||
|
||||
async function startWechat() {
|
||||
error.value = '';
|
||||
qrUrl.value = '';
|
||||
qrCode.value = '';
|
||||
qrTip.value = '';
|
||||
try {
|
||||
const data = await api.get<{ code: string; qrUrl: string }>('/api/wechat/login', { auth: false });
|
||||
qrCode.value = data.code;
|
||||
qrUrl.value = data.qrUrl;
|
||||
poll(data.code);
|
||||
} catch (err) {
|
||||
@ -137,110 +148,150 @@ async function poll(code: string) {
|
||||
go();
|
||||
return;
|
||||
}
|
||||
if (data.code) {
|
||||
if (data.status === 'refreshed' && data.code) {
|
||||
current = data.code;
|
||||
qrCode.value = data.code;
|
||||
qrUrl.value = data.qrUrl;
|
||||
qrTip.value = '二维码已刷新,请重新扫码';
|
||||
}
|
||||
} catch {
|
||||
if (!polling) return; // 切走面板时主动 abort,不用提示
|
||||
failures += 1;
|
||||
if (failures > 5) {
|
||||
error.value = '连接中断,请刷新重试';
|
||||
polling = false;
|
||||
return;
|
||||
}
|
||||
qrTip.value = '连接中断,正在重试…';
|
||||
await new Promise(resolve => setTimeout(resolve, 800));
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 停止轮询并断开请求:服务端会立刻结束挂起(不会白等 60 秒) */
|
||||
function stopWechat() {
|
||||
polling = false;
|
||||
abort?.abort();
|
||||
}
|
||||
|
||||
function switchTab(next: Tab) {
|
||||
stopWechat();
|
||||
if (next === tab.value) return;
|
||||
if (tab.value === 'wechat') stopWechat();
|
||||
error.value = '';
|
||||
ok.value = '';
|
||||
qrTip.value = '';
|
||||
tab.value = next;
|
||||
if (next === 'wechat') startWechat();
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('pagehide', stopWechat);
|
||||
if (route.query.mode === 'wechat') switchTab('wechat');
|
||||
if (route.query.mode === 'register') tab.value = 'register';
|
||||
else if (route.query.mode === 'register') tab.value = 'register';
|
||||
});
|
||||
|
||||
onBeforeUnmount(stopWechat);
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('pagehide', stopWechat);
|
||||
stopWechat();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="bare-page">
|
||||
<div class="card bare-card">
|
||||
<h1 class="brand-line">云仓视频溯源系统</h1>
|
||||
<div class="brand-line">云仓视频溯源系统</div>
|
||||
|
||||
<div class="tabs">
|
||||
<button :class="['tab', { active: tab === 'login' }]" @click="switchTab('login')">登录</button>
|
||||
<button :class="['tab', { active: tab === 'register' }]" @click="switchTab('register')">注册</button>
|
||||
<button :class="['tab', { active: tab === 'wechat' }]" @click="switchTab('wechat')">扫码</button>
|
||||
</div>
|
||||
<div :class="['panel-switch', paneClass]">
|
||||
<!-- 扫码 ↔ 账号密码:右上角三角形(与输入框右边缘对齐) -->
|
||||
<button
|
||||
v-if="tab === 'wechat'"
|
||||
class="corner-toggle"
|
||||
type="button"
|
||||
title="返回账号密码登录"
|
||||
aria-label="返回账号密码登录"
|
||||
@click="switchTab('login')"
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 20h4v-4H4v4zm0-6h4v-4H4v4zm6 6h4v-4h-4v4zm-6-12h4V4H4v4zm6 0h4V4h-4v4zm6 12h4v-4h-4v4zm-5-1h8v2h-8v-2zm4-9h4V4h-4v4zm-9-1h10v2H6V9z"/></svg>
|
||||
</button>
|
||||
<button
|
||||
v-else
|
||||
class="corner-toggle"
|
||||
type="button"
|
||||
title="用微信扫码登录"
|
||||
aria-label="用微信扫码登录"
|
||||
@click="switchTab('wechat')"
|
||||
>
|
||||
<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M4 4h6v6H4V4zm10 0h6v6h-6V4zM4 14h6v6H4v-6zm9 1h2v2h-2v-2zm3 0h2v2h-2v-2zm-3 3h2v2h-2v-2zm3 0h2v2h-2v-2z"/></svg>
|
||||
</button>
|
||||
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
<div v-if="ok" class="alert alert-ok">{{ ok }}</div>
|
||||
|
||||
<!-- 登录 -->
|
||||
<form v-if="tab === 'login'" @submit.prevent="doLogin">
|
||||
<label class="field">
|
||||
<span>账号(用户名 / 手机号 / 邮箱)</span>
|
||||
<input v-model="loginForm.account" autocomplete="username" placeholder="admin" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>密码</span>
|
||||
<input v-model="loginForm.password" type="password" autocomplete="current-password" placeholder="******" />
|
||||
</label>
|
||||
<button class="btn" style="width: 100%" :disabled="busy">登录</button>
|
||||
<p class="hint" style="margin-top: 12px">
|
||||
<RouterLink :to="{ name: 'forgot' }">忘记密码?</RouterLink>
|
||||
</p>
|
||||
</form>
|
||||
|
||||
<!-- 注册 -->
|
||||
<form v-else-if="tab === 'register'" @submit.prevent="doRegister">
|
||||
<label class="field">
|
||||
<span>用户名</span>
|
||||
<input v-model="registerForm.username" placeholder="3-32 位字母、数字或下划线" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>邮箱</span>
|
||||
<input v-model="registerForm.email" type="email" placeholder="用于接收验证码" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>邮箱验证码</span>
|
||||
<div style="display: flex; gap: 8px">
|
||||
<input v-model="registerForm.code" style="flex: 1" placeholder="6 位验证码" />
|
||||
<button class="btn btn-ghost" type="button" :disabled="busy" @click="sendCode">
|
||||
{{ codeSent ? '重新发送' : '获取验证码' }}
|
||||
</button>
|
||||
<!-- 账号密码 / 注册 -->
|
||||
<div class="pane pane-account">
|
||||
<div class="tabs">
|
||||
<button :class="['tab', { active: tab === 'login' }]" type="button" @click="switchTab('login')">登录</button>
|
||||
<button :class="['tab', { active: tab === 'register' }]" type="button" @click="switchTab('register')">注册</button>
|
||||
</div>
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>密码</span>
|
||||
<input v-model="registerForm.password" type="password" placeholder="至少 6 位" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>重复密码</span>
|
||||
<input v-model="registerForm.confirmPassword" type="password" placeholder="再输一次" />
|
||||
</label>
|
||||
<button class="btn" style="width: 100%" :disabled="busy">注册并登录</button>
|
||||
</form>
|
||||
|
||||
<!-- 扫码 -->
|
||||
<div v-else class="qr">
|
||||
<img v-if="qrUrl" :src="qrUrl" width="200" height="200" alt="登录二维码" />
|
||||
<p v-else class="hint">二维码生成中…</p>
|
||||
<p class="hint">用已登录的手机扫码确认,本页会自动登录(码过期会自动换新)</p>
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
<div v-if="ok" class="alert alert-ok">{{ ok }}</div>
|
||||
|
||||
<!-- 登录 -->
|
||||
<form v-if="tab === 'login'" @submit.prevent="doLogin">
|
||||
<div class="field-plain">
|
||||
<span class="tip">必填 · 用户名 / 手机号 / 邮箱都行</span>
|
||||
<input v-model="loginForm.account" autocomplete="username" placeholder="账号(用户名 / 手机号 / 邮箱)" />
|
||||
</div>
|
||||
<div class="field-plain">
|
||||
<span class="tip">必填 · 密码</span>
|
||||
<input v-model="loginForm.password" type="password" autocomplete="current-password" placeholder="密码" />
|
||||
</div>
|
||||
<button class="btn btn-block" :disabled="busy">登录</button>
|
||||
<p class="hint center">
|
||||
<RouterLink :to="{ name: 'forgot' }">忘记密码?</RouterLink>
|
||||
</p>
|
||||
</form>
|
||||
|
||||
<!-- 注册(字段顺序:用户名 → 邮箱 → 邮箱验证码 → 密码 → 重复密码) -->
|
||||
<form v-else @submit.prevent="doRegister">
|
||||
<div class="field-plain">
|
||||
<span class="tip"><span class="required">必填</span> · 3-32 位字母、数字或下划线</span>
|
||||
<input v-model="registerForm.username" autocomplete="username" placeholder="用户名" />
|
||||
</div>
|
||||
<div class="field-plain">
|
||||
<span class="tip"><span class="required">必填</span> · 用于接收验证码,也能当登录账号</span>
|
||||
<input v-model="registerForm.email" type="email" autocomplete="email" placeholder="邮箱" />
|
||||
</div>
|
||||
<div class="field-plain">
|
||||
<span class="tip"><span class="required">必填</span> · 邮箱收到的 6 位验证码</span>
|
||||
<div class="input-row">
|
||||
<input v-model="registerForm.code" inputmode="numeric" placeholder="邮箱验证码" />
|
||||
<button class="btn btn-ghost" type="button" :disabled="busy" @click="sendCode">
|
||||
{{ codeSent ? '重新发送' : '获取验证码' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field-plain">
|
||||
<span class="tip"><span class="required">必填</span> · 至少 6 位</span>
|
||||
<input v-model="registerForm.password" type="password" autocomplete="new-password" placeholder="密码" />
|
||||
</div>
|
||||
<div class="field-plain">
|
||||
<span class="tip"><span class="required">必填</span> · 再输一次密码</span>
|
||||
<input v-model="registerForm.confirmPassword" type="password" autocomplete="new-password" placeholder="重复密码" />
|
||||
</div>
|
||||
<button class="btn btn-block" :disabled="busy">注册并登录</button>
|
||||
<p class="hint center">
|
||||
已有账号?<a href="#" @click.prevent="switchTab('login')">直接登录</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- 扫码(不放多余说明:二维码 + 返回入口) -->
|
||||
<div class="pane pane-wechat">
|
||||
<img v-if="qrUrl" class="qr-img" :src="qrUrl" width="160" height="160" alt="登录二维码" />
|
||||
<p v-else class="hint center">二维码生成中…</p>
|
||||
<p v-if="qrTip" class="hint center qr-tip">{{ qrTip }}</p>
|
||||
<p class="hint center"><a href="#" @click.prevent="switchTab('login')">返回账号密码登录</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -250,13 +301,16 @@ onBeforeUnmount(stopWechat);
|
||||
.brand-line {
|
||||
margin: 0 0 14px;
|
||||
font-size: 20px;
|
||||
font-weight: 600;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
margin-bottom: 16px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
.tab {
|
||||
flex: 1;
|
||||
border: 1px solid var(--border);
|
||||
@ -266,16 +320,39 @@ onBeforeUnmount(stopWechat);
|
||||
cursor: pointer;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.tab.active {
|
||||
border-color: var(--brand);
|
||||
color: var(--brand);
|
||||
font-weight: 600;
|
||||
}
|
||||
.qr {
|
||||
|
||||
.btn-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
}
|
||||
.qr img {
|
||||
|
||||
.hint.center {
|
||||
margin: 12px 0 0;
|
||||
}
|
||||
|
||||
.pane-wechat {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.qr-img {
|
||||
width: 160px;
|
||||
height: 160px;
|
||||
padding: 6px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
border-radius: 10px;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.qr-tip {
|
||||
margin-top: 10px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -74,7 +74,7 @@ onMounted(async () => {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AppLayout>
|
||||
<AppLayout fill>
|
||||
<template #title>扫码记录</template>
|
||||
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
@ -94,6 +94,7 @@ onMounted(async () => {
|
||||
<span class="hint">共 {{ total }} 条</span>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap">
|
||||
<table class="table table-list">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -117,6 +118,7 @@ onMounted(async () => {
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="pager">
|
||||
<button class="btn btn-ghost btn-sm" :disabled="page <= 1 || loading" @click="load(page - 1)">上一页</button>
|
||||
|
||||
@ -45,27 +45,36 @@ async function submit() {
|
||||
<template v-else>
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
<form @submit.prevent="submit">
|
||||
<label class="field">
|
||||
<span>新密码</span>
|
||||
<input v-model="password" type="password" placeholder="至少 6 位" />
|
||||
</label>
|
||||
<label class="field">
|
||||
<span>重复新密码</span>
|
||||
<input v-model="confirmPassword" type="password" placeholder="再输一次" />
|
||||
</label>
|
||||
<button class="btn" style="width: 100%" :disabled="busy">提交</button>
|
||||
<div class="field-plain">
|
||||
<span class="tip">必填 · 至少 6 位</span>
|
||||
<input v-model="password" type="password" autocomplete="new-password" placeholder="新密码" />
|
||||
</div>
|
||||
<div class="field-plain">
|
||||
<span class="tip">必填 · 再输一次新密码</span>
|
||||
<input v-model="confirmPassword" type="password" autocomplete="new-password" placeholder="重复密码" />
|
||||
</div>
|
||||
<button class="btn btn-block" :disabled="busy">提交</button>
|
||||
</form>
|
||||
</template>
|
||||
|
||||
<p class="hint"><RouterLink :to="{ name: 'login' }">返回登录</RouterLink></p>
|
||||
<p class="hint center"><RouterLink :to="{ name: 'login' }">返回登录</RouterLink></p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.title {
|
||||
margin: 0 0 12px;
|
||||
margin: 0 0 14px;
|
||||
font-size: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.btn-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
margin: 12px 0 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -137,6 +137,7 @@ const apiToken = ref(getToken());
|
||||
<button class="btn" :disabled="deviceBusy" @click="doDeviceLogin">扫码登录</button>
|
||||
|
||||
<div v-if="loginResult" class="result">
|
||||
<h4 class="sub-title">返回结果</h4>
|
||||
<p class="hint">
|
||||
{{ loginResult.sn }} · {{ loginResult.firstTime ? '首次注册' : '已存在' }} ·
|
||||
归属:{{ loginResult.user ? (loginResult.user.nickname || loginResult.user.username) : '—' }}
|
||||
@ -149,7 +150,7 @@ const apiToken = ref(getToken());
|
||||
</div>
|
||||
|
||||
<!-- ② 模拟中控上报 -->
|
||||
<div class="card" style="margin-top: 16px">
|
||||
<div class="card">
|
||||
<h3>② 模拟中控上报</h3>
|
||||
<p class="hint">拿①里的 SN + 长期 JWT 上报一条扫码记录(与真机 <code>/api/scan/records</code> 同一套校验)。</p>
|
||||
<div class="form-grid">
|
||||
@ -165,11 +166,14 @@ const apiToken = ref(getToken());
|
||||
</label>
|
||||
<button class="btn" :disabled="scanBusy" @click="doScanReport">上报</button>
|
||||
|
||||
<pre v-if="scanResult" class="json-box">{{ JSON.stringify(scanResult, null, 2) }}</pre>
|
||||
<template v-if="scanResult">
|
||||
<h4 class="sub-title">返回结果</h4>
|
||||
<pre class="json-box">{{ JSON.stringify(scanResult, null, 2) }}</pre>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- ③ 模拟扫码授权 -->
|
||||
<div class="card" style="margin-top: 16px">
|
||||
<div class="card">
|
||||
<h3>③ 模拟扫码授权(AJAX)</h3>
|
||||
<p class="hint">
|
||||
填电脑端登录页的 6 位码(或整条 <code>/wechat?spm=…</code> 地址):
|
||||
@ -186,7 +190,7 @@ const apiToken = ref(getToken());
|
||||
</div>
|
||||
|
||||
<!-- 当前账号令牌 -->
|
||||
<div class="card" style="margin-top: 16px">
|
||||
<div class="card">
|
||||
<h3>当前账号的用户令牌</h3>
|
||||
<p class="hint">
|
||||
接口鉴权 <b>只看 header</b>(<code>Authorization: Bearer <token></code>),不看 cookie,
|
||||
@ -221,15 +225,7 @@ textarea {
|
||||
width: 100%;
|
||||
background: #fff;
|
||||
}
|
||||
.json-box {
|
||||
margin: 12px 0 0;
|
||||
padding: 12px;
|
||||
background: #0f172a;
|
||||
color: #e2e8f0;
|
||||
border-radius: 8px;
|
||||
font: 12px/1.6 ui-monospace, SFMono-Regular, Consolas, monospace;
|
||||
overflow-x: auto;
|
||||
}
|
||||
/* 结果区用全局 .json-box(浅色、可滚动),令牌框用浅灰底 */
|
||||
.token-box {
|
||||
background: #f9fafb;
|
||||
}
|
||||
|
||||
@ -49,10 +49,8 @@ async function confirm() {
|
||||
<div v-else-if="!code" class="alert alert-error">登录码格式不对,请重新扫码。</div>
|
||||
<template v-else>
|
||||
<div v-if="error" class="alert alert-error">{{ error }}</div>
|
||||
<p class="hint" style="margin-top: 0">
|
||||
扫的是 <b>云仓视频溯源系统</b> 的登录二维码({{ code }}),确认后电脑端会立即登录。
|
||||
</p>
|
||||
<button class="btn" style="width: 100%" :disabled="busy" @click="confirm">确认登录</button>
|
||||
<p class="code-line">登录码 <code>{{ code }}</code></p>
|
||||
<button class="btn btn-block" :disabled="busy" @click="confirm">确认登录</button>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
@ -60,8 +58,18 @@ async function confirm() {
|
||||
|
||||
<style scoped>
|
||||
.title {
|
||||
margin: 0 0 12px;
|
||||
margin: 0 0 14px;
|
||||
font-size: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.btn-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.code-line {
|
||||
margin: 0 0 14px;
|
||||
text-align: center;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user