huoran
/
FE_huoran_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
master
yujialong 4 months ago
parent 95773d1d73
commit e17d895b2e
6 changed files with 830 additions and 728 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. 16
      src/layouts/footer/index.vue
  2. 6
      src/layouts/navbar/index.vue
  3. 2
      src/pages/column/index.vue
  4. 899
      src/pages/exp/index.vue
  5. 633
      src/pages/overview/index.vue
  6. 2
      src/setting.js

16
src/layouts/footer/index.vue
Unescape View File

@ -553,8 +553,20 @@ export default {
.float {
position: relative;
&:hover .popup {
display: block;
// &:first-child .popup {
// display: block;
// }
&:hover {
// &~.float {
// .popup {
// display: none;
// }
// }
.popup {
display: block;
}
}
}
}

6
src/layouts/navbar/index.vue
Unescape View File

@ -146,8 +146,10 @@ export default {
},
// 跳转
jump (id) {
this.getPath(this.otherMenus, id || this.otherMenus[0].id)
this.getPath(this.menus, id || this.menus[0].id)
id = id || this.otherMenus[0].id
this.active = id
this.getPath(this.otherMenus, id)
this.getPath(this.menus, id)
this.columnTo(this.toItem)
this.$parent.showSearch = false
this.$emit('updateModelType', false)

2
src/pages/column/index.vue
Unescape View File

@ -662,7 +662,7 @@ export default {
}
} else if (typeId === 3) {
// 长页栏目直接获取path
this.$router.push(`/${to.path}?id=${to.id}&siteId=${this.site}`).catch(() => { })
this.$router.replace(`/${to.path}?id=${to.id}&siteId=${this.site}`).catch(() => { })
} else if (left && (typeId === 1 || (typeId === 4 && !to.children.length))) {
// 常规栏目，或者没有子级的子级优先栏目，跳转到column页
this.$router.push(`/column?id=${to.id + (to.level !== 1 || !this.sameStyle ? '&column=1' : '')}&siteId=${this.site}`).catch((err) => { });

899
src/pages/exp/index.vue
View File

File diff suppressed because it is too large Load Diff

633
src/pages/overview/index.vue
Unescape View File

@ -1,58 +1,44 @@
<template>
<div class="wrap">
<div class="single-banner">
<img class="banner-img"
:src="modules[0].form.pic"
alt="" />
<img class="banner-img" :src="modules[0].form.pic" alt="" />
<div class="texts">
<h6 class="banner-title">{{ modules[0].form.title }}</h6>
</div>
</div>
<div class="block history gray">
<div :class="['inner', {'cursor-pointer': isLink(modules[1].form.link.linkName)}]"
@click="openLink(modules[1].form)">
<div class="texts wow fadeInDown"
data-wow-delay="0.5s">
<div :class="['inner', { 'cursor-pointer': isLink(modules[1].form.link.linkName) }]"
@click="openLink(modules[1].form)">
<div class="texts wow fadeInDown" data-wow-delay="0.5s">
<div class="left">
<h2 v-html="modules[1].form.title"></h2>
<div class="line"></div>
<div class="des"
v-html="modules[1].form.des"></div>
<div class="des" v-html="modules[1].form.des"></div>
</div>
<img class="bg"
width="562"
height="418"
:src="modules[1].form.pic"
alt="">
<img class="bg" width="562" height="418" :src="modules[1].form.pic" alt="">
</div>
</div>
</div>
<div class="block">
<div class="inner">
<div :class="['core', {'cursor-pointer': isLink(modules[2].form.link.linkName)}]"
@click="openLink(modules[2].form)">
<img :src="modules[2].form.pic"
alt=""
class="pic">
<div :class="['core', { 'cursor-pointer': isLink(modules[2].form.link.linkName) }]"
@click="openLink(modules[2].form)">
<img :src="modules[2].form.pic" alt="" class="pic">
<div class="texts">
<h6>{{ modules[2].form.title }}</h6>
<div class="core-title" v-html="modules[2].form.title"></div>
<div class="line"></div>
<div class="text"
v-html="modules[2].form.des"></div>
<div class="text" v-html="modules[2].form.des"></div>
</div>
</div>
<div :class="['core', {'cursor-pointer': isLink(modules[3].form.link.linkName)}]"
@click="openLink(modules[3].form)">
<img :src="modules[3].form.pic"
alt=""
class="pic">
<div :class="['core', { 'cursor-pointer': isLink(modules[3].form.link.linkName) }]"
@click="openLink(modules[3].form)">
<img :src="modules[3].form.pic" alt="" class="pic">
<div class="texts">
<h6>{{ modules[3].form.title }}</h6>
<div class="core-title" v-html="modules[3].form.title"></div>
<div class="line"></div>
<div class="text"
v-html="modules[3].form.des"></div>
<div class="text" v-html="modules[3].form.des"></div>
</div>
</div>
</div>
@ -61,53 +47,35 @@
<div class="block gray fac">
<div class="inner">
<div class="event">
<img src="https://huorantech.com/images/overview/16.png"
alt=""
class="pic">
<img src="https://huorantech.com/images/overview/16.png" alt="" class="pic">
<div class="texts">
<h6 v-html="modules[4].form.title"></h6>
<p class="en">{{ modules[4].form.subTitle }}</p>
<div class="text"
v-html="modules[4].form.des"></div>
<img v-if="isLink(modules[4].form.link.linkName)"
class="arrow"
src="@/assets/images/arrow.png"
alt=""
@click="openLink(modules[4].form)">
<div class="text" v-html="modules[4].form.des"></div>
<img v-if="isLink(modules[4].form.link.linkName)" class="arrow" src="@/assets/images/arrow.png" alt=""
@click="openLink(modules[4].form)">
</div>
</div>
<ul class="l-card">
<li :class="{'cursor-pointer': isLink(modules[5].form.link.linkName)}"
@click="openLink(modules[5].form)">
<img :src="modules[5].form.pic"
alt=""
class="pic" />
<li :class="{ 'cursor-pointer': isLink(modules[5].form.link.linkName) }" @click="openLink(modules[5].form)">
<img :src="modules[5].form.pic" alt="" class="pic" />
<div class="texts">
<h6>{{ modules[5].form.title }}</h6>
<div class="text"
v-html="modules[5].form.des"></div>
<div class="text" v-html="modules[5].form.des"></div>
</div>
</li>
<li :class="{'cursor-pointer': isLink(modules[6].form.link.linkName)}"
@click="openLink(modules[6].form)">
<img :src="modules[6].form.pic"
alt=""
class="pic" />
<li :class="{ 'cursor-pointer': isLink(modules[6].form.link.linkName) }" @click="openLink(modules[6].form)">
<img :src="modules[6].form.pic" alt="" class="pic" />
<div class="texts">
<h6>{{ modules[6].form.title }}</h6>
<div class="text"
v-html="modules[6].form.des"></div>
<div class="text" v-html="modules[6].form.des"></div>
</div>
</li>
<li :class="{'cursor-pointer': isLink(modules[7].form.link.linkName)}"
@click="openLink(modules[7].form)">
<img :src="modules[7].form.pic"
alt=""
class="pic" />
<li :class="{ 'cursor-pointer': isLink(modules[7].form.link.linkName) }" @click="openLink(modules[7].form)">
<img :src="modules[7].form.pic" alt="" class="pic" />
<div class="texts">
<h6>{{ modules[7].form.title }}</h6>
<div class="text"
v-html="modules[7].form.des"></div>
<div class="text" v-html="modules[7].form.des"></div>
</div>
</li>
</ul>
@ -115,20 +83,13 @@
</div>
<div class="block scan gray">
<h2 class="b-title wow fadeInUp hide-bd"
v-html="modules[8].form.title"></h2>
<p class="intro wow fadeInUp"
data-wow-delay="0.5s">{{ modules[8].form.des }}</p>
<h2 class="b-title wow fadeInUp hide-bd" v-html="modules[8].form.title"></h2>
<p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[8].form.des }}</p>
<div class="inner scan-inner">
<div class="left">
<template v-for="(item, i) in modules[9].list">
<div v-if="item.isEnable"
class="line"
:key="i">
<img v-if="item.pic"
:src="item.pic"
alt=""
class="icon">
<div v-if="item.isEnable" class="line" :key="i">
<img v-if="item.pic" :src="item.pic" alt="" class="icon">
<p class="text">{{ item.title }}</p>
</div>
</template>
@ -147,9 +108,7 @@
</li>
</ul>
</div>
<img :src="modules[13].form.pic"
alt=""
class="pic" />
<img :src="modules[13].form.pic" alt="" class="pic" />
</div>
</div>
</div>
@ -197,282 +156,334 @@ export default {
<style lang="scss" scoped>
@import url(../../plugins/wow/animate.css);
@import '../../styles/page/page.scss';
.history {
h2 {
font-size: 1rem;
color: #333;
h2 {
font-size: 1rem;
color: #333;
}
.texts {
display: flex;
justify-content: space-between;
padding: 5.125rem 3.5625rem 1.875rem;
margin-top: 20px;
background-color: #fff;
border-radius: 6.25rem 0px 0px 0px;
transition: 0.3s;
&:hover {
transform: scale(1.05);
}
}
.left {
width: 43.4375rem;
}
.line {
width: 53px;
height: 3px;
margin: 18px 0;
background: #0280f1;
}
.des {
font-size: 0.9rem;
color: #181818;
line-height: 31px;
-webkit-line-clamp: 6;
}
.bg {
margin: -115px -80px 0 30px;
border-top-right-radius: 40px;
}
}
.core {
position: relative;
margin-bottom: 40px;
&:last-child {
.texts {
display: flex;
justify-content: space-between;
padding: 5.125rem 3.5625rem 1.875rem;
margin-top: 20px;
background-color: #fff;
border-radius: 6.25rem 0px 0px 0px;
transition: 0.3s;
&:hover {
transform: scale(1.05);
}
}
.left {
width: 43.4375rem;
}
.line {
width: 53px;
height: 3px;
margin: 18px 0;
background: #0280f1;
}
.des {
font-size: 0.9rem;
color: #181818;
line-height: 31px;
-webkit-line-clamp: 6;
}
.bg {
margin: -115px -80px 0 30px;
border-top-right-radius: 40px;
left: 40px;
right: auto;
}
}
.pic {
width: 100%;
}
.texts {
position: absolute;
top: 80px;
right: 40px;
width: 500px;
color: #fff;
}
.core-title {
font-size: 1.4rem;
font-family: PingFangSC-Medium, PingFang SC;
}
.line {
width: 136px;
height: 3px;
margin: 20px 0;
background: #ffffff;
opacity: 0.56;
}
.text {
font-size: 1rem;
line-height: 1.6;
}
}
.core {
.fac {
.event {
position: relative;
margin-bottom: 40px;
&:last-child {
.texts {
left: 40px;
right: auto;
}
}
.pic {
width: 100%;
width: 100%;
}
.texts {
position: absolute;
top: 80px;
right: 40px;
width: 500px;
color: #fff;
position: absolute;
top: 70px;
right: 300px;
bottom: 70px;
left: 60px;
}
h6 {
font-size: 1.4rem;
font-family: PingFangSC-Medium, PingFang SC;
position: relative;
font-size: 2.2rem;
font-family: PingFangSC-Medium, PingFang SC;
color: #333;
}
.line {
width: 136px;
height: 3px;
margin: 20px 0;
background: #ffffff;
opacity: 0.56;
.en {
margin-top: -30px;
font-size: 2rem;
font-family: AppleSystemUIFont;
color: #e4e4e4;
}
.text {
font-size: 1rem;
line-height: 1.6;
margin: 15px 0;
font-size: 1rem;
color: #333;
}
}
.fac {
.event {
position: relative;
.pic {
width: 100%;
}
.texts {
position: absolute;
top: 70px;
right: 300px;
bottom: 70px;
left: 60px;
}
h6 {
position: relative;
font-size: 2.2rem;
font-family: PingFangSC-Medium, PingFang SC;
color: #333;
}
.en {
margin-top: -30px;
font-size: 2rem;
font-family: AppleSystemUIFont;
color: #e4e4e4;
}
.text {
margin: 15px 0;
font-size: 1rem;
color: #333;
}
}
.l-card {
display: flex;
margin-top: 20px;
li {
position: relative;
width: calc((100% - 40px) / 3);
height: 359px;
margin-right: 20px;
&:last-child {
margin-right: 0;
}
}
.l-card {
display: flex;
margin-top: 20px;
li {
position: relative;
width: calc((100% - 40px) / 3);
height: 359px;
margin-right: 20px;
&:last-child {
margin-right: 0;
}
}
.pic {
width: 100%;
height: 100%;
}
.texts {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 140px 30px 0;
color: #fff;
background-color: rgba(0, 0, 0, 0.5);
}
h6 {
margin-bottom: 15px;
font-size: 1.6rem;
font-family: PingFangSC-Medium, PingFang SC;
}
.text {
font-size: 1rem;
font-family: PingFangSC-Medium, PingFang SC;
line-height: 2;
@include mul-ellipsis(4);
}
.pic {
width: 100%;
height: 100%;
}
.texts {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 140px 30px 0;
color: #fff;
background-color: rgba(0, 0, 0, 0.5);
}
h6 {
margin-bottom: 15px;
font-size: 1.6rem;
font-family: PingFangSC-Medium, PingFang SC;
}
.text {
font-size: 1rem;
font-family: PingFangSC-Medium, PingFang SC;
line-height: 2;
@include mul-ellipsis(4);
}
}
}
.scan {
.scan-inner {
display: flex;
}
.left {
width: 45%;
margin-right: 80px;
.scan-inner {
display: flex;
}
.left {
width: 45%;
margin-right: 80px;
}
.line {
display: flex;
align-items: center;
margin-bottom: 30px;
.icon {
width: 50px;
height: 50px;
margin-right: 20px;
}
.line {
display: flex;
align-items: center;
margin-bottom: 30px;
.icon {
width: 50px;
height: 50px;
margin-right: 20px;
}
.text {
font-size: 1rem;
font-family: PingFangSC-Medium, PingFang SC;
color: #333;
line-height: 1.6;
}
.text {
font-size: 1rem;
font-family: PingFangSC-Medium, PingFang SC;
color: #333;
line-height: 1.6;
}
.total {
display: flex;
justify-content: space-between;
margin-top: 50px;
.num {
margin-bottom: 10px;
font-size: 2rem;
font-family: ToppanBunkyuMidashiMinchoStdN-ExtraBold, ToppanBunkyuMidashiMinchoStdN;
font-weight: 800;
color: #1583ff;
}
.text {
font-size: 1rem;
color: #333;
}
}
.total {
display: flex;
justify-content: space-between;
margin-top: 50px;
.num {
margin-bottom: 10px;
font-size: 2rem;
font-family: ToppanBunkyuMidashiMinchoStdN-ExtraBold, ToppanBunkyuMidashiMinchoStdN;
font-weight: 800;
color: #1583ff;
}
.pic {
width: 50%;
// object-fit: cover;
.text {
font-size: 1rem;
color: #333;
}
}
.pic {
width: 50%;
// object-fit: cover;
}
}
@media (min-width: 2000px) {
.scan {
.scan-inner {
justify-content: flex-start;
}
.scan {
.scan-inner {
justify-content: flex-start;
}
}
}
@media (max-width: 1400px) {
.history {
.texts {
flex-direction: column;
}
.left {
width: 100%;
}
.bg {
width: auto;
max-width: 100%;
height: auto;
margin: 20px 0 0 0;
}
.history {
.texts {
flex-direction: column;
}
.scan {
.scan-inner {
flex-direction: column;
}
.left {
width: 100%;
}
.pic {
width: 100%;
margin-top: 2rem;
}
.left {
width: 100%;
}
.fac {
.event {
.texts {
position: static;
margin-top: 20px;
}
}
.bg {
width: auto;
max-width: 100%;
height: auto;
margin: 20px 0 0 0;
}
}
.scan {
.scan-inner {
flex-direction: column;
}
.left {
width: 100%;
}
.pic {
width: 100%;
margin-top: 2rem;
}
}
.fac {
.event {
.texts {
position: static;
margin-top: 20px;
}
}
}
}
@media (max-width: 920px) {
.core {
.texts {
top: 20px !important;
left: 20px !important;
right: 20px !important;
width: auto;
}
}
.scan {
padding: 20px;
.core {
.texts {
top: 20px !important;
left: 20px !important;
right: 20px !important;
width: auto;
}
.fac {
.l-card {
flex-direction: column;
li {
width: 100%;
margin-bottom: 1rem;
}
}
}
.scan {
padding: 20px;
}
.fac {
.l-card {
flex-direction: column;
li {
width: 100%;
margin-bottom: 1rem;
}
}
}
}
@media (max-width: 750px) {
.hide-bd:after {
display: none;
}
.block {
padding: 50px 0;
.hide-bd:after {
display: none;
}
.block {
padding: 50px 0;
}
.core {
.texts {
position: static;
padding: 20px;
color: #333;
}
.core {
.texts {
position: static;
padding: 20px;
color: #333;
}
.line {
background: #333;
}
.line {
background: #333;
}
.fac {
.event {
.pic {
display: none;
}
}
}
.fac {
.event {
.pic {
display: none;
}
}
}
}
</style>

2
src/setting.js
Unescape View File

@ -7,7 +7,7 @@ const isGta = url.includes('139.159.254.212'); // 国泰安
let host = `${location.origin}/`
if (isDev) {
host = 'http://192.168.31.217:10000/'
// host = 'https://huorantech.com'
host = 'https://huorantech.com'
}
const Setting = {

Write Preview
Loading…
Cancel
Save