@@ -659,6 +662,7 @@
sliderParams: null,
sliderScriptLoaded: false,
sliderListenersBound: false,
+ qrcodeFetchedAt: 0,
};
function parseSliderUrlParams(sliderUrl) {
@@ -758,21 +762,18 @@
$('btn-logout').disabled = loading;
}
- function getCommonPayload(requireProxy) {
+ function getCommonPayload() {
const key = $('key').value.trim();
const proxy = $('proxy').value.trim();
+ const device = ($('device') && $('device').value) || '';
if (!key) {
alert('请先填写账号唯一标识（key）');
return null;
}
- if (requireProxy && !proxy) {
- alert('请先填写 socks5 代理。服务器在香港，不上代理必封号。');
- return null;
- }
return {
key,
proxy: proxy || undefined,
- ipadOrMac: 'ipad',
+ ipadOrMac: device || 'ipad',
};
}
@@ -1025,15 +1026,37 @@
}
}
+ async function onCheckProxy() {
+ var proxyInput = ($('proxy') && $('proxy').value || '').trim();
+ var url = '/api/check-proxy';
+ if (proxyInput) url += '?proxy=' + encodeURIComponent(proxyInput);
+ log('正在检测代理…' + (proxyInput ? '（使用当前填写的代理）' : '（使用环境变量或 KDL）'));
+ var btn = $('btn-check-proxy');
+ if (btn) btn.disabled = true;
+ try {
+ var data = await callApi(url);
+ if (data && data.ok) {
+ log('代理正常。来源: ' + (data.source || '') + (data.proxy_preview ? '，代理: ' + data.proxy_preview : ''), 'ok');
+ } else {
+ log('代理不可用: ' + (data && data.error ? data.error : JSON.stringify(data)), 'error');
+ }
+ } catch (e) {
+ log('检测代理失败: ' + (e.message || e), 'error');
+ } finally {
+ if (btn) btn.disabled = false;
+ }
+ }
+
async function onGetQrCode(forceMac) {
- const payload = getCommonPayload(true);
+ const payload = getCommonPayload();
if (!payload) return;
setLoading(true);
try {
- log(forceMac ? '重新取码(Mac)，用于无数字时走滑块…' : '请求登录二维码(iPad)...');
+ var deviceLabel = forceMac ? 'Mac' : (payload.ipadOrMac || 'ipad');
+ log(forceMac ? '重新取码(Mac)…' : '请求登录二维码(' + deviceLabel + ')...');
const body = {
Proxy: payload.proxy || '',
- IpadOrmac: forceMac ? 'mac' : 'ipad',
+ IpadOrmac: forceMac ? 'mac' : (payload.ipadOrMac || 'ipad'),
Check: false,
force_mac: !!forceMac,
};
@@ -1055,16 +1078,19 @@
log(line2);
if (line3) log(line3);
})();
+ state.qrcodeFetchedAt = Date.now();
renderQrFromResponse(data);
- updateLoginState(forceMac ? '已用 Mac 重新取码，请手机停在确认页并完成下方滑块' : '等待扫码 / 确认中', 'pending', forceMac ? '滑块 Key=408449830，Data62 已更新' : '请在 60 秒内使用微信扫码。');
+ updateLoginState(forceMac ? '已用 Mac 重新取码，请手机停在确认页并完成下方滑块' : '等待扫码 / 确认中', 'pending', forceMac ? 'Data62 已更新，需滑块时请点「打开滑块验证」' : '请在 60 秒内使用微信扫码。');
if (forceMac && data) {
var newData62 = (data.Data && data.Data.Data62) || data.Data62 || data.data62 || '';
if (newData62) {
if (!state.sliderParams) state.sliderParams = {};
state.sliderParams.data62 = newData62;
state.sliderParams.key = state.sliderParams.key || '408449830';
- showSliderAreaAndFill(state.sliderParams);
- log('已用新 Data62 更新滑块区域，请完成滑块后到手机点确认。', 'warn');
+ state.sliderOpened = true;
+ var reopenWrap = $('slider-reopen-wrap');
+ if (reopenWrap) reopenWrap.style.display = 'block';
+ log('Mac 取码成功，Data62 已更新。上方显示二维码/返回内容；需滑块时请点击「打开滑块验证」。', 'warn');
}
}
if (state.pollingScan) clearInterval(state.pollingScan);
@@ -1095,14 +1121,17 @@
const d = obj.Data && typeof obj.Data === 'object' ? obj.Data : obj;
const stateVal = d.state ?? d.State;
- // 后端返回滑块 path，在当前页右侧替换为滑块区域并自动填充参数
+ // 后端返回滑块 path，在当前页右侧替换为滑块区域并自动填充参数（取码后 15 秒内不自动切，避免未出码就进验证）
const sliderUrl = data.slider_url;
- if (sliderUrl && typeof sliderUrl === 'string') {
+ var allowSliderSwitch = !state.qrcodeFetchedAt || (Date.now() - state.qrcodeFetchedAt) > 15000;
+ if (sliderUrl && typeof sliderUrl === 'string' && allowSliderSwitch) {
state.sliderOpened = true;
log('需完成滑块验证，已切换到滑块验证区域。', 'warn');
const params = parseSliderUrlParams(sliderUrl);
if (params) state.sliderParams = params;
showSliderAreaAndFill(params);
+ } else if (sliderUrl && !allowSliderSwitch) {
+ log('检测到需验证，但刚取码不久，暂不自动切到滑块，请先扫码或稍后再检测。', 'warn');
}
// 检测状态是否成功登录：state==2 或 Success+已登录 等，成功后自动跳转管理页
@@ -1134,11 +1163,14 @@
} else {
updateLoginState(needVerify || sliderUrl ? '请完成滑块验证' : '正在确认登录状态…', 'pending',
needVerify || sliderUrl ? '扫码完成，请完成验证后登录' : '');
- // 判定到需验证时直接切换验证模块，不等用户点「检测扫码状态」；有 slider_url 已在上方填参，无则先切过去，后续轮询会带参
+ // 判定到需验证时切换验证模块；取码后 15 秒内不自动切，避免未出码就进验证
if (needVerify || sliderUrl) {
- state.sliderOpened = true;
- if (!sliderUrl) log('需完成滑块验证，已切换到滑块验证区域，等待参数…', 'warn');
- showSliderAreaAndFill(state.sliderParams || {});
+ var allowSwitch = !state.qrcodeFetchedAt || (Date.now() - state.qrcodeFetchedAt) > 15000;
+ if (allowSwitch) {
+ state.sliderOpened = true;
+ if (!sliderUrl) log('需完成滑块验证，已切换到滑块验证区域，等待参数…', 'warn');
+ showSliderAreaAndFill(state.sliderParams || {});
+ }
}
}
} else {
@@ -1214,6 +1246,10 @@
e.preventDefault();
onWake();
});
+ $('btn-check-proxy') && $('btn-check-proxy').addEventListener('click', function(e) {
+ e.preventDefault();
+ onCheckProxy();
+ });
$('btn-show-slider') && $('btn-show-slider').addEventListener('click', function() {
if (state.sliderParams) showSliderAreaAndFill(state.sliderParams);
});
diff --git a/public/manage.html b/public/manage.html
index fea7400..3d3c9f4 100644
--- a/public/manage.html
+++ b/public/manage.html
@@ -146,11 +146,11 @@
-
+
-
在下方「客户档案」中维护的标签会出现在下拉列表；可多选，发送时仅推送给带这些标签的客户。
+
在下方「客户档案」中维护的标签会出现在下拉列表；可多选，发送时仅推送给带这些标签的客户。支持获取联系人列表。
@@ -165,9 +165,10 @@
+
已选 0 人
-
+
@@ -630,6 +631,28 @@
}
let massSelectedWxids = [];
+ /** 快速群发可选列表（好友+客户合并去重）：{ wxid, name, source?: 'friend'|'customer' } */
+ let massContactList = [];
+
+ function renderMassContactList() {
+ const el = $('mass-friend-list');
+ if (!el) return;
+ if (!massContactList.length) {
+ el.innerHTML = '
请点击「加载联系人」或「加载客户」获取列表。';
+ return;
+ }
+ el.innerHTML = massContactList.map(f => {
+ const wxid = (f.wxid || '').toString();
+ const name = (f.name || wxid).toString();
+ const checked = massSelectedWxids.includes(wxid) ? ' checked' : '';
+ const badge = f.source === 'customer' ? '
[客户]' : '';
+ return '
';
+ }).join('');
+ el.querySelectorAll('.mass-friend-cb').forEach(cb => {
+ cb.addEventListener('change', updateMassSelected);
+ });
+ updateMassSelected();
+ }
async function loadFriendsForMass() {
const key = $('key').value.trim();
@@ -637,27 +660,55 @@
const el = $('mass-friend-list');
el.innerHTML = '
加载中…';
try {
- const data = await callApi('/api/friends?key=' + encodeURIComponent(key), { cache: 'no-store' });
+ const data = await callApi('/api/contact-list?key=' + encodeURIComponent(key) + '&refresh=1', { cache: 'no-store' });
const list = data.items || [];
- if (!list.length) {
- el.innerHTML = '
暂无联系人，请先在「客户档案」添加客户。';
+ massContactList = list.map(f => {
+ const wxid = (f.wxid || f.Wxid || f.UserName || '').toString();
+ const name = (f.remark_name || f.RemarkName || f.nick_name || f.NickName || wxid).toString();
+ return { wxid, name, source: 'friend' };
+ }).filter(f => f.wxid);
+ if (!massContactList.length) {
+ el.innerHTML = '
暂无联系人。可点击「加载客户」从客户档案选择。';
return;
}
- el.innerHTML = list.map(f => {
- const wxid = (f.wxid || f.Wxid || f.UserName || '').toString();
- const name = (f.remark_name || f.RemarkName || f.NickName || wxid).toString();
- return '
';
- }).join('');
- el.querySelectorAll('.mass-friend-cb').forEach(cb => {
- cb.addEventListener('change', updateMassSelected);
- });
- massSelectedWxids = [];
- updateMassSelected();
+ renderMassContactList();
} catch (e) {
el.innerHTML = '
加载失败: ' + escapeHtml(e.message) + '';
}
}
+ async function loadCustomersForMass() {
+ const key = $('key').value.trim();
+ if (!key) { alert('请先登录'); return; }
+ const el = $('mass-friend-list');
+ const wasEmpty = !massContactList.length;
+ if (wasEmpty) el.innerHTML = '
加载中…';
+ try {
+ const data = await callApi('/api/customers?key=' + encodeURIComponent(key));
+ const list = data.items || [];
+ const existingWxids = new Set(massContactList.map(f => f.wxid));
+ list.forEach(c => {
+ const wxid = (c.wxid || '').toString();
+ if (!wxid) return;
+ if (existingWxids.has(wxid)) return;
+ existingWxids.add(wxid);
+ massContactList.push({
+ wxid,
+ name: (c.remark_name || c.wxid || wxid).toString(),
+ source: 'customer'
+ });
+ });
+ if (!massContactList.length) {
+ el.innerHTML = '
暂无客户。请先在「客户档案」添加客户，或点击「加载联系人」获取好友列表。';
+ return;
+ }
+ renderMassContactList();
+ } catch (e) {
+ if (wasEmpty) el.innerHTML = '
加载失败: ' + escapeHtml(e.message) + '';
+ else alert('加载客户失败: ' + e.message);
+ }
+ }
+
function updateMassSelected() {
const list = $('mass-friend-list');
if (!list) return;
@@ -832,6 +883,7 @@
if ($('g-time')) { $('g-time').addEventListener('change', onGreetingTimeChange); $('g-time').addEventListener('input', onGreetingTimeChange); }
})();
$('btn-load-friends').addEventListener('click', loadFriendsForMass);
+ $('btn-load-customers-mass') && $('btn-load-customers-mass').addEventListener('click', loadCustomersForMass);
$('btn-mass-send').addEventListener('click', doMassSend);
$('btn-send-image').addEventListener('click', doSendImage);
if ($('img-file') && $('img-file-name')) {