diff --git a/.env.development b/.env.development index fc6d7b6..aca7cf5 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,5 @@ ENV = development # 本地环境接口地址 -VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' -# VITE_API_URL = 'http://192.168.2.27:10587/cashier-client' -# VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client' -# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' \ No newline at end of file +# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' +VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client' \ No newline at end of file diff --git a/.env.production b/.env.production index 1b05e5b..c9256cd 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,4 @@ ENV = production # 线上环境接口地址 -# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' -# VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client' -VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' \ No newline at end of file +VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' \ No newline at end of file diff --git a/dist-electron/main.js b/dist-electron/main.js index a9d897e..3b14b44 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1 +1,86 @@ -"use strict";const s=require("path"),e=require("electron");let t;e.app.whenReady().then(()=>{t=new e.BrowserWindow({title:"银收客",width:1024,height:768,fullscreenable:!0,fullscreen:!process.env.VITE_DEV_SERVER_URL,simpleFullscreen:!0,frame:!!process.env.VITE_DEV_SERVER_URL,webPreferences:{nodeIntegration:!0,contextIsolation:!1}}),process.env.VITE_DEV_SERVER_URL?t.loadURL(process.env.VITE_DEV_SERVER_URL):t.loadFile(s.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(r,n)=>{e.app.quit()}),e.ipcMain.on("getPrintList",()=>{t.webContents.getPrintersAsync().then(r=>{t.webContents.send("printList",r)})});const i=new e.BrowserWindow({show:!1,width:464,height:1726,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?i.loadFile(s.join(__dirname,"../public/print.html")):i.loadFile(s.resolve(__dirname,"../dist/print.html")),e.ipcMain.on("printerInfoSync",(r,n)=>{i.webContents.send("getParams",n)}),e.ipcMain.on("printStart",(r,n)=>{console.log(n);let o=JSON.parse(n).deviceName;i.webContents.print({silent:!0,deviceName:o,pageSize:{width:58e3,height:216e3},scaleFactor:80,landscape:!1,margins:{marginType:"none",top:0,bottom:0,left:0,right:0},dpi:{horizontal:203,vertical:203}})})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()}); +"use strict"; +const path = require("path"); +const electron = require("electron"); +let win; +electron.app.whenReady().then(() => { + win = new electron.BrowserWindow({ + title: "银收客", + width: 1024, + height: 768, + fullscreenable: true, + fullscreen: process.env.VITE_DEV_SERVER_URL ? false : true, + simpleFullscreen: true, + frame: process.env.VITE_DEV_SERVER_URL ? true : false, + webPreferences: { + // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法 + nodeIntegration: true, + contextIsolation: false + } + }); + if (process.env.VITE_DEV_SERVER_URL) { + win.loadURL(process.env.VITE_DEV_SERVER_URL); + } else { + win.loadFile(path.resolve(__dirname, "../dist/index.html")); + } + electron.app.on("activate", () => { + if (electron.BrowserWindow.getAllWindows().length === 0) { + createWindow(); + } + }); + electron.ipcMain.on("quitHandler", (_, msg) => { + electron.app.quit(); + }); + electron.ipcMain.on("getPrintList", () => { + win.webContents.getPrintersAsync().then((res) => { + win.webContents.send("printList", res); + }); + }); + const printWin = new electron.BrowserWindow({ + show: false, + width: 464, + height: 1726, + webPreferences: { + // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法 + nodeIntegration: true, + contextIsolation: false + } + }); + if (process.env.VITE_DEV_SERVER_URL) { + printWin.loadFile(path.join(__dirname, "../public/print.html")); + } else { + printWin.loadFile(path.resolve(__dirname, "../dist/print.html")); + } + electron.ipcMain.on("printerInfoSync", (event, arg) => { + printWin.webContents.send("getParams", arg); + }); + electron.ipcMain.on("printStart", (event, arg) => { + console.log(arg); + const _parmas = JSON.parse(arg); + let name = _parmas.deviceName; + printWin.webContents.print({ + silent: true, + deviceName: name, + pageSize: { + width: 58e3, + height: 216e3 + }, + scaleFactor: 80, + landscape: false, + margins: { + marginType: "none", + top: 0, + bottom: 0, + left: 0, + right: 0 + }, + dpi: { + horizontal: 203, + vertical: 203 + } + }); + }); +}); +electron.app.on("window-all-closed", () => { + if (process.platform !== "darwin") + electron.app.quit(); +}); diff --git a/package.json b/package.json index 49bc01f..326f7da 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vite-electron", "private": true, - "version": "1.2.6", + "version": "1.2.8", "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", diff --git a/vite.config.js b/vite.config.js index 2600931..b1aab91 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,34 +1,37 @@ -import { defineConfig } from "vite"; +import { defineConfig, loadEnv } from "vite"; import vue from "@vitejs/plugin-vue"; import electron from "vite-plugin-electron"; import electronRender from "vite-plugin-electron-renderer"; import path from "path"; // https://vitejs.dev/config/ -export default defineConfig({ - server: { - proxy: { - '/api': { - // target: 'http://192.168.2.96:10587/cashier-client', // 阿伟 - // target: 'https://cashierclient.sxczgkj.cn/cashier-client', // 线上 - // target: 'http://192.168.2.116:10587/cashier-client', // 国成 - // target: 'http://192.168.2.41:10587/cashier-client', // 鹏辉 - target: 'https://cashier-client.sxczgkj.cn/cashier-client', // 测试 - changeOrigin: true, - rewrite: (path) => path.replace(/^\/api/, '') - } - } - }, - plugins: [ - vue(), - electron({ - entry: "electron/main.js", - }), - electronRender(), - ], - resolve: { - alias: { - "@": path.resolve(__dirname, "./src"), +export default defineConfig(({ command, mode }) => { + const env = loadEnv(mode, process.cwd(), ""); + return { + server: { + proxy: { + "/api": { + target: env.VITE_API_URL, + // target: 'http://192.168.2.96:10587/cashier-client', // 阿伟 + // target: 'http://192.168.2.41:10587/cashier-client', // 鹏辉 + // target: "https://cashierclient.sxczgkj.cn/cashier-client", // 线上 + // target: 'https://cashier-client.sxczgkj.cn/cashier-client', // 测试 + changeOrigin: true, + rewrite: (path) => path.replace(/^\/api/, ""), + }, + }, }, - }, + plugins: [ + vue(), + electron({ + entry: "electron/main.js", + }), + electronRender(), + ], + resolve: { + alias: { + "@": path.resolve(__dirname, "./src"), + }, + }, + }; });