提交 0830cd5e authored 作者: 龙菲's avatar 龙菲

优化部分

上级 26365705
...@@ -260,3 +260,17 @@ li { ...@@ -260,3 +260,17 @@ li {
position: relative; position: relative;
} }
} }
.list-total{
display: flex;
justify-content: flex-end;
align-items: center;
font-size: 16px;
padding: 8px 14%;
background-color: #fff;
.list-total-num{
font-size: 24px;
color: $themeSecondaryColor;
margin: 0 6px;
}
}
\ No newline at end of file
...@@ -10,6 +10,6 @@ $font-size-sm:14px; ...@@ -10,6 +10,6 @@ $font-size-sm:14px;
$font-size-base:16px; $font-size-base:16px;
$font-size-lg:22px; $font-size-lg:22px;
$nav-height: 130px; $nav-height: 120px;
$defaultFontFamily: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; $defaultFontFamily: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
'header-absolute': isAbsolute, 'header-absolute': isAbsolute,
'header-fixed ': isFixed, 'header-fixed ': isFixed,
// 'header-absolute': isHome || isBoutique, // 'header-absolute': isHome || isBoutique,
//'show-themeColor': isFixed && isHome, 'show-themeColor': showThemeColor,
isChStyle: navbarStyle == '2', isChStyle: navbarStyle == '2',
isRedStyle: navbarStyle == '3', isRedStyle: navbarStyle == '3',
isSDCS: navbarStyle == '4' && isFixed, isSDCS: navbarStyle == '4' && isFixed,
...@@ -46,7 +46,9 @@ ...@@ -46,7 +46,9 @@
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<el-button round> <el-button round>
<i class="el-icon-user"></i> <i class="el-icon-user"></i>
<span>{{hasToken?userInfo.nickName||userInfo.username:'登录'}}</span> <span>{{
hasToken ? userInfo.nickName || userInfo.username : "登录"
}}</span>
<!-- <i class="el-icon-arrow-down el-icon--right"></i> --> <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
...@@ -252,7 +254,7 @@ export default { ...@@ -252,7 +254,7 @@ export default {
path: "/ccProduct", path: "/ccProduct",
}; };
} }
if (value.params.themeType) { if (value.params.themeType) {
this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType); this.$store.commit("app/CHANGE_NAV_COLOR", value.params.themeType);
} else { } else {
this.$store.commit("app/CHANGE_NAV_COLOR", "1"); this.$store.commit("app/CHANGE_NAV_COLOR", "1");
...@@ -273,6 +275,7 @@ export default { ...@@ -273,6 +275,7 @@ export default {
}, },
"$route.path"(cur) { "$route.path"(cur) {
this.getAbsolute(cur); this.getAbsolute(cur);
this.isListPage(cur)
}, },
}, },
data() { data() {
...@@ -378,6 +381,7 @@ export default { ...@@ -378,6 +381,7 @@ export default {
}, },
], ],
isAbsolute: true, isAbsolute: true,
showThemeColor: false,
}; };
}, },
mounted() { mounted() {
...@@ -392,6 +396,7 @@ export default { ...@@ -392,6 +396,7 @@ export default {
let path = this.$route.path; let path = this.$route.path;
this.getAbsolute(path); this.getAbsolute(path);
this.isListPage(path)
}, },
methods: { methods: {
getAbsolute(path) { getAbsolute(path) {
...@@ -403,6 +408,13 @@ export default { ...@@ -403,6 +408,13 @@ export default {
this.isAbsolute = true; this.isAbsolute = true;
} }
}, },
isListPage(path) {
let listPages = ["/display", "/culturalRelic", "/museum", "/ccProduct"];
let arr = listPages.filter((item) => {
return path === item;
});
this.showThemeColor = arr.length > 0;
},
initHeight() { initHeight() {
let scrollTop = let scrollTop =
window.pageYOffset || window.pageYOffset ||
...@@ -592,18 +604,17 @@ export default { ...@@ -592,18 +604,17 @@ export default {
} }
.show-themeColor { .show-themeColor {
background-color: #2069c4 !important; background-color: $themeColor !important;
} }
.isChStyle { .isChStyle {
// background-color: #892325 !important; // background-color: #892325 !important;
background-color: rgba(0,0,0,0.25) !important; background-color: rgba(0, 0, 0, 0.25) !important;
} }
.isRedStyle { .isRedStyle {
// background-color: #813525 !important; // background-color: #813525 !important;
background-color: rgba(0,0,0,0.25) !important; background-color: rgba(0, 0, 0, 0.25) !important;
} }
.isSDCS { .isSDCS {
...@@ -630,19 +641,19 @@ export default { ...@@ -630,19 +641,19 @@ export default {
position: relative; position: relative;
z-index: 99; z-index: 99;
box-shadow: rgba(0, 0, 0, 0.3) 0 1px 5px 0px; box-shadow: rgba(0, 0, 0, 0.3) 0 1px 5px 0px;
padding-top: 10px; // padding-top: 10px;
.container { .container {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 70px 0 100px; padding: 6px 70px 0 100px;
flex-direction: column; flex-direction: column;
.logo-container { .logo-container {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 16px; // margin-bottom: 6px;
img { img {
width: 50px; width: 50px;
height: 50px; height: 50px;
......
<template> <template>
<div class="cultural-relic"> <div class="cultural-relic">
<ListBanner <!-- <ListBanner
title="共计已上线文创产品" title="共计已上线文创产品"
:num="list.total" :num="list.total"
unit="件/套" unit="件/套"
:info="['文创', '展示']" :info="['文创', '展示']"
/> /> -->
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<el-row <el-row
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
</el-cascader> </el-cascader>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-input <el-input
class="input item" class="input item"
v-model="keyword" v-model="keyword"
...@@ -63,9 +62,15 @@ ...@@ -63,9 +62,15 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<div class="list-total">
共计文创产品
<span class="list-total-num">{{ list.total }}</span>
件/套
</div>
<el-row :gutter="40" class="cr-list"> <el-row :gutter="40" class="cr-list">
<el-col <el-col
:span="item.status == 1 ? 8 : 0" :span="item.status == 1 ? 6 : 0"
class="cr-item" class="cr-item"
@click.native="handleClick(item)" @click.native="handleClick(item)"
@mouseenter.native="handleEnterImg(item)" @mouseenter.native="handleEnterImg(item)"
...@@ -325,7 +330,7 @@ export default { ...@@ -325,7 +330,7 @@ export default {
position: absolute; position: absolute;
} }
.cascader .el-radio__input.is-checked .el-radio__inner { .cascader .el-radio__input.is-checked .el-radio__inner {
background: transparent; background: transparent;
} }
</style> </style>
...@@ -437,9 +442,12 @@ $text-indent: 16px; ...@@ -437,9 +442,12 @@ $text-indent: 16px;
.content { .content {
// width: 100%; // width: 100%;
box-shadow: 0px 1px 56px 4px rgba(0, 0, 0, 0.16); box-shadow: 0px 1px 56px 4px rgba(0, 0, 0, 0.16);
.search-button{ .search {
padding: 48px 0 32px;
}
.search-button {
height: 44px; height: 44px;
&:hover{ &:hover {
color: #000; color: #000;
} }
} }
......
<template> <template>
<div class="cultural-relic"> <div class="cultural-relic">
<ListBanner <!-- <ListBanner
title="共计文物" title="共计文物"
unit="件/套" unit="件/套"
:info="['文物', '展示']" :info="['文物', '展示']"
:num="list.total" :num="list.total"
/> /> -->
<div class="search-bar wow animate__animated animate__fadeIn"> <div class="search-bar wow animate__animated animate__fadeIn">
<div class="search-wrapper"> <div class="search-wrapper">
<el-row :gutter="40"> <el-row :gutter="40">
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div :span="4" class="search-item" @click="handleClickThreeD"> <div :span="4" class="search-item" @click="handleClickThreeD">
<div class="text">3D文物</div> <div class="text">是否有3D链接</div>
<svg-icon <svg-icon
:icon-class="onlyShow3d ? 'filter-s' : 'filter'" :icon-class="onlyShow3d ? 'filter-s' : 'filter'"
></svg-icon> ></svg-icon>
...@@ -61,9 +61,11 @@ ...@@ -61,9 +61,11 @@
</el-scrollbar> </el-scrollbar>
</div> </div>
</transition> </transition>
<!-- <div class="total"> <div class="list-total">
<span>{{list.total}}件文物</span> 共计文物
</div> --> <span class="list-total-num">{{ list.total }}</span>
件/套
</div>
<div class="content-wrapper relic"> <div class="content-wrapper relic">
<div class="content"> <div class="content">
<el-row :gutter="40" class="cr-list"> <el-row :gutter="40" class="cr-list">
...@@ -402,7 +404,7 @@ $text-indent: 16px; ...@@ -402,7 +404,7 @@ $text-indent: 16px;
flex-direction: column; flex-direction: column;
// padding: 24px 20%; // padding: 24px 20%;
// padding: 16px 13%; // padding: 16px 13%;
padding: 16px 0; padding:48px 0 16px;
background: #fff; background: #fff;
.search-wrapper { .search-wrapper {
// display: flex; // display: flex;
...@@ -625,7 +627,7 @@ $text-indent: 16px; ...@@ -625,7 +627,7 @@ $text-indent: 16px;
// padding-bottom: 126px; // padding-bottom: 126px;
.content { .content {
padding: 16px 0 60px; padding: 0 0 60px;
// width: 100%; // width: 100%;
// margin-top: 32px; // margin-top: 32px;
// box-shadow: 0px 1px 56px 4px rgba(0, 0, 0, 0.16); // box-shadow: 0px 1px 56px 4px rgba(0, 0, 0, 0.16);
......
<template> <template>
<div class="display"> <div class="display">
<!-- <NavBar /> --> <!-- <ListBanner
<ListBanner
title="共计已上线展览" title="共计已上线展览"
:num="list.total" :num="list.total"
:info="['展览', '展示']" :info="['展览', '展示']"
/> /> -->
<!-- <div class="search-bar wow animate__animated animate__fadeIn"> <!-- <div class="search-bar wow animate__animated animate__fadeIn">
<div class="search-wrapper"> <div class="search-wrapper">
<div class="search-item" @click="handleClickSearchBar('type')"> <div class="search-item" @click="handleClickSearchBar('type')">
...@@ -56,6 +55,11 @@ ...@@ -56,6 +55,11 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="list-total">
共计展览
<span class="list-total-num">{{ list.total }}</span>
</div>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<el-row :gutter="40" class="display-list"> <el-row :gutter="40" class="display-list">
...@@ -312,6 +316,7 @@ $text-indent: 16px; ...@@ -312,6 +316,7 @@ $text-indent: 16px;
// padding: 0 13%; // padding: 0 13%;
// margin-bottom: 32px; // margin-bottom: 32px;
background: #fff; background: #fff;
padding: 32px 0 8px;
> div { > div {
width: 1400px; width: 1400px;
margin: auto; margin: auto;
...@@ -354,11 +359,11 @@ $text-indent: 16px; ...@@ -354,11 +359,11 @@ $text-indent: 16px;
justify-content: center; justify-content: center;
/* border: 1px solid #ccc; /* border: 1px solid #ccc;
background-color: #fff; */ background-color: #fff; */
margin-right: 20px; // margin-right: 20px;
cursor: pointer; cursor: pointer;
border: 1px solid #fff; border: 1px solid #fff;
background-color: #c5cade; background-color: #c5cade;
i{ i {
font-size: 18px; font-size: 18px;
} }
......
...@@ -573,6 +573,7 @@ export default { ...@@ -573,6 +573,7 @@ export default {
color: #255780; color: #255780;
width: 400px; width: 400px;
text-indent: 44px; text-indent: 44px;
line-height: 1.6;
} }
.entrance { .entrance {
......
<template> <template>
<div class="display"> <div class="display">
<!-- <NavBar /> --> <!-- <NavBar /> -->
<ListBanner <!-- <ListBanner
title="共计已收录博物馆" title="共计已收录博物馆"
:num="list.total" :num="list.total"
:info="['州馆', '展示']" :info="['州馆', '展示']"
/> /> -->
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<el-row <el-row
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论