From b153b1ed709d9274fa82bff4ddbbc52e0c598065 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 12:18:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8Navbar=E7=BB=84=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AAiframe=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=B1=95=E7=A4=BA=E5=A4=A9=E6=B0=94=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82=E8=BF=99=E4=B8=AAiframe=E7=9A=84=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E8=A2=AB=E8=AE=BE=E7=BD=AE=E4=B8=BA500=E5=83=8F?=
 =?UTF-8?q?=E7=B4=A0=EF=BC=8C=E9=AB=98=E5=BA=A6=E4=B8=BA40=E5=83=8F?=
 =?UTF-8?q?=E7=B4=A0=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BE=B9=E6=A1=86=E8=A2=AB?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=EF=BC=8C=E6=BB=9A=E5=8A=A8=E8=A2=AB=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E6=B0=B4=E5=B9=B3=E9=97=B4=E8=B7=9D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA0=E3=80=82=E8=BF=99=E4=B8=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=BD=BF=E5=BE=97=E5=A4=A9=E6=B0=94=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8Navbar=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE=E4=B8=8A?=
 =?UTF-8?q?=E8=A2=AB=E6=AD=A3=E7=A1=AE=E5=B1=95=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 966031b..5ce2d1a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,6 +5,7 @@
 
     <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container"/>
     <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container"/>
+    <iframe width="500" height="40" frameborder="0" scrolling="no" hspace="0" src="https://i.tianqi.com/?c=code&a=getcode&id=40&icon=1"></iframe>
 
 
 

From 0c71d9828bfa50f832031ad046c8e06f24b7dd2f Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 12:21:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E5=AE=9A=E4=BD=8D=E5=A4=A9?=
 =?UTF-8?q?=E6=B0=94=E5=B0=8F=E9=83=A8=E4=BB=B6=E4=BB=A5=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2=E4=B8=80=E8=87=B4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将天气小部件从独立位置移动到右菜单内，以提高可读性和美观性。此更改通过整合天气小部件与用户界面的其余部分，创造了更和谐的视觉体验。
---
 src/layout/components/Navbar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5ce2d1a..7d322c2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,11 +5,12 @@
 
     <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container"/>
     <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container"/>
-    <iframe width="500" height="40" frameborder="0" scrolling="no" hspace="0" src="https://i.tianqi.com/?c=code&a=getcode&id=40&icon=1"></iframe>
 
 
 
     <div class="right-menu">
+      <iframe width="500" height="40" frameborder="0" scrolling="no" hspace="0" src="https://i.tianqi.com/?c=code&a=getcode&id=40&icon=1"></iframe>
+
       <el-button  @click="drawerTru"  type="primary" style="margin: 10px 0;">
         <i class="el-icon-s-comment"></i>
       </el-button>