diff --git a/dist-electron/main.js b/dist-electron/main.js index 3b14b44..a9d897e 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1,86 +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: 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(); -}); +"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()}); diff --git a/package.json b/package.json index 81695df..89df417 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vite-electron", "private": true, - "version": "1.1.9", + "version": "1.1.10", "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", diff --git a/src/api/group.js b/src/api/group.js index 69a00e9..ed90664 100644 --- a/src/api/group.js +++ b/src/api/group.js @@ -38,3 +38,16 @@ export function groupOrdergroupScan(params) { params, }); } + +/** + * 退单 + * @param {*} data + * @returns + */ +export function returnGpOrder(data) { + return request({ + method: "post", + url: "/pay/returnGpOrder", + data, + }); +} diff --git a/src/views/group_buy/components/refundDialog.vue b/src/views/group_buy/components/refundDialog.vue new file mode 100644 index 0000000..444ccc1 --- /dev/null +++ b/src/views/group_buy/components/refundDialog.vue @@ -0,0 +1,111 @@ + + + + + \ No newline at end of file diff --git a/src/views/group_buy/index.vue b/src/views/group_buy/index.vue index 09f17c7..0d0784e 100644 --- a/src/views/group_buy/index.vue +++ b/src/views/group_buy/index.vue @@ -18,8 +18,8 @@
- - + + @@ -75,10 +79,12 @@ import { groupOrderlist } from '@/api/group' import { Search, RefreshRight, MagicStick } from '@element-plus/icons-vue' import { ref, onMounted, reactive } from 'vue' import scanGroup from './components/scanGroup.vue' +import refundDialog from './components/refundDialog.vue' import { useUser } from "@/store/user.js" const store = useUser() const scanGroupRef = ref(null) +const refundDialogRef = ref(null) const tableData = reactive({ resetLoading: false, diff --git a/vite.config.js b/vite.config.js index 578cfc3..4ce8683 100644 --- a/vite.config.js +++ b/vite.config.js @@ -9,11 +9,11 @@ export default defineConfig({ server: { proxy: { '/api': { - target: 'http://192.168.2.96:10587/cashier-client', // 阿伟 + // 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.171:10587/cashier-client', // 鹏辉 - // target: 'https://cashier-client.sxczgkj.cn/cashier-client', // 测试 + target: 'https://cashier-client.sxczgkj.cn/cashier-client', // 测试 changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }