From bb554a28d2b58f8dcb4c1098aa19fa52e310fe68 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Thu, 11 Jul 2024 14:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=BF=9B=E8=A1=8Cmd5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 151 +++++++++++++++++---------------- src/components/fastPayCard.vue | 3 +- src/views/order/index.vue | 3 +- 3 files changed, 80 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index dcedad9..ff43abb 100644 --- a/package.json +++ b/package.json @@ -1,76 +1,77 @@ { - "name": "vite-electron", - "private": true, - "version": "1.3.44", - "main": "dist-electron/main.js", - "scripts": { - "dev": "chcp 65001 && vite", - "build": "node ./addVersion.js && vite build && electron-builder", - "preview": "vite preview", - "build:win": "node ./addVersion.js && vite build && electron-builder --w" - }, - "dependencies": { - "@element-plus/icons-vue": "^2.3.1", - "axios": "^1.6.2", - "dayjs": "^1.11.10", - "electron-pos-printer": "^1.3.6", - "electron-pos-printer-vue": "^1.0.9", - "element-plus": "^2.4.3", - "lodash": "^4.17.21", - "pinia": "^2.1.7", - "qrcode": "^1.5.3", - "reconnecting-websocket": "^4.4.0", - "serialport": "^12.0.0", - "swiper": "^11.1.1", - "uuid": "^10.0.0", - "vue": "^3.3.8", - "vue-router": "^4.2.5" - }, - "devDependencies": { - "@vitejs/plugin-vue": "^4.5.0", - "electron": "^28.2.3", - "electron-builder": "^24.13.3", - "electron-rebuild": "^3.2.9", - "path": "^0.12.7", - "sass": "^1.69.5", - "sass-loader": "^13.3.2", - "tree-kill": "^1.2.2", - "vite": "^5.0.0", - "vite-plugin-electron": "^0.15.4", - "vite-plugin-electron-renderer": "^0.14.5" - }, - "build": { - "appId": "com.cashierdesktop.app", - "productName": "银收客", - "asar": true, - "files": [ - "./dist/**/*", - "./dist-electron/**/*" - ], - "directories": { - "buildResources": "build", - "output": "release" - }, - "win": { - "icon": "./public/logo.ico", - "target": [ - { - "target": "nsis", - "arch": [ - "ia32" - ] - } - ] - }, - "nsis": { - "oneClick": false, - "allowElevation": true, - "allowToChangeInstallationDirectory": true, - "installerIcon": "./public/logo.ico", - "uninstallerIcon": "./public/logo.ico", - "installerHeaderIcon": "./public/logo.ico", - "createDesktopShortcut": true, - "createStartMenuShortcut": true - } - } -} \ No newline at end of file + "name": "vite-electron", + "private": true, + "version": "1.3.44", + "main": "dist-electron/main.js", + "scripts": { + "dev": "chcp 65001 && vite", + "build": "node ./addVersion.js && vite build && electron-builder", + "preview": "vite preview", + "build:win": "node ./addVersion.js && vite build && electron-builder --w" + }, + "dependencies": { + "@element-plus/icons-vue": "^2.3.1", + "axios": "^1.6.2", + "dayjs": "^1.11.10", + "electron-pos-printer": "^1.3.6", + "electron-pos-printer-vue": "^1.0.9", + "element-plus": "^2.4.3", + "js-md5": "^0.8.3", + "lodash": "^4.17.21", + "pinia": "^2.1.7", + "qrcode": "^1.5.3", + "reconnecting-websocket": "^4.4.0", + "serialport": "^12.0.0", + "swiper": "^11.1.1", + "uuid": "^10.0.0", + "vue": "^3.3.8", + "vue-router": "^4.2.5" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^4.5.0", + "electron": "^28.2.3", + "electron-builder": "^24.13.3", + "electron-rebuild": "^3.2.9", + "path": "^0.12.7", + "sass": "^1.69.5", + "sass-loader": "^13.3.2", + "tree-kill": "^1.2.2", + "vite": "^5.0.0", + "vite-plugin-electron": "^0.15.4", + "vite-plugin-electron-renderer": "^0.14.5" + }, + "build": { + "appId": "com.cashierdesktop.app", + "productName": "银收客", + "asar": true, + "files": [ + "./dist/**/*", + "./dist-electron/**/*" + ], + "directories": { + "buildResources": "build", + "output": "release" + }, + "win": { + "icon": "./public/logo.ico", + "target": [ + { + "target": "nsis", + "arch": [ + "ia32" + ] + } + ] + }, + "nsis": { + "oneClick": false, + "allowElevation": true, + "allowToChangeInstallationDirectory": true, + "installerIcon": "./public/logo.ico", + "uninstallerIcon": "./public/logo.ico", + "installerHeaderIcon": "./public/logo.ico", + "createDesktopShortcut": true, + "createStartMenuShortcut": true + } + } +} diff --git a/src/components/fastPayCard.vue b/src/components/fastPayCard.vue index e61b953..d73f84f 100644 --- a/src/components/fastPayCard.vue +++ b/src/components/fastPayCard.vue @@ -97,6 +97,7 @@ import { } from "@/api/member/index.js"; import { useUser } from "@/store/user.js"; import { clearNoNum } from "@/utils"; +import md5 from "js-md5"; import scanModal from "@/components/payCard/scanModal.vue"; import { ElMessage } from "element-plus"; @@ -155,7 +156,7 @@ async function passwordSuccess(e) { shopId: store.userInfo.shopId, memberId: props.userInfo.id, amount: money.value, - pwd: e, + pwd: md5(e), }); payLoading.value = false; ElMessage.success("支付成功"); diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 54ef883..b8ba6e1 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -413,6 +413,7 @@ import { import add from "@/views/order/components/add.vue"; import cashTable from "@/views/order/components/cashTable.vue"; import { clearNoNum } from "@/utils"; +import md5 from "js-md5"; import { useGlobal } from "@/store/global.js"; @@ -466,7 +467,7 @@ async function passwordSuccess(pwd) { return item && item; }); if (arr.length != 0) { - await payreturnOrder(arr, pwd); + await payreturnOrder(arr, md5(pwd)); changechecked.value = false; recharge.value = false; itemboxshow.value = false;