From d266294dd3929fcc71fbcb7943527559c13a2b8a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 17 Mar 2021 17:08:27 +0800
Subject: [PATCH] 修改
---
src/page/index/top/index.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 395e94d..932e734 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -19,8 +19,14 @@
</span>
</div>
<div class="top-bar__right">
+<<<<<<< HEAD
<img src="/img/ydlg.png" style="height: 44px; vertical-align: middle;" alt="">
+=======
+
+ <img src="/img/ydlg.png" style="width: 100px;" alt="">
+
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
<el-tooltip v-if="showColor"
effect="dark"
:content="$t('navbar.color')"
--
Gitblit v1.9.3