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

updates

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