提交 4a35ba15 authored 作者: haodaking's avatar haodaking

update

上级 dc251dea
...@@ -32,7 +32,7 @@ export default new Vuex.Store({ ...@@ -32,7 +32,7 @@ export default new Vuex.Store({
const isLogin = await getUser() const isLogin = await getUser()
.then(response => { .then(response => {
if (response.code === 0) { if (response.code === 0) {
commit('setUser', response) commit('setUser', response.data)
return true return true
} else { } else {
commit('setUser', {}) commit('setUser', {})
......
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
methods: { methods: {
// 获取openid // 获取openid
getOpenId() { getOpenId() {
api.getOpenId({ id: this.user.data.id, identity: 'alumni' }).then(response => { api.getOpenId({ id: this.user.id, identity: 'alumni' }).then(response => {
this.openId = response.data.openid this.openId = response.data.openid
// 生成订单 // 生成订单
this.genOrder() this.genOrder()
......
...@@ -68,8 +68,20 @@ export default { ...@@ -68,8 +68,20 @@ export default {
{ src: 'img/home_nav_03.png', title: '直播课', type: 3 }, { src: 'img/home_nav_03.png', title: '直播课', type: 3 },
// { src: 'img/home_nav_04.png', title: '找工作', type: 4 }, // { src: 'img/home_nav_04.png', title: '找工作', type: 4 },
{ src: 'img/home_nav_04.png', title: '运动家', type: 5 } { src: 'img/home_nav_04.png', title: '运动家', type: 5 }
], ]
popularList: [ }
},
computed: {
user() {
return this.$store.state.user
},
popularList() {
return [
{
title: '紫荆-玛丽伍德MBA项目',
src: 'img/home_marywood.png',
href: `https://pages.ezijing.com/marywood/m204001490516.html?channel_num=19963&usre_id=${this.user.id}`
},
{ {
title: '紫荆-索菲亚FMBA项目', title: '紫荆-索菲亚FMBA项目',
src: 'img/home_sofia.png', src: 'img/home_sofia.png',
...@@ -83,7 +95,6 @@ export default { ...@@ -83,7 +95,6 @@ export default {
] ]
} }
}, },
methods: { methods: {
handleNavClick({ type }) { handleNavClick({ type }) {
this.$router.push({ name: 'activity', query: { type } }) this.$router.push({ name: 'activity', query: { type } })
...@@ -155,28 +166,28 @@ export default { ...@@ -155,28 +166,28 @@ export default {
background-size: contain; background-size: contain;
} }
.popular-list { .popular-list {
display: flex;
justify-content: space-between;
// display: flex; // display: flex;
// overflow-x: auto; // justify-content: space-between;
// overflow-y: hidden; display: flex;
// margin-left: -15px; overflow-x: auto;
// margin-right: -15px; overflow-y: hidden;
// -webkit-overflow-scrolling: touch; margin-left: -15px;
margin-right: -15px;
-webkit-overflow-scrolling: touch;
} }
.popular-item { .popular-item {
flex-shrink: 0; flex-shrink: 0;
margin-bottom: 0.18rem; margin-bottom: 0.18rem;
// margin-right: 0.15rem; margin-right: 0.15rem;
width: 1.65rem; width: 1.65rem;
min-height: 1.4rem; min-height: 1.4rem;
background: #ffffff; background: #ffffff;
box-shadow: 0px 2px 6px 0px rgba(74, 9, 25, 0.05); box-shadow: 0px 2px 6px 0px rgba(74, 9, 25, 0.05);
border-radius: 6px; border-radius: 6px;
overflow: hidden; overflow: hidden;
// &:first-child { &:first-child {
// margin-left: 15px; margin-left: 15px;
// } }
} }
.popular-item-pic { .popular-item-pic {
height: 0.95rem; height: 0.95rem;
......
...@@ -10,7 +10,7 @@ module.exports = { ...@@ -10,7 +10,7 @@ module.exports = {
}, },
proxy: { proxy: {
'/api': { '/api': {
target: 'https://alumni2.ezijing.com' target: 'https://alumni.ezijing.com'
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论