diff --git a/.gitignore b/.gitignore
index 56cff83..479a129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ OpenIM_*
 
 # plugin
 /nativeplugins
+android-keeplive
+sl-notify
diff --git a/App.vue b/App.vue
index 5d3a189..a01d067 100644
--- a/App.vue
+++ b/App.vue
@@ -1,417 +1,57 @@
 <script>
-	import {mapGetters,mapActions} from "vuex";
-	import IMSDK, {IMMethods,MessageType,SessionType,} from "openim-uniapp-polyfill";
-	import config from "./common/config";
-	import {getDbDir,toastWithCallback} from "@/util/common.js";
-	import {conversationSort} from "@/util/imCommon";
-	import {checkUpgrade} from "@/api/login.js"
-	import {PageEvents,UpdateMessageTypes} from "@/constant";
-
+	import IMSDK from "openim-uniapp-polyfill";
 	export default {
 		onLaunch: function() {
-			console.log("App Launch");
 			// #ifndef APP
 			console.error(
 				`暂时不支持运行到 Web或小程序端，如果需要移动端的 Web 项目，参考 [H5 demo](https://github.com/openimsdk/openim-h5-demo)`
 			);
 			return ;
 			// #endif
-			// #ifdef APP
-			this.checkUpdate();
-			this.setGlobalIMlistener();
-			this.tryLogin();
-			// #endif
+			this.init();
 		},
 		onShow: function() {
-			console.log("App Show");
+			var args= plus.runtime.arguments;
+			if(args){
+				// 处理args参数，如直达到某新页面等
+				console.log(args);
+			}
+			//console.log("App Show");
 			// #ifdef APP
 			IMSDK.asyncApi(IMSDK.IMMethods.SetAppBackgroundStatus, IMSDK.uuid(), false);
 			// #endif
+			//console.log(this.$store.state.contact);
 		},
 		onHide: function() {
-			console.log("App Hide");
+			//console.log("App Hide");
 			// #ifdef APP
 			IMSDK.asyncApi(IMSDK.IMMethods.SetAppBackgroundStatus, IMSDK.uuid(), true);
 			// #endif
 		},
-		computed: {
-			...mapGetters([
-				"storeConversationList",
-				"storeCurrentConversation",
-				"storeCurrentUserID",
-				"storeSelfInfo",
-				"storeRecvFriendApplications",
-				"storeRecvGroupApplications",
-				"storeHistoryMessageList",
-				"storeIsSyncing",
-				"storeGroupList",
-			]),
-		},
 		methods: {
-			...mapActions("message", ["pushNewMessage", "updateOneMessage"]),
-			...mapActions("conversation", ["updateCurrentMemberInGroup"]),
-			...mapActions("circle", ["getFriendCircleInfo"]),
-			...mapActions("contact", [
-				"updateFriendInfo",
-				"pushNewFriend",
-				"updateBlackInfo",
-				"pushNewBlack",
-				"pushNewGroup",
-				"updateGroupInfo",
-				"pushNewRecvFriendApplition",
-				"updateRecvFriendApplition",
-				"pushNewSentFriendApplition",
-				"updateSentFriendApplition",
-				"pushNewRecvGroupApplition",
-				"updateRecvGroupApplition",
-				"pushNewSentGroupApplition",
-				"updateSentGroupApplition",
-			]),
-			setGlobalIMlistener() {
+			init(){
 				this.$store.dispatch("system/getConfig");
-				console.log("setGlobalIMlistener");
-				// init
-				const kickHander = (message) => {
-					toastWithCallback(message, () => {
-						uni.removeStorage({
-							key: "IMToken",
-						});
-						uni.removeStorage({
-							key: "BusinessToken",
-						});
-						uni.$u.route("/pages/common/login/index");
+				const IMToken = uni.getStorageSync("IMToken");
+				const IMUserID = uni.getStorageSync("IMUserID")+'';
+				if (IMToken && IMUserID) {
+					uni.navigateTo({
+						url: "/pages/index/launch"
 					});
-				};
-				IMSDK.subscribe(IMSDK.IMEvents.OnKickedOffline, (data) => {
-					kickHander("您的账号在其他设备登录，请重新登陆！");
-				});
-				IMSDK.subscribe(IMSDK.IMEvents.OnUserTokenExpired, (data) => {
-					kickHander("您的登录已过期，请重新登陆！");
-				});
-				IMSDK.subscribe(IMSDK.IMEvents.OnUserTokenInvalid, (data) => {
-					kickHander("您的登录已无效，请重新登陆！");
-				});
-
-				// sync
-				const syncStartHandler = ({data}) => {
-					this.$store.commit("user/SET_IS_SYNCING", true);
-					this.$store.commit("user/SET_REINSTALL", data);
-				};
-				const syncProgressHandler = ({data}) => {
-					this.$store.commit("user/SET_PROGRESS", data);
-				};
-				const syncFinishHandler = () => {
-					uni.hideLoading();
-					this.$store.dispatch("conversation/getConversationList");
-					this.$store.dispatch("contact/getFriendList");
-					this.$store.dispatch("contact/getGrouplist");
-					this.$store.dispatch("conversation/getUnReadCount");
-					this.$store.commit("user/SET_IS_SYNCING", false);
-				};
-				const syncFailedHandler = () => {
-					uni.hideLoading();
-					uni.$u.toast("同步消息失败");
-					this.$store.dispatch("conversation/getConversationList");
-					this.$store.dispatch("conversation/getUnReadCount");
-					this.$store.commit("user/SET_IS_SYNCING", false);
-				};
-				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerStart, syncStartHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerFinish, syncFinishHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerFailed, syncFailedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerProgress, syncProgressHandler);
-
-				// self
-				const selfInfoUpdateHandler = ({data}) => {
-					this.$store.commit("user/SET_SELF_INFO", {
-						...this.storeSelfInfo,
-						...data,
+				}else{
+					uni.navigateTo({
+						url: "/pages/common/login/index"
 					});
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnSelfInfoUpdated, selfInfoUpdateHandler);
-
-				// message
-				const newMessagesHandler = ({data}) => {
-					if (this.storeIsSyncing) {
-						return;
-					}
-					data.forEach(this.handleNewMessage);
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnRecvNewMessages, newMessagesHandler);
-
-				// friend
-				const friendInfoChangeHandler = ({data}) => {
-					console.log('friendInfoChangeHandler',data);
-					uni.$emit(IMSDK.IMEvents.OnFriendInfoChanged, {data});
-					this.updateFriendInfo({friendInfo: data,});
-				};
-				const friendAddedHandler = ({data}) => {
-					this.pushNewFriend(data);
-				};
-				const friendDeletedHander = ({data}) => {
-					this.updateFriendInfo({
-						friendInfo: data,
-						isRemove: true,
-					});
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnFriendInfoChanged,friendInfoChangeHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnFriendAdded, friendAddedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnFriendDeleted, friendDeletedHander);
-
-				// blacklist
-				const blackAddedHandler = ({data}) => {
-					this.pushNewBlack(data);
-				};
-				const blackDeletedHandler = ({data}) => {
-					this.updateBlackInfo({
-						blackInfo: data,
-						isRemove: true,
-					});
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnBlackAdded, blackAddedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnBlackDeleted, blackDeletedHandler);
-
-				// group
-				const joinedGroupAddedHandler = ({data}) => {
-					this.pushNewGroup(data);
-				};
-				const joinedGroupDeletedHandler = ({data}) => {
-					this.updateGroupInfo({
-						groupInfo: data,
-						isRemove: true,
-					});
-				};
-				const groupInfoChangedHandler = ({data}) => {
-					this.updateGroupInfo({
-						groupInfo: data,
-					});
-				};
-				const groupMemberInfoChangedHandler = ({data}) => {
-					uni.$emit(IMSDK.IMEvents.OnGroupMemberInfoChanged, {data});
-					if (data.groupID === this.storeCurrentConversation?.groupID) {
-						this.updateCurrentMemberInGroup(data);
-					}
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnJoinedGroupAdded,joinedGroupAddedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnJoinedGroupDeleted,joinedGroupDeletedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnGroupInfoChanged,groupInfoChangedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnGroupMemberInfoChanged,groupMemberInfoChangedHandler);
-
-				// application
-				const friendApplicationNumHandler = ({data}) => {
-					const isRecv = data.toUserID === this.storeCurrentUserID;
-					if (isRecv) {
-						this.pushNewRecvFriendApplition(data);
-					} else {
-						this.pushNewSentFriendApplition(data);
-					}
-				};
-				const friendApplicationAccessHandler = ({data}) => {
-					const isRecv = data.toUserID === this.storeCurrentUserID;
-					if (isRecv) {
-						this.updateRecvFriendApplition({
-							application: data,
-						});
-					} else {
-						this.updateSentFriendApplition({
-							application: data,
-						});
-					}
-				};
-				const groupApplicationNumHandler = ({data}) => {
-					const isRecv = data.userID !== this.storeCurrentUserID;
-					if (isRecv) {
-						this.pushNewRecvGroupApplition(data);
-					} else {
-						this.pushNewSentGroupApplition(data);
-					}
-				};
-				const groupApplicationAccessHandler = ({data}) => {
-					const isRecv = data.userID !== this.storeCurrentUserID;
-					if (isRecv) {
-						this.updateRecvGroupApplition({
-							application: data,
-						});
-					} else {
-						this.updateSentGroupApplition({
-							application: data,
-						});
-					}
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnFriendApplicationAdded,friendApplicationNumHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnFriendApplicationAccepted,friendApplicationAccessHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnFriendApplicationRejected,friendApplicationAccessHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnGroupApplicationAdded,groupApplicationNumHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnGroupApplicationAccepted,groupApplicationAccessHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnGroupApplicationRejected,groupApplicationAccessHandler);
-
-				// conversation
-				const totalUnreadCountChangedHandler = ({data}) => {
-					if (this.storeIsSyncing) {
-						return;
-					}
-					this.$store.commit("conversation/SET_UNREAD_COUNT", data);
-				};
-				const newConversationHandler = ({data}) => {
-					if (this.storeIsSyncing) {
-						return;
-					}
-					const result = [...data, ...this.storeConversationList];
-					this.$store.commit(
-						"conversation/SET_CONVERSATION_LIST",
-						conversationSort(result)
-					);
-				};
-				const conversationChangedHandler = ({data}) => {
-					//console.log('conversationChangedHandler',data);
-					if (this.storeIsSyncing) {
-						return;
-					}
-					let filterArr = [];
-					//console.log(data);
-					const chids = data.map((ch) => ch.conversationID);
-					filterArr = this.storeConversationList.filter((tc) => !chids.includes(tc.conversationID));
-					const idx = data.findIndex((c) =>c.conversationID === this.storeCurrentConversation.conversationID);
-					if (idx !== -1){
-						this.$store.commit("conversation/SET_CURRENT_CONVERSATION",data[idx]);
-					}
-					const result = [...data, ...filterArr];
-					this.$store.commit("conversation/SET_CONVERSATION_LIST",conversationSort(result));
-				};
-
-				IMSDK.subscribe(IMSDK.IMEvents.OnTotalUnreadMessageCountChanged,totalUnreadCountChangedHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnNewConversation, newConversationHandler);
-				IMSDK.subscribe(IMSDK.IMEvents.OnConversationChanged,conversationChangedHandler);
-			},
-
-			tryLogin() {
-				const initStore = () => {
-					this.$store.dispatch("user/getSelfInfo");
-					this.$store.dispatch("conversation/getConversationList");
-					this.$store.dispatch("conversation/getUnReadCount");
-					this.$store.dispatch("contact/getBlacklist");
-					this.$store.dispatch("contact/getRecvFriendApplications");
-					this.$store.dispatch("contact/getSentFriendApplications");
-					this.$store.dispatch("contact/getRecvGroupApplications");
-					this.$store.dispatch("contact/getSentGroupApplications");
-					this.$store.dispatch("contact/getFriendList");
-					this.$store.dispatch("circle/getFriendCircleInfo");
-					uni.switchTab({
-						url: "/pages/conversation/conversationList/index?isRedirect=true"
-					});
-				};
-				getDbDir()
-					.then(async (path) => {
-						const flag = await IMSDK.asyncApi(IMMethods.InitSDK, IMSDK.uuid(), {
-							systemType: "uni-app",
-							apiAddr: config.getApiUrl(), // SDK的API接口地址。如：http://xxx:10002
-							wsAddr: config.getWsUrl(), // SDK的websocket地址。如： ws://xxx:10001
-							dataDir: path, // 数据存储路径
-							logLevel: 6,
-							logFilePath: path,
-							isLogStandardOutput: true,
-							isExternalExtensions: false,
-						});
-						if (!flag) {
-							plus.navigator.closeSplashscreen();
-							uni.$u.toast("初始化IMSDK失败！");
-							return;
-						}
-						const status = await IMSDK.asyncApi(IMSDK.IMMethods.GetLoginStatus,IMSDK.uuid());
-						if (status === 3) {
-							initStore();
-							return;
-						}
-
-						const IMToken = uni.getStorageSync("IMToken");
-						const IMUserID = uni.getStorageSync("IMUserID")+'';
-						if (IMToken && IMUserID) {
-							IMSDK.asyncApi(IMSDK.IMMethods.Login, IMSDK.uuid(), {
-									userID: IMUserID,
-									token: IMToken,
-								})
-								.then(initStore)
-								.catch((err) => {
-									console.log(err);
-									uni.removeStorage({
-										key: "IMToken",
-									});
-									uni.removeStorage({
-										key: "BusinessToken",
-									});
-									plus.navigator.closeSplashscreen();
-								});
-						} else {
-							plus.navigator.closeSplashscreen();
-						}
-					})
-					.catch((err) => {
-						console.log("get dir failed");
-						console.log(err);
-						plus.navigator.closeSplashscreen();
-					});
-			},
-			handleNewMessage(newServerMsg) {
-				if (this.inCurrentConversation(newServerMsg)) {
-					if (
-						newServerMsg.contentType !== MessageType.TypingMessage &&
-						newServerMsg.contentType !== MessageType.RevokeMessage
-					) {
-						newServerMsg.isAppend = true;
-						this.pushNewMessage(newServerMsg);
-						setTimeout(() => uni.$emit(PageEvents.ScrollToBottom, true));
-						uni.$u.debounce(this.markConversationAsRead, 2000);
-					}
 				}
-			},
-			inCurrentConversation(newServerMsg) {
-				switch (newServerMsg.sessionType) {
-					case SessionType.Single:
-						return (
-							newServerMsg.sendID === this.storeCurrentConversation.userID ||
-							(newServerMsg.sendID === this.storeCurrentUserID &&
-								newServerMsg.recvID === this.storeCurrentConversation.userID)
-						);
-					case SessionType.WorkingGroup:
-						return newServerMsg.groupID === this.storeCurrentConversation.groupID;
-					case SessionType.Notification:
-						return newServerMsg.sendID === this.storeCurrentConversation.userID;
-					default:
-						return false;
-				}
-			},
-			markConversationAsRead() {
-				IMSDK.asyncApi(
-					IMSDK.IMMethods.MarkConversationMessageAsRead,
-					IMSDK.uuid(),
-					this.storeCurrentConversation.conversationID
-				);
-			},
-			// 验证是否升级
-			checkUpdate() {
-				let system = uni.getSystemInfoSync()
-				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-					checkUpgrade({version:system.appVersion,platform:system.platform,version_wgt:inf.versionCode}).then(res=>{
-						let skip_version = uni.getStorageSync('skip_version')
-						if(res && res.version!=skip_version){
-							uni.$emit('closeWebview')
-							this.setShow(this.current, false)
-							router('/pages/common/upgrade?model=' + JSON.stringify(res), '', 'fade-in')
-						}
-					})
-				})
-			},
-		},
+			}
+		}
 	};
 </script>
 
 <style lang="scss">
 	/*每个页面公共css */
+	text,view{
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+	}
 	@import "@/uni_modules/uview-ui/index.scss";
 	@import "@/styles/login.scss";
 	@import "@/styles/global.scss";
diff --git a/Readme.md b/Readme.md
index 7b4413e..4d77b1e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,4 +1,5 @@
 ```
+安卓App Key:7105a186f961b5d418914c5d1b12f6af
 n1e5a6s6m7
 ```
 ```
diff --git a/android.keystore b/android.keystore
new file mode 100644
index 0000000..566bcd8
Binary files /dev/null and b/android.keystore differ
diff --git a/components/CustomNavBar/index.vue b/components/CustomNavBar/index.vue
index cbbbf65..7d3a4c9 100644
--- a/components/CustomNavBar/index.vue
+++ b/components/CustomNavBar/index.vue
@@ -1,92 +1,80 @@
 <template>
-  <u-navbar :title="title" placeholder class="custom_nav_bar">
-    <template slot="left">
-      <slot name="left">
-        <view class="u-nav-slot">
-          <img
-            @click="leftClick"
-            class="back_icon"
-            width="12"
-            height="20"
-            src="static/images/common_left_arrow.png"
-            alt=""
-            srcset=""
-          />
-        </view>
-      </slot>
-    </template>
+	<u-navbar :title="title" placeholder class="custom_nav_bar">
+		<template slot="left">
+			<slot name="left">
+				<view class="u-nav-slot">
+					<img @click="leftClick" class="back_icon" width="12" height="20"
+						src="static/images/common_left_arrow.png" alt="" srcset="" />
+				</view>
+			</slot>
+		</template>
 
-    <template slot="center">
-      <slot name="center"></slot>
-    </template>
+		<template slot="center">
+			<slot name="center"></slot>
+		</template>
 
-    <template slot="right">
-      <slot name="more">
-        <view @click="rightClick" v-if="more" class="u-nav-slot">
-          <u-icon
-            class="more_dot"
-            name="more-dot-fill"
-            size="23"
-            color="#0C1C33"
-          ></u-icon>
-        </view>
-      </slot>
-    </template>
-  </u-navbar>
+		<template slot="right">
+			<slot name="more">
+				<view @click="rightClick" v-if="more" class="u-nav-slot">
+					<u-icon class="more_dot" name="more-dot-fill" size="23" color="#0C1C33"></u-icon>
+				</view>
+			</slot>
+		</template>
+	</u-navbar>
 </template>
 
 <script>
-export default {
-  name: "",
-  components: {},
-  props: {
-    title: {
-      type: String,
-    },
-    more: {
-      type: Boolean,
-      default: false,
-    },
-    route: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  data() {
-    return {};
-  },
-  methods: {
-    leftClick() {
-      if (this.route) {
-        uni.navigateBack();
-      }
-      this.$emit("leftClick");
-    },
-    rightClick() {
-      this.$emit("rightClick");
-    },
-  },
-};
+	export default {
+		name: "",
+		components: {},
+		props: {
+			title: {
+				type: String,
+			},
+			more: {
+				type: Boolean,
+				default: false,
+			},
+			route: {
+				type: Boolean,
+				default: true,
+			},
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			leftClick() {
+				if (this.route) {
+					uni.navigateBack();
+				}
+				this.$emit("leftClick");
+			},
+			rightClick() {
+				this.$emit("rightClick");
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.custom_nav_bar {
-  ::v-deep .u-navbar__content__left {
-    padding: 0;
-  }
+	.custom_nav_bar {
+		::v-deep .u-navbar__content__left {
+			padding: 0;
+		}
 
-  ::v-deep .u-navbar__content__right {
-    padding: 0;
-  }
+		::v-deep .u-navbar__content__right {
+			padding: 0;
+		}
 
-  .back_icon {
-    padding: 24rpx;
-    margin-left: 20rpx;
-  }
+		.back_icon {
+			padding: 24rpx;
+			margin-left: 20rpx;
+		}
 
-  .more_dot {
-    padding: 24rpx;
-    margin-right: 20rpx;
-  }
-}
-</style>
+		.more_dot {
+			padding: 24rpx;
+			margin-right: 20rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/map.vue b/components/map.vue
deleted file mode 100644
index 6f609c0..0000000
--- a/components/map.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-	<view class="map_container"></view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				map: null,
-				centerMarker: null,
-				currentPoint: null,
-				currentAddress: '',
-			}
-		},
-		mounted() {
-			this.createMap();
-			this.initializeMap();
-		},
-		methods: {
-			createMap() {
-				const mapId = "map_" + Math.random();
-				const map = plus.maps.create(mapId, {
-					zoom: 13,
-					MapType: plus.maps.MapType.MAPTYPE_NORMAL,
-					traffic: true,
-					zoomControls: true,
-					top: "0",
-					left: "0",
-					width: '100%',
-					height: '100%',
-					position: "static",
-				});
-				
-				plus.webview.currentWebview().append(map);
-				this.map = map;
-			},
-			
-			initializeMap() {
-				const _this = this;
-				
-				// 获取当前位置
-				uni.getLocation({
-					type: 'gcj02',
-					success(res) {
-						const point = new plus.maps.Point(res.longitude, res.latitude);
-						_this.map.setCenter(point);
-						_this.currentPoint = point;
-						_this.addCenterMarker(point);
-						_this.getAddressByPoint(point);
-						_this.setupMapMoveListener();
-						_this.map.show();
-					},
-					fail() {
-						// 如果获取位置失败，使用默认位置
-						const defaultPoint = new plus.maps.Point(116.4074, 39.9042);
-						_this.map.setCenter(defaultPoint);
-						_this.currentPoint = defaultPoint;
-						_this.addCenterMarker(defaultPoint);
-						_this.getAddressByPoint(defaultPoint);
-						_this.setupMapMoveListener();
-						_this.map.show();
-					}
-				});
-			},
-			
-			addCenterMarker(point) {
-				// 移除旧的marker
-				if (this.centerMarker) {
-					this.map.removeOverlay(this.centerMarker);
-				}
-				
-				// 添加中心点marker
-				this.centerMarker = new plus.maps.Marker(point);
-				this.centerMarker.setIcon("/static/images/chat/marker.png");
-				this.map.addOverlay(this.centerMarker);
-			},
-			
-			setupMapMoveListener() {
-				const _this = this;
-				
-				// 使用定时器轮询来检测地图位置变化
-				// plus.maps 的 H5 版本可能不支持事件监听，通过定时器实现
-				let lastCenter = this.map.getCenter ? this.map.getCenter() : null;
-				
-				setInterval(() => {
-					_this.map.getCurrentCenter((state, point) => {
-						if (state !== 0 || !point) {
-							return;
-						}
-						
-						// 简单的位置变化检测
-						if (!lastCenter || 
-							lastCenter.getLng() !== point.getLng() || 
-							lastCenter.getLat() !== point.getLat()) {
-							
-							lastCenter = point;
-							_this.updateCenterMarker();
-						}
-					});
-				}, 500);
-			},
-			
-			updateCenterMarker() {
-				const _this = this;
-				
-				this.map.getCurrentCenter((state, point) => {
-					if (state !== 0) {
-						return;
-					}
-					
-					_this.currentPoint = point;
-					_this.addCenterMarker(point);
-					_this.getAddressByPoint(point);
-				});
-			},
-			
-			getAddressByPoint(point) {
-				const _this = this;
-				
-				// 简化处理：直接显示"位置已选择"，不调用外部 API
-				// 如果需要真实地址，可以在确认时调用服务端 API
-				_this.currentAddress = '位置已选择';
-			},
-			
-			getCurrentCenter(callback) {
-				const _this = this;
-				
-				this.map.getCurrentCenter((state, point) => {
-					if (state !== 0) {
-						callback(state, null);
-						return;
-					}
-					
-					// 直接返回当前数据，地址会异步更新
-					callback(state, {
-						point: point,
-						lng: point.getLng(),
-						lat: point.getLat(),
-						address: _this.currentAddress || '位置已选择'
-					});
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.map_container {
-		width: 100%;
-		height: 100%;
-	}
-</style>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/main.js b/main.js
index 693408d..4416fcf 100644
--- a/main.js
+++ b/main.js
@@ -53,7 +53,7 @@ const app = new Vue({
 	...App,
 });
 app.REQUEST_TRACE = process.env.NODE_ENV == 'development';
-//app.REQUEST_TRACE = false;
+app.REQUEST_TRACE = false;
 
 // 引入请求封装
 import request from "./util/request/index";
diff --git a/manifest.json b/manifest.json
index 26bd1e8..093cccf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
-    "name" : "回声",
-    "appid" : "__UNI__CA458BA",
-    "description" : "",
+    "name" : "瞬聊",
+    "appid" : "__UNI__E41111F",
+    "description" : "一款即时聊天软件",
     "versionName" : "3.3.5",
     "versionCode" : 335,
     "transformPx" : false,
@@ -23,7 +23,8 @@
             "Geolocation" : {},
             "Fingerprint" : {},
             "Contacts" : {},
-            "Barcode" : {}
+            "Barcode" : {},
+            "Push" : {}
         },
         "distribute" : {
             "android" : {
@@ -48,12 +49,13 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "minSdkVersion" : 21,
                 "targetSdkVersion" : 26,
-                "schemes" : "huisheng"
+                "schemes" : "shunliao"
             },
             "ios" : {
                 "dSYMs" : false,
@@ -69,11 +71,11 @@
                 },
                 "capabilities" : {
                     "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "huisheng", "applinks:url.huisheng.hk" ]
+                        "com.apple.developer.associated-domains" : [ "shunliao", "applinks:www.shun777.com", "applinks:url.shun777.com" ]
                     }
                 },
                 "idfa" : false,
-                "urltypes" : "huisheng"
+                "urltypes" : "shunliao"
             },
             "sdkConfigs" : {
                 "ad" : {},
@@ -91,7 +93,22 @@
                 },
                 "share" : {},
                 "statics" : {},
-                "speech" : {}
+                "speech" : {},
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : true,
+                        "icons" : {
+                            "small" : {
+                                "ldpi" : "static/images/about_logo.png",
+                                "mdpi" : "static/images/about_logo.png",
+                                "hdpi" : "static/images/about_logo.png",
+                                "xhdpi" : "static/images/about_logo.png",
+                                "xxhdpi" : "static/images/about_logo.png"
+                            }
+                        }
+                    }
+                }
             },
             "splashscreen" : {
                 "androidStyle" : "default",
@@ -163,7 +180,10 @@
         "setting" : {
             "urlCheck" : false
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "unipush" : {
+            "enable" : true
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -199,6 +219,9 @@
             "treeShaking" : {
                 "enable" : true
             }
+        },
+        "unipush" : {
+            "enable" : true
         }
     }
 }
diff --git a/package.json b/package.json
index bd541ee..fb83d44 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
   "dependencies": {
     "@openim/client-sdk": "^0.0.11-ahpha.1",
+    "crypto-js": "^4.2.0",
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.6",
     "grapheme-splitter": "^1.0.4",
     "image-tools": "^1.4.0",
     "md5": "^2.3.0",
-    "openim-uniapp-polyfill": "^1.4.1",
+    "openim-uniapp-polyfill": "^1.4.4",
     "uuid": "^9.0.0"
   }
 }
diff --git a/pages.json b/pages.json
index bcb3b6c..4fc1837 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,17 @@
 {
 	"pages": [
+		{
+			"path": "pages/index/guide",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/index/launch",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/common/login/index"
diff --git a/pages/common/createGroup/index.vue b/pages/common/createGroup/index.vue
index 02e7c5d..b68f51e 100644
--- a/pages/common/createGroup/index.vue
+++ b/pages/common/createGroup/index.vue
@@ -48,11 +48,7 @@
 
 <script>
 import { ContactChooseTypes } from "@/constant";
-import IMSDK, {
-  GroupType,
-  IMMethods,
-  SessionType,
-} from "openim-uniapp-polyfill";
+import IMSDK, {GroupType,IMMethods,SessionType,} from "openim-uniapp-polyfill";
 import CustomNavBar from "@/components/CustomNavBar/index.vue";
 import MyAvatar from "@/components/MyAvatar/index.vue";
 import { navigateToDesignatedConversation } from "@/util/imCommon";
diff --git a/pages/common/detailsFileds/index.vue b/pages/common/detailsFileds/index.vue
index d10f78c..00d055f 100644
--- a/pages/common/detailsFileds/index.vue
+++ b/pages/common/detailsFileds/index.vue
@@ -1,94 +1,93 @@
 <template>
-  <view class="details_container">
-    <custom-nav-bar title="个人资料" />
+	<view class="details_container">
+		<custom-nav-bar title="个人资料" />
 
-    <view class="info_list">
-      <user-info-row-item class="info_item" lable="头像" arrow>
-        <my-avatar
-          :src="sourceInfo.faceURL"
-          :desc="sourceInfo.nickname"
-          size="26"
-        />
-      </user-info-row-item>
-      <user-info-row-item class="info_item" lable="昵称" arrow>
-        <text class="right_content">{{ sourceInfo.nickname }}</text>
-      </user-info-row-item>
-      <user-info-row-item class="info_item" lable="性别" arrow>
-        <text class="right_content">{{ getGender }}</text>
-      </user-info-row-item>
-      <user-info-row-item class="info_item" lable="生日" arrow>
-        <text class="right_content">{{ getBirthStr }}</text>
-      </user-info-row-item>
-    </view>
+		<view class="info_list">
+			<user-info-row-item class="info_item" lable="头像" arrow>
+				<my-avatar :src="sourceInfo.faceURL" :desc="sourceInfo.nickname" size="26" />
+			</user-info-row-item>
+			<user-info-row-item class="info_item" lable="昵称" arrow>
+				<text class="right_content">{{ sourceInfo.nickname }}</text>
+			</user-info-row-item>
+			<user-info-row-item class="info_item" lable="性别" arrow>
+				<text class="right_content">{{ getGender }}</text>
+			</user-info-row-item>
+			<user-info-row-item class="info_item" lable="生日" arrow>
+				<text class="right_content">{{ getBirthStr }}</text>
+			</user-info-row-item>
+		</view>
 
-    <view class="info_list">
-      <user-info-row-item class="info_item" lable="手机号码" arrow>
-        <text class="right_content">{{ sourceInfo.phoneNumber || "-" }}</text>
-      </user-info-row-item>
-      <user-info-row-item class="info_item" lable="邮箱" arrow>
-        <text class="right_content">{{ sourceInfo.email || "-" }}</text>
-      </user-info-row-item>
-    </view>
-  </view>
+		<view class="info_list">
+			<user-info-row-item class="info_item" lable="手机号码" arrow>
+				<text class="right_content">{{ sourceInfo.phoneNumber || "-" }}</text>
+			</user-info-row-item>
+			<user-info-row-item class="info_item" lable="邮箱" arrow>
+				<text class="right_content">{{ sourceInfo.email || "-" }}</text>
+			</user-info-row-item>
+		</view>
+	</view>
 </template>
 
 <script>
-import dayjs from "dayjs";
-import CustomNavBar from "@/components/CustomNavBar/index.vue";
-import MyAvatar from "@/components/MyAvatar/index.vue";
-import UserInfoRowItem from "../userCard/components/UserInfoRowItem.vue";
-export default {
-  components: {
-    CustomNavBar,
-    MyAvatar,
-    UserInfoRowItem,
-  },
-  data() {
-    return {
-      sourceInfo: {},
-    };
-  },
-  computed: {
-    getGender() {
-      if (this.sourceInfo.gender === 1) {
-        return "男";
-      }
-      if (this.sourceInfo.gender === 2) {
-        return "女";
-      }
-      return "保密";
-    },
-    getBirthStr() {
-      const birth = this.sourceInfo.birth ?? 0;
-      return dayjs(birth).format("YYYY-MM-DD");
-    },
-  },
-  onLoad(options) {
-    const { sourceInfo } = options;
-    this.sourceInfo = JSON.parse(sourceInfo);
-  },
-};
+	import dayjs from "dayjs";
+	import CustomNavBar from "@/components/CustomNavBar/index.vue";
+	import MyAvatar from "@/components/MyAvatar/index.vue";
+	import UserInfoRowItem from "../userCard/components/UserInfoRowItem.vue";
+	import util from "@/util/index.js"
+	export default {
+		components: {
+			CustomNavBar,
+			MyAvatar,
+			UserInfoRowItem,
+		},
+		data() {
+			return {
+				sourceInfo: {},
+			};
+		},
+		computed: {
+			getGender() {
+				if (this.sourceInfo.gender === 1) {
+					return "男";
+				}
+				if (this.sourceInfo.gender === 2) {
+					return "女";
+				}
+				return "保密";
+			},
+			getBirthStr() {
+				const birth = this.sourceInfo.birth ?? 0;
+				return dayjs(birth).format("YYYY-MM-DD");
+			},
+		},
+		onLoad(options) {
+			const {
+				sourceInfo
+			} = options;
+			this.sourceInfo = util.aesdecode(sourceInfo);
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.details_container {
-  @include colBox(false);
-  height: 100vh;
-  background-color: #f6f6f6;
+	.details_container {
+		@include colBox(false);
+		height: 100vh;
+		background-color: #f6f6f6;
 
-  .info_list {
-    border-radius: 6px;
-    overflow: hidden;
-    margin: 24rpx;
+		.info_list {
+			border-radius: 6px;
+			overflow: hidden;
+			margin: 24rpx;
 
-    .info_item {
-      background-color: #fff;
-      // border-bottom: 1px solid rgba(153, 153, 153, 0.3);
+			.info_item {
+				background-color: #fff;
+				// border-bottom: 1px solid rgba(153, 153, 153, 0.3);
 
-      .right_content {
-        color: #999;
-      }
-    }
-  }
-}
-</style>
+				.right_content {
+					color: #999;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/groupCard/index.vue b/pages/common/groupCard/index.vue
index 4a1954d..e1d4423 100644
--- a/pages/common/groupCard/index.vue
+++ b/pages/common/groupCard/index.vue
@@ -50,6 +50,7 @@
 	import {navigateToDesignatedConversation} from "@/util/imCommon";
 	import IMSDK, {GroupVerificationType,SessionType,} from "openim-uniapp-polyfill";
 	import dayjs from "dayjs";
+	import util from "@/util/index.js"
 	import MyAvatar from "@/components/MyAvatar/index.vue";
 	import CustomNavBar from "@/components/CustomNavBar/index.vue";
 	import UserInfoRowItem from "../userCard/components/UserInfoRowItem.vue";
@@ -94,7 +95,7 @@
 				this.sourceID = sourceID;
 				this.getSourceGroupInfo();
 			} else {
-				const info = JSON.parse(sourceInfo);
+				const info = util.aesdecode(sourceInfo);
 				this.sourceID = info.groupID;
 				this.sourceGroupInfo = {
 					...info,
diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue
index 409001a..cf27a58 100644
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@@ -68,6 +68,8 @@ import { checkLoginError } from "@/util/common";
 import { SmsUserFor } from "@/constant";
 import IMSDK from "openim-uniapp-polyfill";
 import util from "@/util/index.js"
+import config from "@/common/config";
+import {getDbDir,toastWithCallback} from "@/util/common.js";
 
 let timer;
 
@@ -145,59 +147,48 @@ export default {
                 this.loginInfo.email = "commiu@outlook.com";
                 this.loginInfo.password = "qwe123";
             }
+			plus.navigator.closeSplashscreen();
         },
         updateEye() {
             this.eying = !this.eying;
         },
         toRegisterOrForget(isRegister) {
-            uni.$u.route("/pages/common/login/index", {
+            uni.$u.route("/pages/common/registerOrForget/index", {
                 isRegister,
             });
         },
         async startLogin() {
-            // this.$refs.loginForm.validate().then(async (valid) => {
-            this.loading = true;
-            this.saveLoginInfo();
-            let data = {};
-            try {
-                data = await businessLogin({
-                    mobile: this.loginInfo.phoneNumber,
-                    email: this.loginInfo.email,
-                    region: `+${this.loginInfo.region}`,
-                    password: this.isPwdLogin ? md5(this.loginInfo.password) : "",
-                    platform: uni.$u.os(),
-                    type: this.active === 0 ? 'mobile' : 'email',
-                    code: this.loginInfo.verificationCode,
-                });
-                const { imToken, userID } = data;
-				// #ifdef APP
-                await IMSDK.asyncApi(IMSDK.IMMethods.Login, uuidv4(), {
-                    userID,
-                    token: imToken,
-                });
-				// #endif
-                this.saveLoginProfile(data);
-                this.$store.commit("user/SET_AUTH_DATA", data);
-                this.$store.dispatch("user/getSelfInfo");
-                this.$store.dispatch("conversation/getConversationList");
-                this.$store.dispatch("conversation/getUnReadCount");
-                // this.$store.dispatch("contact/getFriendList");
-                // this.$store.dispatch("contact/getGrouplist");
-                this.$store.dispatch("contact/getBlacklist");
-                this.$store.dispatch("contact/getRecvFriendApplications");
-                this.$store.dispatch("contact/getSentFriendApplications");
-                this.$store.dispatch("contact/getRecvGroupApplications");
-                this.$store.dispatch("contact/getSentGroupApplications");
-                uni.switchTab({
-                    url: "/pages/conversation/conversationList/index",
-                });
-                this.loginInfo.password = "";
-            } catch (err) {
-                console.error(err);
-                uni.$u.toast(checkLoginError(err));
-            }
-            this.loading = false;
-            // });
+            this.$refs.loginForm.validate().then(async (valid) => {
+				this.loading = true;
+				this.saveLoginInfo();
+				let data = {};
+				try {
+					data = await businessLogin({
+						mobile: this.loginInfo.phoneNumber,
+						email: this.loginInfo.email,
+						region: `+${this.loginInfo.region}`,
+						password: this.isPwdLogin ? md5(this.loginInfo.password) : "",
+						platform: uni.$u.os(),
+						type: this.active === 0 ? 'mobile' : 'email',
+						code: this.loginInfo.verificationCode,
+					});
+					const { imToken, userID } = data;
+					this.saveLoginProfile(data);
+					this.$store.commit("user/SET_AUTH_DATA", data);
+					this.loginInfo.password = "";
+					// #ifdef APP
+					// await IMSDK.asyncApi(IMSDK.IMMethods.Login, uuidv4(), {
+					//     userID,
+					//     token: imToken,
+					// });
+					plus.runtime.restart();
+					// #endif
+				} catch (err) {
+					console.error(err);
+					uni.$u.toast(checkLoginError(err));
+				}
+				this.loading = false;
+            });
         },
         saveLoginProfile(data) {
             const { imToken, token, userID } = data;
diff --git a/pages/common/map.vue b/pages/common/map.vue
index e72f549..9dbb650 100644
--- a/pages/common/map.vue
+++ b/pages/common/map.vue
@@ -1,16 +1,12 @@
 <template>
 	<view class="map_page">
-		<u-navbar left-icon="arrow-left" @leftClick="back" placeholder bgColor="transparent">
-			<template slot="right">
-				<u-button type="primary" class="confirm_btn" size="mini" @click="confirm">确定</u-button>
-			</template>
-		</u-navbar>
 		<view style="display: flex; flex-direction: column; height: 100%;">
 			<!-- 使用web-view嵌入天地图 -->
 			<ly-map class="ly-map" 
 				v-if="lng && lat"
 				@onUserEvent="onUserEvent"
 				ref="map" 
+				:type="type"
 				:lonlat=[lng,lat]
 				:map-key="apikey" />
 			<view class="search_container" v-if="1==2">
@@ -24,10 +20,20 @@
 				</u-cell-group>
 			</view>
 		</view>
+		
+		<view class="map_info" v-if="type == 'viewlocation'">
+			<view class="left">
+				<u-text wordWrap="anywhere" size="16" :text="address"></u-text>
+			</view>
+			<u-button @click="gotoMap" class="right">
+				<uni-icons size="36" color="#07c160" type="paperplane-filled"></uni-icons>
+			</u-button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import util from "@/util/index.js"
 	export default {
 		data() {
 			return {
@@ -53,6 +59,7 @@
 			if(opt.address){
 				this.address = opt.address;
 			}
+			console.log(this.type)
 			this.init();
 		},
 		methods: {
@@ -72,10 +79,12 @@
 					})
 				}
 			},
+			gotoMap(){
+				util.toMapAPP(this.lng,this.lat,this.address);
+			},
 			onUserEvent(e) {
-				//console.log(e)
-				if(this.type=='chooselocation'){
-					if(e.type == "move"){
+				if(e.type == "move"){
+					if(this.type=='chooselocation'){
 						this.lng = e.lng;
 						this.lat = e.lat;
 						this.$refs.map.setMarkers([
@@ -84,10 +93,22 @@
 								lat: Number(e.lat)
 							}
 						]);
+						return ;
 					}
+					if(this.type=='viewlocation'){
+						return ;
+					}
+					return ;
 				}
-				if(this.type=='viewlocation'){
+				if(e.type=='back'){
+					uni.navigateBack();
+					return ;
 				}
+				if(e.type=='confirm'){
+					this.confirm();
+					return ;
+				}
+				//console.log(e)
 			},
 			/**
 			 * 确定位置按钮点击
@@ -153,8 +174,21 @@
 			flex: 1;
 			width: 100%;
 		}
-	}
-	.confirm_btn{
-		padding: 30rpx 10rpx;
+		.map_info{
+			height: 100rpx;
+			padding: 50rpx 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left{
+				flex:1;
+			}
+			.right{
+				width: 100rpx;
+				.u-button{
+					background-color: #ccc;
+				}
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/common/markOrIDPage/index.vue b/pages/common/markOrIDPage/index.vue
index ca73e07..e3878ca 100644
--- a/pages/common/markOrIDPage/index.vue
+++ b/pages/common/markOrIDPage/index.vue
@@ -17,6 +17,7 @@
 
 <script>
 	import IMSDK from "openim-uniapp-polyfill";
+	import util from "@/util/index.js"
 
 	import CustomNavBar from "@/components/CustomNavBar/index.vue";
 	import {
@@ -56,7 +57,7 @@
 				isSelfNickname,
 				sourceInfo
 			} = options;
-			this.sourceInfo = JSON.parse(sourceInfo);
+			this.sourceInfo = util.aesdecode(sourceInfo);
 			console.log(sourceInfo);
 			console.log(this.sourceInfo);
 			this.isRemark = !!isRemark;
diff --git a/pages/common/registerOrForget/index.vue b/pages/common/registerOrForget/index.vue
index 42b00b2..a426cdf 100644
--- a/pages/common/registerOrForget/index.vue
+++ b/pages/common/registerOrForget/index.vue
@@ -34,15 +34,10 @@
 
 <script>
 	import AreaPicker from "@/components/AreaPicker";
-	import {
-		businessSendSms
-	} from "@/api/login";
-	import {
-		SmsUserFor
-	} from "@/constant";
-	import {
-		checkLoginError
-	} from "@/util/common";
+	import {businessSendSms} from "@/api/login";
+	import {SmsUserFor} from "@/constant";
+	import {checkLoginError} from "@/util/common";
+	import util from "@/util/index.js"
 	export default {
 		components: {
 			AreaPicker,
@@ -99,7 +94,7 @@
 							setTimeout(
 								() =>
 								uni.$u.route("/pages/common/verifyCode/index", {
-									userInfo: JSON.stringify(this.userInfo),
+									userInfo: util.aesencode(this.userInfo),
 									isRegister: this.isRegister,
 								}),
 								1000,
diff --git a/pages/common/scan.vue b/pages/common/scan.vue
index 5f0502c..c120a1c 100644
--- a/pages/common/scan.vue
+++ b/pages/common/scan.vue
@@ -1,24 +1,9 @@
 <template>
 	<view class="scan_page" :style="{height:windowHeight+'px'}">
-		<uni-nav-bar 
-			left-icon="back"
-			 @clickLeft="back"
-			fixed 
-			backgroundColor="#FFF" 
-			statusBar
-			>
+		<uni-nav-bar left-icon="back" @clickLeft="back" fixed backgroundColor="#FFF" statusBar>
 		</uni-nav-bar>
-		<barcode id='1' 
-			class="barcode" 
-			ref="barcode" 
-			:autostart="true" 
-			background="rgb(0,0,0)" 
-			frameColor="#07c160" 
-			scanbarColor="#07c160" 
-			 :style="{height:windowHeight+'px'}"
-			:filters="fil" 
-			@marked="success" 
-			@error="fail">
+		<barcode id='1' class="barcode" ref="barcode" :autostart="true" background="rgb(0,0,0)" frameColor="#07c160"
+			scanbarColor="#07c160" :style="{height:windowHeight+'px'}" :filters="fil" @marked="success" @error="fail">
 		</barcode>
 		<view class="overlay">
 			<button class="btn" @click="toStart">开始扫码识别</button>
@@ -33,8 +18,8 @@
 	export default {
 		data() {
 			return {
-				fil: [0, 2, 1,3,4,12],
-				windowHeight:500,
+				fil: [0, 2, 1, 3, 4, 12],
+				windowHeight: 500,
 			}
 		},
 
@@ -52,10 +37,10 @@
 		},
 		methods: {
 			success(e) {
-				console.log("success1:" + JSON.stringify(e));
+				//console.log("success1:" + JSO1N.stringify(e));
 			},
 			fail(e) {
-				console.log("fail1:" + JSON.stringify(e));
+				//console.log("fail1:" + JSON1.stringify(e));
 			},
 			toStart: function() {
 				this.$refs.barcode.start({
@@ -63,7 +48,7 @@
 					filename: '_doc/barcode/'
 				});
 			},
-			tocancel:function(){
+			tocancel: function() {
 				this.$refs.barcode.cancel();
 			},
 			toFlash: function() {
@@ -73,12 +58,11 @@
 			toscan: function() {
 				console.log("scan:");
 				const barcodeModule = uni.requireNativePlugin('barcodeScan');
-				barcodeModule.scan("/static/barcode1.png"
-				,(e)=>{
-					console.log("scan_error:"+JSON.stringify(e));
+				barcodeModule.scan("/static/barcode1.png", (e) => {
+					console.log("scan_error:", e);
 				});
 			},
-			back(){
+			back() {
 				uni.navigateBack();
 			}
 		}
@@ -86,14 +70,15 @@
 </script>
 
 <style lang="scss" scoped>
-	.scan_page{
+	.scan_page {
 		width: 750rpx;
 		position: relative;
+
 		.barcode {
 			width: 750rpx;
 			background-color: #808080;
 		}
-		
+
 		.btn {
 			top: 20rpx;
 			width: 730rpx;
@@ -102,7 +87,8 @@
 			background-color: #458B00;
 			border-radius: 10rpx;
 		}
-		.overlay{
+
+		.overlay {
 			background: rgba(0, 0, 0, 0.1);
 			position: absolute;
 			bottom: 100rpx;
@@ -111,4 +97,4 @@
 			height: 200rpx;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/common/searchUserOrGroup/index.vue b/pages/common/searchUserOrGroup/index.vue
index 48d5883..4dd7c10 100644
--- a/pages/common/searchUserOrGroup/index.vue
+++ b/pages/common/searchUserOrGroup/index.vue
@@ -32,9 +32,8 @@
 
 	import searchGroup from "static/images/contact_add_join_group_fill.png";
 	import searchUser from "static/images/contact_add_search_user_fill.png";
-	import {
-		businessSearchUserInfo
-	} from "@/api/login";
+	import {businessSearchUserInfo} from "@/api/login";
+	import util from "@/util/index.js"
 
 	export default {
 		components: {
@@ -87,8 +86,9 @@
 							info = data[0];
 						}
 						if (info) {
+							const s = util.aesencode(info);
 							uni.navigateTo({
-								url: `/pages/common/groupCard/index?sourceInfo=${JSON.stringify(info,)}`,
+								url: `/pages/common/groupCard/index?sourceInfo=${s}`,
 							});
 						} else {
 							this.empty = true;
@@ -116,7 +116,7 @@
 						console.log(info)
 						if (info) {
 							uni.navigateTo({
-								url: `/pages/common/userCard/index?sourceInfo=${JSON.stringify(info,)}`,
+								url: `/pages/common/userCard/index?sourceID=${info.userID}`,
 							});
 						} else {
 							this.empty = true;
diff --git a/pages/common/setPassword/index.vue b/pages/common/setPassword/index.vue
index 5d59598..e2369f7 100644
--- a/pages/common/setPassword/index.vue
+++ b/pages/common/setPassword/index.vue
@@ -30,9 +30,8 @@
 </template>
 
 <script>
-	import {
-		businessReset
-	} from "@/api/login";
+	import {businessReset} from "@/api/login";
+	import util from "@/util/index.js"
 	export default {
 		data() {
 			return {
@@ -89,8 +88,8 @@
 				isRegister,
 				codeValue
 			} = options;
-			this.userInfo = JSON.parse(userInfo);
-			this.isRegister = JSON.parse(isRegister);
+			this.userInfo = util.aesdecode(userInfo);
+			this.isRegister = util.parse(isRegister);
 			this.codeValue = codeValue;
 		},
 		onBackPress() {
@@ -112,7 +111,7 @@
 						businessReset(options)
 							.then(() => {
 								uni.$u.toast("密码重置成功，请前往登录！");
-								setTimeout(() => uni.$u.route("/pages/login/index"), 1000);
+								setTimeout(() => uni.$u.route("/pages/common/login/index"), 1000);
 							})
 							.catch((err) => {
 								console.log('err', err)
diff --git a/pages/common/setSelfInfo/index.vue b/pages/common/setSelfInfo/index.vue
index 2c4b8e3..2915670 100644
--- a/pages/common/setSelfInfo/index.vue
+++ b/pages/common/setSelfInfo/index.vue
@@ -39,6 +39,7 @@
 	import { mapGetters } from "vuex";
 	import {		businessRegister	} from "@/api/login";
 	import {		checkLoginError	} from "@/util/common";
+	import util from "@/util/index.js"
 	export default {
 		components: {
 			MyAvatar,
@@ -104,7 +105,7 @@
 			const {userInfo,codeValue} = options;
 			this.userInfo = {
 				...this.userInfo,
-				...JSON.parse(userInfo),
+				...util.aesdecode(userInfo),
 			};
 			this.codeValue = codeValue;
 			if(process.env.NODE_ENV == 'development'){
@@ -143,12 +144,13 @@
 					await businessRegister(options);
 					this.saveLoginInfo();
 					uni.$u.toast('注册成功')
-					uni.$u.route("/pages/login/index")
+					uni.$u.route("/pages/common/login/index")
 				} catch (err) {
 					console.log(err);
 					if(err.msg=="验证码过期" || err.msg=="验证码错误"){
+						const s = util.aesencode(this.userInfo);
 						uni.$u.route("/pages/common/verifyCode/index", {
-							userInfo: JSON.stringify(this.userInfo),
+							userInfo: s,
 							isRegister: true,
 							resend: 1,
 						})
diff --git a/pages/common/userCard/components/UserInfoRowItem.vue b/pages/common/userCard/components/UserInfoRowItem.vue
index 4fb5bba..cfb7ab8 100644
--- a/pages/common/userCard/components/UserInfoRowItem.vue
+++ b/pages/common/userCard/components/UserInfoRowItem.vue
@@ -1,51 +1,55 @@
 <template>
-  <view @click="click" class="row_item" :class="{ arrow_right: arrow }">
-    <view class="title">
-      <text>{{ lable }}</text>
-    </view>
-    <view class="content">
-      <text>{{ content }}</text>
-    </view>
-    <slot>
-      <u-icon v-if="arrow" name="arrow-right" color="#999" size="20"></u-icon>
-    </slot>
-  </view>
+	<view @click="click" class="row_item" :class="{ arrow_right: arrow }">
+		<view class="title">
+			<text>{{ lable }}</text>
+		</view>
+		<view class="content">
+			<text>{{ content }}</text>
+		</view>
+		<slot>
+			<u-icon v-if="arrow" name="arrow-right" color="#999" size="20"></u-icon>
+		</slot>
+	</view>
 </template>
 
 <script>
-export default {
-  name: "",
-  components: {},
-  props: {
-    lable: String,
-    content: String,
-    arrow: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {};
-  },
-  methods: {
-    click() {
-      this.$emit("click");
-    },
-  },
-};
+	export default {
+		name: "",
+		components: {},
+		props: {
+			lable: String,
+			content: String,
+			arrow: {
+				type: Boolean,
+				default: false,
+			},
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			click() {
+				this.$emit("click");
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.row_item {
-  @include vCenterBox();
-  padding: 24rpx 44rpx;
-}
+	.row_item {
+		@include vCenterBox();
+		padding: 24rpx 44rpx;
+		.content{
+			display: flex;
+			align-items: center;
+		}
+	}
 
-.title {
-  margin-right: 24rpx;
-}
+	.title {
+		margin-right: 24rpx;
+	}
 
-.arrow_right {
-  justify-content: space-between;
-}
-</style>
+	.arrow_right {
+		justify-content: space-between;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/userCard/index.vue b/pages/common/userCard/index.vue
index d459bfa..6082520 100644
--- a/pages/common/userCard/index.vue
+++ b/pages/common/userCard/index.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="user_card_container">
 		<u-loading-page :loading="isLoading" loading-text="loading..."></u-loading-page>
-		<custom-nav-bar title="" />
+		<custom-nav-bar title="" @rightClick="toMoreInfo" more v-if="isFriend" />
+		<custom-nav-bar title="" v-else />
 
 		<view v-if="!isLoading" style="flex: 1;display: flex;flex-direction: column;">
 			<view class="base_info">
@@ -9,10 +10,7 @@
 					size="46" />
 				<view class="user_name">
 					<text class="text">{{ getShowName }}</text>
-					<text class="id" @click="copy(sourceUserInfo.userID)">{{sourceUserInfo.userID}}</text>
-				</view>
-				<view class="add_btn" @click="toAddFriend" v-if="trySendRequest">
-					<u-button type="primary" icon="man-add" text="添加"></u-button>
+					<text class="id" @click="copy(sourceUserInfo.userID || sourceUserInfo.id)">{{sourceUserInfo.userID || sourceUserInfo.id}}</text>
 				</view>
 			</view>
 			<view class="info_row">
@@ -20,15 +18,15 @@
 				<user-info-row-item lable="生日" :content="getBirth" />
 				<user-info-row-item lable="个性签名" :content="sourceUserInfo.bio" />
 			</view>
-			<view v-if="isFriend" class="info_row">
-				<user-info-row-item @click="toMoreInfo" lable="个人资料" arrow />
+			
+			<view class="info_row">
+				<user-info-row-item v-if="isFriend" @click="toMoreInfo" lable="更多信息" arrow />
+				<user-info-row-item v-if="1==1" @click="gotoCircle" lable="朋友圈" arrow />
 			</view>
-
+			
 			<view class="action_row" v-if="!isSelf">
-				<view @click="toDesignatedConversation" class="action_item">
-					<img src="static/images/user_card_message.png" alt="" />
-					<text>发消息</text>
-				</view>
+				<u-button type="primary" icon="chat" text="发消息" @click="toDesignatedConversation" v-if="isFriend"></u-button>
+				<u-button type="primary" icon="man-add" text="添加" @click="toAddFriend" v-else></u-button>
 			</view>
 		</view>
 	</view>
@@ -43,6 +41,7 @@
 	import UserInfoRowItem from "./components/UserInfoRowItem.vue";
 	import {businessSearchUserInfo} from "@/api/login";
 	import dayjs from "dayjs";
+	import util from "@/util/index.js"
 
 	export default {
 		components: {
@@ -106,7 +105,7 @@
 			if (sourceID) {
 				this.sourceID = sourceID;
 			} else {
-				const info = JSON.parse(sourceInfo);
+				const info = util.aesdecode(sourceInfo);
 				this.sourceID = info.userID;
 			}
 			//console.log(this.storeSelfInfo);
@@ -148,16 +147,8 @@
 				try {
 					const res = await businessSearchUserInfo(this.sourceID);
 					if (res.total > 0) {
-						const {
-							data
-						} = await IMSDK.asyncApi(
-							IMSDK.IMMethods.GetUsersInfo,
-							IMSDK.uuid(),
-							[this.sourceID+''],
-						);
-						const imData = data[0]?.friendInfo ?? data[0]?.publicInfo ?? {};
 						info = {
-							...imData,
+							...info,
 							...res.data[0],
 						};
 					}
@@ -177,6 +168,13 @@
 					notNeedVerification: false,
 				});
 			},
+			gotoCircle(){
+				console.log('gotoCircle');
+				return ;
+				uni.navigateTo({
+					url:"/pages/find/friend-circle/friend-circle?userId="+this.sourceID
+				})
+			},
 			toDesignatedConversation() {
 				navigateToDesignatedConversation(
 					this.sourceID,
@@ -185,8 +183,9 @@
 				).catch(() => uni.$u.toast("获取会话信息失败"));
 			},
 			toMoreInfo() {
+				const s = util.aesencode(this.sourceUserInfo);
 				uni.navigateTo({
-					url: `/pages/common/userCardMore/index?sourceInfo=${JSON.stringify(this.sourceUserInfo,)}`,
+					url: `/pages/common/userCardMore/index?sourceInfo=${s}`,
 				});
 			}
 		},
@@ -207,16 +206,6 @@
 			padding: 44rpx;
 			margin-bottom: 18rpx;
 
-			.add_btn {
-				width: 140rpx;
-				height: 60rpx;
-				margin-left: auto;
-
-				.u-button {
-					width: 140rpx;
-					height: 60rpx;
-				}
-			}
 
 			.u-avatar {
 				margin-right: 24rpx;
@@ -226,7 +215,6 @@
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-				margin-bottom: 12rpx;
 				height: 46px;
 
 				.text {
@@ -271,23 +259,6 @@
 			margin: 44rpx;
 			flex: 1;
 
-			.action_item {
-				width: 100%;
-				@include colBox(true);
-				flex-direction: row;
-				align-items: center;
-				justify-content: center;
-				padding: 22rpx 0;
-				background: $u-primary;
-				color: #fff;
-				border-radius: 12rpx;
-
-				img {
-					margin-right: 16rpx;
-					width: 40rpx;
-					height: 40rpx;
-				}
-			}
 		}
 
 		.id {
diff --git a/pages/common/userCardMore/index.vue b/pages/common/userCardMore/index.vue
index a0c3987..90da1db 100644
--- a/pages/common/userCardMore/index.vue
+++ b/pages/common/userCardMore/index.vue
@@ -26,9 +26,8 @@
 	import IMSDK from "openim-uniapp-polyfill";
 	import CustomNavBar from "@/components/CustomNavBar/index.vue";
 	import UserInfoRowItem from "../userCard/components/UserInfoRowItem.vue";
-	import {
-		ContactChooseTypes
-	} from "@/constant";
+	import {ContactChooseTypes} from "@/constant";
+	import util from "@/util/index.js"
 	export default {
 		components: {
 			CustomNavBar,
@@ -59,7 +58,7 @@
 		},
 		onLoad(options) {
 			const {sourceInfo} = options;
-			this.sourceInfo = JSON.parse(sourceInfo);
+			this.sourceInfo = util.aesdecode(sourceInfo);
 		},
 		methods: {
 			change(isBlack) {
@@ -81,18 +80,21 @@
 					.finally(() => (this.showConfirm = false));
 			},
 			toMore() {
+				const s = util.aesencode(this.sourceInfo);
 				uni.navigateTo({
-					url: `/pages/common/detailsFileds/index?sourceInfo=${JSON.stringify(this.sourceInfo,)}`,
+					url: `/pages/common/detailsFileds/index?sourceInfo=${s}`,
 				});
 			},
 			toMark() {
+				const s = util.aesencode(this.sourceInfo);
 				uni.navigateTo({
-					url: `/pages/common/markOrIDPage/index?isRemark=true&sourceInfo=${JSON.stringify(this.sourceInfo,)}`,
+					url: `/pages/common/markOrIDPage/index?isRemark=true&sourceInfo=${s}`,
 				});
 			},
 			toShare() {
+				const s = util.aesencode(this.sourceInfo);
 				uni.navigateTo({
-					url: `/pages/common/contactChoose/index?type=${ContactChooseTypes.ShareCard}&cardInfo=${JSON.stringify(this.sourceInfo)}`,
+					url: `/pages/common/contactChoose/index?type=${ContactChooseTypes.ShareCard}&cardInfo=${s}`,
 				});
 			},
 			showToast(message) {
diff --git a/pages/common/userOrGroupQrCode.vue b/pages/common/userOrGroupQrCode.vue
index dc69e02..144c0e6 100644
--- a/pages/common/userOrGroupQrCode.vue
+++ b/pages/common/userOrGroupQrCode.vue
@@ -74,7 +74,7 @@
 		},
 		onLoad(opt) {
 			if(opt.sourceInfo){
-				this.source = JSON.parse(opt.sourceInfo);
+				this.source = util.aesdecode(opt.sourceInfo);
 			}else{
 				this.source = {
 					type:"user",
diff --git a/pages/common/verifyCode/index.vue b/pages/common/verifyCode/index.vue
index 6bba3d6..b08e74b 100644
--- a/pages/common/verifyCode/index.vue
+++ b/pages/common/verifyCode/index.vue
@@ -22,10 +22,11 @@
 	</view>
 </template>
 <script>
-	import user from "../../../store/modules/user";
-	import {		businessSendSms,		businessVerifyCode	} from "@/api/login";
-	import {		SmsUserFor	} from "@/constant";
-	import {		checkLoginError	} from "@/util/common";
+	import user from "@/store/modules/user";
+	import {businessSendSms,businessVerifyCode} from "@/api/login";
+	import {SmsUserFor} from "@/constant";
+	import {checkLoginError	} from "@/util/common";
+	import util from "@/util/index.js"
 	let timer;
 	export default {
 		data() {
@@ -49,7 +50,7 @@
 				resend
 			} = options;
 			console.log(userInfo,isRegister)
-			this.userInfo = JSON.parse(userInfo);
+			this.userInfo = util.aesdecode(userInfo);
 			this.isRegister = JSON.parse(isRegister);
 			if(resend == 1){
 				this.count = 0;
@@ -61,7 +62,7 @@
 		onReady() {},
 		methods: {
 			back() {
-				uni.$u.route("/pages/common/login/index", {
+				uni.$u.route("/pages/common/registerOrForget/index", {
 					isRegister: this.isRegister,
 				});
 			},
@@ -76,15 +77,16 @@
 				};
 				businessVerifyCode(options)
 					.then(() => {
+						const s = util.aesencode(this.userInfo);
 						if (this.isRegister) {
 							uni.$u.route("/pages/common/setSelfInfo/index", {
-								userInfo: JSON.stringify(this.userInfo),
+								userInfo: s,
 								isRegister: this.isRegister,
 								codeValue: this.codeValue,
 							});
 						} else {
 							uni.$u.route("/pages/common/setPassword/index", {
-								userInfo: JSON.stringify(this.userInfo),
+								userInfo: s,
 								isRegister: !this.isRegister,
 								codeValue: this.codeValue,
 							});
diff --git a/pages/contact/applicationDetails/index.vue b/pages/contact/applicationDetails/index.vue
index ba81ec0..72a0eac 100644
--- a/pages/contact/applicationDetails/index.vue
+++ b/pages/contact/applicationDetails/index.vue
@@ -1,256 +1,245 @@
 <template>
-  <view class="page_container">
-    <custom-nav-bar :title="isGroupApplication ? '群通知' : '好友请求'" />
+	<view class="page_container">
+		<custom-nav-bar :title="isGroupApplication ? '群通知' : '好友请求'" />
 
-    <view class="application_item">
-      <view class="base_info_row">
-        <view class="base_info_left" @click="toSourceDetails">
-          <my-avatar :src="getSourceFaceURL" :desc="getSourceName" />
-          <view class="base_info_details">
-            <text class="nickname">{{ getSourceName }}</text>
-          </view>
-        </view>
+		<view class="application_item">
+			<view class="base_info_row">
+				<view class="base_info_left" @click="toSourceDetails">
+					<my-avatar :src="getSourceFaceURL" :desc="getSourceName" />
+					<view class="base_info_details">
+						<text class="nickname">{{ getSourceName }}</text>
+					</view>
+				</view>
 
-        <u-icon name="arrow-right" size="18" color="#999"></u-icon>
-      </view>
+				<u-icon name="arrow-right" size="18" color="#999"></u-icon>
+			</view>
 
-      <view class="request_message">
-        <view v-if="isGroupApplication" class="title">
-          <text>申请加入 </text>
-          <text class="group_name">{{ currentApplication.groupName }}</text>
-        </view>
-        <text v-else>{{ `${getSourceName}：` }}</text>
-        <text>{{ currentApplication.reqMsg }}</text>
-      </view>
+			<view class="request_message">
+				<view v-if="isGroupApplication" class="title">
+					<text>申请加入 </text>
+					<text class="group_name">{{ currentApplication.groupName }}</text>
+				</view>
+				<text v-else>{{ `${getSourceName}：` }}</text>
+				<text>{{ currentApplication.reqMsg }}</text>
+			</view>
 
-    </view>
+		</view>
 
-    <view class="action_row">
-      <u-button
-        :loading="loadingState.accept"
-        @click="acceptAplication"
-        type="primary"
-        :plain="true"
-        :text="`通过${isGroupApplication ? '入群' : '好友'}申请`"
-      ></u-button>
-    </view>
+		<view class="action_row">
+			<u-button :loading="loadingState.accept" @click="acceptAplication" type="primary" :plain="true"
+				:text="`通过${isGroupApplication ? '入群' : '好友'}申请`"></u-button>
+		</view>
 
-    <view class="action_row">
-      <u-button
-        :loading="loadingState.refuse"
-        @click="refuseAplication"
-        type="primary"
-        :plain="true"
-        :text="`拒绝${isGroupApplication ? '入群' : '好友'}申请`"
-      ></u-button>
-    </view>
-  </view>
+		<view class="action_row">
+			<u-button :loading="loadingState.refuse" @click="refuseAplication" type="primary" :plain="true"
+				:text="`拒绝${isGroupApplication ? '入群' : '好友'}申请`"></u-button>
+		</view>
+	</view>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import IMSDK, { GroupJoinSource } from "openim-uniapp-polyfill";
-import CustomNavBar from "@/components/CustomNavBar/index.vue";
-import MyAvatar from "@/components/MyAvatar/index.vue";
-export default {
-  components: {
-    CustomNavBar,
-    MyAvatar,
-  },
-  data() {
-    return {
-      currentApplication: {},
-      isOnline: false,
-      loadingState: {
-        accept: false,
-        refuse: false,
-      },
-    };
-  },
-  computed: {
-    ...mapGetters(["storeSelfInfo"]),
-    isGroupApplication() {
-      return this.currentApplication.groupID !== undefined;
-    },
-    getSourceID() {
-      return (
-        this.currentApplication.fromUserID ?? this.currentApplication.userID
-      );
-    },
-    getSourceName() {
-      return (
-        this.currentApplication.fromNickname ?? this.currentApplication.nickname
-      );
-    },
-    getSourceFaceURL() {
-      return (
-        this.currentApplication.fromFaceURL ?? this.currentApplication.faceURL
-      );
-    },
-  },
-  onLoad(options) {
-    const { application } = options;
-    this.currentApplication = JSON.parse(application);
-  },
-  methods: {
-    toSourceDetails() {
-      uni.navigateTo({
-        url: `/pages/common/userCard/index?sourceID=${this.getSourceID}`,
-      });
-    },
-    acceptAplication() {
-      this.loadingState.accept = true;
-      let func;
-      if (this.isGroupApplication) {
-        func = IMSDK.asyncApi(
-          IMSDK.IMMethods.AcceptGroupApplication,
-          IMSDK.uuid(),
-          {
-            groupID: this.currentApplication.groupID,
-            fromUserID: this.currentApplication.userID,
-            handleMsg: "",
-          },
-        );
-      } else {
-        console.log(this.currentApplication);
-        func = IMSDK.asyncApi(
-          IMSDK.IMMethods.AcceptFriendApplication,
-          IMSDK.uuid(),
-          {
-            toUserID: this.currentApplication.fromUserID,
-            handleMsg: "",
-          },
-        );
-      }
-      func
-        .then(() => {
-          uni.$u.toast("操作成功");
-          setTimeout(() => uni.navigateBack(), 500);
-        })
-        .catch((e) => {
-          console.log(e);
-          uni.$u.toast("操作失败");
-        })
-        .finally(() => (this.loadingState.accept = false));
-    },
-    refuseAplication() {
-      this.loadingState.refuse = true;
-      let func;
-      if (this.isGroupApplication) {
-        func = IMSDK.asyncApi(
-          IMSDK.IMMethods.RefuseGroupApplication,
-          IMSDK.uuid(),
-          {
-            groupID: this.currentApplication.groupID,
-            fromUserID: this.currentApplication.userID,
-            handleMsg: "",
-          },
-        );
-      } else {
-        func = IMSDK.asyncApi(
-          IMSDK.IMMethods.RefuseFriendApplication,
-          IMSDK.uuid(),
-          {
-            toUserID: this.currentApplication.fromUserID,
-            handleMsg: "",
-          },
-        );
-      }
-      func
-        .then(() => {
-          uni.$u.toast("操作成功");
-          setTimeout(() => uni.navigateBack(), 250);
-        })
-        .catch(() => uni.$u.toast("操作失败"))
-        .finally(() => (this.loadingState.refuse = false));
-    },
-  },
-};
+	import {mapGetters} from "vuex";
+	import IMSDK, {GroupJoinSource} from "openim-uniapp-polyfill";
+	import CustomNavBar from "@/components/CustomNavBar/index.vue";
+	import MyAvatar from "@/components/MyAvatar/index.vue";
+	import util from "@/util/index.js"
+	export default {
+		components: {
+			CustomNavBar,
+			MyAvatar,
+		},
+		data() {
+			return {
+				currentApplication: {},
+				isOnline: false,
+				loadingState: {
+					accept: false,
+					refuse: false,
+				},
+			};
+		},
+		computed: {
+			...mapGetters(["storeSelfInfo"]),
+			isGroupApplication() {
+				return this.currentApplication.groupID !== undefined;
+			},
+			getSourceID() {
+				return (
+					this.currentApplication.fromUserID ?? this.currentApplication.userID
+				);
+			},
+			getSourceName() {
+				return (
+					this.currentApplication.fromNickname ?? this.currentApplication.nickname
+				);
+			},
+			getSourceFaceURL() {
+				return (
+					this.currentApplication.fromFaceURL ?? this.currentApplication.faceURL
+				);
+			},
+		},
+		onLoad(options) {
+			const {
+				application
+			} = options;
+			this.currentApplication = util.aesdecode(application);
+		},
+		methods: {
+			toSourceDetails() {
+				uni.navigateTo({
+					url: `/pages/common/userCard/index?sourceID=${this.getSourceID}`,
+				});
+			},
+			acceptAplication() {
+				this.loadingState.accept = true;
+				let func;
+				if (this.isGroupApplication) {
+					func = IMSDK.asyncApi(
+						IMSDK.IMMethods.AcceptGroupApplication,
+						IMSDK.uuid(), {
+							groupID: this.currentApplication.groupID,
+							fromUserID: this.currentApplication.userID,
+							handleMsg: "",
+						},
+					);
+				} else {
+					console.log(this.currentApplication);
+					func = IMSDK.asyncApi(
+						IMSDK.IMMethods.AcceptFriendApplication,
+						IMSDK.uuid(), {
+							toUserID: this.currentApplication.fromUserID,
+							handleMsg: "",
+						},
+					);
+				}
+				func
+					.then(() => {
+						uni.$u.toast("操作成功");
+						setTimeout(() => uni.navigateBack(), 500);
+					})
+					.catch((e) => {
+						console.log(e);
+						uni.$u.toast("操作失败");
+					})
+					.finally(() => (this.loadingState.accept = false));
+			},
+			refuseAplication() {
+				this.loadingState.refuse = true;
+				let func;
+				if (this.isGroupApplication) {
+					func = IMSDK.asyncApi(
+						IMSDK.IMMethods.RefuseGroupApplication,
+						IMSDK.uuid(), {
+							groupID: this.currentApplication.groupID,
+							fromUserID: this.currentApplication.userID,
+							handleMsg: "",
+						},
+					);
+				} else {
+					func = IMSDK.asyncApi(
+						IMSDK.IMMethods.RefuseFriendApplication,
+						IMSDK.uuid(), {
+							toUserID: this.currentApplication.fromUserID,
+							handleMsg: "",
+						},
+					);
+				}
+				func
+					.then(() => {
+						uni.$u.toast("操作成功");
+						setTimeout(() => uni.navigateBack(), 250);
+					})
+					.catch(() => uni.$u.toast("操作失败"))
+					.finally(() => (this.loadingState.refuse = false));
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page_container {
-  background-color: #f8f8f8;
+	.page_container {
+		background-color: #f8f8f8;
 
-  .application_item {
-    padding: 72rpx 44rpx 24rpx;
-    background-color: #fff;
+		.application_item {
+			padding: 72rpx 44rpx 24rpx;
+			background-color: #fff;
 
-    .base_info_row {
-      @include btwBox();
+			.base_info_row {
+				@include btwBox();
 
-      .base_info_left {
-        @include vCenterBox();
-      }
+				.base_info_left {
+					@include vCenterBox();
+				}
 
-      .base_info_details {
-        margin-left: 24rpx;
+				.base_info_details {
+					margin-left: 24rpx;
 
-        .nickname {
-          @include nomalEllipsis();
-          max-width: 600rpx;
-        }
+					.nickname {
+						@include nomalEllipsis();
+						max-width: 600rpx;
+					}
 
-        .online_state {
-          @include vCenterBox();
-          flex-direction: row;
-          font-size: 24rpx;
-          color: #999;
-          margin-top: 6rpx;
+					.online_state {
+						@include vCenterBox();
+						flex-direction: row;
+						font-size: 24rpx;
+						color: #999;
+						margin-top: 6rpx;
 
-          .dot {
-            background-color: #10cc64;
-            width: 12rpx;
-            height: 12rpx;
-            border-radius: 50%;
-            margin-right: 12rpx;
-          }
-        }
-      }
-    }
+						.dot {
+							background-color: #10cc64;
+							width: 12rpx;
+							height: 12rpx;
+							border-radius: 50%;
+							margin-right: 12rpx;
+						}
+					}
+				}
+			}
 
-    .request_message {
-      background-color: #eee;
-      margin-top: 48rpx;
-      padding: 24rpx 36rpx;
-      border-radius: 12rpx;
-      font-size: 28rpx;
-      color: #666;
-      min-height: 240rpx;
+			.request_message {
+				background-color: #eee;
+				margin-top: 48rpx;
+				padding: 24rpx 36rpx;
+				border-radius: 12rpx;
+				font-size: 28rpx;
+				color: #666;
+				min-height: 240rpx;
 
-      .title {
-        margin-bottom: 12rpx;
-        color: $uni-text-color;
+				.title {
+					margin-bottom: 12rpx;
+					color: $uni-text-color;
 
-        .group_name {
-          @nomalEllipsis();
-          max-width: 400rpx;
-          color: $uni-color-primary;
-          margin-left: 12rpx;
-        }
-      }
-    }
+					.group_name {
+						@nomalEllipsis();
+						max-width: 400rpx;
+						color: $uni-color-primary;
+						margin-left: 12rpx;
+					}
+				}
+			}
 
-    .join_source {
-      margin-top: 20rpx;
-      font-size: 24rpx;
-      color: #666;
-      text-align: right;
-    }
-  }
+			.join_source {
+				margin-top: 20rpx;
+				font-size: 24rpx;
+				color: #666;
+				text-align: right;
+			}
+		}
 
-  .action_row {
-    margin-top: 24rpx;
+		.action_row {
+			margin-top: 24rpx;
 
-    .u-button {
-      border: none;
-    }
+			.u-button {
+				border: none;
+			}
 
-    &:last-child {
-      .u-button {
-        color: #999 !important;
-      }
-    }
-  }
-}
-</style>
+			&:last-child {
+				.u-button {
+					color: #999 !important;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/contact/applicationList/ApplicationItem.vue b/pages/contact/applicationList/ApplicationItem.vue
index 3a6b198..c1eada4 100644
--- a/pages/contact/applicationList/ApplicationItem.vue
+++ b/pages/contact/applicationList/ApplicationItem.vue
@@ -28,13 +28,10 @@
 </template>
 
 <script>
-	import {
-		navigateToDesignatedConversation
-	} from "@/util/imCommon";
-	import IMSDK, {
-		SessionType
-	} from "openim-uniapp-polyfill";
+	import {navigateToDesignatedConversation} from "@/util/imCommon";
+	import IMSDK, {SessionType} from "openim-uniapp-polyfill";
 	import MyAvatar from "@/components/MyAvatar/index.vue";
+	import util from "@/util/index.js"
 	export default {
 		name: "ApplicationItem",
 		components: {
@@ -97,17 +94,12 @@
 		methods: {
 			clickItem() {
 				if (this.showAccept) {
+					const s = util.aesencode(this.application);
 					uni.navigateTo({
-						url: `/pages/contact/applicationDetails/index?application=${JSON.stringify(
-            this.application,
-          )}`,
+						url: `/pages/contact/applicationDetails/index?application=${s}`,
 					});
 				} else {
-					let sourceID =
-						this.application.groupID ??
-						(this.isRecv ?
-							this.application.fromUserID :
-							this.application.toUserID);
+					let sourceID = this.application.groupID ?? (this.isRecv ? this.application.fromUserID : this.application.toUserID);
 					let cardType = this.isGroupApplication ? "groupCard" : "userCard";
 					const url = `/pages/common/${cardType}/index?sourceID=${sourceID}`;
 					uni.navigateTo({
diff --git a/pages/contact/applicationListDetails/index.vue b/pages/contact/applicationListDetails/index.vue
index 2f83e5e..a35906f 100644
--- a/pages/contact/applicationListDetails/index.vue
+++ b/pages/contact/applicationListDetails/index.vue
@@ -1,81 +1,81 @@
 <template>
-  <view class="application_list_container">
-    <custom-nav-bar :title="getTitle" />
+	<view class="application_list_container">
+		<custom-nav-bar :title="getTitle" />
 
-    <u-list class="application_list">
-      <u-list-item
-        v-for="application in getRenderData"
-        :key="getKey(application)"
-      >
-        <application-item :isRecv="isRecv" :application="application" />
-      </u-list-item>
-    </u-list>
-  </view>
+		<u-list class="application_list">
+			<u-list-item v-for="application in getRenderData" :key="getKey(application)">
+				<application-item :isRecv="isRecv" :application="application" />
+			</u-list-item>
+		</u-list>
+	</view>
 </template>
 
 <script>
-import CustomNavBar from "@/components/CustomNavBar/index.vue";
-import ApplicationItem from "../applicationList/ApplicationItem.vue";
-export default {
-  components: {
-    CustomNavBar,
-    ApplicationItem,
-  },
-  data() {
-    return {
-      isGroupApplication: false,
-      isRecv: false,
-    };
-  },
-  computed: {
-    getRenderData() {
-      let getterKey = this.isRecv
-        ? "storeRecvFriendApplications"
-        : "storeSentFriendApplications";
-      if (this.isGroupApplication) {
-        getterKey = this.isRecv
-          ? "storeRecvGroupApplications"
-          : "storeSentGroupApplications";
-      }
-      return [...this.$store.getters[getterKey]].sort((a, b) =>
-        a.handleResult === 0 ? -1 : 1,
-      );
-    },
-    getKey() {
-      return (application) => {
-        if (this.isGroupApplication) {
-          return this.isRecv
-            ? application.userID + application.groupID
-            : application.groupID;
-        }
-        return application[this.isRecv ? "fromUserID" : "toUserID"];
-      };
-    },
-    getTitle() {
-      if (!this.isRecv) {
-        return "我的申请";
-      }
-      return this.isGroupApplication ? "群通知" : "好友请求";
-    },
-  },
-  onLoad(options) {
-    const { isGroupApplication, isRecv } = options;
-    this.isGroupApplication = JSON.parse(isGroupApplication);
-    this.isRecv = JSON.parse(isRecv);
-  },
-  methods: {},
-};
+	import CustomNavBar from "@/components/CustomNavBar/index.vue";
+	import ApplicationItem from "../applicationList/ApplicationItem.vue";
+	export default {
+		components: {
+			CustomNavBar,
+			ApplicationItem,
+		},
+		data() {
+			return {
+				isGroupApplication: false,
+				isRecv: false,
+			};
+		},
+		computed: {
+			getRenderData() {
+				let getterKey = this.isRecv ?
+					"storeRecvFriendApplications" :
+					"storeSentFriendApplications";
+				if (this.isGroupApplication) {
+					getterKey = this.isRecv ?
+						"storeRecvGroupApplications" :
+						"storeSentGroupApplications";
+				}
+				return [...this.$store.getters[getterKey]].sort((a, b) =>
+					a.handleResult === 0 ? -1 : 1,
+				);
+			},
+			getKey() {
+				return (application) => {
+					if (this.isGroupApplication) {
+						return this.isRecv ?
+							application.userID + application.groupID :
+							application.groupID;
+					}
+					return application[this.isRecv ? "fromUserID" : "toUserID"];
+				};
+			},
+			getTitle() {
+				if (!this.isRecv) {
+					return "我的申请";
+				}
+				return this.isGroupApplication ? "群通知" : "好友请求";
+			},
+		},
+		onLoad(options) {
+			const {
+				isGroupApplication,
+				isRecv
+			} = options;
+			this.isGroupApplication = JSON.parse(isGroupApplication);
+			this.isRecv = JSON.parse(isRecv);
+		},
+		methods: {},
+	};
 </script>
 
 <style lang="scss" scoped>
-.application_list_container {
-  @include colBox(false);
-  height: 100vh;
-  background-color: #f8f8f8;
+	.application_list_container {
+		@include colBox(false);
+		height: 100vh;
+		background-color: #f8f8f8;
 
-  .application_list {
-    margin-top: 24rpx;
-    flex: 1;
-  }
-}
-</style>
+		.application_list {
+			margin-top: 24rpx;
+			flex: 1;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/contact/contactAdd/index.vue b/pages/contact/contactAdd/index.vue
index 1165e90..08e947d 100644
--- a/pages/contact/contactAdd/index.vue
+++ b/pages/contact/contactAdd/index.vue
@@ -26,15 +26,15 @@
 					{
 						idx: 0,
 						title: "创建群聊",
-						desc: "创建群聊，全面使用OpenIM",
+						desc: "创建群聊",
 						icon: contact_add_create_group_img,
 					},
-					{
-						idx: 1,
-						title: "添加群聊",
-						desc: "向管理员或团队成员询问ID",
-						icon: rcontact_add_join_group_img,
-					},
+					// {
+					// 	idx: 1,
+					// 	title: "添加群聊",
+					// 	desc: "向管理员或团队成员询问ID",
+					// 	icon: contact_add_join_group_img,
+					// },
 				],
 				friendActionMenus: [
 					{
diff --git a/pages/contact/friendList/index.vue b/pages/contact/friendList/index.vue
index d95efaa..ca0d634 100644
--- a/pages/contact/friendList/index.vue
+++ b/pages/contact/friendList/index.vue
@@ -15,7 +15,7 @@
 		</view>
 		<uni-list class="contact_menus">
 			<uni-list-item title="新的好友" :showBadge="storeUnHandleFriendApplicationNum>0" :badgeText="storeUnHandleFriendApplicationNum+''" badgeType="error" thumbSize="lg" to="/pages/contact/applicationList/index?applicationType=NewFriend" thumb="/static/images/contact_new_friend.png"></uni-list-item>
-			<uni-list-item title="新的群组" thumbSize="lg" to="/pages/contact/applicationList/index?applicationType=NewGroup" thumb="/static/images/contact_new_group.png"></uni-list-item>
+<!-- 			<uni-list-item title="新的群组" thumbSize="lg" to="/pages/contact/applicationList/index?applicationType=NewGroup" thumb="/static/images/contact_new_group.png"></uni-list-item> -->
 			<uni-list-item title="群聊" thumbSize="lg" to="/pages/contact/groupList/index" thumb="/static/images/contact_my_group.png"></uni-list-item>
 		</uni-list>
 
diff --git a/pages/conversation/chating/components/ChatingFooter/index.vue b/pages/conversation/chating/components/ChatingFooter/index.vue
index 46febae..bba4622 100644
--- a/pages/conversation/chating/components/ChatingFooter/index.vue
+++ b/pages/conversation/chating/components/ChatingFooter/index.vue
@@ -251,12 +251,15 @@
 							const realVideoPath = await getPurePath(item);
 							console.log('处理后的可用路径', realVideoPath);
 							const info = await getVideoInfo(realVideoPath);
-                            const cover = await getVideoCover(item);
+                            //const cover = await getVideoCover(item);
+							const res1 = await IMSDK.getVideoCover(item);
+							//console.log(res1.path);
                             const videoParams = {
                                 videoPath: realVideoPath,
                                 videoType: "mp4",
                                 duration: info.duration,
-                                snapshotPath: getPurePath(cover),
+                                snapshotPath: getPurePath(res1.path),
+                                //snapshotPath: getPurePath(cover),
                             };
 							console.log('videoParams', videoParams);
 							message = await IMSDK.asyncApi(
@@ -271,7 +274,7 @@
 								getPurePath(item)
 							);
 						}
-						console.log(message);
+						//console.log(message);
 						if(message){
 							_this.sendMessage(message,_this.storeCurrentConversation.userID,_this.storeCurrentConversation.groupID);
 						}
@@ -416,10 +419,16 @@
                             return ; 
                         }
                         if(e.source == "album"){
+							// IMSDK.pickFile().then(res=>{
+							// 	console.log(res);
+							// }).catch(e=>{
+							// 	console.log(e);
+							// });
+							// return;
                             plus.gallery.pick(({files})=>{
                                 _this.sendMediaMesage(files);
                             }, (error )=>{
-                                reject(error);
+                                console.log(error); 
                             }, {
                                 animation:true,
                                 confirmText:"确定",
diff --git a/pages/conversation/chating/components/ChatingHeader.vue b/pages/conversation/chating/components/ChatingHeader.vue
index ad05f62..4446bc3 100644
--- a/pages/conversation/chating/components/ChatingHeader.vue
+++ b/pages/conversation/chating/components/ChatingHeader.vue
@@ -23,12 +23,8 @@
 </template>
 
 <script>
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		SessionType
-	} from "openim-uniapp-polyfill";
+	import {mapGetters} from "vuex";
+	import {SessionType} from "openim-uniapp-polyfill";
 	import MyAvatar from "@/components/MyAvatar/index.vue";
 
 	export default {
diff --git a/pages/conversation/chating/components/MessageItem/LocationMessageRender.vue b/pages/conversation/chating/components/MessageItem/LocationMessageRender.vue
index a025d23..32d133f 100644
--- a/pages/conversation/chating/components/MessageItem/LocationMessageRender.vue
+++ b/pages/conversation/chating/components/MessageItem/LocationMessageRender.vue
@@ -21,8 +21,9 @@
 			src="/static/images/sync_error.png">
 		</u--image>
 		<u--text class="address" :style="{
-			width:selfWidth+'px'
-		}" :lines="1" :size="20" :text="desc"></u--text>
+			width:selfWidth+'px',
+			paddingTop:'5px'
+		}" :lines="1" :size="16" :text="desc"></u--text>
 	</view>
 </template>
 
@@ -38,7 +39,6 @@
 		data() {
 			return {
 				selfWidth:200,
-				loadingWidth: "200px",
 				src:"",
 				coverDownloading:false,
 				coverDownloadProgress:"",
@@ -48,12 +48,13 @@
 			};
 		},
 		created() {
+			this.selfWidth = uni.$u.getPx('400rpx');
 			let loc = this.message.locationElem;
 			this.desc = loc.description;
 			this.apisrc = "http://api.tianditu.gov.cn/staticimage?"
 				+"center="+loc.longitude+","+loc.latitude
 				+"&width=400"
-				+"&height=300"
+				+"&height=250"
 				+"&zoom=10"
 				+"&markers="+loc.longitude+","+loc.latitude
 				+"&tk=5255a4be64441ba9fa2ebe605ca472bf";
@@ -94,7 +95,6 @@
 				})
 			},
 			onLoaded() {
-				this.loadingWidth = "auto";
 			},
 
 		},
@@ -104,7 +104,6 @@
 <style lang="scss" scoped>
 	.location_message_container{
 		.address{
-			margin-top: 20rpx;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/conversation/chating/components/MessageItem/NotificationRender.vue b/pages/conversation/chating/components/MessageItem/NotificationRender.vue
new file mode 100644
index 0000000..44d0609
--- /dev/null
+++ b/pages/conversation/chating/components/MessageItem/NotificationRender.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="text_message_container bg_container" v-if="notification.contentType == 101">
+		<u-parse :content="getContent" :previewImg="false" :showImgMenu="false" selectable></u-parse>
+	</view>
+</template>
+
+<script>
+	import {parseBr} from "@/util/common";
+
+	export default {
+		name: "NotificationRender",
+		components: {
+		},
+		props: {
+			message: Object,
+			conversationID:String,
+			isSender:Boolean
+		},
+		computed:{
+			notification(){
+				const body = JSON.parse(this.message.notificationElem.detail);
+				body.data = JSON.parse(body.data);
+				return body.data;
+			},
+			getContent() {
+				return parseBr(this.notification.textElem?.content);
+			}
+		},
+		data() {
+			return {
+				content:"",
+			};
+		},
+		mounted() {
+		},
+		methods: {
+			onMessageEvent(e){
+				this.$emit('onMessageEvent',e);
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue b/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue
index d9df6b5..9c7c06b 100644
--- a/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue
+++ b/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue
@@ -54,7 +54,7 @@
 			"videoType": "mp4",
 			"videoSize": 3751005,
 			"duration": 44,
-			"snapshotPath": "/storage/emulated/0/Android/data/hk.huisheng.im/apps/__UNI__CA458BA/doc/video_cover_2ea1c8ec.jpg",
+			"snapshotPath": "/storage/emulated/0/Android/data/hk.huisheng.im/apps/__UNI__E41111F/doc/video_cover_2ea1c8ec.jpg",
 			"snapshotSize": 36974,
 			"snapshotUrl": "http://www.axzc.xyz/object/100003/msg_videoSnapshot_d9a596f3e665e84559821a8aa5fb9f16.jpg",
 			"snapshotWidth": 1087,
@@ -116,8 +116,11 @@
         },
 		methods: {
 			async init(){
-				const snapshotUrl = this.message?.videoElem?.snapshotUrl;
+				const self = this;
+				console.log(this.message?.videoElem);
+				const snapshotUrl = this.message?.videoElem?.snapshotPath || this.message?.videoElem?.snapshotUrl;
 				self.coverDownloading = true;
+				console.log(snapshotUrl);
 				util.cacheFile(snapshotUrl,`${this.conversationID}`).then((fn)=>{
 					self.coverDownloading = false;
 					self.src = fn;
diff --git a/pages/conversation/chating/components/MessageItem/index.vue b/pages/conversation/chating/components/MessageItem/index.vue
index 2c5ff80..f732026 100644
--- a/pages/conversation/chating/components/MessageItem/index.vue
+++ b/pages/conversation/chating/components/MessageItem/index.vue
@@ -57,6 +57,7 @@
 	import MarkdownMessageRender from "./MarkdownMessageRender";
 	import StreamMessageRender from "./StreamMessageRender";
 	import OANotificationRender from "./OANotificationRender";
+	import NotificationRender from "./NotificationRender";
 	
 	import ErrorMessageRender from "./ErrorMessageRender";
 	import {noticeMessageTypes} from "@/constant";
@@ -82,6 +83,7 @@
 			MarkdownMessageRender,
 			StreamMessageRender,
 			OANotificationRender,
+			NotificationRender,
 			ErrorMessageRender
 		},
 		props: {
@@ -173,7 +175,8 @@
 				['type_'+MessageType.FaceMessage] : "FaceMessageRender",
 				['type_'+MessageType.MarkdownMessage] : "MarkdownMessageRender",
 				['type_'+MessageType.StreamMessage] : "StreamMessageRender",
-				['type_'+MessageType.OANotification] : "OANotificationRender"
+				['type_'+MessageType.OANotification] : "OANotificationRender",
+				'type_2001' : "NotificationRender"
 			};
 			this.component = MsgType2Components['type_'+this.source.contentType] || "ErrorMessageRender";
 			this.$emit('userEvent',{type:"messageItemRender"},this.source.clientMsgID);
diff --git a/pages/conversation/conversationList/components/ConversationItem.vue b/pages/conversation/conversationList/components/ConversationItem.vue
index fb40f15..c7136e8 100644
--- a/pages/conversation/conversationList/components/ConversationItem.vue
+++ b/pages/conversation/conversationList/components/ConversationItem.vue
@@ -103,19 +103,20 @@
 			flex:1;
 
 			.details {
-				@include colBox(true);
+				display: flex;
+				flex-direction: column;
+				justify-content: space-around;
 				flex:1;
 				margin-left: 24rpx;
 				height: 46px;
-				color: $uni-text-color;
-				padding-bottom:20rpx;
+				color: $u-main-color;
 				.title{
 					@include btwBox();
 					.conversation_name {
 						@include nomalEllipsis();
 						max-width: 40vw;
 						font-size: 32rpx;
-						font-weight: 500;
+						font-weight: 400;
 					}
 
 					.right_desc {
diff --git a/pages/conversation/groupManage/index.vue b/pages/conversation/groupManage/index.vue
index 8c54b6a..359bb54 100644
--- a/pages/conversation/groupManage/index.vue
+++ b/pages/conversation/groupManage/index.vue
@@ -14,13 +14,7 @@
 
 <script>
 	import {mapGetters} from "vuex";
-	import IMSDK, {
-		GroupMemberRole,
-		GroupStatus,
-		GroupVerificationType,
-		IMMethods,
-		MessageReceiveOptType,
-	} from "openim-uniapp-polyfill";
+	import IMSDK, {GroupMemberRole,GroupStatus,GroupVerificationType,IMMethods,MessageReceiveOptType,} from "openim-uniapp-polyfill";
 	import {GroupMemberListTypes} from "@/constant";
 	export default {
 		data() {
diff --git a/pages/conversation/groupMemberList/index.vue b/pages/conversation/groupMemberList/index.vue
index cd1fb38..2686125 100644
--- a/pages/conversation/groupMemberList/index.vue
+++ b/pages/conversation/groupMemberList/index.vue
@@ -1,314 +1,284 @@
 <template>
-  <view @click="pageClick" class="group_members_container">
-    <group-member-list-header
-      ref="navHeaderRef"
-      :checkVisible.sync="showCheck"
-      :isTransfer="isTransfer"
-      :isNomal="!isOwner && !isAdmin"
-      :groupID="groupID"
-      @removeMember="showMemberCheck"
-    />
+	<view @click="pageClick" class="group_members_container">
+		<group-member-list-header ref="navHeaderRef" :checkVisible.sync="showCheck" :isTransfer="isTransfer"
+			:isNomal="!isOwner && !isAdmin" :groupID="groupID" @removeMember="showMemberCheck" />
 
-    <view class="search_bar_wrap">
-      <u-search
-        disabled
-        class="search_bar"
-        shape="square"
-        placeholder="搜索"
-        :showAction="false"
-        v-model="keyword"
-      />
-    </view>
+		<view class="search_bar_wrap">
+			<u-search disabled class="search_bar" shape="square" placeholder="搜索" :showAction="false"
+				v-model="keyword" />
+		</view>
 
-    <u-list
-      class="member_list"
-      @scrolltolower="loadMore"
-      lowerThreshold="100"
-      height="1"
-    >
-      <u-list-item v-for="member in groupMemberList" :key="member.userID">
-        <user-item
-          @itemClick="userClick"
-          @updateCheck="updateCheck"
-          :checked="isChecked(member.userID)"
-          :checkVisible="showCheck"
-          :disabled="!canCheck(member) && showCheck"
-          :item="member"
-        />
-      </u-list-item>
-      <view
-        v-show="loadState.loading"
-        class="member_loading"
-      >
-        <u-loading-icon></u-loading-icon>
-      </view>
-    </u-list>
+		<u-list class="member_list" @scrolltolower="loadMore" lowerThreshold="100" height="1">
+			<u-list-item v-for="member in groupMemberList" :key="member.userID">
+				<user-item @itemClick="userClick" @updateCheck="updateCheck" :checked="isChecked(member.userID)"
+					:checkVisible="showCheck" :disabled="!canCheck(member) && showCheck" :item="member" />
+			</u-list-item>
+			<view v-show="loadState.loading" class="member_loading">
+				<u-loading-icon></u-loading-icon>
+			</view>
+		</u-list>
 
-    <choose-index-footer
-      v-if="showCheck"
-      :comfirmLoading="comfirmLoading"
-      @removeItem="updateCheck"
-      @confirm="confirm"
-      :choosedData="getChoosedData"
-      :isRemove="isRemove"
-      :maxLength="groupMemberLength"
-    />
+		<choose-index-footer v-if="showCheck" :comfirmLoading="comfirmLoading" @removeItem="updateCheck"
+			@confirm="confirm" :choosedData="getChoosedData" :isRemove="isRemove" :maxLength="groupMemberLength" />
 
-    <u-modal
-      :show="showConfirmModal"
-      asyncClose
-      showCancelButton
-      @confirm="modalConfirm"
-      @cancel="() => (showConfirmModal = false)"
-      :content="
+		<u-modal :show="showConfirmModal" asyncClose showCancelButton @confirm="modalConfirm"
+			@cancel="() => (showConfirmModal = false)" :content="
         isRemove
           ? '确定移除已选群成员？'
           : `确定要把群主转移给${choosedTransferMember.nickname}吗？`
-      "
-    />
-    <u-toast ref="uToast"></u-toast>
-  </view>
+      " />
+		<u-toast ref="uToast"></u-toast>
+	</view>
 </template>
 
 <script>
-let moreActionArea;
-import { GroupMemberListTypes } from "@/constant";
-import IMSDK, { GroupMemberRole } from "openim-uniapp-polyfill";
-import UserItem from "@/components/UserItem/index.vue";
-import GroupMemberListHeader from "./components/GroupMemberListHeader.vue";
-import ChooseIndexFooter from "@/components/ChooseIndexFooter/index.vue";
-export default {
-  components: {
-    GroupMemberListHeader,
-    ChooseIndexFooter,
-    UserItem,
-  },
-  data() {
-    return {
-      showCheck: false,
-      groupID: "",
-      keyword: "",
-      showConfirmModal: false,
-      comfirmLoading: false,
-      groupMemberList: [],
-      choosedMemberIDList: [],
-      choosedTransferMember: {},
-      type: GroupMemberListTypes.Preview,
-      isRightKick: true,
-      loadState: {
-        hasMore: true,
-        loading: false,
-      },
-    };
-  },
-  computed: {
-    getChoosedData() {
-      const tmpList = [...this.choosedMemberIDList];
-      return this.groupMemberList.filter(
-        (member) => {
-          const idx = tmpList.findIndex((item) => item === member.userID);
-          if (idx > -1) {
-            tmpList.splice(idx, 1);
-          }
-          return idx > -1;
-        },
-      );
-    },
-    isRemove() {
-      return this.type === GroupMemberListTypes.Kickout;
-    },
-    isTransfer() {
-      return this.type === GroupMemberListTypes.Transfer;
-    },
-    isChecked() {
-      return (userID) => this.choosedMemberIDList.includes(userID);
-    },
-    isOwner() {
-      return (
-        this.$store.getters.storeCurrentMemberInGroup.roleLevel ===
-        GroupMemberRole.Owner
-      );
-    },
-    isAdmin() {
-      return (
-        this.$store.getters.storeCurrentMemberInGroup.roleLevel ===
-        GroupMemberRole.Admin
-      );
-    },
-    canCheck() {
-      return ({ roleLevel, userID }) => {
-        if (this.type === GroupMemberListTypes.Kickout) {
-          return (
-            (this.isOwner ||
-              (this.isAdmin && roleLevel !== GroupMemberRole.Owner)) &&
-            userID !== this.$store.getters.storeCurrentUserID
-          );
-        }
+	let moreActionArea;
+	import {GroupMemberListTypes} from "@/constant";
+	import IMSDK, {GroupMemberRole} from "openim-uniapp-polyfill";
+	import UserItem from "@/components/UserItem/index.vue";
+	import GroupMemberListHeader from "./components/GroupMemberListHeader.vue";
+	import ChooseIndexFooter from "@/components/ChooseIndexFooter/index.vue";
+	import util from "@/util/index.js"
+	export default {
+		components: {
+			GroupMemberListHeader,
+			ChooseIndexFooter,
+			UserItem,
+		},
+		data() {
+			return {
+				showCheck: false,
+				groupID: "",
+				keyword: "",
+				showConfirmModal: false,
+				comfirmLoading: false,
+				groupMemberList: [],
+				choosedMemberIDList: [],
+				choosedTransferMember: {},
+				type: GroupMemberListTypes.Preview,
+				isRightKick: true,
+				loadState: {
+					hasMore: true,
+					loading: false,
+				},
+			};
+		},
+		computed: {
+			getChoosedData() {
+				const tmpList = [...this.choosedMemberIDList];
+				return this.groupMemberList.filter(
+					(member) => {
+						const idx = tmpList.findIndex((item) => item === member.userID);
+						if (idx > -1) {
+							tmpList.splice(idx, 1);
+						}
+						return idx > -1;
+					},
+				);
+			},
+			isRemove() {
+				return this.type === GroupMemberListTypes.Kickout;
+			},
+			isTransfer() {
+				return this.type === GroupMemberListTypes.Transfer;
+			},
+			isChecked() {
+				return (userID) => this.choosedMemberIDList.includes(userID);
+			},
+			isOwner() {
+				return (
+					this.$store.getters.storeCurrentMemberInGroup.roleLevel ===
+					GroupMemberRole.Owner
+				);
+			},
+			isAdmin() {
+				return (
+					this.$store.getters.storeCurrentMemberInGroup.roleLevel ===
+					GroupMemberRole.Admin
+				);
+			},
+			canCheck() {
+				return ({
+					roleLevel,
+					userID
+				}) => {
+					if (this.type === GroupMemberListTypes.Kickout) {
+						return (
+							(this.isOwner ||
+								(this.isAdmin && roleLevel !== GroupMemberRole.Owner)) &&
+							userID !== this.$store.getters.storeCurrentUserID
+						);
+					}
 
-        return userID !== this.$store.getters.storeCurrentUserID;
-      };
-    },
-    groupMemberLength() {
-      return this.$store.getters.storeCurrentGroup?.memberCount ?? 0;
-    },
-  },
-  onLoad(options) {
-    const { groupID, type } = options;
-    this.loadMemberList(groupID);
-    this.type = type;
-    this.groupID = groupID;
-    this.isRightKick = type === GroupMemberListTypes.Kickout;
-    if (
-      this.isRightKick
-    ) {
-      this.showCheck = true;
-    }
-  },
-  methods: {
-    async pageClick(e) {
-      if (!moreActionArea) {
-        moreActionArea = await this.getEl(".more_container");
-      }
-      if (!moreActionArea) return;
-      if (
-        e.target.y < moreActionArea.top ||
-        e.target.y > moreActionArea.bottom ||
-        e.target.x < moreActionArea.left
-      ) {
-        this.$refs.navHeaderRef.checkMenu();
-      }
-    },
-    confirm() {
-      this.showConfirmModal = true;
-    },
-    modalConfirm() {
-      let func = () => {};
-      if (this.type === GroupMemberListTypes.Kickout) {
-        func = IMSDK.asyncApi(IMSDK.IMMethods.KickGroupMember, IMSDK.uuid(), {
-          groupID: this.getChoosedData[0].groupID,
-          reason: "",
-          userIDList: this.getChoosedData.map((member) => member.userID),
-        });
-      } else {
-        func = IMSDK.asyncApi(
-          IMSDK.IMMethods.TransferGroupOwner,
-          IMSDK.uuid(),
-          {
-            groupID: this.choosedTransferMember.groupID,
-            newOwnerUserID: this.choosedTransferMember.userID,
-          },
-        );
-      }
-      func
-        .then(() => this.showToast("操作成功", () => uni.navigateBack()))
-        .catch(() => this.showToast("操作失败"))
-        .finally(() => (this.showConfirmModal = false));
-    },
-    updateChoosedData(userID) {
-      if (this.choosedMemberIDList.includes(userID)) {
-        const idx = this.choosedMemberIDList.findIndex(
-          (item) => item === userID,
-        );
-        const tmpArr = [...this.choosedMemberIDList];
-        tmpArr.splice(idx, 1);
-        this.choosedMemberIDList = tmpArr;
-      } else {
-        this.choosedMemberIDList = [...this.choosedMemberIDList, userID];
-      }
-      console.log(this.choosedMemberIDList);
-    },
-    userClick(member) {
-      if (this.type === GroupMemberListTypes.Transfer) {
-        if (member.userID === this.$store.getters.storeCurrentUserID) return;
-        this.choosedTransferMember = member;
-        this.showConfirmModal = true;
-      } else {
-        uni.$u.route("/pages/common/userCard/index", {
-          sourceID: member.userID,
-          memberInfo: JSON.stringify(member),
-        });
-      }
-    },
-    updateCheck(member) {
-      this.updateChoosedData(member.userID);
-    },
-    showMemberCheck() {
-      this.type = GroupMemberListTypes.Kickout;
-      this.showCheck = true;
-    },
-    loadMore() {
-      const stateKey = "loadState";
-      const methodKey = "loadMemberList";
-      if (this[stateKey].hasMore && !this[stateKey].loading) {
-        this[methodKey]();
-      }
-    },
-    loadMemberList(groupID) {
-      this.loadState.loading = true;
-      IMSDK.asyncApi(IMSDK.IMMethods.GetGroupMemberList, IMSDK.uuid(), {
-        groupID: groupID ?? this.groupID,
-        filter: 0,
-        offset: this.groupMemberList.length,
-        count: 500,
-      })
-        .then(({ data }) => {
-          this.groupMemberList = [...this.groupMemberList, ...data];
-          this.loadState.hasMore = data.length === 500;
-        })
-        .finally(() => (this.loadState.loading = false));
-    },
-    showToast(message, complete = null) {
-      this.$refs.uToast.show({
-        message,
-        complete,
-      });
-    },
-    getEl(el) {
-      return new Promise((resolve) => {
-        const query = uni.createSelectorQuery().in(this);
-        query
-          .select(el)
-          .boundingClientRect((data) => {
-            // 存在data，且存在宽和高，视为渲染完毕
-            resolve(data);
-          })
-          .exec();
-      });
-    },
-  },
-  onBackPress(options) {
-    if (this.showCheck && this.isRightKick) {
-      this.showCheck = false;
-      this.type = GroupMemberListTypes.Preview;
-      return true;
-    }
-    return false;
-  },
-};
+					return userID !== this.$store.getters.storeCurrentUserID;
+				};
+			},
+			groupMemberLength() {
+				return this.$store.getters.storeCurrentGroup?.memberCount ?? 0;
+			},
+		},
+		onLoad(options) {
+			const {
+				groupID,
+				type
+			} = options;
+			this.loadMemberList(groupID);
+			this.type = type;
+			this.groupID = groupID;
+			this.isRightKick = type === GroupMemberListTypes.Kickout;
+			if (
+				this.isRightKick
+			) {
+				this.showCheck = true;
+			}
+		},
+		methods: {
+			async pageClick(e) {
+				if (!moreActionArea) {
+					moreActionArea = await this.getEl(".more_container");
+				}
+				if (!moreActionArea) return;
+				if (
+					e.target.y < moreActionArea.top ||
+					e.target.y > moreActionArea.bottom ||
+					e.target.x < moreActionArea.left
+				) {
+					this.$refs.navHeaderRef.checkMenu();
+				}
+			},
+			confirm() {
+				this.showConfirmModal = true;
+			},
+			modalConfirm() {
+				let func = () => {};
+				if (this.type === GroupMemberListTypes.Kickout) {
+					func = IMSDK.asyncApi(IMSDK.IMMethods.KickGroupMember, IMSDK.uuid(), {
+						groupID: this.getChoosedData[0].groupID,
+						reason: "",
+						userIDList: this.getChoosedData.map((member) => member.userID),
+					});
+				} else {
+					func = IMSDK.asyncApi(
+						IMSDK.IMMethods.TransferGroupOwner,
+						IMSDK.uuid(), {
+							groupID: this.choosedTransferMember.groupID,
+							newOwnerUserID: this.choosedTransferMember.userID,
+						},
+					);
+				}
+				func
+					.then(() => this.showToast("操作成功", () => uni.navigateBack()))
+					.catch(() => this.showToast("操作失败"))
+					.finally(() => (this.showConfirmModal = false));
+			},
+			updateChoosedData(userID) {
+				if (this.choosedMemberIDList.includes(userID)) {
+					const idx = this.choosedMemberIDList.findIndex(
+						(item) => item === userID,
+					);
+					const tmpArr = [...this.choosedMemberIDList];
+					tmpArr.splice(idx, 1);
+					this.choosedMemberIDList = tmpArr;
+				} else {
+					this.choosedMemberIDList = [...this.choosedMemberIDList, userID];
+				}
+				console.log(this.choosedMemberIDList);
+			},
+			userClick(member) {
+				if (this.type === GroupMemberListTypes.Transfer) {
+					if (member.userID === this.$store.getters.storeCurrentUserID) return;
+					this.choosedTransferMember = member;
+					this.showConfirmModal = true;
+				} else {
+					const s = util.aesencode(member);
+					uni.$u.route("/pages/common/userCard/index", {
+						sourceID: member.userID,
+						memberInfo: s,
+					});
+				}
+			},
+			updateCheck(member) {
+				this.updateChoosedData(member.userID);
+			},
+			showMemberCheck() {
+				this.type = GroupMemberListTypes.Kickout;
+				this.showCheck = true;
+			},
+			loadMore() {
+				const stateKey = "loadState";
+				const methodKey = "loadMemberList";
+				if (this[stateKey].hasMore && !this[stateKey].loading) {
+					this[methodKey]();
+				}
+			},
+			loadMemberList(groupID) {
+				this.loadState.loading = true;
+				IMSDK.asyncApi(IMSDK.IMMethods.GetGroupMemberList, IMSDK.uuid(), {
+						groupID: groupID ?? this.groupID,
+						filter: 0,
+						offset: this.groupMemberList.length,
+						count: 500,
+					})
+					.then(({
+						data
+					}) => {
+						this.groupMemberList = [...this.groupMemberList, ...data];
+						this.loadState.hasMore = data.length === 500;
+					})
+					.finally(() => (this.loadState.loading = false));
+			},
+			showToast(message, complete = null) {
+				this.$refs.uToast.show({
+					message,
+					complete,
+				});
+			},
+			getEl(el) {
+				return new Promise((resolve) => {
+					const query = uni.createSelectorQuery().in(this);
+					query
+						.select(el)
+						.boundingClientRect((data) => {
+							// 存在data，且存在宽和高，视为渲染完毕
+							resolve(data);
+						})
+						.exec();
+				});
+			},
+		},
+		onBackPress(options) {
+			if (this.showCheck && this.isRightKick) {
+				this.showCheck = false;
+				this.type = GroupMemberListTypes.Preview;
+				return true;
+			}
+			return false;
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.group_members_container {
-  @include colBox(false);
-  height: 100vh;
-  overflow: hidden;
+	.group_members_container {
+		@include colBox(false);
+		height: 100vh;
+		overflow: hidden;
 
-  .search_bar_wrap {
-    height: 34px;
-    padding: 12px 22px;
-  }
+		.search_bar_wrap {
+			height: 34px;
+			padding: 12px 22px;
+		}
 
-  .at_all_btn {
-    font-weight: 500;
-    padding: 24rpx 44rpx;
-  }
+		.at_all_btn {
+			font-weight: 500;
+			padding: 24rpx 44rpx;
+		}
 
-  ::v-deep.u-popup {
-    flex: none;
-  }
+		::v-deep.u-popup {
+			flex: none;
+		}
 
-  .member_list {
-    flex: 1;
-  }
-}
-</style>
+		.member_list {
+			flex: 1;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/conversation/groupSettings/index.vue b/pages/conversation/groupSettings/index.vue
index df2763f..2aa35ac 100644
--- a/pages/conversation/groupSettings/index.vue
+++ b/pages/conversation/groupSettings/index.vue
@@ -62,18 +62,13 @@
 <script>
 	import {mapGetters} from "vuex";
 	import {GroupMemberListTypes} from "@/constant";
-	import IMSDK, {
-		GroupMemberRole,
-		GroupStatus,
-		GroupVerificationType,
-		IMMethods,
-		MessageReceiveOptType,
-	} from "openim-uniapp-polyfill";
+	import IMSDK, {GroupMemberRole,GroupStatus,GroupVerificationType,IMMethods,MessageReceiveOptType,} from "openim-uniapp-polyfill";
 	import CustomNavBar from "@/components/CustomNavBar/index.vue";
 	import MyAvatar from "@/components/MyAvatar/index.vue";
 	import SettingItem from "@/components/SettingItem/index.vue";
 	import GroupMemberRow from "./components/GroupMemberRow.vue";
 	import {getPurePath} from "@/util/common";
+	import util from "@/util/index.js"
 
 	const ConfirmTypes = {
 		Dismiss: "Dismiss",
@@ -193,13 +188,13 @@
 				return this.storeCurrentMemberInGroup.roleLevel === GroupMemberRole.Admin;
 			},
 			getGroupQrcdeUrl(){
-				const info = {
+				const info = util.aesencode({
 					code	:	this.storeCurrentConversation.groupID,
 					showName:	`${this.storeCurrentConversation.showName}(${this.storeCurrentGroup.memberCount})`,
 					faceURL	:	this.storeCurrentConversation.faceURL,
 					type	:	"group",
-				};
-				return `/pages/common/userOrGroupQrCode?sourceInfo=${JSON.stringify(info,)}`;
+				});
+				return `/pages/common/userOrGroupQrCode?sourceInfo=${s}`;
 			},
 			getGroupVerStr() {
 				if (
@@ -251,9 +246,9 @@
 				if (!this.isAdmin && !this.isOwner) {
 					return;
 				}
-
+				const s = util.aesencode(this.storeCurrentGroup);
 				uni.navigateTo({
-					url: `/pages/conversation/updateGroupOrNickname/index?sourceInfo=${JSON.stringify(this.storeCurrentGroup,)}`,
+					url: `/pages/conversation/updateGroupOrNickname/index?sourceInfo=${s}`,
 				});
 			},
 			copyGroupID() {
diff --git a/pages/conversation/updateGroupOrNickname/index.vue b/pages/conversation/updateGroupOrNickname/index.vue
index 6797960..c511fb0 100644
--- a/pages/conversation/updateGroupOrNickname/index.vue
+++ b/pages/conversation/updateGroupOrNickname/index.vue
@@ -1,92 +1,89 @@
 <template>
-  <view class="page_container">
-    <custom-nav-bar :title="getTitle">
-      <view class="nav_right_action" slot="more">
-        <u-button type="primary" v-show="!updateLoading" @click="comfirmUpdate">保存</u-button>
-        <u-loading-icon v-show="updateLoading" />
-      </view>
-    </custom-nav-bar>
+	<view class="page_container">
+		<custom-nav-bar :title="getTitle">
+			<view class="nav_right_action" slot="more">
+				<u-button type="primary" v-show="!updateLoading" @click="comfirmUpdate">保存</u-button>
+				<u-loading-icon v-show="updateLoading" />
+			</view>
+		</custom-nav-bar>
 
-    <view class="content_row">
-      <u-input
-        v-model="content"
-        disabledColor="transparent"
-        maxlength="16"
-        placeholder="请输入内容"
-        clearable
-      >
-      </u-input>
-    </view>
-  </view>
+		<view class="content_row">
+			<u-input v-model="content" disabledColor="transparent" maxlength="16" placeholder="请输入内容" clearable>
+			</u-input>
+		</view>
+	</view>
 </template>
 
 <script>
-import IMSDK from "openim-uniapp-polyfill";
-import CustomNavBar from "@/components/CustomNavBar/index.vue";
-import MyAvatar from "@/components/MyAvatar/index.vue";
-export default {
-  components: {
-    CustomNavBar,
-    MyAvatar,
-  },
-  data() {
-    return {
-      sourceInfo: {},
-      content: "",
-      updateLoading: false,
-    };
-  },
-  computed: {
-    getTitle() {
-      return "修改群聊名称";
-    },
-    getSubTitle() {
-      return "修改群名称后，将在群内通知其他成员";
-    },
-  },
-  onLoad(options) {
-    const { sourceInfo } = options;
-    this.sourceInfo = JSON.parse(sourceInfo);
-    this.content = this.sourceInfo.groupName;
-  },
-  methods: {
-    comfirmUpdate() {
-      this.updateLoading = true;
-      IMSDK.asyncApi(IMSDK.IMMethods.SetGroupInfo, IMSDK.uuid(), {
-          groupID: this.sourceInfo.groupID,
-          groupName: this.content,
-        })
-        .then(() => {
-          uni.$u.toast("修改成功");
-          setTimeout(() => uni.navigateBack(), 250);
-        })
-        .catch(() => uni.$u.toast("修改失败"))
-        .finally(() => (this.updateLoading = false));
-    },
-  },
-};
+	import IMSDK from "openim-uniapp-polyfill";
+	import CustomNavBar from "@/components/CustomNavBar/index.vue";
+	import MyAvatar from "@/components/MyAvatar/index.vue";
+	import util from "@/util/index.js"
+	export default {
+		components: {
+			CustomNavBar,
+			MyAvatar,
+		},
+		data() {
+			return {
+				sourceInfo: {},
+				content: "",
+				updateLoading: false,
+			};
+		},
+		computed: {
+			getTitle() {
+				return "修改群聊名称";
+			},
+			getSubTitle() {
+				return "修改群名称后，将在群内通知其他成员";
+			},
+		},
+		onLoad(options) {
+			const {
+				sourceInfo
+			} = options;
+			this.sourceInfo = util.aesdecode(sourceInfo);
+			this.content = this.sourceInfo.groupName;
+		},
+		methods: {
+			comfirmUpdate() {
+				this.updateLoading = true;
+				IMSDK.asyncApi(IMSDK.IMMethods.SetGroupInfo, IMSDK.uuid(), {
+						groupID: this.sourceInfo.groupID,
+						groupName: this.content,
+					})
+					.then(() => {
+						uni.$u.toast("修改成功");
+						setTimeout(() => uni.navigateBack(), 250);
+					})
+					.catch(() => uni.$u.toast("修改失败"))
+					.finally(() => (this.updateLoading = false));
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.page_container {
-  @include colBox(false);
-  height: 100vh;
+	.page_container {
+		@include colBox(false);
+		height: 100vh;
 
-  .nav_right_action {
-    margin-right: 36rpx;
-  }
+		.nav_right_action {
+			margin-right: 36rpx;
+		}
 
-  .content_row {
-    margin-top: 96rpx;
-    margin: 72rpx 44rpx 0;
+		.content_row {
+			margin-top: 96rpx;
+			margin: 72rpx 44rpx 0;
 
-    .u-input {
-      background-color: #e8eaef;
-    }
+			.u-input {
+				background-color: #e8eaef;
+			}
 
-    .u-button {
-      height: 60rpx;
-    }
-  }
-}
-</style>
+			.u-button {
+				height: 60rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/guide.vue b/pages/index/guide.vue
new file mode 100644
index 0000000..c6c2de2
--- /dev/null
+++ b/pages/index/guide.vue
@@ -0,0 +1,75 @@
+<template>
+	<view class="page">
+		<view v-if="i==1">
+			<view>
+				<image src='/static/img/g1.png' style="width: 60%; margin: auto;" mode="widthFix"></image>
+			</view>
+			<view style="font-size: 56rpx; color: #333; font-weight: 700; text-align: center; margin-top: 40rpx;">
+				Make some <span style="color: #1D61E7; margin-left: 20rpx;">money</span></view>
+			<view style="width: 80%; margin: 20rpx auto; text-align: center; font-size: 32rpx; color: #333;">
+				Paid surveys are a handy sideline for anyone looking to make some extra money，You earn a commission for
+				each survey you complete.
+			</view>
+		</view>
+		<view v-if="i==2">
+			<view>
+				<image src='/static/img/g2.png' style="width: 60%; margin: auto;" mode="widthFix"></image>
+			</view>
+			<view style="font-size: 56rpx; color: #333; font-weight: 700; text-align: center; margin-top: 40rpx;">
+				Make money by <br><span style="color: #1D61E7;">completing surveys</span></view>
+			<view style="width: 80%; margin: 20rpx auto; text-align: center; font-size: 32rpx; color: #333;">
+				If you are looking for an easy way to make money with surveys, you can join the "MMT" community.
+			</view>
+		</view>
+		<view style="bottom: 0rpx; position: absolute; width:100vw; height: 200rpx; ">
+			<button style="width: 86%; background-color: #1D61E7; color: #fff; margin: auto;"
+				@click="button">{{text}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getUserInfo} from '@/util';
+	import {mapState,mapMutations} from 'vuex';
+	export default {
+		data() {
+			return {
+				i: 1,
+				text: "Next"
+			}
+		},
+		computed: {
+
+		},
+		//第一次加载
+		onLoad(e) {
+
+		},
+		//页面显示
+		onShow() {},
+		//方法
+		methods: {
+			button() {
+				if (this.i == 1) {
+					this.i = 2;
+					this.text = "Enter"
+				} else {
+					uni.navigateTo({
+						url: '/pages/index/index'
+					})
+				}
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+
+	body {
+		background-color: #fff;
+	}
+
+	.page {
+		min-height: 96vh;
+		padding-top: 200rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/launch.vue b/pages/index/launch.vue
new file mode 100644
index 0000000..ecde904
--- /dev/null
+++ b/pages/index/launch.vue
@@ -0,0 +1,541 @@
+<template>
+	<view>
+		<view class="container">
+			<image src="/static/images/about_logo.png" class="gif-image" style="margin-top: 40%;" mode="aspectFit"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {mapGetters,mapActions} from "vuex";
+	import IMSDK, {IMMethods,MessageType,SessionType,} from "openim-uniapp-polyfill";
+	import config from "@/common/config";
+	import {getDbDir,toastWithCallback} from "@/util/common.js";
+	import {getConversationContent,conversationSort} from "@/util/imCommon";
+	import {PageEvents,UpdateMessageTypes} from "@/constant";
+	import {checkUpgrade} from "@/api/login.js"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			...mapGetters([
+				"storeConversationList",
+				"storeCurrentConversation",
+				"storeCurrentUserID",
+				"storeSelfInfo",
+				"storeRecvFriendApplications",
+				"storeRecvGroupApplications",
+				"storeHistoryMessageList",
+				"storeIsSyncing",
+				"storeGroupList",
+				"config",
+			]),
+		},
+		onReady() {
+			//console.log('onReady');
+			// #ifdef APP
+			this.checkUpdate();
+			this.tryLogin();
+			// #endif
+			// setTimeout(() => {
+			// 	uni.navigateTo({
+			// 		url: '/pages/index/index'
+			// 	}); // 替换为你的首页路径
+			// }, 4000); // 假设GIF加载完毕并显示3秒后跳转，根据GIF实际时间调整
+		},
+		created() {
+			//console.log('created');
+		},
+		methods: {
+			...mapActions("message", ["pushNewMessage", "updateOneMessage"]),
+			...mapActions("conversation", ["updateCurrentMemberInGroup"]),
+			...mapActions("circle", ["getFriendCircleInfo"]),
+			...mapActions("contact", [
+				"updateFriendInfo",
+				"pushNewFriend",
+				"updateBlackInfo",
+				"pushNewBlack",
+				"pushNewGroup",
+				"updateGroupInfo",
+				"pushNewRecvFriendApplition",
+				"updateRecvFriendApplition",
+				"pushNewSentFriendApplition",
+				"updateSentFriendApplition",
+				"pushNewRecvGroupApplition",
+				"updateRecvGroupApplition",
+				"pushNewSentGroupApplition",
+				"updateSentGroupApplition",
+			]),
+			setGlobalIMlistener() {
+				//console.log("setGlobalIMlistener");
+				// init
+				const kickHander = (message) => {
+					toastWithCallback(message, () => {
+						uni.removeStorage({
+							key: "IMToken",
+						});
+						uni.removeStorage({
+							key: "BusinessToken",
+						});
+						uni.$u.route("/pages/common/login/index");
+					});
+				};
+				//由于 APP 管理员强制用户下线，或由于登录策略导致用户被踢下线
+				IMSDK.subscribe(IMSDK.IMEvents.OnKickedOffline, (data) => {
+					kickHander("您的账号在其他设备登录，请重新登陆！");
+				});
+				//token无效回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnUserTokenExpired, (data) => {
+					kickHander("您的登录已过期，请重新登陆！");
+				});
+				IMSDK.subscribe(IMSDK.IMEvents.OnUserTokenInvalid, (data) => {
+					kickHander("您的登录已无效，请重新登陆！");
+				});
+
+				// sync
+				//向服务器同步会话开始时的回调。
+				const syncStartHandler = ({data}) => {
+					this.$store.commit("user/SET_IS_SYNCING", true);
+					this.$store.commit("user/SET_REINSTALL", data);
+				};
+				//同步中
+				const syncProgressHandler = ({data}) => {
+					this.$store.commit("user/SET_PROGRESS", data);
+				};
+				//向服务器同步会话成功时的回调。
+				const syncFinishHandler = () => {
+					uni.hideLoading();
+					this.$store.dispatch("conversation/getConversationList");
+					this.$store.dispatch("contact/getFriendList");
+					this.$store.dispatch("contact/getGrouplist");
+					this.$store.dispatch("conversation/getUnReadCount");
+					this.$store.commit("user/SET_IS_SYNCING", false);
+				};
+				//向服务器同步会话失败时的回调。
+				const syncFailedHandler = () => {
+					uni.hideLoading();
+					uni.$u.toast("同步消息失败");
+					this.$store.dispatch("conversation/getConversationList");
+					this.$store.dispatch("conversation/getUnReadCount");
+					this.$store.commit("user/SET_IS_SYNCING", false);
+				};
+				//向服务器同步会话开始时的回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerStart, syncStartHandler);
+				//向服务器同步会话成功时的回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerFinish, syncFinishHandler);
+				//向服务器同步会话失败时的回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerFailed, syncFailedHandler);
+				//同步中
+				IMSDK.subscribe(IMSDK.IMEvents.OnSyncServerProgress, syncProgressHandler);
+
+				// 当前登录用户个人信息改变时会收到此回调。
+
+				IMSDK.subscribe(IMSDK.IMEvents.OnSelfInfoUpdated, ({data}) => {
+					this.$store.commit("user/SET_SELF_INFO", {
+						...this.storeSelfInfo,
+						...data,
+					});
+				});
+
+				// message
+				//接收到新消息时会收到此回调，回调中只会携带一条消息。
+				//设置了批量消息监听setBatchMsgListener时，此回调不会触发。
+				//IMSDK.subscribe(IMSDK.IMEvents.OnRecvNewMessage, ({data}) =>{});
+				IMSDK.subscribe(IMSDK.IMEvents.OnRecvNewMessages, ({data}) => {
+					if (this.storeIsSyncing) {
+						return;
+					}
+					console.log(data);
+					data.forEach(this.handleNewMessage);
+				});
+
+				//好友个人信息（包括备注）改变时会收到此回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnFriendInfoChanged,({data}) => {
+					console.log('friendInfoChangeHandler',data);
+					uni.$emit(IMSDK.IMEvents.OnFriendInfoChanged, {data});
+					this.updateFriendInfo({friendInfo: data,});
+				});
+				//两个用户成功建立好友关系后双方都会收到该回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnFriendAdded, ({data}) => {
+					this.pushNewFriend(data);
+				});
+				//某个用户的好友列表减少时会收到该回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnFriendDeleted, ({data}) => {
+					this.updateFriendInfo({
+						friendInfo: data,
+						isRemove: true,
+					});
+				});
+
+				// blacklist
+				//某个用户的黑名单列表增加时会收到该回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnBlackAdded, ({data}) => {
+					this.pushNewBlack(data);
+				});
+				//某个用户的黑名单列表减少时会收到该回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnBlackDeleted, ({data}) => {
+					this.updateBlackInfo({
+						blackInfo: data,
+						isRemove: true,
+					});
+				});
+
+				// group
+				const joinedGroupAddedHandler = ({data}) => {
+					this.pushNewGroup(data);
+				};
+				const joinedGroupDeletedHandler = ({data}) => {
+					this.updateGroupInfo({
+						groupInfo: data,
+						isRemove: true,
+					});
+				};
+				const groupInfoChangedHandler = ({data}) => {
+					this.updateGroupInfo({
+						groupInfo: data,
+					});
+				};
+				const groupMemberInfoChangedHandler = ({data}) => {
+					uni.$emit(IMSDK.IMEvents.OnGroupMemberInfoChanged, {data});
+					if (data.groupID === this.storeCurrentConversation?.groupID) {
+						this.updateCurrentMemberInGroup(data);
+					}
+				};
+				//用户所在群组的数量增加时（被邀请入群、入群申请被同意等），会收到此回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnJoinedGroupAdded,joinedGroupAddedHandler);
+				//用户所在群组的数量减少时（主动退群、群被解散等），会收到此回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnJoinedGroupDeleted,joinedGroupDeletedHandler);
+				//群组信息（头像、群名称等，也包括群主变化）改变时，该群所有群成员会收到此回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnGroupInfoChanged,groupInfoChangedHandler);
+				//群成员信息改变（群昵称、头像等）后回调，该群所有群成员会收到此回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnGroupMemberInfoChanged,groupMemberInfoChangedHandler);
+
+				// application
+				const friendApplicationNumHandler = ({data}) => {
+					const isRecv = data.toUserID === this.storeCurrentUserID;
+					if (isRecv) {
+						this.pushNewRecvFriendApplition(data);
+					} else {
+						this.pushNewSentFriendApplition(data);
+					}
+				};
+				const friendApplicationAccessHandler = ({data}) => {
+					const isRecv = data.toUserID === this.storeCurrentUserID;
+					if (isRecv) {
+						this.updateRecvFriendApplition({
+							application: data,
+						});
+					} else {
+						this.updateSentFriendApplition({
+							application: data,
+						});
+					}
+				};
+				const groupApplicationNumHandler = ({data}) => {
+					const isRecv = data.userID !== this.storeCurrentUserID;
+					if (isRecv) {
+						this.pushNewRecvGroupApplition(data);
+					} else {
+						this.pushNewSentGroupApplition(data);
+					}
+				};
+				const groupApplicationAccessHandler = ({data}) => {
+					const isRecv = data.userID !== this.storeCurrentUserID;
+					if (isRecv) {
+						this.updateRecvGroupApplition({
+							application: data,
+						});
+					} else {
+						this.updateSentGroupApplition({
+							application: data,
+						});
+					}
+				};
+				//用户发起好友申请后，申请发起者和接收者都会收到此回调，接收者可以选择同意或拒绝好友申请。
+				IMSDK.subscribe(IMSDK.IMEvents.OnFriendApplicationAdded,friendApplicationNumHandler);
+				//好友申请被同意时，申请发起方和接收方都会收到该回调，双方成功建立好友关系。
+				IMSDK.subscribe(IMSDK.IMEvents.OnFriendApplicationAccepted,friendApplicationAccessHandler);
+				//好友申请被拒绝时，申请发起方和接收方都会收到该回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnFriendApplicationRejected,friendApplicationAccessHandler);
+				//用户发起好友申请后，申请发起者和接收者都会收到此回调，接收者可以选择同意或拒绝好友申请。
+				IMSDK.subscribe(IMSDK.IMEvents.OnGroupApplicationAdded,groupApplicationNumHandler);
+				//好友申请被同意时，申请发起方和接收方都会收到该回调，双方成功建立好友关系。
+				IMSDK.subscribe(IMSDK.IMEvents.OnGroupApplicationAccepted,groupApplicationAccessHandler);
+				//好友申请被拒绝时，申请发起方和接收方都会收到该回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnGroupApplicationRejected,groupApplicationAccessHandler);
+				//群组被解散时，该群所有群成员会收到此回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.OnGroupDismissed,({ data })=>{});
+				//群成员增加（如用户被邀请进群），其他群成员会收到此回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.onGroupMemberAdded,({ data })=>{});
+				//群成员增加（如用户被邀请进群），群成员减少（如群成员退群）， 其他群成员会收到此回调。。
+				//IMSDK.subscribe(IMSDK.IMEvents.onGroupMemberDeleted,({ data })=>{});
+				//收到的消息被撤回或自己发出的消息被撤回时，会收到此回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.onNewRecvMessageRevoked,({ data })=>{});
+				//自己发出的单聊消息被对方标记为已读后，消息发送者会收到此回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.onRecvC2CReadReceipt,({ data })=>{});
+				//自己发出的群聊消息被群成员标记为已读后，消息发送者和标记者均会收到此回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.onRecvGroupReadReceipt,({ data })=>{});
+				//当应用在后台运行，接收到新消息时，会收到该回调，回调中只会携带一条消息。
+				//设置了批量消息监听setBatchMsgListener时，此回调不会触发。
+				//IMSDK.subscribe(IMSDK.IMEvents.onRecvOfflineNewMessage,({ data })=>{});
+				//当应用在后台运行，接收到新消息时，会收到该回调，回调中可能会携带多条消息。
+				IMSDK.subscribe(IMSDK.IMEvents.OnRecvOfflineNewMessages,(res)=>{
+					console.log(res);
+				});
+				//已订阅用户的在线状态发生变化时，会触发此回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.onUserStatusChanged,({ data })=>{});
+				//建立WebSocket连接失败返回后，触发此回调
+				//IMSDK.subscribe(IMSDK.IMEvents.onConnectFailed,({ data })=>{});
+				//建立WebSocket连接成功返回后，触发此回调
+				//IMSDK.subscribe(IMSDK.IMEvents.onConnectSuccess,({ data })=>{});
+				//建立WebSocket连接中，触发此回调
+				//IMSDK.subscribe(IMSDK.IMEvents.onConnecting,({ data })=>{});
+				//正在输入状态回调。
+				//IMSDK.subscribe(IMSDK.IMEvents.onInputStatusChanged,({ data })=>{});
+				// conversation
+				const totalUnreadCountChangedHandler = ({data}) => {
+					if (this.storeIsSyncing) {
+						return;
+					}
+					this.$store.commit("conversation/SET_UNREAD_COUNT", data);
+				};
+				const newConversationHandler = ({data}) => {
+					if (this.storeIsSyncing) {
+						return;
+					}
+					const result = [...data, ...this.storeConversationList];
+					this.$store.commit(
+						"conversation/SET_CONVERSATION_LIST",
+						conversationSort(result)
+					);
+				};
+				const conversationChangedHandler = ({data}) => {
+					//console.log('conversationChangedHandler',data);
+					if (this.storeIsSyncing) {
+						return;
+					}
+					let filterArr = [];
+					//console.log(data);
+					const chids = data.map((ch) => ch.conversationID);
+					filterArr = this.storeConversationList.filter((tc) => !chids.includes(tc.conversationID));
+					const idx = data.findIndex((c) =>c.conversationID === this.storeCurrentConversation.conversationID);
+					if (idx !== -1){
+						this.$store.commit("conversation/SET_CURRENT_CONVERSATION",data[idx]);
+					}
+					const result = [...data, ...filterArr];
+					this.$store.commit("conversation/SET_CONVERSATION_LIST",conversationSort(result));
+				};
+				//会话总未读发生变化时的回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnTotalUnreadMessageCountChanged,totalUnreadCountChangedHandler);
+				//有新会话产生时，会收到此回调。
+				IMSDK.subscribe(IMSDK.IMEvents.OnNewConversation, newConversationHandler);
+				//某些会话的关键信息发生变化时，会触发该回调，例如会话的未读数发生变化，会话的最后一条消息发生变化等。
+				IMSDK.subscribe(IMSDK.IMEvents.OnConversationChanged,conversationChangedHandler);
+
+			},
+
+			async tryLogin() {
+				const _this = this;
+				const IMToken = uni.getStorageSync("IMToken");
+				const IMUserID = uni.getStorageSync("IMUserID")+'';
+				//console.log('IMToken:',IMToken);
+				//console.log('IMUserID:',IMUserID);
+				if (IMToken && IMUserID) {
+					//un1i.create1PushMessage({content:"水水水水水水，请重新登陆！"})
+					const path = await getDbDir();
+					//console.log('path:',path);
+					const IMConfig = {
+						systemType: "uni-app",
+						apiAddr: config.getApiUrl(), // SDK的API接口地址。如：http://xxx:10002
+						wsAddr: config.getWsUrl(), // SDK的websocket地址。如： ws://xxx:10001
+						dataDir: path, // 数据存储路径
+						logLevel: 6,
+						logFilePath: path,
+						isLogStandardOutput: true,
+						isExternalExtensions: false,
+					};
+					//console.log('IMConfig:',IMConfig);
+					const flag = await IMSDK.asyncApi(IMMethods.InitSDK, IMSDK.uuid(), IMConfig);
+					//console.log('flag:',flag);
+					if (!flag) {
+						plus.navigator.closeSplashscreen();
+						console.log('初始化IMSDK失败！');
+						uni.$u.toast("初始化IMSDK失败！");
+						return;
+					}
+					
+					_this.setGlobalIMlistener();
+					// setTimeout(()=>{
+						
+					// },1000);
+					let status;
+					do{
+						status = await IMSDK.asyncApi(IMSDK.IMMethods.GetLoginStatus,IMSDK.uuid());
+						//console.log(status);
+					}while(status == -1001);
+					if (status === 3) {
+						console.log('初始化status === 3失败！');
+						_this.initStore();
+						return;
+					}
+					if (status === 1) {
+						IMSDK.asyncApi(IMSDK.IMMethods.Login, IMSDK.uuid(), {
+								userID: IMUserID,
+								token: IMToken,
+							})
+							.then(_this.initStore)
+							.catch((err) => {
+								console.log(err);
+								uni.removeStorage({
+									key: "IMToken",
+								});
+								uni.removeStorage({
+									key: "BusinessToken",
+								});
+								plus.navigator.closeSplashscreen();
+							});
+					}
+				}else{
+					plus.navigator.closeSplashscreen();
+					uni.$u.route("/pages/common/login/index");
+				}
+			},
+			
+			handleNewMessage(newServerMsg) {
+				if (this.inCurrentConversation(newServerMsg)) {
+					if (
+						newServerMsg.contentType !== MessageType.TypingMessage &&
+						newServerMsg.contentType !== MessageType.RevokeMessage
+					) {
+						newServerMsg.isAppend = true;
+						this.pushNewMessage(newServerMsg);
+						setTimeout(() => uni.$emit(PageEvents.ScrollToBottom, true));
+						uni.$u.debounce(this.markConversationAsRead, 2000);
+					}
+				}else{
+					console.log(newServerMsg);
+					
+					console.log( getConversationContent(newServerMsg));
+					uni.createPushMessage({
+						title:"您的朋友发来新的消息",
+						content:getConversationContent(newServerMsg),
+						payload:newServerMsg,
+						//icon:'',
+						//sound:'',
+						//cover:'false',
+						//delay:0,
+						//when:0,//消息上显示的提示时间
+						//channelId:"",
+						//category:"",
+						success(res){
+							console.log(res);
+						},
+						fail(res){
+							console.log(res);
+						},
+						complete(res){
+							console.log(res);
+						}
+					});
+				}
+			},
+			
+			inCurrentConversation(newServerMsg) {
+				switch (newServerMsg.sessionType) {
+					case SessionType.Single:
+						return (
+							newServerMsg.sendID === this.storeCurrentConversation.userID ||
+							(newServerMsg.sendID === this.storeCurrentUserID &&
+								newServerMsg.recvID === this.storeCurrentConversation.userID)
+						);
+					case SessionType.WorkingGroup:
+						return newServerMsg.groupID === this.storeCurrentConversation.groupID;
+					case SessionType.Notification:
+						return newServerMsg.sendID === this.storeCurrentConversation.userID;
+					default:
+						return false;
+				}
+			},
+			
+			markConversationAsRead() {
+				IMSDK.asyncApi(
+					IMSDK.IMMethods.MarkConversationMessageAsRead,
+					IMSDK.uuid(),
+					this.storeCurrentConversation.conversationID
+				);
+			},
+			
+			initStore() {
+				const _this = this;
+				this.$store.dispatch("user/getSelfInfo");
+				this.$store.dispatch("conversation/getConversationList");
+				this.$store.dispatch("conversation/getUnReadCount");
+				this.$store.dispatch("contact/getBlacklist");
+				this.$store.dispatch("contact/getRecvFriendApplications");
+				this.$store.dispatch("contact/getSentFriendApplications");
+				this.$store.dispatch("contact/getRecvGroupApplications");
+				this.$store.dispatch("contact/getSentGroupApplications");
+				this.$store.dispatch("contact/getFriendList");
+				this.$store.dispatch("circle/getFriendCircleInfo");
+				uni.switchTab({
+					url: "/pages/conversation/conversationList/index?isRedirect=true",
+					complete() {
+						_this.keppAlive();
+						plus.navigator.closeSplashscreen();
+					},
+					fail(e){
+						console.log(e);
+					}
+				});
+			},
+			
+			// 验证是否升级
+			checkUpdate() {
+				let system = uni.getSystemInfoSync()
+				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+					checkUpgrade({version:system.appVersion,platform:system.platform,version_wgt:inf.versionCode}).then(res=>{
+						let skip_version = uni.getStorageSync('skip_version')
+						if(res && res.version!=skip_version){
+							uni.$emit('closeWebview')
+							this.setShow(this.current, false)
+							router('/pages/common/upgrade?model=' + JSON.stringify(res), '', 'fade-in')
+						}
+					})
+				})
+			},
+			
+			keppAlive(){
+				// #ifdef APP-NVUE
+				uni.requestPermissions(['android.permission.RECEIVE_BOOT_COMPLETED'], (result) => {
+					if (result.granted) {
+						console.log('权限已获得');
+					} else {
+						console.log('权限被拒绝');
+						uni.showModal({
+							title: '权限申请',
+							content: '您需要授权后台运行权限才能正常使用该功能',
+							showCancel: false
+						});
+					}
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+	}
+
+	.gif-image {
+		width: 50%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/index/index.vue b/pages/user/index/index.vue
index ab611a7..0733b0d 100644
--- a/pages/user/index/index.vue
+++ b/pages/user/index/index.vue
@@ -16,7 +16,7 @@
 
 				<view class="qr" @click="toSelfQr">
 					<img src="static/images/self_info_qr.png" alt="" />
-					<img src="static/images/common_right.png" alt="" />
+					<u-icon name="arrow-right" color="#999"></u-icon>
 				</view>
 			</view>
 		</view>
@@ -94,6 +94,7 @@
 					uni.removeStorage({
 						key: "BusinessToken",
 					});
+					IMSDK.asyncApi(IMSDK.IMMethods.UnInitSDK,IMSDK.uuid());
 				}).catch((err) => {
 					console.log(err)
 				}).finally(() => {
@@ -116,13 +117,14 @@
 				});
 			},
 			toSelfQr() {
-				const info = {
+				const info = util.aesencode({
 					code	:	this.selfInfo.userID,
 					showName:	`${this.selfInfo.nickname}`,
 					faceURL	:	this.selfInfo.faceURL,
-					type	:	"user",
-				};
-				const url = `/pages/common/userOrGroupQrCode?sourceInfo=${JSON.stringify(info,)}`;
+					type	:	"user"
+				});
+				
+				const url = `/pages/common/userOrGroupQrCode?sourceInfo=${info}`;
 				uni.navigateTo({
 					url: url,
 				});
@@ -204,15 +206,19 @@
 				.nickname {
 					@include nomalEllipsis();
 					max-width: 400rpx;
-					font-weight: 500;
+					font-weight: 400;
 					font-size: 34rpx;
+					margin-bottom: 20rpx;
 				}
 
 				.id {
 					color: #8e9ab0;
 				}
 			}
-
+			.qr{
+				display: flex;
+				align-items: center;
+			}
 			img {
 				width: 18px;
 				height: 18px;
diff --git a/pages/user/selfInfo/index.vue b/pages/user/selfInfo/index.vue
index 35cece5..cd506ac 100644
--- a/pages/user/selfInfo/index.vue
+++ b/pages/user/selfInfo/index.vue
@@ -32,9 +32,7 @@
 	import dayjs from "dayjs";
 	import InfoItem from "./InfoItem.vue";
 	import util from "@/util";
-	import {
-		getPurePath
-	} from "@/util/common";
+	import {getPurePath} from "@/util/common";
 	export default {
 		components: {
 			CustomNavBar,
@@ -74,8 +72,9 @@
 		methods: {
 			...util,
 			updateNickname() {
+				const s = util.aesencode(this.selfInfo);
 				uni.navigateTo({
-					url: `/pages/common/markOrIDPage/index?isSelfNickname=true&sourceInfo=${JSON.stringify(this.selfInfo)}`,
+					url: `/pages/common/markOrIDPage/index?isSelfNickname=true&sourceInfo=${s}`,
 				});
 			},
 			updateGender() {
@@ -102,23 +101,23 @@
 						const fileName = path.slice(nameIdx);
 						const fileType = path.slice(typeIdx);
 						this.loadingState.faceURL = true;
-						const {
-							data: {
-								url
-							},
-						} = await IMSDK.asyncApi(IMSDK.IMMethods.UploadFile, IMSDK.uuid(), {
-							filepath: getPurePath(tempFilePaths[0]),
-							name: fileName,
-							contentType: fileType,
-							uuid: IMSDK.uuid(),
-						});
-						console.log(url);
-						this.updateSelfInfo({
-								faceURL: url,
-							},
-							"faceURL",
-						);
-						this.loadingState.faceURL = false;
+						try{
+							const res = await IMSDK.asyncApi(IMSDK.IMMethods.UploadFile, IMSDK.uuid(), {
+								filepath: getPurePath(tempFilePaths[0]),
+								name: fileName,
+								contentType: fileType,
+								uuid: IMSDK.uuid(),
+							});
+							console.log(res);
+							this.updateSelfInfo({
+									faceURL: res.data.url,
+								},
+								"faceURL",
+							);
+							this.loadingState.faceURL = false;
+						}catch(e){
+							console.log(e);
+						}
 					},
 				});
 			},
diff --git a/static/images/common_right.png b/static/images/common_right.png
deleted file mode 100644
index c387f8d..0000000
Binary files a/static/images/common_right.png and /dev/null differ
diff --git a/static/images/user_card_message.png b/static/images/user_card_message.png
deleted file mode 100644
index c269959..0000000
Binary files a/static/images/user_card_message.png and /dev/null differ
diff --git a/store/modules/contact.js b/store/modules/contact.js
index 325b7fc..d4b4921 100644
--- a/store/modules/contact.js
+++ b/store/modules/contact.js
@@ -27,6 +27,18 @@ const mutations = {
 	},
 	SET_RECV_FRIEND_APPLICATIONS(state, list) {
 		state.recvFriendApplications = [...list];
+		const count = list.filter((item) => item.handleResult === 0);
+		state.unHandleFriendApplicationNum = count.length;
+		if(state.unHandleFriendApplicationNum>0){
+			uni.setTabBarBadge({
+				index:1,
+				text:(state.unHandleFriendApplicationNum<100?state.unHandleFriendApplicationNum:'···')+'',
+			});
+		}else{
+			uni.hideTabBarRedDot({
+				index:1
+			})
+		}
 	},
 	SET_SENT_FRIEND_APPLICATIONS(state, list) {
 		state.sentFriendApplications = [...list];
@@ -60,7 +72,7 @@ const actions = {
 				if (data.length < count) break;
 				initialFetch = false;
 			} catch (error) {
-				console.error("getFriendListPage error");
+				console.error("getFriendListPage error",error);
 			}
 		}
 		commit("SET_FRIEND_LIST", friendInfoList);
diff --git a/styles/common.scss b/styles/common.scss
index 9828046..8a2427a 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -36,4 +36,4 @@
   -webkit-line-clamp: $line;
   overflow: hidden;
   word-break: break-all;
-}
+}
\ No newline at end of file
diff --git a/uni_modules/ly-map/components/ly-map/ly-map.vue b/uni_modules/ly-map/components/ly-map/ly-map.vue
index 7b0e5c9..5159688 100644
--- a/uni_modules/ly-map/components/ly-map/ly-map.vue
+++ b/uni_modules/ly-map/components/ly-map/ly-map.vue
@@ -1,5 +1,32 @@
 <template>
 	<view class="ly-map-wrapper">
+		<view style="background: transparent;position: absolute;z-index:1998;top:10px;left: 10px;right:10px;display: flex;align-items: center;justify-content: space-between;">
+			<uni-icons type="left" size="26" color="#333" @click="back"></uni-icons>
+			<u-button 
+				@click="confirm" 
+				type="primary" 
+				v-if="type == 'chooselocation'"
+				style="font-size: 15px;width: 100rpx;margin: 0;">确定</u-button>
+		</view>
+		<!-- <uni-nav-bar 
+			left-icon="back" 
+			@clickLeft="back"
+			backgroundColor="transparent"
+			:border="false"
+			fixed
+			statusBar
+			>
+			<template slot="right" v-if="type == 'chooselocation'">
+				<u-button 
+					type="primary" 
+					size="mini" 
+					:customStyle="{
+						fontSize: '26rpx',
+						padding: '16rpx auto'
+					}"
+					@click="confirm">确定</u-button>
+			</template>
+		</uni-nav-bar> -->
 		<!-- 地图展示 -->
 		<view :id="mapId" :config="config" :change:config="LyMap.init" :call="option" :change:call="LyMap.call"
 			class="ly-map" />
@@ -48,7 +75,8 @@
 			showLocationIcon: {
 				type: Boolean,
 				default: false,
-			}
+			},
+			type:String
 		},
 		// 数据定义
 		data() {
@@ -81,6 +109,12 @@
 		},
 		// 通用方法
 		methods: {
+			confirm(){
+				this.$emit('onUserEvent',{type:'confirm'});
+			},
+			back(){
+				this.$emit('onUserEvent',{type:'back'});
+			},
 			// 生成唯一ID
 			genId() {
 				let result = '';
@@ -621,7 +655,7 @@
 		height: 100%;
 		position: relative;
 		overflow: hidden;
-		background: #f0f0f0;
+		background: transparent;
 
 		.ly-map {
 			width: 100%;
diff --git a/uni_modules/network-manage/utssdk/app-android/libs/okhttp-3.12.12.jar b/uni_modules/network-manage/utssdk/app-android/libs/okhttp-3.12.12.jar
deleted file mode 100644
index f4381a6..0000000
Binary files a/uni_modules/network-manage/utssdk/app-android/libs/okhttp-3.12.12.jar and /dev/null differ
diff --git a/uni_modules/network-manage/utssdk/app-android/libs/okio-1.15.0.jar b/uni_modules/network-manage/utssdk/app-android/libs/okio-1.15.0.jar
deleted file mode 100644
index ab8ab73..0000000
Binary files a/uni_modules/network-manage/utssdk/app-android/libs/okio-1.15.0.jar and /dev/null differ
diff --git a/unpackage/res/cover/1080_1882.9.png b/unpackage/res/cover/1080_1882.9.png
index 3d90e72..aedf4a8 100644
Binary files a/unpackage/res/cover/1080_1882.9.png and b/unpackage/res/cover/1080_1882.9.png differ
diff --git a/unpackage/res/cover/480_762.9.png b/unpackage/res/cover/480_762.9.png
index 41fb6eb..93f6b78 100644
Binary files a/unpackage/res/cover/480_762.9.png and b/unpackage/res/cover/480_762.9.png differ
diff --git a/unpackage/res/cover/720_1242.9.png b/unpackage/res/cover/720_1242.9.png
index 2157c9d..09b693a 100644
Binary files a/unpackage/res/cover/720_1242.9.png and b/unpackage/res/cover/720_1242.9.png differ
diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png
index ca3b505..ae1e384 100644
Binary files a/unpackage/res/icons/1024x1024.png and b/unpackage/res/icons/1024x1024.png differ
diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png
index adf8685..3e30142 100644
Binary files a/unpackage/res/icons/120x120.png and b/unpackage/res/icons/120x120.png differ
diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png
index b29af59..d9c3d35 100644
Binary files a/unpackage/res/icons/144x144.png and b/unpackage/res/icons/144x144.png differ
diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png
index 1d12b5f..952ed8d 100644
Binary files a/unpackage/res/icons/152x152.png and b/unpackage/res/icons/152x152.png differ
diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png
index 6167a5b..b624076 100644
Binary files a/unpackage/res/icons/167x167.png and b/unpackage/res/icons/167x167.png differ
diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png
index 56adb58..b8cf383 100644
Binary files a/unpackage/res/icons/180x180.png and b/unpackage/res/icons/180x180.png differ
diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png
index 61e4e49..2f824db 100644
Binary files a/unpackage/res/icons/192x192.png and b/unpackage/res/icons/192x192.png differ
diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png
index 18d6974..e4acfb4 100644
Binary files a/unpackage/res/icons/20x20.png and b/unpackage/res/icons/20x20.png differ
diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png
index 4fcb50f..06c8c76 100644
Binary files a/unpackage/res/icons/29x29.png and b/unpackage/res/icons/29x29.png differ
diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png
index 63fbb20..a8d05be 100644
Binary files a/unpackage/res/icons/40x40.png and b/unpackage/res/icons/40x40.png differ
diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png
index 758bc2b..4d02bf9 100644
Binary files a/unpackage/res/icons/58x58.png and b/unpackage/res/icons/58x58.png differ
diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png
index 7ac5599..5a8b2bb 100644
Binary files a/unpackage/res/icons/60x60.png and b/unpackage/res/icons/60x60.png differ
diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png
index 5467b60..cc86b3f 100644
Binary files a/unpackage/res/icons/72x72.png and b/unpackage/res/icons/72x72.png differ
diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png
index 7cb3e6b..583beaf 100644
Binary files a/unpackage/res/icons/76x76.png and b/unpackage/res/icons/76x76.png differ
diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png
index 155d431..f86b312 100644
Binary files a/unpackage/res/icons/80x80.png and b/unpackage/res/icons/80x80.png differ
diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png
index 2cb70c0..1cee449 100644
Binary files a/unpackage/res/icons/87x87.png and b/unpackage/res/icons/87x87.png differ
diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png
index 83f7e68..9aa35d6 100644
Binary files a/unpackage/res/icons/96x96.png and b/unpackage/res/icons/96x96.png differ
diff --git a/util/imCommon.js b/util/imCommon.js
index 2d64c0f..ae8961e 100644
--- a/util/imCommon.js
+++ b/util/imCommon.js
@@ -32,7 +32,6 @@ dayjs.updateLocale("zh-cn", {
 
 export const formatMessageTime = (timestemp, keepSameYear = false) => {
 	if (!timestemp) return "";
-
 	const isRecent = dayjs().diff(timestemp, "day") < 7;
 	const keepYear = keepSameYear || !isThisYear(timestemp);
 
@@ -211,6 +210,10 @@ export const parseMessageByType = (pmsg) => {
 			return `[RevokeMessage]`;
 		case MessageType.MsgPinned:
 			return `[MsgPinned]`;
+		case 2001:
+			const body = JSON.parse(pmsg.notificationElem.detail);
+			body.data = JSON.parse(body.data);
+			return parseMessageByType(body.data);
 		default:
 			return "[暂未支持的消息类型]";
 	}
diff --git a/util/index.js b/util/index.js
index 514aa6c..2bf5f94 100644
--- a/util/index.js
+++ b/util/index.js
@@ -4,6 +4,7 @@ import base from '@/common/config';
 //import store from "@/store";
 import IMSDK from "openim-uniapp-polyfill";
 
+import CryptoJS from 'crypto-js';
 import md5 from "md5";
 
 import {downloadFile} from "@/uni_modules/network-manage";
@@ -233,8 +234,6 @@ const get_absolute_path = (fn)=>{
 }
 const pendingDownloads = new Map();
 const cacheFile = (url, saveDir,progressCallback) => {
-	let cacheDir = plus.io.convertLocalFileSystemURL(`_doc/{{dir}}/{{key}}.{{ext}}`);
-	cacheDir = cacheDir.replace('apps/'+plus.runtime.appid+'/doc','cache');
     return new Promise(async (resolve, reject) => {
         try {
 			if(!url || !url.startsWith('http')){
@@ -246,6 +245,8 @@ const cacheFile = (url, saveDir,progressCallback) => {
 			if(url.toLowerCase().indexOf('.mp4')!==-1){
 				ext = "mp4";
 			}
+			let cacheDir = plus.io.convertLocalFileSystemURL(`_doc/{{dir}}/{{key}}.{{ext}}`);
+			cacheDir = cacheDir.replace('apps/'+plus.runtime.appid+'/doc','cache');
             const cacheFilePath = cacheDir.replace('{{dir}}',saveDir)
 				.replace('{{key}}',key)
 				.replace('{{ext}}',ext);
@@ -315,8 +316,130 @@ const cacheFile = (url, saveDir,progressCallback) => {
         }
     });
 };
+const toMapAPP = (latitude,longitude,name) =>{
+	let url = "";
+	if (plus.os.name == "Android") {//判断是安卓端
+		plus.nativeUI.actionSheet({//选择菜单
+			title: "选择地图应用",
+			cancel: "取消",
+			buttons: [{title: "腾讯地图"},{title: "百度地图"}, {title: "高德地图"}]
+		}, function(e) {
+			switch (e.index) {
+				//下面是拼接url,不同系统以及不同地图都有不同的拼接字段
+				case 1:
+					//注意referer=xxx的xxx替换成你在腾讯地图开发平台申请的key
+					url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
+					break;
+				case 2:
+					url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`;
+					break;
+				case 3:
+					url = `androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
+					break;
+				default:
+					break;
+			}
+			if (url != "") {
+				url = encodeURI(url);
+				//plus.runtime.openURL(url,function(e){})调起手机APP应用
+				plus.runtime.openURL(url, function(e) {
+					plus.nativeUI.alert("本机未安装指定的地图应用");
+				});
+			}
+		})
+	} else {
+		// iOS上获取本机是否安装了百度高德地图，需要在manifest里配置
+		// 在manifest.json文件app-plus->distribute->apple->urlschemewhitelist节点下添加
+		//（如urlschemewhitelist:["iosamap","baidumap"]）  
+		plus.nativeUI.actionSheet({
+			title: "选择地图应用",
+			cancel: "取消",
+			buttons: [{title: "腾讯地图"},{title: "百度地图"}, {title: "高德地图"}]
+		}, function(e) {
+			switch (e.index) {
+				case 1:
+					url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
+					break;
+				case 2:
+					url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
+					break;
+				case 3:
+					url = `iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
+					break;
+				default:
+					break;
+			}
+			if (url != "") {
+				url = encodeURI(url);
+				plus.runtime.openURL(url, function(e) {
+					plus.nativeUI.alert("本机未安装指定的地图应用");
+				});
+			}
+		})
+	}
+}
+
+/**
+* AES 加密函数
+* @param {String|Object|Array} str 要加密的内容
+* @param {String} key 加密密钥
+* @returns {String} 加密后的Base64字符串
+*/
+const aesencode = (str, key = 'muNcJyt0XXV6faCGe41VSIaf0ecZeW2jXmgpL0Ak93Kbwjyr')=> {
+	// 如果是对象或数组，转为JSON字符串
+	if (typeof str === 'object') {
+		str = JSON.stringify(str);
+	}
+
+	// 使用SHA-256哈希处理密钥
+	const hashedKey = CryptoJS.SHA256(key);
+
+	// 生成IV（前16字节）
+	const iv = CryptoJS.lib.WordArray.create(hashedKey.words.slice(0, 4));
+
+	// 加密
+	const encrypted = CryptoJS.AES.encrypt(str,hashedKey,{
+		iv: iv,
+		mode: CryptoJS.mode.CBC,
+		padding: CryptoJS.pad.Pkcs7
+	});
+
+	// 返回Base64编码结果
+	const _str = encrypted.toString();
+	return _str.replace(/\+/ig,'%2b');
+}
+
+/**
+* AES 解密函数
+* @param {String} str 要解密的Base64字符串
+* @param {String} key 解密密钥
+* @returns {String} 解密后的原始字符串
+*/
+const aesdecode = (str, key = 'muNcJyt0XXV6faCGe41VSIaf0ecZeW2jXmgpL0Ak93Kbwjyr') => {
+	// 使用SHA-256哈希处理密钥
+	const hashedKey = CryptoJS.SHA256(key);
+
+	// 生成IV（前16字节）
+	const iv = CryptoJS.lib.WordArray.create(hashedKey.words.slice(0, 4));
+	str = str.replace(/\%2b/ig,'+');
+	// 解密
+	const decrypted = CryptoJS.AES.decrypt(str,hashedKey,{
+		iv: iv,
+		mode: CryptoJS.mode.CBC,
+		padding: CryptoJS.pad.Pkcs7
+	});
+
+	// 转为UTF-8字符串
+	let _str = decrypted.toString(CryptoJS.enc.Utf8);
+	console.log(_str);
+	const obj = _str.startsWith('{') || _str.startsWith('[') ? JSON.parse(_str) : _str;
+	return obj;
+}
 
 export default{
+	aesdecode,
+	aesencode,
+	toMapAPP,
 	cacheFile,
 	fileExsit,
     get_absolute_path,