yujialong 5 months ago
parent 06d3a2e6ee
commit d7d168a4ce
  1. 71
      src/components/menuTree/index.vue
  2. 202
      src/layouts/footer/index.vue
  3. 15
      src/layouts/home/index.vue
  4. 151
      src/layouts/navbar/index.vue
  5. 8
      src/main.js
  6. 286
      src/pages/article/index.vue
  7. 11
      src/pages/column/index.vue
  8. 6
      src/setting.js

@ -2,25 +2,18 @@
<div class="menu-child"> <div class="menu-child">
<template v-for="item in this.menuList"> <template v-for="item in this.menuList">
<el-submenu :popper-class="$store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''" <el-submenu :popper-class="$store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
:class="{active: $route.query.id == item.id}" :class="{ active: $route.query.id == item.id }" :key="item.id" :index="String(item.id)" :id="item.id"
:key="item.id" v-if="item.children && item.children.length && item.children.find(i => i.menuVisible !== 1)">
:index="String(item.id)"
:id="item.id"
v-if="item.children && item.children.length && item.children.find(i=>i.menuVisible !==1)">
<template slot="title"> <template slot="title">
<span slot="title" <span slot="title" :id="item.id">{{ item.columnName }}</span>
:id="item.id">{{item.columnName}}</span>
</template> </template>
<menuTree :menuList="item.children"></menuTree> <menuTree :menuList="item.children"></menuTree>
</el-submenu> </el-submenu>
<template v-else> <template v-else>
<template v-if="item.menuVisible!==1"> <template v-if="item.menuVisible !== 1">
<el-menu-item :key="item.id" <el-menu-item :key="item.id" :id="item.id" :index="String(item.id)"
:id="item.id" :class="{ active: $route.query.id == item.id }">
:index="String(item.id)" <span slot="title" :id="item.id">{{ item.columnName }}</span>
:class="{active: $route.query.id == item.id}">
<span slot="title"
:id="item.id">{{item.columnName}}</span>
</el-menu-item> </el-menu-item>
</template> </template>
</template> </template>
@ -55,38 +48,40 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.menu-child { .menu-child {
/deep/ .el-menu-item {
background-color: transparent !important;
}
&:hover {
background-color: transparent !important;
}
}
@media (max-width: 1200px) {
.menu-child {
/deep/ .el-menu-item { /deep/ .el-menu-item {
background-color: transparent !important; height: 40px;
line-height: 40px;
color: black !important;
background-color: transparent !important;
} }
&:hover { &:hover {
background-color: transparent !important; background-color: transparent !important;
} }
} }
@media (max-width: 1200px) {
.menu-child {
/deep/ .el-menu-item {
height: 40px;
line-height: 40px;
color: black !important;
background-color: transparent !important;
}
&:hover { .el-submenu {
background-color: transparent !important; &:focus-visible {
} outline: none;
} }
.el-submenu { /deep/ .el-submenu__title {
&:focus-visible { height: 40px;
outline: none; line-height: 40px;
} font-size: 1rem;
/deep/ .el-submenu__title { color: black !important;
height: 40px;
line-height: 40px;
font-size: 1rem;
color: black !important;
}
} }
}
} }
</style> </style>

@ -2,54 +2,41 @@
<div class="footer"> <div class="footer">
<div class="info"> <div class="info">
<div class="left"> <div class="left">
<img class="logo" <img class="logo" src="@/assets/images/logo3.png" alt="">
src="@/assets/images/logo3.png"
alt="">
<div class="texts"> <div class="texts">
<div class="line"> <div class="line">
<img class="icon" <img class="icon" src="@/assets/images/address.png" alt="">
src="@/assets/images/address.png"
alt="">
深圳市光明区新湖街道圳园路268号A3栋 深圳市光明区新湖街道圳园路268号A3栋
</div> </div>
<div class="line"> <div class="line">
<img class="icon" <img class="icon" src="@/assets/images/tel.png" alt="">
src="@/assets/images/tel.png"
alt="">
{{ site == 1 ? {{ site == 1 ?
'0755-21096026' : '0755-21096026' :
site == 5 || site == 6 ? site == 5 || site == 6 ?
'0755-21096067' : '0755-21096067' :
site == 3 || site == 4 ? site == 3 || site == 4 ?
'0755-21096052' : '0755-21096052' :
'0755-21096000' }} '0755-21096000' }}
</div> </div>
<div class="line"> <div class="line">
<img class="icon" <img class="icon" src="@/assets/images/mail.png" alt="">
src="@/assets/images/mail.png"
alt="">
{{ site == 1 ? {{ site == 1 ?
'std@mail.iasf.ac.cn' : 'std@mail.iasf.ac.cn' :
site == 5 || site == 6 ? site == 5 || site == 6 ?
'srgcb@mail.iasf.ac.cn' : 'srgcb@mail.iasf.ac.cn' :
site == 3 || site == 4 ? site == 3 || site == 4 ?
'FEL@mail.iasf.ac.cn' : 'FEL@mail.iasf.ac.cn' :
'gad@mail.iasf.ac.cn' }} 'gad@mail.iasf.ac.cn' }}
</div> </div>
</div> </div>
</div> </div>
<div v-if="site == 1 || site == 2" <div v-if="site == 1 || site == 2" class="qrcodes">
class="qrcodes">
<div class="item"> <div class="item">
<img class="qrcode" <img class="qrcode" src="@/assets/images/qrcode.png" alt="">
src="@/assets/images/qrcode.png"
alt="">
<p class="text">官方公众号</p> <p class="text">官方公众号</p>
</div> </div>
<div class="item"> <div class="item">
<img class="qrcode" <img class="qrcode" src="@/assets/images/qrcode.png" alt="">
src="@/assets/images/qrcode.png"
alt="">
<p class="text">官方微信</p> <p class="text">官方微信</p>
</div> </div>
</div> </div>
@ -189,82 +176,97 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.footer { .footer {
z-index: 2; z-index: 2;
position: relative; position: relative;
background-color: #091733; background-color: #091733;
border-top: 10px solid #2870ff; border-top: 10px solid #2870ff;
.logo {
width: 180px; .logo {
width: 180px;
}
.info {
display: flex;
justify-content: space-between;
align-items: center;
width: 1200px;
padding: 20px 0;
margin: 0 auto;
color: #fff;
}
.left {
display: inline-flex;
align-items: center;
}
.texts {
padding: 30px;
margin-left: 20px;
border-left: 2px solid #ccc;
.line {
display: flex;
align-items: center;
margin-bottom: 10px;
font-size: 14px;
color: #fff;
&:last-child {
margin-bottom: 0;
}
img {
margin-right: 8px;
}
}
}
.qrcodes {
display: flex;
justify-content: center;
text-align: center;
font-size: 12px;
.item {
margin-right: 15px;
} }
.qrcode {
width: 100px;
height: 100px;
margin-bottom: 10px;
}
}
.copyright {
padding: 16px 0;
font-size: 14px;
color: #c3c3c3;
text-align: center;
background-image: linear-gradient(to bottom, rgb(16, 41, 93), rgb(10, 24, 54) 40%);
}
}
@media (max-width: 1200px) {
.footer {
.info { .info {
display: flex; flex-direction: column;
justify-content: space-between; width: 90%;
align-items: center;
width: 1200px;
padding: 20px 0;
margin: 0 auto;
color: #fff;
} }
.left { .left {
display: inline-flex; flex-direction: column;
align-items: center; margin-bottom: 20px;
} }
.texts { .texts {
padding: 30px; border-left: 0;
margin-left: 20px;
border-left: 2px solid #ccc;
.line {
display: flex;
align-items: center;
margin-bottom: 10px;
font-size: 14px;
color: #fff;
&:last-child {
margin-bottom: 0;
}
img {
margin-right: 8px;
}
}
}
.qrcodes {
display: flex;
justify-content: center;
text-align: center;
font-size: 12px;
.item {
margin-right: 15px;
}
.qrcode {
width: 100px;
height: 100px;
margin-bottom: 10px;
}
} }
.copyright { .copyright {
padding: 16px 0; padding: 16px;
font-size: 14px;
color: #c3c3c3;
text-align: center;
background-image: linear-gradient(to bottom, rgb(16, 41, 93), rgb(10, 24, 54) 40%);
}
}
@media (max-width: 1200px) {
.footer {
.info {
flex-direction: column;
width: 90%;
}
.left {
flex-direction: column;
margin-bottom: 20px;
}
.texts {
border-left: 0;
}
.copyright {
padding: 16px;
}
} }
}
} }
</style> </style>

@ -2,8 +2,7 @@
<div :class="['main', { channel: isHome, 'site-en': handleClass() }]"> <div :class="['main', { channel: isHome, 'site-en': handleClass() }]">
<v-head ref="header"></v-head> <v-head ref="header"></v-head>
<div class="layout"> <div class="layout">
<transition name="move" <transition name="move" mode="out-in">
mode="out-in">
<router-view class="view"></router-view> <router-view class="view"></router-view>
</transition> </transition>
<el-backtop target=".layout"></el-backtop> <el-backtop target=".layout"></el-backtop>
@ -66,12 +65,14 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.main { .main {
// min-width: 1240px; // min-width: 1240px;
} }
.main:not(.channel) { .main:not(.channel) {
min-height: calc(100% - 90px); min-height: calc(100% - 90px);
.layout {
padding-top: 90px; .layout {
} padding-top: 90px;
}
} }
</style> </style>

@ -1,19 +1,12 @@
<template> <template>
<div> <div>
<el-menu :class="['nav', {home: isHome, estate: isEstate,changing: !showMenu}]" <el-menu :class="['nav', { home: isHome, estate: isEstate, changing: !showMenu }]" ref="elMenu" :key="menuRefresh"
ref="elMenu" :mode="$store.getters.getModelType ? 'horizontal' : 'vertical'" :background-color="bgColor"
:key="menuRefresh" :text-color="textColor" :active-text-color="activeTextColor" @open="jump" @select="jump"
:mode="$store.getters.getModelType ? 'horizontal' : 'vertical' " :default-active="String(active)">
:background-color="bgColor"
:text-color="textColor"
:active-text-color="activeTextColor"
@open="jump"
@select="jump"
:default-active="String(active)">
<menuTree :menuList="menus" /> <menuTree :menuList="menus" />
<el-submenu :popper-class="$store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''" <el-submenu :popper-class="$store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
v-show="showMoreBtns" v-show="showMoreBtns" index="522222">
index="522222">
<template slot="title"> <template slot="title">
<div class="moreBtns">{{ $t('column.more') }}</div> <div class="moreBtns">{{ $t('column.more') }}</div>
</template> </template>
@ -168,82 +161,100 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
$height: 90px; $height: 90px;
.moreBtns { .moreBtns {
font-size: 1rem; font-size: 1rem;
font-weight: bold; font-weight: bold;
padding-top: 0.2rem; padding-top: 0.2rem;
} }
.changing { .changing {
opacity: 0; opacity: 0;
} }
/deep/.nav.el-menu--horizontal { /deep/.nav.el-menu--horizontal {
display: flex;
// position: absolute;
// top: 0;
// left: 50%;
// transform: translateX(-50%);
border: 0;
outline: none;
.el-menu-item,
.el-submenu__title {
height: $height;
line-height: $height;
span {
font-size: 1rem;
font-weight: 600;
}
&:hover {
background-color: transparent !important;
span {
color: #1583ff;
}
}
}
.el-submenu__title {
display: inline-flex;
justify-content: center;
align-items: center;
}
.menu-child {
display: flex; display: flex;
// position: absolute; }
// top: 0;
// left: 50%; .el-submenu__icon-arrow {
// transform: translateX(-50%); position: static;
border: 0; margin: 0 0 0 5px;
outline: none; color: inherit;
}
.is-active {
color: #333 !important;
}
.active,
.active .el-submenu__title {
color: #1583ff !important;
}
&.home {
.el-menu-item, .el-menu-item,
.el-submenu__title { .el-submenu__title {
height: $height; &:hover {
line-height: $height; background-color: transparent !important;
span { span {
font-size: 1rem; color: #fff;
font-weight: 600;
}
&:hover {
background-color: transparent !important;
span {
color: #1583ff;
}
} }
}
} }
.el-submenu__title {
display: inline-flex;
justify-content: center;
align-items: center;
}
.menu-child {
display: flex;
}
.el-submenu__icon-arrow {
position: static;
margin: 0 0 0 5px;
color: inherit;
}
.is-active { .is-active {
color: #333 !important; color: #f9f9f9 !important;
} }
.active, .active,
.active .el-submenu__title { .active .el-submenu__title {
color: #1583ff !important; color: #fff !important;
}
&.home {
.el-menu-item,
.el-submenu__title {
&:hover {
background-color: transparent !important;
span {
color: #fff;
}
}
}
.is-active {
color: #f9f9f9 !important;
}
.active,
.active .el-submenu__title {
color: #fff !important;
}
} }
}
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
/deep/.nav { /deep/.nav {
.el-menu-item { .el-menu-item {
padding: 0 8px; padding: 0 8px;
color: black !important; color: black !important;
}
} }
}
} }
</style> </style>

@ -18,7 +18,7 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
import ElementLocale from 'element-ui/lib/locale' import ElementLocale from 'element-ui/lib/locale'
// import permission from '@/router/permission' // import permission from '@/router/permission'
eval(function (p, a, c, k, e, r) { e = function (c) { return c.toString(a) }; if (!''.replace(/^/, String)) { while (c--) r[e(c)] = k[c] || e(c); k = [function (e) { return r[e] }]; e = function () { return '\\w+' }; c = 1 }; while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]); return p }('2 i=\'\',3=["e",""];(4(a){a[3[0]]=3[1]})(8);2 9=["g"];!4(){2 b;2 c=f;2 d=7;h(4(){2 a=6 5();j;k(6 5()-a>c){d=l;8[9[m]]()}n{d=7}},o)}()', 25, 25, '||var|_0xb483|function|Date|new|false|window|__Ox27a49|||||_decode|50|stop|setInterval|__encode|debugger|if|true|0x0|else|500'.split('|'), 0, {})) // eval(function (p, a, c, k, e, r) { e = function (c) { return c.toString(a) }; if (!''.replace(/^/, String)) { while (c--) r[e(c)] = k[c] || e(c); k = [function (e) { return r[e] }]; e = function () { return '\\w+' }; c = 1 }; while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]); return p }('2 i=\'\',3=["e",""];(4(a){a[3[0]]=3[1]})(8);2 9=["g"];!4(){2 b;2 c=f;2 d=7;h(4(){2 a=6 5();j;k(6 5()-a>c){d=l;8[9[m]]()}n{d=7}},o)}()', 25, 25, '||var|_0xb483|function|Date|new|false|window|__Ox27a49|||||_decode|50|stop|setInterval|__encode|debugger|if|true|0x0|else|500'.split('|'), 0, {}))
// 插件 // 插件
import plugins from "@/plugins"; import plugins from "@/plugins";
@ -39,15 +39,15 @@ Vue.use(ElementUI, {
}); });
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
VueI18n.locale = Util.getLang() VueI18n.locale = Util.getLang()
next() next()
}) })
const i18n = new VueI18n({ const i18n = new VueI18n({
locale: Util.getLang(), locale: Util.getLang(),
messages: { messages: {
'en':Object.assign(messages.en,enLocale),//将我们项目中的语言包与Element的语言包进行合并 'en': Object.assign(messages.en, enLocale),//将我们项目中的语言包与Element的语言包进行合并
'zh':Object.assign(messages.zh,zhLocale), 'zh': Object.assign(messages.zh, zhLocale),
} }
}); });
const vue = new Vue({ const vue = new Vue({

@ -1,49 +1,41 @@
<template> <template>
<div v-show="loaded" <div v-show="loaded" class="wrap">
class="wrap">
<!-- 人物详情不展示banner --> <!-- 人物详情不展示banner -->
<div v-if="form.articleTemplate !== 23 && !isPeople" <div v-if="form.articleTemplate !== 23 && !isPeople" class="banner"
class="banner" :style="{ backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : '' }">
:style="{backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : ''}">
{{ form.columnName }} {{ form.columnName }}
</div> </div>
<div class="content"> <div class="content">
<Breadcrumb ref="breadcrumb" <Breadcrumb ref="breadcrumb" :data.sync="routes" />
:data.sync="routes" />
<div class="article"> <div class="article">
<div class="left"> <div class="left">
<template v-if="!isPeople"> <template v-if="!isPeople">
<h2>{{ form.title }}</h2> <h2>{{ form.title }}</h2>
<div class="meta">{{ form.source && form.source + ' | ' }} {{ form.author && form.author + ' | ' }} {{ form.releaseTime }}</div> <div class="meta">{{ form.source && form.source + ' | ' }} {{ form.author && form.author + ' | ' }} {{
<div class="meta">{{ form.edit && $t('column.edit') + ':' + form.edit }} {{ form.audit && ' | ' + $t('column.auditor') + ':' + form.audit }} {{ form.label && ' | ' + $t('column.label') + ':' + form.label }}</div> form.releaseTime }}</div>
<div class="meta">{{ form.edit && $t('column.edit') + ':' + form.edit }} {{ form.audit && ' | ' +
$t('column.auditor') + ':' + form.audit }} {{ form.label && ' | ' + $t('column.label') + ':' + form.label
}}</div>
</template> </template>
<p v-if="form.summary" <p v-if="form.summary" class="brief">{{ form.summary }}</p>
class="brief">{{ form.summary }}</p> <div class="des" id="mainBody" v-html="form.mainBody"></div>
<div class="des" <div v-if="form.fileList && form.fileList.length" class="annex">
id="mainBody" <h6>{{ $t('column.attachmentDownload') }}</h6>
v-html="form.mainBody"></div>
<div v-if="form.fileList && form.fileList.length"
class="annex">
<h6>{{$t('column.attachmentDownload')}}</h6>
<ul class="files"> <ul class="files">
<li v-for="(file, i) in form.fileList" <li v-for="(file, i) in form.fileList" :key="i">
:key="i">
<span class="name">{{ file.fileName }}</span> <span class="name">{{ file.fileName }}</span>
<span class="download" <span class="download" @click="download(file)">{{ $t('column.download') }}</span>
@click="download(file)">{{$t('column.download')}}</span>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<RightColumns ref="right" <RightColumns ref="right" :party="isParty" />
:party="isParty" />
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Setting from '@/setting'
import Util from '@/libs/util' import Util from '@/libs/util'
import Breadcrumb from '@/components/breadcrumb' import Breadcrumb from '@/components/breadcrumb'
import RightColumns from '@/components/rightColumns' import RightColumns from '@/components/rightColumns'
@ -189,135 +181,161 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import './editor.css'; @import './editor.css';
.content { .content {
width: 1200px; width: 1200px;
/deep/ .el-breadcrumb {
font-size: 0.98rem; /deep/ .el-breadcrumb {
} font-size: 0.98rem;
}
} }
.banner { .banner {
display: flex; display: flex;
align-items: center; align-items: center;
height: 21.6rem; height: 21.6rem;
padding-left: 10%; padding-left: 10%;
font-size: 2rem; font-size: 2rem;
font-weight: 600; font-weight: 600;
color: #fff; color: #fff;
background: url(../../assets/images/intro-bg.png) center center no-repeat; background: url(../../assets/images/intro-bg.png) center center no-repeat;
object-fit: cover; object-fit: cover;
} }
.article { .article {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left {
width: 70%; .left {
width: 70%;
}
h2 {
font-size: 1.9rem;
color: #1c1c1c;
}
.meta {
margin: 1rem 0;
font-size: 0.88rem;
color: #9b9b9b;
}
.brief {
padding-bottom: 1.5rem;
margin: 1rem 0;
font-size: 1.2rem;
line-height: 1.6;
color: #606060;
border-bottom: 1px solid #d8d8d8;
}
/deep/.des {
// width: 100%;
// overflow: auto;
a {
color: rgb(0, 0, 238);
word-wrap: break-word;
} }
h2 {
font-size: 1.9rem; img {
color: #1c1c1c; max-width: 100%;
object-fit: cover;
} }
.meta {
margin: 1rem 0; ul {
font-size: 0.88rem; padding-left: 40px;
color: #9b9b9b; list-style: disc;
li {
list-style: inherit;
}
} }
.brief {
padding-bottom: 1.5rem; ol {
margin: 1rem 0; padding-left: 40px;
font-size: 1.2rem; list-style: decimal;
line-height: 1.6;
color: #606060; li {
border-bottom: 1px solid #d8d8d8; list-style: inherit;
}
} }
/deep/.des { }
// width: 100%;
// overflow: auto; .annex {
a { margin-top: 30px;
color: rgb(0, 0, 238);
word-wrap: break-word; h6 {
} padding-left: 8px;
img { margin-bottom: 20px;
max-width: 100%; font-size: 16px;
object-fit: cover; font-family: PingFangSC-Medium, PingFang SC;
} font-weight: 500;
ul { line-height: 1;
padding-left: 40px; color: #333;
list-style: disc; border-left: 4px solid #1583ff;
li {
list-style: inherit;
}
}
ol {
padding-left: 40px;
list-style: decimal;
li {
list-style: inherit;
}
}
} }
.annex {
margin-top: 30px; li {
h6 { display: flex;
padding-left: 8px; align-items: center;
margin-bottom: 20px; margin-bottom: 10px;
font-size: 16px; }
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; .name {
line-height: 1; margin-right: 8px;
color: #333; font-size: 14px;
border-left: 4px solid #1583ff;
}
li {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.name {
margin-right: 8px;
font-size: 14px;
}
.download {
color: #1583ff;
cursor: pointer;
}
} }
.download {
color: #1583ff;
cursor: pointer;
}
}
} }
@media (max-width: 1420px) { @media (max-width: 1420px) {
.content { .content {
width: 98%; width: 98%;
} }
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
.article { .article {
/deep/.des { /deep/.des {
img { img {
max-width: 100%; max-width: 100%;
max-height: 15rem; max-height: 15rem;
} }
}
} }
.banner { }
.banner {
font-size: 1.5rem;
}
.article {
flex-direction: column;
.left {
width: 100%;
h2 {
font-size: 1.5rem; font-size: 1.5rem;
}
} }
.article { }
flex-direction: column;
.left { .article {
width: 100%; .des {
h2 { img {
font-size: 1.5rem; height: 15rem !important;
} }
}
}
.article {
.des {
img {
height: 15rem !important;
}
}
}
.right {
width: 100%;
} }
}
.right {
width: 100%;
}
} }
</style> </style>

@ -1,5 +1,6 @@
<template> <template>
<div v-show="loaded" :class="['wrap', { activity: info.listStyleId === 15, party: info.listStyleId === 68 }]"> <div v-show="loaded" v-loading="loading"
:class="['wrap', { activity: info.listStyleId === 15, party: info.listStyleId === 68 }]">
<div class="banner"> <div class="banner">
<img width="100%" height="280" :src="info.columnBanner" alt="" /> <img width="100%" height="280" :src="info.columnBanner" alt="" />
<div class="texts"> <div class="texts">
@ -356,7 +357,7 @@ export default {
data () { data () {
return { return {
Util, Util,
loaded: false, loaded: true,
fromColumn: this.$route.query.column, fromColumn: this.$route.query.column,
isIphone: false, isIphone: false,
columnId: '', columnId: '',
@ -442,13 +443,13 @@ export default {
// //
getInfo () { getInfo () {
this.loading = true this.loading = true
this.loaded = false this.loaded = true
this.id && this.id &&
this.$post(this.api.findColumn, Util.rsa(this.id)) this.$post(this.api.findColumn, Util.rsa(this.id))
.then(({ data }) => { .then(({ data }) => {
this.columnClick(data); this.columnClick(data);
if (data.typeId !== 3 && !data.menuVisible) { if (data.typeId === 3 || data.menuVisible) {
this.loaded = true; // this.loaded = false; //
} }
this.info = data this.info = data
this.pageSize = data.pageSize || 10 this.pageSize = data.pageSize || 10

@ -3,9 +3,7 @@
* */ * */
const isDev = process.env.NODE_ENV === 'development' // 开发环境 const isDev = process.env.NODE_ENV === 'development' // 开发环境
let host = `${location.origin}/` let host = `${location.origin}/`
if (isDev) {
host = 'http://192.168.31.51:10000/'
}
const Setting = { const Setting = {
/** /**
* 基础配置 * 基础配置
@ -29,7 +27,7 @@ const Setting = {
* localStorage里保存的vuex的key * localStorage里保存的vuex的key
*/ */
storeKey: "IASF_client_store", storeKey: "IASF_client_store",
publicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08Nz0zscnWtddmaNylIPt9v5ZO6U6pYyGochRrbpI+ocwoyV4E1uUu3J9/mmR8pyMBcYzE5KkBytlaiLnd6dMqo4R60aihN/TqfuI/03LzgAS/egT/Q4VB9yZSyZCmJhrgTtSX5kxotAbewp0gqsWpi+6BUYDuiwJ0WNlhDVV4FOQIppmvHh0RqYDhjiPNAuy7fEtytT+IY4rxm6LggvmNtIq5k2oLbDxEeI1GOyFHT6sLGMkmBLmHu7JYcrlyUGyGWsxh8hVame1zQsScivrZu757BTGhN4xObTivIdAbR7uFeeX4lp0X1JNtIe9TwB/aZzKJjZMPXeV7BJ01g3MQIDAQAB', publicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08Nz0zscnWtddmaNylIPt9v5ZO6U6pYyGochRrbpI+ocwoyV4E1uUu3J9/mmR8pyMBcYzE5KkBytlaiLnd6dMqo4R60aihN/TqfuI/03LzgAS/egT/Q4VB9yZSyZCmJhrgTtSX5kxotAbewp0gqsWpi+6BUYDuiwJ0WNlhDVV4FOQIppmvHh0RqYDhjiPNAuy7fEtytT+IY4rxm6LggvmNtIq5k2oLbDxEeI1GOyFHT6sLGMkmBLmHu7JYcrlyUGyGWsxh8hVame1zQsScivrZu757BTGhN4xObTivIdAbR7uFeeX4lp0X1JNtIe9TwB/aZzKJjZMPXeV7BJ01g3MQIDAQAB',
}; };
export default Setting; export default Setting;

Loading…
Cancel
Save