添加鸿蒙及思源字体,删除其他字体等

master
yujialong 4 months ago
parent e17d895b2e
commit 3f193aba12
  1. 49
      src/layouts/footer/index.vue
  2. 1
      src/layouts/navbar/index.vue
  3. 2
      src/libs/util.js
  4. 9
      src/mixins/page/index.js
  5. 4
      src/pages/column/index.vue
  6. 14
      src/pages/iasf/index.vue
  7. 36
      src/styles/common.scss
  8. BIN
      src/styles/font/HarmonyOS_SansSC_Light.ttf
  9. BIN
      src/styles/font/PingFang-Regular.otf
  10. BIN
      src/styles/font/PingFangSC-Medium.otf
  11. BIN
      src/styles/font/PingFangTC-Semibold.ttf
  12. BIN
      src/styles/font/ProximaNova-Regular.otf
  13. BIN
      src/styles/font/SF-Pro-Display-Bold.otf
  14. BIN
      src/styles/font/SourceHanSansCN-VF-2.otf
  15. 2
      src/styles/layout/index.scss
  16. 2
      src/styles/lib/_style.scss

@ -1,31 +1,5 @@
<template>
<div>
<div v-if="showDefaultPath.includes($route.path)" :class="['footer', { iasf: isIasf }]">
<div class="mask"></div>
<ul v-if="isIasf" class="entry">
<li :class="{ 'cursor-pointer': isLink(modules[14].form.link.linkName) }" @click="openLink(modules[14].form)">
<img class="icon" :src="modules[14].form.pic" alt="">
<p class="text">{{ modules[14].form.title }}</p>
</li>
<li :class="{ 'cursor-pointer': isLink(modules[15].form.link.linkName) }" @click="openLink(modules[15].form)">
<img class="icon" :src="modules[15].form.pic" alt="">
<p class="text">{{ modules[15].form.title }}</p>
</li>
<li :class="{ 'cursor-pointer': isLink(modules[16].form.link.linkName) }" @click="openLink(modules[16].form)">
<img class="icon" :src="modules[16].form.pic" alt="">
<p class="text">{{ modules[16].form.title }}</p>
</li>
<li :class="{ 'cursor-pointer': isLink(modules[17].form.link.linkName) }" @click="openLink(modules[17].form)">
<img class="icon" :src="modules[17].form.pic" alt="">
<p class="text">{{ modules[17].form.title }}</p>
</li>
<li :class="{ 'cursor-pointer': isLink(modules[18].form.link.linkName) }" @click="openLink(modules[18].form)">
<img class="icon" :src="modules[18].form.pic" alt="">
<p class="text">{{ modules[18].form.title }}</p>
</li>
</ul>
</div>
<!-- 这里需要读取后台的页脚设置有3种样式 -->
<template v-if="footers.length">
<!-- 常规样式 -->
@ -79,7 +53,7 @@
<div v-else-if="styleId === 2" class="footer">
<div class="relative text-center">
<img :src="footers[0].form.pic" alt="">
<div class="columns flex j-center a-center m-t-20">
<div class="columns flex j-center m-t-20">
<div v-for="(item, i) in columns" :key="i" class="column">
<h6 @click="columnTo(item)">{{ item.columnName }}</h6>
<ul v-if="item.children.length" class="children">
@ -137,10 +111,8 @@ export default {
data () {
return {
isIasf: false,
showDefaultPath: ['/iasf'], //
showContactPath: ['/news', '/sfel', '/talent', '/careers', '/edu', '/news'], //
columns: [],
modules: [],
floatings: [],
footers: [],
styleId: 1,
@ -183,20 +155,6 @@ export default {
this.columns = data.slice(0, 5)
}).catch(err => { })
},
// iasf
getInfo () {
// /
this.$route.query.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.$route.query.id}`).then(({ data }) => {
if (data.length) {
// state1theEditedJson稿0jsonBeforeEditing
const json = JSON.parse(this.preview ?
data :
data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
this.modules = json
}
}).catch(err => { })
},
//
async getFloating () {
const { id } = this.$route.query
@ -295,12 +253,13 @@ export default {
</script>
<style lang="scss" scoped>
.footer {
z-index: 3;
position: relative;
padding: 48px 20% 25px;
color: #fff;
background-color: #091733;
overflow: hidden;
background: rgba(0, 5, 12, .8) url(../../assets/images/footer-bg.png) no-repeat;
background: rgba(0, 5, 12, 1) url(../../assets/images/footer-bg.png) no-repeat;
.meta {
margin-bottom: 10px;
@ -382,6 +341,7 @@ export default {
}
.contact {
z-index: 3;
position: relative;
padding: 0 0 106px 0;
background: url(https://huorantech.com/images/about/map.png) 0 0 / cover no-repeat;
@ -466,6 +426,7 @@ export default {
}
.footer3 {
z-index: 3;
position: relative;
padding: 30px 0;
background-color: #000;

@ -124,6 +124,7 @@ export default {
const home = this.isHome
if (this.lastHome !== home) this.showMenu = false
this.bgColor = home ? 'transparent' : '#fff'
if (this.$route.path !== '/home') this.textColor = home ? '#f9f9f9' : '#333'
this.lastHome !== home && this.$nextTick(() => {
setTimeout(() => {
this.showMenu = true

@ -11,7 +11,7 @@ const exts = {
doc: 'doc,docx,txt,xls,xlsx,csv,xml,ppt,pptx'
}
// 各个站点首页的路径
const indexPath = ['/home', '/sfel', '/estate/index', '/iasf']
const indexPath = ['/home', '/sfel', '/estate/index']
const util = {
local: _local,
//返回格式化时间,传参例如:"yyyy-MM-dd hh:mm:ss"

@ -14,6 +14,15 @@ export default {
return this.$route.query.siteId || this.$store.getters.site
}
},
watch: {
'$route.query' () {
const { id } = this.$route.query
if (id) {
this.id = id
this.getInfo()
}
}
},
mounted () {
this.getInfo && this.$route.query.id && this.init()
},

@ -904,7 +904,7 @@ export default {
/deep/.columns {
&+.detail {
padding-left: 10px;
padding-left: 20px;
}
width: 22%;
@ -1253,7 +1253,7 @@ export default {
.detail {
flex: 1;
max-width: 77%;
padding: 10px 15px;
padding: 20px;
background-color: #fff;
overflow: auto;

@ -24,9 +24,8 @@
<li :class="{ 'cursor-pointer': isLink(modules[2].form.link.linkName) }"
@click="openLink(modules[2].form)">
<img class="pic" :src="modules[2].form.pic" alt="">
<div class="project">SILF</div>
<div class="project">{{ modules[2].form.title }}</div>
<div class="texts">
<div class="name">SILF</div>
<h6>{{ modules[2].form.title }}</h6>
<p class="des">{{ modules[2].form.des }}</p>
</div>
@ -34,9 +33,8 @@
<li :class="{ 'cursor-pointer': isLink(modules[3].form.link.linkName) }"
@click="openLink(modules[3].form)">
<img class="pic" :src="modules[3].form.pic" alt="">
<div class="project">S³FEL</div>
<div class="project">{{ modules[3].form.title }}</div>
<div class="texts">
<div class="name">S³FEL</div>
<h6>{{ modules[3].form.title }}</h6>
<p class="des">{{ modules[3].form.des }}</p>
</div>
@ -312,7 +310,7 @@ export default {
if (json[6].form.column.length) {
const { column, articleNum } = json[6].form
this.$post(this.api.queryArticlesByColumnType, Util.rsa(column[column.length - 1])).then(({ data }) => {
this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
this.articles1 = Util.removeTag(data.slice(0, articleNum || 4))
if (this.articles1.length) this.curArticle1 = this.articles1[0]
}).catch(err => { })
@ -599,7 +597,7 @@ $bannerMh: 800px;
align-items: center;
width: 100%;
height: 100%;
font-size: 45px;
font-size: 24px;
font-family: PingFangSC-Medium, PingFang SC;
color: #fff;
background-color: rgba(0, 0, 0, 0.3);
@ -631,7 +629,7 @@ $bannerMh: 800px;
h6 {
margin: 10px 0 20px;
line-height: 63px;
font-size: 45px;
font-size: 40px;
font-family: PingFangSC-Medium, PingFang SC;
@include mul-ellipsis(2);
}
@ -1139,7 +1137,7 @@ $bannerMh: 800px;
.tools {
z-index: 10;
position: fixed;
top: 60vh;
top: 30vh;
right: 0;
display: flex;
flex-direction: column;

@ -2,44 +2,17 @@
@import './var.scss';
@font-face {
font-family: PingFang;
src: url('font/PingFang-Regular.otf');
font-family: Harmony;
src: url('font/HarmonyOS_SansSC_Light.ttf');
}
@font-face {
font-family: PingFangSC-Medium;
src: url('font/PingFangSC-Medium.otf');
}
@font-face {
font-family: PingFangSC-Semibold;
src: url('font/PingFangTC-Semibold.ttf');
}
@font-face {
font-family: SFProDisplay-Bold;
src: url('font/SF-Pro-Display-Bold.otf');
}
@font-face {
font-family: SFProDisplay;
src: url('font/SF-Pro-Display-Regular.otf');
}
@font-face {
font-family: toppan;
src: url('font/toppan.otf');
}
@font-face {
font-family: ProximaNova;
src: url('font/ProximaNova-Regular.otf');
}
@font-face {
font-family: AlimamaShuHeiTi-Bold;
src: url('font/AlimamaShuHeiTi-Bold.otf');
font-family: siyuan;
src: url('font/SourceHanSansCN-VF-2.otf');
}
[v-cloak] {
display: none;
}
.site-en {
font-family: SFProDisplay;
}
.flex-between {
display: flex;
justify-content: space-between;
@ -71,7 +44,6 @@
position: relative;
padding-bottom: 20px;
font-size: 1rem;
font-family: PingFangSC-Medium, PingFang SC;
color: #000;
line-height: 1.6;
border-bottom: 1px solid #ddd;

@ -11,7 +11,7 @@ body,
body {
// min-width: 1280px;
font-family: PingFang, PingFang SC, "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
font-family: Harmony, STHeiTi, sans-serif;
font-size: 14px;
background: rgba(0, 0, 0, 0.02);
}

@ -1,3 +1,3 @@
html {
font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
font-family: Harmony, STHeiTi, sans-serif;
}

Loading…
Cancel
Save