add

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "b4X0GBHb95VN"
-!define PRODUCT_VERSION        		"2.1.0.4"
+!define PRODUCT_VERSION        		"2.1.0.5"
 !define PRODUCT_NAME           		"星优链接复制器"
 !define INSTALL_OUTPUT_NAME    		"XYLinks_XY.exe" 
 !define EXE_NAME               		"XYLinks.exe"
 !define PRODUCT_PATHNAME           	"XYLinks"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYLinks"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.0.4.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYLinks/lastest2.1.0.5.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYLinks/uninstallWeb/?v=2.1.0.4"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYLinks/uninstallWeb/?v=2.1.0.5"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYLinks",
-	"version": "2.1.0.4",
+	"version": "2.1.0.5",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "links",

src/renderer/components/home.vue

@@ -140,7 +140,7 @@
 											</template>
 											<template v-if="row.status == '3'">
 												<i class="el-icon-loading" style="font-size: 16px; color: #999;"></i>
-												<span>分析中...</span>
+												<span>处理中...</span>
 											</template>
 											<template v-if="row.status == '4'">
 												<i class="el-icon-error" style="font-size: 16px; color: #ed4014;"></i>
@@ -748,9 +748,9 @@
 						waitUntil = this.initDevelop().waitUntil;
 						
 						let searchReg = /^https?:\/\/(s|search).taobao.com\/search/;
-						let tbShopReg = /^https?:\/\/(?!www|item|s|search)(shop\d+|[\w-]+)\.taobao\.com(\/[^\s]*)?$/; //店铺首页
-						let tbShopReg2 = /^https?:\/\/(?!www|item|s|search)(shop\d+|[\w-]+)\.(taobao|tmall)\.com(\/(search|category)[^\s]*)?$/; // 店铺搜索和店铺分类
-						let tmallShopReg = /^https?:\/\/(?!www|list|detail|s|search)([\w-]+)\.tmall\.(com|hk)(\/[^\s]*)?$/
+						let tbShopReg = /^https?:\/\/(?!www|item|search)(shop\d+|[\w-]+)\.taobao\.com(\/[^\s]*)?$/; //店铺首页
+						let tbShopReg2 = /^https?:\/\/(?!www|item|search)(shop\d+|[\w-]+)\.(taobao|tmall)\.com(\/(search|category)[^\s]*)?$/; // 店铺搜索和店铺分类
+						let tmallShopReg = /^https?:\/\/(?!www|list|detail|search)([\w-]+)\.tmall\.(com|hk)(\/[^\s]*)?$/
 						let shopGoodsCurrentPage = 1;
 						let shopGoodstotalPage = 1;
 						let tbShopGoods = {
@@ -1092,7 +1092,7 @@
 							}else{
 								let pageHandle = await page.$$('[class=jPage]');
 								if(pageHandle && pageHandle.length > 0){
-									currentPage = await page.$eval('[class=jPage] [class*=jPageCurrent]', el => el.innerText);
+									currentPage = await page.$eval('[class=jPage] [class*=urrent]', el => el.innerText);
 									totalPage = await page.$$eval('[class=jPage] a', links => links[links.length - 2].textContent);
 								}
 							}
@@ -1371,7 +1371,7 @@
 					}else{
 						let pageHandle = await page.$$('[class=jPage]');
 						if(pageHandle && pageHandle.length > 0){
-							outCurrent = await page.$eval('[class=jPage] [class*=jPageCurrent]', el => el.innerText);
+							outCurrent = await page.$eval('[class=jPage] [class*=urrent]', el => el.innerText);
 							outTotal = await page.$$eval('[class=jPage] a', links => links[links.length - 2].textContent);
 						}
 					}
@@ -1405,7 +1405,7 @@
 					
 					return {'scrollHeight': scrollHeight, 'cHeight': cHeight, 'currentPage': currentPage, 'totalPage': totalPage}
 				}, typeStr, outCurrent, outTotal);
-				
+
 				if(pageInfo.currentPage > 0){ // 返回当前页面大于0，特殊页面分页处理
 					currentPage = pageInfo.currentPage;
 					totalPage = pageInfo.totalPage;
@@ -1435,6 +1435,9 @@
 									};
 									//主图
 									let arr1 = document.querySelectorAll('[class*=goods-list] li[class*=gl-item]');
+									if(arr1.length == 0){
+										arr1 = document.querySelectorAll('li [class*=jItem]');
+									}
 									for(let i=0; i< arr1.length; i++){
 										let href = arr1[i].querySelector('[class^=jPic] a').href;
 										let id = arr1[i].querySelector('[class^=jPic] a').dataset.sku;