diff --git a/App.vue b/App.vue
index f23398d7..2d21a918 100644
--- a/App.vue
+++ b/App.vue
@@ -11,8 +11,14 @@ import provinceList from './json/area_province.js';
 import cityList from './json/area_city.js';
 import districtList from './json/area_district.js';
 import storage from '@/utils/storage.js'; //缓存
-
+//初始化im
+import { TUIChatKit } from '@/TUIKit';
+import { loginIm } from '@/utils/handleim.js';
 export default {
+	// 全局属性
+	globalData: {
+		chat: null
+	},
 	data() {
 		return {
 			config
@@ -56,6 +62,14 @@ export default {
 		plus.globalEvent.addEventListener('newintent', (e) => {
 			this.checkArguments(); // 检测启动参数
 		});
+		// init im
+		var ddd = TUIChatKit.init();
+		console.log('dasjdlasjdlajsldjaslkdjasljdklasdljasldadjaldjlkasdlkasjdalsdjl', ddd);
+		// 如果有缓存登录信息
+		console.log('是否登录', storage.getHasLogin());
+		if (storage.getHasLogin()) {
+			loginIm();
+		}
 		// #endif
 
 		// #ifdef MP-WEIXIN
diff --git a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue
index 35d48915..3418ff4a 100644
--- a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue
+++ b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue
@@ -1,85 +1,103 @@
 <template>
-  <div class="custom">
-    <template v-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.SERVICE">
-      <div>
-        <h1>
-          <label>{{ extension.title }}</label>
-          <a
-            v-if="extension.hyperlinks_text"
-            :href="extension.hyperlinks_text.value"
-            target="view_window"
-          >{{ extension.hyperlinks_text.key }}</a>
-        </h1>
-        <ul v-if="extension.item && extension.item.length > 0">
-          <li
-            v-for="(item, index) in extension.item"
-            :key="index"
-          >
-            <a
-              v-if="isUrl(item.value)"
-              :href="item.value"
-              target="view_window"
-            >{{ item.key }}</a>
-            <p v-else>
-              {{ item.key }}
-            </p>
-          </li>
-        </ul>
-        <article>{{ extension.description }}</article>
-      </div>
-    </template>
-    <template v-else-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.EVALUATE">
-      <div class="evaluate">
-        <h1>{{ TUITranslateService.t("message.custom.对本次服务评价") }}</h1>
-        <ul class="evaluate-list">
-          <li
-            v-for="(item, index) in Math.max(customData.score, 0)"
-            :key="index"
-            class="evaluate-list-item"
-          >
-            <Icon
-              :file="star"
-              class="file-icon"
-            />
-          </li>
-        </ul>
-        <article>{{ customData.comment }}</article>
-      </div>
-    </template>
-    <template v-else-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.ORDER">
-      <div
-        class="order"
-        @click="openLink(customData.link)"
-      >
-        <img
-          :src="customData.imageUrl"
-        >
-        <main>
-          <h1>{{ customData.title }}</h1>
-          <p>{{ customData.description }}</p>
-          <span>{{ customData.price }}</span>
-        </main>
-      </div>
-    </template>
-    <template v-else-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.LINK">
-      <div class="textLink">
-        <p>{{ customData.text }}</p>
-        <a
-          :href="customData.link"
-          target="view_window"
-        >{{
-          TUITranslateService.t("message.custom.查看详情>>")
-        }}</a>
-      </div>
-    </template>
-    <template v-else>
-      <span v-html="content.custom" />
-    </template>
-  </div>
+	<div class="custom">
+		<template v-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.SERVICE">
+			<div>
+				<h1>
+					<label>{{ extension.title }}</label>
+					<a
+						v-if="extension.hyperlinks_text"
+						:href="extension.hyperlinks_text.value"
+						target="view_window"
+					>
+						{{ extension.hyperlinks_text.key }}
+					</a>
+				</h1>
+				<ul v-if="extension.item && extension.item.length > 0">
+					<li
+						v-for="(item, index) in extension.item"
+						:key="index"
+					>
+						<a
+							v-if="isUrl(item.value)"
+							:href="item.value"
+							target="view_window"
+						>
+							{{ item.key }}
+						</a>
+						<p v-else>
+							{{ item.key }}
+						</p>
+					</li>
+				</ul>
+				<article>{{ extension.description }}</article>
+			</div>
+		</template>
+		<template v-else-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.EVALUATE">
+			<div class="evaluate">
+				<h1>{{ TUITranslateService.t('message.custom.对本次服务评价') }}</h1>
+				<ul class="evaluate-list">
+					<li
+						v-for="(item, index) in Math.max(customData.score, 0)"
+						:key="index"
+						class="evaluate-list-item"
+					>
+						<Icon
+							:file="star"
+							class="file-icon"
+						/>
+					</li>
+				</ul>
+				<article>{{ customData.comment }}</article>
+			</div>
+		</template>
+		<!-- 自定义视频消息 -->
+		<template v-else-if="customData.businessID === 'video'">
+			<div
+				class="order"
+				@click="openRouter(customData.link)"
+			>
+				<img :src="customData.imageUrl" />
+				<main>
+					<h1>{{ customData.title }}</h1>
+					<p>{{ customData.description }}</p>
+					<span>{{ customData.price }}</span>
+				</main>
+			</div>
+		</template>
+
+		<template v-else-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.ORDER">
+			<div
+				class="order"
+				@click="openLink(customData.link)"
+			>
+				<img :src="customData.imageUrl" />
+				<main>
+					<h1>{{ customData.title }}</h1>
+					<p>{{ customData.description }}</p>
+					<span>{{ customData.price }}</span>
+				</main>
+			</div>
+		</template>
+		<template v-else-if="customData.businessID === CHAT_MSG_CUSTOM_TYPE.LINK">
+			<div class="textLink">
+				<p>{{ customData.text }}</p>
+				<a
+					:href="customData.link"
+					target="view_window"
+				>
+					{{ TUITranslateService.t('message.custom.查看详情>>') }}
+				</a>
+			</div>
+		</template>
+		<template v-else>
+			<span v-html="content.custom" />
+		</template>
+	</div>
 </template>
 
 <script lang="ts" setup>
 import { watchEffect, ref } from '../../../../adapter-vue';
+import { TUIGlobal } from '@tencentcloud/universal-api';
 import { TUITranslateService, IMessageModel } from '@tencentcloud/chat-uikit-engine';
 import { isUrl, JSONToObject } from '../../../../utils/index';
 import { CHAT_MSG_CUSTOM_TYPE } from '../../../../constant';
@@ -87,101 +105,106 @@ import { ICustomMessagePayload } from '../../../../interface';
 import Icon from '../../../common/Icon.vue';
 import star from '../../../../assets/icon/star-light.png';
 interface Props {
-  messageItem: IMessageModel;
-  content: any;
+	messageItem: IMessageModel;
+	content: any;
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  messageItem: undefined,
-  content: undefined,
+	messageItem: undefined,
+	content: undefined
 });
 
 const custom = ref();
 const message = ref<IMessageModel>();
 const extension = ref();
 const customData = ref<ICustomMessagePayload>({
-  businessID: '',
+	businessID: ''
 });
 
 watchEffect(() => {
-  custom.value = props.content;
-  message.value = props.messageItem;
-  const { payload } = props.messageItem;
-  customData.value = payload.data || '';
-  customData.value = JSONToObject(payload.data);
-  if (payload.data === CHAT_MSG_CUSTOM_TYPE.SERVICE) {
-    extension.value = JSONToObject(payload.extension);
-  }
+	custom.value = props.content;
+	message.value = props.messageItem;
+	const { payload } = props.messageItem;
+	customData.value = payload.data || '';
+	customData.value = JSONToObject(payload.data);
+	if (payload.data === CHAT_MSG_CUSTOM_TYPE.SERVICE) {
+		extension.value = JSONToObject(payload.extension);
+	}
 });
 const openLink = (url: any) => {
-  window.open(url);
+	window.open(url);
+};
+const openRouter = (url: any) => {
+	TUIGlobal.navigateTo({
+		url
+	});
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../../assets/styles/common";
+@import '../../../../assets/styles/common';
 
 a {
-  color: #679ce1;
+	color: #679ce1;
 }
 
 .custom {
-  font-size: 14px;
+	font-size: 14px;
 
-  h1 {
-    font-size: 14px;
-    color: #000;
-  }
+	h1 {
+		font-size: 14px;
+		color: #000;
+	}
 
-  h1,
-  a,
-  p {
-    font-size: 14px;
-  }
+	h1,
+	a,
+	p {
+		font-size: 14px;
+	}
 
-  .evaluate {
-    ul {
-      display: flex;
-      padding: 10px 0;
-    }
+	.evaluate {
+		ul {
+			display: flex;
+			padding: 10px 0;
+		}
 
-    &-list {
-      display: flex;
-      flex-direction: row;
+		&-list {
+			display: flex;
+			flex-direction: row;
 
-      &-item {
-        padding: 0 2px;
-      }
-    }
-  }
+			&-item {
+				padding: 0 2px;
+			}
+		}
+	}
 
-  .order {
-    display: flex;
+	.order {
+		display: flex;
 
-    main {
-      padding-left: 5px;
+		main {
+			padding-left: 5px;
 
-      p {
-        font-family: PingFangSC-Regular;
-        width: 145px;
-        line-height: 17px;
-        font-size: 14px;
-        color: #999;
-        letter-spacing: 0;
-        margin-bottom: 6px;
-        word-break: break-word;
-      }
+			p {
+				font-family: PingFangSC-Regular;
+				width: 145px;
+				line-height: 17px;
+				font-size: 14px;
+				color: #999;
+				letter-spacing: 0;
+				margin-bottom: 6px;
+				word-break: break-word;
+			}
 
-      span {
-        font-family: PingFangSC-Regular;
-        line-height: 25px;
-        color: #ff7201;
-      }
-    }
+			span {
+				font-family: PingFangSC-Regular;
+				line-height: 25px;
+				color: #ff7201;
+			}
+		}
 
-    img {
-      width: 67px;
-      height: 67px;
-    }
-  }
+		img {
+			width: 67px;
+			height: 67px;
+		}
+	}
 }
 </style>
diff --git a/TUIKit/components/TUIConversation/conversation-list/index.vue b/TUIKit/components/TUIConversation/conversation-list/index.vue
index c3b5db28..fcdc0cbc 100644
--- a/TUIKit/components/TUIConversation/conversation-list/index.vue
+++ b/TUIKit/components/TUIConversation/conversation-list/index.vue
@@ -1,123 +1,108 @@
 <template>
-  <div
-    ref="conversationListInnerDomRef"
-    class="tui-conversation-list"
-  >
-    <ActionsMenu
-      v-if="isShowOverlay"
-      :selectedConversation="currentConversation"
-      :actionsMenuPosition="actionsMenuPosition"
-      :selectedConversationDomRect="currentConversationDomRect"
-      @closeConversationActionMenu="closeConversationActionMenu"
-    />
-    <div
-      v-for="(conversation, index) in conversationList"
-      :id="`convlistitem-${index}`"
-      :key="index"
-      :class="[
-        'tui-conversation-content',
-        isMobile && 'tui-conversation-content-h5 disable-select',
-      ]"
-    >
-      <div
-        :class="[
-          isPC && 'isPC',
-          'tui-conversation-item',
-          currentConversationID === conversation.conversationID &&
-            'tui-conversation-item-selected',
-          conversation.isPinned && 'tui-conversation-item-pinned',
-        ]"
-        @click="enterConversationChat(conversation.conversationID)"
-        @longpress="showConversationActionMenu($event, conversation, index)"
-        @contextmenu="showConversationActionMenu($event, conversation, index, true)"
-      >
-        <aside class="left">
-          <Avatar
-            useSkeletonAnimation
-            :url="conversation.getAvatar()"
-            size="30px"
-          />
-          <div
-            v-if="userOnlineStatusMap && isShowUserOnlineStatus(conversation)"
-            :class="[
-              'online-status',
-              Object.keys(userOnlineStatusMap).length > 0 &&
-                Object.keys(userOnlineStatusMap).includes(
-                  conversation.userProfile.userID
-                ) &&
-                userOnlineStatusMap[conversation.userProfile.userID]
-                  .statusType === 1
-                ? 'online-status-online'
-                : 'online-status-offline',
-            ]"
-          />
-          <span
-            v-if="conversation.unreadCount > 0 && !conversation.isMuted"
-            class="num"
-          >
-            {{
-              conversation.unreadCount > 99 ? "99+" : conversation.unreadCount
-            }}
-          </span>
-          <span
-            v-if="conversation.unreadCount > 0 && conversation.isMuted"
-            class="num-notify"
-          />
-        </aside>
-        <div class="content">
-          <div class="content-header">
-            <label class="content-header-label">
-              <p class="name">{{ conversation.getShowName() }}</p>
-            </label>
-            <div class="middle-box">
-              <span
-                v-if="conversation.draftText && conversation.conversationID !== currentConversationID"
-                class="middle-box-draft"
-              >{{ TUITranslateService.t('TUIChat.[草稿]') }}</span>
-              <span
-                v-else-if="
-                  conversation.type === 'GROUP' &&
-                    conversation.groupAtInfoList &&
-                    conversation.groupAtInfoList.length > 0
-                "
-                class="middle-box-at"
-              >{{ conversation.getGroupAtInfo() }}</span>
-              <div class="middle-box-content">
-                {{ conversation.getLastMessage("text") }}
-              </div>
-            </div>
-          </div>
-          <div class="content-footer">
-            <span class="time">{{ conversation.getLastMessage("time") }}</span>
-            <Icon
-              v-if="conversation.isMuted"
-              :file="muteIcon"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+	<div
+		ref="conversationListInnerDomRef"
+		class="tui-conversation-list"
+	>
+		<ActionsMenu
+			v-if="isShowOverlay"
+			:selectedConversation="currentConversation"
+			:actionsMenuPosition="actionsMenuPosition"
+			:selectedConversationDomRect="currentConversationDomRect"
+			@closeConversationActionMenu="closeConversationActionMenu"
+		/>
+		<div
+			v-for="(conversation, index) in conversationList"
+			:id="`convlistitem-${index}`"
+			:key="index"
+			:class="['tui-conversation-content', isMobile && 'tui-conversation-content-h5 disable-select']"
+		>
+			<div
+				:class="[
+					isPC && 'isPC',
+					'tui-conversation-item',
+					currentConversationID === conversation.conversationID && 'tui-conversation-item-selected',
+					conversation.isPinned && 'tui-conversation-item-pinned'
+				]"
+				@click="enterConversationChat(conversation.conversationID)"
+				@longpress="showConversationActionMenu($event, conversation, index)"
+				@contextmenu="showConversationActionMenu($event, conversation, index, true)"
+			>
+				<aside class="left">
+					<Avatar
+						useSkeletonAnimation
+						:url="conversation.getAvatar()"
+						size="30px"
+					/>
+					<div
+						v-if="userOnlineStatusMap && isShowUserOnlineStatus(conversation)"
+						:class="[
+							'online-status',
+							Object.keys(userOnlineStatusMap).length > 0 &&
+							Object.keys(userOnlineStatusMap).includes(conversation.userProfile.userID) &&
+							userOnlineStatusMap[conversation.userProfile.userID].statusType === 1
+								? 'online-status-online'
+								: 'online-status-offline'
+						]"
+					/>
+					<span
+						v-if="conversation.unreadCount > 0 && !conversation.isMuted"
+						class="num"
+					>
+						{{ conversation.unreadCount > 99 ? '99+' : conversation.unreadCount }}
+					</span>
+					<span
+						v-if="conversation.unreadCount > 0 && conversation.isMuted"
+						class="num-notify"
+					/>
+				</aside>
+				<div class="content">
+					<div class="content-header">
+						<label class="content-header-label">
+							<p class="name">{{ conversation.getShowName() }}</p>
+						</label>
+						<div class="middle-box">
+							<span
+								v-if="conversation.draftText && conversation.conversationID !== currentConversationID"
+								class="middle-box-draft"
+							>
+								{{ TUITranslateService.t('TUIChat.[草稿]') }}
+							</span>
+							<span
+								v-else-if="conversation.type === 'GROUP' && conversation.groupAtInfoList && conversation.groupAtInfoList.length > 0"
+								class="middle-box-at"
+							>
+								{{ conversation.getGroupAtInfo() }}
+							</span>
+							<div class="middle-box-content">
+								{{ conversation.getLastMessage('text') }}
+							</div>
+						</div>
+					</div>
+					<div class="content-footer">
+						<span class="time">{{ conversation.getLastMessage('time') }}</span>
+						<Icon
+							v-if="conversation.isMuted"
+							:file="muteIcon"
+						/>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
 interface IUserStatus {
-  statusType: number;
-  customStatus: string;
+	statusType: number;
+	customStatus: string;
 }
 
 interface IUserStatusMap {
-  [userID: string]: IUserStatus;
+	[userID: string]: IUserStatus;
 }
 
 import { ref, onMounted, onUnmounted } from '../../../adapter-vue';
-import TUIChatEngine, {
-  TUIStore,
-  StoreName,
-  TUIConversationService,
-  TUITranslateService,
-  IConversationModel,
-} from '@tencentcloud/chat-uikit-engine';
+import TUIChatEngine, { TUIStore, StoreName, TUIConversationService, TUITranslateService, IConversationModel } from '@tencentcloud/chat-uikit-engine';
 import { TUIGlobal, isIOS, addLongPressListener } from '@tencentcloud/universal-api';
 import Icon from '../../common/Icon.vue';
 import Avatar from '../../common/Avatar/index.vue';
@@ -134,13 +119,13 @@ const conversationList = ref<IConversationModel[]>([]);
 const conversationListDomRef = ref<HTMLElement | undefined>();
 const conversationListInnerDomRef = ref<HTMLElement | undefined>();
 const actionsMenuPosition = ref<{
-  top: number;
-  left: number | undefined;
-  conversationHeight: number | undefined;
+	top: number;
+	left: number | undefined;
+	conversationHeight: number | undefined;
 }>({
-  top: 0,
-  left: undefined,
-  conversationHeight: undefined,
+	top: 0,
+	left: undefined,
+	conversationHeight: undefined
 });
 const displayOnlineStatus = ref(false);
 const userOnlineStatusMap = ref<IUserStatusMap>();
@@ -148,151 +133,141 @@ const userOnlineStatusMap = ref<IUserStatusMap>();
 let lastestOpenActionsMenuTime: number | null = null;
 
 onMounted(() => {
-  console.log(conversationList)
-  TUIStore.watch(StoreName.CONV, {
-    currentConversationID: onCurrentConversationIDUpdated,
-    conversationList: onConversationListUpdated,
-    currentConversation: onCurrentConversationUpdated,
-  });
+	TUIStore.watch(StoreName.CONV, {
+		currentConversationID: onCurrentConversationIDUpdated,
+		conversationList: onConversationListUpdated,
+		currentConversation: onCurrentConversationUpdated
+	});
 
-  TUIStore.watch(StoreName.USER, {
-    displayOnlineStatus: onDisplayOnlineStatusUpdated,
-    userStatusList: onUserStatusListUpdated,
-  });
+	TUIStore.watch(StoreName.USER, {
+		displayOnlineStatus: onDisplayOnlineStatusUpdated,
+		userStatusList: onUserStatusListUpdated
+	});
 
-  if (!isUniFrameWork && isIOS && !isPC) {
-    addLongPressHandler();
-  }
+	if (!isUniFrameWork && isIOS && !isPC) {
+		addLongPressHandler();
+	}
 });
 
 onUnmounted(() => {
-  TUIStore.unwatch(StoreName.CONV, {
-    currentConversationID: onCurrentConversationIDUpdated,
-    conversationList: onConversationListUpdated,
-    currentConversation: onCurrentConversationUpdated,
-  });
+	TUIStore.unwatch(StoreName.CONV, {
+		currentConversationID: onCurrentConversationIDUpdated,
+		conversationList: onConversationListUpdated,
+		currentConversation: onCurrentConversationUpdated
+	});
 
-  TUIStore.unwatch(StoreName.USER, {
-    displayOnlineStatus: onDisplayOnlineStatusUpdated,
-    userStatusList: onUserStatusListUpdated,
-  });
+	TUIStore.unwatch(StoreName.USER, {
+		displayOnlineStatus: onDisplayOnlineStatusUpdated,
+		userStatusList: onUserStatusListUpdated
+	});
 });
 
 const isShowUserOnlineStatus = (conversation: IConversationModel): boolean => {
-  return (
-    displayOnlineStatus.value
-    && conversation.type === TUIChatEngine.TYPES.CONV_C2C
-  );
+	return displayOnlineStatus.value && conversation.type === TUIChatEngine.TYPES.CONV_C2C;
 };
 
-const showConversationActionMenu = (
-  event: Event,
-  conversation: IConversationModel,
-  index: number,
-  isContextMenuEvent?: boolean,
-) => {
-  if (isContextMenuEvent) {
-    event.preventDefault();
-    if (isUniFrameWork) {
-      return;
-    }
-  }
-  currentConversation.value = conversation;
-  lastestOpenActionsMenuTime = Date.now();
-  getActionsMenuPosition(event, index);
+const showConversationActionMenu = (event: Event, conversation: IConversationModel, index: number, isContextMenuEvent?: boolean) => {
+	if (isContextMenuEvent) {
+		event.preventDefault();
+		if (isUniFrameWork) {
+			return;
+		}
+	}
+	currentConversation.value = conversation;
+	lastestOpenActionsMenuTime = Date.now();
+	getActionsMenuPosition(event, index);
 };
 
 const closeConversationActionMenu = () => {
-  // Prevent continuous triggering of overlay tap events
-  if (
-    lastestOpenActionsMenuTime
-    && Date.now() - lastestOpenActionsMenuTime > 300
-  ) {
-    currentConversation.value = undefined;
-    isShowOverlay.value = false;
-  }
+	// Prevent continuous triggering of overlay tap events
+	if (lastestOpenActionsMenuTime && Date.now() - lastestOpenActionsMenuTime > 300) {
+		currentConversation.value = undefined;
+		isShowOverlay.value = false;
+	}
 };
 
 const getActionsMenuPosition = (event: Event, index: number) => {
-  if (isUniFrameWork) {
-    if (typeof conversationListDomRef.value === 'undefined') {
-      emits('getPassingRef', conversationListDomRef);
-    }
-    const query = TUIGlobal?.createSelectorQuery().in(conversationListDomRef.value);
-    query.select(`#convlistitem-${index}`).boundingClientRect((data) => {
-      if (data) {
-        actionsMenuPosition.value = {
-          // The uni-page-head of uni-h5 is not considered a member of the viewport, so the height of the head is manually increased.
-          top: data.bottom + (isH5 ? 44 : 0),
-          // @ts-expect-error in uniapp event has touches property
-          left: event.touches[0].pageX,
-          conversationHeight: data.height,
-        };
-        isShowOverlay.value = true;
-      }
-    }).exec();
-  } else {
-    const rect = ((event.currentTarget || event.target) as HTMLElement)?.getBoundingClientRect() || {};
-    if (rect) {
-      actionsMenuPosition.value = {
-        top: rect.bottom,
-        left: isPC ? (event as MouseEvent).clientX : undefined,
-        conversationHeight: rect.height,
-      };
-    }
-    isShowOverlay.value = true;
-  }
+	if (isUniFrameWork) {
+		if (typeof conversationListDomRef.value === 'undefined') {
+			emits('getPassingRef', conversationListDomRef);
+		}
+		const query = TUIGlobal?.createSelectorQuery().in(conversationListDomRef.value);
+		query
+			.select(`#convlistitem-${index}`)
+			.boundingClientRect((data) => {
+				if (data) {
+					actionsMenuPosition.value = {
+						// The uni-page-head of uni-h5 is not considered a member of the viewport, so the height of the head is manually increased.
+						top: data.bottom + (isH5 ? 44 : 0),
+						// @ts-expect-error in uniapp event has touches property
+						left: event.touches[0].pageX,
+						conversationHeight: data.height
+					};
+					isShowOverlay.value = true;
+				}
+			})
+			.exec();
+	} else {
+		const rect = ((event.currentTarget || event.target) as HTMLElement)?.getBoundingClientRect() || {};
+		if (rect) {
+			actionsMenuPosition.value = {
+				top: rect.bottom,
+				left: isPC ? (event as MouseEvent).clientX : undefined,
+				conversationHeight: rect.height
+			};
+		}
+		isShowOverlay.value = true;
+	}
 };
 
 const enterConversationChat = (conversationID: string) => {
-  emits('handleSwitchConversation', conversationID);
-  TUIConversationService.switchConversation(conversationID);
+	emits('handleSwitchConversation', conversationID);
+	TUIConversationService.switchConversation(conversationID);
 };
 
 function addLongPressHandler() {
-  if (!conversationListInnerDomRef.value) {
-    return;
-  }
-  addLongPressListener({
-    element: conversationListInnerDomRef.value,
-    onLongPress: (event, target) => {
-      const index = (Array.from(conversationListInnerDomRef.value!.children) as HTMLElement[]).indexOf(target!);
-      showConversationActionMenu(event, conversationList.value[index], index);
-    },
-    options: {
-      eventDelegation: {
-        subSelector: '.tui-conversation-content',
-      },
-    },
-  });
+	if (!conversationListInnerDomRef.value) {
+		return;
+	}
+	addLongPressListener({
+		element: conversationListInnerDomRef.value,
+		onLongPress: (event, target) => {
+			const index = (Array.from(conversationListInnerDomRef.value!.children) as HTMLElement[]).indexOf(target!);
+			showConversationActionMenu(event, conversationList.value[index], index);
+		},
+		options: {
+			eventDelegation: {
+				subSelector: '.tui-conversation-content'
+			}
+		}
+	});
 }
 
 function onCurrentConversationUpdated(conversation: IConversationModel) {
-  currentConversation.value = conversation;
+	currentConversation.value = conversation;
 }
 
 function onConversationListUpdated(list: IConversationModel[]) {
-  conversationList.value = list;
+	conversationList.value = list;
+	console.log('会话列表数据', conversationList.value);
+	console.log('Conversation实例:', TUIStore);
 }
 
 function onCurrentConversationIDUpdated(id: string) {
-  currentConversationID.value = id;
+	currentConversationID.value = id;
 }
 
 function onDisplayOnlineStatusUpdated(status: boolean) {
-  displayOnlineStatus.value = status;
+	displayOnlineStatus.value = status;
 }
 
 function onUserStatusListUpdated(list: Map<string, IUserStatus>) {
-  if (list.size !== 0) {
-    userOnlineStatusMap.value = [...list.entries()].reduce(
-      (obj, [key, value]) => {
-        obj[key] = value;
-        return obj;
-      },
-      {} as IUserStatusMap,
-    );
-  }
+	if (list.size !== 0) {
+		userOnlineStatusMap.value = [...list.entries()].reduce((obj, [key, value]) => {
+			obj[key] = value;
+			return obj;
+		}, {} as IUserStatusMap);
+	}
 }
 // Expose to the parent component and close actionsMenu when a sliding event is detected
 defineExpose({ closeChildren: closeConversationActionMenu });
@@ -301,11 +276,11 @@ defineExpose({ closeChildren: closeConversationActionMenu });
 <style lang="scss" scoped src="./style/index.scss"></style>
 <style lang="scss" scoped>
 .disable-select {
-  -webkit-touch-callout:none;
-  -webkit-user-select:none;
-  -khtml-user-select:none;
-  -moz-user-select:none;
-  -ms-user-select:none;
-  user-select:none;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 </style>
diff --git a/api/checkInfo.js b/api/checkInfo.js
new file mode 100644
index 00000000..7a67999e
--- /dev/null
+++ b/api/checkInfo.js
@@ -0,0 +1,35 @@
+/**
+ * @description  文本内容审核
+ * AuditName:1600080789_1745821176_amtwGf
+ * ContentType:Text|Image|Audio|Video
+ * Content:需要审核的文本内容
+ * ExtSender:im的id，这里对应的是用户手机号
+ * ExtReceiver:接收方的信息，选填
+ */
+import {
+	http,
+	Method
+} from "@/utils/request.js";
+
+export function checkText({
+	ExtSender,
+	Content,
+}) {
+	return http.request({
+		url: 'https://console.tim.qq.com/v4/im_msg_audit/content_moderation'
+		method: Method.POST,
+		params: {
+			sdkappid: '1600080789',
+			identifier: 'administrator',
+			usersig: 'eJwtjEELgjAYhv-LroV9zi2n0CU6VBSRJV28jLbiK7SxjRxE-z1Tj*-zvDwfct6dore2JCc0AjLtNyrdeLxhj6WqsUHnrfQvOx6cekpjUJE8ngOAgFRkg9HBoNUd55zTTg3UY-1nKeOCJomIxwreu76BMnv4TcGXZTVrgMVMFm6795NQH8OateqK7CBbu7oYWJDvD4AYNPU_',
+			random: Math.floor(Math.random() * (4294967295 + 1)),
+			contenttype: 'json'
+		},
+		data: {
+			AuditName: '1600080789_1745821176_amtwGf'
+			ContentType: 'Text',
+			Content,
+			ExtSender
+		}
+	});
+}
\ No newline at end of file
diff --git a/components/vlog/guanzhu.nvue b/components/vlog/guanzhu.nvue
index 614804db..751bd9c1 100644
--- a/components/vlog/guanzhu.nvue
+++ b/components/vlog/guanzhu.nvue
@@ -192,7 +192,7 @@
 								<!-- 4.分享 -->
 								<view
 									v-if="item.isShowProgressBarTime == false"
-									@click="share"
+									@click="share(item)"
 									style="opacity: 0.9; margin-top: 17px"
 								>
 									<image
@@ -415,6 +415,7 @@
 					:thisVlogId="pinglunInfo.vlogId"
 					:vlogUrl="pinglunInfo.url"
 					:isPrivate="pinglunInfo.isPrivate"
+					:vlogItem="pinglunInfo"
 				></uni-popup-share>
 			</uni-popup>
 		</view>
@@ -984,6 +985,7 @@ export default {
 					}, 50);
 				} else {
 					this.noData = '暂无数据';
+					this.isShow1 = false;
 				}
 			} else {
 				uni.showToast({
@@ -1103,7 +1105,8 @@ export default {
 				animation: true
 			});
 		},
-		share() {
+		share(item) {
+			this.pinglunInfo = item;
 			this.$refs.share.open();
 			uni.hideTabBar({
 				animation: true
diff --git a/components/vlog/local.nvue b/components/vlog/local.nvue
index 4d53ba04..ef972bd6 100644
--- a/components/vlog/local.nvue
+++ b/components/vlog/local.nvue
@@ -192,7 +192,7 @@
 								<!-- 4.分享 -->
 								<view
 									v-if="item.isShowProgressBarTime == false"
-									@click="share"
+									@click="share(item)"
 									style="opacity: 0.9; margin-top: 17px"
 								>
 									<image
@@ -415,6 +415,7 @@
 					:thisVlogId="pinglunInfo.vlogId"
 					:vlogUrl="pinglunInfo.url"
 					:isPrivate="pinglunInfo.isPrivate"
+					:vlogItem="pinglunInfo"
 				></uni-popup-share>
 			</uni-popup>
 		</view>
@@ -985,6 +986,7 @@ export default {
 					}, 50);
 				} else {
 					this.noData = '暂无数据';
+					this.isShow1 = false;
 					return;
 				}
 			} else {
@@ -1105,7 +1107,8 @@ export default {
 				animation: true
 			});
 		},
-		share() {
+		share(item) {
+			this.pinglunInfo = item;
 			this.$refs.share.open();
 			uni.hideTabBar({
 				animation: true
diff --git a/components/vlog/tuijian.nvue b/components/vlog/tuijian.nvue
index 5c267327..6fc33b04 100644
--- a/components/vlog/tuijian.nvue
+++ b/components/vlog/tuijian.nvue
@@ -185,7 +185,7 @@
 								<!-- 4.分享 -->
 								<view
 									v-if="item.isShowProgressBarTime == false"
-									@click="share"
+									@click="share(item)"
 									style="opacity: 0.9; margin-top: 17px"
 								>
 									<image
@@ -408,6 +408,7 @@
 					:thisVlogId="pinglunInfo.vlogId"
 					:vlogUrl="pinglunInfo.url"
 					:isPrivate="pinglunInfo.isPrivate"
+					:vlogItem="pinglunInfo"
 				></uni-popup-share>
 			</uni-popup>
 		</view>
@@ -1087,7 +1088,8 @@ export default {
 				animation: true
 			});
 		},
-		share() {
+		share(item) {
+			this.pinglunInfo = item;
 			this.$refs.share.open();
 			uni.hideTabBar({
 				animation: true
diff --git a/config/api.js b/config/api.js
index 8a46559e..683b03fc 100644
--- a/config/api.js
+++ b/config/api.js
@@ -17,7 +17,7 @@ const prod = {
 	// buyer: "https://buyer-api.pickmall.cn",
 	common: "http://192.168.1.211:8890",
 	buyer: "http://192.168.1.211:8888",
-	vlog: "http://192.168.1.86:8099",
+	vlog: "http://192.168.1.211:8099",
 };
 
 //默认生产环境
diff --git a/pages/me/me.nvue b/pages/me/me.nvue
index 8982018c..9613cfca 100755
--- a/pages/me/me.nvue
+++ b/pages/me/me.nvue
@@ -270,7 +270,7 @@ export default {
 	onShow() {
 		let me = this;
 		// 判断我有没有登录
-		this.userIsLogin = filters.isLogin('auth');
+		this.userIsLogin = storage.getHasLogin();
 		console.log(this.userIsLogin);
 		if (this.userIsLogin) {
 			this.getUinfo();
@@ -280,9 +280,9 @@ export default {
 	},
 	onTabItemTap: (e) => {
 		console.log(e);
-		if (!filters.isLogin('auth')) {
+		if (!storage.getHasLogin()) {
 			uni.navigateTo({
-				url: '/pages/passport/login?init=index'
+				url: '/pages/passport/login'
 			});
 		}
 	},
diff --git a/pages/me/vlog.nvue b/pages/me/vlog.nvue
index 24d6bc86..3bf801c8 100644
--- a/pages/me/vlog.nvue
+++ b/pages/me/vlog.nvue
@@ -195,7 +195,7 @@
 								<!-- 4.分享 -->
 								<view
 									v-if="item.isShowProgressBarTime == false"
-									@click="share"
+									@click="share(item)"
 									style="opacity: 0.9; margin-top: 17px"
 								>
 									<image
@@ -418,6 +418,7 @@
 					:thisVlogId="pinglunInfo.vlogId"
 					:vlogUrl="pinglunInfo.url"
 					:isPrivate="pinglunInfo.isPrivate"
+					:vlogItem="pinglunInfo"
 				></uni-popup-share>
 			</uni-popup>
 		</view>
@@ -1123,7 +1124,8 @@ export default {
 				animation: true
 			});
 		},
-		share() {
+		share(item) {
+			this.pinglunInfo = item;
 			this.$refs.share.open();
 			uni.hideTabBar({
 				animation: true
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index f7e97d64..ac5c56f8 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -1,331 +1,374 @@
-<template>
-  <view class="person-msg">
-    <view class="head c-content" @click="changeFace">
-      <image :src="form.face || '/static/missing-face.png'" mode=""></image>
-      <view>点击修改头像</view>
-    </view>
-    <u-form :model="form" ref="uForm" class="form">
-      <u-form-item label="昵称" label-width="150">
-        <u-input
-          v-model="form.nickName"
-          placeholder="请输入昵称"
-          maxlength="10"
-        />
-      </u-form-item>
-      <u-form-item label="二维码" label-width="150">
-        <img :src="erwei" alt="" width="60" @click="showQrCodeInFullSize" />
-      </u-form-item>
-      <u-form-item label="性别" label-width="150">
-        <u-radio-group v-model="form.sex" :active-color="lightColor">
-          <u-radio name="1">男</u-radio>
-          <u-radio name="0">女</u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item label="生日" label-width="150" right-icon="arrow-right">
-        <div style="width: 100%" @click="showBirthday = true">
-          {{ birthday || "请选择出生日期" }}
-        </div>
-        <u-picker
-          v-model="showBirthday"
-          mode="time"
-          :confirm-color="lightColor"
-          @confirm="selectTime"
-        ></u-picker>
-      </u-form-item>
-
-      <u-form-item
-        label="城市"
-        label-width="150"
-        placeholder="请选择城市"
-        right-icon="arrow-right"
-      >
-        <div
-          style="
-            width: 32vh;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-          "
-          @click="clickRegion"
-        >
-          {{ form.___path || "请选择城市" }}
-        </div>
-      </u-form-item>
-    </u-form>
-    <div style="display: flex; justify-content: center"></div>
-    <div class="bottom">
-      <view class="submit" @click="submit">保存</view>
-      <view class="submit light" @click="showModalDialog">退出登录</view>
-    </div>
-    <u-modal
-      show-cancel-button
-      v-model="quitShow"
-      @confirm="confirm"
-      :confirm-color="lightColor"
-      :async-close="true"
-      :content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"
-    ></u-modal>
-    <m-city
-      :provinceData="region"
-      headTitle="区域选择"
-      ref="cityPicker"
-      @funcValue="getpickerParentValue"
-      pickerSize="4"
-    ></m-city>
-  </view>
-</template>
-<script>
-import { saveUserInfo, geterwei } from "@/api/members.js";
-import { upload } from "@/api/common.js";
-import { logout } from "@/api/login";
-import storage from "@/utils/storage.js";
-import uFormItem from "@/uview-ui/components/u-form-item/u-form-item.vue";
-import gkcity from "@/components/m-city/m-city.vue";
-export default {
-  components: {
-    uFormItem,
-    "m-city": gkcity,
-  },
-  data() {
-    return {
-      erwei: "",
-      quitShow: false,
-      userInfo: {},
-      lightColor: this.$lightColor, //高亮颜色
-      form: {
-        nickName: storage.getUserInfo().nickName || "",
-        birthday: storage.getUserInfo().birthday || "",
-        face: storage.getUserInfo().face || "/static/imlogo.png", //默认头像
-        regionId: [], //地址Id
-        region: storage.getUserInfo().region || [], //地址
-        sex: storage.getUserInfo().sex, //性别
-        ___path: storage.getUserInfo().region,
-      },
-      birthday: storage.getUserInfo().birthday || "", //生日
-      photo: [
-        {
-          text: "立即拍照",
-          color: this.$mainColor,
-        },
-        {
-          text: "从相册选择",
-          color: this.$mainColor,
-        },
-      ],
-      region: [
-        //请求城市默认地址
-        {
-          id: "",
-          localName: "请选择",
-          children: [],
-        },
-      ],
-      showBirthday: false, //显示生日日期
-    };
-  },
-  onShow() {
-    this.userInfo = this.$options.filters.isLogin();
-    this.getgeterwei();
-  },
-  methods: {
-    showQrCodeInFullSize() {
-      uni.previewImage({
-        urls: [this.erwei],
-        current: this.erwei,
-      });
-    },
-    getgeterwei() {
-      geterwei().then((res) => {
-        this.erwei = res.data.result;
-      });
-    },
-    showModalDialog() {
-      this.quitShow = true;
-    },
-    clear() {
-      storage.setAccessToken("");
-      storage.setRefreshToken("");
-      storage.setUserInfo({});
-      // 清理vlog信息
-      storage.setVlogToken("");
-      storage.setVlogUserInfo({});
-      this.$options.filters.navigateToLogin("redirectTo");
-    },
-    /**
-     * 确认退出
-     * 清除缓存重新登录
-     */
-    async confirm() {
-      await logout();
-      this.clear();
-    },
-    /**
-     * 退出登录
-     */
-    quiteLoginOut() {
-      this.$options.filters.quiteLoginOut();
-    },
-    /**
-     * 选择地址回调
-     */
-    getpickerParentValue(e) {
-      this.form.region = [];
-      this.form.regionId = [];
-      let name = "";
-
-      e.forEach((item, index) => {
-        if (item.id) {
-          this.form.region.push(item.localName);
-          this.form.regionId.push(item.id);
-          if (index == e.length - 1) {
-            name += item.localName;
-          } else {
-            name += item.localName + ",";
-          }
-          this.form.___path = name;
-        }
-      });
-    },
-
-    /**
-     * 点击选择地址
-     */
-    clickRegion() {
-      this.$refs.cityPicker.show();
-    },
-
-    /**
-     * 提交保存
-     */
-    submit() {
-      delete this.form.___path;
-      let params = JSON.parse(JSON.stringify(this.form));
-      saveUserInfo(params).then((res) => {
-        if (res.statusCode == 200) {
-          storage.setUserInfo(res.data.result);
-          uni.navigateBack();
-        }
-      });
-    },
-
-    /**
-     * 修改头像
-     */
-    changeFace(index) {
-      uni.chooseImage({
-        success: (chooseImageRes) => {
-          const tempFilePaths = chooseImageRes.tempFilePaths;
-          uni.uploadFile({
-            url: upload,
-            filePath: tempFilePaths[0],
-            name: "file",
-            header: {
-              accessToken: storage.getAccessToken(),
-            },
-            success: (uploadFileRes) => {
-              let data = JSON.parse(uploadFileRes.data);
-              this.form.face = data.result;
-            },
-          });
-        },
-      });
-    },
-
-    /**
-     * 选择地址
-     */
-    selectRegion(region) {
-      this.$set(
-        this.form,
-        "address",
-        `${region.province.label} ${region.city.label} ${region.area.label}`
-      );
-    },
-
-    /**
-     * 选择时间
-     */
-    selectTime(time) {
-      this.form.birthday = `${time.year}-${time.month}-${time.day}`;
-      this.birthday = `${time.year} - ${time.month} - ${time.day}`;
-    },
-  },
-
-  /**
-   * 加载数据
-   */
-  onLoad() {},
-};
-</script>
-
-<style lang="scss" scoped>
-.submit {
-  height: 90rpx;
-  line-height: 90rpx;
-  text-align: center;
-  margin-top: 90rpx;
-
-  width: 100%;
-  margin: 0 auto;
-  color: $main-color;
-  border-radius: 100px;
-}
-
-.head {
-  height: 260rpx;
-  color: $font-color-light;
-  font-size: $font-sm;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  line-height: 2em;
-
-  image {
-    width: 144rpx;
-    height: 144rpx;
-    border-radius: 50%;
-  }
-}
-
-/deep/ .u-form {
-  background-color: #ffffff;
-  padding: 0;
-  margin-top: 30rpx;
-
-  .u-form-item {
-    padding: 0 20rpx;
-    height: 110rpx;
-    line-height: 110rpx;
-  }
-}
-
-.form {
-  background-color: #ffffff;
-}
-.bottom {
-  position: fixed;
-  bottom: 40px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  > .submit {
-    background: $light-color;
-    background: #fe3c3c;
-    color: #fff;
-    width: 40%;
-  }
-}
-
-::v-deep {
-  .u-radio__icon-wrap--checked {
-    //  background: #FE3C3C;
-    //  border: 1px solid #FE3C3C;
-    border-color: #fe3c3c !important;
-    background-color: #fe3c3c !important;
-  }
-}
-
-.u-form-item div {
-}
-</style>
+<template>
+	<view class="person-msg">
+		<view
+			class="head c-content"
+			@click="changeFace"
+		>
+			<image
+				:src="form.face || '/static/missing-face.png'"
+				mode=""
+			></image>
+			<view>点击修改头像</view>
+		</view>
+		<u-form
+			:model="form"
+			ref="uForm"
+			class="form"
+		>
+			<u-form-item
+				label="昵称"
+				label-width="150"
+			>
+				<u-input
+					v-model="form.nickName"
+					placeholder="请输入昵称"
+					maxlength="10"
+				/>
+			</u-form-item>
+			<u-form-item
+				label="二维码"
+				label-width="150"
+			>
+				<img
+					:src="erwei"
+					alt=""
+					width="60"
+					@click="showQrCodeInFullSize"
+				/>
+			</u-form-item>
+			<u-form-item
+				label="性别"
+				label-width="150"
+			>
+				<u-radio-group
+					v-model="form.sex"
+					:active-color="lightColor"
+				>
+					<u-radio name="1">男</u-radio>
+					<u-radio name="0">女</u-radio>
+				</u-radio-group>
+			</u-form-item>
+			<u-form-item
+				label="生日"
+				label-width="150"
+				right-icon="arrow-right"
+			>
+				<div
+					style="width: 100%"
+					@click="showBirthday = true"
+				>
+					{{ birthday || '请选择出生日期' }}
+				</div>
+				<u-picker
+					v-model="showBirthday"
+					mode="time"
+					:confirm-color="lightColor"
+					@confirm="selectTime"
+				></u-picker>
+			</u-form-item>
+
+			<u-form-item
+				label="城市"
+				label-width="150"
+				placeholder="请选择城市"
+				right-icon="arrow-right"
+			>
+				<div
+					style="width: 32vh; white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
+					@click="clickRegion"
+				>
+					{{ form.___path || '请选择城市' }}
+				</div>
+			</u-form-item>
+		</u-form>
+		<div style="display: flex; justify-content: center"></div>
+		<div class="bottom">
+			<view
+				class="submit"
+				@click="submit"
+			>
+				保存
+			</view>
+			<view
+				class="submit light"
+				@click="showModalDialog"
+			>
+				退出登录
+			</view>
+		</div>
+		<u-modal
+			show-cancel-button
+			v-model="quitShow"
+			@confirm="confirm"
+			:confirm-color="lightColor"
+			:async-close="true"
+			:content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"
+		></u-modal>
+		<m-city
+			:provinceData="region"
+			headTitle="区域选择"
+			ref="cityPicker"
+			@funcValue="getpickerParentValue"
+			pickerSize="4"
+		></m-city>
+	</view>
+</template>
+<script>
+import { saveUserInfo, geterwei } from '@/api/members.js';
+import { upload } from '@/api/common.js';
+import { logout } from '@/api/login';
+import storage from '@/utils/storage.js';
+import uFormItem from '@/uview-ui/components/u-form-item/u-form-item.vue';
+import gkcity from '@/components/m-city/m-city.vue';
+import { clearIm } from '@/utils/handleim.js';
+export default {
+	components: {
+		uFormItem,
+		'm-city': gkcity
+	},
+	data() {
+		return {
+			erwei: '',
+			quitShow: false,
+			userInfo: {},
+			lightColor: this.$lightColor, //高亮颜色
+			form: {
+				nickName: storage.getUserInfo().nickName || '',
+				birthday: storage.getUserInfo().birthday || '',
+				face: storage.getUserInfo().face || '/static/imlogo.png', //默认头像
+				regionId: [], //地址Id
+				region: storage.getUserInfo().region || [], //地址
+				sex: storage.getUserInfo().sex, //性别
+				___path: storage.getUserInfo().region
+			},
+			birthday: storage.getUserInfo().birthday || '', //生日
+			photo: [
+				{
+					text: '立即拍照',
+					color: this.$mainColor
+				},
+				{
+					text: '从相册选择',
+					color: this.$mainColor
+				}
+			],
+			region: [
+				//请求城市默认地址
+				{
+					id: '',
+					localName: '请选择',
+					children: []
+				}
+			],
+			showBirthday: false //显示生日日期
+		};
+	},
+	onShow() {
+		this.userInfo = this.$options.filters.isLogin();
+		this.getgeterwei();
+	},
+	methods: {
+		showQrCodeInFullSize() {
+			uni.previewImage({
+				urls: [this.erwei],
+				current: this.erwei
+			});
+		},
+		getgeterwei() {
+			geterwei().then((res) => {
+				this.erwei = res.data.result;
+			});
+		},
+		showModalDialog() {
+			this.quitShow = true;
+		},
+		clear() {
+			storage.setRefreshVlogIndex('1'); //需要刷新
+			storage.setHasLogin(false);
+			storage.setAccessToken('');
+			storage.setRefreshToken('');
+			storage.setUuid('');
+			storage.setUserInfo({});
+			// 清理vlog信息
+			storage.setVlogToken('');
+			storage.setVlogUserInfo(null);
+			// 清除初始化数据内容
+			storage.setRefreshVlogIndex('1'); //需要刷新
+			// 退出im登录
+			clearIm();
+			this.$options.filters.navigateToLogin('redirectTo');
+		},
+		/**
+		 * 确认退出
+		 * 清除缓存重新登录
+		 */
+		async confirm() {
+			await logout();
+			this.clear();
+		},
+		/**
+		 * 退出登录
+		 */
+		quiteLoginOut() {
+			this.$options.filters.quiteLoginOut();
+		},
+		/**
+		 * 选择地址回调
+		 */
+		getpickerParentValue(e) {
+			this.form.region = [];
+			this.form.regionId = [];
+			let name = '';
+
+			e.forEach((item, index) => {
+				if (item.id) {
+					this.form.region.push(item.localName);
+					this.form.regionId.push(item.id);
+					if (index == e.length - 1) {
+						name += item.localName;
+					} else {
+						name += item.localName + ',';
+					}
+					this.form.___path = name;
+				}
+			});
+		},
+
+		/**
+		 * 点击选择地址
+		 */
+		clickRegion() {
+			this.$refs.cityPicker.show();
+		},
+
+		/**
+		 * 提交保存
+		 */
+		submit() {
+			delete this.form.___path;
+			let params = JSON.parse(JSON.stringify(this.form));
+			saveUserInfo(params).then((res) => {
+				if (res.statusCode == 200) {
+					storage.setUserInfo(res.data.result);
+					uni.navigateBack();
+				}
+			});
+		},
+
+		/**
+		 * 修改头像
+		 */
+		changeFace(index) {
+			uni.chooseImage({
+				success: (chooseImageRes) => {
+					const tempFilePaths = chooseImageRes.tempFilePaths;
+					uni.uploadFile({
+						url: upload,
+						filePath: tempFilePaths[0],
+						name: 'file',
+						header: {
+							accessToken: storage.getAccessToken()
+						},
+						success: (uploadFileRes) => {
+							let data = JSON.parse(uploadFileRes.data);
+							this.form.face = data.result;
+						}
+					});
+				}
+			});
+		},
+
+		/**
+		 * 选择地址
+		 */
+		selectRegion(region) {
+			this.$set(this.form, 'address', `${region.province.label} ${region.city.label} ${region.area.label}`);
+		},
+
+		/**
+		 * 选择时间
+		 */
+		selectTime(time) {
+			this.form.birthday = `${time.year}-${time.month}-${time.day}`;
+			this.birthday = `${time.year} - ${time.month} - ${time.day}`;
+		}
+	},
+
+	/**
+	 * 加载数据
+	 */
+	onLoad() {}
+};
+</script>
+
+<style lang="scss" scoped>
+.submit {
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	margin-top: 90rpx;
+
+	width: 100%;
+	margin: 0 auto;
+	color: $main-color;
+	border-radius: 100px;
+}
+
+.head {
+	height: 260rpx;
+	color: $font-color-light;
+	font-size: $font-sm;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	line-height: 2em;
+
+	image {
+		width: 144rpx;
+		height: 144rpx;
+		border-radius: 50%;
+	}
+}
+
+/deep/ .u-form {
+	background-color: #ffffff;
+	padding: 0;
+	margin-top: 30rpx;
+
+	.u-form-item {
+		padding: 0 20rpx;
+		height: 110rpx;
+		line-height: 110rpx;
+	}
+}
+
+.form {
+	background-color: #ffffff;
+}
+.bottom {
+	position: fixed;
+	bottom: 40px;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	> .submit {
+		background: $light-color;
+		background: #fe3c3c;
+		color: #fff;
+		width: 40%;
+	}
+}
+
+::v-deep {
+	.u-radio__icon-wrap--checked {
+		//  background: #FE3C3C;
+		//  border: 1px solid #FE3C3C;
+		border-color: #fe3c3c !important;
+		background-color: #fe3c3c !important;
+	}
+}
+
+.u-form-item div {
+}
+</style>
diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index d4849097..b54d3e91 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -1,231 +1,273 @@
-<template>
-  <view class="container">
-    <view class="person" @click="checkUserInfo()">
-      <u-image width=140 height="140" shape="circle" :src="userInfo.face || '/static/missing-face.png'" mode="">
-      </u-image>
-      <view class="user-name">
-
-        {{ userInfo.id ? userInfo.nickName || '' : '暂未登录'  }}
-      </view>
-      <u-icon color="#ccc" name="arrow-right"></u-icon>
-    </view>
-    <!-- #ifdef MP-WEIXIN -->
-    <view style="height: 20rpx; width: 100%"></view>
-    <!-- #endif -->
-    <u-cell-group :border="false">
-      <!-- #ifdef APP-PLUS -->
-      <u-cell-item title="清除缓存" :value="fileSizeString" @click="clearCache"></u-cell-item>
-      <!-- #endif -->
-      <u-cell-item title="安全中心" @click="navigateTo('/pages/mine/set/securityCenter/securityCenter')"></u-cell-item>
-      <u-cell-item title="意见反馈" @click="navigateTo('/pages/mine/set/feedBack')"></u-cell-item>
-      <!-- #ifndef H5 -->
-      <!-- #endif -->
-      <u-cell-item :title="`关于我们`" @click="navigateTo('/pages/mine/set/editionIntro')"></u-cell-item>
-    </u-cell-group>
-    <view class="submit" @click="showModalDialog">{{userInfo.id ?'退出登录':'返回登录'}}</view>
-    <u-modal show-cancel-button v-model="quitShow" @confirm="confirm" :confirm-color="lightColor" :async-close="true"
-      :content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"></u-modal>
-  </view>
-</template>
-
-<script>
-import { logout } from "@/api/login";
-import storage from "@/utils/storage.js";
-import config from "@/config/config";
-export default {
-  data() {
-    return {
-      config,
-      lightColor: this.$lightColor,
-      quitShow: false,
-      isCertificate: false,
-      userInfo: {},
-      fileSizeString: "0B",
-    };
-  },
-
-  methods: {
-    navigateTo(url) {
-      if (url == "/pages/set/securityCenter/securityCenter") {
-        url += `?mobile=${this.userInfo.mobile}`;
-      }
-      uni.navigateTo({
-        url: url,
-      });
-    },
-    clear() {
-      storage.setAccessToken("");
-      storage.setRefreshToken("");
-      storage.setUserInfo({});
-	  // 清理vlog信息
-	  storage.setVlogToken("")
-	  storage.setVlogUserInfo({})
-      this.$options.filters.navigateToLogin("redirectTo");
-    },
-
-    /**
-     * 确认退出
-     * 清除缓存重新登录
-     */
-    async confirm() {
-      await logout();
-      this.clear();
-    },
-
-    /**
-     * 显示退出登录对话框
-     */
-    showModalDialog() {
-      this.quitShow = true;
-    },
-
-    /**
-     * 读取当前缓存
-     */
-    getCacheSize() {
-      //获取缓存数据
-      let that = this;
-      plus.cache.calculate(function (size) {
-        let sizeCache = parseInt(size);
-        if (sizeCache == 0) {
-          that.fileSizeString = "0B";
-        } else if (sizeCache < 1024) {
-          that.fileSizeString = sizeCache + "B";
-        } else if (sizeCache < 1048576) {
-          that.fileSizeString = (sizeCache / 1024).toFixed(2) + "KB";
-        } else if (sizeCache < 1073741824) {
-          that.fileSizeString = (sizeCache / 1048576).toFixed(2) + "MB";
-        } else {
-          that.fileSizeString = (sizeCache / 1073741824).toFixed(2) + "GB";
-        }
-      });
-    },
-
-    /**
-     * 点击用户详情
-     * 判断当前是否进入用户中心
-     */
-    checkUserInfo() {
-      if (this.$options.filters.isLogin("auth")) {
-        this.navigateTo("/pages/mine/set/personMsg");
-      } else {
-        uni.showToast({
-          title: "当前暂无用户请登录后重试",
-          duration: 2000,
-          icon: "none",
-        });
-      }
-    },
-
-    /**
-     * 清除当前设备缓存
-     */
-    clearCache() {
-      //清理缓存
-      let that = this;
-      let os = plus.os.name;
-      if (os == "Android") {
-        let main = plus.android.runtimeMainActivity();
-        let sdRoot = main.getCacheDir();
-        let files = plus.android.invoke(sdRoot, "listFiles");
-        let len = files.length;
-        for (let i = 0; i < len; i++) {
-          let filePath = "" + files[i]; // 没有找到合适的方法获取路径，这样写可以转成文件路径
-          plus.io.resolveLocalFileSystemURL(
-            filePath,
-            function (entry) {
-              if (entry.isDirectory) {
-                entry.removeRecursively(
-                  function (entry) {
-                    //递归删除其下的所有文件及子目录
-                    uni.showToast({
-                      title: "缓存清理完成",
-                      duration: 2000,
-                      icon: "none",
-                    });
-                    that.getCacheSize(); // 重新计算缓存
-                  },
-                  function (e) {}
-                );
-              } else {
-                entry.remove();
-              }
-            },
-            function (e) {
-              uni.showToast({
-                title: "文件路径读取失败",
-                duration: 2000,
-                icon: "none",
-              });
-            }
-          );
-        }
-      } else {
-        // ios
-        plus.cache.clear(function () {
-          uni.showToast({
-            title: "缓存清理完成",
-            duration: 2000,
-            icon: "none",
-          });
-          that.getCacheSize();
-        });
-      }
-    },
-  },
-  onShow() {
-    this.userInfo = this.$options.filters.isLogin();
-    // #ifdef APP-PLUS
-    this.getCacheSize();
-    // #endif
-  },
-};
-</script>
-
-<style lang='scss' scoped>
-.submit {
-  height: 90rpx;
-  line-height: 90rpx;
-  text-align: center;
-  margin-top: 90rpx;
-  background: #fff;
-  width: 100%;
-  margin: 0 auto;
-  color: $main-color;
-}
-.person {
-  height: 208rpx;
-  display: flex;
-  padding: 0 20rpx;
-  font-size: $font-base;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20rpx;
-  .user-name {
-    width: 500rpx;
-    overflow: hidden;
-
-    text-overflow: ellipsis;
-
-    white-space: nowrap;
-    margin-left: 30rpx;
-    line-height: 2em;
-    font-size: 34rpx;
-  }
-}
-.u-cell {
-  height: 110rpx;
-  /* line-height: 110rpx; */
-  padding: 0 20rpx;
-  align-items: center;
-  color: #333333;
-}
-
-/deep/ .u-cell__value {
-  color: #cccccc !important;
-}
-
-/deep/ .u-cell__right-icon-wrap {
-  color: #cccccc !important;
-}
-</style>
+<template>
+	<view class="container">
+		<view
+			class="person"
+			@click="checkUserInfo()"
+		>
+			<u-image
+				width="140"
+				height="140"
+				shape="circle"
+				:src="userInfo.face || '/static/missing-face.png'"
+				mode=""
+			></u-image>
+			<view class="user-name">
+				{{ userInfo.id ? userInfo.nickName || '' : '暂未登录' }}
+			</view>
+			<u-icon
+				color="#ccc"
+				name="arrow-right"
+			></u-icon>
+		</view>
+		<!-- #ifdef MP-WEIXIN -->
+		<view style="height: 20rpx; width: 100%"></view>
+		<!-- #endif -->
+		<u-cell-group :border="false">
+			<!-- #ifdef APP-PLUS -->
+			<u-cell-item
+				title="清除缓存"
+				:value="fileSizeString"
+				@click="clearCache"
+			></u-cell-item>
+			<!-- #endif -->
+			<u-cell-item
+				title="安全中心"
+				@click="navigateTo('/pages/mine/set/securityCenter/securityCenter')"
+			></u-cell-item>
+			<u-cell-item
+				title="意见反馈"
+				@click="navigateTo('/pages/mine/set/feedBack')"
+			></u-cell-item>
+			<!-- #ifndef H5 -->
+			<!-- #endif -->
+			<u-cell-item
+				:title="`关于我们`"
+				@click="navigateTo('/pages/mine/set/editionIntro')"
+			></u-cell-item>
+		</u-cell-group>
+		<view
+			class="submit"
+			@click="showModalDialog"
+		>
+			{{ userInfo.id ? '退出登录' : '返回登录' }}
+		</view>
+		<u-modal
+			show-cancel-button
+			v-model="quitShow"
+			@confirm="confirm"
+			:confirm-color="lightColor"
+			:async-close="true"
+			:content="userInfo.id ? '确定要退出登录么？' : '确定要返回登录么？'"
+		></u-modal>
+	</view>
+</template>
+
+<script>
+import { logout } from '@/api/login';
+import storage from '@/utils/storage.js';
+import config from '@/config/config';
+import { clearIm } from '@/utils/handleim.js';
+export default {
+	data() {
+		return {
+			config,
+			lightColor: this.$lightColor,
+			quitShow: false,
+			isCertificate: false,
+			userInfo: {},
+			fileSizeString: '0B'
+		};
+	},
+
+	methods: {
+		navigateTo(url) {
+			if (url == '/pages/set/securityCenter/securityCenter') {
+				url += `?mobile=${this.userInfo.mobile}`;
+			}
+			uni.navigateTo({
+				url: url
+			});
+		},
+		clear() {
+			storage.setRefreshVlogIndex('1'); //需要刷新
+			storage.setHasLogin(false);
+			storage.setAccessToken('');
+			storage.setRefreshToken('');
+			storage.setUuid('');
+			storage.setUserInfo({});
+			// 清理vlog信息
+			storage.setVlogToken('');
+			storage.setVlogUserInfo(null);
+			// 清除初始化数据内容
+			storage.setRefreshVlogIndex('1'); //需要刷新
+			// 退出im登录
+			clearIm();
+			this.$options.filters.navigateToLogin('redirectTo');
+		},
+
+		/**
+		 * 确认退出
+		 * 清除缓存重新登录
+		 */
+		async confirm() {
+			await logout();
+			this.clear();
+		},
+
+		/**
+		 * 显示退出登录对话框
+		 */
+		showModalDialog() {
+			this.quitShow = true;
+		},
+
+		/**
+		 * 读取当前缓存
+		 */
+		getCacheSize() {
+			//获取缓存数据
+			let that = this;
+			plus.cache.calculate(function (size) {
+				let sizeCache = parseInt(size);
+				if (sizeCache == 0) {
+					that.fileSizeString = '0B';
+				} else if (sizeCache < 1024) {
+					that.fileSizeString = sizeCache + 'B';
+				} else if (sizeCache < 1048576) {
+					that.fileSizeString = (sizeCache / 1024).toFixed(2) + 'KB';
+				} else if (sizeCache < 1073741824) {
+					that.fileSizeString = (sizeCache / 1048576).toFixed(2) + 'MB';
+				} else {
+					that.fileSizeString = (sizeCache / 1073741824).toFixed(2) + 'GB';
+				}
+			});
+		},
+
+		/**
+		 * 点击用户详情
+		 * 判断当前是否进入用户中心
+		 */
+		checkUserInfo() {
+			if (this.$options.filters.isLogin('auth')) {
+				this.navigateTo('/pages/mine/set/personMsg');
+			} else {
+				uni.showToast({
+					title: '当前暂无用户请登录后重试',
+					duration: 2000,
+					icon: 'none'
+				});
+			}
+		},
+
+		/**
+		 * 清除当前设备缓存
+		 */
+		clearCache() {
+			//清理缓存
+			let that = this;
+			let os = plus.os.name;
+			if (os == 'Android') {
+				let main = plus.android.runtimeMainActivity();
+				let sdRoot = main.getCacheDir();
+				let files = plus.android.invoke(sdRoot, 'listFiles');
+				let len = files.length;
+				for (let i = 0; i < len; i++) {
+					let filePath = '' + files[i]; // 没有找到合适的方法获取路径，这样写可以转成文件路径
+					plus.io.resolveLocalFileSystemURL(
+						filePath,
+						function (entry) {
+							if (entry.isDirectory) {
+								entry.removeRecursively(
+									function (entry) {
+										//递归删除其下的所有文件及子目录
+										uni.showToast({
+											title: '缓存清理完成',
+											duration: 2000,
+											icon: 'none'
+										});
+										that.getCacheSize(); // 重新计算缓存
+									},
+									function (e) {}
+								);
+							} else {
+								entry.remove();
+							}
+						},
+						function (e) {
+							uni.showToast({
+								title: '文件路径读取失败',
+								duration: 2000,
+								icon: 'none'
+							});
+						}
+					);
+				}
+			} else {
+				// ios
+				plus.cache.clear(function () {
+					uni.showToast({
+						title: '缓存清理完成',
+						duration: 2000,
+						icon: 'none'
+					});
+					that.getCacheSize();
+				});
+			}
+		}
+	},
+	onShow() {
+		this.userInfo = this.$options.filters.isLogin();
+		// #ifdef APP-PLUS
+		this.getCacheSize();
+		// #endif
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.submit {
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	margin-top: 90rpx;
+	background: #fff;
+	width: 100%;
+	margin: 0 auto;
+	color: $main-color;
+}
+.person {
+	height: 208rpx;
+	display: flex;
+	padding: 0 20rpx;
+	font-size: $font-base;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 20rpx;
+	.user-name {
+		width: 500rpx;
+		overflow: hidden;
+
+		text-overflow: ellipsis;
+
+		white-space: nowrap;
+		margin-left: 30rpx;
+		line-height: 2em;
+		font-size: 34rpx;
+	}
+}
+.u-cell {
+	height: 110rpx;
+	/* line-height: 110rpx; */
+	padding: 0 20rpx;
+	align-items: center;
+	color: #333333;
+}
+
+/deep/ .u-cell__value {
+	color: #cccccc !important;
+}
+
+/deep/ .u-cell__right-icon-wrap {
+	color: #cccccc !important;
+}
+</style>
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 361d2f6c..f8889b50 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -1,790 +1,803 @@
-<template>
-  <div class="wrapper">
-    <div v-if="!wechatLogin">
-      <!-- <u-navbar :is-back="true" :border-bottom="false" :custom-back="customback"></u-navbar> -->
-      <div class="imgage">
-        <div>便捷生活畅玩无终街</div>
-        <!-- <div class="title">{{ loginTitleWay[current].title }}</div>
-				<div :class="current == 1 ? 'desc-light' : 'desc'">
-					{{ loginTitleWay[current].desc
-          }}<span v-if="current == 1">{{ mobile | secrecyMobile }}</span>
-				</div> -->
-      </div>
-      <!-- 手机号 -->
-      <div v-show="current == 0" style="padding: 0px 40px">
-        <u-input
-          :custom-style="inputStyle"
-          :placeholder-style="placeholderStyle"
-          placeholder="请输入手机号 (11位)"
-          class="mobile"
-          focus
-          v-model="mobile"
-          type="number"
-          maxlength="11"
-        />
-        <div
-          :class="!enabuleFetchCode ? 'disable' : 'fetch'"
-          @click="fetchCode"
-          class="btn"
-        >
-          获取验证码
-        </div>
-        <div class="flex">
-          <u-checkbox-group :icon-size="24" width="45rpx">
-            <u-checkbox
-              shape="circle"
-              v-model="enabulePrivacy"
-              active-color="#FF5E00"
-            ></u-checkbox>
-          </u-checkbox-group>
-          <div class="tips">
-            未注册的手机号验证后将自动创建用户账号，登录即代表您已同意<span
-              @click="navigateToPrivacy('privacy')"
-              >《使用条款及隐私协议》</span
-            >
-          </div>
-        </div>
-      </div>
-      <!-- 输入验证码 -->
-      <div v-show="current == 1" class="box-code">
-        <verifyCode
-          type="bottom"
-          @confirm="submit"
-          boxActiveColor="#D8D8D8"
-          v-model="code"
-          isFocus
-          boxNormalColor="#D8D8D8"
-          cursorColor="#D8D8D8"
-        />
-
-        <div class="fetch-btn">
-          <u-verification-code
-            change-text="验证码已发送（x）"
-            end-text="重新获取验证码"
-            unique-key="page-login"
-            :seconds="seconds"
-            @end="end"
-            @start="start"
-            ref="uCode"
-            @change="codeChange"
-          ></u-verification-code>
-          <span @tap="fetchCode" :style="{ color: codeColor }">
-            {{ tips }}</span
-          >
-        </div>
-      </div>
-
-      <!-- 循环出当前可使用的第三方登录模式 -->
-      <!-- <div class="flex login-list">
-        <div
-          v-if="item.code"
-          :style="{ background: item.color }"
-          class="login-item"
-          v-for="(item, index) in loginList"
-          :key="index"
-        >
-          <u-icon
-            v-if="item.title != 'APPLE'"
-            color="#fff"
-            size="42"
-            :name="item.icon"
-            @click="navigateLogin(item)"
-          >
-          </u-icon>
-          <u-image
-            v-else
-            src="/static/appleidButton@2x.png"
-            :lazy-load="false"
-            @click="navigateLogin(item)"
-            width="80"
-            height="80"
-          />
-        </div>
-      </div> -->
-      <myVerification
-        v-if="codeFlag"
-        @send="verification"
-        class="verification"
-        ref="verification"
-        business="LOGIN"
-      />
-    </div>
-    <view v-else>
-      <wechatH5Login />
-    </view>
-  </div>
-</template>
-
-<script>
-import { openIdLogin, loginCallback } from "@/api/connect.js";
-import api from "@/config/api.js";
-import { sendMobile, smsLogin } from "@/api/login";
-import myVerification from "@/components/verification/verification.vue"; //验证码模块
-import uuid from "@/utils/uuid.modified.js"; // uuid
-import verifyCode from "@/components/verify-code/verify-code";
-import { getUserInfo } from "@/api/members";
-import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
-import storage from "@/utils/storage.js"; //缓存
-import wechatH5Login from "./wechatH5Login.vue";
-import { webConnect } from "@/api/connect.js";
-export default {
-  components: {
-    myVerification,
-    verifyCode,
-    wechatH5Login,
-  },
-
-  data() {
-    return {
-      uuid,
-      wechatLogin: false, //是否加载微信公众号登录
-      flage: false, //是否验证码验证
-      codeFlag: true, //验证开关，用于是否展示验证码
-      tips: "",
-      current: 0,
-      codeColor: "#999", //按钮验证码颜色
-      lightColor: this.$lightColor,
-      seconds: 60, //默认验证码等待时间
-      loginTitleWay: [
-        {
-          title: "欢迎登录",
-          desc: "登录后更精彩，美好生活即将开始",
-        },
-        {
-          title: "请输入验证码",
-          desc: "已经发送验证码至",
-        },
-      ],
-      showBack: false,
-      enabuleFetchCode: false,
-      enabulePrivacy: false, //隐私政策
-      mobile: "", //手机号
-      code: "", //验证码
-      inputStyle: {
-        height: "104rpx",
-        "border-bottom": "1rpx solid #D8D8D8",
-        "letter-spacing": "1rpx",
-        "font-size": "40rpx",
-        "line-height": "40rpx",
-        color: "#333",
-      },
-      placeholderStyle: "font-size: 32rpx;line-height: 32rpx;color: #999999;",
-      loginList: [
-        //第三方登录集合
-        {
-          icon: "weixin-fill",
-          color: "#00a327",
-          title: "微信",
-          code: "WECHAT",
-        },
-        {
-          icon: "qq-fill",
-          color: "#38ace9",
-          title: "QQ",
-          code: "QQ",
-        },
-        {
-          icon: "apple-fill",
-          color: "#000000",
-          title: "Apple",
-          code: "APPLE",
-        },
-      ],
-      initurl: false,
-    };
-  },
-
-  onShow() {
-    //#ifdef H5
-    let isWXBrowser = /micromessenger/i.test(navigator.userAgent);
-    if (isWXBrowser) {
-      webConnect("WECHAT").then((res) => {
-        let data = res.data;
-        if (data.success) {
-          window.location = data.result;
-        }
-      });
-    }
-    //#endif
-  },
-
-  mounted() {
-    // #ifndef APP-PLUS
-    //判断是否微信浏览器
-    var ua = window.navigator.userAgent.toLowerCase();
-    if (ua.match(/MicroMessenger/i) == "micromessenger") {
-      this.wechatLogin = true;
-      return;
-    }
-    // #endif
-    /**
-     * 条件编译判断当前客户端类型
-     */
-    //#ifdef H5
-    this.clientType = "H5";
-    //#endif
-
-    //#ifdef APP-PLUS
-    this.clientType = "APP";
-    /**如果是app 加载支持的登录方式*/
-    let _this = this;
-    uni.getProvider({
-      service: "oauth",
-      success: (result) => {
-        _this.loginList = result.provider.map((value) => {
-          //展示title
-          let title = "";
-          //系统code
-          let code = "";
-          //颜色
-          let color = "#8b8b8b";
-          //图标
-          let icon = "";
-          //uni 联合登录 code
-          let appcode = "";
-          switch (value) {
-            case "weixin":
-              icon = "weixin-circle-fill";
-              color = "#00a327";
-              title = "微信";
-              code = "WECHAT";
-              break;
-            case "qq":
-              icon = "qq-circle-fill";
-              color = "#38ace9";
-              title = "QQ";
-              code = "QQ";
-              break;
-            case "apple":
-              icon = "apple-fill";
-              color = "#000000";
-              title = "Apple";
-              code = "APPLE";
-              break;
-          }
-          return {
-            title: title,
-            code: code,
-            color: color,
-            icon: icon,
-            appcode: value,
-          };
-        });
-      },
-      fail: (error) => {
-        uni.showToast({
-          title: "获取登录通道失败" + error,
-          duration: 2000,
-          icon: "none",
-        });
-      },
-    });
-    //#endif
-
-    //特殊平台，登录方式需要过滤
-    // #ifdef H5
-    this.methodFilter(["QQ"]);
-    // #endif
-
-    //微信小程序，只支持微信登录
-    // #ifdef MP-WEIXIN
-    this.methodFilter(["WECHAT"]);
-    // #endif
-  },
-  watch: {
-    current(val) {
-      val ? (this.showBack = true) : (this.showBack = false);
-    },
-    mobile: {
-      handler(val) {
-        if (val.length == 11) {
-          this.enabuleFetchCode = true;
-        }
-      },
-    },
-
-    async flage(val) {
-      if (val) {
-        if (this.$refs.uCode.canGetCode) {
-          // 向后端请求验证码
-          uni.showLoading({});
-          let res = await sendMobile(this.mobile);
-          uni.hideLoading();
-          // 这里此提示会被this.start()方法中的提示覆盖
-          if (res.data.success) {
-            this.current = 1;
-            this.$refs.uCode.start();
-          } else {
-            uni.showToast({
-              title: res.data.message,
-              duration: 2000,
-              icon: "none",
-            });
-            this.flage = false;
-          }
-        } else {
-          this.$u.toast("请倒计时结束后再发送");
-        }
-      } else {
-        this.$refs.verification.hide();
-      }
-    },
-  },
-  onLoad(options) {
-    if (options.init == "index") {
-      this.initurl = true;
-    }
-    if (options && options.state) {
-      this.stateLogin(options.state);
-    }
-  },
-  methods: {
-    customback() {
-      if (this.initurl) {
-        uni.switchTab({
-          url: "/pages/tabbar/vlog/index?init=ok",
-        });
-      } else {
-        uni.navigateBack();
-      }
-    },
-    //联合信息返回登录
-    stateLogin(state) {
-      loginCallback(state).then((res) => {
-        console.log(res);
-        let data = res.data;
-        if (data.success) {
-          storage.setAccessToken(data.result.accessToken);
-          storage.setRefreshToken(data.result.refreshToken);
-          // 登录成功
-          uni.showToast({
-            title: "登录成功!",
-            icon: "none",
-          });
-          getUserInfo().then((user) => {
-            storage.setUserInfo(user.data.result);
-            storage.setHasLogin(true);
-          });
-          getCurrentPages().length > 1
-            ? uni.navigateBack({
-                delta: getCurrentPages().length - 2,
-              })
-            : uni.switchTab({
-                url: "/pages/tabbar/home/index",
-              });
-        }
-      });
-    },
-    /** 根据参数显示登录模块 */
-    methodFilter(code) {
-      let way = [];
-      this.loginList.forEach((item) => {
-        if (code.length != 0) {
-          code.forEach((val) => {
-            if (item.code == val) {
-              way.push(item);
-            }
-          });
-        } else {
-          uni.showToast({
-            title: "配置有误请联系管理员",
-            duration: 2000,
-            icon: "none",
-          });
-        }
-      });
-      this.loginList = way;
-    },
-    //非h5 获取openid
-    async nonH5OpenId(item) {
-      let _this = this;
-      //获取各个openid
-      await uni.login({
-        provider: item.appcode,
-        // #ifdef MP-ALIPAY
-        scopes: "auth_user", //支付宝小程序需设置授权类型
-        // #endif
-        success: function (res) {
-          uni.setStorageSync("type", item.code);
-          //微信小程序意外的其它方式直接在storage中写入openid
-          // #ifndef MP-WEIXIN
-          uni.setStorageSync("openid", res.authResult.openid);
-          // #endif
-        },
-        fail(e) {
-          uni.showToast({
-            title: "第三方登录暂不可用！",
-            icon: "none",
-            duration: 3000,
-          });
-        },
-        complete(e) {
-          //获取用户信息
-          uni.getUserInfo({
-            provider: item.appcode,
-            success: function (infoRes) {
-              //写入用户信息
-              uni.setStorageSync("nickname", infoRes.userInfo.nickName);
-              uni.setStorageSync("avatar", infoRes.userInfo.avatarUrl);
-
-              // #ifdef MP-WEIXIN
-              //微信小程序获取openid 需要特殊处理 如需获取openid请参考uni-id: https://uniapp.dcloud.net.cn/uniCloud/uni-id
-              _this.weixinMPOpenID(res).then((res) => {
-                //这里需要先行获得openid，再使用openid登录，小程序登录需要两步，所以这里特殊编译
-                _this.goOpenidLogin("WECHAT_MP");
-              });
-              // #endif
-
-              // #ifndef MP-WEIXIN
-              _this.goOpenidLogin("APP");
-              //#endif
-            },
-          });
-        },
-      });
-    },
-    //openid 登录
-    goOpenidLogin(clientType) {
-      // 获取准备好的参数，进行登录系统
-      let params = {
-        uuid: uni.getStorageSync("openid"), //联合登陆id
-        source: uni.getStorageSync("type"), //联合登陆类型
-        nickname: uni.getStorageSync("nickname"), // 昵称
-        avatar: uni.getStorageSync("avatar"), // 头像
-        uniAccessToken: uni.getStorageSync("uni_access_token"), //第三方token
-      };
-      openIdLogin(params, clientType).then((res) => {
-        if (!res.data.success) {
-          let errormessage = "第三方登录暂不可用";
-          uni.showToast({
-            // title: '未绑定第三方账号',
-            title: errormessage,
-            icon: "none",
-            duration: 3000,
-          });
-          return;
-        } else {
-			var infoData = res.data.result;
-			storage.setAccessToken(infoData.accessToken);
-			storage.setRefreshToken(infoData.refreshToken);
-			const vlogInfo = JSON.parse(infoData.tikUser);
-			// 将vlog的token和vlog用户信息放入缓存
-			storage.setVlogToken(vlogInfo.userToken);
-			storage.setVlogUserInfo(vlogInfo);
-          // 登录成功
-          uni.showToast({
-            title: "第三方登录成功!",
-            icon: "none",
-          });
-          // 执行登录
-          getUserInfo().then((user) => {
-            if (user.data.success) {
-              /**
-               * 个人信息存储到缓存userInfo中
-               */
-              storage.setUserInfo(user.data.result);
-              storage.setHasLogin(true);
-
-              /**
-               * 计算出当前router路径
-               * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
-               * 2.都不满足返回跳转页面
-               */
-              whetherNavigate();
-            } else {
-              uni.switchTab({
-                url: "/pages/tabbar/home/index",
-              });
-            }
-          });
-        }
-      });
-    },
-    //微信小程序获取openid
-    async weixinMPOpenID(res) {
-      await miniProgramLogin(res.code).then((res) => {
-        uni.setStorageSync("openid", res.data);
-      });
-    },
-    /**跳转到登录页面 */
-    navigateLogin(connectLogin) {
-      // #ifdef H5
-      let code = connectLogin.code;
-      let buyer = api.buyer;
-      window.open(
-        buyer + `/passport/connect/connect/login/web/` + code,
-        "_self"
-      );
-      // #endif
-      // #ifdef APP-PLUS
-      this.nonH5OpenId(connectLogin);
-      // #endif
-    },
-
-    // 提交
-    submit() {
-      /**
-       * 清空当前账号信息
-       */
-      storage.setHasLogin(false);
-      storage.setAccessToken("");
-      storage.setRefreshToken("");
-      storage.setUserInfo({});
-      // 清理vlog信息
-      storage.setVlogToken("");
-      storage.setVlogUserInfo({});
-      /**
-       * 执行登录
-       */
-      smsLogin(
-        {
-          mobile: this.mobile,
-          code: this.code,
-        },
-        this.clientType
-      ).then((res) => {
-        // console.log(res)
-        if (res.data.success) {
-          const infoData = res.data.result;
-          const vlogInfo = JSON.parse(infoData.tikUser);
-          storage.setAccessToken(infoData.accessToken);
-          storage.setRefreshToken(infoData.refreshToken);
-          // 将vlog的token和vlog用户信息放入缓存
-          storage.setVlogToken(vlogInfo.userToken);
-          storage.setVlogUserInfo(vlogInfo);
-
-          /**
-           * 登录成功后获取个人信息
-           */
-          getUserInfo().then((user) => {
-            // console.log(user)
-            if (user.data.success) {
-              /**
-               * 个人信息存储到缓存userInfo中
-               */
-              storage.setUserInfo(user.data.result);
-              storage.setHasLogin(true);
-              // 登录成功
-              uni.showToast({
-                title: "登录成功!",
-                icon: "none",
-              });
-
-              /**
-               * 计算出当前router路径
-               * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
-               * 2.都不满足返回跳转页面
-               */
-              whetherNavigate();
-            } else {
-              uni.switchTab({
-                url: "/pages/tabbar/home/index",
-              });
-            }
-          });
-        }
-      });
-    },
-    // 验证码验证
-    verification(val) {
-      // console.log(val)
-      this.flage = val == this.$store.state.verificationKey ? true : false;
-      // console.log(this.flage)
-    },
-    // 跳转
-    navigateToPrivacy(val) {
-      uni.navigateTo({
-        url: "/pages/mine/help/tips?type=" + val,
-      });
-    },
-    // 点击获取验证码
-    start() {
-      this.codeColor = "#999";
-      this.$u.toast("验证码已发送");
-      this.flage = false;
-      this.codeFlag = false;
-
-      this.$refs.verification.hide();
-    },
-    /**点击验证码*/
-    codeChange(text) {
-      this.tips = text;
-    },
-    /** 结束验证码后执行 */
-    end() {
-      this.codeColor = this.lightColor;
-      this.codeFlag = true;
-      console.log(this.codeColor);
-    },
-    // 发送验证码
-    fetchCode() {
-      if (!this.enabulePrivacy) {
-        uni.showToast({
-          title: "请同意用户隐私",
-          duration: 2000,
-          icon: "none",
-        });
-        return false;
-      }
-
-      if (!this.$u.test.mobile(this.mobile)) {
-        uni.showToast({
-          title: "请填写正确手机号",
-          duration: 2000,
-          icon: "none",
-        });
-        return false;
-      }
-      if (this.tips == "重新获取验证码") {
-        uni.showLoading({
-          title: "加载中",
-        });
-        if (!this.codeFlag) {
-          let timer = setInterval(() => {
-            if (this.$refs.verification) {
-              this.$refs.verification.error(); //发送
-            }
-            clearInterval(timer);
-          }, 100);
-        }
-        uni.hideLoading();
-      }
-      if (!this.flage) {
-        this.$refs.verification.error(); //发送
-
-        return false;
-      }
-    },
-  },
-};
-</script>
-<style>
-page {
-  background: #fff;
-}
-</style>
-<style lang="scss" scoped>
-.wrapper {
-  // padding: 0 80rpx;
-}
-
-.title {
-  padding-top: calc(104rpx);
-  font-style: normal;
-  line-height: 1;
-  font-weight: 500;
-  font-size: 56rpx;
-  color: #333;
-}
-
-.box-code {
-  margin-top: 78rpx;
-}
-
-.desc,
-.desc-light {
-  font-size: 32rpx;
-  line-height: 32rpx;
-  color: #333333;
-  margin-top: 40rpx;
-}
-
-.desc {
-  color: #333;
-}
-
-.desc-light {
-  color: #999999;
-
-  > span {
-    color: #333;
-    margin-left: 8rpx;
-  }
-}
-
-.mobile {
-  margin-top: 80rpx;
-}
-
-.disable {
-  // background: linear-gradient(90deg, #ffdcba 2.21%, #ffcfb2 99.86%);
-  background: #FE3C3C;
-}
-
-.fetch {
-  background: #FE3C3C;
-}
-
-.btn {
-  border-radius: 100px;
-  width: 590rpx;
-  margin-top: 97rpx;
-  height: 80rpx;
-  font-size: 30rpx;
-  line-height: 80rpx;
-  text-align: center;
-  color: #ffffff;
-}
-
-.tips {
-  font-size: 12px;
-  line-height: 20px;
-  margin-top: 32rpx;
-  width: 546rpx;
-
-  > span {
-    color: $light-color;
-  }
-}
-
-.fetch-btn {
-  width: 370rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  text-align: center;
-  background: #f2f2f2;
-  border-radius: 100rpx;
-  font-size: 28rpx;
-  color: #999;
-
-  margin: 71rpx auto 0 auto;
-}
-
-.login-list {
-  display: flex;
-  width: 80%;
-  margin: 0 auto;
-  margin-top: 25vh;
-  // position: absolute;
-  // bottom: 20px;
-  align-items: center;
-  justify-content: center;
-}
-
-.login-item {
-  width: 80rpx;
-
-  border-radius: 10rpx;
-  height: 80rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  margin: 0 20rpx;
-}
-.imgage {
-  width: 100%;
-  height: 37.5vh;
-  background: url("./static/logn.png");
-  background-size: 100% 100%;
-  & > div {
-    width: 100%;
-    height: 80%;
-    display: flex;
-    justify-content: center;
-    align-items: end;
-    color: #fff;
-    font-size: 14px;
-  }
-}
-</style>
+<template>
+	<div class="wrapper">
+		<div v-if="!wechatLogin">
+			<!-- <u-navbar :is-back="true" :border-bottom="false" :custom-back="customback"></u-navbar> -->
+			<div class="imgage">
+				<div>便捷生活畅玩无终街</div>
+				<!-- <div class="title">{{ loginTitleWay[current].title }}</div>
+				<div :class="current == 1 ? 'desc-light' : 'desc'">
+					{{ loginTitleWay[current].desc
+          }}<span v-if="current == 1">{{ mobile | secrecyMobile }}</span>
+				</div> -->
+			</div>
+			<!-- 手机号 -->
+			<div
+				v-show="current == 0"
+				style="padding: 0px 40px"
+			>
+				<u-input
+					:custom-style="inputStyle"
+					:placeholder-style="placeholderStyle"
+					placeholder="请输入手机号 (11位)"
+					class="mobile"
+					focus
+					v-model="mobile"
+					type="number"
+					maxlength="11"
+				/>
+				<div
+					:class="!enabuleFetchCode ? 'disable' : 'fetch'"
+					@click="fetchCode"
+					class="btn"
+				>
+					获取验证码
+				</div>
+				<div class="flex">
+					<u-checkbox-group
+						:icon-size="24"
+						width="45rpx"
+					>
+						<u-checkbox
+							shape="circle"
+							v-model="enabulePrivacy"
+							active-color="#FF5E00"
+						></u-checkbox>
+					</u-checkbox-group>
+					<div class="tips">
+						未注册的手机号验证后将自动创建用户账号，登录即代表您已同意
+						<span @click="navigateToPrivacy('privacy')">《使用条款及隐私协议》</span>
+					</div>
+				</div>
+			</div>
+			<!-- 输入验证码 -->
+			<div
+				v-show="current == 1"
+				class="box-code"
+			>
+				<verifyCode
+					type="bottom"
+					@confirm="submit"
+					boxActiveColor="#D8D8D8"
+					v-model="code"
+					isFocus
+					boxNormalColor="#D8D8D8"
+					cursorColor="#D8D8D8"
+				/>
+
+				<div class="fetch-btn">
+					<u-verification-code
+						change-text="验证码已发送（x）"
+						end-text="重新获取验证码"
+						unique-key="page-login"
+						:seconds="seconds"
+						@end="end"
+						@start="start"
+						ref="uCode"
+						@change="codeChange"
+					></u-verification-code>
+					<span
+						@tap="fetchCode"
+						:style="{ color: codeColor }"
+					>
+						{{ tips }}
+					</span>
+				</div>
+			</div>
+
+			<!-- 循环出当前可使用的第三方登录模式 -->
+			<!-- <div class="flex login-list">
+        <div
+          v-if="item.code"
+          :style="{ background: item.color }"
+          class="login-item"
+          v-for="(item, index) in loginList"
+          :key="index"
+        >
+          <u-icon
+            v-if="item.title != 'APPLE'"
+            color="#fff"
+            size="42"
+            :name="item.icon"
+            @click="navigateLogin(item)"
+          >
+          </u-icon>
+          <u-image
+            v-else
+            src="/static/appleidButton@2x.png"
+            :lazy-load="false"
+            @click="navigateLogin(item)"
+            width="80"
+            height="80"
+          />
+        </div>
+      </div> -->
+			<myVerification
+				v-if="codeFlag"
+				@send="verification"
+				class="verification"
+				ref="verification"
+				business="LOGIN"
+			/>
+		</div>
+		<view v-else>
+			<wechatH5Login />
+		</view>
+	</div>
+</template>
+
+<script>
+import { openIdLogin, loginCallback } from '@/api/connect.js';
+import api from '@/config/api.js';
+import { sendMobile, smsLogin } from '@/api/login';
+import myVerification from '@/components/verification/verification.vue'; //验证码模块
+import uuid from '@/utils/uuid.modified.js'; // uuid
+import verifyCode from '@/components/verify-code/verify-code';
+import { getUserInfo } from '@/api/members';
+import { whetherNavigate } from '@/utils/Foundation'; //登录跳转
+import storage from '@/utils/storage.js'; //缓存
+import wechatH5Login from './wechatH5Login.vue';
+import { webConnect } from '@/api/connect.js';
+import { loginIm } from '@/utils/handleim.js';
+export default {
+	components: {
+		myVerification,
+		verifyCode,
+		wechatH5Login
+	},
+
+	data() {
+		return {
+			uuid,
+			wechatLogin: false, //是否加载微信公众号登录
+			flage: false, //是否验证码验证
+			codeFlag: true, //验证开关，用于是否展示验证码
+			tips: '',
+			current: 0,
+			codeColor: '#999', //按钮验证码颜色
+			lightColor: this.$lightColor,
+			seconds: 60, //默认验证码等待时间
+			loginTitleWay: [
+				{
+					title: '欢迎登录',
+					desc: '登录后更精彩，美好生活即将开始'
+				},
+				{
+					title: '请输入验证码',
+					desc: '已经发送验证码至'
+				}
+			],
+			showBack: false,
+			enabuleFetchCode: false,
+			enabulePrivacy: false, //隐私政策
+			mobile: '', //手机号
+			code: '', //验证码
+			inputStyle: {
+				height: '104rpx',
+				'border-bottom': '1rpx solid #D8D8D8',
+				'letter-spacing': '1rpx',
+				'font-size': '40rpx',
+				'line-height': '40rpx',
+				color: '#333'
+			},
+			placeholderStyle: 'font-size: 32rpx;line-height: 32rpx;color: #999999;',
+			loginList: [
+				//第三方登录集合
+				{
+					icon: 'weixin-fill',
+					color: '#00a327',
+					title: '微信',
+					code: 'WECHAT'
+				},
+				{
+					icon: 'qq-fill',
+					color: '#38ace9',
+					title: 'QQ',
+					code: 'QQ'
+				},
+				{
+					icon: 'apple-fill',
+					color: '#000000',
+					title: 'Apple',
+					code: 'APPLE'
+				}
+			],
+			initurl: false
+		};
+	},
+
+	onShow() {
+		//#ifdef H5
+		let isWXBrowser = /micromessenger/i.test(navigator.userAgent);
+		if (isWXBrowser) {
+			webConnect('WECHAT').then((res) => {
+				let data = res.data;
+				if (data.success) {
+					window.location = data.result;
+				}
+			});
+		}
+		//#endif
+	},
+
+	mounted() {
+		// #ifndef APP-PLUS
+		//判断是否微信浏览器
+		var ua = window.navigator.userAgent.toLowerCase();
+		if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+			this.wechatLogin = true;
+			return;
+		}
+		// #endif
+		/**
+		 * 条件编译判断当前客户端类型
+		 */
+		//#ifdef H5
+		this.clientType = 'H5';
+		//#endif
+
+		//#ifdef APP-PLUS
+		this.clientType = 'APP';
+		/**如果是app 加载支持的登录方式*/
+		let _this = this;
+		uni.getProvider({
+			service: 'oauth',
+			success: (result) => {
+				_this.loginList = result.provider.map((value) => {
+					//展示title
+					let title = '';
+					//系统code
+					let code = '';
+					//颜色
+					let color = '#8b8b8b';
+					//图标
+					let icon = '';
+					//uni 联合登录 code
+					let appcode = '';
+					switch (value) {
+						case 'weixin':
+							icon = 'weixin-circle-fill';
+							color = '#00a327';
+							title = '微信';
+							code = 'WECHAT';
+							break;
+						case 'qq':
+							icon = 'qq-circle-fill';
+							color = '#38ace9';
+							title = 'QQ';
+							code = 'QQ';
+							break;
+						case 'apple':
+							icon = 'apple-fill';
+							color = '#000000';
+							title = 'Apple';
+							code = 'APPLE';
+							break;
+					}
+					return {
+						title: title,
+						code: code,
+						color: color,
+						icon: icon,
+						appcode: value
+					};
+				});
+			},
+			fail: (error) => {
+				uni.showToast({
+					title: '获取登录通道失败' + error,
+					duration: 2000,
+					icon: 'none'
+				});
+			}
+		});
+		//#endif
+
+		//特殊平台，登录方式需要过滤
+		// #ifdef H5
+		this.methodFilter(['QQ']);
+		// #endif
+
+		//微信小程序，只支持微信登录
+		// #ifdef MP-WEIXIN
+		this.methodFilter(['WECHAT']);
+		// #endif
+	},
+	watch: {
+		current(val) {
+			val ? (this.showBack = true) : (this.showBack = false);
+		},
+		mobile: {
+			handler(val) {
+				if (val.length == 11) {
+					this.enabuleFetchCode = true;
+				}
+			}
+		},
+
+		async flage(val) {
+			if (val) {
+				if (this.$refs.uCode.canGetCode) {
+					// 向后端请求验证码
+					uni.showLoading({});
+					let res = await sendMobile(this.mobile);
+					uni.hideLoading();
+					// 这里此提示会被this.start()方法中的提示覆盖
+					if (res.data.success) {
+						this.current = 1;
+						this.$refs.uCode.start();
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							duration: 2000,
+							icon: 'none'
+						});
+						this.flage = false;
+					}
+				} else {
+					this.$u.toast('请倒计时结束后再发送');
+				}
+			} else {
+				this.$refs.verification.hide();
+			}
+		}
+	},
+	onLoad(options) {
+		if (options.init == 'index') {
+			this.initurl = true;
+		}
+		if (options && options.state) {
+			this.stateLogin(options.state);
+		}
+	},
+	methods: {
+		customback() {
+			if (this.initurl) {
+				uni.switchTab({
+					url: '/pages/tabbar/vlog/index?init=ok'
+				});
+			} else {
+				uni.navigateBack();
+			}
+		},
+		//联合信息返回登录
+		stateLogin(state) {
+			loginCallback(state).then((res) => {
+				console.log(res);
+				let data = res.data;
+				if (data.success) {
+					storage.setAccessToken(data.result.accessToken);
+					storage.setRefreshToken(data.result.refreshToken);
+					// 登录成功
+					uni.showToast({
+						title: '登录成功!',
+						icon: 'none'
+					});
+					getUserInfo().then((user) => {
+						storage.setUserInfo(user.data.result);
+						storage.setHasLogin(true);
+					});
+					getCurrentPages().length > 1
+						? uni.navigateBack({
+								delta: getCurrentPages().length - 2
+						  })
+						: uni.switchTab({
+								url: '/pages/tabbar/home/index'
+						  });
+				}
+			});
+		},
+		/** 根据参数显示登录模块 */
+		methodFilter(code) {
+			let way = [];
+			this.loginList.forEach((item) => {
+				if (code.length != 0) {
+					code.forEach((val) => {
+						if (item.code == val) {
+							way.push(item);
+						}
+					});
+				} else {
+					uni.showToast({
+						title: '配置有误请联系管理员',
+						duration: 2000,
+						icon: 'none'
+					});
+				}
+			});
+			this.loginList = way;
+		},
+		//非h5 获取openid
+		async nonH5OpenId(item) {
+			let _this = this;
+			//获取各个openid
+			await uni.login({
+				provider: item.appcode,
+				// #ifdef MP-ALIPAY
+				scopes: 'auth_user', //支付宝小程序需设置授权类型
+				// #endif
+				success: function (res) {
+					uni.setStorageSync('type', item.code);
+					//微信小程序意外的其它方式直接在storage中写入openid
+					// #ifndef MP-WEIXIN
+					uni.setStorageSync('openid', res.authResult.openid);
+					// #endif
+				},
+				fail(e) {
+					uni.showToast({
+						title: '第三方登录暂不可用！',
+						icon: 'none',
+						duration: 3000
+					});
+				},
+				complete(e) {
+					//获取用户信息
+					uni.getUserInfo({
+						provider: item.appcode,
+						success: function (infoRes) {
+							//写入用户信息
+							uni.setStorageSync('nickname', infoRes.userInfo.nickName);
+							uni.setStorageSync('avatar', infoRes.userInfo.avatarUrl);
+
+							// #ifdef MP-WEIXIN
+							//微信小程序获取openid 需要特殊处理 如需获取openid请参考uni-id: https://uniapp.dcloud.net.cn/uniCloud/uni-id
+							_this.weixinMPOpenID(res).then((res) => {
+								//这里需要先行获得openid，再使用openid登录，小程序登录需要两步，所以这里特殊编译
+								_this.goOpenidLogin('WECHAT_MP');
+							});
+							// #endif
+
+							// #ifndef MP-WEIXIN
+							_this.goOpenidLogin('APP');
+							//#endif
+						}
+					});
+				}
+			});
+		},
+		//openid 登录
+		goOpenidLogin(clientType) {
+			// 获取准备好的参数，进行登录系统
+			let params = {
+				uuid: uni.getStorageSync('openid'), //联合登陆id
+				source: uni.getStorageSync('type'), //联合登陆类型
+				nickname: uni.getStorageSync('nickname'), // 昵称
+				avatar: uni.getStorageSync('avatar'), // 头像
+				uniAccessToken: uni.getStorageSync('uni_access_token') //第三方token
+			};
+			openIdLogin(params, clientType).then((res) => {
+				if (!res.data.success) {
+					let errormessage = '第三方登录暂不可用';
+					uni.showToast({
+						// title: '未绑定第三方账号',
+						title: errormessage,
+						icon: 'none',
+						duration: 3000
+					});
+					return;
+				} else {
+					var infoData = res.data.result;
+					storage.setAccessToken(infoData.accessToken);
+					storage.setRefreshToken(infoData.refreshToken);
+					const vlogInfo = JSON.parse(infoData.tikUser);
+					// 将vlog的token和vlog用户信息放入缓存
+					storage.setVlogToken(vlogInfo.userToken);
+					storage.setVlogUserInfo(vlogInfo);
+					// 登录成功
+					uni.showToast({
+						title: '第三方登录成功!',
+						icon: 'none'
+					});
+					// 执行登录
+					getUserInfo().then((user) => {
+						if (user.data.success) {
+							/**
+							 * 个人信息存储到缓存userInfo中
+							 */
+							storage.setUserInfo(user.data.result);
+							storage.setHasLogin(true);
+
+							/**
+							 * 计算出当前router路径
+							 * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
+							 * 2.都不满足返回跳转页面
+							 */
+							whetherNavigate();
+						} else {
+							uni.switchTab({
+								url: '/pages/tabbar/home/index'
+							});
+						}
+					});
+				}
+			});
+		},
+		//微信小程序获取openid
+		async weixinMPOpenID(res) {
+			await miniProgramLogin(res.code).then((res) => {
+				uni.setStorageSync('openid', res.data);
+			});
+		},
+		/**跳转到登录页面 */
+		navigateLogin(connectLogin) {
+			// #ifdef H5
+			let code = connectLogin.code;
+			let buyer = api.buyer;
+			window.open(buyer + `/passport/connect/connect/login/web/` + code, '_self');
+			// #endif
+			// #ifdef APP-PLUS
+			this.nonH5OpenId(connectLogin);
+			// #endif
+		},
+
+		// 提交
+		submit() {
+			/**
+			 * 清空当前账号信息
+			 */
+			storage.setHasLogin(false);
+			storage.setAccessToken('');
+			storage.setRefreshToken('');
+			storage.setUuid('');
+			storage.setUserInfo({});
+			// 清理vlog信息
+			storage.setVlogToken('');
+			storage.setVlogUserInfo(null);
+			// 清除初始化数据内容
+			storage.setRefreshVlogIndex('1'); //需要刷新
+			/**
+			 * 执行登录
+			 */
+			smsLogin(
+				{
+					mobile: this.mobile,
+					code: this.code
+				},
+				this.clientType
+			).then((res) => {
+				console.log(res);
+				if (res.data.success) {
+					const infoData = res.data.result;
+					const vlogInfo = JSON.parse(infoData.tikUser);
+					storage.setAccessToken(infoData.accessToken);
+					storage.setRefreshToken(infoData.refreshToken);
+					// 将vlog的token和vlog用户信息放入缓存
+					storage.setVlogToken(vlogInfo.userToken);
+					storage.setVlogUserInfo(vlogInfo);
+
+					/**
+					 * 登录成功后获取个人信息
+					 */
+					getUserInfo().then((user) => {
+						// console.log(user)
+						if (user.data.success) {
+							/**
+							 * 个人信息存储到缓存userInfo中
+							 */
+							storage.setUserInfo(user.data.result);
+							storage.setHasLogin(true);
+							// loginIm
+							loginIm();
+							// 登录成功
+							uni.showToast({
+								title: '登录成功!',
+								icon: 'none'
+							});
+
+							/**
+							 * 计算出当前router路径
+							 * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页
+							 * 2.都不满足返回跳转页面
+							 */
+							whetherNavigate();
+						} else {
+							uni.switchTab({
+								url: '/pages/tabbar/home/index'
+							});
+						}
+					});
+				}
+			});
+		},
+		// 验证码验证
+		verification(val) {
+			// console.log(val)
+			this.flage = val == this.$store.state.verificationKey ? true : false;
+			// console.log(this.flage)
+		},
+		// 跳转
+		navigateToPrivacy(val) {
+			uni.navigateTo({
+				url: '/pages/mine/help/tips?type=' + val
+			});
+		},
+		// 点击获取验证码
+		start() {
+			this.codeColor = '#999';
+			this.$u.toast('验证码已发送');
+			this.flage = false;
+			this.codeFlag = false;
+
+			this.$refs.verification.hide();
+		},
+		/**点击验证码*/
+		codeChange(text) {
+			this.tips = text;
+		},
+		/** 结束验证码后执行 */
+		end() {
+			this.codeColor = this.lightColor;
+			this.codeFlag = true;
+			console.log(this.codeColor);
+		},
+		// 发送验证码
+		fetchCode() {
+			if (!this.enabulePrivacy) {
+				uni.showToast({
+					title: '请同意用户隐私',
+					duration: 2000,
+					icon: 'none'
+				});
+				return false;
+			}
+
+			if (!this.$u.test.mobile(this.mobile)) {
+				uni.showToast({
+					title: '请填写正确手机号',
+					duration: 2000,
+					icon: 'none'
+				});
+				return false;
+			}
+			if (this.tips == '重新获取验证码') {
+				uni.showLoading({
+					title: '加载中'
+				});
+				if (!this.codeFlag) {
+					let timer = setInterval(() => {
+						if (this.$refs.verification) {
+							this.$refs.verification.error(); //发送
+						}
+						clearInterval(timer);
+					}, 100);
+				}
+				uni.hideLoading();
+			}
+			if (!this.flage) {
+				this.$refs.verification.error(); //发送
+
+				return false;
+			}
+		}
+	}
+};
+</script>
+<style>
+page {
+	background: #fff;
+}
+</style>
+<style lang="scss" scoped>
+.wrapper {
+	// padding: 0 80rpx;
+}
+
+.title {
+	padding-top: calc(104rpx);
+	font-style: normal;
+	line-height: 1;
+	font-weight: 500;
+	font-size: 56rpx;
+	color: #333;
+}
+
+.box-code {
+	margin-top: 78rpx;
+}
+
+.desc,
+.desc-light {
+	font-size: 32rpx;
+	line-height: 32rpx;
+	color: #333333;
+	margin-top: 40rpx;
+}
+
+.desc {
+	color: #333;
+}
+
+.desc-light {
+	color: #999999;
+
+	> span {
+		color: #333;
+		margin-left: 8rpx;
+	}
+}
+
+.mobile {
+	margin-top: 80rpx;
+}
+
+.disable {
+	// background: linear-gradient(90deg, #ffdcba 2.21%, #ffcfb2 99.86%);
+	background: #fe3c3c;
+}
+
+.fetch {
+	background: #fe3c3c;
+}
+
+.btn {
+	border-radius: 100px;
+	width: 590rpx;
+	margin-top: 97rpx;
+	height: 80rpx;
+	font-size: 30rpx;
+	line-height: 80rpx;
+	text-align: center;
+	color: #ffffff;
+}
+
+.tips {
+	font-size: 12px;
+	line-height: 20px;
+	margin-top: 32rpx;
+	width: 546rpx;
+
+	> span {
+		color: $light-color;
+	}
+}
+
+.fetch-btn {
+	width: 370rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	background: #f2f2f2;
+	border-radius: 100rpx;
+	font-size: 28rpx;
+	color: #999;
+
+	margin: 71rpx auto 0 auto;
+}
+
+.login-list {
+	display: flex;
+	width: 80%;
+	margin: 0 auto;
+	margin-top: 25vh;
+	// position: absolute;
+	// bottom: 20px;
+	align-items: center;
+	justify-content: center;
+}
+
+.login-item {
+	width: 80rpx;
+
+	border-radius: 10rpx;
+	height: 80rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+
+	margin: 0 20rpx;
+}
+.imgage {
+	width: 100%;
+	height: 37.5vh;
+	background: url('./static/logn.png');
+	background-size: 100% 100%;
+	& > div {
+		width: 100%;
+		height: 80%;
+		display: flex;
+		justify-content: center;
+		align-items: end;
+		color: #fff;
+		font-size: 14px;
+	}
+}
+</style>
diff --git a/pages/publish/publish.nvue b/pages/publish/publish.nvue
index c9b6a0e7..840e2916 100755
--- a/pages/publish/publish.nvue
+++ b/pages/publish/publish.nvue
@@ -95,6 +95,7 @@ import api from '@/config/api.js';
 export default {
 	data() {
 		return {
+			upFlage: true,
 			publishTouched: false,
 			preplayTouched: false,
 			tempFilePath: '',
@@ -107,6 +108,7 @@ export default {
 		};
 	},
 	onLoad(params) {
+		this.upFlage = false;
 		let me = this;
 		let vlogInfo = storage.getVlogUserInfo();
 		// 上个页面传过来的文件事件对象, 其中包含了相册中选择的视频内容
@@ -147,6 +149,9 @@ export default {
 			// 	(res.progress * 100) / res.total
 			// );
 			me.percentCompleted = res.progress;
+			if (res.progress == 100) {
+				me.upFlage = true;
+			}
 		});
 	},
 	methods: {
@@ -155,6 +160,9 @@ export default {
 			this.title = e.detail.value;
 		},
 		doPublich() {
+			if (!this.upFlage) {
+				return;
+			}
 			if (this.title.length < 5) {
 				uni.showToast({
 					title: '请输入5个字以上的标题！',
@@ -162,6 +170,10 @@ export default {
 				});
 				return;
 			}
+			this.upFlage = false;
+			uni.showLoading({
+				title: '请稍等'
+			});
 			let me = this;
 			let vlogInfo = storage.getVlogUserInfo();
 			let userId = vlogInfo.id;
@@ -187,17 +199,15 @@ export default {
 				data: vlog,
 				success(result) {
 					if (result.data.status == 200) {
-						uni.showToast({
-							title: result.data.msg,
-							icon: 'none',
-							duration: 2000
-						});
+						// uni.showToast({
+						// 	title: result.data.msg,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
 
-						setTimeout(() => {
-							uni.switchTab({
-								url: '/pages/me/me'
-							});
-						}, 2000);
+						uni.switchTab({
+							url: '/pages/me/me'
+						});
 					} else {
 						uni.showToast({
 							title: result.data.msg,
@@ -205,6 +215,10 @@ export default {
 							duration: 3000
 						});
 					}
+				},
+				complete() {
+					this.upFlage = true;
+					uni.hideLoading();
 				}
 			});
 		},
diff --git a/pages/search/user.vue b/pages/search/user.vue
index d21e7149..e18284d3 100644
--- a/pages/search/user.vue
+++ b/pages/search/user.vue
@@ -114,6 +114,10 @@ export default {
 					}
 					data.forEach((i) => {
 						i.doIflow = false;
+						if (i.followStatus == null) {
+							// 处理未登录时的状态
+							i.followStatus = '未关注';
+						}
 						this.flowList.push(i);
 					});
 					// this.flowList.push(...data);
diff --git a/pages/tabbar/im/index.vue b/pages/tabbar/im/index.vue
index dfc5f8b7..6c3a405e 100644
--- a/pages/tabbar/im/index.vue
+++ b/pages/tabbar/im/index.vue
@@ -1,610 +1,613 @@
 <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="handleAddFriend">添加好友/群聊</li>
-          <li @click="handleMenu()">发起群聊</li>
-          <li @click="handleScan">扫一扫</li>
-        </ul>
-      </view>
-    </div>
-    <!-- 搜索添加 -->
-    <TUIContactsea v-if="statue == 2" @switchConversation="hui" />
-    <!-- 联系人 -->
-    <TUIContact v-else-if="statue == 1" 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"
-      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="handleAddFriend">添加好友/群聊</li>
+					<li @click="handleMenu()">发起群聊</li>
+					<li @click="handleScan">扫一扫</li>
+				</ul>
+			</view>
+		</div>
+		<!-- 搜索添加 -->
+		<TUIContactsea
+			v-if="statue == 2"
+			@switchConversation="hui"
+		/>
+		<!-- 联系人 -->
+		<TUIContact
+			v-else-if="statue == 1"
+			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"
+			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" />
-  </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 { 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 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 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 { 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";
-TUIChatKit.init();
-let vueVersion = 2;
+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 {
-      statue: 0, // 0对话记录  1联系人 2添加好友/群聊  3建群  4群名称  6站内信 10群类型  7扫码后用户详情
-      isPopupVisible: false, // 控制弹出框的显示与隐藏
-      isq: false,
-      popupRef: null, // 新增，用于保存弹窗的引用
-      meList: [],
-      swipeStates: [],
-      startX: 0,
-      tole: 0, //已读未读
-      cleartime: null,
-      pageSize: 20,
-      pageNumber: 1,
-      total: 0,
-      loadMoreStatus: "more", // 加载更多状态
-    };
-  },
-  created() {},
-  onShow() {
-    // 每次进入页面时调用的方法
-    //获取用户信息
-    getUserimInfo()
-      .then(({ data }) => {
-        if (data.code == 200) {
-          const par = data.result;
-          TUILogin.login({
-            SDKAppID: par.sdkAppId,
-            userID: par.userID,
-            userSig: par.userSig,
-            useUploadPlugin: true, // If you need to send rich media messages, please set to true.
-            framework: `vue${vueVersion}`, // framework used vue2 / vue3
-          }).then(() => {
-            Push.setRegistrationID(par.userID, () => {
-              console.log(
-                "设置id设置id设置id设置id设置id设置id设置id设置id设置id设置id",
-                par.userID
-              );
+	// 注册组件
+	components: {
+		TUIConversation,
+		TUIContact,
+		TUIContactsea,
+		ContactSearch,
+		SelectFriend,
+		SelectFriendqlioa,
+		// TUIChatKit,
+		CreateGroup,
+		ContactInfo
+	},
+	data() {
+		return {
+			showNoLoginPage: false,
+			statue: 0, // 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;
+		}
+	},
 
-              Push.registerPush(
-                par.sdkAppId,
-                "vkFpe55aYqfV7Sk5uGaoxhEstJ3tcI9dquk7JwG1GloDSLD2HeMWeQweWWXgNlhC",
-                (data) => {
-                  console.log("registerPush ok", data);
-                  Push.getRegistrationID((registrationID) => {
-                    console.log("getRegistrationID ok", registrationID);
-                  });
-                },
-                (errCode, errMsg) => {
-                  console.error("registerPush failed", errCode, errMsg);
-                }
-              );
-            });
-            // 监听通知栏点击事件，获取推送扩展信息
-            Push.addPushListener(Push.EVENT.NOTIFICATION_CLICKED, (res) => {
-              console.log("notification clicked", res);
-              // 解析扩展信息，跳转到相应的会话（代码仅供参考，发布前需要完善）
-              try {
-                const data = JSON.parse(res.data);
-                const conv_type =
-                  data?.entity?.chatType === 1 ? "C2C" : "GROUP";
-                // 根据推送信息拼的 conversationID
-                const conversationID = `${conv_type}${data.entity.sender}`;
-                // 切换会话
-                TUIConversationService.switchConversation(conversationID);
-                const chatPath = "/TUIKit/components/TUIChat/index";
-                uni.navigateTo({ url: chatPath });
-              } catch (error) {
-                console.log("error", error);
-              }
-            });
-            // 监听在线推送
-            Push.addPushListener(Push.EVENT.MESSAGE_RECEIVED, (res) => {
-              // res 为消息内容
-              console.log("message received", res);
-            });
-            // 监听在线推送被撤回
-            Push.addPushListener(Push.EVENT.MESSAGE_REVOKED, (res) => {
-              // res 为被撤回的消息 ID
-              console.log("message revoked", res);
-            });
-          });
-        } else {
-          // 接口返回非 200 状态码，跳转登录页面
-          uni.navigateTo({
-            url: "/pages/passport/login",
-          });
-        }
-      })
-      .catch(() => {
-        // 请求失败，跳转登录页面
-        uni.navigateTo({
-          url: "/pages/passport/login",
-        });
-      });
-  },
+	mounted() {
+		this.getMembermethod();
+		this.setTime();
 
-  mounted() {
-    this.getMembermethod();
-    this.setTime();
+		// 监听自定义全局点击事件
+		uni.$on('globalClick', (event) => {
+			// console.log(event, "====+++");
+			this.handleGlobalClick(event);
+		});
 
-    // 监听自定义全局点击事件
-    uni.$on("globalClick", (event) => {
-      // console.log(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");
-    // 清除定时器
-    clearTimeout(this.cleartime);
-  },
-  methods: {
-    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();
-      }
-    },
-    setTime() {
-      const th = this;
-      this.cleartime = setTimeout(() => {
-        this.getMembermethod();
-        th.setTime(); //递归调用setTime函数，实现每10秒执行一次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; // 点击在节点范围内，执行相应操作
+							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;
+		},
 
-    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;
+}
 uni-page-body,
 html,
 body,
 page {
-  width: 100% !important;
-  height: 100% !important;
-  overflow: hidden;
+	width: 100% !important;
+	height: 100% !important;
+	overflow: hidden;
 }
 .jolkp {
-  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;
+	padding: 10px 20px;
+	cursor: pointer;
 }
 
 .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/pages/tabbar/vlog/index.nvue b/pages/tabbar/vlog/index.nvue
index 092b60c7..e2ad8ebc 100644
--- a/pages/tabbar/vlog/index.nvue
+++ b/pages/tabbar/vlog/index.nvue
@@ -210,13 +210,32 @@ export default {
 		let tabIndex = e.index;
 		if (tabIndex == 0) {
 			var prop = this.pageList[this.curIndex];
-			this.$refs[prop].showVd();
+			// this.$refs[prop].showVd();
+			console.log('是否刷新：' + storage.getRefreshVlogIndex());
+			if (storage.getRefreshVlogIndex() === '1') {
+				try {
+					storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新
+					console.log('是否刷新：' + storage.getRefreshVlogIndex());
+					// 登录后需要刷新数据
+					for (var i = 0; i < this.pageList.length; i++) {
+						this.$refs[i].dataList = []; //所有数据清空
+					}
+					this.$refs[prop].get(); //只初始化当前所在位置的数据
+				} catch (err) {
+					console.log(err + '255');
+				}
+			} else {
+				try {
+					this.$refs[prop].showVd();
+				} catch (err) {
+					console.log(err);
+				}
+			}
 		}
 	},
 	onShow() {
 		var prop = this.pageList[this.curIndex];
 		this.getLocation();
-		this.myUserInfo = storage.getVlogUserInfo();
 		if (storage.getRefreshVlogIndex() == '1') {
 			// 登录后需要刷新数据
 			for (var i = 0; i < this.pageList.length; i++) {
diff --git a/store/index.js b/store/index.js
index c6e5d4b3..3fa58d39 100644
--- a/store/index.js
+++ b/store/index.js
@@ -5,27 +5,27 @@ import storage from "@/utils/storage";
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
-  state: {
-    verificationKey: "", //获取key表示验证通过
-    distributionId:"", //分销员Id 如果当前账户从未登录过时记录
-    hasLogin: storage.getHasLogin(),
-    userInfo: storage.getUserInfo(),
-    uuid: storage.getUuid(),
-    token: "",
-  },
-  mutations: {
-    login(state, userInfo) {
-      state.userInfo = userInfo || {};
-      state.userName =
-        userInfo.Name || userInfo.Nickname || userInfo.Username || "匿名用户";
-      state.hasLogin = true;
-    },
-    logout(state) {
-      state.userName = "";
-      state.hasLogin = false;
-    },
-  },
-  actions: {},
+	state: {
+		verificationKey: "", //获取key表示验证通过
+		distributionId: "", //分销员Id 如果当前账户从未登录过时记录
+		hasLogin: storage.getHasLogin(),
+		userInfo: storage.getUserInfo(),
+		uuid: storage.getUuid(),
+		token: "",
+	},
+	mutations: {
+		login(state, userInfo) {
+			state.userInfo = userInfo || {};
+			state.userName =
+				userInfo.Name || userInfo.Nickname || userInfo.Username || "匿名用户";
+			state.hasLogin = true;
+		},
+		logout(state) {
+			state.userName = "";
+			state.hasLogin = false;
+		},
+	},
+	actions: {},
 });
 
-export default store;
+export default store;
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index eb90a9f4..907154e9 100755
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -15,13 +15,16 @@
 .all-box {
 	display: flex;
 	flex-direction: row;
-	justify-content: space-around;
+	/* justify-content: space-around; */
 	height: 280rpx;
 }
 .share-item {
 	display: flex;
 	flex-direction: column;
 	margin-top: 60rpx;
+	margin-left: 20rpx;
+	margin-right: 20rpx;
+	width: 120rpx;
 }
 .icon-wrapper {
 	width: 120rpx;
@@ -39,8 +42,12 @@
 }
 .icon-tag-text {
 	color: #ffffff;
+	width: 120rpx;
 	font-size: 14px;
 	margin-top: 10rpx;
+	lines: 1;
+	text-overflow: ellipsis;
+	text-align: center;
 }
 </style>
 
@@ -70,6 +77,7 @@
 			</view> -->
 
 			<view
+				v-if="userId == ''"
 				class="share-item"
 				@click="copyLink()"
 			>
@@ -90,6 +98,73 @@
 					复制链接
 				</text>
 			</view>
+			<!-- 会话列表 storage.getHasLogin() -->
+			<scroll-view
+				v-if="userId != ''"
+				:scroll-x="true"
+				:show-scrollbar="false"
+				class="all-box"
+			>
+				<view
+					class="share-item"
+					@click="copyLink()"
+				>
+					<view
+						class="icon-wrapper"
+						style="align-self: center"
+					>
+						<image
+							class="icon-image"
+							src="/static/images/link.png"
+							style="align-self: center"
+						></image>
+					</view>
+					<text
+						class="icon-tag-text"
+						style="align-self: center"
+					>
+						复制链接
+					</text>
+				</view>
+				<view
+					v-for="(i, index) in converList"
+					:key="index"
+					class="share-item"
+					@click="toIm(i)"
+				>
+					<view
+						class="icon-wrapper"
+						style="align-self: center"
+					>
+						<image
+							v-if="i.type == 'C2C'"
+							class="icon-image"
+							:src="i.userProfile.avatar || ''"
+							style="align-self: center"
+						></image>
+						<image
+							v-if="i.type == 'GROUP'"
+							class="icon-image"
+							:src="i.groupProfile.avatar || ''"
+							style="align-self: center"
+						></image>
+					</view>
+					<text
+						v-if="i.type == 'C2C'"
+						class="icon-tag-text"
+						style="align-self: center"
+					>
+						{{ i.userProfile.nick || '' }}
+					</text>
+					<text
+						v-if="i.type == 'GROUP'"
+						class="icon-tag-text"
+						style="align-self: center"
+					>
+						{{ i.groupProfile.name || '' }}
+					</text>
+				</view>
+			</scroll-view>
 
 			<!-- 	<view
 				class="share-item"
@@ -190,8 +265,10 @@
 
 <script>
 import storage from '@/utils/storage.js'; //缓存
+import config from '@/config/config.js';
 import { vlogChangeToPublic, vlogChangeToPrivate } from '@/api/vlog';
 import { dateFormat, graceNumber, getDateBeforeNow } from '@/utils/tools.js';
+import { conversationData, sendVlogCustomMsg } from '@/utils/handleim.js';
 import popup from '../uni-popup/popup.js';
 export default {
 	name: 'UniPopupShare',
@@ -221,12 +298,15 @@ export default {
 		isPrivate: {
 			type: Number,
 			default: 0
-		}
+		},
+		vlogItem: {}
 	},
 	data() {
 		return {
 			userId: '',
-			cancelTouched: false
+			cancelTouched: false,
+			converList: [],
+			flag: true
 		};
 	},
 
@@ -234,10 +314,51 @@ export default {
 		console.log('挂载');
 		var info = storage.getVlogUserInfo();
 		if (info != null) {
+			console.log('登录了');
 			this.userId = info.id;
+			this.conversationList();
 		}
 	},
 	methods: {
+		// 获取会话列表
+		async conversationList() {
+			var data = await conversationData();
+			console.log(data);
+			this.converList = data.data.conversationList;
+			console.log(this.converList);
+		},
+		toIm(i) {
+			if (this.flag) {
+				this.flag = false;
+				sendVlogCustomMsg(i, this.vlogItem)
+					.then((res) => {
+						console.log('发送成功，返回结果：', res);
+						uni.showToast({
+							icon: 'success',
+							title: '分享成功',
+							duration: 3000
+						});
+						var timer = setTimeout(() => {
+							clearTimeout(timer);
+							this.flag = true;
+						}, 3000);
+					})
+					.catch((err) => {
+						this.flag = true;
+						console.error('发送失败了', err);
+						// 这里可以做失败之后的处理，比如弹个错误提示
+						uni.showToast({
+							icon: 'error',
+							title: '云服务异常'
+						});
+					});
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: '点太快了'
+				});
+			}
+		},
 		/**
 		 * 选择内容
 		 */
@@ -293,8 +414,9 @@ export default {
 
 		copyLink() {
 			// this.thisVlogId 视频id
+			var url = config.shareLink + '/pages/me/vlog?vlogId=' + this.thisVlogId;
 			uni.setClipboardData({
-				data: this.vlogUrl,
+				data: url,
 				success: () => {
 					uni.showToast({
 						//提示
diff --git a/utils/handleim.js b/utils/handleim.js
new file mode 100644
index 00000000..7e2fe9d6
--- /dev/null
+++ b/utils/handleim.js
@@ -0,0 +1,216 @@
+import {
+	getUserimInfo
+} from '@/api/members';
+
+import {
+	TUILogin
+} from '@tencentcloud/tui-core';
+
+import {
+	TUIConversationService,
+} from '@tencentcloud/chat-uikit-engine';
+
+
+import {
+	TUIGlobal
+} from '@tencentcloud/universal-api';
+
+
+import * as Push from '@/uni_modules/TencentCloud-Push';
+
+import storage from "@/utils/storage.js";
+
+// sdkStateNotReady IM断了
+// onMessageReceived 收到推送的单聊、群聊、群提示、群系统通知的新消息
+
+// im断开链接时
+const onSdkNotReady = function(event) {
+	console.log('IM断了')
+	var islogin = storage.getVlogUserInfo();
+	if (islogin != null) {
+		// 重新执行IM登录
+		loginIm()
+	}
+}
+
+const onMessageReceived = function(event) {
+	// event.data - 存储 Message 对象的数组 - [Message]
+	// 这里处理消息通知相关业务，4.0版本后续进行开发
+	console.log('收到了消息通知内容')
+	console.log(event.data)
+}
+
+const pushClick = (res) => {
+	console.log('notification clicked', res);
+	// 解析扩展信息，跳转到相应的会话（代码仅供参考，发布前需要完善）
+	try {
+		const data = JSON.parse(res.data);
+		const conv_type = data?.entity?.chatType === 1 ? 'C2C' : 'GROUP';
+		// 根据推送信息拼的 conversationID
+		const conversationID = `${conv_type}${data.entity.sender}`;
+		// 切换会话
+		TUIConversationService.switchConversation(conversationID);
+		const chatPath = '/TUIKit/components/TUIChat/index';
+		uni.navigateTo({
+			url: chatPath
+		});
+	} catch (error) {
+		console.log('error', error);
+	}
+}
+
+const pushOnLine = (res) => {
+	// res 为消息内容
+	console.log('在线推送', res);
+}
+
+const pushMsgBack = (res) => {
+	// res 为被撤回的消息 ID
+	console.log('撤回消息推送', res);
+}
+
+
+
+export const loginIm = () => {
+	console.log('执行im登录')
+	getUserimInfo()
+		.then(({
+			data
+		}) => {
+			console.log(data)
+			if (data.code == 200) {
+				const par = data.result;
+				TUILogin.login({
+					SDKAppID: par.sdkAppId,
+					userID: par.userID,
+					userSig: par.userSig,
+					useUploadPlugin: true, // If you need to send rich media messages, please set to true.
+					framework: `vue2` // framework used vue2 / vue3
+				}).then((res) => {
+
+					var {
+						SDKAppID,
+						userID,
+						userSig,
+						chat
+					} = TUILogin.getContext();
+					getApp().globalData.chat = chat;
+					console.log('我是个老板', res)
+					// 每次登录先移除，避免多次监听
+					chat.off('sdkStateNotReady', onSdkNotReady);
+					chat.off('onMessageReceived', onMessageReceived);
+					// 监听im断开链接后重新链接
+					chat.on('sdkStateNotReady', onSdkNotReady);
+					// 监听消息通知
+					chat.on('onMessageReceived', onMessageReceived);
+
+
+					Push.setRegistrationID(par.userID, () => {
+						console.log('设置id设置id设置id设置id设置id设置id设置id设置id设置id设置id', par.userID);
+
+						Push.registerPush(
+							par.sdkAppId,
+							'vkFpe55aYqfV7Sk5uGaoxhEstJ3tcI9dquk7JwG1GloDSLD2HeMWeQweWWXgNlhC',
+							(data) => {
+								console.log('registerPush ok', data);
+								Push.getRegistrationID((registrationID) => {
+									console.log('getRegistrationID ok',
+										registrationID);
+								});
+							},
+							(errCode, errMsg) => {
+								console.error('registerPush failed', errCode, errMsg);
+							}
+						);
+					});
+					// 监听通知栏点击事件，获取推送扩展信息
+					Push.addPushListener(Push.EVENT.NOTIFICATION_CLICKED, pushClick);
+					// 监听在线推送
+					Push.addPushListener(Push.EVENT.MESSAGE_RECEIVED, pushOnLine);
+					// 监听在线推送被撤回
+					Push.addPushListener(Push.EVENT.MESSAGE_REVOKED, pushMsgBack);
+				});
+			} else {
+				// 接口返回非 200 状态码，跳转登录页面
+				uni.navigateTo({
+					url: '/pages/passport/login'
+				});
+			}
+		})
+		.catch((e) => {
+			console.log(e)
+		});
+}
+
+export const clearIm = async () => {
+	var chat = getApp().globalData.chat;
+	var res_out = await chat.logout()
+	console.log(res_out)
+	console.log('IM退出登录')
+	getApp().globalData.chat = null;
+	// chat.logout中做了关闭推送服务
+	// Push.unRegisterPush().then(res => {
+	// 	//反注册关闭推送服务
+	// 	console.log(res)
+	// 	console.log('反注册关闭推送服务')
+	// })
+	Push.removePushListener(Push.EVENT.NOTIFICATION_CLICKED, pushClick)
+	Push.removePushListener(Push.EVENT.MESSAGE_RECEIVED, pushOnLine)
+	Push.removePushListener(Push.EVENT.MESSAGE_REVOKED, pushMsgBack)
+}
+
+export const conversationData = async () => {
+	// 会话列表
+	try {
+		const chatInstance = getApp().globalData.chat
+		console.log(chatInstance)
+		var res = await chatInstance.getConversationList()
+		return res
+	} catch (err) {
+		console.log(err)
+	}
+}
+
+export const sendVlogCustomMsg = async (i, vlogItem) => {
+	// i=IM相关用户信息 
+	console.log(i);
+	console.log(vlogItem);
+	try {
+		var chat = getApp().globalData.chat;
+		var conversationType = i.type;
+		if (conversationType == 'C2C') {
+			var to = i.userProfile.userID;
+		} else {
+			var to = i.groupProfile.groupID;
+		}
+		var message = chat.createCustomMessage({
+			to,
+			conversationType,
+			payload: {
+				data: JSON.stringify({
+					businessID: 'video',
+					title: vlogItem.vlogerName,
+					description: vlogItem.content,
+					price: '分享好视频',
+					link: '/pages/me/vlog?vlogId=' + vlogItem.vlogId,
+					imageUrl: vlogItem.cover || vlogItem.firstFrameImg
+				}),
+				description: '[分享视频]',
+				extension: '',
+
+			},
+			cloudCustomData: JSON.stringify({
+				pushTitle: vlogItem.vlogerName,
+				pushDesc: vlogItem.content,
+				businessID: 'video', // 保持一致
+			})
+		})
+		var result = await chat.sendMessage(message)
+		console.log('发送成功：', result);
+		return result; // 成功就把发送结果返回出去
+	} catch (err) {
+		console.log(err);
+		throw err;
+	}
+
+}
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 26b50f32..e345e36e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -11,6 +11,12 @@ import api from "@/config/api.js";
 
 import uuid from "@/utils/uuid.modified.js";
 
+import {
+	clearIm
+} from "@/utils/handleim.js";
+
+
+
 function cleanStorage() {
 	uni.showToast({
 		title: "你的登录状态已过期，请重新登录",
@@ -21,31 +27,38 @@ function cleanStorage() {
 		uni.hideLoading();
 	}
 
-  storage.setHasLogin(false);
-  storage.setAccessToken("");
-  storage.setRefreshToken("");
-  storage.setUuid("");
-  storage.setUserInfo({});
-  // 清理vlog信息
-  storage.setVlogToken("");
-  storage.setVlogUserInfo(null);
-  // 清除初始化数据内容
-  storage.setRefreshVlogIndex("0"); //不需要刷新
-  // 获取当前页面栈
-  const pages = getCurrentPages();
-  const currentPage = pages[pages.length - 1];
-  const currentRoute = currentPage.route;
-  // 防抖处理跳转
-  // #ifdef MP-WEIXIN
-  if (currentRoute !== 'pages/passport/wechatMPLogin') {
-    uni.navigateTo({ url: "/pages/passport/wechatMPLogin" });
-  }
-  // #endif
-  // #ifndef MP-WEIXIN
-  if (currentRoute !== 'pages/passport/login') {
-    uni.navigateTo({ url: "/pages/passport/login" });
-  }
-  //  #endif
+	storage.setHasLogin(false);
+	storage.setAccessToken("");
+	storage.setRefreshToken("");
+	storage.setUuid("");
+	storage.setUserInfo({});
+	// 清理vlog信息
+	storage.setVlogToken("");
+	storage.setVlogUserInfo(null);
+	// 清除初始化数据内容
+	storage.setRefreshVlogIndex("1"); //需要刷新
+	// 退出im登录
+	clearIm()
+
+	// 获取当前页面栈
+	const pages = getCurrentPages();
+	const currentPage = pages[pages.length - 1];
+	const currentRoute = currentPage.route;
+	// 防抖处理跳转
+	// #ifdef MP-WEIXIN
+	if (currentRoute !== 'pages/passport/wechatMPLogin') {
+		uni.navigateTo({
+			url: "/pages/passport/wechatMPLogin"
+		});
+	}
+	// #endif
+	// #ifndef MP-WEIXIN
+	if (currentRoute !== 'pages/passport/login') {
+		uni.navigateTo({
+			url: "/pages/passport/login"
+		});
+	}
+	//  #endif
 }
 
 let http = new Request();
@@ -88,25 +101,25 @@ http.interceptors.request.use(
 				..._params,
 			};
 
-      config.params = params;
-      config.header.accessToken = accessToken;
-    }
-    // 配置vlog所需参数
-    let vlogToken = storage.getVlogToken();
-    let vlogId = storage.getVlogUserInfo();
-    if (vlogToken) {
-      config.header.headerUserToken = vlogToken;
-      config.header.headerUserId = vlogId.id;
-    }
-    config.header = {
-      ...config.header,
-      uuid: storage.getUuid() || uuid.v1(),
-    };
-    return config;
-  },
-  (config) => {
-    return Promise.reject(config);
-  }
+			config.params = params;
+			config.header.accessToken = accessToken;
+		}
+		// 配置vlog所需参数
+		let vlogToken = storage.getVlogToken();
+		let vlogId = storage.getVlogUserInfo();
+		if (vlogToken) {
+			config.header.headerUserToken = vlogToken;
+			config.header.headerUserId = vlogId.id;
+		}
+		config.header = {
+			...config.header,
+			uuid: storage.getUuid() || uuid.v1(),
+		};
+		return config;
+	},
+	(config) => {
+		return Promise.reject(config);
+	}
 );
 
 // 是否正在刷新的标记
@@ -115,20 +128,28 @@ let isRefreshing = false;
 let requests = [];
 // 必须使用异步函数，注意
 http.interceptors.response.use(
-  async (response) => {
-    // console.log(isRefreshing)
-    // console.log(response)
-    /* 请求之后拦截器。可以使用async await 做异步操作  */
-    // token存在并且token过期
-    if (isRefreshing && response.statusCode === 403) {
-      cleanStorage();
-      isRefreshing = false;
-    }
+	async (response) => {
+			// console.log(isRefreshing)
+			console.log(response)
+			/* 请求之后拦截器。可以使用async await 做异步操作  */
+			// token存在并且token过期
+
+			/**
+			 * 后续进来的请求，此时异步获取token时isRefreshing一定为true
+			 * 那么也就代表此时token一定是过期状态，响应码也一定为403
+			 * 也就会去清理缓存
+			 * 所以会导致页面多次刷新到登录页
+			 */
+
+			// if (isRefreshing && response.statusCode === 403) {
+			// 	cleanStorage();
+			// 	isRefreshing = false;
+			// }
 
 			let token = storage.getAccessToken();
 			if (
 				(token && response.statusCode === 403) ||
-				response.data.status === 403
+				(token && response.data.status === 403)
 			) {
 				if (!isRefreshing) {
 					isRefreshing = true;
@@ -149,6 +170,8 @@ http.interceptors.response.use(
 							return http.request(response.config);
 						})
 						.catch((err) => {
+							console.log('刷新token失败刷新token失败刷新token失败刷新token失败刷新token失败刷新token失败')
+							console.log(err);
 							cleanStorage();
 							return Promise.reject(err);
 						})
@@ -158,41 +181,44 @@ http.interceptors.response.use(
 				} else {
 					// 返回未执行 resolve 的 Promise
 					return new Promise((resolve) => {
-						// 用函数形式将 resolve 存入，等待刷新后再执行
+						// 用函数形式将 resolve 存入，等待刷新后再执行 
 						requests.push((token) => {
+							// 刷新token后传入新的token
 							response.header.accessToken = `${token}`;
 							resolve(http.request(response.config));
 						});
 					});
 				}
 
-				// 如果当前返回没登录
+				// 这是没有token的情况
 			} else if (
 				(!token && response.statusCode === 403) ||
 				response.data.code === 403
 			) {
+				console.log('没有token的情况');
 				cleanStorage();
 
-      // 如果当前状态码为正常但是success为不正常时
-    } else if (
-      (response.statusCode == 200 && !response.data.success) ||
-      response.statusCode == 400
-    ) {
-      if (response.data.message) {
-        uni.showToast({
-          title: response.data.message,
-          icon: "none",
-          duration: 1500,
-        });
-      }
-    } else if (response.data.code == 502) {
-      cleanStorage();
-    }
-    return response;
-  },
-  (error) => {
-    return error;
-  }
+				// 如果当前状态码为正常但是success为不正常时
+			} else if (
+				(response.statusCode == 200 && !response.data.success) ||
+				response.statusCode == 400
+			) {
+				if (response.data.message) {
+					uni.showToast({
+						// title: response.data.message,
+						title: "请重试",
+						icon: "none",
+						duration: 1500,
+					});
+				}
+			} else if (response.data.code == 502) {
+				cleanStorage();
+			}
+			return response;
+		},
+		(error) => {
+			return error;
+		}
 );
 
 export {
diff --git a/utils/storage.js b/utils/storage.js
index ba5ce864..64488e27 100644
--- a/utils/storage.js
+++ b/utils/storage.js
@@ -10,21 +10,21 @@ const FACE_LOGIN = isDev ? "face_login_dev" : "face_login";
 const FINGER_LOGIN = isDev ? "finger_login_dev" : "finger_login";
 const CART_BACKBTN = isDev ? "cart_backbtn_dev" : "cart_backbtn";
 const AFTERSALE_DATA = isDev ? "aftersale_data_dev" : "aftersale_data";
-export default {
-	setCityCode(val) {
-		return uni.setStorageSync('cityCode',val)
-	},
-	getCityCode(){
-		return uni.getStorageSync('cityCode')
+export default {
+	setCityCode(val) {
+		return uni.setStorageSync('cityCode', val)
 	},
-	/**
-	 * 写入RefreshVlogIndex
-	 */
-	setRefreshVlogIndex(val) {
-		return uni.setStorageSync('refreshVlogIndex',val) //0=不需要刷新
-	},
-	getRefreshVlogIndex() {
-		return uni.getStorageSync('refreshVlogIndex') //0=不需要刷新
+	getCityCode() {
+		return uni.getStorageSync('cityCode')
+	},
+	/**
+	 * 写入RefreshVlogIndex
+	 */
+	setRefreshVlogIndex(val) {
+		return uni.setStorageSync('refreshVlogIndex', val) //0=不需要刷新
+	},
+	getRefreshVlogIndex() {
+		return uni.getStorageSync('refreshVlogIndex') //0=不需要刷新
 	},
 	/** 
 	 * 获取Vlogtoken 
@@ -39,16 +39,16 @@ export default {
 		return uni.setStorageSync(VLOG_TOKEN, val);
 	},
 	/**
-	 * 写入VlogUserInfo 
+	 * 写入VlogUserInfo 
 	 */
 	setVlogUserInfo(val) {
 		return uni.setStorageSync(VLOG_USER_INFO, val);
-	},
-	/**
-	 * 获取VlogUserInfo 
-	 */
-	getVlogUserInfo(val) {
-		return uni.getStorageSync(VLOG_USER_INFO)||null;
+	},
+	/**
+	 * 获取VlogUserInfo 
+	 */
+	getVlogUserInfo(val) {
+		return uni.getStorageSync(VLOG_USER_INFO) || null;
 	},
 
 	// 写入热门搜索时间戳