diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index ced3f3e..0fa1bf9 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -2,7 +2,7 @@
@@ -225,6 +225,10 @@ $height: 90px; &:not(.channel) { background-color: #fff; border-bottom: 1px solid #f3f3f3; + + .logo { + color: #333; + } } &.estate { @@ -236,7 +240,7 @@ $height: 90px; align-items: center; font-size: 18px; font-weight: 700; - color: #333; + color: #fff; cursor: pointer; img { diff --git a/src/libs/util.js b/src/libs/util.js index 767f763..1d7b031 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -11,7 +11,7 @@ const exts = { doc: 'doc,docx,txt,xls,xlsx,csv,xml,ppt,pptx' } // 各个站点首页的路径 -const indexPath = ['/home', '/sfel', '/estate/index'] +const indexPath = ['/home', '/sfel', '/estate/index', '/iasf'] const util = { local: _local, //返回格式化时间,传参例如:"yyyy-MM-dd hh:mm:ss" diff --git a/src/pages/shop/list/index.vue b/src/pages/shop/list/index.vue index 5917d47..c7c1fb9 100644 --- a/src/pages/shop/list/index.vue +++ b/src/pages/shop/list/index.vue @@ -6,16 +6,23 @@ :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'"> @@ -186,10 +193,12 @@ import mixins from '@/mixins/page' import { Loading } from "element-ui"; import ScrollReveal from 'scrollreveal' +import Util from '@/libs/util' export default { mixins: [mixins], data () { return { + isImg: Util.isImg, timer: null, curTab: '', tabs: [ @@ -520,12 +529,9 @@ export default { .carousel { .pic { height: 100%; + background-position: center center; + background-size: 100% 100%; background-repeat: no-repeat; - background-size: cover; - } - - img { - height: 100%; } /deep/.el-carousel__container { @@ -542,36 +548,24 @@ export default { transform: translateY(-50%); } - h6 { - margin-bottom: 25px; - font-size: 2.2rem; - } - - .sub { - font-size: 1.5rem; + .qrcodes { + display: flex; + margin-right: 50px; } - .qrcode-wrap { - display: inline-block; - padding: 5px; - margin-right: 50px; + .qrcode { text-align: center; - background-color: #fff; - border-radius: 12px; .text { - margin-top: 5px; + margin-top: 10px; font-size: 12px; - color: #979797; + color: #fff; + white-space: nowrap; } } - - .qrcode { - width: 120px; - height: 120px; - } } + .intro { display: flex; justify-content: space-between; diff --git a/src/setting.js b/src/setting.js index 69db3e3..f4b00ea 100644 --- a/src/setting.js +++ b/src/setting.js @@ -17,7 +17,7 @@ const Setting = { titleSuffix: location.href.includes('eduvessel') ? '慧教云舟' : '职站商城', // 网页标题的后缀 routerMode: "hash", // 路由模式,可选值为 history 或 hash apiBaseURL: host, // 接口请求地址 - huoranApi: `https://occupationlab.com`, + huoranApi: `https://www.occupationlab.com`, autoLogoutTime: 3600000, // 长时间未操作,自动退出登录时间 modalDuration: 3, // 接口请求返回错误时,弹窗的持续时间,单位:秒 errorModalType: "Message", // 接口请求返回错误时,弹窗的类型,可选值为 Message 或 Notice