From 3fea115834eea8da7fb7bbd9f10888baf0f3fe1c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 15 Aug 2025 16:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/default/header/index.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index 8b8b832..d43e1d0 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -263,18 +263,10 @@ } .headClass{ -<<<<<<< .mine // background-image: url('../resource/img/bj.png') !important; // background-repeat: no-repeat; // background-size: 100% auto; // background-color: #eef3f8 !important; background: linear-gradient(to right, #e2edff, #eef3f8) !important; -======= - // background-image: url('../resource/img/bj.png') !important; - // background-repeat: no-repeat; - // background-size: 100% auto; - // background-color: #e5f5f9 !important; - ->>>>>>> .theirs }