Skip to content

Commit

Permalink
"部分bug的修改"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiale-Fang committed Apr 1, 2022
1 parent 723cadb commit 67756ec
Show file tree
Hide file tree
Showing 45 changed files with 571 additions and 671 deletions.
42 changes: 42 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
"vue-router": "^3.2.0",
"vue-social-share": "0.0.3",
"vuex": "^3.6.2",
"vuex-persist": "^3.1.3",
"vuex-persistedstate": "^4.1.0",
"waypoints": "^4.0.1"
},
"devDependencies": {
Expand Down
24 changes: 19 additions & 5 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<template>
<div id="app">
<!-- 导航栏 -->
<TopNavBar v-show="( path==='/home' || path==='/types' || path==='/archives' || path==='/link' || path==='/blog' || path==='/tags' || path==='/about' || path==='/message' || path==='/login' || path==='/crawler' || path==='/crawlerBlog' || path==='/AI' )"></TopNavBar>
<TopNavBar v-show="( path==='/home' || path.includes('/types') || path==='/archives' || path==='/link' || path.includes('/blog/') || path.includes('/tags') || path==='/about' || path==='/message' || path==='/login' || path.includes('/crawler') || path==='/AI' )"></TopNavBar>
<!-- <AdminTopNavBar v-show="( path==='/blogs' || path==='/tags2' || path==='/types2' || path==='/postblogs')"></AdminTopNavBar>-->
<!-- <MusicTopNavBar v-show="( path==='/music' || path==='discovery' || path==='/playlists' || path==='/songs' || path==='/mvs' )"></MusicTopNavBar>-->
<AdminTopNavBar v-show="false"></AdminTopNavBar>
<Audio></Audio>
<!-- 忘记密码模态框 -->
<ForgetModel></ForgetModel>
<!-- <Audio v-show="( path==='/home' || path==='/types' || path==='/archives' || path==='/link' || path==='/blog' || path==='/tags' || path==='/about' || path==='/message' || path==='/login' || path==='/crawler' || path==='/crawlerBlog' )"></Audio>-->
<!-- <Footer v-show="( path==='/home' || path==='/types' || path==='/archives' || path==='/link' || path==='/blog' || path==='/tags' || path==='/about')"></Footer>-->
<!-- <Audio v-show="( path==='/home' || path==='/types' || path==='/archives' || path==='/link' || path==='/blog' || path==='/tags' || path==='/about' || path==='/message' || path==='/login' || path==='/crawler' || path==='/crawlerBlog' )"></Audio>-->
<router-view/>
<!-- <Footer v-show="( path==='/home' || path==='/types' || path==='/archives' || path==='/link' || path==='/blog' || path==='/tags' || path==='/about')"></Footer>-->
</div>
</template>
<script>
Expand All @@ -19,6 +19,8 @@ import ForgetModel from './components/model/ForgetModel'
import TopNavBar from './components/layout/TopNavBar'
import AdminTopNavBar from './components/layout/AdminTopNavBar'
import Audio from './components/music/Audio'
import router from './router'
import { generaMenu } from './assets/js/menu'
// import Footer from './components/layout/Footer'
export default {
data () {
Expand All @@ -37,14 +39,26 @@ export default {
// 判断路由
mounted () {
this.path = this.$route.path
// console.log(this.$route.path)
},
watch: {
$route (to, from) {
this.path = to.path
router.addRoutes(this.$store.state.asyncRoutes);
}
},
created () {
// 在页面加载时读取sessionStorage里的状态信息
if (sessionStorage.getItem("store")) {
this.$store.replaceState(Object.assign({}, this.$store.state, JSON.parse(sessionStorage.getItem("store"))))
}
if (this.$store.state.token !== '') {
generaMenu()
}
// 在页面刷新时将vuex里的信息保存到sessionStorage里
window.addEventListener("beforeunload", () => {
sessionStorage.setItem("store", JSON.stringify(this.$store.state))
})
}
}
</script>
<style>
Expand Down
10 changes: 5 additions & 5 deletions src/assets/js/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default {
QQ_APP_ID: "101999460",
QQ_REDIRECT_URI: "https://www.tcefrep.site/oauth/login/qq",
WEIBO_APP_ID: "2028412959",
WEIBO_REDIRECT_URI: "https://www.tcefrep.site/oauth/login/weibo",
TENCENT_CAPTCHA: "2088053498"
QQ_APP_ID: "",
QQ_REDIRECT_URI: "",
WEIBO_APP_ID: "",
WEIBO_REDIRECT_URI: "",
TENCENT_CAPTCHA: ""
};
18 changes: 18 additions & 0 deletions src/assets/music/index.css → src/assets/music/music.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@ html {
Microsoft YaHei, '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif;
}

body {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 100vh;
background: url("https://r.photo.store.qq.com/psc?/V53KcXfb1umonn4HbITu3rINxs43TczD/45NBuzDIW489QBoVep5mce80KgERvhV49OLgLEc6tIViX7bQ6yhDjSCZnfvv3X*LDhhFk0K*5xZoxTlCiYo.ZBnLMk4RdY2seW70EDByE84!/r") center center /
cover no-repeat;
background-color: #49b1f5;
background-attachment: fixed;
text-align: center;
color: #fff !important;
animation: header-effect 1s !important;
}
*{
margin: 0;
padding: 0;
}
* {
box-sizing: border-box;
margin: 0;
Expand Down
25 changes: 12 additions & 13 deletions src/components/OauthLogin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

<script>
/* eslint-disable no-undef */
import { generaMenu } from '../assets/js/menu'
export default {
created () {
const that = this;
Expand All @@ -28,9 +30,11 @@ export default {
.then(({ data }) => {
if (data.flag) {
// 保存登录状态
// that.$store.commit("login", data.data);
sessionStorage.setItem('token', data.code)
sessionStorage.setItem('user', JSON.stringify(data.data))
window.sessionStorage.setItem('token', data.data.token)
that.$store.state.token = data.data.token
that.$store.commit("login", data.data.user);
generaMenu()
that.$router.push({ path: "/welcome" });
if (data.data.email == null) {
that.$message.info("请绑定邮箱以便及时收到回复");
} else {
Expand All @@ -50,9 +54,11 @@ export default {
.then(({ data }) => {
if (data.flag) {
// 保存登录状态
// that.$store.commit("login", data.data);
sessionStorage.setItem('token', data.code)
sessionStorage.setItem('user', JSON.stringify(data.data))
window.sessionStorage.setItem('token', data.data.token)
that.$store.state.token = data.data.token
that.$store.commit("login", data.data.user);
generaMenu()
that.$router.push({ path: "/welcome" });
if (data.data.email == null) {
that.$message.info("请绑定邮箱以便及时收到回复");
} else {
Expand All @@ -63,13 +69,6 @@ export default {
}
});
}
// 跳转回原页面
const loginUrl = that.$store.state.loginUrl;
if (loginUrl != null && loginUrl !== "") {
that.$router.push({ path: loginUrl });
} else {
that.$router.push({ path: "/" });
}
}
};
</script>
Expand Down
Loading

0 comments on commit 67756ec

Please sign in to comment.