@@ -204,19 +231,24 @@
-
@@ -229,7 +261,6 @@
-
+ 1
diff --git a/src/单兵终端APP/js/api.js b/src/单兵终端APP/js/api.js
index 4316bcb..4497fbc 100644
--- a/src/单兵终端APP/js/api.js
+++ b/src/单兵终端APP/js/api.js
@@ -142,6 +142,17 @@ const API = (() => {
}
}
+ async function changePassword(soldierId, oldPassword, newPassword) {
+ return request('/api/auth/change-password', {
+ method: 'POST',
+ body: JSON.stringify({
+ soldier_id: soldierId,
+ old_password: oldPassword,
+ new_password: newPassword
+ })
+ });
+ }
+
// ===== 模拟数据（后端未就绪时使用） =====
function getMockDropPoints() {
return [
@@ -201,6 +212,7 @@ const API = (() => {
sendSOS,
login,
register,
- getAccounts
+ getAccounts,
+ changePassword
};
})();
diff --git a/src/单兵终端APP/js/app.js b/src/单兵终端APP/js/app.js
index c5afd32..69cd736 100644
--- a/src/单兵终端APP/js/app.js
+++ b/src/单兵终端APP/js/app.js
@@ -10,6 +10,7 @@ const App = (() => {
soldierId: localStorage.getItem('soldier_id') || 'soldier_001',
soldierName: localStorage.getItem('soldier_name') || '张三',
soldierUnit: localStorage.getItem('soldier_unit') || '第3步兵师/1连',
+ theme: localStorage.getItem('app_theme') || 'dark', // 主题模式：'dark' | 'light' | 'auto'
pollInterval: 5000
};
@@ -25,6 +26,9 @@ const App = (() => {
// ===== 初始化 =====
function init() {
+ // 初始化主题
+ initTheme();
+
// 检查登录状态
const saved = localStorage.getItem('soldier_session');
if (saved) {
@@ -337,9 +341,20 @@ const App = (() => {
try {
await API.postDemand(demand);
showToast('✅ 需求上报成功！');
+
+ // 清空选中的投放点
selectedDropPoint = null;
+ mapSelectedPoint = null;
+
+ // 重置填写物资信息页面的显示
+ const selectedCard = document.getElementById('selected-drop-card');
const dropDisplay = document.getElementById('demand-drop-display');
- if (dropDisplay) dropDisplay.textContent = '当前位置：A区街角12号';
+ if (selectedCard) selectedCard.style.display = 'none';
+ if (dropDisplay) {
+ dropDisplay.style.display = 'block';
+ dropDisplay.textContent = '未选择投放点';
+ }
+
setTimeout(() => router('home'), 1000);
} catch (e) {
showToast('❌ 上报失败：' + (e.message || '网络错误'));
@@ -352,18 +367,24 @@ const App = (() => {
setTimeout(async () => {
await LocationModule.initPickerMap('drop-map', (point) => {
mapSelectedPoint = point;
- // 更新UI显示
- const nameEl = document.getElementById('drop-selected-name');
- const addrEl = document.getElementById('drop-selected-address');
- const coordEl = document.getElementById('drop-selected-coords');
- if (nameEl) nameEl.textContent = point.name;
- if (addrEl) addrEl.textContent = point.address;
- if (coordEl) coordEl.textContent = `${point.lat.toFixed(6)}, ${point.lng.toFixed(6)}`;
- showToast('📍 已选择：' + point.name);
+
+ // 显示选中位置卡片
+ const selectedCard = document.getElementById('selected-location-card');
+ if (selectedCard) {
+ selectedCard.style.display = 'block';
+
+ // 更新卡片内容
+ const nameEl = document.getElementById('mini-selected-name');
+ const addrEl = document.getElementById('mini-selected-address');
+ if (nameEl) nameEl.textContent = point.name;
+ if (addrEl) addrEl.textContent = point.address || `${point.lat.toFixed(6)}, ${point.lng.toFixed(6)}`;
+
+ showToast('📍 已选择：' + point.name);
+ }
});
}, 300);
- // 加载推荐列表
+ // 加载推荐列表（小卡片形式）
const list = document.getElementById('drop-point-list');
list.innerHTML = '
📍 已选位置
- 请点击地图选择投放点
- --
- --
+
+
-
+
🎯 附近推荐投放点
-
+
- ← 返回
📋 当前任务
@@ -276,7 +307,6 @@
- ← 返回
🚀 无人机状态
@@ -345,7 +375,6 @@
- ← 返回
👤 个人中心
@@ -392,19 +421,19 @@
🔒 安全设置
ℹ️ 关于
@@ -439,7 +468,7 @@
我的
加载中...
';
@@ -374,19 +395,17 @@ const App = (() => {
return;
}
+ // 渲染为小卡片形式
list.innerHTML = points.map((p, i) => {
const isSafe = p.safety_score >= 70;
return `
-
-
📍 ${p.name}
-
- 安全系数: ${p.safety_score}%
- 距离: ${p.distance}m
-
- ${p.reason}
-
- ${isSafe ? '✅ 推荐投放' : '❌ 危险区域'}
+ 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
+
+
`;
}).join('');
@@ -459,35 +478,54 @@ const App = (() => {
showToast('📍 已定位：' + p.name);
}
- // ===== 选择投放点（从列表） =====
- function selectDropPoint(index) {
- API.getDropPoints().then(async points => {
+ // ===== 从列表选择投放点 =====
+ async function selectDropPointFromList(index) {
+ try {
+ const points = await API.getDropPoints();
const p = points[index];
+ if (!p) return;
+
if (p.safety_score < 70) {
showToast('⚠️ 该区域危险，建议选择其他投放点');
return;
}
- selectedDropPoint = p;
-
- // 同时在地图上标记
+
+ // 在地图上标记
await LocationModule.setPickerPosition(p.lat, p.lng, p.name, p.address);
-
- // 更新选中显示
+
+ // 更新选中状态
mapSelectedPoint = {
lat: p.lat,
lng: p.lng,
name: p.name,
address: p.address || p.name
};
- const nameEl = document.getElementById('drop-selected-name');
- const addrEl = document.getElementById('drop-selected-address');
- const coordEl = document.getElementById('drop-selected-coords');
- if (nameEl) nameEl.textContent = p.name;
- if (addrEl) addrEl.textContent = p.address || '安全系数 ' + p.safety_score + '%';
- if (coordEl) coordEl.textContent = `${p.lat.toFixed(6)}, ${p.lng.toFixed(6)}`;
-
+
+ // 显示选中位置卡片
+ const selectedCard = document.getElementById('selected-location-card');
+ if (selectedCard) {
+ selectedCard.style.display = 'block';
+
+ const nameEl = document.getElementById('mini-selected-name');
+ const addrEl = document.getElementById('mini-selected-address');
+ if (nameEl) nameEl.textContent = p.name;
+ if (addrEl) addrEl.textContent = p.address || `安全系数 ${p.safety_score}%`;
+ }
+
showToast('已选择：' + p.name);
- });
+ } catch (e) {
+ showToast('选择失败');
+ }
+ }
+
+ // ===== 从地图选择投放点（点击选中的卡片） =====
+ function selectDropPointFromMap() {
+ if (!mapSelectedPoint) {
+ showToast('请先在地图上选择一个位置');
+ return;
+ }
+
+ showToast('📍 已确认：' + mapSelectedPoint.name);
}
function confirmDropPoint() {
@@ -495,18 +533,48 @@ const App = (() => {
if (mapSelectedPoint) {
selectedDropPoint = mapSelectedPoint;
router('demand');
- const display = document.getElementById('demand-drop-display');
- if (display) display.textContent = mapSelectedPoint.name;
+
+ // 更新填写物资信息页面的显示
+ const selectedCard = document.getElementById('selected-drop-card');
+ const dropDisplay = document.getElementById('demand-drop-display');
+
+ if (selectedCard && dropDisplay) {
+ // 隐藏默认显示，显示选中卡片
+ dropDisplay.style.display = 'none';
+ selectedCard.style.display = 'block';
+
+ // 更新卡片内容
+ const nameEl = document.getElementById('selected-drop-name');
+ const coordsEl = document.getElementById('selected-drop-coords');
+ if (nameEl) nameEl.textContent = mapSelectedPoint.name;
+ if (coordsEl) coordsEl.textContent = `${mapSelectedPoint.lat.toFixed(6)}, ${mapSelectedPoint.lng.toFixed(6)}`;
+ }
+
showToast('✅ 已确认投放点：' + mapSelectedPoint.name);
return;
}
+
// fallback到列表选中的点
if (selectedDropPoint) {
router('demand');
- const display = document.getElementById('demand-drop-display');
- if (display) display.textContent = selectedDropPoint.name;
+
+ const selectedCard = document.getElementById('selected-drop-card');
+ const dropDisplay = document.getElementById('demand-drop-display');
+
+ if (selectedCard && dropDisplay) {
+ dropDisplay.style.display = 'none';
+ selectedCard.style.display = 'block';
+
+ const nameEl = document.getElementById('selected-drop-name');
+ const coordsEl = document.getElementById('selected-drop-coords');
+ if (nameEl) nameEl.textContent = selectedDropPoint.name;
+ if (coordsEl) coordsEl.textContent = `${selectedDropPoint.lat.toFixed(6)}, ${selectedDropPoint.lng.toFixed(6)}`;
+ }
+
+ showToast('✅ 已确认投放点：' + selectedDropPoint.name);
return;
}
+
showToast('请先点击地图或列表选择一个投放点');
}
@@ -549,7 +617,11 @@ const App = (() => {
if (tstart) tstart.textContent = task.start_name || '后方阵地';
const ttarget = document.getElementById('task-target');
- if (ttarget) ttarget.textContent = task.target_name || '目标位置';
+ if (ttarget) {
+ // 优先使用选中的投放点名称，其次使用后端返回的 target_name
+ const targetName = selectedDropPoint ? selectedDropPoint.name : (task.target_name || '目标位置');
+ ttarget.textContent = targetName;
+ }
const trisk = document.getElementById('task-risk');
if (trisk) trisk.textContent = '安全系数: ' + (task.safety_score || 0) + '%';
@@ -692,9 +764,38 @@ const App = (() => {
}
}
- function updateDropPoint() {
- showToast('投放点已更新');
- setTimeout(() => router('task'), 500);
+ async function updateDropPoint() {
+ try {
+ showToast('正在获取当前位置...');
+
+ // 获取当前位置
+ const pos = await LocationModule.getCurrentPosition();
+
+ // 构建投放点对象
+ const newDropPoint = {
+ name: '当前位置 (' + pos.lat.toFixed(6) + ', ' + pos.lng.toFixed(6) + ')',
+ lat: pos.lat,
+ lng: pos.lng,
+ safety_score: 90, // 默认安全系数
+ address: 'GPS定位位置'
+ };
+
+ // 更新选中的投放点
+ selectedDropPoint = newDropPoint;
+ mapSelectedPoint = newDropPoint;
+
+ showToast('✅ 投放点已更新为当前位置');
+
+ // 跳转到任务页面
+ setTimeout(() => {
+ router('task');
+ // 强制刷新任务信息
+ loadTaskInfo();
+ }, 500);
+ } catch (e) {
+ showToast('❌ 获取位置失败：' + (e.message || '未知错误'));
+ console.error('updateDropPoint错误:', e);
+ }
}
// ===== 标注 =====
@@ -731,6 +832,446 @@ const App = (() => {
}
}
+ // ===== 主题切换 =====
+ function initTheme() {
+ const theme = CONFIG.theme || 'dark';
+ applyTheme(theme);
+ updateThemeDisplay();
+
+ // 如果是自动模式，监听系统主题变化
+ if (theme === 'auto') {
+ const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+ mediaQuery.addEventListener('change', handleSystemThemeChange);
+ }
+ }
+
+ function applyTheme(theme) {
+ if (theme === 'auto') {
+ const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+ document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
+ } else {
+ document.documentElement.setAttribute('data-theme', theme);
+ }
+ }
+
+ function handleSystemThemeChange(e) {
+ if (CONFIG.theme === 'auto') {
+ applyTheme('auto');
+ const themeName = e.matches ? '深色' : '浅色';
+ showToast('系统主题已切换为：' + themeName + '模式');
+ }
+ }
+
+ function toggleTheme() {
+ // 创建自定义选择弹窗
+ const modal = document.createElement('div');
+ modal.style.cssText = `
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0,0,0,0.5);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 10000;
+ `;
+
+ const content = document.createElement('div');
+ content.style.cssText = `
+ background: white;
+ border-radius: 12px;
+ padding: 20px;
+ min-width: 280px;
+ max-width: 90%;
+ `;
+
+ const title = document.createElement('div');
+ title.textContent = '选择主题模式';
+ title.style.cssText = `
+ font-size: 16px;
+ font-weight: 600;
+ color: #333;
+ margin-bottom: 16px;
+ text-align: center;
+ `;
+
+ const options = [
+ { value: 'dark', label: '🌙 深色模式', desc: '始终使用深色主题' },
+ { value: 'light', label: '☀️ 浅色模式', desc: '始终使用浅色主题' },
+ { value: 'auto', label: '🔄 跟随系统', desc: '自动跟随系统主题' }
+ ];
+
+ options.forEach((opt, index) => {
+ const optionDiv = document.createElement('div');
+ const isSelected = CONFIG.theme === opt.value;
+ optionDiv.style.cssText = `
+ padding: 12px 16px;
+ margin-bottom: ${index < options.length - 1 ? '8px' : '0'};
+ border-radius: 8px;
+ cursor: pointer;
+ background: ${isSelected ? '#E6F7FF' : '#f5f5f5'};
+ border: ${isSelected ? '2px solid #007AFF' : '2px solid transparent'};
+ transition: all 0.2s;
+ `;
+
+ optionDiv.innerHTML = `
+
+
+ ${p.name}
+ 安全系数: ${p.safety_score}% · 距离: ${p.distance}m
✓
+ ${opt.label}
+
+
+ ${opt.desc}
+
+ `;
+
+ optionDiv.addEventListener('click', () => {
+ // 应用选择的主题
+ CONFIG.theme = opt.value;
+ localStorage.setItem('app_theme', CONFIG.theme);
+ applyTheme(CONFIG.theme);
+ updateThemeDisplay();
+
+ // 关闭弹窗
+ document.body.removeChild(modal);
+
+ const themeNames = {
+ 'dark': '深色模式',
+ 'light': '浅色模式',
+ 'auto': '环境跟随'
+ };
+ showToast('已切换到：' + themeNames[CONFIG.theme]);
+
+ // 如果切换到自动模式，开始监听系统主题
+ if (CONFIG.theme === 'auto') {
+ const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+ mediaQuery.addEventListener('change', handleSystemThemeChange);
+ }
+ });
+
+ content.appendChild(optionDiv);
+ });
+
+ // 添加取消按钮
+ const cancelBtn = document.createElement('div');
+ cancelBtn.textContent = '取消';
+ cancelBtn.style.cssText = `
+ margin-top: 16px;
+ padding: 12px;
+ text-align: center;
+ color: #007AFF;
+ font-size: 14px;
+ cursor: pointer;
+ border-top: 1px solid #e0e0e0;
+ `;
+ cancelBtn.addEventListener('click', () => {
+ document.body.removeChild(modal);
+ });
+
+ content.appendChild(cancelBtn);
+ modal.appendChild(content);
+ document.body.appendChild(modal);
+
+ // 点击背景关闭
+ modal.addEventListener('click', (e) => {
+ if (e.target === modal) {
+ document.body.removeChild(modal);
+ }
+ });
+ }
+
+ function updateThemeDisplay() {
+ const themeEl = document.getElementById('theme-value');
+ if (!themeEl) return;
+
+ const themeIcons = {
+ 'dark': '◉ 深色',
+ 'light': '○ 浅色',
+ 'auto': '◎ 跟随系统'
+ };
+ themeEl.textContent = themeIcons[CONFIG.theme] + ' →';
+ }
+
+ // ===== 修改密码 =====
+ function showChangePasswordModal() {
+ // 获取当前主题
+ const currentTheme = document.documentElement.getAttribute('data-theme') || 'dark';
+ const isDark = currentTheme === 'dark';
+
+ // 主题颜色配置
+ const themeColors = {
+ bg: isDark ? '#1a1a2e' : 'white',
+ text: isDark ? '#e0e0e0' : '#333',
+ border: isDark ? '#2a2a3e' : '#e0e0e0',
+ inputBg: isDark ? '#16213e' : 'white',
+ cancelBg: isDark ? '#2a2a3e' : '#f5f5f5',
+ cancelText: isDark ? '#e0e0e0' : '#333'
+ };
+
+ // 创建弹窗
+ const modal = document.createElement('div');
+ modal.style.cssText = `
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0,0,0,0.5);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 10000;
+ `;
+
+ const content = document.createElement('div');
+ content.style.cssText = `
+ background: ${themeColors.bg};
+ border-radius: 12px;
+ padding: 24px;
+ min-width: 320px;
+ max-width: 90%;
+ `;
+
+ const title = document.createElement('div');
+ title.textContent = '修改登录密码';
+ title.style.cssText = `
+ font-size: 18px;
+ font-weight: 600;
+ color: ${themeColors.text};
+ margin-bottom: 20px;
+ text-align: center;
+ `;
+
+ // 输入框配置
+ const inputs = [
+ { id: 'old-pwd', label: '原密码', type: 'password', placeholder: '请输入原密码' },
+ { id: 'new-pwd', label: '新密码', type: 'password', placeholder: '请输入新密码' },
+ { id: 'confirm-pwd', label: '确认新密码', type: 'password', placeholder: '请再次输入新密码' }
+ ];
+
+ inputs.forEach((input, index) => {
+ const group = document.createElement('div');
+ group.style.cssText = 'margin-bottom: 16px;';
+
+ const label = document.createElement('label');
+ label.textContent = input.label;
+ label.style.cssText = `
+ display: block;
+ font-size: 14px;
+ color: ${themeColors.text};
+ margin-bottom: 6px;
+ font-weight: 500;
+ `;
+
+ const inputWrapper = document.createElement('div');
+ inputWrapper.style.cssText = 'position: relative;';
+
+ const inputEl = document.createElement('input');
+ inputEl.type = input.type;
+ inputEl.id = input.id;
+ inputEl.placeholder = input.placeholder;
+ inputEl.style.cssText = `
+ width: 100%;
+ padding: 12px 40px 12px 12px;
+ border: 1px solid ${themeColors.border};
+ border-radius: 8px;
+ font-size: 14px;
+ outline: none;
+ box-sizing: border-box;
+ background: ${themeColors.inputBg};
+ color: ${themeColors.text};
+ `;
+
+ // 眼睛图标（显示/隐藏密码）
+ const eyeIcon = document.createElement('span');
+ eyeIcon.innerHTML = '🙈'; // 默认隐藏密码，显示捂眼
+ eyeIcon.style.cssText = `
+ position: absolute;
+ right: 12px;
+ top: 50%;
+ transform: translateY(-50%);
+ cursor: pointer;
+ font-size: 18px;
+ user-select: none;
+ `;
+
+ let isPasswordVisible = false;
+ eyeIcon.addEventListener('click', () => {
+ isPasswordVisible = !isPasswordVisible;
+ inputEl.type = isPasswordVisible ? 'text' : 'password';
+ // 显示密码时用睁开的眼睛，隐藏时用捂眼
+ eyeIcon.innerHTML = isPasswordVisible ? '👁️' : '🙈';
+ });
+
+ inputWrapper.appendChild(inputEl);
+ inputWrapper.appendChild(eyeIcon);
+ group.appendChild(label);
+ group.appendChild(inputWrapper);
+ content.appendChild(group);
+ });
+
+ // 按钮区域
+ const btnGroup = document.createElement('div');
+ btnGroup.style.cssText = `
+ display: flex;
+ gap: 12px;
+ margin-top: 24px;
+ `;
+
+ // 取消按钮
+ const cancelBtn = document.createElement('button');
+ cancelBtn.textContent = '取消';
+ cancelBtn.style.cssText = `
+ flex: 1;
+ padding: 12px;
+ background: ${themeColors.cancelBg};
+ color: ${themeColors.cancelText};
+ border: none;
+ border-radius: 8px;
+ font-size: 14px;
+ cursor: pointer;
+ `;
+ cancelBtn.addEventListener('click', () => {
+ document.body.removeChild(modal);
+ });
+
+ // 确认按钮
+ const confirmBtn = document.createElement('button');
+ confirmBtn.textContent = '确认修改';
+ confirmBtn.style.cssText = `
+ flex: 1;
+ padding: 12px;
+ background: linear-gradient(135deg, #007AFF 0%, #0056b3 100%);
+ color: white;
+ border: none;
+ border-radius: 8px;
+ font-size: 14px;
+ font-weight: 600;
+ cursor: pointer;
+ `;
+
+ // 显示结果状态的函数
+ function showResult(success, message) {
+ content.innerHTML = '';
+ content.style.textAlign = 'center';
+ content.style.padding = '40px 24px';
+
+ const icon = document.createElement('div');
+ icon.textContent = success ? '✅' : '❌';
+ icon.style.cssText = `
+ font-size: 48px;
+ margin-bottom: 16px;
+ `;
+
+ const msg = document.createElement('div');
+ msg.textContent = message;
+ msg.style.cssText = `
+ font-size: 16px;
+ color: ${themeColors.text};
+ margin-bottom: 24px;
+ `;
+
+ const closeBtn = document.createElement('button');
+ closeBtn.textContent = '关闭';
+ closeBtn.style.cssText = `
+ padding: 12px 48px;
+ background: ${success ? 'linear-gradient(135deg, #28a745 0%, #1e7e34 100%)' : 'linear-gradient(135deg, #007AFF 0%, #0056b3 100%)'};
+ color: white;
+ border: none;
+ border-radius: 8px;
+ font-size: 14px;
+ font-weight: 600;
+ cursor: pointer;
+ `;
+ closeBtn.addEventListener('click', () => {
+ document.body.removeChild(modal);
+ });
+
+ content.appendChild(icon);
+ content.appendChild(msg);
+ content.appendChild(closeBtn);
+
+ // 成功时2秒后自动关闭
+ if (success) {
+ setTimeout(() => {
+ if (document.body.contains(modal)) {
+ document.body.removeChild(modal);
+ }
+ }, 2000);
+ }
+ }
+
+ confirmBtn.addEventListener('click', async () => {
+ // 防止重复点击
+ if (confirmBtn.disabled) return;
+
+ const oldPwd = document.getElementById('old-pwd').value.trim();
+ const newPwd = document.getElementById('new-pwd').value.trim();
+ const confirmPwd = document.getElementById('confirm-pwd').value.trim();
+
+ // 验证
+ if (!oldPwd || !newPwd || !confirmPwd) {
+ showToast('请填写所有字段');
+ return;
+ }
+
+ if (newPwd !== confirmPwd) {
+ showToast('两次输入的新密码不一致');
+ return;
+ }
+
+ if (newPwd.length < 6) {
+ showToast('新密码长度不能少于6位');
+ return;
+ }
+
+ // 立即禁用按钮并显示加载状态
+ confirmBtn.disabled = true;
+ confirmBtn.textContent = '处理中...';
+ confirmBtn.style.opacity = '0.7';
+ cancelBtn.disabled = true;
+
+ try {
+ const result = await API.changePassword(CONFIG.soldierId, oldPwd, newPwd);
+
+ if (result.ok) {
+ showResult(true, '密码修改成功');
+ } else {
+ showResult(false, result.error || '修改失败');
+ }
+ } catch (e) {
+ // 如果后端不可用，使用离线模式
+ const demoAccounts = {
+ 'soldier_001': '123456',
+ 'soldier_002': '123456',
+ 'soldier_003': '123456'
+ };
+
+ const currentPwd = demoAccounts[CONFIG.soldierId];
+ if (!currentPwd || oldPwd !== currentPwd) {
+ showResult(false, '原密码错误');
+ return;
+ }
+
+ showResult(true, '密码修改成功');
+ }
+ });
+
+ btnGroup.appendChild(cancelBtn);
+ btnGroup.appendChild(confirmBtn);
+ content.appendChild(btnGroup);
+
+ modal.appendChild(content);
+ document.body.appendChild(modal);
+
+ // 点击背景关闭
+ modal.addEventListener('click', (e) => {
+ if (e.target === modal) {
+ document.body.removeChild(modal);
+ }
+ });
+ }
+
// ===== 轮询 =====
function startPolling() {
if (pollTimer) clearInterval(pollTimer);
@@ -758,7 +1299,8 @@ const App = (() => {
router,
back,
submitDemand,
- selectDropPoint,
+ selectDropPointFromList,
+ selectDropPointFromMap,
confirmDropPoint,
searchDropPoint,
selectSearchResult,
@@ -770,6 +1312,8 @@ const App = (() => {
showToast,
showServerConfig,
toggleSwitch,
+ toggleTheme,
+ showChangePasswordModal,
doLogin,
doRegister,
fillLogin,
diff --git a/src/单兵终端APP/node_modules/@capacitor/android/capacitor/build/.transforms/cd6f5e2cb23a7915c09abd40da45a7b1/results.bin b/src/单兵终端APP/node_modules/@capacitor/android/capacitor/build/.transforms/cd6f5e2cb23a7915c09abd40da45a7b1/results.bin
new file mode 100644
index 0000000..0d259dd
--- /dev/null
+++ b/src/单兵终端APP/node_modules/@capacitor/android/capacitor/build/.transforms/cd6f5e2cb23a7915c09abd40da45a7b1/results.bin
@@ -0,0 +1 @@
+o/classes
diff --git a/src/单兵终端APP/node_modules/@capacitor/android/capacitor/build/.transforms/cd6f5e2cb23a7915c09abd40da45a7b1/transformed/classes/classes_dex/classes.dex b/src/单兵终端APP/node_modules/@capacitor/android/capacitor/build/.transforms/cd6f5e2cb23a7915c09abd40da45a7b1/transformed/classes/classes_dex/classes.dex
new file mode 100644
index 0000000000000000000000000000000000000000..e62d64ad7b38a27a1ecc889187c430b7b6037eab
GIT binary patch
literal 196248
zcmbrn37k&l8~=ab&y0OA_9ZbG*_Uh~`!e=@Y}tmG2$MY;`>rH3)`X