From dc306aeff09e716f94f034c5aa808aa7c8cd92a7 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 14 Mar 2024 15:58:56 +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

---
 dist-electron/main.js                | 41 +---------------------------
 package.json                         |  2 +-
 src/components/payCard/scanModal.vue |  6 ++++
 src/views/home/components/goods.vue  | 22 +++++++++++++--
 src/views/login.vue                  |  2 +-
 5 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/dist-electron/main.js b/dist-electron/main.js
index 4bb7d2b..fb9c23e 100644
--- a/dist-electron/main.js
+++ b/dist-electron/main.js
@@ -1,40 +1 @@
-"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();
-});
+"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()});
diff --git a/package.json b/package.json
index 73a1754..67a7aaf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.0.13",
+	"version": "1.0.1",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/src/components/payCard/scanModal.vue b/src/components/payCard/scanModal.vue
index 8d9a876..065c210 100644
--- a/src/components/payCard/scanModal.vue
+++ b/src/components/payCard/scanModal.vue
@@ -123,9 +123,15 @@ async function checkPayStauts() {
     try {
         const res = await queryOrder({ orderId: props.orderId })
         if (res.status == 'closed') {
+            ElMessage.success('支付成功')
             emits('success')
+            return
+        } if (res.status == 'paying') {
+            ElMessage.warning('用户支付中...')
+            return
         } else {
             ElMessage.error(res.payRemark || '支付失败！')
+            return
         }
     } catch (error) {
         console.log(error)
diff --git a/src/views/home/components/goods.vue b/src/views/home/components/goods.vue
index 05dbf14..2bdf877 100644
--- a/src/views/home/components/goods.vue
+++ b/src/views/home/components/goods.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref } from 'vue'
 import _ from 'lodash'
 
 import skuModal from '@/components/skuModal.vue'
@@ -76,7 +76,7 @@ const emit = defineEmits(['success'])
 
 const skuModalRef = ref(null)
 
-const shopListType = ref('img')
+const shopListType = ref('text')
 
 const categoryId = ref('')
 const categorys = ref([])
@@ -172,7 +172,7 @@ async function productqueryCommodityInfoAjax() {
             categoryId: categoryId.value,
             commdityName: commdityName.value,
             page: 1,
-            pageSize: 1000,
+            pageSize: 500,
             masterId: props.masterId
         })
         goodsList.value = res
@@ -195,6 +195,22 @@ defineExpose({
 </script>
 
 <style scoped lang="scss">
+.loading_wrap {
+    display: flex;
+    justify-content: center;
+    padding: 20px 0;
+    color: #999;
+
+    .loading {
+        display: flex;
+        align-items: center;
+
+        .icon {
+            font-size: 20px;
+        }
+    }
+}
+
 .popover_wrap {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/views/login.vue b/src/views/login.vue
index 9418e5a..895d92d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -105,8 +105,8 @@ const rules = reactive({
 const submitHandle = () => {
   formRef.value.validate(async (valid) => {
     if (valid) {
+      loading.value = true;
       store.userlogin(form).then((res) => {
-        loading.value = true;
         ElMessage.success("登录成功");
         setTimeout(() => {
           router.replace({