提交 c6133f0a authored 作者: 龙菲's avatar 龙菲

修改整体字体为阿里巴巴普惠体(可免费商用),修改所有图片容器背景为灰色

上级 39300a29
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -30,5 +30,6 @@ html, ...@@ -30,5 +30,6 @@ html,
body, body,
#app { #app {
height: 100%; height: 100%;
} }
</style> </style>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
} }
#app { #app {
font-family: Avenir, Helvetica, Arial, sans-serif; font-family: "Alibaba-PuHuiTi",Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
......
...@@ -6,7 +6,7 @@ import store from './store/index' ...@@ -6,7 +6,7 @@ import store from './store/index'
import ElementUI from 'element-ui'; import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; import 'element-ui/lib/theme-chalk/index.css';
import "@/assets/styles/index.scss"; //全局样式 import "@/assets/styles/index.scss"; //全局样式
// import * as echarts from 'echarts'
import './icons' import './icons'
import animated from 'animate.css'; import animated from 'animate.css';
...@@ -14,11 +14,9 @@ import animated from 'animate.css'; ...@@ -14,11 +14,9 @@ import animated from 'animate.css';
import VideoPlayer from 'vue-video-player' import VideoPlayer from 'vue-video-player'
import 'video.js/dist/video-js.css' import 'video.js/dist/video-js.css'
import 'vue-video-player/src/custom-theme.css' import 'vue-video-player/src/custom-theme.css'
Vue.use(VideoPlayer) Vue.use(VideoPlayer)
// 滚动动画 wow.js
// import {
// WOW
// } from '../public/static/js/wow'
import { import {
getFullUrl getFullUrl
} from '@/utils/index' } from '@/utils/index'
...@@ -30,20 +28,6 @@ Vue.use(ElementUI); ...@@ -30,20 +28,6 @@ Vue.use(ElementUI);
// 全局注册动画效果 // 全局注册动画效果
Vue.use(animated); Vue.use(animated);
// Vue.prototype.$wow = new WOW({
// boxClass: 'wow', // default
// animateClass: 'animated', // default
// offset: 0, // default
// mobile: true, // default
// live: true,
// scrollContainer: null,
// resetAnimation: true,
// // live为true时,控制台会提示:MutationObserver is not supported by your browser. & WOW.js cannot detect dom mutations, please call .sync() after loading new content.
// callback: function (box) {
// console.log("WOW: animating <" + box.tagName.toLowerCase() + ">")
// }
// })
Vue.prototype.$getFullUrl = getFullUrl Vue.prototype.$getFullUrl = getFullUrl
new Vue({ new Vue({
router, router,
......
...@@ -234,9 +234,15 @@ ...@@ -234,9 +234,15 @@
<span>相关文物推荐</span> <span>相关文物推荐</span>
<div class="recommend-type"> <div class="recommend-type">
<el-radio-group v-model="currentRcKey" size="small"> <el-radio-group v-model="currentRcKey" size="small">
<el-radio :label="'type'">按文物类别推荐</el-radio> <el-radio :label="'type'" v-if="CRDetail.type"
<el-radio :label="'years'">按文物年代推荐</el-radio> >按文物类别推荐</el-radio
<el-radio :label="'deptId'">按馆藏单位推荐</el-radio> >
<el-radio :label="'years'" v-if="CRDetail.years"
>按文物年代推荐</el-radio
>
<el-radio :label="'deptId'" v-if="CRDetail.deptId"
>按馆藏单位推荐</el-radio
>
</el-radio-group> </el-radio-group>
</div> </div>
</div> </div>
...@@ -623,7 +629,7 @@ $blue: #2069c4; ...@@ -623,7 +629,7 @@ $blue: #2069c4;
.enlarge { .enlarge {
position: absolute; position: absolute;
bottom: 40px; bottom: 20px;
right: 40px; right: 40px;
display: flex; display: flex;
z-index: 9; z-index: 9;
...@@ -711,6 +717,7 @@ $blue: #2069c4; ...@@ -711,6 +717,7 @@ $blue: #2069c4;
.img-container { .img-container {
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #f5f5f9;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -656,7 +656,7 @@ $blue: #2069c4; ...@@ -656,7 +656,7 @@ $blue: #2069c4;
margin: 0 10px; margin: 0 10px;
display: flex; display: flex;
align-items: center; align-items: center;
i{ i {
margin-right: 10px; margin-right: 10px;
font-size: 38px; font-size: 38px;
color: #2069c4; color: #2069c4;
...@@ -698,7 +698,7 @@ $blue: #2069c4; ...@@ -698,7 +698,7 @@ $blue: #2069c4;
.enlarge { .enlarge {
position: absolute; position: absolute;
bottom: 40px; bottom: 20px;
right: 40px; right: 40px;
display: flex; display: flex;
z-index: 9; z-index: 9;
...@@ -771,6 +771,7 @@ $blue: #2069c4; ...@@ -771,6 +771,7 @@ $blue: #2069c4;
.img-container { .img-container {
height: 100%; height: 100%;
width: 100%; width: 100%;
background-color: #f5f5f9;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -977,6 +978,7 @@ $blue: #2069c4; ...@@ -977,6 +978,7 @@ $blue: #2069c4;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #f5f5f9;
.images_img { .images_img {
flex: 1; flex: 1;
} }
...@@ -994,11 +996,10 @@ $blue: #2069c4; ...@@ -994,11 +996,10 @@ $blue: #2069c4;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
color:#999; color: #999;
i { i {
margin: 0 10px; margin: 0 10px;
font-size: 20px; font-size: 20px;
} }
} }
...@@ -1034,7 +1035,7 @@ $blue: #2069c4; ...@@ -1034,7 +1035,7 @@ $blue: #2069c4;
width: 100%; width: 100%;
height: 460px; height: 460px;
position: relative; position: relative;
background-color: #f5f5f9;
.cr-name-intro { .cr-name-intro {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
...@@ -49,8 +49,8 @@ module.exports = defineConfig({ ...@@ -49,8 +49,8 @@ module.exports = defineConfig({
proxy: { proxy: {
'/api': { '/api': {
// target: 'http://192.168.1.230:9562/api', // target: 'http://192.168.1.230:9562/api',
target: 'http://222.85.214.245:9566/api', target: 'http://222.85.214.245:9602/api',
// target:'http://192.168.1.230:9566/api', // target:'http://192.168.1.230:9562/api',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '' '^/api': ''
...@@ -58,7 +58,7 @@ module.exports = defineConfig({ ...@@ -58,7 +58,7 @@ module.exports = defineConfig({
}, },
'/files':{ '/files':{
// target:'http://192.168.1.230:9563/files', // target:'http://192.168.1.230:9563/files',
target: 'http://222.85.214.245:9563/files', target: 'http://222.85.214.245:9604/files',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/files': '' '^/files': ''
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论