tt-help-cli-ycl 1.3.65 → 1.3.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.65",
+  "version": "1.3.72",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/cli/attach.js

@@ -134,7 +134,9 @@ export async function handleAttach(options) {
     `[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}${countryStr}`,
   );
 
-  const scraper = new TikTokScraper(effectiveProxy || null);
+  const scraper = new TikTokScraper({
+    proxyServer: effectiveProxy || null,
+  });
   const shutdown = async (signal) => {
     if (shuttingDown) return;
     shuttingDown = true;

package/src/cli/refresh.js

@@ -380,6 +380,7 @@ export async function handleRefresh(options) {
           maxFollowing: exploreMaxFollowing || 100,
           maxFollowers: exploreMaxFollowers || 100,
           location: exploreLocation,
+          locationMode: "refresh",
           browser,
           proxyServer: cdpOptions.proxyServer || null,
         },
@@ -405,6 +406,7 @@ export async function handleRefresh(options) {
             maxFollowing: exploreMaxFollowing || 100,
             maxFollowers: exploreMaxFollowers || 100,
             location: exploreLocation,
+            locationMode: "refresh",
             browser,
             proxyServer: cdpOptions.proxyServer || null,
           },
@@ -443,6 +445,7 @@ export async function handleRefresh(options) {
               maxFollowing: exploreMaxFollowing || 100,
               maxFollowers: exploreMaxFollowers || 100,
               location: exploreLocation,
+              locationMode: "refresh",
               browser,
               proxyServer: cdpOptions.proxyServer || null,
             },
@@ -525,10 +528,20 @@ export async function handleRefresh(options) {
 
       processedCount++;
 
-      const guessedLocation = result.locationCreated || null;
+      // refresh 模式：confirmedLocation 是二次确认的国家，写入 confirmed_location 列
+      // locationCreated 保持原始值不变
+      const refreshLocation =
+        result.confirmedLocation || result.locationCreated;
+      const guessedLocation = refreshLocation || null;
+
+      // 把 confirmedLocation 合并到 userInfo 中（通过 commitRedoJob 写入 DB）
+      const refreshUserInfo = { ...(result.userInfo || {}) };
+      if (result.confirmedLocation) {
+        refreshUserInfo.confirmedLocation = result.confirmedLocation;
+      }
 
       const payload = {
-        userInfo: result.userInfo || {},
+        userInfo: refreshUserInfo,
         discoveredFollowing: (result.discoveredFollowing || []).map((f) => ({
           handle: Array.isArray(f) ? f[0] : f,
           displayName: Array.isArray(f) ? f[1] : null,
@@ -542,7 +555,6 @@ export async function handleRefresh(options) {
         processed: result.processed,
         hasFollowData: result.hasFollowData,
         keepFollow: result.keepFollow,
-        locationCreated: result.locationCreated,
         noVideo: result.noVideo,
         collectedVideos: result.collectedVideos,
       };
@@ -555,7 +567,7 @@ export async function handleRefresh(options) {
           {
             sourceUser: username,
             videoList: result.videoList,
-            locationCreated: result.locationCreated,
+            locationCreated: refreshLocation,
             ttSeller: result.userInfo?.ttSeller || false,
           },
         );

package/src/scraper/explore-core.js

@@ -23,6 +23,7 @@ async function processExplore(page, username, options, log) {
     maxFollowing = 50,
     maxFollowers = 50,
     location = DEFAULT_TARGET_LOCATIONS_CSV,
+    locationMode = "explore", // "explore" | "refresh"
     proxyServer = null,
   } = options;
 
@@ -91,10 +92,12 @@ async function processExplore(page, username, options, log) {
       return result;
     }
 
-    // 从最多 5 个视频并发获取 locationCreated。
-    // 新规则：采样列表里只要有任一国家命中目标列表，就直接采用该国家；否则回退到众数。
-    const SAMPLE_SIZE = 5;
+    // 国家采样判断
+    // explore 模式：采样 5 个，优先命中目标国家，不匹配则回退众数 → 写 locationCreated
+    // refresh 模式：采样 7 个，纯众数逻辑 → 写 confirmedLocation（二次确认）
+    const SAMPLE_SIZE = locationMode === "refresh" ? 7 : 5;
     let locationCreated = null;
+    let confirmedLocation = null;
     let locationDecision = null;
     const sampleVideos = videoArray.slice(0, SAMPLE_SIZE);
     if (sampleVideos.length > 0) {
@@ -108,34 +111,48 @@ async function processExplore(page, username, options, log) {
         `  国家采样(${locations.length}个): [${locations.filter(Boolean).join(", ") || "无数据"}]`,
       );
       const normalizedLocations = normalizeLocationList(locations, []);
-      const matchedTargetLocation = findFirstMatchingLocation(
-        normalizedLocations,
-        locationList,
-      );
+
+      // 统计频率
       const freq = {};
       for (const key of normalizedLocations) {
         freq[key] = (freq[key] || 0) + 1;
       }
       const entries = Object.entries(freq).sort((a, b) => b[1] - a[1]);
-      if (matchedTargetLocation) {
-        locationCreated = matchedTargetLocation;
-        locationDecision = "命中目标国家";
-      } else if (entries.length > 0) {
-        locationCreated = entries[0][0];
-        locationDecision = "回退众数";
+
+      if (locationMode === "refresh") {
+        // refresh 模式：纯众数逻辑 → 写 confirmedLocation
+        if (entries.length > 0) {
+          confirmedLocation = entries[0][0];
+          locationDecision = `众数 (${entries[0][1]}次)`;
+        }
+      } else {
+        // explore 模式：优先命中目标国家，不匹配则回退众数
+        const matchedTargetLocation = findFirstMatchingLocation(
+          normalizedLocations,
+          locationList,
+        );
+        if (matchedTargetLocation) {
+          locationCreated = matchedTargetLocation;
+          locationDecision = "命中目标国家";
+        } else if (entries.length > 0) {
+          locationCreated = entries[0][0];
+          locationDecision = "回退众数";
+        }
       }
     }
 
     result.locationCreated = locationCreated || null;
+    result.confirmedLocation = confirmedLocation || null;
     log(
-      `  国家: ${result.locationCreated || "未知"}${locationDecision ? ` (${locationDecision})` : ""}`,
+      `  国家: ${result.confirmedLocation || result.locationCreated || "未知"}${locationDecision ? ` (${locationDecision})` : ""}`,
     );
 
-    // 国家筛选
-    const isTargetLocation = isLocationInList(
-      result.locationCreated,
-      locationList,
-    );
+    // 国家筛选：refresh 模式用 confirmedLocation，explore 模式用 locationCreated
+    const effectiveLocation =
+      locationMode === "refresh"
+        ? result.confirmedLocation
+        : result.locationCreated;
+    const isTargetLocation = isLocationInList(effectiveLocation, locationList);
 
     if (isTargetLocation) {
       result.keepFollow = true;

package/src/watch/data-store.js

@@ -104,6 +104,8 @@ function initUserDb(filePath) {
       comment_count INTEGER DEFAULT 0,
       guessed_location TEXT,
       location_created TEXT,
+      confirmed_location TEXT,
+      modified_at INTEGER,
       follower_count INTEGER DEFAULT 0,
       following_count INTEGER DEFAULT 0,
       heart_count INTEGER DEFAULT 0,
@@ -132,6 +134,12 @@ function initUserDb(filePath) {
   if (!existingJobColumns.has("latest_video_time")) {
     db.exec(`ALTER TABLE jobs ADD COLUMN latest_video_time INTEGER`);
   }
+  if (!existingJobColumns.has("confirmed_location")) {
+    db.exec(`ALTER TABLE jobs ADD COLUMN confirmed_location TEXT`);
+  }
+  if (!existingJobColumns.has("modified_at")) {
+    db.exec(`ALTER TABLE jobs ADD COLUMN modified_at INTEGER`);
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS raw_jobs (
       unique_id TEXT PRIMARY KEY,
@@ -151,6 +159,8 @@ function initUserDb(filePath) {
       comment_count INTEGER DEFAULT 0,
       guessed_location TEXT,
       location_created TEXT,
+      confirmed_location TEXT,
+      modified_at INTEGER,
       follower_count INTEGER DEFAULT 0,
       following_count INTEGER DEFAULT 0,
       heart_count INTEGER DEFAULT 0,
@@ -180,6 +190,12 @@ function initUserDb(filePath) {
   if (!existingRawJobColumns.has("latest_video_time")) {
     db.exec(`ALTER TABLE raw_jobs ADD COLUMN latest_video_time INTEGER`);
   }
+  if (!existingRawJobColumns.has("confirmed_location")) {
+    db.exec(`ALTER TABLE raw_jobs ADD COLUMN confirmed_location TEXT`);
+  }
+  if (!existingRawJobColumns.has("modified_at")) {
+    db.exec(`ALTER TABLE raw_jobs ADD COLUMN modified_at INTEGER`);
+  }
   db.exec(`
     CREATE TABLE IF NOT EXISTS videos (
       id TEXT PRIMARY KEY,
@@ -1415,6 +1431,8 @@ function getTargetUsersByCountryFromDb(targetLocations = []) {
         tt_seller,
         verified,
         location_created,
+        confirmed_location,
+        modified_at,
         latest_video_time,
         refresh_time,
         status,
@@ -1490,6 +1508,8 @@ const writableJobColumns = new Set([
   "comment_count",
   "guessed_location",
   "location_created",
+  "confirmed_location",
+  "modified_at",
   "follower_count",
   "following_count",
   "heart_count",
@@ -3201,6 +3221,29 @@ export function createStore(filePath) {
     return { ok: true, userUpdateCount: user.userUpdateCount };
   }
 
+  function updateUserLocation(uniqueId, location) {
+    if (db) {
+      const existing = db
+        .prepare("SELECT * FROM jobs WHERE unique_id = ?")
+        .get(uniqueId);
+      if (!existing) return { error: "user not found" };
+      const now = Date.now();
+      db.prepare(
+        "UPDATE jobs SET location_created = ?, modified_at = ?, updated_at = ? WHERE unique_id = ?",
+      ).run(location, now, now, uniqueId);
+      return { ok: true, location, modifiedAt: now };
+    }
+
+    const user = getUser(uniqueId);
+    if (!user) return { error: "user not found" };
+    user.locationCreated = location;
+    user.modifiedAt = Date.now();
+    user.updatedAt = Date.now();
+    user.userUpdateCount = (user.userUpdateCount || 0) + 1;
+    save();
+    return { ok: true, location, modifiedAt: user.modifiedAt };
+  }
+
   function batchUpdateUserInfo(updates) {
     if (db) {
       const txn = db.transaction((items) =>
@@ -3503,6 +3546,7 @@ export function createStore(filePath) {
     commitRedoJob,
     getPendingUserUpdateTasks,
     updateUserInfo,
+    updateUserLocation,
     batchUpdateUserInfo,
     reportClientError,
     deleteClientError,

package/src/watch/public/app.js

@@ -309,7 +309,7 @@ function renderTable(users) {
   for (const u of users) newUserMap[u.uniqueId] = u;
 
   el.innerHTML = users
-    .map((u) => {
+    .map((u, idx) => {
       const wasStatus = prevUserMap[u.uniqueId]?.status;
       const nowStatus = u.status;
       const changed =
@@ -345,6 +345,11 @@ function renderTable(users) {
       const fans = u.followerCount != null ? formatNum(u.followerCount) : "-";
       const videos = u.videoCount != null ? u.videoCount : "-";
       const loc = u.locationCreated || "-";
+      const confirmedLoc = u.confirmedLocation
+        ? u.confirmedLocation === u.locationCreated
+          ? `<span style="color:#22c55e">${u.confirmedLocation} ✓</span>`
+          : `<span style="color:#ef4444">${u.confirmedLocation} ✗</span>`
+        : "-";
       const latestVideo = u.latestVideoTime
         ? formatTime(u.latestVideoTime * 1000)
         : "-";
@@ -377,6 +382,7 @@ function renderTable(users) {
           ? `<span class="tag error" style="font-size:10px">${u.statusCode}</span>`
           : "";
       return `<tr${rowClass}>
+      <td style="text-align:right;color:#555;padding-right:8px;font-size:12px">${idx + 1}</td>
       <td class="user-id" data-label="用户名">@${u.uniqueId}</td>
       <td data-label="昵称">${nick}</td>
       <td data-label="粉丝">${fans}</td>
@@ -520,6 +526,123 @@ function closeAddModal() {
   if (overlay) overlay.remove();
 }
 
+// ========== 国家修改模态框 ==========
+
+const TARGET_LOCATIONS = [
+  "AT",
+  "BE",
+  "CZ",
+  "DE",
+  "ES",
+  "FR",
+  "GR",
+  "HU",
+  "IE",
+  "IT",
+  "NL",
+  "PL",
+  "PT",
+];
+
+function openLocationModal(uniqueId, currentLocation) {
+  let overlay = document.getElementById("locationModalOverlay");
+  if (overlay) return;
+  overlay = document.createElement("div");
+  overlay.id = "locationModalOverlay";
+  overlay.className = "modal-overlay";
+  const options = TARGET_LOCATIONS.map(
+    (loc) =>
+      `<button class="loc-option ${loc === currentLocation ? "active" : ""}" onclick="selectLocation('${uniqueId}','${loc}')">${loc}</button>`,
+  ).join("");
+  overlay.innerHTML = `
+    <div class="modal" style="max-width:420px">
+      <h3>修改用户国家</h3>
+      <div class="hint">用户: @${uniqueId}，当前国家: ${currentLocation}</div>
+      <div class="loc-grid">${options}</div>
+      <div class="btn-row" style="margin-top:16px">
+        <button class="btn-cancel" onclick="closeLocationModal()">取消</button>
+      </div>
+    </div>
+  `;
+  document.body.appendChild(overlay);
+  overlay.addEventListener("click", (e) => {
+    if (e.target === overlay) closeLocationModal();
+  });
+}
+
+function closeLocationModal() {
+  const overlay = document.getElementById("locationModalOverlay");
+  if (overlay) overlay.remove();
+}
+
+async function selectLocation(uniqueId, location) {
+  closeLocationModal();
+  showLoading("正在更新...");
+  try {
+    const res = await fetch(`/api/user-location/${uniqueId}`, {
+      method: "PUT",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ location }),
+    });
+    const data = await res.json();
+    if (data.error) {
+      showToast(data.error, true);
+      return;
+    }
+    showToast(`@${uniqueId} 国家已更新为 ${location}`);
+
+    // 同步更新内存数据：将用户从旧国家组移到新国家组
+    if (currentTargetData && currentTargetData.countries) {
+      let oldCountry = null;
+      let userObj = null;
+      for (const country of currentTargetData.countries) {
+        const idx = country.users.findIndex((u) => u.uniqueId === uniqueId);
+        if (idx !== -1) {
+          oldCountry = country;
+          userObj = country.users.splice(idx, 1)[0];
+          break;
+        }
+      }
+      if (userObj) {
+        userObj.locationCreated = location;
+        userObj.modifiedAt = Date.now();
+        // 找到或创建新国家组
+        let newCountry = currentTargetData.countries.find(
+          (c) => c.country === location,
+        );
+        if (!newCountry) {
+          newCountry = { country: location, count: 0, users: [] };
+          currentTargetData.countries.push(newCountry);
+        }
+        newCountry.users.push(userObj);
+        newCountry.count = newCountry.users.length;
+        // 更新旧国家组的 count
+        if (oldCountry) oldCountry.count = oldCountry.users.length;
+        // 重新渲染左侧国家列表和表格
+        renderTargetCountryGrid(currentTargetData.countries);
+        renderTargetLocationFilter(currentTargetData.countries);
+        renderTargetTable(currentTargetData.countries);
+      }
+    }
+
+    // 只更新当前行 DOM
+    const tr = document.querySelector(`tr[data-user="${uniqueId}"]`);
+    if (tr) {
+      const locCell = tr.querySelector(".location-cell");
+      if (locCell) {
+        const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
+        locCell.className = "location-cell modified";
+        locCell.innerHTML = `${location}${editIcon}`;
+        locCell.title = `点击修改国家（已修改: ${formatTime(Date.now())})`;
+      }
+    }
+  } catch (e) {
+    showToast("更新失败: " + e.message, true);
+  } finally {
+    hideLoading();
+  }
+}
+
 async function submitAddUsers() {
   const ta = document.getElementById("modalUserInput");
   const raw = ta.value.trim();
@@ -881,8 +1004,9 @@ function renderTargetCountryGrid(countries) {
     .map((c) => {
       const pct = ((c.count / total) * 100).toFixed(1);
       const safeCountry = escapeJsString(c.country);
+      const sel = currentTargetLocation === c.country ? " selected" : "";
       return `
-      <div class="pending-country-item has-target"
+      <div class="pending-country-item has-target${sel}"
            onclick="filterTargetByCountry('${safeCountry}')">
         <div class="country-name">${c.country}</div>
         <div class="country-count">${c.count}</div>
@@ -942,12 +1066,23 @@ function renderTargetTable(countries) {
       const fans = u.followerCount != null ? formatNum(u.followerCount) : "-";
       const videos = u.videoCount != null ? u.videoCount : "-";
       const location = u.locationCreated || "-";
+      const confirmedLocation = u.confirmedLocation
+        ? u.confirmedLocation === u.locationCreated
+          ? `<span style="color:#22c55e">${u.confirmedLocation} ✓</span>`
+          : `<span style="color:#ef4444">${u.confirmedLocation} ✗</span>`
+        : "-";
       const latestVideo = u.latestVideoTime
         ? formatTime(u.latestVideoTime * 1000)
         : "-";
       const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
       const sources = (u.sources || []).join(", ");
 
+      // 修改过的国家用特殊颜色，带编辑图标
+      const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
+      const locationCell = u.modifiedAt
+        ? `<td data-label="国家" class="location-cell modified" onclick="openLocationModal('${u.uniqueId}','${location}')" title="点击修改国家（已修改: ${formatTime(u.modifiedAt)}）">${location}${editIcon}</td>`
+        : `<td data-label="国家" class="location-cell" onclick="openLocationModal('${u.uniqueId}','${location}')" title="点击修改国家">${location}${editIcon}</td>`;
+
       let statusTag = "";
       if (u.status === "done")
         statusTag = '<span class="tag processed">已完成</span>';
@@ -961,16 +1096,15 @@ function renderTargetTable(countries) {
         statusTag = '<span class="tag error">受限</span>';
       else statusTag = u.status || "-";
 
-      return `<tr>
+      return `<tr data-user="${u.uniqueId}">
       <td class="user-id" data-label="用户名">@${u.uniqueId}</td>
       <td data-label="昵称">${nick}</td>
       <td data-label="粉丝">${fans}</td>
       <td data-label="视频">${videos}</td>
-      <td data-label="国家">${location}</td>
+      ${locationCell}
+      <td data-label="确认国家" style="font-size:11px">${confirmedLocation}</td>
       <td data-label="最近发布" style="font-size:11px;color:#888">${latestVideo}</td>
       <td data-label="最近刷新" style="font-size:11px;color:#888">${refreshTime}</td>
-      <td data-label="来源">${sources || "-"}</td>
-      <td data-label="状态">${statusTag}</td>
     </tr>`;
     })
     .join("");
@@ -980,7 +1114,10 @@ function filterTargetByCountry(country) {
   currentTargetLocation = country;
   const sel = document.getElementById("targetLocationFilter");
   if (sel) sel.value = country;
+  const btn = document.getElementById("targetReprocessBtn");
+  if (btn) btn.style.display = "";
   if (currentTargetData) {
+    renderTargetCountryGrid(currentTargetData.countries || []);
     renderTargetTable(currentTargetData.countries || []);
   }
 }
@@ -989,6 +1126,7 @@ function onTargetLocationChange() {
   const sel = document.getElementById("targetLocationFilter");
   currentTargetLocation = sel.value;
   if (currentTargetData) {
+    renderTargetCountryGrid(currentTargetData.countries || []);
     renderTargetTable(currentTargetData.countries || []);
   }
 }
@@ -999,11 +1137,62 @@ function clearTargetFilters() {
   const locationFilter = document.getElementById("targetLocationFilter");
   if (searchInput) searchInput.value = "";
   if (locationFilter) locationFilter.value = "";
+  const btn = document.getElementById("targetReprocessBtn");
+  if (btn) btn.style.display = "none";
   if (currentTargetData) {
+    renderTargetCountryGrid(currentTargetData.countries || []);
     renderTargetTable(currentTargetData.countries || []);
   }
 }
 
+async function reprocessTargetUsers() {
+  if (!currentTargetLocation || !currentTargetData) return;
+  const country = currentTargetLocation;
+  const countryData = currentTargetData.countries.find((c) => c.country === country);
+  const users = countryData ? countryData.users : [];
+  const search = document.getElementById("targetSearchInput")
+    ? document.getElementById("targetSearchInput").value.trim().toLowerCase()
+    : "";
+  const filtered = search
+    ? users.filter(
+        (u) =>
+          (u.uniqueId || "").toLowerCase().includes(search) ||
+          (u.nickname || "").toLowerCase().includes(search),
+      )
+    : users;
+  if (filtered.length === 0) {
+    showToast("当前筛选结果为空", true);
+    return;
+  }
+  if (
+    !confirm(
+      `确定要重新处理 ${country} 的 ${filtered.length} 个目标商家吗？\n这将重置它们的任务状态，使客户端重新采集。`,
+    )
+  ) {
+    return;
+  }
+  const userIds = filtered.map((u) => u.uniqueId);
+  showLoading("正在批量重置...");
+  try {
+    const res = await fetch("/api/jobs/batch-reset", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userIds }),
+    });
+    const data = await res.json();
+    if (data.error) {
+      showToast(data.error, true);
+      return;
+    }
+    showToast(`已重置 ${data.reset} / ${data.total} 个用户`);
+    fetchTargetData();
+  } catch (e) {
+    showToast("批量重置失败: " + e.message, true);
+  } finally {
+    hideLoading();
+  }
+}
+
 let targetSearchTimer = null;
 
 document.getElementById("targetSearchInput").addEventListener("input", () => {
@@ -1356,6 +1545,11 @@ function renderRawJobsTable(users) {
       const fans = u.followerCount != null ? formatNum(u.followerCount) : "-";
       const videos = u.videoCount != null ? u.videoCount : "-";
       const loc = u.locationCreated || "-";
+      const confirmedLocRaw = u.confirmedLocation
+        ? u.confirmedLocation === u.locationCreated
+          ? `<span style="color:#22c55e">${u.confirmedLocation} ✓</span>`
+          : `<span style="color:#ef4444">${u.confirmedLocation} ✗</span>`
+        : "-";
       const guessedLoc = u.guessedLocation || "-";
       const sources = (u.sources || []).join(", ");
       const created = u.createdAt ? formatTime(u.createdAt) : "-";
@@ -1366,6 +1560,7 @@ function renderRawJobsTable(users) {
       <td data-label="粉丝">${fans}</td>
       <td data-label="视频">${videos}</td>
       <td data-label="国家">${loc}</td>
+      <td data-label="确认国家" style="font-size:11px">${confirmedLocRaw}</td>
       <td data-label="猜测国家">${guessedLoc}</td>
       <td data-label="来源">${sources || "-"}</td>
       <td data-label="状态">${statusTag}</td>

package/src/watch/public/index.html

@@ -120,6 +120,7 @@
         <table>
           <thead>
             <tr>
+              <th style="width:40px;text-align:right;color:#666">#</th>
               <th>用户名</th>
               <th>昵称</th>
               <th>粉丝</th>
@@ -308,11 +309,8 @@
         <h3>目标商家列表</h3>
         <div class="controls">
           <input type="text" id="targetSearchInput" placeholder="搜索目标商家用户名 / 昵称...">
-          <select id="targetLocationFilter" onchange="onTargetLocationChange()"
-            style="padding:6px 10px;border:1px solid #7c3aed;border-radius:6px;background:#2a2a3a;color:#ccc;font-size:12px;cursor:pointer;outline:none;">
-            <option value="">全部国家</option>
-          </select>
           <button onclick="clearTargetFilters()">清空筛选</button>
+          <button id="targetReprocessBtn" onclick="reprocessTargetUsers()" style="display:none">重新处理</button>
         </div>
         <div class="table-scroll">
           <table>
@@ -323,10 +321,9 @@
                 <th>粉丝</th>
                 <th>视频</th>
                 <th>国家</th>
+                <th>确认国家</th>
                 <th>最近发布</th>
                 <th>最近刷新</th>
-                <th>来源</th>
-                <th>状态</th>
               </tr>
             </thead>
             <tbody id="targetTable"></tbody>

package/src/watch/public/style.css

@@ -273,6 +273,18 @@ body {
   border-color: #fe2c55;
 }
 
+#targetReprocessBtn {
+  background: #dc2626;
+  border-color: #dc2626;
+  color: #fff;
+}
+
+#targetReprocessBtn:hover {
+  background: #ef4444;
+  border-color: #ef4444;
+  color: #fff;
+}
+
 .add-users {
   display: flex;
   gap: 8px;
@@ -392,6 +404,58 @@ body {
   background: #e61944;
 }
 
+.loc-grid {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 8px;
+  margin-top: 12px;
+}
+
+.loc-option {
+  padding: 10px 8px;
+  border: 1px solid #333;
+  border-radius: 6px;
+  background: #2a2a3a;
+  color: #ccc;
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+
+.loc-option:hover {
+  border-color: #fe2c55;
+  background: rgba(254, 44, 85, 0.1);
+  color: #fe2c55;
+}
+
+.loc-option.active {
+  border-color: #fe2c55;
+  background: rgba(254, 44, 85, 0.15);
+  color: #fe2c55;
+}
+
+.location-cell {
+  cursor: pointer;
+  transition: all 0.15s;
+  position: relative;
+}
+
+.location-cell:hover {
+  background: rgba(254, 44, 85, 0.08);
+  color: #fe2c55;
+}
+
+.location-cell.modified {
+  color: #f59e0b !important;
+  font-weight: 600 !important;
+}
+
+.location-cell.modified:hover {
+  color: #fbbf24 !important;
+  background: rgba(245, 158, 11, 0.1) !important;
+}
+
 .toast {
   position: fixed;
   top: 16px;
@@ -507,8 +571,9 @@ tr.row-flash {
 }
 
 .table-scroll {
-  max-height: 500px;
+  max-height: none;
   overflow-y: auto;
+  height: 100%;
 }
 
 table {
@@ -788,6 +853,25 @@ td.user-id:hover {
   color: #a78bfa;
 }
 
+.pending-country-item.selected {
+  background: #7c3aed;
+  border-color: #a78bfa;
+  box-shadow: 0 0 16px rgba(124, 58, 237, 0.6);
+}
+
+.pending-country-item.selected .country-name {
+  color: #fff;
+  font-weight: 700;
+}
+
+.pending-country-item.selected .country-count {
+  color: #fff;
+}
+
+.pending-country-item.selected .country-label {
+  color: #ddd6fe;
+}
+
 .back-btn {
   padding: 6px 14px;
   border: 1px solid #333;
@@ -983,7 +1067,10 @@ td.user-id:hover {
 .target-page-layout {
   display: grid;
   grid-template-columns: 320px 1fr;
+  grid-template-rows: 1fr;
   gap: 16px;
+  min-height: calc(100vh - 280px);
+  align-items: stretch;
 }
 
 .target-side-card {

package/src/watch/server.js

@@ -439,6 +439,29 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
         return;
       }
 
+      const userLocationMatch = routePath.match(
+        /^\/api\/user-location\/([^/]+)$/,
+      );
+      if (req.method === "PUT" && userLocationMatch) {
+        const uniqueId = userLocationMatch[1];
+        try {
+          const body = await readBody(req);
+          const ret = store.updateUserLocation(uniqueId, body.location);
+          if (ret.error) {
+            sendJSON(res, 404, { error: ret.error });
+            return;
+          }
+          const ts = new Date().toISOString().slice(11, 19);
+          console.error(
+            `[JOB ${ts}] USER-LOCATION: ${uniqueId} → ${body.location} (modifiedAt=${ret.modifiedAt})`,
+          );
+          sendJSON(res, 200, ret);
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       if (req.method === "GET" && routePath === "/api/comment-tasks") {
         const limit = parseInt(params.limit) || 1;
         const tasks = store.getPendingCommentTasks(limit);