From 0431271ffff63657934a7c407b7b5333391b12f9 Mon Sep 17 00:00:00 2001
From: zm2000 <18386612143@163.com>
Date: Fri, 4 Sep 2026 20:44:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E3=80=81?=
=?UTF-8?q?=E6=89=93=E5=8C=85=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/request/apis.js | 32 +++++
core/router/index.js | 10 +-
core/utils/auth-guard.js | 7 +-
core/utils/auth.js | 12 ++
env.js | 4 +-
pages.json | 7 +
pages/login/index.vue | 204 ++++++++++++++++++++++++++++-
pages/packing/packMode.vue | 260 +++++++++++++++++++++++++++++++++++++
8 files changed, 526 insertions(+), 10 deletions(-)
create mode 100644 pages/packing/packMode.vue
diff --git a/core/request/apis.js b/core/request/apis.js
index 9ced2fb..3d82843 100644
--- a/core/request/apis.js
+++ b/core/request/apis.js
@@ -2,6 +2,16 @@
* 接口列表文件
*/
export default {
+ /** 系统(免登录) ↓ **/
+ index: {
+ // 工作台登录码登录:wms_workbench.login_code 命中返回工作台 token(免登录、免鉴权)
+ LoginWorkbenchByCode: {
+ path: "index.LoginWorkbenchByCode",
+ auth: false,
+ method: "POST",
+ isSystemApi: true
+ }
+ },
/** 公共 ↓ **/
common: {
ping: {
@@ -92,6 +102,28 @@ export default {
isSystemApi: true
}
},
+ /** 工作台 ↓ **/
+ workbench: {
+ list: {
+ path: "workbench.list",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
+ // 用工作台 token 获取工作台信息(免登录、免鉴权):token 无效/不存在返回 403
+ getWorkbenchInfo: {
+ path: "workbench.getWorkbenchInfo",
+ auth: false,
+ method: "POST",
+ isSystemApi: true
+ },
+ bindMember: {
+ path: "workbench.bindMember",
+ auth: false,
+ method: "POST",
+ isSystemApi: true
+ }
+ },
storage: {
receiving: {
getReceivingList: {
diff --git a/core/router/index.js b/core/router/index.js
index cd62a49..965c425 100644
--- a/core/router/index.js
+++ b/core/router/index.js
@@ -6,7 +6,8 @@ import {
import store from '@/core/store'
import {
getToken,
- removeToken
+ removeToken,
+ isWorkbenchSession
} from '@/core/utils/auth'
const router = createRouter({
platform: process.env.VUE_APP_PLATFORM,
@@ -59,6 +60,13 @@ const router = createRouter({
//全局路由前置守卫
router.beforeEach(async (to, from, next) => {
const hasToken = getToken();
+
+ // 工作台会话(token = workbenchToken):不做用户态校验,不调用 user.info
+ if (hasToken && isWorkbenchSession()) {
+ console.log('工作台会话放行:', to.path);
+ next();
+ return;
+ }
if (hasToken) {
console.log("去哪里",to);
diff --git a/core/utils/auth-guard.js b/core/utils/auth-guard.js
index aa303e7..86ae510 100644
--- a/core/utils/auth-guard.js
+++ b/core/utils/auth-guard.js
@@ -1,4 +1,4 @@
-import { getToken, removeToken } from '@/core/utils/auth'
+import { getToken, removeToken, isWorkbenchSession } from '@/core/utils/auth'
export const LOGIN_URL = '/pages/login/index'
export const HOME_URL = '/pages/index/index'
@@ -126,6 +126,11 @@ export async function ensureEntry(store, forceValidate = false) {
const token = getToken()
const currentRoute = getCurrentRoute()
+ // 工作台会话:跳过用户态校验,不调用 user.info;保持当前打包模式页不跳首页
+ if (isWorkbenchSession()) {
+ return { loggedIn: true }
+ }
+
if (!token) {
if (!currentRoute || !isLoginRoute(currentRoute)) {
await goLogin()
diff --git a/core/utils/auth.js b/core/utils/auth.js
index 6fad43e..7ce5a70 100644
--- a/core/utils/auth.js
+++ b/core/utils/auth.js
@@ -1,5 +1,7 @@
const TokenKey = 'token'
+const WorkbenchTokenKey = 'workbenchToken'
+
export function getToken() {
return uni.getStorageSync(TokenKey);
}
@@ -11,4 +13,14 @@ export function setToken(token) {
export function removeToken() {
return uni.setStorageSync(TokenKey,'');
+}
+
+/**
+ * 是否为工作台会话:全局 token 与工作台 token(workbenchToken)一致
+ * 工作台会话下不做用户态校验,不调用 user.info
+ */
+export function isWorkbenchSession() {
+ const token = getToken();
+ const workbenchToken = uni.getStorageSync(WorkbenchTokenKey);
+ return !!token && !!workbenchToken && token === workbenchToken;
}
\ No newline at end of file
diff --git a/env.js b/env.js
index b87b72a..c33f58a 100644
--- a/env.js
+++ b/env.js
@@ -1,4 +1,4 @@
-export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
-// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
+// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
+export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
export const API_URL = `${BASE_URL}/system` //后台接口域名
export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
diff --git a/pages.json b/pages.json
index 1eedd0a..d884de5 100644
--- a/pages.json
+++ b/pages.json
@@ -272,6 +272,13 @@
"titleNView": false
}
},
+ {
+ "path" : "pages/packing/packMode",
+ "style" :
+ {
+ "titleNView": false
+ }
+ },
{
"path" : "pages/replenishment/replenishShorts",
"style" :
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 39cda00..eaa51e4 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -2,7 +2,7 @@
@@ -50,15 +50,29 @@
- PDA扫描工牌登录
+ PDA扫描登录
+
+
+
+
+
@@ -164,6 +178,11 @@ export default {
username: '',
password: ''
},
+ workbenchCode: '',
+ workbenchLogining: false, // wblc 登录请求防重入锁
+ workbenchInputFocus: false, // 工作台登录码输入框自动聚焦(从打包模式退出回来时)
+ showWorkbenchLogin: false, // 工作台登录码输入框显隐(隐藏入口:连续点击5次标题切换)
+ workbenchTitleTapCount: 0, // 系统标题连点计数(满5次切换工作台登录码输入框显隐)
}
},
onLoad() {
@@ -186,7 +205,37 @@ export default {
},
onShow() {
this.scanning = true;
- this.$store.dispatch('broadcast/resume');
+ // 每次回到本页(reLaunch 重建 / 从其它页面返回)都重新绑定最新回调并确保广播监听
+ this.$store.dispatch('broadcast/setCallbacks', {
+ onResult: this.handleBroadcastResult
+ });
+ this.$store.dispatch('broadcast/start');
+ // 诊断日志:真机复现时确认接收器是否在监听
+ this.$store.dispatch('broadcast/getStatus').then((status) => {
+ console.log('[Login][bcast] onShow 广播状态:', JSON.stringify(status));
+ });
+ // 兜底:reLaunch 往返时旧页面(如 packMode)onUnload 的 stop 可能晚于本页 start,
+ // 把刚注册的接收器注销掉;延迟复查,若未在监听则重新 start,确保二次扫码可用
+ setTimeout(() => {
+ this.$store.dispatch('broadcast/getStatus').then((status) => {
+ const listening = !!(status && (status.moduleActive || status.isListening));
+ if (!listening) {
+ console.warn('[Login][bcast] 广播未在监听,延迟重启接收器');
+ this.$store.dispatch('broadcast/start');
+ }
+ });
+ }, 1200);
+ // 从打包模式退出回来:自动聚焦可见的“工作台登录码”输入框,
+ // 枪扫内容(键盘模拟)直接落入该框,回车即登录,无需再手动点输入框
+ if (uni.getStorageSync('loginAutoFocusScan') == 1) {
+ uni.removeStorageSync('loginAutoFocusScan');
+ this.$nextTick(() => {
+ setTimeout(() => {
+ this.workbenchInputFocus = true;
+ console.log('[Login][focus] 已自动聚焦工作台登录码输入框');
+ }, 400);
+ });
+ }
},
onHide() {
this.$store.dispatch('broadcast/stop');
@@ -517,6 +566,38 @@ export default {
togglePasswordVisibility() {
this.showPassword = !this.showPassword;
},
+ handleSystemTitleTap() {
+ // 隐藏入口:连续点击标题 5 次,切换工作台登录码输入框的显示/隐藏
+ this.workbenchTitleTapCount += 1;
+ if (this.workbenchTitleTapCount >= 5) {
+ this.workbenchTitleTapCount = 0;
+ this.showWorkbenchLogin = !this.showWorkbenchLogin;
+ if (this.showWorkbenchLogin) {
+ console.log('[Login][hidden] 连续点击5次标题,工作台登录码输入框已显示');
+ // 显示后自动聚焦登录码输入框,便于扫码枪/键盘直接输入
+ this.$nextTick(() => {
+ setTimeout(() => {
+ this.workbenchInputFocus = true;
+ }, 300);
+ });
+ } else {
+ console.log('[Login][hidden] 连续点击5次标题,工作台登录码输入框已隐藏');
+ this.workbenchInputFocus = false;
+ }
+ }
+ },
+ handleWorkbenchInputConfirm() {
+ // 工作台登录码输入框回车 / 枪扫内容(键盘模拟)落入该框后的统一入口:
+ // 清空后交给 handleBroadcastResult 自动识别(wblc 工作台码 / 工牌 Base64)
+ const code = String(this.workbenchCode || '').trim();
+ if (!code) {
+ console.log('[Login][scan] 工作台输入框内容为空,忽略');
+ return;
+ }
+ this.workbenchCode = '';
+ console.log('[Login][scan] 工作台输入框收到内容 code len=', code.length, ' head=', code.slice(0, 12));
+ this.handleBroadcastResult({ data: code, source: 'keyboard' });
+ },
decodeBase64Text(value) {
if (!value) return '';
if (typeof atob !== 'function') return '';
@@ -748,10 +829,122 @@ export default {
})
}
},
+ isWorkbenchLoginCode(text) {
+ const code = String(text || '').trim();
+ // 工作台登录码:前缀 wblc + 随机段,共 64 位(字母数字)
+ return /^wblc[A-Za-z0-9]+$/i.test(code) && code.length === 64;
+ },
+ handleWorkbenchLogin() {
+ const code = String(this.workbenchCode || '').trim();
+ if (!this.isWorkbenchLoginCode(code)) {
+ uni.showToast({ title: '请输入有效的工作台登录码(wblc 开头,共64位)', icon: 'none' });
+ return;
+ }
+ this.loginByWorkbenchCode(code);
+ },
+ async loginByWorkbenchCode(loginCode) {
+ try {
+ const code = String(loginCode || '').trim();
+
+ // 防重入:登录请求进行中,忽略重复的广播/点击触发
+ if (this.workbenchLogining) {
+ console.log('[Login][wblc] 登录进行中,忽略重复触发');
+ return;
+ }
+ this.workbenchLogining = true;
+ console.log('[Login][wblc] 开始工作台登录码登录, head=', code.slice(0, 6), ' len=', code.length);
+
+ // 登录请求期间暂停广播,避免期间重复扫码触发并发登录;
+ // 成功跳转 packMode 后由页面卸载自然 stop,失败时在 catch 中 resume 恢复
+ this.$store.dispatch('broadcast/stop');
+
+ // index.LoginWorkbenchByCode(免登录、免鉴权):校验工作台登录码,直接返回工作台 token 与身份
+ const loginRes = await this.$http('index.LoginWorkbenchByCode', {
+ loginCode: code
+ });
+ if (loginRes?.flag === 'failure' || Number(loginRes?.code) === 400 || Number(loginRes?.code) === 403) {
+ throw new Error(loginRes?.message || '工作台不存在或登录码无效');
+ }
+
+ const loginData = (loginRes && typeof loginRes === 'object' && loginRes.data && typeof loginRes.data === 'object')
+ ? loginRes.data
+ : loginRes;
+ const token = String(loginData?.token || '').trim() || this.extractToken(loginData);
+ let workbenchId = loginData?.workbench_id ?? loginData?.workbenchId ?? loginData?.id ?? '';
+ let workbenchName = String(loginData?.name || '').trim();
+ if (!token) {
+ throw new Error('工作台登录成功但未返回token');
+ }
+
+ // 该 token 即最终工作台 token(后端已直接返回,无需再走绑定会话)
+ setToken(token);
+
+ // 用工作台 token 拉取完整工作台信息(含 warehouse_id/status/type 等)
+ // 只有 getWorkbenchInfo 返回成功后才会进入打包模块;失败则抛错中断
+ const infoRes = await this.$http('workbench.getWorkbenchInfo', { token });
+ if (infoRes?.flag === 'failure' || Number(infoRes?.code) === 400 || Number(infoRes?.code) === 403) {
+ throw new Error(infoRes?.message || '获取工作台信息失败');
+ }
+ const infoData = (infoRes && typeof infoRes === 'object' && infoRes.data && typeof infoRes.data === 'object')
+ ? infoRes.data
+ : infoRes;
+ if (!infoData || typeof infoData !== 'object') {
+ throw new Error('获取工作台信息失败:返回数据无效');
+ }
+
+ const workbenchDetail = {
+ id: infoData?.workbench_id ?? infoData?.workbenchId ?? infoData?.id ?? workbenchId,
+ name: String(infoData?.name || workbenchName),
+ warehouse_id: infoData?.warehouse_id ?? infoData?.warehouseId ?? '',
+ status: infoData?.status ?? '',
+ type: String(infoData?.type || ''),
+ remark: String(infoData?.remark || ''),
+ token
+ };
+
+ workbenchId = workbenchDetail.id;
+ workbenchName = workbenchDetail.name;
+ uni.setStorageSync('workbenchInfo', workbenchDetail);
+ uni.setStorageSync('workbenchToken', token);
+
+ uni.showToast({ title: '工作台登录成功', icon: 'success' });
+
+ // 免登录成功:不进主控,直接进入打包模式占位页
+ // 注意:URL 仅传 workbenchId,中文 workbenchName 通过 storage(workbenchInfo)传递,避免真机 URL 中文乱码
+ const query = `workbenchId=${encodeURIComponent(String(workbenchId))}`;
+ setTimeout(() => {
+ uni.reLaunch({ url: `/pages/packing/packMode?${query}` });
+ }, 600);
+ } catch (error) {
+ this.scanning = true;
+ this.workbenchLogining = false;
+ this.deviceCode = '';
+ this.scanUuid = '';
+ this.currentDevice = null;
+ // 登录失败:恢复广播监听,允许再次扫码
+ this.$store.dispatch('broadcast/resume');
+ console.error('[Login][wblc] 工作台登录失败:', error?.msg || error?.message || error);
+ uni.showToast({
+ title: error?.msg || error?.message || '工作台登录失败',
+ icon: 'none'
+ })
+ }
+ },
handleBroadcastResult(result) {
+ console.log('[Login][bcast] handleBroadcastResult 触发 scanning=', this.scanning, ' data=', result && result.data);
if (!this.scanning || !result || !result.data) return;
const rawCode = String(result.data || '').trim(); // 扫描原文
+ console.log('[Login][bcast] rawCode len=', rawCode.length, ' head=', rawCode.slice(0, 12));
+
+ // 工作台登录码(wblc 前缀,共 64 位)→ 免登录直达打包模式,不进主控
+ if (this.isWorkbenchLoginCode(rawCode)) {
+ console.log('[Login][bcast] 判定为工作台登录码 -> loginByWorkbenchCode');
+ this.loginByWorkbenchCode(rawCode);
+ return;
+ }
+ console.log('[Login][bcast] 非工作台登录码,按工牌流程处理');
+
const parsed = this.parseScanCodeStrict(rawCode); // 仅用于校验与展示
if (!parsed.ok) {
this.scanning = true;
@@ -1032,13 +1225,12 @@ export default {
}
.method-desc {
- margin: 0;
+ margin: 0 40rpx 0 0;
}
.scan-login-content {
display: flex;
align-items: center;
- gap: 16rpx;
}
}
diff --git a/pages/packing/packMode.vue b/pages/packing/packMode.vue
new file mode 100644
index 0000000..4c580be
--- /dev/null
+++ b/pages/packing/packMode.vue
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已绑定 · {{ workbenchName || '工作台' }}
+
+
+
+
+
+
+ 打包模式接入中
+ 已绑定工作台。当前为占位页面,实际打包作业流程后续将在此接入。
+
+
+
+
+
+
+
+
+ 未绑定工作台
+
+
+
+ 提示
+ 当前未绑定工作台,请返回登录页使用工作台登录码(wblc 开头)登录后进入打包模式。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+