From 5b73519a2c26fea97b4dfd7f56ee6c4e5ea27dde Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 11 Sep 2025 15:55:37 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into feature/v6.0/6.0.1
---
src/page/index/setting.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/page/index/setting.vue b/src/page/index/setting.vue
index 1000fa7..9aadd4c 100644
--- a/src/page/index/setting.vue
+++ b/src/page/index/setting.vue
@@ -1,28 +1,28 @@
<template>
- <el-button
+<!-- <el-button
@click="show = true"
class="setting-icon"
type="primary"
icon="el-icon-setting"
circle
- ></el-button>
+ ></el-button>-->
<el-drawer append-to-body :with-header="false" v-model="show" size="30%">
<div class="setting">
- <h5>导航模式</h5>
+<!-- <h5>导航模式</h5>
<div class="setting-checkbox">
<el-tooltip class="item" effect="dark" content="侧边菜单布局" placement="top">
<div
@click="setting.sidebar = 'vertical'"
- class="setting-checkbox-item setting-checkbox-item--side"
+ class="setting-checkbox-item setting-checkbox-item--side"
></div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="顶部菜单布局" placement="top">
<div
@click="setting.sidebar = 'horizontal'"
- class="setting-checkbox-item setting-checkbox-item--top"
+ class="setting-checkbox-item setting-checkbox-item--top"
></div>
</el-tooltip>
- </div>
+ </div>-->
<h5>页面布局</h5>
<div class="setting-checkbox">
<div class="setting-item" v-for="(item, index) in list1" :key="index">
@@ -97,7 +97,7 @@
&-icon {
color: #666;
position: fixed;
- bottom: 200px;
+ top: 1020px;
right: 20px;
z-index: 2048;
}
--
Gitblit v1.9.3