modified: app/amazon/__pycache__/approve.cpython-39.pyc

modified:   app/amazon/__pycache__/del_brand.cpython-39.pyc
	modified:   app/amazon/__pycache__/main.cpython-39.pyc
	modified:   app/amazon/__pycache__/match_action.cpython-39.pyc
	modified:   app/amazon/__pycache__/tool.cpython-39.pyc
	modified:   app/amazon/approve.py
	modified:   app/amazon/del_brand.py
	modified:   app/amazon/main.py
	modified:   app/amazon/match_action.py
	modified:   app/amazon/tool.py
	modified:   app/assets/delete-brand.js
	modified:   app/new_web_source/delete-brand.html

app/amazon/main.py

@@ -10,6 +10,9 @@ from amazon.approve import ApproveTask
 from amazon.match_action import MatchTak
 
 
+from amazon.tool import get_shop_info,show_notification
+
+
 class TaskMonitor:
     """任务监控器：负责监控队列并执行品牌删除任务"""
     
@@ -64,13 +67,13 @@ class TaskMonitor:
                     
                     if task_type == "delete-brand-run":
                         # 提交删除品牌任务到线程池
-                        self.log(f"接收到删除品牌任务，提交到线程池处理...")
+                        self.log(f"接收到【删除品牌】任务，提交到线程池处理...")
                         future = self.executor.submit(self._process_task_wrapper, task_data)
                         futures.append(future)
                         
                     elif task_type in task_type_info:
                         # 提交产品风险审批任务到线程池
-                        self.log(f"接收到产品风险审批任务，提交到线程池处理...")
+                        self.log(f"接收到任务，提交到线程池处理...")
                         future = self.executor.submit(self._process_approve_task_wrapper, task_data, task_type_info[task_type])
                         futures.append(future)
                         
@@ -242,10 +245,22 @@ class TaskMonitor:
                     driver = None
                 
                 # 判断是否需要登录
+                driver.tab.wait.doc_loaded(timeout=30, raise_err=False)  # 等待页面加载，避免过早判断登录状态
                 need_login = driver.need_login()
+                print("【是否需要登录】：",need_login)
                 if need_login:
                     self.log(f"店铺 {shop_name} 需要登录，正在登录...")
-                    password = ""
+                    # 获取店铺凭证
+                    response = get_shop_info(shop_name)
+                    print("【获取店铺凭证返回】：",response.text)
+                    shop_data = response.json()
+                    if not shop_data:
+                        mes = f"获取店铺凭证失败，响应数据: {shop_data.get('message', '未知错误')}"
+                        self.log(mes, "ERROR")
+                        show_notification(mes, "ERROR")
+                        continue
+
+                    password = shop_data["data"]["password"]
 
                     login_success = driver.login(password)
                     if login_success:
@@ -611,6 +626,7 @@ class TaskMonitor:
                     verify=False  # 忽略SSL证书验证
                 )
                 print("【结果提交】：",payload)
+                print("【结果提交返回】：",response.text)
                 
                 if response.status_code == 200:
                     self.log(f"结果回传成功: {url}")