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

src/components/enterpriseSearch/index.vue

@@ -8,27 +8,29 @@
       </template>
     </el-input>
     <div class="listBox" v-show="hintShow && (groupList.length !== 0 || personList.length !== 0)">
-      <div class="groupList" v-if="groupList.length !== 0">
-        <p class="title">我的群组</p>
-        <cardItem type="group" v-for="item in groupList" :groupName="item.groupName" :id="item.chatGroupId"
-          :key="item.chatGroupId" :text="item.text" :title="item.groupName" :serchValue="searchContent"
-          @sendMessage="sendMessage"></cardItem>
-        <div class="btn" v-if="allgroupList.length > 10">
-          <span v-if="!groupLoading" @click="getall('gro')">查看全部</span>
-          <i v-else class="el-icon-loading"></i>
+      <div class="scrollList">
+        <div class="groupList" v-if="groupList.length !== 0">
+          <p class="title">我的群组</p>
+          <cardItem type="group" v-for="item in groupList" :groupName="item.groupName" :id="item.chatGroupId"
+            :key="item.chatGroupId" :text="item.text" :title="item.groupName" :serchValue="searchContent"
+            @sendMessage="sendMessage"></cardItem>
+          <div class="btn" v-if="allgroupList.length > 5 && groupList < allgroupList">
+            <span v-if="!groupLoading" @click="getall('gro')">查看全部</span>
+            <i v-else class="el-icon-loading"></i>
+          </div>
         </div>
-      </div>
-      <div class="personList" v-if="personList.length !== 0">
-        <div>
-          <p class="title mt-10">{{ entName }}</p>
-          <cardItem type="person" v-for="item in personList" :id="item.id" :key="item.id" :text="item.deptName"
-            :title="item.personName" :serchValue="searchContent" @sendMessage="sendMessage" :phone="item.phone"
-            :mail="item.email">
-          </cardItem>
-        </div>
-        <div class="btn" v-if="allpersonList.length > 10">
-          <span v-if="!personLoading" @click="getall('per')">查看全部</span>
-          <i v-else class="el-icon-loading"></i>
+        <div class="personList" v-if="personList.length !== 0">
+          <div>
+            <p class="title mt-10">{{ entName }}</p>
+            <cardItem type="person" v-for="item in personList" :id="item.positionId" :key="item.id" :text="item.deptName"
+              :title="item.personName" :serchValue="searchContent" @sendMessage="sendMessage" :phone="item.phone"
+              :mail="item.email">
+            </cardItem>
+          </div>
+          <div class="btn" v-if="allpersonList.length > 5 && personList < allpersonList">
+            <span v-if="!personLoading" @click="getall('per')">查看全部</span>
+            <i v-else class="el-icon-loading"></i>
+          </div>
         </div>
       </div>
     </div>
@@ -100,7 +102,7 @@ export default {
           }
         })
         this.allgroupList = allgroupList
-        this.groupList = this.allgroupList.slice(0, 10)
+        this.groupList = this.allgroupList.slice(0, 5)
         this.hintShow = true
       })
       entAddressBook({ name: name }).then(res => {
@@ -116,7 +118,7 @@ export default {
             ele.email = ''
           }
         })
-        this.personList = this.allpersonList.slice(0, 10)
+        this.personList = this.allpersonList.slice(0, 5)
         this.hintShow = true
       })
     },
@@ -143,7 +145,6 @@ export default {
 .listBox {
   position: absolute;
   width: 366px;
-  max-height: 797px;
   left: 0px;
   top: 48px;
   background: #FFFFFF;
@@ -151,9 +152,14 @@ export default {
   border-radius: 8px;
   box-sizing: border-box;
   padding: 16px 0;
-  overflow-y: auto;
   z-index: 99;
 
+  .scrollList {
+    max-height: 708px;
+    overflow-y: auto;
+
+  }
+
   .title {
     font-size: 14px;
     line-height: 22px;

src/views/shareBox/index.vue

@@ -103,7 +103,7 @@ export default {
         console.warn(e)
       }
     },
-    slowclick (payload) {
+    slowclick (payload) { // 分享成功跳转对应对话界面
       try {
         // 关闭父级窗口
         window.parent.$shareBox.close()