From d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:20:27 +0800
Subject: [PATCH] 处理工单下发代码冲突
---
src/store/modules/settings.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 2455a1e..5963b15 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -5,8 +5,8 @@
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = {
title: '',
- theme: storageSetting.theme || '#409EFF',
- sideTheme: storageSetting.sideTheme || sideTheme,
+ theme: '#409EFF',
+ sideTheme: "#409EFF",
showSettings: showSettings,
topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
--
Gitblit v1.8.0