From ef29aebf9c1c2899ad090062fa6e9d747c9be0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B5=A9?= <15830956848@163.com>
Date: Mon, 5 May 2025 17:45:22 +0800
Subject: [PATCH] =?UTF-8?q?5.5=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TUIContact/contact-list/index.vue         |    1 +
 .../TUIContact/select-friend/index.vue        |    6 +-
 .../TUIContact/select-friend/index1.vue       |    4 +-
 .../TUIGroup/manage-group/index.vue           |    4 +-
 .../TUIGroup/manage-group/manage-member.vue   |    1 +
 TUIKit/components/common/SelectUser/index.vue |    1 -
 TUIKit/components/common/Transfer/index.vue   |    3 +-
 TUIKit/locales/zh_cn/TUIContact.ts            |    2 +-
 config/api.js                                 |    5 +
 pages/mine/openShop/ThirdApply.vue            |   10 +-
 pages/mine/openShop/index.vue                 |    6 +-
 pages/tabbar/im/index.vue                     | 1045 ++++++++---------
 utils/request.js                              |   51 +-
 13 files changed, 569 insertions(+), 570 deletions(-)

diff --git a/TUIKit/components/TUIContact/contact-list/index.vue b/TUIKit/components/TUIContact/contact-list/index.vue
index 2fc75e55..be878d96 100644
--- a/TUIKit/components/TUIContact/contact-list/index.vue
+++ b/TUIKit/components/TUIContact/contact-list/index.vue
@@ -234,6 +234,7 @@ function selectItem(item: any) {
         (item: IContactInfoType) => (item as Friend)?.userID === (currentContactInfo.value as Friend)?.userID,
       );
     } else if ((currentContactInfo.value as IGroupModel)?.groupID) {
+     
       targetListItem = contactListMap.value?.groupList?.list?.find(
         (item: IContactInfoType) => (item as IGroupModel)?.groupID === (currentContactInfo.value as IGroupModel)?.groupID,
       );
diff --git a/TUIKit/components/TUIContact/select-friend/index.vue b/TUIKit/components/TUIContact/select-friend/index.vue
index 919d0deb..47fb7588 100644
--- a/TUIKit/components/TUIContact/select-friend/index.vue
+++ b/TUIKit/components/TUIContact/select-friend/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- <div></div> -->
   <SelectUser
     :isRadio="selectOptions.isRadio"
     :isNeedSearch="selectOptions.isNeedSearch"
@@ -55,8 +56,9 @@ watchEffect(() => {
     generateSearchServer(params.isNeedSearch);
   }
   TUIFriendService.getFriendList().then((res: any) => {
-    friendList.value = res.data.map((item: any) => item.profile);
-    userList.value = friendList.value;
+
+    // friendList.value = res.data.map((item: any) => item.profile);
+    userList.value = res.data;
     
   }).catch((err: any) => {
     console.warn('getFriendList error:', err);
diff --git a/TUIKit/components/TUIContact/select-friend/index1.vue b/TUIKit/components/TUIContact/select-friend/index1.vue
index cdb3769d..cc037f5a 100644
--- a/TUIKit/components/TUIContact/select-friend/index1.vue
+++ b/TUIKit/components/TUIContact/select-friend/index1.vue
@@ -57,8 +57,8 @@
       generateSearchServer(params.isNeedSearch);
     }
     TUIFriendService.getFriendList().then((res: any) => {
-      friendList.value = res.data.map((item: any) => item.profile);
-      userList.value = friendList.value;
+      // friendList.value = res.data.map((item: any) => item.profile);
+      userList.value =res.data;
     }).catch((err: any) => {
       console.warn('getFriendList error:', err);
     });
diff --git a/TUIKit/components/TUIGroup/manage-group/index.vue b/TUIKit/components/TUIGroup/manage-group/index.vue
index 3832e73c..a8ddbbb2 100644
--- a/TUIKit/components/TUIGroup/manage-group/index.vue
+++ b/TUIKit/components/TUIGroup/manage-group/index.vue
@@ -368,6 +368,7 @@ TUIStore.watch(StoreName.GRP, {
     }
   },
   currentGroupMemberList: (memberList: IGroupMember[]) => {
+    console.log('memberList', memberList);
     groupMemberList.value = memberList;
     member.value = {
       admin: [],
@@ -549,7 +550,8 @@ const toggleMask = async (type?: string) => {
 
 const friendList = async () => {
   const imResponse = await TUIFriendService.getFriendList();
-  const friendList = imResponse.data.map((item: any) => item?.profile);
+  // const friendList = imResponse.data.map((item: any) => item?.profile);
+  const friendList = imResponse.data
   return friendList.filter(
     (item: any) =>
       !userInfo.value.list.some(
diff --git a/TUIKit/components/TUIGroup/manage-group/manage-member.vue b/TUIKit/components/TUIGroup/manage-group/manage-member.vue
index b72bb317..900f56dd 100644
--- a/TUIKit/components/TUIGroup/manage-group/manage-member.vue
+++ b/TUIKit/components/TUIGroup/manage-group/manage-member.vue
@@ -139,6 +139,7 @@ const selfValue = ref<IGroupSelfInfo>({});
 watchEffect(() => {
   totalMember.value = props.total;
   isShowDeleteBtn.value = props.isShowDel;
+  console.log('-------------', props.list);
   memberList.value = props.list as Array<IGroupMember>;
   selfValue.value = props.self;
 });
diff --git a/TUIKit/components/common/SelectUser/index.vue b/TUIKit/components/common/SelectUser/index.vue
index e6c67fe1..a0f923fd 100644
--- a/TUIKit/components/common/SelectUser/index.vue
+++ b/TUIKit/components/common/SelectUser/index.vue
@@ -50,7 +50,6 @@ const props = defineProps({
     default: 0,
   },
 });
-
 const reset = () => {
   emits('complete', [],0);
 };
diff --git a/TUIKit/components/common/Transfer/index.vue b/TUIKit/components/common/Transfer/index.vue
index fffede06..a9e3d096 100644
--- a/TUIKit/components/common/Transfer/index.vue
+++ b/TUIKit/components/common/Transfer/index.vue
@@ -79,7 +79,7 @@
                   "
                   onerror="this.onerror=null;this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'"
                 />
-                <span class="name">{{ item.nick || item.userID }}</span>
+                <span class="name">{{ item.remark || item.userID }}</span>
                 <span v-if="item.isDisabled"
                   >（{{ TUITranslateService.t("component.已在群中") }}）</span
                 >
@@ -251,6 +251,7 @@ watchEffect(() => {
         // eslint-disable-next-line vue/no-mutating-props
         props.list.splice(index, 1);
       }
+      console.log("++++++++++", props.list);
       transferList.value = props.list as ITransferListItem[];
     }
   } else {
diff --git a/TUIKit/locales/zh_cn/TUIContact.ts b/TUIKit/locales/zh_cn/TUIContact.ts
index f0642e01..15113258 100644
--- a/TUIKit/locales/zh_cn/TUIContact.ts
+++ b/TUIKit/locales/zh_cn/TUIContact.ts
@@ -4,7 +4,7 @@ const TUIContact = {
   "群聊通知": "群聊通知",
   "系统通知": "系统通知",
   "我的群聊": "我的群聊",
-  "输入ID": "请输入用户/群聊 ID，回车搜索",
+  "输入ID": "请输入用户手机号回车搜索",
   "群名称": "群名称",
   "群ID": "群ID",
   "加入群聊": "加入群聊",
diff --git a/config/api.js b/config/api.js
index e71437f8..bbda59b5 100644
--- a/config/api.js
+++ b/config/api.js
@@ -18,6 +18,11 @@ const dev = {
 };
 // 生产环境
 const prod = {
+	// common: "http://192.168.1.211:8890",
+	// buyer: "http://192.168.1.211:8888",
+	// vlog: "http://192.168.1.211:8099",
+	// web: "http://192.168.1.211:8099",
+	// seller: "http://192.168.1.211:8889",
 	// common: "http://192.168.1.211:8890",
 	// buyer: "http://192.168.1.211:8888",
 	common: "http://43.143.227.203:8890",
diff --git a/pages/mine/openShop/ThirdApply.vue b/pages/mine/openShop/ThirdApply.vue
index e9211075..48146e6f 100644
--- a/pages/mine/openShop/ThirdApply.vue
+++ b/pages/mine/openShop/ThirdApply.vue
@@ -224,11 +224,11 @@ export default {
           applyThird(params)
             .then((res) => {
               this.loading = false;
-              // uni.showToast({
-              //   title: "请正确输入",
-              //   icon: "none",
-              //   duration: 1500,
-              // });
+              uni.showToast({
+                title: "提交成功",
+                icon: "none",
+                duration: 1500,
+              });
               setTimeout(() => {
                 uni.navigateTo({
                   url: "/pages/tabbar/user/my",
diff --git a/pages/mine/openShop/index.vue b/pages/mine/openShop/index.vue
index 2b8a4413..05099fbe 100644
--- a/pages/mine/openShop/index.vue
+++ b/pages/mine/openShop/index.vue
@@ -377,10 +377,10 @@ export default {
           if (
             this.form.legalPhoto != "" &&
             this.form.legalId != "" &&
-            this.form.legalName != ""
+            this.form.legalName != "" &&
+            this.form.linkName!= "" &&
+            this.form.linkPhone!= "" 
           ) {
-            console.log(params,'========');
-            
             applyFirst(params)
               .then((res) => {
                 if (res.data.success) {
diff --git a/pages/tabbar/im/index.vue b/pages/tabbar/im/index.vue
index 2887393b..9d4681eb 100644
--- a/pages/tabbar/im/index.vue
+++ b/pages/tabbar/im/index.vue
@@ -1,614 +1,607 @@
 <template>
-	<div
-		style="height: 100%"
-		@click="handleTouchStart"
-	>
-		<div class="jolkp">
-			<div
-				class="fan"
-				:style="{ marginRight: statue == 0 ? '47.5%' : '47.5%' }"
-			>
-				<div
-					@click="hui(0)"
-					:style="{ marginTop: '45px' }"
-					v-if="statue != 0"
-				>
-					<u-icon name="arrow-left"></u-icon>
-				</div>
-			</div>
-			<!-- <TUIContact v-else-if="statue==1"  :stu="2" /> -->
-			<div
-				@click="hui(6)"
-				class="jolkp_z"
-				v-if="statue == 0 || 6"
-				:style="{ marginTop: '45px' }"
-			>
-				<div class="tiole">{{ tole }}</div>
-			</div>
+  <div style="height: 100%" @click="handleTouchStart">
+    <div class="jolkp">
+      <div
+        class="fan"
+        :style="{ marginRight: statue == 0 ? '47.5%' : '47.5%' }"
+      >
+        <div @click="hui(0)" :style="{ marginTop: '45px' }" v-if="statue != 0">
+          <u-icon name="arrow-left"></u-icon>
+        </div>
+      </div>
+      <!-- <TUIContact v-else-if="statue==1"  :stu="2" /> -->
+      <div
+        @click="hui(6)"
+        class="jolkp_z"
+        v-if="statue == 0 || 6"
+        :style="{ marginTop: '45px' }"
+      >
+        <div class="tiole">{{ tole }}</div>
+      </div>
 
-			<div
-				@click="hui(1)"
-				class="jolkp_h"
-				v-if="statue == 0 || 6"
-				:style="{ marginTop: '45px' }"
-			></div>
-			<view
-				class="jolkp_l"
-				:style="{ marginTop: '45px' }"
-			></view>
-			<!-- 弹出框 -->
-			<view
-				v-if="isPopupVisible"
-				class="popup"
-				ref="popup"
-			>
-				<ul>
-					<li @click.stop="handleAddFriend">添加好友/群聊</li>
-					<li @click.stop="handleMenu()">发起群聊</li>
-					<li @click.stop="handleScan">扫一扫</li>
-				</ul>
-			</view>
-		</div>
-		<!-- 搜索添加 -->
-		<TUIContactsea
-			v-if="statue == 2"
-			@switchConversation="hui"
-		/>
-		<!-- 联系人 -->
-		<TUIContact
-			v-else-if="statue == 1 && isPopupVisible==false"
-			style="height: 100%"
-		/>
-		<!-- 群选择的 -->
-		<SelectFriend
-			v-else-if="statue == 3 "
-			@con="hui"
-			:style="{ marginTop: '20px', heigth: '80%' }"
-		/>
-		<!-- 群类型 -->
-		<CreateGroup
-			v-else-if="statue == 10 "
-			@con="confn"
-		/>
-		<SelectFriendqlioa
-			v-else-if="statue == 4 "
-			@concen="concen"
-		/>
-		<ContactInfo
-			v-else-if="statue == 7"
-			@concen="concen"
-		/>
-		<!-- 站内信数据 -->
-		<!-- <div > -->
-		<scroll-view
-			@scrolltolower="lowerBottom"
-			scroll-y="true"
-			v-else-if="statue == 6 && isPopupVisible==false"
-			class="znx"
-		>
-			<div
-				@touchstart="startLongPress(item, index)"
-				@touchend="endLongPress(item, index)"
-				@click="torut(item)"
-				v-for="(item, index) in meList"
-				:key="item.id"
-				class="tui-conversation-item"
-			>
-				<div :style="{ transform: 'translateX(' + swipeStates[index] + 'px)' }">
-					{{ item.title }}
-				</div>
-				<div class="content">{{ item.createTime }}</div>
-				<div
-					class="delete-button"
-					@click="deleteMessage(index)"
-					v-if="swipeStates[index] <= -50"
-				>
-					删除
-				</div>
-			</div>
-		</scroll-view>
+      <div
+        @click="hui(1)"
+        class="jolkp_h"
+        v-if="statue == 0 || 6"
+        :style="{ marginTop: '45px' }"
+      ></div>
+      <view class="jolkp_l" :style="{ marginTop: '45px' }"></view>
+      <!-- 弹出框 -->
+      <view v-if="isPopupVisible" class="popup" ref="popup">
+        <ul>
+          <li @click.stop="handleAddFriend">添加好友/群聊</li>
+          <li @click.stop="handleMenu()">发起群聊</li>
+          <li @click.stop="handleScan">扫一扫</li>
+        </ul>
+      </view>
+    </div>
+    <!-- 搜索添加 -->
+    <TUIContactsea v-if="statue == 2" @switchConversation="hui" />
+    <!-- 联系人 -->
+    <TUIContact
+      v-else-if="statue == 1 && isPopupVisible == false"
+      style="height: 100%"
+    />
+    <!-- 群选择的 -->
+    <SelectFriend
+      v-else-if="statue == 3"
+      @con="hui"
+      :style="{ marginTop: '20px', heigth: '80%' }"
+    />
+    <!-- 群类型 -->
+    <CreateGroup v-else-if="statue == 10" @con="confn" />
+    <SelectFriendqlioa v-else-if="statue == 4" @concen="concen" />
+    <ContactInfo v-else-if="statue == 7" @concen="concen" />
+    <!-- 站内信数据 -->
+    <!-- <div > -->
+    <scroll-view
+      @scrolltolower="lowerBottom"
+      scroll-y="true"
+      v-else-if="statue == 6 && isPopupVisible == false"
+      class="znx"
+    >
+      <div
+        @touchstart="startLongPress(item, index)"
+        @touchend="endLongPress(item, index)"
+        @click="torut(item)"
+        v-for="(item, index) in meList"
+        :key="item.id"
+        class="tui-conversation-item"
+      >
+        <div :style="{ transform: 'translateX(' + swipeStates[index] + 'px)' }">
+          {{ item.title }}
+        </div>
+        <div class="content">{{ item.createTime }}</div>
+        <div
+          class="delete-button"
+          @click="deleteMessage(index)"
+          v-if="swipeStates[index] <= -50"
+        >
+          删除
+        </div>
+      </div>
+    </scroll-view>
 
-		<!-- </div> -->
-		<!-- 会话 -->
-		<TUIConversation
-			style="height: 100%"
-			v-else
-			@state="state"
-		/>
-		<!-- 未登录显示 -->
-		<view
-			v-if="showNoLoginPage"
-			class="no-login"
-			@click="toLogin"
-		>
-			请登录
-		</view>
-	</div>
+    <!-- </div> -->
+    <!-- 会话 -->
+    <TUIConversation style="height: 100%" v-else @state="state" />
+    <!-- 未登录显示 -->
+    <view v-if="showNoLoginPage" class="no-login" @click="toLogin">
+      请登录
+    </view>
+  </div>
 </template>
 
 <script>
 // 导入组件
-import TUIConversation from '@/TUIKit/components/TUIConversation/index';
-import TUIContact from '@/TUIKit/components/TUIContact/index';
-import TUIContactsea from '@/TUIKit/components/TUIContact/indexsea';
-import { TUILogin } from '@tencentcloud/tui-core';
-import ContactSearch from '@/TUIKit/components/TUIContact/contact-search/index.vue';
-import CreateGroup from '@/TUIKit/components/TUIGroup/create-group/index.vue';
+import TUIConversation from "@/TUIKit/components/TUIConversation/index";
+import TUIContact from "@/TUIKit/components/TUIContact/index";
+import TUIContactsea from "@/TUIKit/components/TUIContact/indexsea";
+import { TUILogin } from "@tencentcloud/tui-core";
+import ContactSearch from "@/TUIKit/components/TUIContact/contact-search/index.vue";
+import CreateGroup from "@/TUIKit/components/TUIGroup/create-group/index.vue";
 // import { TUIChatKit } from '@/TUIKit';
-import SelectFriend from '@/TUIKit/components/TUIContact/select-friend/index.vue';
-import ContactInfo from '@/TUIKit/components/TUIContact/contact-info/index.vue';
-import SelectFriendqlioa from '@/TUIKit/components/TUIGroup/index.vue';
+import SelectFriend from "@/TUIKit/components/TUIContact/select-friend/index.vue";
+import ContactInfo from "@/TUIKit/components/TUIContact/contact-info/index.vue";
+import SelectFriendqlioa from "@/TUIKit/components/TUIGroup/index.vue";
 
-import TUICore, { ExtensionInfo, TUIConstants } from '@tencentcloud/tui-core';
-import storage from '@/utils/storage.js';
+import TUICore, { ExtensionInfo, TUIConstants } from "@tencentcloud/tui-core";
+import storage from "@/utils/storage.js";
 // push
 // import { TUIConversationService } from '@tencentcloud/chat-uikit-engine';
 // import * as Push from '@/uni_modules/TencentCloud-Push';
 
-import { getUserimInfo, getMember, getMemberstate, getMemberdelete, geterweijki } from '@/api/members';
-import { TUITranslateService, TUIStore, StoreName, IGroupModel, TUIFriendService, Friend, FriendApplication, TUIUserService } from '@tencentcloud/chat-uikit-engine';
+import {
+  getUserimInfo,
+  getMember,
+  getMemberstate,
+  getMemberdelete,
+  geterweijki,
+} from "@/api/members";
+import {
+  TUITranslateService,
+  TUIStore,
+  StoreName,
+  IGroupModel,
+  TUIFriendService,
+  Friend,
+  FriendApplication,
+  TUIUserService,
+} from "@tencentcloud/chat-uikit-engine";
 // TUIChatKit.init();
 // let vueVersion = 2;
 // vueVersion = 3;
 
 export default {
-	// 注册组件
-	components: {
-		TUIConversation,
-		TUIContact,
-		TUIContactsea,
-		ContactSearch,
-		SelectFriend,
-		SelectFriendqlioa,
-		// TUIChatKit,
-		CreateGroup,
-		ContactInfo
-	},
-	data() {
-		return {
-			showNoLoginPage: false,
-			statue: 1, // 0对话记录  1联系人 2添加好友/群聊  3建群  4群名称  6站内信 10群类型  7扫码后用户详情
-			isPopupVisible: false, // 控制弹出框的显示与隐藏
-			isq: false,
-			popupRef: null, // 新增，用于保存弹窗的引用
-			meList: [],
-			swipeStates: [],
-			startX: 0,
-			tole: 0, //已读未读
-			timer: null, //获取站内信
-			pageSize: 20,
-			pageNumber: 1,
-			total: 0,
-			loadMoreStatus: 'more' // 加载更多状态
-		};
-	},
-	onTabItemTap(e) {
-		let tabIndex = e.index;
-		console.log(tabIndex);
-		if (tabIndex == 2) {
-			// 检测登录状态
-			if (!storage.getHasLogin()) {
-				this.removeTimer();
-				// 未登录
-				uni.navigateTo({
-					url: '/pages/passport/login'
-				});
-				this.showNoLoginPage = true;
-			} else {
-				this.removeTimer();
-				this.setTime();
-				this.showNoLoginPage = false;
-			}
-		}
-	},
-	onUnload() {},
-	created() {},
-	onHide() {
-		console.log('IM页面隐藏');
-		this.removeTimer();
-	},
-	onShow() {
-		// 检测登录状态
-		if (!storage.getHasLogin()) {
-			this.removeTimer();
-			// 未登录
-			this.showNoLoginPage = true;
-		} else {
-			this.setTime();
-			this.showNoLoginPage = false;
-		}
-	},
+  // 注册组件
+  components: {
+    TUIConversation,
+    TUIContact,
+    TUIContactsea,
+    ContactSearch,
+    SelectFriend,
+    SelectFriendqlioa,
+    // TUIChatKit,
+    CreateGroup,
+    ContactInfo,
+  },
+  data() {
+    return {
+      showNoLoginPage: false,
+      statue: 1, // 0对话记录  1联系人 2添加好友/群聊  3建群  4群名称  6站内信 10群类型  7扫码后用户详情
+      isPopupVisible: false, // 控制弹出框的显示与隐藏
+      isq: false,
+      popupRef: null, // 新增，用于保存弹窗的引用
+      meList: [],
+      swipeStates: [],
+      startX: 0,
+      tole: 0, //已读未读
+      timer: null, //获取站内信
+      pageSize: 20,
+      pageNumber: 1,
+      total: 0,
+      loadMoreStatus: "more", // 加载更多状态
+    };
+  },
+  onTabItemTap(e) {
+    let tabIndex = e.index;
+    console.log(tabIndex);
+    if (tabIndex == 2) {
+      // 检测登录状态
+      if (!storage.getHasLogin()) {
+        this.removeTimer();
+        // 未登录
+        uni.navigateTo({
+          url: "/pages/passport/login",
+        });
+        this.showNoLoginPage = true;
+      } else {
+        this.removeTimer();
+        this.setTime();
+        this.showNoLoginPage = false;
+      }
+    }
+  },
+  onUnload() {},
+  created() {},
+  onHide() {
+    console.log("IM页面隐藏");
+    this.removeTimer();
+  },
+  onShow() {
+    // 检测登录状态
+    if (!storage.getHasLogin()) {
+      this.removeTimer();
+      // 未登录
+      this.showNoLoginPage = true;
+    } else {
+      this.setTime();
+      this.showNoLoginPage = false;
+    }
+  },
 
-	mounted() {
-		this.getMembermethod();
-		this.setTime();
+  mounted() {
+    this.getMembermethod();
+    this.setTime();
 
-		// 监听自定义全局点击事件
-		uni.$on('globalClick', (event) => {
-			// console.log(event, "====+++");
-			this.handleGlobalClick(event);
-		});
+    // 监听自定义全局点击事件
+    uni.$on("globalClick", (event) => {
+      this.handleGlobalClick(event);
+    });
 
-		// // 在页面根元素上监听触摸开始事件并触发自定义全局点击事件
-		// uni.onTouchStart((event) => {
-		//   uni.$emit("globalClick", event);
-		// });
-	},
-	beforeDestroy() {
-		// 移除全局点击事件监听
-		uni.$off('globalClick');
-		// 清除定时器
-		this.removeTimer();
-	},
-	methods: {
-		toLogin() {
-			uni.navigateTo({
-				url: '/pages/passport/login'
-			});
-		},
-		state(item) {
-			this.isPopupVisible = item;
-		},
-		handleTouchStart(event) {
-			uni.$emit('globalClick', event);
-		},
-		handleGlobalClick(event) {
-			const query = uni.createSelectorQuery().in(this);
-			query
-				.select('.jolkp_l')
-				// 获取节点的布局位置和尺寸信息
-				.boundingClientRect((rect) => {
-					if (rect) {
-						const clickX = event.clientX || event.touches[0].clientX;
-						const clickY = event.clientY || event.touches[0].clientY;
+    // // 在页面根元素上监听触摸开始事件并触发自定义全局点击事件
+    // uni.onTouchStart((event) => {
+    //   uni.$emit("globalClick", event);
+    // });
+  },
+  beforeDestroy() {
+    // 移除全局点击事件监听
+    uni.$off("globalClick");
+    // 清除定时器
+    this.removeTimer();
+  },
+  methods: {
+    toLogin() {
+      uni.navigateTo({
+        url: "/pages/passport/login",
+      });
+    },
+    state(item) {
+      this.isPopupVisible = item;
+    },
+    handleTouchStart(event) {
+      uni.$emit("globalClick", event);
+    },
+    handleGlobalClick(event) {
+      const query = uni.createSelectorQuery().in(this);
+      query
+        .select(".jolkp_l")
+        // 获取节点的布局位置和尺寸信息
+        .boundingClientRect((rect) => {
+          if (rect) {
+            const clickX = event.clientX || event.touches[0].clientX;
+            const clickY = event.clientY || event.touches[0].clientY;
 
-						if (clickX >= rect.left && clickX <= rect.width + rect.left && clickY >= rect.top && clickY <= rect.top + rect.height * 2) {
-							// this.statue = 0; // 点击在节点范围内，执行相应操作
-							console.log('点击是在节点范围');
-							this.isPopupVisible = !this.isPopupVisible; // 隐藏弹出框
-						} else {
-							// this.statue = 0; // 点击在节点范围内，执行相应操作
-							console.log('否');
-							this.isPopupVisible = false; // 隐藏弹出框
-						}
-					}
-				})
-				// 执行查询操作
-				.exec(() => {
-					// this.isPopupVisible = true; // 隐藏弹出框
-				});
-		},
-		lowerBottom() {
-			if (this.total >= this.meList.length) {
-				this.pageSize += 10;
-				this.getMembermethod();
-			}
-		},
-		removeTimer() {
-			if (this.timer) {
-				clearInterval(this.timer);
-				this.timer = null;
-			}
-		},
-		setTime() {
-			if (this.timer) {
-				return;
-			}
-			this.timer = setInterval(() => {
-				this.getMembermethod();
-			}, 10000);
-		},
-		torut(item) {
-			this.isPopupVisible = false;
-			const itemJson = encodeURIComponent(JSON.stringify(item));
-			// 使用 uni.navigateTo 方法跳转到详情页，并传递信息
-			uni.navigateTo({
-				url: `/pages/tabbar/im/details/index?item=${itemJson}`
-			});
-			getMemberstate({ messageId: item.messageId }).then((res) => {
-				this.getMembermethod();
-			});
-		},
-		//完成跳转群名
-		confn() {
-			this.statue = 0;
-			this.isPopupVisible = false;
-		},
-		concen() {
-			this.statue = 0;
-		},
-		hui(index) {
-			this.statue = index;
-		},
-		fnkiopl() {
-			this.isPopupVisible = !this.isPopupVisible;
-			this.popupRef = this.$refs.popup;
-		},
+            if (
+              clickX >= rect.left &&
+              clickX <= rect.width + rect.left &&
+              clickY >= rect.top &&
+              clickY <= rect.top + rect.height * 2
+            ) {
+              // this.statue = 0; // 点击在节点范围内，执行相应操作
+              if (this.statue == 2) {
+                return;
+              } else {
+                this.isPopupVisible = !this.isPopupVisible; // 隐藏弹出框
+              }
+            } else {
+              // this.statue = 0; // 点击在节点范围内，执行相应操作
+              this.isPopupVisible = false; // 隐藏弹出框
+            }
+          }
+        })
+        // 执行查询操作
+        .exec(() => {
+          // this.isPopupVisible = true; // 隐藏弹出框
+        });
+    },
+    lowerBottom() {
+      if (this.total >= this.meList.length) {
+        this.pageSize += 10;
+        this.getMembermethod();
+      }
+    },
+    removeTimer() {
+      if (this.timer) {
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+    },
+    setTime() {
+      if (this.timer) {
+        return;
+      }
+      this.timer = setInterval(() => {
+        this.getMembermethod();
+      }, 10000);
+    },
+    torut(item) {
+      this.isPopupVisible = false;
+      const itemJson = encodeURIComponent(JSON.stringify(item));
+      // 使用 uni.navigateTo 方法跳转到详情页，并传递信息
+      uni.navigateTo({
+        url: `/pages/tabbar/im/details/index?item=${itemJson}`,
+      });
+      getMemberstate({ messageId: item.messageId }).then((res) => {
+        this.getMembermethod();
+      });
+    },
+    //完成跳转群名
+    confn() {
+      this.statue = 0;
+      this.isPopupVisible = false;
+    },
+    concen() {
+      this.statue = 0;
+    },
+    hui(index) {
+      this.statue = index;
+    },
+    fnkiopl() {
+      this.isPopupVisible = !this.isPopupVisible;
+      this.popupRef = this.$refs.popup;
+    },
 
-		getMembermethod() {
-			const param = {
-				pageSize: this.pageSize,
-				pageNumber: this.pageNumber
-			};
-			getMember(param).then((res) => {
-				this.total = res.data.result.total;
-				if (this.pageNumber === 1) {
-					this.meList = res.data.result.records;
-				} else {
-					this.meList = this.meList.concat(res.data.result.records);
-				}
-				this.swipeStates = new Array(this.meList.length).fill(0);
-				this.tole = this.meList.filter((item) => item.status === 'UN_READY').length;
-			});
-		},
-		handleMenu() {
-			const fn = [...TUICore.getExtensionList(TUIConstants.TUISearch.EXTENSION.SEARCH_MORE.EXT_ID)];
-			const item = fn[1];
-			const {
-				listener = {
-					onClicked: () => {}
-				}
-			} = item;
-			listener?.onClicked?.(item);
-			this.statue = 3;
-		},
-		// 处理添加好友/群聊点击事件
-		handleAddFriend() {
-			this.statue = 2;
-			this.isPopupVisible = false;
-		},
-		handleScan() {
-			this.isPopupVisible = false;
-			uni.scanCode({
-				success: (res) => {
-					console.log('扫码结果:---', res.result);
-					const params = {
-						userID: res.result //userID
-					};
-					console.log('params', params);
-					TUIStore.update(StoreName.CUSTOM, 'currentContactInfo', params);
-					this.statue = 7;
-				}
-			});
-		},
-		startLongPress(item, index) {
-			this.longPressTimer = setTimeout(() => {
-				uni.showModal({
-					title: '确认删除',
-					content: '确定要删除这条消息吗？',
-					success: (res) => {
-						if (res.confirm) {
-							getMemberdelete({ messageId: item.messageId }).then((res) => {
-								this.getMembermethod();
-							});
-						}
-					}
-				});
-			}, 2000);
-		},
-		endLongPress() {
-			clearTimeout(this.longPressTimer);
-		}
-	}
+    getMembermethod() {
+      const param = {
+        pageSize: this.pageSize,
+        pageNumber: this.pageNumber,
+      };
+      getMember(param).then((res) => {
+        this.total = res.data.result.total;
+        if (this.pageNumber === 1) {
+          this.meList = res.data.result.records;
+        } else {
+          this.meList = this.meList.concat(res.data.result.records);
+        }
+        this.swipeStates = new Array(this.meList.length).fill(0);
+        this.tole = this.meList.filter(
+          (item) => item.status === "UN_READY"
+        ).length;
+      });
+    },
+    handleMenu() {
+      const fn = [
+        ...TUICore.getExtensionList(
+          TUIConstants.TUISearch.EXTENSION.SEARCH_MORE.EXT_ID
+        ),
+      ];
+      const item = fn[1];
+      const {
+        listener = {
+          onClicked: () => {},
+        },
+      } = item;
+      listener?.onClicked?.(item);
+      this.statue = 3;
+    },
+    // 处理添加好友/群聊点击事件
+    handleAddFriend() {
+      this.statue = 2;
+      this.isPopupVisible = false;
+    },
+    handleScan() {
+      this.isPopupVisible = false;
+      uni.scanCode({
+        success: (res) => {
+          console.log("扫码结果:---", res.result);
+          const params = {
+            userID: res.result, //userID
+          };
+          console.log("params", params);
+          TUIStore.update(StoreName.CUSTOM, "currentContactInfo", params);
+          this.statue = 7;
+        },
+      });
+    },
+    startLongPress(item, index) {
+      this.longPressTimer = setTimeout(() => {
+        uni.showModal({
+          title: "确认删除",
+          content: "确定要删除这条消息吗？",
+          success: (res) => {
+            if (res.confirm) {
+              getMemberdelete({ messageId: item.messageId }).then((res) => {
+                this.getMembermethod();
+              });
+            }
+          },
+        });
+      }, 2000);
+    },
+    endLongPress() {
+      clearTimeout(this.longPressTimer);
+    },
+  },
 };
 </script>
 
 <style scoped>
 .no-login {
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	background-color: #000;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	z-index: 9999999;
-	font-size: 36rpx;
-	font-weight: 600;
-	color: #fff;
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: #000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999999;
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #fff;
 }
 uni-page-body,
 html,
 body,
 page {
-	width: 100% !important;
-	height: 100% !important;
-	overflow: hidden;
+  width: 100% !important;
+  height: 100% !important;
+  overflow: hidden;
 }
 .jolkp {
-	position: sticky;
-	top: 0;
-	height: 75px;
-	display: flex;
-	font-size: 15px;
-	justify-content: end;
-	/* background: green; */
-	/* 设置背景图 */
-	/* background-image: url('@/static/im/Rectangle.png'); */
-	/* 让背景图覆盖整个元素 */
-	background-size: cover;
-	/* 背景图不重复 */
-	background-repeat: no-repeat;
+  position: sticky;
+  top: 0;
+  height: 75px;
+  display: flex;
+  font-size: 15px;
+  justify-content: end;
+  /* background: green; */
+  /* 设置背景图 */
+  /* background-image: url('@/static/im/Rectangle.png'); */
+  /* 让背景图覆盖整个元素 */
+  background-size: cover;
+  /* 背景图不重复 */
+  background-repeat: no-repeat;
 }
 
 .jolkp_l {
-	width: 1.8rem;
-	height: 1.8rem;
-	background-image: url('@/static/im/Frame.png');
-	/* 让背景图覆盖整个元素 */
-	background-size: cover;
-	/* 背景图不重复 */
-	background-repeat: no-repeat;
-	margin-top: 35px;
-	margin-right: 10px;
+  width: 1.8rem;
+  height: 1.8rem;
+  background-image: url("@/static/im/Frame.png");
+  /* 让背景图覆盖整个元素 */
+  background-size: cover;
+  /* 背景图不重复 */
+  background-repeat: no-repeat;
+  margin-top: 35px;
+  margin-right: 10px;
 }
 
 .jolkp_h {
-	width: 1.8rem;
-	height: 1.8rem;
-	background-image: url('@/static/im/user.png');
-	/* 让背景图覆盖整个元素 */
-	background-size: cover;
-	/* 背景图不重复 */
-	background-repeat: no-repeat;
-	margin-top: 35px;
-	margin-right: 20px;
+  width: 1.8rem;
+  height: 1.8rem;
+  background-image: url("@/static/im/user.png");
+  /* 让背景图覆盖整个元素 */
+  background-size: cover;
+  /* 背景图不重复 */
+  background-repeat: no-repeat;
+  margin-top: 35px;
+  margin-right: 20px;
 }
 .jolkp_z {
-	width: 1.8rem;
-	height: 1.8rem;
-	background-image: url('@/static/im/znx.png');
-	/* 让背景图覆盖整个元素 */
-	background-size: cover;
-	/* 背景图不重复 */
-	background-size: 100% 100%;
+  width: 1.8rem;
+  height: 1.8rem;
+  background-image: url("@/static/im/znx.png");
+  /* 让背景图覆盖整个元素 */
+  background-size: cover;
+  /* 背景图不重复 */
+  background-size: 100% 100%;
 
-	margin-right: 20px;
+  margin-right: 20px;
 }
 .tiole {
-	margin-top: -10px;
-	margin-left: 105%;
-	color: #fff;
-	font-size: 14px;
+  margin-top: -10px;
+  margin-left: 105%;
+  color: #fff;
+  font-size: 14px;
 }
 .popup {
-	position: absolute;
-	top: 75px;
-	/* 调整弹出框的位置 */
-	right: 5px;
-	background-color: #fff;
-	border: 1px solid #ccc;
-	border-radius: 4px;
-	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-	z-index: 3;
+  position: absolute;
+  top: 75px;
+  /* 调整弹出框的位置 */
+  right: 5px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  z-index: 3;
 }
 
 .popup ul {
-	list-style-type: none;
-	padding: 0;
-	margin: 0;
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
 }
 
 .popup li {
-	padding: 10px 20px;
-	cursor: pointer;
-	z-index: 999999;
+  padding: 10px 20px;
+  cursor: pointer;
+  z-index: 999999;
 }
 
 .popup li:hover {
-	background-color: #f0f0f0;
+  background-color: #f0f0f0;
 }
 
 .fan {
-	width: 10%;
-	height: '100%';
-	font-size: 18px;
-	display: flex;
+  width: 10%;
+  height: "100%";
+  font-size: 18px;
+  display: flex;
 
-	padding: 5px;
+  padding: 5px;
 }
 @media screen and (device-width: 393px) and (device-height: 851px) and (-webkit-device-pixel-ratio: 3) {
-	.fan {
-		margin-right: 56% !important;
-		width: 10%;
-		height: '100%';
-		font-size: 18px;
-		display: flex;
-		margin-top: 80%;
-		/* padding: 5px; */
-	}
+  .fan {
+    margin-right: 56% !important;
+    width: 10%;
+    height: "100%";
+    font-size: 18px;
+    display: flex;
+    margin-top: 80%;
+    /* padding: 5px; */
+  }
 }
 .three {
-	width: 100%;
-	height: 10%;
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	background: rgb(255, 255, 255);
+  width: 100%;
+  height: 10%;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  background: rgb(255, 255, 255);
 }
 .con {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 .three_div1 {
-	height: 3rem;
-	width: 40%;
-	background-image: url('@/static/im/kf.png');
-	background-size: 100% 100%;
-	background-repeat: no-repeat;
-	display: flex;
-	align-items: center;
-	justify-content: end;
+  height: 3rem;
+  width: 40%;
+  background-image: url("@/static/im/kf.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  display: flex;
+  align-items: center;
+  justify-content: end;
 }
 
 .three_div2 {
-	width: 40%;
-	height: 3rem;
-	background-image: url('@/static/im/hy.png');
-	background-size: 100% 100%;
-	background-repeat: no-repeat;
-	width: 40%;
+  width: 40%;
+  height: 3rem;
+  background-image: url("@/static/im/hy.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 40%;
 }
 
 .three_div3 {
-	height: 3rem;
-	background-image: url('@/static/im/da.png');
-	background-size: 100% 100%;
-	background-repeat: no-repeat;
-	width: 40%;
+  height: 3rem;
+  background-image: url("@/static/im/da.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 40%;
 }
 .tui-conversation-item {
-	/* height: 10%; */
-	padding: 12px;
-	display: flex;
-	align-items: center;
-	cursor: pointer;
-	box-sizing: border-box;
-	overflow: hidden;
-	border: 1px solid #d9d9d9;
-	width: 98%;
-	margin: 10px 10px 10px 5px;
-	position: relative;
+  /* height: 10%; */
+  padding: 12px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  box-sizing: border-box;
+  overflow: hidden;
+  border: 1px solid #d9d9d9;
+  width: 98%;
+  margin: 10px 10px 10px 5px;
+  position: relative;
 }
 .content {
-	display: flex;
-	flex: 1;
-	padding-left: 8px;
-	justify-content: end;
-	box-sizing: border-box;
-	overflow: hidden;
+  display: flex;
+  flex: 1;
+  padding-left: 8px;
+  justify-content: end;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 .left {
-	position: relative;
-	width: 36px;
-	height: 36px;
+  position: relative;
+  width: 36px;
+  height: 36px;
 }
 
 .znx {
-	max-height: 100vh;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	overflow-y: auto;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  overflow-y: auto;
 }
 .delete-button {
-	position: absolute;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	width: 100px;
-	background-color: red;
-	color: white;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	cursor: pointer;
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  width: 100px;
+  background-color: red;
+  color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
 }
 </style>
diff --git a/utils/request.js b/utils/request.js
index 00ac548e..1147abf9 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -3,9 +3,6 @@ import {
 	refreshTokenFn
 } from "@/api/login.js";
 import storage from "@/utils/storage.js";
-import {
-	logout
-} from '@/api/login';
 import {
 	md5
 } from "@/utils/md5.js";
@@ -149,7 +146,7 @@ http.interceptors.response.use(
 			// }
 
 			let token = storage.getAccessToken();
-
+			
 			if (
 				(token && response.statusCode === 403) ||
 				(token && response.data.status === 403)
@@ -208,30 +205,28 @@ http.interceptors.response.use(
 				(response.statusCode == 200 && !response.data.success) ||
 				response.statusCode == 400
 			) {
-				if (response.data.message) {
-					if (response.data.code == 408) {
-						uni.showModal({
-							title: '提示',
-							content: response.data.message,
-							showCancel: false,
-							success() {
-								logout().then(() => {
-									cleanStorage();
-								});
-							}
-						})
-						uni.showToast({
-							title: response.data.message,
-							icon: "none",
-							duration: 1500,
-						});
-					} else {
-						uni.showToast({
-							title: response.data.message,
-							icon: "none",
-							duration: 1500,
-						});
-					}
+				if (response.data.code == 408) {
+					uni.showModal({
+						title: '提示',
+						content: response.data.message,
+						showCancel: false,
+						success() {
+							logout().then(() => {
+								cleanStorage();
+							});
+						}
+					})
+					uni.showToast({
+						title: response.data.message,
+						icon: "none",
+						duration: 1500,
+					});
+				} else {
+					uni.showToast({
+						title: response.data.message,
+						icon: "none",
+						duration: 1500,
+					});
 				}
 			} else if (response.data.code == 502) {
 				cleanStorage();