From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/page/index/index.vue | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index c925305..c761232 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -13,9 +13,9 @@
<div class="tags-box">
<tags />
</div>
- <search class="avue-view" v-show="isSearch"></search>
+ <search class="main-avue-view-container" v-show="isSearch"></search>
<!-- 主体视图层 -->
- <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
+ <div class="main-avue-view-container" v-show="!isSearch" v-if="isRefresh">
<router-view #="{ Component }">
<keep-alive :include="$store.getters.tagsKeep">
<component :is="Component" />
@@ -27,17 +27,16 @@
<!-- <wechat></wechat> -->
</div>
</template>
-
<script>
-import index from '@/mixins/index';
-import wechat from './wechat.vue';
+import index from '@/mixins/index'
+import wechat from './wechat.vue'
//import { validatenull } from 'utils/validate';
-import { mapGetters } from 'vuex';
-import tags from './tags.vue';
-import search from './search.vue';
-import logo from './logo.vue';
-import top from './top/index.vue';
-import sidebar from './sidebar/index.vue';
+import { mapGetters } from 'vuex'
+import tags from './tags.vue'
+import search from './search.vue'
+import logo from './logo.vue'
+import top from './top/index.vue'
+import sidebar from './sidebar/index.vue'
export default {
mixins: [index],
@@ -50,10 +49,10 @@
wechat,
},
name: 'index',
- provide() {
+ provide () {
return {
index: this,
- };
+ }
},
computed: {
...mapGetters([
@@ -65,27 +64,27 @@
'menu',
'setting',
]),
- validSidebar() {
+ validSidebar () {
return !(
(this.$route.meta || {}).menu === false || (this.$route.query || {}).menu === 'false'
- );
+ )
},
},
props: [],
methods: {
//打开菜单
- openMenu(item = {}) {
+ openMenu (item = {}) {
this.$store.dispatch('GetMenu', item.id).then(data => {
if (data.length !== 0) {
this.$router.$avueRouter.formatRoutes(data, true)
// 获取url里面的redirect
- const redirect = decodeURIComponent(this.$route.query.redirect || '');
- if (redirect){
- console.log('redirect',redirect);
- const [path, queryString] = redirect.split('?');
- const query = queryString ? Object.fromEntries(new URLSearchParams(queryString)) : {};
- this.$router.push({ path,query})
+ const redirect = decodeURIComponent(this.$route.query.redirect || '')
+ if (redirect) {
+ console.log('redirect', redirect)
+ const [path, queryString] = redirect.split('?')
+ const query = queryString ? Object.fromEntries(new URLSearchParams(queryString)) : {}
+ this.$router.push({ path, query })
}
}
//当点击顶部菜单后默认打开第一个菜单
@@ -109,15 +108,13 @@
}, itemActive.meta)
});
}*/
- });
+ })
},
},
-};
+}
</script>
<style lang="scss" scoped>
-:deep(.basic-container){
-height: none !important;}
// #avue-view{
// :deep(){
// .avue-crud__body{
@@ -129,9 +126,10 @@
// }
// }
-.tags-box{
+.tags-box {
background: transparent;
padding: 0 10px;
--el-color-primary: rgba(20, 65, 255, 1);
+ height: pxToVh(55);
}
</style>
--
Gitblit v1.9.3