'add'

nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "Ds8JqlRmiiGR"
-!define PRODUCT_VERSION        		"2.0.0.0"
+!define PRODUCT_VERSION        		"2.0.2.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.0.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCapture/lastest2.0.2.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.0.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCapture/uninstallWeb/?v=2.0.2.0"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

package.json

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

src/renderer/components/header.vue

@@ -127,10 +127,14 @@
 			<div>
 				<el-divider content-position="left">账号登录</el-divider>
 				<el-row type="flex" justify="space-between">
-					<el-button size="mini" @click="toLogin('alibaba')">阿里巴巴账号</el-button>
-					<el-button size="mini" @click="toLogin('jd')">京东账号</el-button>
-					<el-button size="mini" @click="toLogin('tb')">天猫/淘宝账号</el-button>
+					<el-button size="mini" @click="toLogin('alibaba')" :loading="alibabaLoading">阿里巴巴账号</el-button>
+					<el-button size="mini" @click="toLogin('jd')" :loading="jdLoading">京东账号</el-button>
+					<el-button size="mini" @click="toLogin('tb')" :loading="tbLoading">天猫/淘宝账号</el-button>
 				</el-row>
+				<el-row style="text-align: center; margin-top: 10px;">
+					<el-link :underline="false" type="danger" style="text-align: center; font-size: 13px;">登录完成后请关闭浏览器使用</el-link>
+				</el-row>
+				
 				<el-divider content-position="left">退出设置</el-divider>
 				<el-radio-group v-model="closeType">
 				    <el-radio :label="1">最小化到系统托盘</el-radio>
@@ -207,6 +211,10 @@
 				
 				limitModal: false, // 限时购买弹窗
 				limitLogin: false, // 限时购买时的登录状态
+				
+				alibabaLoading: false,
+				jdLoading: false,
+				tbLoading: false,
 			}
 		},
         props: {
@@ -284,6 +292,10 @@
 				}else if(type == 'tb'){
 					url = 'https://login.taobao.com';
 				}
+				this[type + 'Loading'] = true;
+				setTimeout(() => {
+					this[type + 'Loading'] = false;
+				}, 2000)
 				this.$emit('login-url', url);
 			},
 			softMini() { // 软件最小化

src/renderer/components/home.vue

@@ -93,6 +93,8 @@
 										<span v-if="menuIndex == '10'">网页 - </span>
 										图片下载
 									</h3>
+									
+									<el-link v-if="tbStatus == 3" :underline="false" type="danger" style="text-align: center; font-size: 13px;">登录完成后请关闭浏览器</el-link>
 								</el-row>
 								
 								<div style="padding: 15px 0 20px;">
@@ -223,11 +225,10 @@
 		separator = '\\'
 	}
 	
-	let chromePath = process.cwd() + '\\resources\\app\\node_modules\\puppeteer\\.local-chromium\\win64-1045629\\chrome-win\\chrome.exe';
-	if (process.env.NODE_ENV == 'development') {
-	    chromePath = process.cwd() + '\\node_modules\\puppeteer\\.local-chromium\\win64-1045629\\chrome-win\\chrome.exe';
-	}
-
+	// let chromePath = process.cwd() + '\\resources\\app\\node_modules\\puppeteer\\.local-chromium\\win64-1045629\\chrome-win\\chrome.exe';
+	// if (process.env.NODE_ENV == 'development') {
+	//     chromePath = process.cwd() + '\\node_modules\\puppeteer\\.local-chromium\\win64-1045629\\chrome-win\\chrome.exe';
+	// }
 	export default {
 		name: 'landing-page',
 		components: {
@@ -516,7 +517,7 @@
 					try{
 						const tbBrowser = await puppeteer.launch({
 							headless: false,
-							executablePath: chromePath,
+							executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
 							args: ['--window-size=1280,800'],
 							userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 						});
@@ -636,7 +637,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const browser = await puppeteer.launch({
-								executablePath: chromePath,
+								executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await browser.newPage();
@@ -757,7 +758,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const browser = await puppeteer.launch({
-								executablePath: chromePath,
+								executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await browser.newPage();
@@ -825,7 +826,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const jdBrowser = await puppeteer.launch({
-								executablePath: chromePath,
+								executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await jdBrowser.newPage();
@@ -1022,7 +1023,7 @@
 					(async () => {
 						try{
 							const tbBrowser = await puppeteer.launch({
-								executablePath: chromePath,
+								executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await tbBrowser.newPage();
@@ -1094,7 +1095,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const tbBrowser = await puppeteer.launch({
-								executablePath: chromePath,
+								executablePath: puppeteer.executablePath().replace('win32-1', 'win64-1'),
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await tbBrowser.newPage();
@@ -1634,7 +1635,7 @@
 				}
 				this.loading = false;
 				this.$notify.error({
-					title: '错误',
+					title: '提示',
 					message: str
 				});
 			},