From 4ea6ece75a9a7cce919919d5ca312dccf9257aee Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Wed, 13 Mar 2024 09:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=84=E6=A0=BC=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- .env.production | 3 +- package.json | 140 ++++++++++++++++++------------------ src/components/skuModal.vue | 51 ++++++------- 4 files changed, 101 insertions(+), 96 deletions(-) diff --git a/.env.development b/.env.development index b59f2dc..ecd5881 100644 --- a/.env.development +++ b/.env.development @@ -3,4 +3,5 @@ ENV = development # 本地环境接口地址 # VITE_API_URL = 'http://192.168.2.87:10587/cashier-client' -VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client' \ No newline at end of file +# VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client' +VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' \ No newline at end of file diff --git a/.env.production b/.env.production index c9256cd..65e72e0 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,5 @@ ENV = production # 线上环境接口地址 -VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' \ No newline at end of file +VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' +# VITE_API_URL = 'https://cashiernew.sxczgkj.cn/cashier-client' \ No newline at end of file diff --git a/package.json b/package.json index 2e5dfcf..179e9f1 100644 --- a/package.json +++ b/package.json @@ -1,71 +1,71 @@ { - "name": "vite-electron", - "private": true, - "version": "0.0.7", - "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", - "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": "cashier_desktop", - "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 - } - } -} + "name": "vite-electron", + "private": true, + "version": "0.0.11", + "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", + "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": "cashier_desktop", + "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 diff --git a/src/components/skuModal.vue b/src/components/skuModal.vue index 8b8ac4f..d6c4684 100644 --- a/src/components/skuModal.vue +++ b/src/components/skuModal.vue @@ -134,30 +134,33 @@ function show(item, t = 'shop') { goods.value = item type.value = t goods.value.selectSpec = JSON.parse(goods.value.selectSpec) - goods.value.selectSpec.map(item => { - let arr = [] - item.selectSpecResult.map(val => { - switch (type.value) { - case 'shop': - arr.push({ - active: false, - name: val - }) - break; - case 'cart': - // 如果从购物车选择规格需要做选中效果 - const skus = goods.value.skuName.split(',') - arr.push({ - active: !!skus.find(item => item === val), - name: val - }) - break; - - default: - break; - } - }) - item.selectSpecResult = arr + goods.value.selectSpec.map((item, index) => { + if (item.selectSpecResult.length) { + let arr = [] + item.selectSpecResult.map(val => { + switch (type.value) { + case 'shop': + arr.push({ + active: false, + name: val + }) + break; + case 'cart': + // 如果从购物车选择规格需要做选中效果 + const skus = goods.value.skuName.split(',') + arr.push({ + active: !!skus.find(item => item === val), + name: val + }) + break; + default: + break; + } + }) + item.selectSpecResult = arr + } else { + goods.value.selectSpec.splice(index, 1) + } }) console.log(goods.value) selectedSuccess()