From 1be73f5bbbe703766d124a3e2373f2c29c35b948 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Mon, 21 Feb 2022 14:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E5=A5=BD=E5=8F=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/group/invite.vue   | 24 +++++------
 pages/im/group/reviewed.vue | 85 -------------------------------------
 2 files changed, 11 insertions(+), 98 deletions(-)

diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index 2d798eb..0e15481 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="invite">
-        <view class="search">
-            <u--input class="search-input" placeholder="搜索" border="none" prefixIcon="search" v-model="searchTxt"
+        <view class="search u-border-bottom">
+            <u--input class="search-input" placeholder="搜索好友" border="none" prefixIcon="search" v-model="searchTxt"
                 disabledColor="#Fff" prefixIconStyle="font-size: 22px;color: #909399" @change="onSearch" />
         </view>
         <block v-if="friends.length > 0">
@@ -73,19 +73,18 @@
         },
         methods: {
             onSearch() {
-                if (this.searchTxt) {
-					console.log(this.searchTxt)
+                if (this.searchTxt) {
                     this.friends = this.orignalFriends.map((list, index) => {
-                        const resList = list.filter(item => item.name.indexOf(this.searchTxt) > 0)
-                        if (resList.length > 0) {
-                            this.indexs = this.orignalIndexs.map((t, i) => {})
-                        } else {
-                            return;
-                        }
+                        const resList = list.filter(item => {
+                            return item.name.indexOf(this.searchTxt) >= 0
+                        })
                         return resList
                     })
-                    this.friends = this.friends.filter(n => n)
-
+                    this.indexs = this.orignalIndexs.map((t, i) => {
+                        if (this.friends[i].length > 0) {
+                            return t
+                        }
+                    })
                 } else {
                     this.friends = this.orignalFriends
                     this.indexs = this.orignalIndexs
@@ -124,7 +123,6 @@
             },
             onInvite() {
                 inviteGroupUser(this.targetId, this.checkboxValue).then(res => {
-                    console.log(res, 'res')
                     uni.navigateBack({
                         delta: 1,
                         animationType: 'pop-out',
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index 0dea699..0c08b72 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -1,6 +1,5 @@
 <!-- 群聊邀请确认列表页面 -->
 <template>
-<<<<<<< HEAD
     <view class="reviewed">
         <view class="reviewed-item" v-for="(item, index) in pendings" :key="index">
             <u-avatar class="avatar" :src="JSON.parse(item.latestMessage.extra).portraitUrl" shape="square" size="36" />
@@ -106,88 +105,4 @@
         }
 
     }
-=======
-	<view class="reviewed">
-		<view class="reviewed-item">
-			<u-avatar class="avatar" src="require('@/static/user/cover.png')" shape="square" size="36" />
-			<view style="flex:1;">
-				<view class="nickname"><span>{{`艾米的猫儿 `}}</span>想邀请<span>{{` 用户8066`}}</span>加入群聊</view>
-				<view> 申请原因：{{`呵呵哒。。`}}</view>
-			</view>
-			<view class="sure" @click="sure(2)"> 通过 </view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import im from '@/utils/im/index.js'
-	export default {
-		data() {
-			return {
-				lists: [],
-			};
-		},
-		onLoad(e) {
-			this.targetId = e.id
-			this.getGroupPendinglist()
-		},
-		methods: {
-			getGroupPendinglist() {
-			    im.getGroupPendinglist(this.targetId,(pendings) => {
-					console.log(pendings)
-			        // this.pendings = pendings
-			    })
-			},
-			sure(id) {
-				uni.navigateTo({
-					url: "/pages/im/group/reviewedInfo?id=" + id
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.reviewed {
-		.reviewed-item {
-			margin: $padding - 10;
-			display: flex;
-			flex-direction: row;
-			align-items: flex-start;
-			justify-content: flex-start;
-			box-sizing: border-box;
-			border-bottom: solid 1rpx #f9f9f9;
-			font-size: $title-size-m - 2;
-			padding-bottom: 20rpx;
-			color: $text-gray-m;
-
-			.avatar {
-				background-color: $main-color;
-				border-radius: 6rpx;
-				margin-right: 20rpx;
-			}
-
-			.nickname {
-				font-size: $title-size-m;
-				margin-bottom: 10rpx;
-
-				span {
-					color: $text-color;
-					font-size: $title-size-m +1;
-				}
-			}
-
-			.sure {
-				background-color: $main-color;
-				color: #Fff;
-				text-align: center;
-				font-size: $title-size-m;
-				padding: 6rpx 20rpx;
-				border-radius: 10rpx;
-				margin-left: 10rpx;
-			}
-		}
-
-	}
->>>>>>> e99ef72050d54c27a6fe46e8063bb57fc903fac4
 </style>