qiushang 11 月之前
父节点
当前提交
a6db09a8db
共有 7 个文件被更改,包括 16 次插入5 次删除
  1. 2 2
      .electron-vue/build.config.js
  2. 二进制
      nsis/skin/bg1.png
  3. 二进制
      nsis/skin/bg2.png
  4. 二进制
      nsis/skin/bgtop.png
  5. 1 1
      src/main/electronApi.js
  6. 2 2
      src/main/index.js
  7. 11 0
      src/renderer/components/home.vue

+ 2 - 2
.electron-vue/build.config.js

@@ -7,10 +7,10 @@ const dependencies = require('../package.json')
  */
 module.exports = {
   arch: 'ia32',
-  asar: false, //{ unpack: "**/bin/**"},
+  asar: false,
   dir: path.join(__dirname, '../'),
   icon: path.join(__dirname, '../build/icons/icon'),
-  ignore: /(^\/(src|test|\.[a-z]+|README|yarn|static|dist\/web))|\.gitkeep/,
+  ignore: /(^\/(src|test|\.[a-z]+|README|yarn|nsis|static|dist\/web))|\.gitkeep/,
   out: path.join(__dirname, '../build'),
   overwrite: true,
   platform: process.env.BUILD_TARGET || 'all',

二进制
nsis/skin/bg1.png


二进制
nsis/skin/bg2.png


二进制
nsis/skin/bgtop.png


+ 1 - 1
src/main/electronApi.js

@@ -15,7 +15,7 @@ var procMap = {};
 if (process.env.NODE_ENV == 'development') {
     getAllExe(path.join(__dirname, "../../bin"));
 } else {
-    getAllExe(path.join(__dirname, "../../../app.asar.unpacked/bin"));
+    getAllExe(path.join(__dirname, "../../../app/bin"));
 }
 
 function getAllExe(dir) {

+ 2 - 2
src/main/index.js

@@ -66,9 +66,9 @@ function createWindow() {
 
 	mainWindow.loadURL(winURL)
 
-	//if (process.env.NODE_ENV == 'development') {
+	if (process.env.NODE_ENV == 'development') {
 		mainWindow.webContents.openDevTools()
-	//}
+	}
 
 	mainWindow.on('close', (event) => {
 		event.preventDefault();

+ 11 - 0
src/renderer/components/home.vue

@@ -218,6 +218,11 @@
 	} else {
 		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';
+	}
 
 	export default {
 		name: 'landing-page',
@@ -479,6 +484,7 @@
 					try{
 						const tbBrowser = await puppeteer.launch({
 							headless: false,
+							executablePath: chromePath,
 							args: ['--window-size=1280,800'],
 							userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 						});
@@ -598,6 +604,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const browser = await puppeteer.launch({
+								executablePath: chromePath,
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await browser.newPage();
@@ -718,6 +725,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const browser = await puppeteer.launch({
+								executablePath: chromePath,
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await browser.newPage();
@@ -785,6 +793,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const jdBrowser = await puppeteer.launch({
+								executablePath: chromePath,
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await jdBrowser.newPage();
@@ -981,6 +990,7 @@
 					(async () => {
 						try{
 							const tbBrowser = await puppeteer.launch({
+								executablePath: chromePath,
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await tbBrowser.newPage();
@@ -1052,6 +1062,7 @@
 							urlInfo.status = '2';
 							urlInfo.num = 0;
 							const tbBrowser = await puppeteer.launch({
+								executablePath: chromePath,
 								userDataDir: os.tmpdir() + separator + 'chrome-data-capture', 
 							});
 							const page = await tbBrowser.newPage();