Merge branch 'gyq' of e.coding.net:g-cphe0354/pczhuomianduan/cashierdesktop into gyq_zhuan_zhuo

This commit is contained in:
gyq 2024-12-17 15:10:35 +08:00
commit 75f32c7b3d
2 changed files with 84 additions and 84 deletions

View File

@ -1,80 +1,80 @@
{ {
"name": "vite-electron", "name": "vite-electron",
"private": true, "private": true,
"version": "1.4.25", "version": "1.4.26",
"main": "dist-electron/main.js", "main": "dist-electron/main.js",
"scripts": { "scripts": {
"dev": "chcp 65001 && vite", "dev": "chcp 65001 && vite",
"build": "node ./addVersion.js && vite build && electron-builder", "build": "node ./addVersion.js && vite build && electron-builder",
"build:test": "vite build --mode test && electron-builder", "build:test": "vite build --mode test && electron-builder",
"preview": "vite preview", "preview": "vite preview",
"build:win": "node ./addVersion.js && vite build && electron-builder --w" "build:win": "node ./addVersion.js && vite build && electron-builder --w"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"axios": "^1.6.2", "axios": "^1.6.2",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"electron-pos-printer": "^1.3.6", "electron-pos-printer": "^1.3.6",
"electron-pos-printer-vue": "^1.0.9", "electron-pos-printer-vue": "^1.0.9",
"element-plus": "^2.4.3", "element-plus": "^2.4.3",
"js-md5": "^0.8.3", "js-md5": "^0.8.3",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1", "pinia-plugin-persistedstate": "^3.2.1",
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
"reconnecting-websocket": "^4.4.0", "reconnecting-websocket": "^4.4.0",
"serialport": "^12.0.0", "serialport": "^12.0.0",
"speak-tts": "^2.0.8", "speak-tts": "^2.0.8",
"swiper": "^11.1.1", "swiper": "^11.1.1",
"uuid": "^10.0.0", "uuid": "^10.0.0",
"vue": "^3.3.8", "vue": "^3.3.8",
"vue-router": "^4.2.5" "vue-router": "^4.2.5"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "^4.5.0", "@vitejs/plugin-vue": "^4.5.0",
"electron": "^28.2.3", "electron": "^28.2.3",
"electron-builder": "^24.13.3", "electron-builder": "^24.13.3",
"electron-rebuild": "^3.2.9", "electron-rebuild": "^3.2.9",
"path": "^0.12.7", "path": "^0.12.7",
"sass": "^1.69.5", "sass": "^1.69.5",
"sass-loader": "^13.3.2", "sass-loader": "^13.3.2",
"tree-kill": "^1.2.2", "tree-kill": "^1.2.2",
"vite": "^5.0.0", "vite": "^5.0.0",
"vite-plugin-electron": "^0.15.4", "vite-plugin-electron": "^0.15.4",
"vite-plugin-electron-renderer": "^0.14.5" "vite-plugin-electron-renderer": "^0.14.5"
}, },
"build": { "build": {
"appId": "com.cashierdesktop.app", "appId": "com.cashierdesktop.app",
"productName": "银收客", "productName": "银收客",
"asar": true, "asar": true,
"files": [ "files": [
"./dist/**/*", "./dist/**/*",
"./dist-electron/**/*" "./dist-electron/**/*"
], ],
"directories": { "directories": {
"buildResources": "build", "buildResources": "build",
"output": "release" "output": "release"
}, },
"win": { "win": {
"icon": "./public/logo.ico", "icon": "./public/logo.ico",
"target": [ "target": [
{ {
"target": "nsis", "target": "nsis",
"arch": [ "arch": [
"ia32" "ia32"
] ]
} }
] ]
}, },
"nsis": { "nsis": {
"oneClick": false, "oneClick": false,
"allowElevation": true, "allowElevation": true,
"allowToChangeInstallationDirectory": true, "allowToChangeInstallationDirectory": true,
"installerIcon": "./public/logo.ico", "installerIcon": "./public/logo.ico",
"uninstallerIcon": "./public/logo.ico", "uninstallerIcon": "./public/logo.ico",
"installerHeaderIcon": "./public/logo.ico", "installerHeaderIcon": "./public/logo.ico",
"createDesktopShortcut": true, "createDesktopShortcut": true,
"createStartMenuShortcut": true "createStartMenuShortcut": true
} }
} }
} }

View File

@ -87,11 +87,11 @@ const menus = ref([
path: '/member', path: '/member',
icon: 'User' icon: 'User'
}, },
{ // {
label: '排队', // label: '',
path: '/queue', // path: '/queue',
icon: 'Timer' // icon: 'Timer'
}, // },
// { // {
// label: '', // label: '',
// path: '/work', // path: '/work',