Merge remote-tracking branch 'origin/master'

src/views/keySearchpage/keySearchs.vue

@@ -91,7 +91,7 @@
             next(vm=>{          //  这里的vm指的就是vue实例，可以用来当做this使用
                 if(from.path == '/tabconnect'||from.path == '/viewproject')vm.keychecked = 1
                 else if(from.path == '/bigBusiness/detail')vm.keychecked = 2
-                else if(from.path == '/activitylist'||from.path == '/eventdetail'||from.path == '/eventlive')vm.keychecked = 3
+                else if(from.path == '/activitylist'||from.path == '/activitydetail'||from.path == '/eventlive')vm.keychecked = 3
                 else if(from.path == '/topicList'||from.path == '/topicDetails'||from.path == '/discussdetail')vm.keychecked = 4
                 else if(from.path == '/circleList'||from.path == '/networkSearch')vm.keychecked = 5
                 else if(from.path == '/guesslist'||from.path == '/guessDetail')vm.keychecked = 6