diff --git a/src/assets/css/base.css b/src/assets/css/base.css index e4c9575..37899ac 100644 --- a/src/assets/css/base.css +++ b/src/assets/css/base.css @@ -363,7 +363,7 @@ a:hover { font-size: 36px !important; } .lht17 { - lint-height: 17px; + line-height: 17px; } .lht18 { line-height: 18px; @@ -418,6 +418,9 @@ a:hover { .colffa { color: #ffa940; } +.colff4 { + color: #ff4d4f; +} .col28c { color: #28c346; diff --git a/src/components/AvatarDropDown.vue b/src/components/AvatarDropDown.vue index 91cb888..8a6de61 100644 --- a/src/components/AvatarDropDown.vue +++ b/src/components/AvatarDropDown.vue @@ -49,6 +49,7 @@ import { reactive, toRefs } from "vue"; import { getUid } from "@/utils/cookie"; import { getUserInfoShequ } from "@/api/user"; +import store from "@/store"; export default { setup() { const state = reactive({ @@ -59,6 +60,7 @@ export default { const res = await getUserInfoShequ(state.uid); if (res.code === 200) { state.user = res.data; + store.commit("set_user_name", res.data.username); } }; resGetUserInfoShequ(); diff --git a/src/components/Footer - 副本.vue b/src/components/Footer - 副本.vue new file mode 100644 index 0000000..303eaa4 --- /dev/null +++ b/src/components/Footer - 副本.vue @@ -0,0 +1,497 @@ + + + + + + + diff --git a/src/store/index.js b/src/store/index.js index efaf8d1..ac45133 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -13,7 +13,8 @@ export default createStore({ // isShowFooter: true fr_access_token: "", fr_appid: "", - fr_uid: "" + fr_uid: "", + userName: "", }, getters: { get_token(state) { @@ -34,6 +35,9 @@ export default createStore({ let fr_uid = state.fr_uid || Cookies.get(UidKey) || null; return encode(`${fr_appid}.${fr_access_token}.${fr_uid}`) }, + get_user_name(state) { + return state.userName; + }, }, mutations: { @@ -61,6 +65,10 @@ export default createStore({ Cookies.remove(expiresTimeKey); }, + set_user_name(state, data){ + state.userName = data; + } + }, actions: { Login({ commit }) { diff --git a/src/views/class/admin/student_admin_class.vue b/src/views/class/admin/student_admin_class.vue index dc3d788..52ff542 100644 --- a/src/views/class/admin/student_admin_class.vue +++ b/src/views/class/admin/student_admin_class.vue @@ -1,152 +1,146 @@