Merge remote-tracking branch 'origin/dev-frontend'

frontend/src/components/header-bar/index.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, reactive, onMounted, onUnmounted } from 'vue'
+import {defineProps, reactive, onMounted, onUnmounted, ref} from 'vue'
 import useUserInfo from '@/stores/modules/user'
 import { useRouter } from 'vue-router'
 import iconsz from './assets/shezhi@2x.png'
@@ -96,10 +96,12 @@ import gengxin from './assets/gengxin.svg'
 import icpList from '@/utils/ipc'
 import { getRouterUrl } from '@/utils/appfun'
 import client from '@/stores/modules/client'
+import packageJson from '@/../../package.json';
 
 const clientStore = client()
 const useUserInfoStore = useUserInfo()
 
+const currentVersion = ref(packageJson.version);
 // 定义 menu 项的类型
 interface MenuItem {
   name?: string //名称
@@ -156,7 +158,7 @@ const menuType = reactive({
     click: openDeveloper
   },
   ota: {
-    name: '版本更新',
+    name: '当前版本：'+currentVersion.value,
     click: openOTA
   }
 })

frontend/src/views/Home/index.vue

@@ -1,5 +1,10 @@
 <template>
-  <headerBar title="首页" />
+  <headerBar title="首页"
+             :menu="
+              [{
+                type:'ota'
+              }]"
+  />
   <div class="home-container" v-loading="loading">
     <!-- 背景图片 -->
     <img src="@/assets/images/home/bg.png" alt="背景图片" class="background-image" />

frontend/src/views/Photography/shot.vue

@@ -229,10 +229,10 @@ const menu = computed(()=>{
         }
       },
       {
-        type:'ota'
+        ...generate
       },
       {
-        ...generate
+        type:'ota'
       }
     ]
   }
@@ -245,10 +245,10 @@ const menu = computed(()=>{
         type:'developer'
       },
       {
-        type:'ota'
+        ...generate,
       },
       {
-          ...generate,
+        type:'ota'
       }
     ]
   }
@@ -258,6 +258,12 @@ const menu = computed(()=>{
     {
       type:'setting'
     },
+    {
+      ...generate
+    },
+    {
+      type:'ota'
+    }
   ]