qiushang há 5 meses atrás
pai
commit
f42cf81b11
1 ficheiros alterados com 23 adições e 4 exclusões
  1. 23 4
      src/renderer/components/home.vue

+ 23 - 4
src/renderer/components/home.vue

@@ -1105,10 +1105,22 @@
 							let testUrl = 'https://www.1688.com';
 							await page.goto(testUrl, {waitUntil : 'networkidle2'});
 
-							let userDiv = await page.$('div[class^=userSimpleInfo-]');
+							const cookies = await page.cookies();
 							let loginDiv = await page.$('div[class^=userNotLogin-]');
+							const loginEle = await page.$('div[class^=loginAvatar-]');
+							let loginText = '';
+							if (loginEle) {
+								loginText = await page.evaluate(el => el.innerText, loginEle);
+							}
+							const loginCookie = cookies.find(cookie => 
+								cookie.name === '__cn_logon__'
+							);
+							let logonValue = '';
+							if(loginCookie){
+								logonValue = loginCookie.value;
+							}
 							
-							if(loginDiv){
+							if(loginDiv || loginText == '登录' || logonValue == 'false'){
 								this.alibabaStatus = 3; //未登录
 							}else{
 								this.alibabaStatus = 2;
@@ -2005,11 +2017,15 @@
 					//主图
 					let arr1 = document.querySelectorAll('img[class*="-gallery-img"]');
 					for(let i=0; i< arr1.length; i++){
+						let srcUrl = arr1[i].src;
+						if(srcUrl.endsWith('_b.jpg')){
+							srcUrl = srcUrl.replace(/_b\.jpg$/, '');
+						}
 						if(!authority && i < execNum){
-							outObj.mainImg.push(arr1[i].src);
+							outObj.mainImg.push(srcUrl);
 						}
 						if(authority){
-							outObj.mainImg.push(arr1[i].src);
+							outObj.mainImg.push(srcUrl);
 						}
 					}
 					//sku图片
@@ -2030,6 +2046,9 @@
 						if(type == 'img'){
 							src = arr2[i].src;
 						}
+						if(src.endsWith('_sum.jpg')){
+							src = src.replace(/_sum\.jpg$/, '');
+						}
 						if(!authority && i < execNum){
 							outObj.skuImg.push(src);
 						}