Merge remote-tracking branch 'origin/dev' into release/test

# Conflicts: # .env.example # config/runtime.js # pages/profile/profile.vue # stores/session.js # tests/page-contract.test.mjs # vite.config.js
2026-08-26 20:57:50 +08:00
parent 69f8fdfcdb 88b52cff40
commit d32d8abe32
15 changed files with 473 additions and 104 deletions
@@ -1,7 +1,45 @@
 <template>
-	<view v-if="user" class="page-shell portal-page"><PortalHeader title="个人中心" :user="user" :show-profile="false" /><view class="portal-content profile-content"><view class="profile-card"><view class="profile-avatar">{{ user.name.slice(0, 1) }}</view><view><text class="profile-name">{{ user.name }}</text><text class="profile-role">{{ user.role }} · {{ user.id }}</text></view></view><view class="profile-list"><view class="profile-row"><text>作业仓库</text><text class="profile-value">{{ user.warehouse }}</text></view><view class="profile-row"><text>当前班次</text><text class="profile-value">08:00–17:00</text></view><view class="profile-row"><text>应用版本</text><text class="profile-value">0.0.1</text></view></view><button class="profile-action" @tap="showSettings">系统设置 <text>›</text></button><button class="logout-action" @tap="openLogout">退出登录</button></view><uni-popup ref="logoutPopup" type="center" :is-mask-click="true" @change="handleLogoutChange"><view class="logout-dialog-card" role="dialog" aria-modal="true" aria-label="确认退出登录"><PopupHeader title="确认退出登录？" tone="danger" @close="closeLogout" /><text class="logout-dialog-content">退出后会清空本次会话中的箱号草稿、扫码记录与作业进度。</text><view class="logout-dialog-actions"><button class="logout-dialog-cancel" @tap="closeLogout">取消</button><button class="logout-dialog-confirm" @tap="logout">确认退出</button></view></view></uni-popup><view v-if="toast" class="app-toast warning" role="status">设置功能将在后续版本开放</view></view>
+	<view v-if="user" class="page-shell portal-page"><PortalHeader title="个人中心" :user="user" :show-profile="false" /><view class="portal-content profile-content"><view class="profile-card"><view class="profile-avatar">{{ user.name.slice(0, 1) }}</view><view><text class="profile-name">{{ user.name }}</text><text class="profile-role">{{ user.role }} · {{ user.id }}</text></view></view><view class="profile-list"><view class="profile-row"><text>作业仓库</text><text class="profile-value">{{ user.warehouse }}</text></view><view class="profile-row"><text>当前班次</text><text class="profile-value">08:00–17:00</text></view><view class="profile-row"><text>应用版本</text><text class="profile-value">{{ appVersion }}</text></view></view><button class="profile-action" @tap="checkUpdate">检查更新 <text>›</text></button><button class="profile-action" @tap="showSettings">系统设置 <text>›</text></button><button class="logout-action" @tap="openLogout">退出登录</button></view><uni-popup ref="logoutPopup" type="center" :is-mask-click="true" @change="handleLogoutChange"><view class="logout-dialog-card" role="dialog" aria-modal="true" aria-label="确认退出登录"><PopupHeader title="确认退出登录？" tone="danger" @close="closeLogout" /><text class="logout-dialog-content">退出后会清空本次会话中的箱号草稿、扫码记录与作业进度。</text><view class="logout-dialog-actions"><button class="logout-dialog-cancel" @tap="closeLogout">取消</button><button class="logout-dialog-confirm" @tap="logout">确认退出</button></view></view></uni-popup><view v-if="toast" class="app-toast warning" role="status">设置功能将在后续版本开放</view></view>
 </template>
 <script>
-	import { logout as logoutRequest } from '@/api/auth.js'; import PortalHeader from '@/components/PortalHeader.vue'; import PopupHeader from '@/components/PopupHeader.vue'; import { session, requireSession, signOut } from '@/stores/session.js'
-	export default { components: { PopupHeader, PortalHeader }, data() { return { user: session.currentUser, logoutOpen: false, toast: false } }, onShow() { if (!requireSession()) return; this.user = session.currentUser }, beforeUnmount() { clearTimeout(this._toastTimer) }, onBackPress() { if (!this.logoutOpen) return false; this.closeLogout(); return true }, methods: { openLogout() { this.logoutOpen = true; this.$refs.logoutPopup.open() }, closeLogout() { this.logoutOpen = false; this.$refs.logoutPopup.close() }, handleLogoutChange(event) { this.logoutOpen = Boolean(event.show) }, showSettings() { clearTimeout(this._toastTimer); this.toast = true; this._toastTimer = setTimeout(() => { this.toast = false }, 2200) }, logout() { const refreshToken = session.refreshToken; const accessToken = session.token; signOut(); uni.reLaunch({ url: '/pages/login/login' }); if (refreshToken) logoutRequest(refreshToken, accessToken).catch(() => {}) } } }
+	import { logout as logoutRequest } from '@/api/auth.js'
+	import PortalHeader from '@/components/PortalHeader.vue'
+	import PopupHeader from '@/components/PopupHeader.vue'
+	import { session, requireSession, signOut } from '@/stores/session.js'
+	import { checkForAppUpdate } from '@/utils/app-update.js'
+
+	export default {
+		components: { PopupHeader, PortalHeader },
+		data() { return { user: session.currentUser, appVersion: '0.0.1', logoutOpen: false, toast: false } },
+		onShow() { if (!requireSession()) return; this.user = session.currentUser; this.loadAppVersion() },
+		beforeUnmount() { clearTimeout(this._toastTimer) },
+		onBackPress() { if (!this.logoutOpen) return false; this.closeLogout(); return true },
+		methods: {
+			loadAppVersion() {
+				// #ifdef APP-PLUS
+				this.appVersion = String(plus.runtime.version || this.appVersion)
+				// #endif
+			},
+			checkUpdate() {
+				// #ifdef APP-PLUS
+				checkForAppUpdate({ manual: true })
+				return
+				// #endif
+				// #ifndef APP-PLUS
+				uni.showToast({ title: '请在 PDA App 中检查更新', icon: 'none' })
+				// #endif
+			},
+			openLogout() { this.logoutOpen = true; this.$refs.logoutPopup.open() },
+			closeLogout() { this.logoutOpen = false; this.$refs.logoutPopup.close() },
+			handleLogoutChange(event) { this.logoutOpen = Boolean(event.show) },
+			showSettings() { clearTimeout(this._toastTimer); this.toast = true; this._toastTimer = setTimeout(() => { this.toast = false }, 2200) },
+			logout() {
+				const refreshToken = session.refreshToken
+				const accessToken = session.token
+				signOut()
+				uni.reLaunch({ url: '/pages/login/login' })
+				if (refreshToken) logoutRequest(refreshToken, accessToken).catch(() => {})
+			}
+		}
+	}
 </script>
@@ -5,7 +5,8 @@
 			<view class="task-toolbar">
 				<view class="task-heading">
 					<text class="task-title">待处理任务</text>
-					<text class="task-summary">{{ loading ? '正在同步' : `共 ${tasks.length} 个可处理任务` }}</text>
+					<text class="task-summary">{{ loading ? '正在同步' : `接口返回 ${rawTaskCount} 个，可处理 ${tasks.length} 个` }}</text>
+					<text class="task-environment">{{ apiEnvironment }}</text>
 				</view>
 				<button class="task-refresh" :disabled="loading" @tap="loadTasks">{{ loading ? '刷新中' : '刷新' }}</button>
 			</view>
@@ -40,7 +41,14 @@

 	export default {
 		components: { PortalHeader },
-		data() { return { user: session.currentUser, tasks: [], loading: false, error: '', notice: '', online: true, toast: { visible: false, message: '', type: '' } } },
+		data() { return { user: session.currentUser, tasks: [], rawTaskCount: 0, loading: false, error: '', notice: '', online: true, toast: { visible: false, message: '', type: '' } } },
+		computed: {
+			apiEnvironment() {
+				const apiBase = String(session.apiBase || '')
+				const host = apiBase.match(/^https?:\/\/([^/]+)/i)?.[1]
+				return `当前接口：${host || apiBase || '未配置'} · 账号：${session.currentUser?.name || session.currentUser?.id || '未知'}`
+			}
+		},
 		onLoad() { if (!requireSession()) return; this._stopNetwork = watchNetwork((value) => { this.online = value }) },
 		onShow() { if (!requireSession()) return; this.user = session.currentUser; this.loadTasks() },
 		onUnload() { if (this._stopNetwork) this._stopNetwork(); clearTimeout(this._toastTimer) },
@@ -61,12 +69,14 @@
 			isTaskReady(task) { return Boolean(task.recordStatus === 'ACTIVE' && !task.mergedIntoContainerBookingId && task.taskId && task.loadingPlanId && task.containerBookingId && task.cabinetNo && task.currentContainerNo && task.warehouseId && task.version !== null && task.version !== undefined && Number.isInteger(Number(task.version)) && (task.workflowStatus === 'AWAITING_REVIEW' || (task.assignmentVersion !== null && task.assignmentVersion !== undefined && Number.isInteger(Number(task.assignmentVersion)))) && ['UNASSIGNED', 'IN_PROGRESS', 'AWAITING_REVIEW'].includes(task.workflowStatus)) },
 			async loadTasks() {
 				if (!isOnline()) { this.error = '当前网络不可用，请联网后刷新'; return }
-				this.loading = true; this.error = ''; this.notice = ''
+				this.loading = true; this.error = ''; this.notice = ''; this.rawTaskCount = 0
 				try {
 					const result = await listLoadingOrders({ page: 1, size: 50 })
 					const records = result.records || []
+					this.rawTaskCount = records.length
 					records.filter((task) => this.isMergedTask(task)).forEach((task) => this.clearMergedTaskDraft(task))
 					this.tasks = records.filter((task) => this.isTaskReady(task))
+					try { console.info('[PDA] pending tasks', { apiBase: session.apiBase, operatorId: session.currentUser?.id, received: records.length, visible: this.tasks.length }) } catch (_) {}
 					if (records.length > this.tasks.length) this.notice = '部分任务尚未完成服务端就绪校验，本机已隐藏，请稍后刷新'
 				} catch (error) {
 					this.error = error.network ? '当前网络不可用，请联网后刷新' : (error.message || '任务加载失败')
@@ -87,6 +97,7 @@
 .task-heading { display: flex; min-width: 0; flex-direction: column; }
 .task-title { color: #12233f; font-size: 18px; font-weight: 700; line-height: 25px; }
 .task-summary { margin-top: 2px; color: #667085; font-size: 11px; line-height: 16px; }
+.task-environment { margin-top: 1px; color: #98a2b3; font-size: 10px; line-height: 15px; }
 .task-refresh { flex-shrink: 0; margin: 0; min-width: 76px; height: 44px; border: 0; border-radius: 9px; background: #1a73e8; color: #fff; font-size: 14px; line-height: 44px; }
 .task-refresh[disabled] { opacity: .6; }
 .task-error, .task-state { padding: 20px 14px; border-radius: 10px; background: #fff; color: #667085; font-size: 13px; line-height: 20px; text-align: center; }