zhangqi
/
kuailelunwen_new_houtai
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改底部信息显示逻辑

pull/54/head
zq 2 months ago
parent
c235ab8167
commit
14df48de7f
5 changed files with 30 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/App.vue
  2. 13
      src/components/Breadcrumb.vue
  3. 11
      src/components/GlobalLoading1.vue
  4. 41
      src/router/index.js
  5. 3
      src/views/agent/siteList.vue

27
src/App.vue
View File

@ -18,10 +18,7 @@
<router-view />
</global-loading>
</el-main>
<!-- <el-footer v-if="showFooter"> -->
<Footer v-if="showFooter"></Footer>
<!-- </el-footer> -->
<!-- <Footer v-if="showFooter"></Footer> -->
</el-container>
</el-container>
</el-container>
@ -29,7 +26,6 @@
</template>
<script>
import SliderMenu from '@/components/SliderMenu.vue';
// import Footer from '@/components/Footer.vue';
import { mapState } from 'vuex';
import Header from './components/Header.vue';
import Breadcrumb from './components/Breadcrumb.vue';
@ -40,26 +36,6 @@ export default {
data() {
return {
isCollapse: true,
// menuData: [
// {
// index: '1',
// title: '父级菜单1',
// icon: 'el-icon-location',
// children: [
// { index: '1-1', title: '子级菜单1-1', path: '/' },
// { index: '1-2', title: 'ui页面', path: '/ui' }
// ]
// },
// {
// index: '2',
// title: '父级菜单2',
// icon: 'el-icon-menu',
// children: [
// { index: '2-1', title: '子级菜单2-1', path: '/about' },
// { index: '2-2', title: '加盟耶main', path: '/franchise' }
// ]
// }
// ]
};
},
components: {
@ -74,6 +50,7 @@ export default {
...mapState(['showSidebar', 'showFooter', 'showHeader','slidermenu','customize']) // 从Vuex映射showSidebar状态到组件的计算属性中
},
mounted() {
console.log(this.showFooter,'showFooter----');
window.addEventListener('beforeunload', this.clearStorage);
},
beforeUnmount() {

13
src/components/Breadcrumb.vue
View File

@ -7,7 +7,8 @@
<template v-if="index !== breadcrumbs.length - 1">
<router-link to="/" v-if="item.title == '首页'">
<img class="home-icon" src="@/assets/menu/home-bread.svg" alt="首页">
<SvgIcon1 :iconPath="require(`@/assets/menu/home-bread.svg`)" defaultColor="#8A9099" :size="16" activeColor="#006AFF"/>
<!-- <img class="home-icon" src="@/assets/menu/home-bread.svg" alt="首页"> -->
</router-link>
<router-link v-else :to="item.path">{{ item.title }}</router-link>
<img class="separator" src="@/assets/separator.png" alt="">
@ -22,8 +23,12 @@
</template>
<script>
import SvgIcon1 from '@/components/SvgIcon1.vue';
export default {
name: 'Breadcrumb',
components: {
SvgIcon1,
},
computed: {
breadcrumbs() {
if (this.$route.meta.hideBreadcrumb) return []
@ -60,7 +65,7 @@ export default {
}
}
</script>
<style scoped>
<style lang="scss" scoped>
.breadcrumb-container {
padding: 16px 12px;
background-color: #f5f5f5;
@ -84,6 +89,7 @@ export default {
display: flex;
align-items: center;
height: 100%;
cursor: pointer;
}
.router-link-active{
height: 100%;
@ -93,6 +99,9 @@ export default {
.breadcrumb-item a {
color: #626573;
text-decoration: none;
&:hover{
color: #006AFF;
}
}
.breadcrumb-item.active span {

11
src/components/GlobalLoading1.vue
View File

@ -1,12 +1,13 @@
<template>
<div>
<div style="height:100%">
<div class="content-loading-overlay" v-show="isLoading">
<div class="loading-content">
<div ref="animationContainer" class="animation-container"></div>
</div>
</div>
<div v-show="!isLoading">
<div style="height:100%" v-show="!isLoading">
<slot></slot>
<Footer v-if="showFooter"></Footer>
</div>
</div>
</template>
@ -14,6 +15,7 @@
import lottie from 'lottie-web'
import { mapState } from 'vuex'
import defaultAnimation from '@/assets/loadingAni.json'
import Footer from '@/components/Footer.vue';
export default {
name: 'Loading',
@ -22,8 +24,11 @@ export default {
anim: null
}
},
components: {
Footer,
},
computed: {
...mapState(['isLoading', 'loadingText'])
...mapState(['isLoading','showFooter', 'loadingText'])
},
watch: {
isLoading(newVal) {

41
src/router/index.js
View File

@ -8,16 +8,18 @@ import HomeView from '../views/HomeView.vue';
Vue.use(VueRouter)
// 侧边导航黑名单
const blackSliderList = [
'/register'
'/register','/franchise'
];
// 一级路由
const first_child_router = [
'/', '/agent/siteList', '/ui'
]
//头部导航黑名单 不需要添加头部的放置在这里，其余默认显示头部
const blackHeaderList = [];
const blackHeaderList = [
'/franchise'
];
const blackFooterList = [
'/'
'/','/franchise'
];
// const whiteSlideList = ['/', '/ui',
// '/agent/siteList',
@ -100,7 +102,10 @@ const routes = [{
{
path: '/franchise',
name: '加盟',
component: () => import( /* webpackChunkName: "franchise" */ '../views/Franchise.vue')
component: () => import( /* webpackChunkName: "franchise" */ '../views/Franchise.vue'),
meta: {
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
{
path: '/configureServicePrices',
@ -155,8 +160,6 @@ const routes = [{
showDateSelect: false
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
@ -172,8 +175,6 @@ const routes = [{
showDateSelect: true
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -187,8 +188,6 @@ const routes = [{
type: 'check_type'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -202,8 +201,6 @@ const routes = [{
type: 'check_type'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -217,8 +214,6 @@ const routes = [{
type: 'check_type'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -232,8 +227,6 @@ const routes = [{
type: 'loss'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -247,8 +240,6 @@ const routes = [{
type: 'agent'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -262,8 +253,6 @@ const routes = [{
type: 'agent'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -277,8 +266,6 @@ const routes = [{
showDateSelect: false
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -291,8 +278,6 @@ const routes = [{
type: 'purchase'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -305,8 +290,6 @@ const routes = [{
type: 'stagePurchase'
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -321,8 +304,6 @@ const routes = [{
lookMore: false
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -336,8 +317,6 @@ const routes = [{
lookMore: false
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},
@ -351,8 +330,6 @@ const routes = [{
showDateSelect: false
},
meta: {
title: '站点列表',
breadcrumbParent: '首页',
hideBreadcrumb: true // 一级页面不显示面包屑
}
},

3
src/views/agent/siteList.vue
View File

@ -101,7 +101,6 @@
</GuipDialog>
</el-form>
</div>
<Footer></Footer>
</div>
</div>
</template>
@ -109,7 +108,6 @@
<script>
import GuipTable from '@/components/GuipTable.vue';
import Footer from '@/components/Footer.vue';
import SvgIcon from '@/components/SvgIcon.vue';
import GuipSelect from '@/components/GuipSelect.vue';
import GuipButton from '@/components/GuipButton.vue';
@ -120,7 +118,6 @@ import GuipDialog from '@/components/GuipDialog.vue';
export default {
name: 'siteList',
components: {
Footer,
GuipTable,
SvgIcon,
GuipSelect,

Write Preview
Loading…
Cancel
Save