xiaoou/puxiaohu-smarthome-release
0
0
Fork 0
Code Activity

fix: 旁路全局变量，api+loadDevices直读localStorage+raw fetch

Browse Source
This commit is contained in:
xiaoou
2026-07-10 14:23:13 +08:00
parent 5567d6a09d
commit e0357da44d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
welcome.html
View File

@ -97,10 +97,13 @@ var API = ''; // 同源，使用相对路径
var token = localStorage.getItem('pxh_token');
async function api(method, path, body) {
var opts = { method: method, headers: {'Content-Type': 'application/json'} };
var t = token || localStorage.getItem('pxh_token');
if (t) opts.headers['Authorization'] = 'Bearer ' + t;
if (body) opts.body = JSON.stringify(body);
var opts = { method: method };
if (body) { opts.headers = {'Content-Type': 'application/json'}; opts.body = JSON.stringify(body); }
var t = localStorage.getItem('pxh_token');
if (t) {
if (!opts.headers) opts.headers = {};
opts.headers['Authorization'] = 'Bearer ' + t;
}
var r = await fetch(API + path, opts);
return r;
}
@ -245,9 +248,9 @@ async function loadDevices() {
document.getElementById('sys-status').textContent = '运行中';
var names = { 'zone.home': '家庭区域', 'person.admin': '管理员' };
try {
if (!token) token = localStorage.getItem('pxh_token');
if (!token) { document.getElementById('sys-status').textContent = '未登录 (无token)'; return; }
var r = await api('GET', '/api/states');
var t = localStorage.getItem('pxh_token');
if (!t) { document.getElementById('sys-status').textContent = '未登录'; return; }
var r = await fetch(API + '/api/states', { headers: { 'Authorization': 'Bearer ' + t } });
if (!r.ok) throw new Error('HTTP ' + r.status + ' ' + r.statusText);
var states = await r.json();