From cc190593c10d51dd0153339dda30142dd59cd925 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Fri, 17 Sep 2021 00:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E4=BA=AB=E6=9C=8B?=
 =?UTF-8?q?=E5=8F=8B=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Test4.vue                         | 11 +++++-
 src/pages/home/components/ShareToFriend.vue | 44 ++++++++++++---------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/pages/Test4.vue b/src/pages/Test4.vue
index f80e0e5..cf909a1 100644
--- a/src/pages/Test4.vue
+++ b/src/pages/Test4.vue
@@ -1,18 +1,26 @@
 <template>
   <div class="Test">
     <base-button type="primary" @click="t = true">test</base-button>
+    <Search
+        class="ml2r mr2r"
+        placeholder="搜索"
+        v-model="createChatSearchKey"/>
     <ShareToFriend v-model="t"/>
+
+    {{createChatSearchKey}}
   </div>
 </template>
 <script>
 import ShareToFriend from "./home/components/ShareToFriend";
 import BaseButton from "../components/BaseButton";
+import Search from "../components/Search";
 
 export default {
   name: "Test4",
   components: {
     BaseButton,
-    ShareToFriend
+    ShareToFriend,
+    Search
   },
   props: {
     text: {
@@ -23,6 +31,7 @@ export default {
   data() {
     return {
       t: false,
+      createChatSearchKey: ''
     }
   },
   methods: {},
diff --git a/src/pages/home/components/ShareToFriend.vue b/src/pages/home/components/ShareToFriend.vue
index 6c5c15d..63a51f4 100644
--- a/src/pages/home/components/ShareToFriend.vue
+++ b/src/pages/home/components/ShareToFriend.vue
@@ -3,12 +3,15 @@
       v-model="modelValue"
       @cancel="cancel"
       height="70vh">
-    <div class="create-chat-wrapper" v-if="!showJoinedChat">
-      <Search :isShowText="isShowText"
-              @click="isShowText = true"
-              @notice="isShowText = false;"
-              @clear="isShowText = false"
-              class="ml2r mr2r" placeholder="搜索" v-model="createChatSearchKey"></Search>
+    <div class="create-chat-wrapper" v-show="!showJoinedChat">
+      <Search
+          :isShowText="isShowText"
+          @click="isShowText = true"
+          @notice="isShowText = false;"
+          @clear="isShowText = false"
+          class="ml2r mr2r"
+          placeholder="搜索"
+          v-model="createChatSearchKey"/>
       <template v-if="createChatSearchKey">
         <div class="search-result" v-if="searchFriends.length">
           <div class="search-result-item" v-for="item in searchFriends"
@@ -52,9 +55,9 @@
         </div>
       </template>
     </div>
-    <div class="joined-chat-wrapper" v-if="showJoinedChat">
+    <div class="joined-chat-wrapper" v-show="showJoinedChat">
       <div class="nav">
-        <back @click="showJoinedChat = false" mode="light" scale="1.2"></back>
+        <back @click="showJoinedChat = false" mode="light" scale="1"></back>
         <span>已加入的群聊</span>
         <span>&nbsp;</span>
       </div>
@@ -64,14 +67,13 @@
           <img class="left" src="../../../assets/img/icon/head-image.jpeg" alt="">
           <div class="right">
             <div class="title">
-              <div class="name">{{ text.length > 20 ? text.substr(0, 20) + '...' : text }}</div>
+              <div class="name">{{ text }}</div>
               <div class="num">(3)</div>
             </div>
-            <back direction="right" mode="light"></back>
+            <b-button type="primary">分享</b-button>
           </div>
         </div>
       </div>
-      <NoMore></NoMore>
     </div>
   </from-bottom-dialog>
 </template>
@@ -80,7 +82,9 @@ import FromBottomDialog from "../../../components/dialog/FromBottomDialog";
 import {mapState} from "vuex";
 import Search from "../../../components/Search";
 import Check from "../../../components/Check";
+/*
 
+* */
 export default {
   name: "ShareTo",
   components: {
@@ -97,6 +101,7 @@ export default {
       showJoinedChat: false,
       isShowText: false,
       createChatSearchKey: '',
+      text: 'AAAAAAAAA、BBBBBBBBBBBBB、CCCCCCCC',
       localFriends: [],
       searchFriends: []
     }
@@ -105,7 +110,7 @@ export default {
     createChatSearchKey(newVal) {
       if (newVal) {
         //TODO　搜索时仅仅判断是否包含了对应字符串，抖音做了拼音判断的
-        this.searchFriends = this.friends.filter(v => {
+        this.searchFriends = this.friends.all.filter(v => {
           if (v.name.includes(newVal)) return true
           return v.account.includes(newVal);
         })
@@ -305,14 +310,10 @@ export default {
   background: @main-bg;
 
   .nav {
-    font-size: 1.7rem;
+    font-size: 1.6rem;
     padding: 2rem;
     display: flex;
     justify-content: space-between;
-
-    img {
-      height: 2rem;
-    }
   }
 
   .chat-list {
@@ -334,8 +335,8 @@ export default {
       }
 
       .left {
-        width: 4.8rem;
-        height: 4.8rem;
+        width: 3.8rem;
+        height: 3.8rem;
         border-radius: 50%;
         margin-right: 1rem;
       }
@@ -348,11 +349,16 @@ export default {
         justify-content: space-between;
 
         .title {
+          width: 55vw;
+          overflow: hidden;
           box-sizing: border-box;
           display: flex;
           align-items: center;
 
           .name {
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
           }
 
           .num {