From 51fe3266cee3d92887f0ea205f155039d2440331 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Wed, 3 Apr 2024 18:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist-electron/main.js | 88 +-------------------- package.json | 2 +- src/views/home/components/settleAccount.vue | 64 +++++++-------- 3 files changed, 34 insertions(+), 120 deletions(-) diff --git a/dist-electron/main.js b/dist-electron/main.js index f0016f7..205ac11 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1,87 +1 @@ -"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: 2206, - 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); - console.log(_parmas); - let name = _parmas.deviceName; - printWin.webContents.print({ - silent: true, - deviceName: name, - pageSize: { - width: 58e3, - height: 276e3 - }, - 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(); -}); +"use strict";const r=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(r.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(o,n)=>{e.app.quit()}),e.ipcMain.on("getPrintList",()=>{t.webContents.getPrintersAsync().then(o=>{t.webContents.send("printList",o)})});const i=new e.BrowserWindow({show:!1,width:464,height:2206,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?i.loadFile(r.join(__dirname,"../public/print.html")):i.loadFile(r.resolve(__dirname,"../dist/print.html")),e.ipcMain.on("printerInfoSync",(o,n)=>{i.webContents.send("getParams",n)}),e.ipcMain.on("printStart",(o,n)=>{console.log(n);const s=JSON.parse(n);console.log(s);let a=s.deviceName;i.webContents.print({silent:!0,deviceName:a,pageSize:{width:58e3,height:276e3},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()}); diff --git a/package.json b/package.json index 05c1fc5..e97f591 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vite-electron", "private": true, - "version": "1.0.18", + "version": "1.0.20", "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue index 24b599f..93e3fb8 100644 --- a/src/views/home/components/settleAccount.vue +++ b/src/views/home/components/settleAccount.vue @@ -151,47 +151,47 @@ async function bySubTypeAjax() { } async function printHandle() { + // try { + // if (!isPrint.value) return; + // if (printList.value.length) { + // const data = { + // shop_name: store.userInfo.merchantName, + // carts: props.cart, + // amount: props.amount, + // remark: props.remark, + // orderInfo: props.orderInfo, + // deviceName: printList.value[0].config.deviceName, + // createdAt: dayjs(props.orderInfo.createdAt).format( + // "YYYY-MM-DD HH:mm:ss" + // ), + // printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), + // }; + // ipcRenderer.send("printerInfoSync", JSON.stringify(data)); + // } else { + // ElMessage.error("您还没有添加打印设备"); + // } + // } catch (error) { + // console.log(error); + // } try { - if (!isPrint.value) return; - if (printList.value.length) { - const data = { - shop_name: store.userInfo.merchantName, - carts: props.cart, - amount: props.amount, - remark: props.remark, - orderInfo: props.orderInfo, - deviceName: printList.value[0].config.deviceName, - createdAt: dayjs(props.orderInfo.createdAt).format( - "YYYY-MM-DD HH:mm:ss" - ), - printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), - }; - ipcRenderer.send("printerInfoSync", JSON.stringify(data)); - } else { - ElMessage.error("您还没有添加打印设备"); - } + printLoading.value = true; + await print({ + type: "normal", + ispre: true, + orderId: props.orderInfo.id, + }); + printLoading.value = false; + ElMessage.success("打印成功"); } catch (error) { + printLoading.value = false; console.log(error); } - // try { - // printLoading.value = true - // await print({ - // type: 'normal', - // ispre: true, - // orderId: props.orderInfo.id - // }) - // printLoading.value = false - // ElMessage.success('打印成功') - // } catch (error) { - // printLoading.value = false - // console.log(error) - // } } // 订单已支付 function paySuccess() { dialogVisible.value = false; - printHandle(); + // printHandle(); emit("paySuccess"); }