Merge branch 'dev/v1.0.5_zsy' of jianyu/page_pc_stationSocial into feature/v1.0.5

src/components/communicateBook/CompanyList.vue

@@ -9,7 +9,7 @@
         :props="defaultProps"
         icon-class="el-icon-arrow-down">
          <div class="custom-tree-node" :class="{'person-row': node.isLeaf && !data.persons, 'first-level-person': data.level}" slot-scope="{ node, data }">
-           <div class="con-row">
+           <div class="con-row" :class="{'con-row-disabled': data.logonUser}">
              <span>
               <span v-if="node.isLeaf && !data.persons" class="person-name">{{data.personName}}</span>
               <span class="department-name" v-else>{{data.departmentName}}</span>
@@ -21,6 +21,7 @@
                <el-button
                  type="primary"
                  size="mini"
+                 :disabled="Boolean(data.logonUser)"
                  @click="() => sendMessage(data, node)">发消息</el-button>
              </div>
            </div>
@@ -144,6 +145,9 @@ export default {
           height: 100%;
           left:32px;
           border-bottom: 1px solid #DADADA;
+          &-disabled {
+            color: #999999;
+          }
         }
         &.person-row {
           .con-row{
@@ -186,6 +190,12 @@ export default {
       .expanded.el-tree-node__expand-icon{
         transform: rotate(180deg) translateX(20px);
       }
+      .el-button {
+        &.is-disabled{
+          background: #E0E0E0;
+          border: #E0E0E0;
+        }
+      }
     }
 
   }

src/components/communicateBook/LefTabs.vue

@@ -15,7 +15,7 @@
         </div>
         <el-divider></el-divider>
         <div class="self-tab-row" :class="{'active': activeItem === 2}" @click="itemChangeHandle(2)">
-          <span class="title">剑鱼标某某公司</span>
+          <span class="title">{{ userIdentity ? userIdentity.name : '' }}</span>
         </div>
       </div>
       <inviteDialog :show.sync="inviteShow" ref="inviteDialog"></inviteDialog>
@@ -26,6 +26,7 @@
 import enterpriseSearch from '@/components/enterpriseSearch'
 import inviteDialog from '@/components/inviteDialog/inviteDialog.vue'
 import { Container, Divider } from 'element-ui'
+import { mapState } from 'vuex'
 
 export default {
   components: {
@@ -40,6 +41,9 @@ export default {
       inviteShow: false
     }
   },
+  computed: {
+    ...mapState('user', ['userIdentity'])
+  },
   methods: {
     // tab切换的时候
     itemChangeHandle (val) {