diff --git a/server/router/controller/follow.js b/server/router/controller/follow.js
index 1838122..eef9574 100644
--- a/server/router/controller/follow.js
+++ b/server/router/controller/follow.js
@@ -7,6 +7,7 @@ var Answer = mongoose.model('Answer')
 const checkUtil = require('../../common/checkUtil.js')
 const tokenUtil = require('../../common/token.js')
 
+const self = this
 
 exports.followTarget = function (req,res) {
 	// 检查登录
@@ -119,77 +120,99 @@ exports.getUserBind = function(target_id,me_id,callback) {
 }
 
 exports.userFans = function(req,res) {
-	let fields = req.body
-	User.findById(fields.detail_id)
-	.select('avatar username')
-	.populate('fans')
-	.exec((err,user)=> {
-		// 所有粉丝对象
-		let fans = user.fans
-		// 寻找每个粉丝的回答数和关注列表人数
-		getFansData(fans,(infos)=> {
-			return res.json(util.Result({users: fans,infos: infos}))
+	// 检查登录
+	var token = req.headers.token
+	tokenUtil.verifyToken(token)
+	.then((_id)=> {
+		let fields = req.body
+		User.findById(fields.detail_id)
+		.select('avatar username')
+		.populate('fans')
+		.exec((err,user)=> {
+			// 所有粉丝对象
+			let fans = user.fans
+			// 寻找每个粉丝的回答数和关注列表人数
+			getFansData(fans,_id,(infos)=> {
+				return res.json(util.Result({users: fans,infos: infos}))
+			})
 		})
+	}).catch((err)=> {
+		return res.json(util.Result(1))
 	})
 }
 
-function getFansData(fans,callback) {
+function getFansData(fans,_id,callback) {
 	var infos = [];
 	(function iterator(i){
 		if ( i == fans.length ) {
 			return callback(infos)
 		}
-		Question.count({user_id: fans[i]._id})
-		.exec((err,questionSum)=> {
-			infos.push(new FansInfo({
-				questionSum: questionSum,
-				followSum: fans[i].followers.length
-			}))
-			iterator( i+1 )
+		// 当前用户是否关注过该粉丝列表中的用户
+		self.getUserBind(fans[i]._id,_id,(flowerStatus)=> {
+			Answer.count({user_id: fans[i]._id})
+			.exec((err,answerSum)=> {
+				infos.push(new FansInfo({
+					answerSum: answerSum,
+					followSum: fans[i].followers.length,
+					flowerStatus
+				}))
+				iterator( i+1 )
+			})
 		})
 	})(0)
 }
 
-function FansInfo({questionSum,followSum}) {
-	this.questionSum = questionSum
+function FansInfo({answerSum,followSum,flowerStatus}) {
+	this.answerSum = answerSum
 	this.followSum  = followSum
+	this.flowerStatus = flowerStatus
 }
 
 exports.userFollow = function (req,res) {
-	let fields = req.body
-	User.findById(fields.detail_id)
-	.populate({
-		path: 'followers',
-		select: 'avatar username info'
-	})
-	.exec((err,user)=> {
-		// 获得用户关注列表信息
-		let followers = user.followers
-		getFollowsData(followers,(infos)=> {
-			return res.json(util.Result({users: followers,infos}))
+	var token = req.headers.token
+	tokenUtil.verifyToken(token)
+	.then((_id)=> {
+		let fields = req.body
+		User.findById(fields.detail_id)
+		.populate({
+			path: 'followers',
+			select: '_id avatar username info'
+		})
+		.exec((err,user)=> {
+			// 获得用户关注列表信息
+			let followers = user.followers
+			getFollowsData(followers,_id,(infos)=> {
+				return res.json(util.Result({users: followers,infos}))
+			})
 		})
+	}).catch((err)=> {
+		return res.json(util.Result(1))
 	})
 }
 
-function getFollowsData (followers,callback) {
+function getFollowsData (followers,_id,callback) {
 	let infos = [];
 	(function iterator(i){
 		if (i==followers.length) {
 			return callback(infos)
 		}
-		// 查询回答数，提问数，被回答数
-		Answer.count({user_id: followers[i]._id},(err,answerSum)=> {
-			Question.find({user_id: followers[i]._id})
-			.select('_id')
-			.exec((err,questions)=> {
-				// 遍历问题，寻找每个问题下有多少个回答
-				getAnsweredSum(questions,(answeredSum)=> {
-					infos.push(new FollowerInfo({
-						answerSum,
-						questionSum: questions.length,
-						answeredSum
-					}))
-					iterator( i+1 )
+		// 当前用户是否关注过该关注列表中的用户
+		self.getUserBind(followers[i]._id,_id,(flowerStatus)=> {
+			// 查询回答数，提问数，被回答数
+			Answer.count({user_id: followers[i]._id},(err,answerSum)=> {
+				Question.find({user_id: followers[i]._id})
+				.select('_id')
+				.exec((err,questions)=> {
+					// 遍历问题，寻找每个问题下有多少个回答
+					getAnsweredSum(questions,(answeredSum)=> {
+						infos.push(new FollowerInfo({
+							answerSum,
+							questionSum: questions.length,
+							answeredSum,
+							flowerStatus
+						}))
+						iterator( i+1 )
+					})
 				})
 			})
 		})
@@ -209,8 +232,9 @@ function getAnsweredSum(questions,callback) {
 	})(0)
 }
 
-function FollowerInfo({answerSum,questionSum,answeredSum}) {
+function FollowerInfo({answerSum,questionSum,answeredSum,flowerStatus}) {
 	this.answerSum = answerSum
 	this.questionSum = questionSum
 	this.answeredSum = answeredSum
+	this.flowerStatus = flowerStatus
 }
diff --git a/src/pages/Detail/components/attention.vue b/src/pages/Detail/components/attention.vue
index 586acaf..970ce1d 100644
--- a/src/pages/Detail/components/attention.vue
+++ b/src/pages/Detail/components/attention.vue
@@ -36,8 +36,9 @@
 											关注{{item.info.gender==0?'他':item.info.gender==1?'他':'她'}}
 										</button>
 										<button class="follwButton cancel" ref="cancel" v-show="item.followStatus==1"
-										@click.stop.prevent="followPeople(item._id,0,index)">
-											{{followText}}
+										@click.stop.prevent="followPeople(item._id,0,index)"
+										@mouseenter="enter($event)" @mouseleave="leave($event)">
+											已关注
 										</button>
 									</div>
 								</div>
@@ -68,11 +69,16 @@ import axios from 'axios'
 				base: '../../../../static/avatar/60/',
 				loading: true,
 				users: [],
-				sum: 0,
-				followText: '已关注'
+				sum: 0
 			}
 		},
 		methods: {
+			enter(e) {
+				e.target.innerText = '取消关注'
+			},
+			leave(e) {
+				e.target.innerText = '已关注'
+			},
 			clsModal() {
 				this.setAttentionQuestionModal(false)
 			},
@@ -113,15 +119,6 @@ import axios from 'axios'
 					this.sum = res.data.result.sum
 					this.users = this.mergeData(res.data.result.users,res.data.result.infos)	
 					this.loading = false
-					this.$nextTick(()=> {
-						$(this.$refs.cancel).each((index,item)=> {
-							$(item).hover(()=> {
-								$(item).text('取消关注')
-							},()=> {
-								$(item).text('已关注')
-							})
-						})
-					})
 				})
 			})
 		},
diff --git a/src/pages/Detail/components/scroll-header.vue b/src/pages/Detail/components/scroll-header.vue
index cd81e65..3cbbac1 100644
--- a/src/pages/Detail/components/scroll-header.vue
+++ b/src/pages/Detail/components/scroll-header.vue
@@ -10,7 +10,8 @@
  					@click.stop.prevent="attention(question._id,1)">关注问题</button>
 	 				<button class="attention cancel" v-show="attentionStatus==1" type="button" 
 	 				@click.stop.prevent="attention(question._id,0)" 
-	 						style="color: #fff;background-color: #8590a6;">{{attentionText}}</button>
+	 						style="color: #fff;background-color: #8590a6;"
+	 				@mouseenter="enter($event)" @mouseleave="leave($event)">已关注</button>
  					<button class="invite" type="button"><svg viewBox="0 0 12 12" width="14" height="16">
  						<title></title><g><path d="M.423 10.32L0 12l1.667-.474 1.55-.44-2.4-2.33-.394 1.564zM10.153.233c-.327-.318-.85-.31-1.17.018l-.793.817 2.49 2.414.792-.814c.318-.328.312-.852-.017-1.17l-1.3-1.263zM3.84 10.536L1.35 8.122l6.265-6.46 2.49 2.414-6.265 6.46z"></path></g>	
  					</svg>写回答</button>
@@ -30,11 +31,6 @@ import axios from 'axios'
 				default: 0
 			}
 		},
-		data() {
-			return {
-				attentionText: '已关注'
-			}
-		},
 		computed: {
 			...mapGetters([
 				'question',
@@ -42,6 +38,12 @@ import axios from 'axios'
 			])
 		},
 		methods: {
+			enter(e) {
+				e.target.innerText = '取消关注'
+			},
+			leave(e) {
+				e.target.innerText = '已关注'
+			},
 			attention(question_id,status) {
 				axios.post('/attention/question/add',{
 					user_id: this.user._id,
@@ -50,17 +52,7 @@ import axios from 'axios'
 				}).then((res)=> {
 					this.$emit('changeAttention',res.data.status==1?1:0)
 				})
-			},
-			initClick() {
-				$('.cancel').hover(() => {
-					this.attentionText = '取消关注'
-				},() => {
-					this.attentionText = '已关注'
-				})
 			}
-		},
-		mounted() {
-			this.initClick()
 		}
 	}
 </script>
diff --git a/src/pages/People/components/following-module.vue b/src/pages/People/components/following-module.vue
index d3b7a70..108b878 100644
--- a/src/pages/People/components/following-module.vue
+++ b/src/pages/People/components/following-module.vue
@@ -1,11 +1,22 @@
 <template>
  	<div id="following">
- 		<div class="list-header">
+ 		<div class="list-header" v-if="otherUser||user">
  			<h4 class="header-text">
- 				<div class="sub-tabs">
- 					<a class="sub-item is-active">他关注的人</a>
- 					<a class="sub-item">关注他的人</a>
- 					<a class="sub-item">他的专栏</a>
+ 				<div class="sub-tabs" v-if=" otherUser && detail_user_id!=user._id">
+ 					<a class="sub-item is-active" 
+ 					@click.stop.prevent="changeItem($event,0)"  
+ 					v-if="otherUser.info">{{otherUser.info.gender==0?'他':otherUser.info.gender==1?'他':'她'}}关注的人</a>
+ 					<a class="sub-item" 
+ 					@click.stop.prevent="changeItem($event,1)" 
+ 					v-if="otherUser.info">关注{{otherUser.info.gender==0?'他':otherUser.info.gender==1?'他':'她'}}的人</a>
+ 					<a class="sub-item" 
+ 					@click.stop.prevent="changeItem($event,2)" 
+ 					v-if="otherUser.info">{{otherUser.info.gender==0?'他':otherUser.info.gender==1?'他':'她'}}的专栏</a>
+ 				</div>
+ 				<div class="sub-tabs" v-if="detail_user_id==user._id">
+ 					<a class="sub-item is-active" @click.stop.prevent="changeItem($event,0)">我关注的人</a>
+ 					<a class="sub-item" @click.stop.prevent="changeItem($event,1)">关注我的人</a>
+ 					<a class="sub-item" @click.stop.prevent="changeItem($event,2)">我的专栏</a>
  				</div>
  			</h4>
  		</div>
@@ -25,13 +36,19 @@
  								</div>
  							</div>
  						</div>
- 						<div class="item-extra">
- 							<button class="followButton">
+ 						<div class="item-extra" v-show="user._id!=item._id">
+ 							<button class="followButton" v-show="item.flowerStatus==0" 
+ 							@click.stop.prevent="followPeople(item._id,1,index,0)">
  								<span style="display: inline-flex;align-item: center;">&#8203;<svg fill="currentColor" 
  									viewBox="0 0 24 24" width="1.2em" height="1.2em" style="margin-right: 8px; 
  									position: relative;top: 7px;">
  										<path d="M13.491 10.488s-.012-5.387 0-5.998c-.037-1.987-3.035-1.987-2.997 0-.038 1.912 0 5.998 0 5.998H4.499c-1.999.01-1.999 3.009 0 3.009s5.995-.01 5.995-.01v5.999c0 2.019 3.006 2.019 2.997 0-.01-2.019 0-5.998 0-5.998s3.996.009 6.004.009c2.008 0 2.008-3-.01-3.009h-5.994z"></path>
- 									</svg>关注他</span>
+ 									</svg>关注{{item.info.gender==0?'他':item.info.gender==1?'他':'她'}}</span>
+ 							</button>
+ 							<button class="followButton cancel" v-show="item.flowerStatus==1"
+ 							@click.stop.prevent="followPeople(item._id,0,index,0)"
+ 							@mouseenter="enter($event)" @mouseleave="leave($event)">
+ 								<span style="display: inline-flex;align-item: center;">已关注</span>
  							</button>
  						</div>
  					</div>
@@ -40,26 +57,32 @@
  		</div>
  		<div v-show="listIndex==1">
  			<div class="list-item">
- 				<div class="list-item" v-for="(fan,index) in fans" :key="fan._id">
+ 				<div class="list-item" v-for="(fan,fIndex) in fans" :key="fan._id">
  					<div class="item-main">
  						<div class="item-image"><a><img :src="base+fan.avatar" width="60" height="60"></a></div>
  						<div class="item-header">
  							<h2 class="item-title"><a href="">{{fan.username}}</a></h2>
  							<div class="item-meta">
  								<div class="status">
- 									<span class="status-item">{{fan.questionSum}} 回答</span>
+ 									<span class="status-item">{{fan.answerSum}} 回答</span>
  									<span class="status-item">{{fan.followSum}} 关注者</span>
  								</div>
  							</div>
  						</div>
- 						<div class="item-extra" v-if="fan.info">
- 							<button class="followButton">
+ 						<div class="item-extra" v-show="user._id!=fan._id">
+ 							<button class="followButton" v-show="fan.flowerStatus==0"
+ 							@click.stop.prevent="followPeople(fan._id,1,fIndex,1)">
  								<span style="display: inline-flex;align-item: center;">&#8203;<svg fill="currentColor" 
  									viewBox="0 0 24 24" width="1.2em" height="1.2em" style="margin-right: 8px; 
  									position: relative;top: 7px;">
  										<path d="M13.491 10.488s-.012-5.387 0-5.998c-.037-1.987-3.035-1.987-2.997 0-.038 1.912 0 5.998 0 5.998H4.499c-1.999.01-1.999 3.009 0 3.009s5.995-.01 5.995-.01v5.999c0 2.019 3.006 2.019 2.997 0-.01-2.019 0-5.998 0-5.998s3.996.009 6.004.009c2.008 0 2.008-3-.01-3.009h-5.994z"></path>
  									</svg>关注{{fan.info.gender==0?'他':fan.info.gender==1?'他':'她'}}</span>
  							</button>
+ 							<button class="followButton cancel" v-show="fan.flowerStatus==1"
+ 							@click.stop.prevent="followPeople(fan._id,0,fIndex,1)"
+ 							@mouseenter="enter($event)" @mouseleave="leave($event)">
+ 								<span style="display: inline-flex;align-item: center;">已关注</span>
+ 							</button>
  						</div>
  					</div>
  				</div>
@@ -75,22 +98,34 @@ import {mergeData} from 'common/js/common'
 import axios from 'axios'
 import {communicationMixin} from 'common/js/mixin.js'
 	export default {
+		props: {
+ 			otherUser: {
+ 				type: Object,
+ 				default() {
+ 					return {
+ 						info:{}
+ 					}
+ 				}
+ 			}
+ 		},
 		data() {
 			return {
 				listIndex: 0,
+				base: '../../../../static/avatar/60/',
 				fans: [],
-				follows: [],
-				base: '../../../../static/avatar/60/'
+				follows: []
 			}
 		},
 		methods: {
-			initLink() {
-				$('.sub-item').each((index,item)=> {
-					$(item).on('click',(e)=> {
-						$(item).addClass('is-active').siblings().removeClass('is-active')
-						this.listIndex = index
-					})
-				})
+			enter(e) {
+				e.target.innerText = '取消关注'
+			},
+			leave(e) {
+				e.target.innerText = '已关注'
+			},
+			changeItem(e,index) {
+				$(e.target).addClass('is-active').siblings().removeClass('is-active')
+				this.listIndex = index	
 			},
 			getFansList() {
 				axios.post('/follow/user/fans',{
@@ -107,9 +142,53 @@ import {communicationMixin} from 'common/js/mixin.js'
 				}).then((res)=> {
 					let users = res.data.result.users
 					let infos = res.data.result.infos
-					this.follows = mergeData(users,infos)	
+					this.follows = mergeData(users,infos)		
 				})
 			},
+			followPeople(target_id,action,index,from) {
+				axios.post('/follow/followTarget',{
+ 					target_id: target_id,
+ 					action: action
+ 				}).then((res)=> {
+ 					if (res.data.status) {
+ 						alert(res.data.result.msg)
+ 					}
+ 					
+ 					if (from==0) {
+ 						if (action==1) {
+ 							this.follows[index].flowerStatus = 1
+ 						}else {
+ 							this.follows[index].flowerStatus = 0
+ 							// 当在本人主页修改关注信息时
+ 							if (this.user._id == this.detail_user_id) {
+ 								// 当我取消关注了后我的关注列表要刷新，同时我的右侧关注数要减少 
+ 								this.getFollowList()
+ 								// 粉丝列表状态没有同步，也需要刷新
+ 								this.getFansList()
+ 								communicationMixin.$emit('changeCount',0,0)
+ 							}
+ 						}
+ 					}else{
+ 						if (action==1) {
+ 							if (this.user._id == this.detail_user_id) {
+ 								this.fans[index].flowerStatus = 1
+								// 当我在我的粉丝列表中关注我的粉丝时
+								// 我的关注列表要刷新，同时我的右侧关注数要增加
+								this.getFollowList()
+								communicationMixin.$emit('changeCount',0,1)
+ 							}
+ 							
+ 						}else {
+ 							this.fans[index].flowerStatus = 0
+ 							if (this.user._id == this.detail_user_id) {
+ 								// 当我取消关注我的粉丝时,我的关注列表要刷新，同时我的右侧关注数要减少
+	 							this.getFollowList()
+	 							communicationMixin.$emit('changeCount',0,0)
+ 							}
+ 						}	
+ 					}
+ 				})
+			},
 			openList() {
 				communicationMixin.$on('openFollw',()=> {
 					this.listIndex = 0
@@ -119,11 +198,16 @@ import {communicationMixin} from 'common/js/mixin.js'
 					this.listIndex = 1
 					$('.sub-item').eq(1).addClass('is-active').siblings().removeClass('is-active')
 				})
+				communicationMixin.$on('reloadFollwer',()=> {
+					this.getFansList()
+				})
+				// 当改变用户时，因为缓存，也要刷新一次
+				communicationMixin.$emit('changeUser',()=> {
+					this.getFollowList()
+					this.getFansList()
+				})
 			}
 		},
-		mounted() {
-			this.initLink()
-		},
 		created() {
 			this.openList()
 			this.getFollowList()
@@ -131,7 +215,8 @@ import {communicationMixin} from 'common/js/mixin.js'
 		},
 		computed: {
 			...mapGetters([
-				'detail_user_id'
+				'detail_user_id',
+				'user'
 			])
 		},
 		watch: {
diff --git a/src/pages/People/components/main-column.vue b/src/pages/People/components/main-column.vue
index f8c025b..b7db16d 100644
--- a/src/pages/People/components/main-column.vue
+++ b/src/pages/People/components/main-column.vue
@@ -4,21 +4,21 @@
 			<div class="Card main-box">
 				<div class="main-header">
 					<ul class="tabs">
-						<li class="tab-item is-active"><a href="javascript:void(0)" class="tab-link">动态</a></li>
-						<li class="tab-item"><a href="javascript:void(0)" class="tab-link">回答 <span>0</span></a></li>
-						<li class="tab-item"><a href="javascript:void(0)" class="tab-link">提问 <span>0</span></a></li>
-						<li class="tab-item"><a href="javascript:void(0)" class="tab-link">文章 <span>0</span></a></li>
-						<li class="tab-item"><a href="javascript:void(0)" class="tab-link">专栏 <span>0</span></a></li>
-						<li class="tab-item"><a href="javascript:void(0)" class="tab-link">想法 <span>0</span></a></li>
+						<li class="tab-item is-active" @click.stop.prevent="changeItem($event,0)"><a href="javascript:void(0)" class="tab-link">动态</a></li>
+						<li class="tab-item" @click.stop.prevent="changeItem($event,1)"><a href="javascript:void(0)" class="tab-link">回答 <span>0</span></a></li>
+						<li class="tab-item" @click.stop.prevent="changeItem($event,2)"><a href="javascript:void(0)" class="tab-link">提问 <span>0</span></a></li>
+						<li class="tab-item" @click.stop.prevent="changeItem($event,3)"><a href="javascript:void(0)" class="tab-link">文章 <span>0</span></a></li>
+						<li class="tab-item" @click.stop.prevent="changeItem($event,4)"><a href="javascript:void(0)" class="tab-link">专栏 <span>0</span></a></li>
+						<li class="tab-item" @click.stop.prevent="changeItem($event,5)"><a href="javascript:void(0)" class="tab-link">想法 <span>0</span></a></li>
 						<li class="tab-item" ref="more" @click.stop.prevent="getMore"><a href="javascript:void(0)" class="tab-link"><button class="more">更多<svg viewBox="0 0 10 6" width="10" height="16"><title></title><g><path d="M8.716.217L5.002 4 1.285.218C.99-.072.514-.072.22.218c-.294.29-.294.76 0 1.052l4.25 4.512c.292.29.77.29 1.063 0L9.78 1.27c.293-.29.293-.76 0-1.052-.295-.29-.77-.29-1.063 0z"></path></g></svg></button></a></li>
 					</ul>
 				</div>
 				<content-list v-show="showModule==0"></content-list>
 				<answer-module v-show="showModule==1"></answer-module>
-				<following-module v-show="showModule==7"></following-module>
+				<following-module v-show="showModule==7" :otherUser="otherUser"></following-module>
 			</div>
 		</div>
-		<div class="content-arrow" v-show="people_dropup" id="content-arrow"> 
+		<div class="content-arrow" v-show="people_dropup" id="content-arrow" ref="content_arrow"> 
 			<span class="arrow-top"></span>
 			<div class="menu">
 				<a href="javascript:void(0)" class="menu-item">收藏 <span>5</span></a>
@@ -35,6 +35,16 @@ import followingModule from 'p_components/following-module.vue'
 import {mapGetters,mapMutations} from 'vuex'
 import {communicationMixin} from 'common/js/mixin.js'
  	export default {
+ 		props: {
+ 			otherUser: {
+ 				type: Object,
+ 				default() {
+ 					return {
+ 						info:{}
+ 					}
+ 				}
+ 			}
+ 		},
  		data() {
  			return {
  				showModule: 0,
@@ -42,19 +52,10 @@ import {communicationMixin} from 'common/js/mixin.js'
  			}
  		},
  		methods: {
- 			initLink() {
- 				$('.tab-item').each( (index,el)=> {
- 					var me = $(el);
- 					if(index==$('.tab-item').length-1) {
- 						return;
- 					}else{
- 						me.on('click',(e)=> {
-	 						me.addClass('is-active').siblings('.tab-item').removeClass('is-active')
-		 					this.showModule = index;
-		 					communicationMixin.$emit('changeScrollIndex',index)
-	 					});
- 					}
- 				});
+ 			changeItem(e,index) {
+ 				$(e.target).parent().addClass('is-active').siblings().removeClass('is-active')
+ 				this.showModule = index;
+ 				communicationMixin.$emit('changeScrollIndex',index)
  			},
  			listenHeaderModule() {
  				communicationMixin.$on('changeMainIndex',(index) => {
@@ -66,8 +67,8 @@ import {communicationMixin} from 'common/js/mixin.js'
  				})
  			},
  			getMore() {
- 				$('#content-arrow').css('top',258)
- 				$('#content-arrow').addClass('content-arrow').removeClass('content-arrow-top');
+ 				$(this.$refs.content_arrow).css('top',258)
+ 				$(this.$refs.content_arrow).addClass('content-arrow').removeClass('content-arrow-top');
  				this.setPeopleDropUp(true);
  			},
  			openFollowingModule() {
@@ -79,6 +80,8 @@ import {communicationMixin} from 'common/js/mixin.js'
  			ListenterFollwer() {
  				communicationMixin.$on('showFollwer',()=> {
  					this.showModule = 7
+ 					$(this.$refs.more).addClass('is-active').siblings('.tab-item').removeClass('is-active')
+ 					communicationMixin.$emit('openFollow')
  				})
  			},
  			...mapMutations({
@@ -86,7 +89,6 @@ import {communicationMixin} from 'common/js/mixin.js'
 			})
  		},
 		mounted() {
-			this.initLink();
 			this.listenHeaderModule();
 		},
 		created() {
diff --git a/src/pages/People/components/otherProfile.vue b/src/pages/People/components/otherProfile.vue
index b82b8e8..061e695 100644
--- a/src/pages/People/components/otherProfile.vue
+++ b/src/pages/People/components/otherProfile.vue
@@ -24,7 +24,7 @@
 						<div class="buttons">
 							<button class="attention" v-show="fllowerStatus==0" @click.stop.prevent="followPeople(otherUser._id,1)"><span>&#8203;<svg fill="currentColor" viewBox="0 0 24 24" width="1.2em" height="1.2em" style="margin-right: 8px;position: relative;top: 3px;"><path d="M13.491 10.488s-.012-5.387 0-5.998c-.037-1.987-3.035-1.987-2.997 0-.038 1.912 0 5.998 0 5.998H4.499c-1.999.01-1.999 3.009 0 3.009s5.995-.01 5.995-.01v5.999c0 2.019 3.006 2.019 2.997 0-.01-2.019 0-5.998 0-5.998s3.996.009 6.004.009c2.008 0 2.008-3-.01-3.009h-5.994z"></path></svg></span>关注{{otherUser.info.gender==0?'他':otherUser.info.gender==1?'他':'她'}}</button>
 							<button class="attention cancel" v-show="fllowerStatus==1" type="button" @click.stop.prevent="followPeople(otherUser._id,0)" 
-	 						style="color: #fff;background-color: #8590a6;">{{followText}}</button>
+	 						@mouseenter="enter($event)" @mouseleave="leave($event)" style="color: #fff;background-color: #8590a6;">已关注</button>
 							<button class="private"><span>&#8203;<svg fill="currentColor" viewBox="0 0 24 24" width="1.2em" height="1.2em" style="margin-right: 8px;"><path d="M11 2c5.571 0 9 4.335 9 8 0 6-6.475 9.764-11.481 8.022-.315-.07-.379-.124-.78.078-1.455.54-2.413.921-3.525 1.122-.483.087-.916-.25-.588-.581 0 0 .677-.417.842-1.904.064-.351-.14-.879-.454-1.171A8.833 8.833 0 0 1 2 10c0-3.87 3.394-8 9-8zm10.14 9.628c.758.988.86 2.009.86 3.15 0 1.195-.619 3.11-1.368 3.938-.209.23-.354.467-.308.722.12 1.073.614 1.501.614 1.501.237.239-.188.562-.537.5-.803-.146-1.495-.42-2.546-.811-.29-.146-.336-.106-.563-.057-2.043.711-4.398.475-6.083-.927 5.965-.524 8.727-3.03 9.93-8.016z"></path></svg></span>发私信</button>
 						</div>
 					</div>
@@ -36,6 +36,7 @@
 
 <script type="text/ecmascript-6">
 import axios from 'axios'
+import {communicationMixin} from 'common/js/mixin.js'
  	export default {
  		props: {
  			otherUser: {
@@ -53,11 +54,16 @@ import axios from 'axios'
  		},
  		data() {
  			return {
- 				base: '../../../../static/avatar/160/',
- 				followText: '已关注'
+ 				base: '../../../../static/avatar/160/'
  			}
  		},
  		methods: {
+ 			enter(e) {
+ 				e.target.innerText = '取消关注'
+ 			},
+ 			leave(e) {
+ 				e.target.innerText = '已关注'
+ 			},
  			followPeople(target_id,action) {
  				axios.post('/follow/followTarget',{
  					target_id: target_id,
@@ -67,15 +73,10 @@ import axios from 'axios'
  						alert(res.data.result.msg)
  					}
  					this.$emit('changeFllowerStatus',action==1?1:0)
+ 					communicationMixin.$emit('reloadFollwer')
+ 					communicationMixin.$emit('changeCount',1,action==1?1:0)
  				})
  			}
- 		},
- 		mounted() {
- 			$('.cancel').hover(()=> {
- 				this.followText = '取消关注'
- 			},()=> {
- 				this.followText = '已关注'
- 			})
  		}
 	}
 </script>
diff --git a/src/pages/People/components/p-index.vue b/src/pages/People/components/p-index.vue
index 64c68a7..911021d 100644
--- a/src/pages/People/components/p-index.vue
+++ b/src/pages/People/components/p-index.vue
@@ -8,7 +8,7 @@
 				@changeFllowerStatus="changeFllowerStatus"></other-profile>
 			</div>
 			<div class="main-content">
-				<main-column></main-column>
+				<main-column :otherUser="otherUser"></main-column>
 				<side-column :detail_user_id="detail_user_id"></side-column>
 			</div>
 		</div>
diff --git a/src/pages/People/components/scroll-header.vue b/src/pages/People/components/scroll-header.vue
index 5e62aad..96cbe3a 100644
--- a/src/pages/People/components/scroll-header.vue
+++ b/src/pages/People/components/scroll-header.vue
@@ -4,12 +4,12 @@
 			<div class="scroll-header-inner">
 				<div class="user-avatar"><img src="../../../common/image/index/user_avatar_38_38.jpg" width="38" height="38" class="Avatar"></div>
 				<ul class="tabList">
-					<li class="top-tab-item is-active"><a href="javascript:void(0)" class="tab-link is-active">动态</a></li>
-					<li class="top-tab-item"><a href="javascript:void(0)" class="tab-link">回答<span class="tab-meta">0</span></a></li>
-					<li class="top-tab-item"><a href="javascript:void(0)" class="tab-link">提问<span class="tab-meta">0</span></a></li>
-					<li class="top-tab-item"><a href="javascript:void(0)" class="tab-link">文章<span class="tab-meta">0</span></a></li>
-					<li class="top-tab-item"><a href="javascript:void(0)" class="tab-link">专栏<span class="tab-meta">0</span></a></li>
-					<li class="top-tab-item"><a href="javascript:void(0)" class="tab-link">想法<span class="tab-meta">0</span></a></li>
+					<li class="top-tab-item is-active" @click.stop.prevent="changeItem($event,0)"><a href="javascript:void(0)" class="tab-link is-active">动态</a></li>
+					<li class="top-tab-item" @click.stop.prevent="changeItem($event,1)"><a href="javascript:void(0)" class="tab-link">回答<span class="tab-meta">0</span></a></li>
+					<li class="top-tab-item" @click.stop.prevent="changeItem($event,2)"><a href="javascript:void(0)" class="tab-link">提问<span class="tab-meta">0</span></a></li>
+					<li class="top-tab-item" @click.stop.prevent="changeItem($event,3)"><a href="javascript:void(0)" class="tab-link">文章<span class="tab-meta">0</span></a></li>
+					<li class="top-tab-item" @click.stop.prevent="changeItem($event,4)"><a href="javascript:void(0)" class="tab-link">专栏<span class="tab-meta">0</span></a></li>
+					<li class="top-tab-item" @click.stop.prevent="changeItem($event,5)"><a href="javascript:void(0)" class="tab-link">想法<span class="tab-meta">0</span></a></li>
 					<li class="top-tab-item" ref="more"  @click.stop.prevent="getMore"><a href="javascript:void(0)" class="tab-link">更多<svg fill="currentColor" viewBox="0 0 10 6" width="10" height="16" style="margin-left: 4px;"><title></title><g><path d="M8.716.217L5.002 4 1.285.218C.99-.072.514-.072.22.218c-.294.29-.294.76 0 1.052l4.25 4.512c.292.29.77.29 1.063 0L9.78 1.27c.293-.29.293-.76 0-1.052-.295-.29-.77-.29-1.063 0z"></path></g></svg></a></li>
 				</ul>
 				<div class="buttonGroup">
@@ -34,18 +34,9 @@ import {communicationMixin} from 'common/js/mixin.js';
  			...mapMutations({
 				setPeopleDropUp: 'SET_PEOPLE_DROPUP'
 			}),
-			initLink() {
-				$('.top-tab-item').each((index,el) => {
-					var me = $(el)
-					if(index==$('.top-tab-item').length-1) {
- 						return;
- 					}else{
- 						me.on('click',(e)=> {
-	 						me.addClass('is-active').siblings('.top-tab-item').removeClass('is-active')
-	 						communicationMixin.$emit('changeMainIndex',index)
-	 					});
- 					}
-				})
+			changeItem(e,index) {
+				$(e.target).parent().addClass('is-active').siblings().removeClass('is-active')
+				communicationMixin.$emit('changeMainIndex',index)
 			}
  		},	
  		computed: {
@@ -60,9 +51,6 @@ import {communicationMixin} from 'common/js/mixin.js';
 			communicationMixin.$on('openFollow',()=> {
 				$(this.$refs.more).addClass('is-active').siblings().removeClass('is-active')
 			})
-		},
-		mounted() {
-			this.initLink();
 		}
 	}
 </script>
diff --git a/src/pages/People/components/side-column.vue b/src/pages/People/components/side-column.vue
index 2cb79b5..f172a59 100644
--- a/src/pages/People/components/side-column.vue
+++ b/src/pages/People/components/side-column.vue
@@ -116,10 +116,31 @@ import {communicationMixin} from 'common/js/mixin.js'
  			openFans() {
  				communicationMixin.$emit('showFollwer')
  				communicationMixin.$emit('openFans')
+ 			},
+ 			listenerFollowChange() {
+ 				// 改变关注列表数量和粉丝列表数量
+ 				// from， 	0:关注列表  1:粉丝列表
+ 				// action, 	0:关注增加  1；关注减少
+ 				communicationMixin.$on('changeCount',(from,action)=> {
+ 					if (from==0) {
+ 						if (action==1) {
+ 							this.followerCount++
+ 						}else {
+ 							this.followerCount--
+ 						}
+ 					}else {
+ 						if (action==1) {
+ 							this.fansCount++
+ 						}else {
+ 							this.fansCount--
+ 						}
+ 					}
+ 				})
  			}
  		},
 		created() {
 			this.initData()
+			this.listenerFollowChange()
 		},
 		watch: {
 			detail_user_id(newval,oldval) {
diff --git a/src/pages/People/cpLess/following-module.css b/src/pages/People/cpLess/following-module.css
index d156a2c..96cc43c 100644
--- a/src/pages/People/cpLess/following-module.css
+++ b/src/pages/People/cpLess/following-module.css
@@ -1 +1 @@
-.list-header{display:flex;-webkit-box-pack:justify;justify-content:space-between;-webkit-box-align:center;align-items:center;height:50px;margin:0 20px;border-bottom:1px solid #f6f6f6;box-sizing:border-box}.list-header .header-text{font-weight:600}.list-header .header-text .sub-tabs{display:inline-block}.list-header .header-text .sub-tabs .sub-item{height:21px;padding:6px 0 7px;margin-right:36px;color:inherit}.list-header .header-text .sub-tabs .sub-item:not(.is-active){font-weight:400}.list-item{position:relative;padding:16px 20px}.list-item .item-main{display:flex}.list-item .item-main .item-image{float:left;margin-right:16px}.list-item .item-main .item-image img{border-radius:4px;background:#fff}.list-item .item-main .item-header{flex:1;-webkit-box-flex:1;overflow:hidden;margin-right:6px}.list-item .item-main .item-header .item-title{font-size:18px;font-weight:600;line-height:1.6;color:#1a1a1a;margin-top:-4px;margin-bottom:-4px}.list-item .item-main .item-header .item-meta{margin-top:6px;font-size:15px;color:#646464}.list-item .item-main .item-header .item-meta .ztext{word-break:break-word;line-height:1.6}.list-item .item-main .item-header .item-meta .status{margin-top:5px;color:#8590a6;font-size:14px}.list-item .item-main .item-header .item-meta .status .status-item:not(:first-child):before{margin:0 5px;content:"\B7"}.list-item .item-main .item-extra{align-self:center}.list-item .item-main .item-extra .followButton{background:#0084ff!important;color:#fff;min-width:96px;border-color:#0084ff;display:inline-block;padding:0 16px;font-size:14px;line-height:32px;text-align:center;cursor:pointer;background:0 0;border:1px solid;border-radius:3px;align-items:flex-start;box-sizing:border-box}
\ No newline at end of file
+.list-header{display:flex;-webkit-box-pack:justify;justify-content:space-between;-webkit-box-align:center;align-items:center;height:50px;margin:0 20px;border-bottom:1px solid #f6f6f6;box-sizing:border-box}.list-header .header-text{font-weight:600}.list-header .header-text .sub-tabs{display:inline-block}.list-header .header-text .sub-tabs .sub-item{height:21px;padding:6px 0 7px;margin-right:36px;color:inherit}.list-header .header-text .sub-tabs .sub-item:not(.is-active){font-weight:400}.list-item{position:relative;padding:16px 20px}.list-item .item-main{display:flex}.list-item .item-main .item-image{float:left;margin-right:16px}.list-item .item-main .item-image img{border-radius:4px;background:#fff}.list-item .item-main .item-header{flex:1;-webkit-box-flex:1;overflow:hidden;margin-right:6px}.list-item .item-main .item-header .item-title{font-size:18px;font-weight:600;line-height:1.6;color:#1a1a1a;margin-top:-4px;margin-bottom:-4px}.list-item .item-main .item-header .item-meta{margin-top:6px;font-size:15px;color:#646464}.list-item .item-main .item-header .item-meta .ztext{word-break:break-word;line-height:1.6}.list-item .item-main .item-header .item-meta .status{margin-top:5px;color:#8590a6;font-size:14px}.list-item .item-main .item-header .item-meta .status .status-item:not(:first-child):before{margin:0 5px;content:"\B7"}.list-item .item-main .item-extra{align-self:center}.list-item .item-main .item-extra .followButton{background:#0084ff!important;color:#fff;min-width:96px;border-color:#0084ff;display:inline-block;padding:0 16px;font-size:14px;line-height:32px;text-align:center;cursor:pointer;background:0 0;border:1px solid;border-radius:3px;align-items:flex-start;box-sizing:border-box}.list-item .item-main .item-extra .cancel{background:#8590a6!important}
\ No newline at end of file
diff --git a/src/pages/People/cpLess/following-module.less b/src/pages/People/cpLess/following-module.less
index 7229ba2..5b7446f 100644
--- a/src/pages/People/cpLess/following-module.less
+++ b/src/pages/People/cpLess/following-module.less
@@ -85,6 +85,9 @@
 				align-items: flex-start;
 				box-sizing: border-box;
 			}
+			.cancel {
+				background: #8590a6 !important;
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/pages/Question/components/selection-bar.vue b/src/pages/Question/components/selection-bar.vue
index 7b8036a..b8e0dd1 100644
--- a/src/pages/Question/components/selection-bar.vue
+++ b/src/pages/Question/components/selection-bar.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="selection-wrapper">
 		<div class="selection-bar">
-	 		<button class="bar-item is-active" @click.stop.prevent;>为你推荐</button>
-	 		<button class="bar-item" @click.stop.prevent;>全站热门</button>
-	 		<button class="bar-item" @click.stop.prevent;>邀请回答</button>
+	 		<button class="bar-item is-active" @click.stop.prevent="changeItem($event,0)">为你推荐</button>
+	 		<button class="bar-item" @click.stop.prevent="changeItem($event,1)">全站热门</button>
+	 		<button class="bar-item" @click.stop.prevent="changeItem($event,2)">邀请回答</button>
 	 	</div>
 	 	<div class="main-content">
 	 		<recommend v-show="content_type==0"></recommend>
@@ -28,18 +28,10 @@ import invite from 'question_components/invite.vue';
 			hot,
 			invite
 		},
-		mounted() {
-			this.initLink();
-		},
 		methods: {
-			initLink() {
-				$('.bar-item').each((index,el) => {
-					var me = $(el)
-					me.on('click',(e) => {
-						me.addClass('is-active').siblings('.bar-item').removeClass('is-active')
-						this.content_type = index;
-					})
-				});	
+			changeItem(e,index) {
+				$(e.target).addClass('is-active').siblings().removeClass('is-active')
+				this.content_type = index;
 			}
 		}
 	}
diff --git a/static/avatar/160/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/160/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..10fdcc1
Binary files /dev/null and b/static/avatar/160/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/24/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/24/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..e0f2170
Binary files /dev/null and b/static/avatar/24/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/25/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/25/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..68458f5
Binary files /dev/null and b/static/avatar/25/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/30/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/30/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..b8ecfd1
Binary files /dev/null and b/static/avatar/30/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/34/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/34/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..26c434c
Binary files /dev/null and b/static/avatar/34/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/38/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/38/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..ecaed34
Binary files /dev/null and b/static/avatar/38/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/60/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/60/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..1fa43b9
Binary files /dev/null and b/static/avatar/60/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ
diff --git a/static/avatar/arbitrary/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg b/static/avatar/arbitrary/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg
new file mode 100644
index 0000000..25de0ba
Binary files /dev/null and b/static/avatar/arbitrary/5affdcb084dcaa00fca5a316_227_51292216_p0.jpg differ