From 21ec3459233ab4696612a31b4f00c5c86fc7dabb Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Sat, 20 Apr 2024 16:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=BF=87=E5=AE=A1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/App.vue                             |  17 ---
 .../components/user-search/user-search.vue    | 118 ------------------
 im-uniapp/pages.json                          |   2 +-
 im-uniapp/pages/group/group.vue               |   6 +-
 4 files changed, 2 insertions(+), 141 deletions(-)
 delete mode 100644 im-uniapp/components/user-search/user-search.vue

diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 06e58a0..4274b60 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -15,8 +15,6 @@
 			init() {
 				// 加载数据
 				store.dispatch("load").then(() => {
-					// 审核
-					this.initAudit();
 					// 初始化websocket
 					this.initWebSocket();
 				}).catch((e) => {
@@ -241,21 +239,6 @@
 				// this.audioTip = uni.createInnerAudioContext();
 				// this.audioTip.src =  "/static/audio/tip.wav";
 				// this.audioTip.play();
-			},
-			initAudit() {
-				if (store.state.userStore.userInfo.type == 1) {
-					// 显示群组功能
-					uni.setTabBarItem({
-						index: 2,
-						text: "群聊"
-					})
-				} else {
-					// 隐藏群组功能
-					uni.setTabBarItem({
-						index: 2,
-						text: "搜索"
-					})
-				}
 			}
 		},
 		onLaunch() {
diff --git a/im-uniapp/components/user-search/user-search.vue b/im-uniapp/components/user-search/user-search.vue
deleted file mode 100644
index fadd7f6..0000000
--- a/im-uniapp/components/user-search/user-search.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-	<!-- for wx audit -->
-	<view class="page user-search">
-		<view class="search-bar">
-			<uni-search-bar v-model="searchText" :focus="true" @confirm="onSearch()" can
-				cancelButton="none" ceholder="用户名/昵称"></uni-search-bar>
-		</view>
-		<view class="user-items">
-			<scroll-view class="scroll-bar" scroll-with-animation="true" scroll-y="true">
-				<view v-for="(user) in users" :key="user.id" v-show="user.id != $store.state.userStore.userInfo.id">
-					<view class="user-item">
-						<head-image :id="user.id" :name="user.nickName" 
-							:online="user.online" :url="user.headImage"
-							:size="100"></head-image>
-						<view class="user-name">{{ user.nickName}}</view>
-						<view class="user-btns">
-							<button type="primary" v-show="!isFriend(user.id)" size="mini"
-								@click.stop="onAddFriend(user)">加为好友</button>
-							<button type="default" v-show="isFriend(user.id)" size="mini" disabled>已添加</button>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				searchText: "",
-				users: []
-			}
-		},
-		methods: {
-			onSearch() {
-				this.$http({
-					url: "/user/findByName?name=" + this.searchText,
-					method: "GET"
-				}).then((data) => {
-					this.users = data;
-				})
-			},
-			onAddFriend(user) {
-				this.$http({
-					url: "/friend/add?friendId=" + user.id,
-					method: "POST"
-				}).then((data) => {
-					let friend = {
-						id: user.id,
-						nickName: user.nickName,
-						headImage: user.headImage,
-						online: user.online
-					}
-					this.$store.commit("addFriend", friend);
-					uni.showToast({
-						title: "添加成功，对方已成为您的好友",
-						icon: "none"
-					})
-				})
-			},
-			onShowUserInfo(user) {
-				uni.navigateTo({
-					url: "/pages/common/user-info?id=" + user.id
-				})
-			},
-			isFriend(userId) {
-				let friends = this.$store.state.friendStore.friends;
-				let friend = friends.find((f) => f.id == userId);
-				return friend&&!friend.delete;
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.user-search {
-		position: relative;
-		border: #dddddd solid 1px;
-		display: flex;
-		flex-direction: column;
-
-		.search-bar {
-			background: white;
-		}
-		.user-items{
-			position: relative;
-			flex: 1;
-			overflow: hidden;
-			.user-item {
-				height: 120rpx;
-				display: flex;
-				margin-bottom: 1rpx;
-				position: relative;
-				padding: 0 30rpx ;
-				align-items: center;
-				background-color: white;
-				white-space: nowrap;
-			
-				.user-name {
-					flex:1;	
-					padding-left: 20rpx;
-					font-size: 30rpx;
-					font-weight: 600;
-					line-height: 60rpx;
-					white-space: nowrap;
-					overflow: hidden;
-				}
-			}
-			
-			.scroll-bar {
-				height: 100%;
-			}
-		}
-		
-	}
-</style>
\ No newline at end of file
diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json
index 520b23c..6949536 100644
--- a/im-uniapp/pages.json
+++ b/im-uniapp/pages.json
@@ -61,7 +61,7 @@
 				"pagePath": "pages/group/group",
 				"iconPath": "static/tarbar/group.png",
 				"selectedIconPath": "static/tarbar/group_active.png",
-				"text": "搜索"
+				"text": "群聊"
 			},
 			{
 				"pagePath": "pages/mine/mine",
diff --git a/im-uniapp/pages/group/group.vue b/im-uniapp/pages/group/group.vue
index a215665..537b283 100644
--- a/im-uniapp/pages/group/group.vue
+++ b/im-uniapp/pages/group/group.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="$store.state.userStore.userInfo.type == 1" class="tab-page group">
+	<view class="tab-page group">
 		<view class="nav-bar">
 			<view class="nav-search">
 				<uni-search-bar @focus="onFocusSearch" cancelButton="none" placeholder="点击搜索群聊"></uni-search-bar>
@@ -19,10 +19,6 @@
 			</scroll-view>
 		</view>
 	</view>
-	<!-- wx audit -->
-	<view v-else>
-		<user-search></user-search>
-	</view>
 </template>
 
 <script>