diff --git a/.env.development b/.env.development index 9ec5310..e246e26 100644 --- a/.env.development +++ b/.env.development @@ -3,10 +3,10 @@ ENV = development # 正式ws -VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' +# VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' #测试ws -# VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' +VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' # 阿伟本地ws # VITE_API_WSS = 'ws://192.168.2.17:9998/client' @@ -27,7 +27,7 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api' # VITE_API_URL = 'http://192.168.1.106:10589/cashier-client' # 测试 -# 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 eda7f33..05cae54 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1,115 +1 @@ -"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 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(); -}); +"use strict";const s=require("path"),e=require("electron"),a=require("os");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.loadFile(s.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(t,o)=>{n=null,e.app.exit()}),e.ipcMain.on("getPrintList",()=>{n.webContents.getPrintersAsync().then(t=>{n.webContents.send("printList",t)})}),e.ipcMain.on("getOSmacSync",()=>{let t="";a.networkInterfaces().WLAN?(t=a.networkInterfaces().WLAN[0].mac,console.log("wlan.mac===",t)):(t=a.networkInterfaces().以太网[0].mac,console.log("以太网.mac===",t)),n.webContents.send("getOSmacRes",t)});const i=new e.BrowserWindow({show:!1,width:360,height:240,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?i.loadFile(s.join(__dirname,"../public/tag_print.html")):i.loadFile(s.resolve(__dirname,"../dist/tag_print.html")),e.ipcMain.on("printerTagSync",(t,o)=>{console.log(o),i.webContents.send("getParams",o)}),e.ipcMain.on("printTagStart",(t,o)=>{let l=JSON.parse(o).deviceName;i.webContents.print({silent:!0,deviceName:l,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",(t,o,r)=>{n&&(n.isMinimized()&&n.restore(),n.focus(),n.show())}):e.app.quit(),n.on("close",t=>{t.preventDefault(),n.webContents.send("showCloseDialog")})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()}); diff --git a/src/App.vue b/src/App.vue index 551daec..6fdcdf0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -164,24 +164,6 @@ async function getBarCode(e) { } } -// 获取网络状态 -const updateInfo = _.throttle(function () { - let isOnLine = navigator.onLine - // // 获取网络信息 - // let info = navigator.connection - console.log(isOnLine); - // console.log(info); - if (store.userInfo && store.userInfo.shopId) { - if (isOnLine) { - console.log('有网了重新连接ws~'); - socket.init(); - } else { - socket.close(); - console.log('网络连接失败~'); - } - } -}, 100, { leading: true, trailing: false }) - onMounted(() => { document.addEventListener("keydown", (e) => { getBarCode(e); @@ -200,14 +182,16 @@ onMounted(() => { .catch(() => { }); }) - // listnerCloseDialog() - // // 监听网络在线状态 - // window.addEventListener("onLine", updateInfo) - // // 监听网络离线 - // window.addEventListener("offLine", updateInfo) - // 监听网络信息变化 - // navigator.connection.addEventListener('change', updateInfo) + window.addEventListener('online', function () { + console.log('有网络了'); + this.location.reload() + }) + + window.addEventListener('offline', function () { + ElMessage.warning('网络异常') + socket.close() + }) }); diff --git a/src/api/product.js b/src/api/product.js index f4c875b..822cb96 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -2,171 +2,195 @@ import request from "@/utils/request.js"; /** * 查询分类信息 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function queryCategory(params) { - return request({ - method: "get", - url: "product/queryCategory", - params - }); + return request({ + method: "get", + url: "product/queryCategory", + params, + }); } /** * 查询商品信息 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function productqueryCommodityInfo(params) { - return request({ - method: "get", - url: "product/queryCommodityInfo", - params - }); + return request({ + method: "get", + url: "product/queryCommodityInfo", + params, + }); } /** * 查询商品信息 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function queryNewCommodityInfo(params) { - return request({ - method: "get", - url: "product/queryNewCommodityInfo", - params - }); + return request({ + method: "get", + url: "product/queryNewCommodityInfo", + params, + }); } /** * 通过选中的商品规格查询价格 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function queryProductSku(params) { - return request({ - method: "get", - url: "product/queryProductSku", - params - }); + return request({ + method: "get", + url: "product/queryProductSku", + params, + }); } /** * 添加购物车 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function createCart(data) { - return request({ - method: "post", - url: "/order/createCart", - data - }); + return request({ + method: "post", + url: "/order/createCart", + data, + }); } /** * 获取购物车商品 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function queryCart(params) { - return request({ - method: "get", - url: "order/queryCart", - params - }); + return request({ + method: "get", + url: "order/queryCart", + params, + }); } /** * 获取取件码 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function createCode(params) { - return request({ - method: "get", - url: "/order/createCode", - params - }); + return request({ + method: "get", + url: "/order/createCode", + params, + }); } /** * 全部打包 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function packall(data) { - return request({ - method: "post", - url: "/order/packall", - data - }); + return request({ + method: "post", + url: "/order/packall", + data, + }); } /** * 删除购物车 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function delCart(params) { - return request({ - method: "get", - url: "/order/delCart", - params - }); + return request({ + method: "get", + url: "/order/delCart", + params, + }); } /** * 挂单/j激活购物车 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function cartStatus(data) { - return request({ - method: "post", - url: "/order/cartStatus", - data - }); + return request({ + method: "post", + url: "/order/cartStatus", + data, + }); } /** * 获取挂起购物车列表 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function getCartList(params) { - return request({ - method: "get", - url: "/order/getCartList", - params - }); + return request({ + method: "get", + url: "/order/getCartList", + params, + }); } /** * 清空购物车 - * @param {*} params - * @returns + * @param {*} params + * @returns */ export function clearCart(data) { - return request({ - method: "post", - url: "/order/clearCart", - data - }); + return request({ + method: "post", + url: "/order/clearCart", + data, + }); } /** * 创建订单 - * @param {*} data - * @returns + * @param {*} data + * @returns */ export function createOrder(data) { - return request({ - method: "post", - url: "/order/createOrder", - data - }); + return request({ + method: "post", + url: "/order/createOrder", + data, + }); } +/** + * 上下架售罄 + * @param {*} data + * @returns + */ +export function productStatus(data) { + return request({ + method: "PUT", + url: "/product/productStatus", + data, + }); +} +/** + * 修改库存 + * @param {*} data + * @returns + */ +export function productStock(data) { + return request({ + method: "PUT", + url: "/product/productStock", + data, + }); +} diff --git a/src/assets/icon_xq.png b/src/assets/icon_xq.png new file mode 100644 index 0000000..9798258 Binary files /dev/null and b/src/assets/icon_xq.png differ diff --git a/src/assets/xp.png b/src/assets/xp.png deleted file mode 100644 index 14a03b7..0000000 Binary files a/src/assets/xp.png and /dev/null differ diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue index 1b8a8e4..02775bf 100644 --- a/src/components/leftMenu.vue +++ b/src/components/leftMenu.vue @@ -1,10 +1,10 @@