From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突
---
src/layout/components/Navbar.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4b85178..c3202d4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
- @toggleClick="toggleSideBar" />
+ @toggleClick="toggleSideBar" />
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
@@ -39,13 +39,13 @@
</div>
<div class="button-container">
- <el-button type="primary" @click="toScreen">鍙鍖栧ぇ灞�</el-button>
+ <el-button type="primary" @click="toScreen" size="small">鍙鍖栧ぇ灞�</el-button>
</div>
<div class="button-container">
- <el-button type="primary" @click="toSystemB">璺宠浆B绯荤粺</el-button>
+ <el-button type="primary" @click="toSystemB" size="small">璺宠浆B绯荤粺</el-button>
</div>
<div class="button-container">
- <el-button type="primary" @click="toSystemA">璺宠浆A绯荤粺</el-button>
+ <el-button type="primary" @click="toSystemA" size="small">璺宠浆A绯荤粺</el-button>
</div>
</div>
</template>
--
Gitblit v1.8.0