diff --git a/.env.test b/.env.test index eb87bdc..cdc791e 100644 --- a/.env.test +++ b/.env.test @@ -2,16 +2,16 @@ ENV = test #测试ws -# VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' +VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' # 正式ws -VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' +# VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' # 正式 php VITE_API_PHP_URL = 'http://czgdoumei.sxczgkj.com/index.php/api' # 测试 -# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' +VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' # 正式 -VITE_API_URL = 'https://cashierclient.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 0b8ea67..33bc60f 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1 +1,201 @@ -"use strict";const o=require("path"),e=require("electron"),p=require("os");let i;e.app.whenReady().then(()=>{i=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?i.loadURL(process.env.VITE_DEV_SERVER_URL):i.loadFile(o.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(n,t)=>{i=null,e.app.exit()}),e.ipcMain.on("getPrintList",()=>{i.webContents.getPrintersAsync().then(n=>{i.webContents.send("printList",n)})}),e.ipcMain.on("getOSmacSync",()=>{let n="";p.networkInterfaces().WLAN?(n=p.networkInterfaces().WLAN[0].mac,console.log("wlan.mac===",n)):(n=p.networkInterfaces().以太网[0].mac,console.log("以太网.mac===",n)),i.webContents.send("getOSmacRes",n)});const r=new e.BrowserWindow({show:!1,width:464,height:1726,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?r.loadFile(o.join(__dirname,"../public/print.html")):r.loadFile(o.resolve(__dirname,"../dist/print.html")),e.ipcMain.on("printerInfoSync",(n,t)=>{r.webContents.send("getParams",t)}),e.ipcMain.on("printStart",(n,t)=>{console.log(t);let a=JSON.parse(t).deviceName;r.webContents.print({silent:!0,deviceName:a,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}})});const s=new e.BrowserWindow({show:!1,width:464,height:1726,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?s.loadFile(o.join(__dirname,"../public/work_print.html")):s.loadFile(o.resolve(__dirname,"../dist/work_print.html")),e.ipcMain.on("printerWorkSync",(n,t)=>{s.webContents.send("getParams",t)}),e.ipcMain.on("printWorkStart",(n,t)=>{let a=JSON.parse(t).deviceName;s.webContents.print({silent:!0,deviceName:a,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}})});const l=new e.BrowserWindow({show:!1,width:360,height:240,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?l.loadFile(o.join(__dirname,"../public/tag_print.html")):l.loadFile(o.resolve(__dirname,"../dist/tag_print.html")),e.ipcMain.on("printerTagSync",(n,t)=>{console.log(t),l.webContents.send("getParams",t)}),e.ipcMain.on("printTagStart",(n,t)=>{let a=JSON.parse(t).deviceName;l.webContents.print({silent:!0,deviceName:a,pageSize:{width:45e3,height:3e4},scaleFactor:80,landscape:!1,margins:{marginType:"none",top:0,bottom:0,left:0,right:0},dpi:{horizontal:203,vertical:203}})}),e.app.requestSingleInstanceLock()?e.app.on("second-instance",(n,t,c)=>{i&&(i.isMinimized()&&i.restore(),i.focus(),i.show())}):e.app.quit(),i.on("close",n=>{n.preventDefault(),i.webContents.send("showCloseDialog")})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()}); +"use strict"; +const path = require("path"); +const electron = require("electron"); +const os = require("os"); +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) => { + win = null; + electron.app.exit(); + }); + electron.ipcMain.on("getPrintList", () => { + win.webContents.getPrintersAsync().then((res) => { + win.webContents.send("printList", res); + }); + }); + electron.ipcMain.on("getOSmacSync", () => { + let mac = ""; + if (os.networkInterfaces().WLAN) { + mac = os.networkInterfaces().WLAN[0].mac; + console.log("wlan.mac===", mac); + } else { + mac = os.networkInterfaces()["以太网"][0].mac; + console.log("以太网.mac===", mac); + } + win.webContents.send("getOSmacRes", mac); + }); + 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 + } + }); + }); + const workPrintWin = new electron.BrowserWindow({ + show: false, + width: 464, + height: 1726, + webPreferences: { + nodeIntegration: true, + contextIsolation: false + } + }); + if (process.env.VITE_DEV_SERVER_URL) { + workPrintWin.loadFile(path.join(__dirname, "../public/work_print.html")); + } else { + workPrintWin.loadFile(path.resolve(__dirname, "../dist/work_print.html")); + } + electron.ipcMain.on("printerWorkSync", (event, arg) => { + workPrintWin.webContents.send("getParams", arg); + }); + electron.ipcMain.on("printWorkStart", (event, arg) => { + const _parmas = JSON.parse(arg); + let name = _parmas.deviceName; + workPrintWin.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 + } + }); + }); + const tagPrintWin = new electron.BrowserWindow({ + show: false, + width: 360, + height: 240, + webPreferences: { + nodeIntegration: true, + contextIsolation: false + } + }); + if (process.env.VITE_DEV_SERVER_URL) { + tagPrintWin.loadFile(path.join(__dirname, "../public/tag_print.html")); + } else { + tagPrintWin.loadFile(path.resolve(__dirname, "../dist/tag_print.html")); + } + electron.ipcMain.on("printerTagSync", (event, arg) => { + console.log(arg); + tagPrintWin.webContents.send("getParams", arg); + }); + electron.ipcMain.on("printTagStart", (event, arg) => { + const _parmas = JSON.parse(arg); + let name = _parmas.deviceName; + tagPrintWin.webContents.print({ + silent: true, + deviceName: name, + pageSize: { + width: 45e3, + height: 3e4 + }, + scaleFactor: 80, + landscape: false, + margins: { + marginType: "none", + top: 0, + bottom: 0, + left: 0, + right: 0 + }, + dpi: { + horizontal: 203, + vertical: 203 + } + }); + }); + const gotTheLock = electron.app.requestSingleInstanceLock(); + if (!gotTheLock) { + electron.app.quit(); + } else { + electron.app.on("second-instance", (event, commandLine, workingDirectory) => { + if (win) { + if (win.isMinimized()) + win.restore(); + win.focus(); + win.show(); + } + }); + } + win.on("close", (e) => { + e.preventDefault(); + win.webContents.send("showCloseDialog"); + }); +}); +electron.app.on("window-all-closed", () => { + if (process.platform !== "darwin") + electron.app.quit(); +}); diff --git a/package.json b/package.json index e76a9be..a94c5a9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "vite-electron", "private": true, - "version": "1.4.6", + "version": "1.4.7", "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", diff --git a/src/api/order/index.js b/src/api/order/index.js index 5d51f98..294ee95 100644 --- a/src/api/order/index.js +++ b/src/api/order/index.js @@ -29,10 +29,10 @@ export function orderorderDetail(params) { * @param {*} params * @returns */ -export function payreturnOrder(data, pwd) { +export function payreturnOrder(data, pwd, isOnline) { return request({ method: "post", - url: `pay/returnOrder?pwd=${pwd}`, + url: `pay/returnOrder?pwd=${pwd}&isOnline=${isOnline}`, data, }); } diff --git a/src/views/device/index.vue b/src/views/device/index.vue index e81ec66..53d978f 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -141,10 +141,10 @@ const deviceRoute = ref({ }); async function statusChange(e, item) { - console.log(e, item); try { await tbPrintMachinePost(item, "put"); tbPrintMachineGetAjax(); + printStore.init(); } catch (error) { console.log(error); } diff --git a/src/views/group_buy/components/scanGroup.vue b/src/views/group_buy/components/scanGroup.vue index d004632..d3d051c 100644 --- a/src/views/group_buy/components/scanGroup.vue +++ b/src/views/group_buy/components/scanGroup.vue @@ -157,14 +157,20 @@ async function groupOrdergroupScanHandle() { break; case 2: { - groupDetailLoading.value = true - let encrypted_codes = douyin_table.value.getSelectionRows().map(item => item.encrypted_code) - console.log(encrypted_codes); - const res = await douyincertificateprepare({ - verify_token: groupDetail.value.verify_token, - encrypted_codes: encrypted_codes.join(','), - id: groupDetail.value.id - }) + let encrypted_codes = douyin_table.value.getSelectionRows() + if (encrypted_codes.length) { + groupDetailLoading.value = true + let arr = encrypted_codes.map(item => item.encrypted_code) + console.log(encrypted_codes); + const res = await douyincertificateprepare({ + verify_token: groupDetail.value.verify_token, + encrypted_codes: arr.join(','), + id: groupDetail.value.id + }) + } else { + ElMessage.error('请选择核销项目') + return + } } break; default: @@ -261,7 +267,7 @@ const inputChange = _.debounce(function (e) { }, 500); function show() { - global.updateData(true) + global.updateData(false) dialogVisible.value = true; setTimeout(() => { inputRef.value.focus(); @@ -269,7 +275,7 @@ function show() { } function close() { - global.updateData(false) + global.updateData(true) dialogVisible.value = false; } diff --git a/src/views/group_buy/index.vue b/src/views/group_buy/index.vue index 7be5fc0..43e66bf 100644 --- a/src/views/group_buy/index.vue +++ b/src/views/group_buy/index.vue @@ -103,8 +103,9 @@ @@ -231,16 +232,19 @@ function typeChange(e) { default: break; } + tableData.status = '' + tableData.page = 1 + tableData.list = [] + groupOrderlistAjax() } // 状态 function statusFilter(t) { - return statusList.find(item => item.value == t)?.label + return originStatus.find(item => item.value == t)?.label } // 分页变化 function paginationChange(e) { - tableData.page = e groupOrderlistAjax() } @@ -307,7 +311,6 @@ async function groupOrderlistAjax() { onMounted(() => { typeChange(tableData.type) - groupOrderlistAjax() }) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 12cb482..cebb9f5 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -12,19 +12,23 @@ {{ masterId }}
- - - - 快捷收银 +
+ + + + 快捷收银 +
- - - - {{ memberInfo.telephone }} +
+ + + + {{ memberInfo.telephone }} +
@@ -418,7 +422,7 @@ onMounted(() => { .menu { background-color: var(--el-color-warning); color: #fff; - width: 100px; + width: 60px; display: flex; align-items: center; justify-content: center; @@ -437,7 +441,7 @@ onMounted(() => { } .number { - flex: 1; + width: 50px; display: flex; align-items: center; justify-content: center; @@ -450,24 +454,31 @@ onMounted(() => { } .select_user { + flex: 1; display: flex; align-items: center; + justify-content: space-between; background-color: var(--el-color-info-light-8); padding: 0 var(--el-font-size-base); - .icon { - color: var(--el-color-primary); - font-size: 18px; - } + .left { + display: flex; + align-items: center; - .t { - font-size: var(--el-font-size-base); - padding: 0 10px; + .icon { + color: var(--el-color-primary); + font-size: 20px; + } + + .t { + font-size: var(--el-font-size-base); + margin-left: 4px; + } } .arrow { color: #999; - font-size: 20px; + font-size: 16px; position: relative; top: 2px; } diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 308c93a..39ca5a8 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -15,8 +15,10 @@
暂无数据
- + 暂无数据
- + 暂无数据 - + @@ -251,9 +257,12 @@ ￥{{ refundamount > 0 ? refundamount : "0.00" }} +
+ 手动退款 +
+ @click="payreturnOrderclick(true)"> 支付退回 支付退回... @@ -322,9 +331,12 @@ const buttonloading = ref(); //loading function dateConfirm(time) { ordereData.startTime = time[0] ordereData.endTime = time[1] + ordereData.page = 1 asyncorderfindOrder(); } +// 是否线上退款 +const isOnline = ref(true) // 获取支付密码 async function passwordSuccess(pwd) { try { @@ -345,7 +357,7 @@ async function passwordSuccess(pwd) { }); if (arr.length != 0) { // await payreturnOrder(arr, md5(pwd)); - await payreturnOrder(arr, ''); + await payreturnOrder(arr, '', isOnline.value); changechecked.value = false; recharge.value = false; itemboxshow.value = false; @@ -355,7 +367,7 @@ async function passwordSuccess(pwd) { asyncorderfindOrder(); } else { buttonloading.value = false; - ElMessage.error("以没有退款项目！"); + ElMessage.error("没有退款项目！"); } } catch (error) { buttonloading.value = false; @@ -363,7 +375,9 @@ async function passwordSuccess(pwd) { } const payreturnOrderclick = lodash.debounce( - async () => { + async (e) => { + console.log(e); + isOnline.value = e //搜索手机号 if (refundamount.value == 0) { buttonloading.value = false; @@ -866,19 +880,13 @@ onMounted(() => { position: relative; display: flex; flex-direction: column; - align-items: center; .recharge_footer_itemright_botton_boxoneabsolute { - position: absolute; - top: 0; - left: 0; color: #c0c0c0; } .recharge_footer_itemright_botton_boxonetext { font-size: 26px; - height: 60px; - line-height: 60px; } } diff --git a/src/views/table/components/tableInfo.vue b/src/views/table/components/tableInfo.vue index c284444..c518386 100644 --- a/src/views/table/components/tableInfo.vue +++ b/src/views/table/components/tableInfo.vue @@ -30,7 +30,7 @@