提交 5b738007 authored 作者: matian's avatar matian

updates

上级 a265d99e
......@@ -5,8 +5,8 @@ const projectId = process.env.projectId
/**
* 获取用户信息
*/
export function getUser() {
return httpRequest.get('/api/passport/account/get-user-info')
export function getUser(params = { learning_info: 1 }) {
return httpRequest.get('/api/usercenter/v2/frontend/user/get-user-info', { params })
}
/**
......
......@@ -5,7 +5,11 @@
<div class="max-width-content">
<div class="logo-box">
<img
:src="$cookies.get('lang') == 'en-US' ? 'https://webapp-pub.ezijing.com/www/pc/en-logo.png' : 'https://zws-imgs-pub.ezijing.com/static/public/0411340f9306b908eda54b5d66668f50.png'"
:src="
$cookies.get('lang') == 'en-US'
? 'https://webapp-pub.ezijing.com/www/pc/en-logo.png'
: 'https://zws-imgs-pub.ezijing.com/static/public/0411340f9306b908eda54b5d66668f50.png'
"
@click="goPage('/')"
/>
</div>
......@@ -23,7 +27,10 @@
</div>
</client-only>
</template>
<div class="language"><span @click="switchLocale('zh-CN')">中文</span><span style="display:none" @click="switchLocale('en-US')">EN</span></div>
<div class="language">
<span @click="switchLocale('zh-CN')">中文</span
><span style="display:none" @click="switchLocale('en-US')">EN</span>
</div>
</div>
</div>
<div class="head-nav-content max-width-content">
......@@ -60,8 +67,19 @@
</template>
</div>
<template v-for="(level2Item, level2Index) in item.childern">
<div class="two-level" :key="level2Index + 'two-level2'" v-if="level2Item.isShow" @mouseenter="level3Show" @mouseleave="level3Show(level2Item, 'out')">
<div @click="goPage(level3Item.path, level3Item.pathType)" class="name" v-for="(level3Item, level3Index) in level2Item.childern" :key="level3Index + level3Item">
<div
class="two-level"
:key="level2Index + 'two-level2'"
v-if="level2Item.isShow"
@mouseenter="level3Show"
@mouseleave="level3Show(level2Item, 'out')"
>
<div
@click="goPage(level3Item.path, level3Item.pathType)"
class="name"
v-for="(level3Item, level3Index) in level2Item.childern"
:key="level3Index + level3Item"
>
{{ level3Item.name }}
</div>
</div>
......@@ -504,10 +522,16 @@ export default {
return this.$store.state.user || {}
},
loginURL() {
return process.client ? `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}` : ''
return process.client
? `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(
location.origin + this.$route.fullPath
)}`
: ''
},
registerURL() {
return process.client ? `${process.env.loginURL}/register?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}` : ''
return process.client
? `${process.env.loginURL}/register?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}`
: ''
}
}
}
......
......@@ -104,6 +104,7 @@ export default {
}
},
mounted() {
console.log(this.$store.state.user, 'user')
this.roadList = roadMapList
this.homeList = homeList
this.$nextTick(() => {
......
......@@ -47,8 +47,10 @@ export const actions = {
},
// 检测登录状态
async checkLogin({ commit }) {
console.log('000')
const isLogin = await getUser()
.then(response => {
console.log(response, 'response')
commit('setUser', response.data)
return true
})
......
......@@ -6,6 +6,7 @@ export const roadMapList = [
title: '职业教育',
projectList: [
{
tenant: '',
name: '紫荆数字经济产业学院',
href: 'https://www.baidu.com/'
}
......@@ -13,11 +14,11 @@ export const roadMapList = [
checkList: [
{
name: '在线国际学位',
href: ''
path: '/internationalDegree'
},
{
name: '硕士(国际留学)',
href: ''
path: '/studyAbroad'
}
]
},
......@@ -33,17 +34,17 @@ export const roadMapList = [
},
{
name: '国际大一(1+3)即将推出',
href: ''
onClick: ''
}
],
checkList: [
{
name: '在线国际学位',
href: ''
path: '/internationalDegree'
},
{
name: '硕士(国际留学)',
href: ''
path: '/studyAbroad'
}
]
},
......@@ -55,53 +56,60 @@ export const roadMapList = [
title: '在线国际学位',
projectList: [
{
tenant: 'marywood',
name: '数字领导力方向MBA',
href: ''
href: 'https://marywood.ezijing.com'
},
{
tenant: 'seg',
name: '酒店和旅游方向MBA',
href: ''
href: 'https://shms.ezijing.com'
},
{
tenant: 'caas',
name: '餐饮管理方向MBA',
href: ''
href: 'https://caas.ezijing.com'
}
],
checkList: [
{
tenant: 'cbu-plus',
name: '工商管理博士DBA',
href: ''
href: 'https://cbu-plus.ezijing.com'
}
]
},
{
position: 'right-start',
isShow: false,
icon: 'https://webapp-pub.ezijing.com/www/pc/lifeLearning/icon4.png',
title: '硕士',
projectList: [
{
tenant: 'kelley',
name: '金融硕士MSF',
href: ''
href: 'https://kelley.ezijing.com'
},
{
tenant: 'campbellsville',
name: '教育学硕士MED',
href: ''
href: 'https://cu.ezijing.com'
},
{
tenant: 'ciis',
name: '应用心理学MAP',
href: ''
href: 'https://ciis.ezijing.com'
}
],
checkList: [
{
name: '在线国际学位',
href: ''
path: '/internationalDegree'
},
{
tenant: 'cbu-plus',
name: '工商管理博士DBA',
href: ''
href: 'https://cbu-plus.ezijing.com'
}
]
},
......@@ -113,8 +121,9 @@ export const roadMapList = [
title: '博士',
projectList: [
{
tenant: 'cbu-plus',
name: '工商管理博士DBA',
href: ''
href: 'https://cbu-plus.ezijing.com'
}
],
checkList: [
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论