From c68b36740f376bfd8bbce5d7e303660a7183544f Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Wed, 13 Mar 2024 18:26:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist-electron/main.js | 41 +++++++++++++++++++- src/components/leftMenu.vue | 5 +++ src/components/payCard/scanModal.vue | 6 +-- src/components/skuModal.vue | 58 +++++++++++++++------------- src/views/home/components/goods.vue | 25 +++++------- vite.config.js | 4 +- 6 files changed, 90 insertions(+), 49 deletions(-) diff --git a/dist-electron/main.js b/dist-electron/main.js index fb9c23e..4bb7d2b 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -1 +1,40 @@ -"use strict";const o=require("path"),e=require("electron");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.webContents.openDevTools()):n.loadFile(o.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(t,r)=>{e.app.quit()}),e.ipcMain.on("printStart",(t,r)=>{})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()}); +"use strict"; +const path = require("path"); +const electron = require("electron"); +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); + win.webContents.openDevTools(); + } 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) => { + electron.app.quit(); + }); + electron.ipcMain.on("printStart", (event, arg) => { + }); +}); +electron.app.on("window-all-closed", () => { + if (process.platform !== "darwin") + electron.app.quit(); +}); diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue index 8541ce1..b68b050 100644 --- a/src/components/leftMenu.vue +++ b/src/components/leftMenu.vue @@ -159,6 +159,11 @@ const menus = ref([ justify-content: center; align-items: center; text-decoration: none; + /* 去除下划线 */ + color: inherit; + /* 继承父元素的颜色 */ + cursor: pointer; + /* 修改鼠标指针样式 */ &:first-child { border-bottom: 1px solid #666; diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue index 6da2457..3614b65 100644 --- a/src/components/payCard/scanModal.vue +++ b/src/components/payCard/scanModal.vue @@ -107,14 +107,10 @@ async function submitHandle() { async function checkPayStauts() { try { const res = await queryOrder({ orderId: props.orderId }) - loading.value = false if (res.status == 'closed') { emits('success') - scanModalRef.value.close() } else { - checkPayStatusLoading.value = false ElMessage.error(res.payRemark || '支付失败！') - scanModalRef.value.loading = false } } catch (error) { console.log(error) @@ -254,7 +250,7 @@ defineExpose({ .pay_wait { flex: 1; padding: 0 var(--el-font-size-base); - height: 600px; + height: 400px; padding-bottom: 100px; display: flex; flex-direction: column; diff --git a/src/components/skuModal.vue b/src/components/skuModal.vue index d6c4684..60eaa11 100644 --- a/src/components/skuModal.vue +++ b/src/components/skuModal.vue @@ -134,35 +134,41 @@ function show(item, t = 'shop') { goods.value = item type.value = t goods.value.selectSpec = JSON.parse(goods.value.selectSpec) - goods.value.selectSpec.map((item, index) => { + 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 + }) + + let arr = [] + + goods.value.selectSpec.map(item => { 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) + arr.push({ ...item }) } }) - console.log(goods.value) + + goods.value.selectSpec = arr + selectedSuccess() } diff --git a/src/views/home/components/goods.vue b/src/views/home/components/goods.vue index 63d6529..05dbf14 100644 --- a/src/views/home/components/goods.vue +++ b/src/views/home/components/goods.vue @@ -33,12 +33,12 @@ -
+
{{ item.orderCount }}
- +
{{ item.name }}
@@ -78,12 +78,13 @@ const skuModalRef = ref(null) const shopListType = ref('img') +const categoryId = ref('') const categorys = ref([]) const categorysActive = ref(0) const commdityName = ref('') -const originalGoods = ref([]) +const loading = ref(false) const goodsList = ref([]) const showPopover = ref(false) @@ -140,16 +141,8 @@ function changeShopListType() { function changeCategory(item, index) { showPopover.value = false categorysActive.value = index - if (item.id) { - goodsList.value = [] - originalGoods.value.map(val => { - if (val.categoryId == item.id) { - goodsList.value.push(val) - } - }) - } else { - goodsList.value = [...originalGoods.value] - } + categoryId.value = item.id + productqueryCommodityInfoAjax() } // 查询分类信息 @@ -173,17 +166,19 @@ async function queryCategoryAjax() { // 查询商品信息 async function productqueryCommodityInfoAjax() { try { + loading.value = true const res = await productqueryCommodityInfo({ shopId: store.userInfo.shopId, - categoryId: categorys.value[categorysActive.value].id, + categoryId: categoryId.value, commdityName: commdityName.value, page: 1, pageSize: 1000, masterId: props.masterId }) - originalGoods.value = res goodsList.value = res + loading.value = false } catch (error) { + loading.value = false console.log(error) } } diff --git a/vite.config.js b/vite.config.js index 3529b0a..68564d9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -9,8 +9,8 @@ export default defineConfig({ server: { proxy: { '/api': { - // target: 'https://cashierclient.sxczgkj.cn/cashier-client', // 测试 - target: 'http://192.168.2.27:10587/cashier-client', // 国成 + target: 'https://cashierclient.sxczgkj.cn/cashier-client', // 测试 + // target: 'http://192.168.2.27:10587/cashier-client', // 国成 changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }