提交 3f2a9cf1 authored 作者: lihuihui's avatar lihuihui

修改bug

上级 c4cf1d31
...@@ -21,6 +21,6 @@ export function getCerts(params) { ...@@ -21,6 +21,6 @@ export function getCerts(params) {
return httpRequest.get('/api/certs/v1/student/get-certificate', { params }) return httpRequest.get('/api/certs/v1/student/get-certificate', { params })
} }
// // 登出 // // 登出
// export function logout() { export function logout() {
// return httpRequest.get('/api/zy/user/logout') return httpRequest.get('/api/passport/rest/logout')
// } }
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<img :src="user.head_img" class="photo" /> <img :src="user.head_img" class="photo" />
</div> </div>
<div class="name">{{ user.english_name || user.chinese_name }}</div> <div class="name">{{ user.english_name || user.chinese_name }}</div>
<div class="name" @click="loginOut">退出</div>
</template> </template>
<div v-else class="name" @click="goLogin">立即登录</div> <div v-else class="name" @click="goLogin">立即登录</div>
</div> </div>
...@@ -48,6 +49,9 @@ export default { ...@@ -48,6 +49,9 @@ export default {
methods: { methods: {
goLogin() { goLogin() {
window.location.href = webConf.others.loginUrl window.location.href = webConf.others.loginUrl
},
loginOut() {
this.$store.dispatch('logout').then(() => {})
} }
} }
} }
......
<template> <template>
<div> <div>
<div class="degrees-title">{{ this.$t('shmsLang.status.degTitle') }}</div> <div class="degrees-title">{{ this.$t('shmsLang.status.degTitle') }}</div>
<div class="degrees-content"> <div class="padding_lr">
<div class="th-box"> <div class="degrees-content">
<div class="th" v-for="(item, index) in thItem" :key="index">{{ item }}</div> <div class="th-box">
</div> <div class="th" v-for="(item, index) in thItem" :key="index">{{ item }}</div>
<div class="td-box" v-for="(item, index) in degreesItem" :key="index"> </div>
<div class="td">{{ item.major }}</div> <div class="td-box" v-for="(item, index) in degreesItem" :key="index">
<div class="td">{{ item.level }}</div> <div class="td">&nbsp;&nbsp;{{ item.major }}</div>
<div class="td">{{ item.type }}</div> <div class="td">{{ item.level }}</div>
<div class="td">{{ item.type }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -28,6 +30,9 @@ export default { ...@@ -28,6 +30,9 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.padding_lr {
padding: 0 35px;
}
.degrees-title { .degrees-title {
font-size: 20px; font-size: 20px;
line-height: 24px; line-height: 24px;
...@@ -35,7 +40,7 @@ export default { ...@@ -35,7 +40,7 @@ export default {
margin: 24px 0; margin: 24px 0;
} }
.degrees-content { .degrees-content {
width: 857px; // width: 857px;
margin: 0 auto; margin: 0 auto;
.th-box { .th-box {
height: 56px; height: 56px;
......
...@@ -91,9 +91,10 @@ export default { ...@@ -91,9 +91,10 @@ export default {
padding: 24px 0 30px; padding: 24px 0 30px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
display: flex; display: flex;
justify-content: center; justify-content: space-around;
.photo { .photo {
width: 146px; width: 146px;
min-width: 146px;
height: 180px; height: 180px;
background: #ffffff; background: #ffffff;
border: 1px solid #707070; border: 1px solid #707070;
...@@ -117,7 +118,7 @@ export default { ...@@ -117,7 +118,7 @@ export default {
line-height: 22px; line-height: 22px;
color: #838383; color: #838383;
margin-top: 16px; margin-top: 16px;
min-width: 333px; // min-width: 333px;
} }
.info-temp { .info-temp {
display: flex; display: flex;
...@@ -141,7 +142,7 @@ export default { ...@@ -141,7 +142,7 @@ export default {
text-align: right; text-align: right;
} }
.value { .value {
max-width: 200px; max-width: 100px;
font-size: 16px; font-size: 16px;
color: #838383; color: #838383;
margin-left: 19px; margin-left: 19px;
......
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pdf-down_box{ .pdf-down_box {
padding: 0 30px; padding: 0 30px;
} }
.app-card { .app-card {
......
import Vue from 'vue' import Vue from 'vue'
import Vuex from 'vuex' import Vuex from 'vuex'
import { getUser } from '@/api/account' import { getUser, logout } from '@/api/account'
Vue.use(Vuex) Vue.use(Vuex)
const store = new Vuex.Store({ const store = new Vuex.Store({
...@@ -40,13 +40,13 @@ const store = new Vuex.Store({ ...@@ -40,13 +40,13 @@ const store = new Vuex.Store({
}) })
}, },
// 退出登录 // 退出登录
// logout({ commit }) { logout({ commit }) {
// return logout().then(response => { return logout().then(response => {
// commit('setUser', {}) commit('setUser', {})
// commit('setIsLogin', false) commit('setIsLogin', false)
// return response return response
// }) })
// }, },
// 检测登录状态 // 检测登录状态
async checkLogin({ commit }) { async checkLogin({ commit }) {
const isLogin = await getUser() const isLogin = await getUser()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论