diff --git a/dist-electron/main.js b/dist-electron/main.js
index 4bb7d2b..fb9c23e 100644
--- a/dist-electron/main.js
+++ b/dist-electron/main.js
@@ -1,40 +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);
- win.webContents.openDevTools();
- } 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("printStart", (event, arg) => {
- });
-});
-electron.app.on("window-all-closed", () => {
- if (process.platform !== "darwin")
- electron.app.quit();
-});
+"use strict";const o=require("path"),e=require("electron");let n;e.app.whenReady().then(()=>{n=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?(n.loadURL(process.env.VITE_DEV_SERVER_URL),n.webContents.openDevTools()):n.loadFile(o.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(t,r)=>{e.app.quit()}),e.ipcMain.on("printStart",(t,r)=>{})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()});
diff --git a/package.json b/package.json
index 73a1754..67a7aaf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "vite-electron",
"private": true,
- "version": "1.0.13",
+ "version": "1.0.1",
"main": "dist-electron/main.js",
"scripts": {
"dev": "chcp 65001 && vite",
diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue
index 8d9a876..065c210 100644
--- a/src/components/payCard/scanModal.vue
+++ b/src/components/payCard/scanModal.vue
@@ -123,9 +123,15 @@ async function checkPayStauts() {
try {
const res = await queryOrder({ orderId: props.orderId })
if (res.status == 'closed') {
+ ElMessage.success('支付成功')
emits('success')
+ return
+ } if (res.status == 'paying') {
+ ElMessage.warning('用户支付中...')
+ return
} else {
ElMessage.error(res.payRemark || '支付失败!')
+ return
}
} catch (error) {
console.log(error)
diff --git a/src/views/home/components/goods.vue b/src/views/home/components/goods.vue
index 05dbf14..2bdf877 100644
--- a/src/views/home/components/goods.vue
+++ b/src/views/home/components/goods.vue
@@ -56,7 +56,7 @@