add

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.0.5.2"
+!define PRODUCT_VERSION        		"2.0.6.0"
 !define PRODUCT_NAME           		"星优图片下载助手"
 !define INSTALL_OUTPUT_NAME    		"XYCapture_XY.exe" 
 !define EXE_NAME               		"XYCapture.exe"
 !define PRODUCT_PATHNAME           	"XYCapture"     #安装卸载项用到的KEY，注册表
 !define INSTALL_APPEND_PATH         "XYCapture"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.5.2.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.6.0.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/XYCapture/uninstallWeb/?v=2.0.5.2"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.6.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCapture",
-	"version": "2.0.5.2",
+	"version": "2.0.6.0",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "capture",

src/renderer/components/home.vue

@@ -192,6 +192,10 @@
 													<i class="el-icon-error" style="font-size: 16px; color: #ed4014;"></i>
 													<span>网络异常,请重试!</span>
 												</template>
+												<template v-if="row.status == '6'">
+													<i class="el-icon-error" style="font-size: 16px; color: #ed4014;"></i>
+													<span>验证码拦截,请手动验证!</span>
+												</template>
 											</template>
 										</vxe-column>
 										<vxe-column title="操作" width="80">
@@ -959,16 +963,20 @@
 							let start = -1;
 							let scrollInt = setInterval(async() => {
 								start ++;
-								num = await page.evaluate((start) => {
-									let scrollHeight = document.body.scrollHeight;
-									let cHeight = document.documentElement.clientHeight;
-									let num = Math.ceil(scrollHeight / cHeight);
-									window.scrollTo({
-										top: cHeight * start, 
-										behavior: "smooth" 
-									});
-									return num;
-								}, start);
+								if(this.settingArr.indexOf('detailImg') > -1){
+									let scrollHeight2 = await page.evaluate((start) => {
+										let scrollHeight = document.body.scrollHeight;
+										let cHeight = document.documentElement.clientHeight;
+										// let num = Math.ceil(scrollHeight / cHeight);
+										window.scrollTo({
+											top: cHeight * start, 
+											behavior: "smooth" 
+										});
+										return scrollHeight;
+									}, start);
+									num = Math.ceil(scrollHeight2 / cHeight);
+								}
+								
 								if(start > num || start > 200){ // 防止页面过长，滚动200次自动停止
 									urlInfo.status = '3';
 									clearInterval(scrollInt);
@@ -1454,6 +1462,7 @@
 							
 							//鼠标放在主图第一张，生成视频
 							const elementHandle = await page.$('li[class*=thumbnail--]');
+							
 							if(elementHandle){
 								const classListProperty = await elementHandle.getProperty('classList');
 								const classList = await classListProperty.jsonValue();
@@ -1464,23 +1473,43 @@
 								}
 							}
 							
+							let m1 = document.querySelectorAll('img[class^=PicGallery--thumbnailPic--]');
+							let m2 = document.querySelectorAll('img[class*=thumbnailPic--]');
+							if(document.querySelector('iframe') && m1.length == 0 && m2.length == 0){ // 出现弹窗而且没有主图，判断未拦截模式
+								await tbBrowser.close();
+								urlInfo.status = '6';
+								resolve(true);
+								this.loading = false;
+							}
+							
 							let scrollHeight = pageInfo.scrollHeight;
 							let cHeight = pageInfo.cHeight;
-							
 							let num = Math.ceil(scrollHeight / cHeight);
 							let start = -1;
 							let scrollInt = setInterval(async() => {
 								start ++;
-								num = await page.evaluate((start) => {
-									let scrollHeight = document.body.scrollHeight;
-									let cHeight = document.documentElement.clientHeight;
-									let num = Math.ceil(scrollHeight / cHeight);
-									window.scrollTo({
-										top: cHeight * start, 
-										behavior: "smooth" 
-									});
-									return num;
-								}, start);
+								if(this.settingArr.indexOf('detailImg') > -1){
+									let scrollHeight2 = await page.evaluate((start) => {
+										let scrollHeight = document.body.scrollHeight;
+										let cHeight = document.documentElement.clientHeight;
+										let obj = document.getElementById('container') || document.getElementById('content');
+										if(obj && obj.getBoundingClientRect().bottom < 100){
+											return -1;
+										}
+										window.scrollTo({
+											top: cHeight * start, 
+											behavior: "smooth" 
+										});
+										return scrollHeight;
+									}, start);
+									
+									if(scrollHeight2 > 0){
+										num = Math.ceil(scrollHeight2 / cHeight);
+									}else{
+										num = 0;
+									}
+								}
+								
 								if(start > num || start > 200){ // 防止页面过长，滚动200次自动停止
 									urlInfo.status = '3';
 									clearInterval(scrollInt);

src/renderer/components/update.vue

@@ -83,8 +83,8 @@
 				<el-collapse-item title="4、关闭浏览器后,下载任务显示处理中仍没反应" name="4">
 					<div>可能出现官网拦截，出现请拖动滑块还原拼图的情况，点击软件右上角菜单按钮，选择软件设置-账号登录，点击对应的淘宝/天猫账号，浏览器打开后手动拖动还原拼图拦截，完成后关闭浏览器即可正常使用。</div>
 				</el-collapse-item>
-				<el-collapse-item title="5、下载任务显示处理中长时间没反应或者下载文件夹内容为空" name="5">
-					<div>点击软件右上角菜单按钮，选择软件设置-清空缓存，然后重新下载任务使用。</div>
+				<el-collapse-item title="5、下载任务显示验证码拦截,请手动验证或者下载文件夹内容为空" name="5">
+					<div>点击软件右上角菜单按钮，选择软件设置-登录淘宝/天猫账号，浏览器打开后点击首页任意商品链接，手动拖动滑块验证一下，完成后关闭浏览器即可正常使用。</div>
 				</el-collapse-item>
 				<el-collapse-item title="6、淘宝/天猫下载任务提示成功但下载文件夹内容为空" name="6">
 					<div>长时间访问淘宝/天猫平台，可能触发了平台的人机验证，可以通过软件设置->账号登录->打开网页后跳转到首页，随机打开一个商品详情页手动解除一下验证，然后清理缓存重新下载或者换个账号登录重新下载即可</div>
@@ -98,9 +98,9 @@
 				<el-collapse-item title="9、报错:权限受限，请以管理员权限运行软件" name="9">
 					<div>软件权限受系统限制无法运行，需要退出软件，鼠标右击软件图标以管理员权限运行一下。</div>
 				</el-collapse-item>
-				<el-collapse-item title="10、为什么每次打开软件,需要重新登录平台账号" name="10">
+				<!-- <el-collapse-item title="10、为什么每次打开软件,需要重新登录平台账号" name="10">
 					<div>为了考虑安全性，软件在退出后会清空所有的缓存和账号信息，因此每次重新打开软件需要要求用户重新登录各个平台账号。</div>
-				</el-collapse-item>
+				</el-collapse-item> -->
 			</el-collapse>
 			<div slot="footer" class="dialog-footer-center">
 				<el-button @click="questionVisible = false;">关闭</el-button>