Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/pc-space/src/components/PageHeader.vue

@@ -54,6 +54,11 @@ export default {
         };
     },
     computed: { ...mapState(['userInfo']) },
+    mounted() {
+        this.$EventBus.$on('login', () => {
+            this.show = true;
+        });
+    },
     methods: {
         tab(item) {
             this.active = item;

src/main/pc-space/src/eventBus.js

@@ -0,0 +1,2 @@
+import Vue from 'vue';  
+export default new Vue(); 

src/main/pc-space/src/main.js

@@ -9,6 +9,7 @@ import common from './mixins/common';
 ElementUI.Dialog.props.closeOnClickModal.default = false;
 import './styles/font.less';
 import './styles/app.less';
+import eventBus from './eventBus';
 
 Vue.prototype.$colors = {
     prim: '#FF7F1F',
@@ -18,6 +19,8 @@ Vue.use(ElementUI);
 Vue.use(http);
 Vue.mixin(common);
 
+Vue.prototype.$EventBus = eventBus;
+
 Vue.config.productionTip = false;
 
 new Vue({

src/main/pc-space/src/mixins/common.js

@@ -83,7 +83,7 @@ export default {
                 this.$confirm('用户未登录,是否立即登录', '提示', {
                     confirmButtonText: '立即登录'
                 }).then(() => {
-                    this.$router.push('/login');
+                    this.$EventBus.$emit('login');
                 });
                 return Promise.reject();
             }

src/main/pc-space/src/mixins/user.js

@@ -7,7 +7,7 @@ export default {
     methods: {
         like(info) {
             this.checkLogin().then(() => {
-                if (!this.info.follow) {
+                if (!info.follow) {
                     this.$http.get(`/user/${info.id}/follow`).then(res => {
                         this.$message.success('关注成功');
                         this.changeInfo({
@@ -29,7 +29,7 @@ export default {
             });
         },
         changeInfo(info) {
-            if (this.isList) {
+            if (!this.isList) {
                 let list = [...this.list];
 
                 list.forEach(item => {

src/main/pc-space/src/router/index.js

@@ -1,11 +1,14 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
+import store from '../store';
+import { MessageBox } from 'element-ui';
 // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题
 const originalPush = VueRouter.prototype.push;
 VueRouter.prototype.push = function push(location) {
     return originalPush.call(this, location).catch(err => err);
 };
 Vue.use(VueRouter);
+import eventBus from '../eventBus';
 
 const routes = [
     {
@@ -69,7 +72,8 @@ const routes = [
                 name: 'my',
                 component: () => import('../views/My.vue'),
                 meta: {
-                    title: '我的NFT'
+                    title: '我的NFT',
+                    checkLogin: true
                 }
             }
         ]
@@ -95,4 +99,28 @@ const router = new VueRouter({
     }
 });
 
+router.beforeEach((to, from, next) => {
+    if (!store.state.userInfo) {
+        store
+            .dispatch('getUserInfo')
+            .then(() => {
+                next();
+            })
+            .catch(() => {
+                if (to.meta.checkLogin) {
+                    MessageBox('用户未登录,是否立即登录', '提示', {
+                        confirmButtonText: '立即登录'
+                    }).then(() => {
+                        eventBus.$emit('login');
+                    });
+                    next('/');
+                } else {
+                    next();
+                }
+            });
+    } else {
+        next();
+    }
+});
+
 export default router;

src/main/pc-space/src/views/Casting.vue

@@ -49,7 +49,9 @@
                         <div class="text3">{{ item.followers }}</div>
                         <div class="text4">粉丝</div>
                     </div>
-                    <div class="follow" @click.prevent="like(item)">{{ item.follow ? '已关注' : '关注' }}</div>
+                    <div class="follow" :class="{ followed: item.follow }" @click.prevent="like(item)">
+                        {{ item.follow ? '已关注' : '关注' }}
+                    </div>
                 </div>
             </router-link>
 
@@ -117,4 +119,8 @@ export default {
 </script>
 <style lang="less" scoped>
 @import url('../styles/list.less');
+.followed {
+    border-color: #939599;
+    color: #939599 !important;
+}
 </style>