Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin

app/amazon/del_brand.py

@@ -501,7 +501,7 @@ class AmamzonBase(ZiniaoDriver):
         try:
             pwd_input = self.tab.eles('xpath://input[@type="password"]',timeout=10)
             if len(pwd_input) > 0:
-                pwd_input[0].input(password)
+                pwd_input[0].input(password,clear=True)
             submit_btn = self.tab.eles('xpath://input[@id="signInSubmit"]',timeout=10)
             if len(submit_btn) > 0:
                 submit_btn[0].click()

app/amazon/match_action.py

@@ -127,13 +127,13 @@ class AmzoneMatchAction(AmamzonBase):
                 for sku_ele in sku_ls:
                     # solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]')
                     
-                    asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]').text
+                    asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]',timeout=10).text
                     print(f"【{self.mark_name}】ASIN {asin} 找到....")
                     if asin in already_asin:
                         print(f"【{self.mark_name}】{asin} 已经处理过了，跳过")
                         continue
 
-                    price_match = sku_ele.eles('xpath:.//div[@data-test-id="FeaturedOfferPrice"]//a[text()="匹配"]')
+                    price_match = sku_ele.eles('xpath:.//div[@data-test-id="FeaturedOfferPrice"]//a[text()="匹配"]',timeout=5)
                     if len(price_match) == 0:
                         print(f"【{self.mark_name}】{asin},没有推荐价格匹配按钮")
                         yield (asin,"无需处理")