From 75588898406c414d98706ef71374400379bea4ff Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Thu, 22 Feb 2024 09:41:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E9=93=B6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist-electron/main.js | 6 +- electron/main.js | 6 +- package.json | 1 + src/App.vue | 98 +++++- src/assets/1.webp | Bin 0 -> 17500 bytes src/components/HelloWorld.vue | 40 --- src/components/leftMenu.vue | 117 +++++++ src/components/skuModal.vue | 94 ++++++ src/main.js | 37 ++- src/router/index.js | 8 + src/views/cashier.vue | 3 + src/views/home.vue | 569 +++++++++++++++++++++++++++++++++- src/views/table.vue | 3 + 13 files changed, 905 insertions(+), 77 deletions(-) create mode 100644 src/assets/1.webp delete mode 100644 src/components/HelloWorld.vue create mode 100644 src/components/leftMenu.vue create mode 100644 src/components/skuModal.vue create mode 100644 src/views/cashier.vue create mode 100644 src/views/table.vue diff --git a/dist-electron/main.js b/dist-electron/main.js index 9db9ef0..04c71b9 100644 --- a/dist-electron/main.js +++ b/dist-electron/main.js @@ -3,10 +3,12 @@ const electron = require("electron"); electron.app.whenReady().then(() => { const win = new electron.BrowserWindow({ title: "Main window", + width: 1200, + height: 800, fullscreenable: true, - fullscreen: true, + fullscreen: false, simpleFullscreen: true, - frame: false, + frame: true, webPreferences: { // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法 nodeIntegration: true, diff --git a/electron/main.js b/electron/main.js index 2b169df..daeebae 100644 --- a/electron/main.js +++ b/electron/main.js @@ -3,10 +3,12 @@ import { app, BrowserWindow, ipcMain } from "electron"; app.whenReady().then(() => { const win = new BrowserWindow({ title: "Main window", + width: 1200, + height: 800, fullscreenable: true, - fullscreen: true, + fullscreen: false, simpleFullscreen: true, - frame: false, + frame: true, webPreferences: { // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法 nodeIntegration: true, diff --git a/package.json b/package.json index ce4050c..1ffac02 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "preview": "vite preview" }, "dependencies": { + "@element-plus/icons-vue": "^2.3.1", "axios": "^1.6.2", "element-plus": "^2.4.3", "pinia": "^2.1.7", diff --git a/src/App.vue b/src/App.vue index b21e910..8aa33d4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,18 +1,33 @@ - - - - diff --git a/src/components/leftMenu.vue b/src/components/leftMenu.vue new file mode 100644 index 0000000..e0ece87 --- /dev/null +++ b/src/components/leftMenu.vue @@ -0,0 +1,117 @@ + + + + + \ No newline at end of file diff --git a/src/components/skuModal.vue b/src/components/skuModal.vue new file mode 100644 index 0000000..68bf164 --- /dev/null +++ b/src/components/skuModal.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 11c0609..44fa672 100644 --- a/src/main.js +++ b/src/main.js @@ -5,28 +5,33 @@ import ElementPlus from "element-plus"; import zhCn from "element-plus/es/locale/lang/zh-cn"; import "element-plus/dist/index.css"; import "element-plus/theme-chalk/dark/css-vars.css"; +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import store from "./store"; -let matchMedia = window.matchMedia("(prefers-color-scheme: light)"); -setDarkMode(matchMedia.matches); -matchMedia.addEventListener("change", function () { - console.log(`当前的主题是:${this.matches ? "light" : "dark"}`); - setDarkMode(this.matches); -}); +// let matchMedia = window.matchMedia("(prefers-color-scheme: light)"); +// setDarkMode(matchMedia.matches); +// matchMedia.addEventListener("change", function () { +// console.log(`当前的主题是:${this.matches ? "light" : "dark"}`); +// setDarkMode(this.matches); +// }); -// 设置主题模式 -function setDarkMode(flag) { - if (flag) { - document.querySelector("#html").classList.add("light"); - document.querySelector("#html").classList.remove("dark"); - } else { - document.querySelector("#html").classList.add("dark"); - document.querySelector("#html").classList.remove("light"); - } -} +// // 设置主题模式 +// function setDarkMode(flag) { +// if (flag) { +// document.querySelector("#html").classList.add("light"); +// document.querySelector("#html").classList.remove("dark"); +// } else { +// document.querySelector("#html").classList.add("dark"); +// document.querySelector("#html").classList.remove("light"); +// } +// } const app = createApp(App); +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} + app.use(router); app.use(store); app.use(ElementPlus, { locale: zhCn }); diff --git a/src/router/index.js b/src/router/index.js index e372ea9..93aaba2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,6 +23,14 @@ const routes = [ }, component: () => import("@/views/register.vue"), }, + { + path: "/table", + name: "table", + meta: { + index: 1, + }, + component: () => import("@/views/table.vue"), + } ]; const router = createRouter({ diff --git a/src/views/cashier.vue b/src/views/cashier.vue new file mode 100644 index 0000000..63140d3 --- /dev/null +++ b/src/views/cashier.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/home.vue b/src/views/home.vue index 7cf0e6a..b6fbb9e 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,13 +1,568 @@ + + diff --git a/src/views/table.vue b/src/views/table.vue new file mode 100644 index 0000000..41e62f5 --- /dev/null +++ b/src/views/table.vue @@ -0,0 +1,3 @@ + \ No newline at end of file From 5250c581ab34bf96ed4553267e7676089c44c935 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Thu, 22 Feb 2024 09:43:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96redme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 29ca293..9c3dd22 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,15 @@ # Vue 3 + Vite +npm install + +npm install element-plus/icons-vue + npm run dev +npm run build + This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `