Browse Source

Merge branch 'dev-frontend' of http://gitlab.pubdata.cn/liangyibo/CameraMachine into dev-frontend

kongwenhao 8 months ago
parent
commit
3c7034a71f

+ 6 - 5
electron/config/builder.json

@@ -1,13 +1,14 @@
 {
-  "productName": "ee",
-  "appId": "com.electron.ee",
-  "copyright": "© 2025 哆啦好梦 Technology Co., Ltd.",
+  "productName": "ZhiHuiYin",
+  "appId": "valimart",
+  "copyright": "valimart",
   "directories": {
     "output": "out"
   },
   "asar": true,
   "files": [
     "**/*",
+    "dev-app-update.yml",
     "!frontend/",
     "!run/",
     "!logs/",
@@ -28,7 +29,7 @@
     "installerHeaderIcon": "build/icons/icon.ico",
     "createDesktopShortcut": true,
     "createStartMenuShortcut": true,
-    "shortcutName": "EE框架"
+    "shortcutName": "智惠映AI自动拍照机"
   },
   "publish": [
     {
@@ -59,4 +60,4 @@
     ],
     "category": "Utility"
   }
-}
+}

+ 0 - 5
frontend/src/App.vue

@@ -1,7 +1,5 @@
 
 <template>
-  <div id="app">
-
     <router-view v-slot="{ Component }">
       <keep-alive :include="keepAliveIncludes">
         <component :is="Component" />
@@ -10,9 +8,6 @@
 
     <Login v-model:dialogVisible="useUserInfoStore.loginShow" />
 
-
-
-  </div>
 </template>
 <script setup lang="ts">
 import { useRoute, useRouter } from 'vue-router'

+ 13 - 6
frontend/src/components/header-bar/index.vue

@@ -130,13 +130,12 @@ function closeWindow() {
   z-index: 100000;
   background: #fff;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  // padding: 0 10px;
 }
 
 .header-bar__menu {
+  position: absolute;
+  top: 0;
+  left: 0;
   display: flex;
   align-items: center;
 }
@@ -165,10 +164,15 @@ function closeWindow() {
 }
 
 .header-bar__title {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
   display: flex;
+  height: 30px;
+  line-height: 30px;
   align-items: center;
-  justify-content: center; /* 居中显示标题 */
-  flex: 1; /* 占据剩余空间 */
+  justify-content: center;
 }
 
 .header-bar__logo {
@@ -184,6 +188,9 @@ function closeWindow() {
 }
 
 .header-bar__buttons {
+  position: absolute;
+  top: 0;
+  right: 0;
   display: flex;
   align-items: center;
 }

+ 1 - 1
frontend/src/router/index.ts

@@ -5,7 +5,7 @@ import { authGuard } from './plugins/authGuard'
 const routes: RouteRecordRaw[] = [
     {
         path: "/",
-        redirect: "/photography/shot"
+        redirect: "/photography/check"
     },
     {
         path: "/home",

+ 1 - 1
frontend/src/views/Photography/check.vue

@@ -143,7 +143,7 @@ function takePictures() {
 
   background-color: rgba(234, 236, 237, 1);
   width: 100%;
-  min-height: 100vh;
+  min-height: calc(100vh - 30px);
   display: flex;
 }
 .check-page {

+ 1 - 2
frontend/src/views/Photography/shot.vue

@@ -806,8 +806,7 @@ function openPhotographyDetail() {
 .history-section {
         background-color: rgba(234, 236, 237, 1);
         width: 332px;
-        height: 100vh;
-        padding-top: 30px;
+        height: calc(100vh - 30px);
 
         .history-title {
           width: calc(100% - 20px);