Merge remote-tracking branch 'origin/master'

src/components/index/PageTopindex.vue

@@ -167,7 +167,7 @@
                     {id:3,name:this.$t("topNav.activity"),path:'/activitylist',pathchild:'/eventdetail'},
                     {id:4,name:this.$t("topNav.topic"),path:'/topicList',pathchild:'/topicDetails'},
                     {id:5,name:this.$t("topNav.match"),path:'/seeprojectlist',pathchild:'/seeprojectlist'},
-                    {id:6,name:'人脉',path:'/networking',pathchild:'/networkSearch'},
+                    {id:6,name:'人脉',path:'/circleList',pathchild:'/networkSearch'},
                     {id:7,name:this.$t("topNav.article"),path:'/articleList',pathchild:'/articleDetail'},
                     {id:8,name:this.$t("topNav.industry"),path:'/industryReport',pathchild:'/industryReport'},
                 ],

src/router.js

@@ -343,11 +343,11 @@ const router = new Router({
                     component: resolve => require(['views/peoplehomepage/peoplefinfo.vue'], resolve).catch(routerUtils.catchImport),
                     meta: {title: '个人资料'}
                 },
-                {
-                    path: '/networking',
-                    component: resolve => require(['views/netWorkpage/networkring.vue'], resolve).catch(routerUtils.catchImport),
-                    meta: {title: '人脉圈'}
-                },
+                // {
+                //     path: '/networking',
+                //     component: resolve => require(['views/netWorkpage/networkring.vue'], resolve).catch(routerUtils.catchImport),
+                //     meta: {title: '人脉圈'}
+                // },
                 {
                     path: '/networkSearch',
                     component: resolve => require(['views/netWorkpage/networkSearch.vue'], resolve).catch(routerUtils.catchImport),

src/views/peoplehomepage/btnbar.vue

 <template>
     <div>
-        <p v-if="type"
+        <p  v-if="row.relationType == 1 || row.relationType== 2 || row.relationType == 3"
            class="btn btnFriend"
            @click="addEmpContact(row)">
             <i v-if="row.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>

src/views/peoplehomepage/peoplehome.vue

@@ -538,7 +538,7 @@
         },
         mounted() {
             if(!this.userInfo){
-                this.$router.push({path:"/networking"});
+                this.$router.push({path:"/circleList"});
             }
             if(this.isTrans){
                 this.isrouterType(this.$route.path);
@@ -557,7 +557,7 @@
             $route(to, from) {
                 //将mounted中的数据在这里重新加载一下即可
                 if(!this.userInfo){
-                    this.$router.push({path:"/networking"});
+                    this.$router.push({path:"/circleList"});
                 }
                 this.activeName = 'comment';
                 this.empContactData = {