diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 98a8802..e2b5cc8 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -1,14 +1,19 @@
 <script>
-	import store from './store';
+	import App from './App'
 	import http from './common/request';
 	import * as msgType from './common/messageType';
 	import * as enums from './common/enums';
 	import * as wsApi from './common/wssocket';
 	import UNI_APP from '@/.env.js'
-
+	
 	export default {
 		data() {
 			return {
+				chatStore: this.useChatStore(),
+				friendStore: this.useFriendStore(),
+				groupStore: this.useGroupStore(),
+				configStore: this.useConfigStore(),
+				userStore: this.useUserStore(),
 				isExit: false, // 是否已退出
 				audioTip: null,
 				reconnecting: false // 正在重连标志
@@ -18,7 +23,7 @@
 			init() {
 				this.isExit = false;
 				// 加载数据
-				store.dispatch("load").then(() => {
+				this.loadStore().then(() => {
 					// 初始化websocket
 					this.initWebSocket();
 				}).catch((e) => {
@@ -40,8 +45,8 @@
 						})
 					}
 					// 加载离线消息
-					this.pullPrivateOfflineMessage(store.state.chatStore.privateMsgMaxId);
-					this.pullGroupOfflineMessage(store.state.chatStore.groupMsgMaxId);
+					this.pullPrivateOfflineMessage(this.chatStore.privateMsgMaxId);
+					this.pullGroupOfflineMessage(this.chatStore.groupMsgMaxId);
 				});
 				wsApi.onMessage((cmd, msgInfo) => {
 					if (cmd == 2) {
@@ -69,33 +74,51 @@
 					
 				})
 			},
+			loadStore(){
+				return this.userStore.loadUser().then(() => {
+					const promises = [];
+					promises.push(this.friendStore.loadFriend());
+					promises.push(this.groupStore.loadGroup());
+					promises.push(this.chatStore.loadChat());
+					promises.push(this.configStore.loadConfig());
+					return Promise.all(promises);
+				})
+			},
+			unloadStore(){
+				this.friendStore.clear();
+				this.groupStore.clear();
+				this.chatStore.clear();
+				this.configStore.clear();
+				this.userStore.clear();
+			},
 			pullPrivateOfflineMessage(minId) {
-				store.commit("loadingPrivateMsg", true)
+				this.chatStore.setLoadingPrivateMsg(true)
 				http({
 					url: "/message/private/pullOfflineMessage?minId=" + minId,
 					method: 'GET'
 				}).catch(() => {
-					store.commit("loadingPrivateMsg", false)
+					this.chatStore.setLoadingPrivateMsg(false)
 				})
 			},
 			pullGroupOfflineMessage(minId) {
-				store.commit("loadingGroupMsg", true)
+				this.chatStore.setLoadingGroupMsg(true)
 				http({
 					url: "/message/group/pullOfflineMessage?minId=" + minId,
 					method: 'GET'
 				}).catch(() => {
-					store.commit("loadingGroupMsg", false)
+					this.chatStore.setLoadingGroupMsg(false)
 				})
 			},
 			handlePrivateMessage(msg) {
+				console.log("handlePrivateMessage")
 				// 消息加载标志
 				if (msg.type == enums.MESSAGE_TYPE.LOADING) {
-					store.commit("loadingPrivateMsg", JSON.parse(msg.content))
+					this.chatStore.setLoadingPrivateMsg(JSON.parse(msg.content))
 					return;
 				}
 				// 消息已读处理，清空已读数量
 				if (msg.type == enums.MESSAGE_TYPE.READED) {
-					store.commit("resetUnreadCount", {
+					this.chatStore.resetUnreadCount( {
 						type: 'PRIVATE',
 						targetId: msg.recvId
 					})
@@ -103,13 +126,13 @@
 				}
 				// 消息回执处理,改消息状态为已读
 				if (msg.type == enums.MESSAGE_TYPE.RECEIPT) {
-					store.commit("readedMessage", {
+					this.chatStore.readedMessage( {
 						friendId: msg.sendId
 					})
 					return;
 				}
 				// 标记这条消息是不是自己发的
-				msg.selfSend = msg.sendId == store.state.userStore.userInfo.id;
+				msg.selfSend = msg.sendId == this.userStore.userInfo.id;
 				// 好友id
 				let friendId = msg.selfSend ? msg.recvId : msg.sendId;
 				this.loadFriendInfo(friendId).then((friend) => {
@@ -151,9 +174,9 @@
 					headImage: friend.headImage
 				};
 				// 打开会话
-				store.commit("openChat", chatInfo);
+				this.chatStore.openChat(chatInfo);
 				// 插入消息
-				store.commit("insertMessage", msg);
+				this.chatStore.insertMessage(msg);
 				// 播放提示音
 				this.playAudioTip();
 
@@ -161,7 +184,7 @@
 			handleGroupMessage(msg) {
 				// 消息加载标志
 				if (msg.type == enums.MESSAGE_TYPE.LOADING) {
-					store.commit("loadingGroupMsg", JSON.parse(msg.content))
+					this.chatStore.setLoadingGroupMsg(JSON.parse(msg.content))
 					return;
 				}
 				// 消息已读处理
@@ -171,7 +194,7 @@
 						type: 'GROUP',
 						targetId: msg.groupId
 					}
-					store.commit("resetUnreadCount", chatInfo)
+					this.chatStore.resetUnreadCount(chatInfo)
 					return;
 				}
 				// 消息回执处理
@@ -183,11 +206,11 @@
 						readedCount: msg.readedCount,
 						receiptOk: msg.receiptOk
 					};
-					store.commit("updateMessage", msgInfo)
+					this.chatStore.updateMessage(msgInfo)
 					return;
 				}
 				// 标记这条消息是不是自己发的
-				msg.selfSend = msg.sendId == store.state.userStore.userInfo.id;
+				msg.selfSend = msg.sendId == this.userStore.userInfo.id;
 				this.loadGroupInfo(msg.groupId).then((group) => {
 					// 插入群聊消息
 					this.insertGroupMessage(group, msg);
@@ -241,15 +264,15 @@
 					headImage: group.headImageThumb
 				};
 				// 打开会话
-				store.commit("openChat", chatInfo);
+				this.chatStore.openChat(chatInfo);
 				// 插入消息
-				store.commit("insertMessage", msg);
+				this.chatStore.insertMessage( msg);
 				// 播放提示音
 				this.playAudioTip();
 			},
 			loadFriendInfo(id) {
 				return new Promise((resolve, reject) => {
-					let friend = store.getters.findFriend(id);
+					let friend = this.friendStore.findFriend(id);
 					if (friend) {
 						resolve(friend);
 					} else {
@@ -257,7 +280,7 @@
 							url: `/friend/find/${id}`,
 							method: 'GET'
 						}).then((friend) => {
-							store.commit("addFriend", friend);
+							this.friendStore.addFriend(friend);
 							resolve(friend)
 						})
 					}
@@ -265,7 +288,7 @@
 			},
 			loadGroupInfo(id) {
 				return new Promise((resolve, reject) => {
-					let group = store.state.groupStore.groups.find((g) => g.id == id);
+					let group = this.groupStore.groups.find((g) => g.id == id);
 					if (group) {
 						resolve(group);
 					} else {
@@ -273,8 +296,8 @@
 							url: `/group/find/${id}`,
 							method: 'GET'
 						}).then((group) => {
+							this.groupStore.addGroup(group);
 							resolve(group)
-							store.commit("addGroup", group);
 						})
 					}
 				});
@@ -287,7 +310,7 @@
 				uni.reLaunch({
 					url: "/pages/login/login"
 				})
-				store.dispatch("unload");
+				this.unloadStore();
 			},
 			playAudioTip() {
 				// 音频播放无法成功
@@ -314,7 +337,7 @@
 						title: '连接已断开，尝试重新连接...',
 						icon: 'none',
 					})
-					store.commit("setUserInfo", userInfo);
+					this.userStore.setUserInfo(userInfo);
 					// 重新连接
 					let loginInfo = uni.getStorageSync("loginInfo")
 					wsApi.reconnect(UNI_APP.WS_URL, loginInfo.accessToken);
diff --git a/im-uniapp/components/chat-at-box/chat-at-box.vue b/im-uniapp/components/chat-at-box/chat-at-box.vue
index e9f956f..d40518a 100644
--- a/im-uniapp/components/chat-at-box/chat-at-box.vue
+++ b/im-uniapp/components/chat-at-box/chat-at-box.vue
@@ -49,6 +49,7 @@
 		},
 		data() {
 			return {
+				userStore: this.useUserStore(),
 				searchText: "",
 				showMembers:[]
 			};
@@ -56,7 +57,7 @@
 		methods: {
 			init(atUserIds) {
 				this.showMembers = [];
-				let userId = this.$store.state.userStore.userInfo.id;
+				let userId = this.userStore.userInfo.id;
 				if(this.ownerId == userId){
 					this.showMembers.push({
 						userId:-1,
diff --git a/im-uniapp/components/chat-group-readed/chat-group-readed.vue b/im-uniapp/components/chat-group-readed/chat-group-readed.vue
index 6b7452f..117636d 100644
--- a/im-uniapp/components/chat-group-readed/chat-group-readed.vue
+++ b/im-uniapp/components/chat-group-readed/chat-group-readed.vue
@@ -37,6 +37,7 @@
 		name: "chat-group-readed",
 		data() {
 			return {
+				chatStore: this.useChatStore(),
 				items: ['已读', '未读'],
 				current: 0,
 				readedMembers: [],
@@ -79,7 +80,7 @@
 					this.items[0] = `已读(${this.readedMembers.length})`;
 					this.items[1] = `未读(${this.unreadMembers.length})`;
 					// 更新已读人数
-					this.$store.commit("updateMessage", {
+					this.chatStore.updateMessage({
 						id: this.msgInfo.id,
 						groupId: this.msgInfo.groupId,
 						readedCount: this.readedMembers.length
diff --git a/im-uniapp/components/group-rtc-join/group-rtc-join.vue b/im-uniapp/components/group-rtc-join/group-rtc-join.vue
index 8938fe5..2ffcec1 100644
--- a/im-uniapp/components/group-rtc-join/group-rtc-join.vue
+++ b/im-uniapp/components/group-rtc-join/group-rtc-join.vue
@@ -26,6 +26,7 @@
 	export default {
 		data() {
 			return {
+				userStore: this.useUserStore(),
 				rtcInfo: {}
 			}
 		},
@@ -41,7 +42,7 @@
 			},
 			onOk() {
 				let users = this.rtcInfo.userInfos;
-				let mine = this.$store.state.userStore.userInfo;
+				let mine = this.userStore.userInfo;
 				// 加入自己的信息
 				if(!users.find((user)=>user.id==mine.id)){
 					users.push({
diff --git a/im-uniapp/main.js b/im-uniapp/main.js
index bfdb591..1f3965c 100644
--- a/im-uniapp/main.js
+++ b/im-uniapp/main.js
@@ -5,9 +5,15 @@ import * as  enums from './common/enums.js';
 import * as date from './common/date';
 import * as socketApi from './common/wssocket';
 import * as messageType from './common/messageType';
-import store from './store';
 import { createSSRApp } from 'vue'
 import uviewPlus from '@/uni_modules/uview-plus'
+import * as pinia from 'pinia';
+import useChatStore from '@/store/chatStore.js'
+import useFriendStore from '@/store/friendStore.js'
+import useGroupStore from '@/store/groupStore.js'
+import useConfigStore from '@/store/configStore.js'
+import useUserStore from '@/store/userStore.js'
+	
 // #ifdef H5
 import * as recorder from './common/recorder-h5';
 // #endif
@@ -18,8 +24,8 @@ import * as recorder from './common/recorder-app';
 
 export function createApp() {
   const app = createSSRApp(App)
-  app.use(store);
   app.use(uviewPlus);
+  app.use(pinia.createPinia());
   app.config.globalProperties.$http = request;
   app.config.globalProperties.$wsApi = socketApi;
   app.config.globalProperties.$msgType = messageType;
@@ -27,7 +33,14 @@ export function createApp() {
   app.config.globalProperties.$enums = enums;
   app.config.globalProperties.$date = date;
   app.config.globalProperties.$rc = recorder;
+  app.config.globalProperties.useChatStore = useChatStore;
+  app.config.globalProperties.useFriendStore = useFriendStore;
+  app.config.globalProperties.useGroupStore = useGroupStore;
+  app.config.globalProperties.useConfigStore = useConfigStore;
+  app.config.globalProperties.useUserStore = useUserStore;
+  
   return {
-    app
+    app,
+	pinia
   }
 }
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index 013cd11..c76e602 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -108,18 +108,27 @@
 		<chat-at-box ref="atBox" :ownerId="group.ownerId" :members="groupMembers"
 			@complete="onAtComplete"></chat-at-box>
 		<!-- 群语音通话时选择成员 -->
+		<!-- #ifndef MP-WEIXIN -->
 		<group-member-selector ref="selBox" :members="groupMembers"
-			:maxSize="$store.state.configStore.webrtc.maxChannel"
+			:maxSize="configStore.webrtc.maxChannel"
 			@complete="onInviteOk"></group-member-selector>
 		<group-rtc-join ref="rtcJoin" :groupId="group.id"></group-rtc-join>
+		<!-- #endif -->
 	</view>
 </template>
 
 <script>
 	import UNI_APP from '@/.env.js';
+	import useChatStore  from '@/store/chatStore.js'
+	
 	export default {
 		data() {
 			return {
+				chatStore: useChatStore(),
+				friendStore: this.useFriendStore(),
+				groupStore: this.useGroupStore(),
+				configStore: this.useConfigStore(),
+				userStore: this.useUserStore(),
 				chat: {},
 				friend: {},
 				group: {},
@@ -157,7 +166,7 @@
 				this.fillTargetId(msgInfo, this.chat.targetId);
 				this.sendMessageRequest(msgInfo).then((m) => {
 					m.selfSend = true;
-					this.$store.commit("insertMessage", m);
+					this.chatStore.insertMessage(m);
 					// 会话置顶
 					this.moveChatToTop();
 					// 滚动到底部
@@ -226,8 +235,8 @@
 				})
 			},
 			moveChatToTop() {
-				let chatIdx = this.$store.getters.findChatIdx(this.chat);
-				this.$store.commit("moveTop", chatIdx);
+				let chatIdx = this.chatStore.findChatIdx(this.chat);
+				this.chatStore.moveTop(chatIdx);
 			},
 			switchReceipt() {
 				this.isReceipt = !this.isReceipt;
@@ -261,6 +270,7 @@
 				}
 			},
 			sendTextMessage() {
+				const timeStamp  = new Date().getTime();
 				if (!this.sendText.trim() && this.atUserIds.length == 0) {
 					return uni.showToast({
 						title: "不能发送空白信息",
@@ -279,8 +289,10 @@
 				// 填充对方id
 				this.fillTargetId(msgInfo, this.chat.targetId);
 				this.sendMessageRequest(msgInfo).then((m) => {
+					console.log("请求耗时：",new Date().getTime()-timeStamp)
 					m.selfSend = true;
-					this.$store.commit("insertMessage", m);
+					this.chatStore.insertMessage(m);
+					console.log("insertMessage耗时：",new Date().getTime()-timeStamp)
 					// 会话置顶
 					this.moveChatToTop();
 				}).finally(() => {
@@ -387,7 +399,7 @@
 				// 填充对方id
 				this.fillTargetId(msgInfo, this.chat.targetId);
 				// 插入消息
-				this.$store.commit("insertMessage", msgInfo);
+				this.chatStore.insertMessage(msgInfo);
 				// 会话置顶
 				this.moveChatToTop();
 				// 借助file对象保存
@@ -404,13 +416,13 @@
 					msgInfo.loadStatus = 'ok';
 					msgInfo.id = m.id;
 					this.isReceipt = false;
-					this.$store.commit("insertMessage", msgInfo);
+					this.chatStore.insertMessage(msgInfo);
 				})
 			},
 			onUploadImageFail(file, err) {
 				let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
 				msgInfo.loadStatus = 'fail';
-				this.$store.commit("insertMessage", msgInfo);
+				this.chatStore.insertMessage(msgInfo);
 			},
 			onUploadFileBefore(file) {
 				let data = {
@@ -433,7 +445,7 @@
 				// 填充对方id
 				this.fillTargetId(msgInfo, this.chat.targetId);
 				// 插入消息
-				this.$store.commit("insertMessage", msgInfo);
+				this.chatStore.insertMessage(msgInfo);
 				// 会话置顶
 				this.moveChatToTop();
 				// 借助file对象保存
@@ -455,13 +467,13 @@
 					msgInfo.loadStatus = 'ok';
 					msgInfo.id = m.id;
 					this.isReceipt = false;
-					this.$store.commit("insertMessage", msgInfo);
+					this.chatStore.insertMessage(msgInfo);
 				})
 			},
 			onUploadFileFail(file, res) {
 				let msgInfo = JSON.parse(JSON.stringify(file.msgInfo));
 				msgInfo.loadStatus = 'fail';
-				this.$store.commit("insertMessage", msgInfo);
+				this.chatStore.insertMessage(msgInfo);
 			},
 			onDeleteMessage(msgInfo) {
 				uni.showModal({
@@ -469,7 +481,7 @@
 					content: '确认删除消息?',
 					success: (res) => {
 						if (!res.cancel) {
-							this.$store.commit("deleteMessage", msgInfo);
+							this.chatStore.deleteMessage(msgInfo);
 							uni.showToast({
 								title: "删除成功",
 								icon: "none"
@@ -493,7 +505,7 @@
 								msgInfo.type = this.$enums.MESSAGE_TYPE.RECALL;
 								msgInfo.content = '你撤回了一条消息';
 								msgInfo.status = this.$enums.MESSAGE_STATUS.RECALL;
-								this.$store.commit("insertMessage", msgInfo);
+								this.chatStore.insertMessage(msgInfo);
 							})
 						}
 					}
@@ -558,7 +570,7 @@
 					url: `/message/private/maxReadedId?friendId=${fId}`,
 					method: 'get'
 				}).then((id) => {
-					this.$store.commit("readedMessage", {
+					this.chatStore.readedMessage({
 						friendId: fId,
 						maxId: id
 					});
@@ -578,7 +590,7 @@
 					url: url,
 					method: 'PUT'
 				}).then(() => {
-					this.$store.commit("resetUnreadCount", this.chat)
+					this.chatStore.resetUnreadCount(this.chat)
 					this.scrollToBottom();
 				})
 			},
@@ -588,8 +600,8 @@
 					method: 'GET'
 				}).then((group) => {
 					this.group = group;
-					this.$store.commit("updateChatFromGroup", group);
-					this.$store.commit("updateGroup", group);
+					this.chatStore.updateChatFromGroup(group);
+					this.groupStore.updateGroup(group);
 				});
 
 				this.$http({
@@ -606,8 +618,8 @@
 					method: 'GET'
 				}).then((friend) => {
 					this.friend = friend;
-					this.$store.commit("updateChatFromFriend", friend);
-					this.$store.commit("updateFriend", friend);
+					this.chatStore.updateChatFromFriend(friend);
+					this.friendStore.updateFriend(friend);
 				})
 			},
 			rpxTopx(rpx) {
@@ -649,7 +661,7 @@
 		},
 		computed: {
 			mine() {
-				return this.$store.state.userStore.userInfo;
+				return this.userStore.userInfo;
 			},
 			title() {
 				if (!this.chat) {
@@ -719,7 +731,7 @@
 		},
 		onLoad(options) {
 			// 聊天数据
-			this.chat = this.$store.state.chatStore.chats[options.chatIdx];
+			this.chat = this.chatStore.chats[options.chatIdx];
 			// 初始状态只显示20条消息
 			let size = this.messageSize;
 			this.showMinIdx = size > 20 ? size - 20 : 0;
@@ -733,12 +745,12 @@
 				this.loadReaded(this.chat.targetId)
 			}
 			// 激活当前会话
-			this.$store.commit("activeChat", options.chatIdx);
+			this.chatStore.activeChat(options.chatIdx);
 			// 复位回执消息
 			this.isReceipt = false;
 		},
 		onUnload() {
-			this.$store.commit("activeChat", -1);
+			this.chatStore.activeChat(-1);
 		},
 		onShow(){
 			if(this.needScrollToBottom){
diff --git a/im-uniapp/pages/chat/chat-group-video.vue b/im-uniapp/pages/chat/chat-group-video.vue
index f475d92..871abc4 100644
--- a/im-uniapp/pages/chat/chat-group-video.vue
+++ b/im-uniapp/pages/chat/chat-group-video.vue
@@ -7,6 +7,8 @@
 	export default {
 		data() {
 			return {
+				configStore: this.useConfigStore(),
+				userStore: this.useUserStore(),
 				url: "",
 				wv: '',
 				isHost: false,
@@ -67,12 +69,12 @@
 				this.url = "/hybrid/html/rtc-group/index.html?";
 				this.url += "baseUrl=" + UNI_APP.BASE_URL;
 				this.url += "&groupId=" + this.groupId;
-				this.url += "&userId=" + this.$store.state.userStore.userInfo.id;
+				this.url += "&userId=" + this.userStore.userInfo.id;
 				this.url += "&inviterId=" + this.inviterId;
 				this.url += "&isHost=" + this.isHost;
 				this.url += "&loginInfo=" + JSON.stringify(uni.getStorageSync("loginInfo"));
 				this.url += "&userInfos=" + JSON.stringify(this.userInfos);
-				this.url += "&config=" + JSON.stringify(this.$store.state.configStore.webrtc);
+				this.url += "&config=" + JSON.stringify(this.configStore.webrtc);
 			},
 		},
 		onBackPress() {
diff --git a/im-uniapp/pages/chat/chat-private-video.vue b/im-uniapp/pages/chat/chat-private-video.vue
index 5772d46..8dc5077 100644
--- a/im-uniapp/pages/chat/chat-private-video.vue
+++ b/im-uniapp/pages/chat/chat-private-video.vue
@@ -7,6 +7,8 @@
 	export default {
 		data() {
 			return {
+				configStore: this.useConfigStore(),
+				userStore: this.useUserStore(),
 				url: "",
 				wv: '',
 				mode: "video",
@@ -62,9 +64,9 @@
 				this.url += "&isHost="+this.isHost;
 				this.url += "&baseUrl="+UNI_APP.BASE_URL;
 				this.url += "&loginInfo="+JSON.stringify(uni.getStorageSync("loginInfo"));
-				this.url += "&userInfo="+JSON.stringify(this.$store.state.userStore.userInfo);
+				this.url += "&userInfo="+JSON.stringify(this.userStore.userInfo);
 				this.url += "&friend="+JSON.stringify(this.friend);
-				this.url += "&config=" + JSON.stringify(this.$store.state.configStore.webrtc);
+				this.url += "&config=" + JSON.stringify(this.configStore.webrtc);
 			},
 		},
 		onBackPress() {
diff --git a/im-uniapp/pages/chat/chat.vue b/im-uniapp/pages/chat/chat.vue
index 6aaa9a5..1437b28 100644
--- a/im-uniapp/pages/chat/chat.vue
+++ b/im-uniapp/pages/chat/chat.vue
@@ -26,9 +26,12 @@
 </template>
 
 <script>
+	import useChatStore from '@/store/chatStore.js'
+	
 	export default {
 		data() {
 			return {
+				chatStore: useChatStore(),
 				searchText: "",
 				menu: {
 					show: false,
@@ -65,10 +68,10 @@
 				this.menu.show = false;
 			},
 			removeChat(chatIdx) {
-				this.$store.commit("removeChat", chatIdx);
+				this.chatStore.removeChat(chatIdx);
 			},
 			moveToTop(chatIdx) {
-				this.$store.commit("moveTop", chatIdx);
+				this.chatStore.moveTop(chatIdx);
 			},
 			isShowChat(chat){
 				if(chat.delete){
@@ -107,9 +110,6 @@
 				});
 				return chatsPos;
 			},
-			chatStore() {
-				return this.$store.state.chatStore;
-			},
 			unreadCount() {
 				let count = 0;
 				this.chatStore.chats.forEach(chat => {
diff --git a/im-uniapp/pages/common/user-info.vue b/im-uniapp/pages/common/user-info.vue
index fd95031..0689050 100644
--- a/im-uniapp/pages/common/user-info.vue
+++ b/im-uniapp/pages/common/user-info.vue
@@ -35,6 +35,9 @@
 	export default {
 		data() {
 			return {
+				userStore: this.useUserStore(),
+				chatStore: this.useChatStore(),
+				friendStore: this.useFriendStore(),
 				userInfo: {}
 			}
 		},
@@ -54,8 +57,8 @@
 					showName: this.userInfo.nickName,
 					headImage: this.userInfo.headImage,
 				};
-				this.$store.commit("openChat", chat);
-				let chatIdx = this.$store.getters.findChatIdx(chat);
+				this.chatStore.openChat(chat);
+				let chatIdx = this.chatStore.findChatIdx(chat);
 				uni.navigateTo({
 					url:"/pages/chat/chat-box?chatIdx=" + chatIdx
 				})
@@ -71,7 +74,7 @@
 						headImage: this.userInfo.headImageThumb,
 						online: this.userInfo.online
 					}
-					this.$store.commit("addFriend", friend);
+					this.friendStore.addFriend(friend);
 					uni.showToast({
 						title: '对方已成为您的好友',
 						icon: 'none'
@@ -89,8 +92,8 @@
 							url: `/friend/delete/${this.userInfo.id}`,
 							method: 'delete'
 						}).then((data) => {
-							this.$store.commit("removeFriend", this.userInfo.id);
-							this.$store.commit("removePrivateChat", this.userInfo.id);
+							this.friendStore.removeFriend(this.userInfo.id);
+							this.chatStore.removePrivateChat(this.userInfo.id);
 							uni.showToast({
 								title: 	`与 '${this.userInfo.nickName}'的好友关系已解除`,
 								icon: 'none'
@@ -110,9 +113,9 @@
 					data: friend
 				}).then(() => {
 					// 更新好友列表中的昵称和头像
-					this.$store.commit("updateFriend", friend);
+					this.friendStore.updateFriend(friend);
 					// 更新会话中的头像和昵称
-					this.$store.commit("updateChatFromFriend", this.userInfo);
+					this.chatStore.updateChatFromFriend(this.userInfo);
 				})
 			},
 			loadUserInfo(id){
@@ -134,7 +137,7 @@
 				return this.friendInfo&&!this.friendInfo.delete;
 			},
 			friendInfo(){
-				let friends = this.$store.state.friendStore.friends;
+				let friends = this.friendStore.friends;
 				let friend = friends.find((f) => f.id == this.userInfo.id);
 				return friend;
 			}
diff --git a/im-uniapp/pages/friend/friend-add.vue b/im-uniapp/pages/friend/friend-add.vue
index 09c81b2..ce6dd15 100644
--- a/im-uniapp/pages/friend/friend-add.vue
+++ b/im-uniapp/pages/friend/friend-add.vue
@@ -6,7 +6,7 @@
 		</view>
 		<view class="user-items">
 			<scroll-view class="scroll-bar" scroll-with-animation="true" scroll-y="true">
-				<view v-for="(user) in users" :key="user.id" v-show="user.id != $store.state.userStore.userInfo.id">
+				<view v-for="(user) in users" :key="user.id" v-show="user.id != userStore.userInfo.id">
 					<view class="user-item">
 						<head-image :id="user.id" :name="user.nickName" 
 							:online="user.online" :url="user.headImage"
@@ -28,6 +28,8 @@
 	export default {
 		data() {
 			return {
+				friendStore: this.useFriendStore(),
+				userStore: this.useUserStore(),
 				searchText: "",
 				users: []
 			}
@@ -55,7 +57,7 @@
 						headImage: user.headImage,
 						online: user.online
 					}
-					this.$store.commit("addFriend", friend);
+					this.friendStore.addFriend(friend);
 					uni.showToast({
 						title: "添加成功，对方已成为您的好友",
 						icon: "none"
@@ -68,7 +70,7 @@
 				})
 			},
 			isFriend(userId) {
-				let friends = this.$store.state.friendStore.friends;
+				let friends = this.friendStore.friends;
 				let friend = friends.find((f) => f.id == userId);
 				return friend&&!friend.delete;
 			}
diff --git a/im-uniapp/pages/friend/friend.vue b/im-uniapp/pages/friend/friend.vue
index cf6f0f9..6c929e5 100644
--- a/im-uniapp/pages/friend/friend.vue
+++ b/im-uniapp/pages/friend/friend.vue
@@ -34,6 +34,7 @@
 	export default {
 		data() {
 			return {
+				friendStore: this.useFriendStore(),
 				searchText: ''
 			}
 		},
@@ -58,7 +59,7 @@
 		},
 		computed: {
 			friends() {
-				return this.$store.state.friendStore.friends;
+				return this.friendStore.friends;
 			},
 			friendGroupMap(){
 				// 按首字母分组
diff --git a/im-uniapp/pages/group/group-edit.vue b/im-uniapp/pages/group/group-edit.vue
index f7e9c0e..074257e 100644
--- a/im-uniapp/pages/group/group-edit.vue
+++ b/im-uniapp/pages/group/group-edit.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="$store.state.userStore.userInfo.type == 1" class="page group-edit">
+	<view v-if="userStore.userInfo.type == 1" class="page group-edit">
 		<uni-forms ref="form" :modelValue="group" :rules="rules" validate-trigger="bind" label-position="top"
 			label-width="100%">
 			<uni-forms-item label="群聊头像:" name="headImage">
@@ -16,7 +16,7 @@
 				<uni-easyinput v-model="group.remarkGroupName" type="text" :placeholder="group.name" />
 			</uni-forms-item>
 			<uni-forms-item label="我在本群的昵称:" name="remarkNickName">
-				<uni-easyinput v-model="group.remarkNickName" type="text" :placeholder="$store.state.userStore.userInfo.nickName" />
+				<uni-easyinput v-model="group.remarkNickName" type="text" :placeholder="userStore.userInfo.nickName" />
 			</uni-forms-item>
 			<uni-forms-item label="群公告:" name="notice">
 				<uni-easyinput type="textarea" v-model="group.notice" :disabled="!isOwner" placeholder="请输入群公告" />
@@ -30,6 +30,9 @@
 	export default {
 		data() {
 			return {
+				chatStore: this.useChatStore(),
+				groupStore: this.useGroupStore(),
+				userStore: this.useUserStore(),
 				group: {},
 				rules: {
 					name: {
@@ -61,7 +64,7 @@
 					method: "PUT",
 					data: this.group
 				}).then((group) => {
-					this.$store.commit("updateGroup", group);
+					this.groupStore.updateGroup(group);
 					uni.showToast({
 						title: "修改群聊信息成功",
 						icon: 'none'
@@ -81,7 +84,7 @@
 					method: 'POST',
 					data: this.group
 				}).then((group) => {
-					this.$store.commit("addGroup", group);
+					this.groupStore.addGroup(group);
 					uni.showToast({
 						title: `群聊创建成功，快邀请小伙伴进群吧`,
 						icon: 'none',
@@ -102,25 +105,25 @@
 				}).then((group) => {
 					this.group = group;
 					// 更新聊天页面的群聊信息
-					this.$store.commit("updateChatFromGroup", group);
+					this.chatStore.updateChatFromGroup(group);
 					// 更新聊天列表的群聊信息
-					this.$store.commit("updateGroup", group);
+					this.groupStore.updateGroup(group);
 
 				});
 			},
 			initNewGroup() {
-				let userInfo = this.$store.state.userStore.userInfo;
+				let userInfo = this.userStore.userInfo;
 				this.group = {
 					name: `${userInfo.userName}创建的群聊`,
 					headImage: userInfo.headImage,
 					headImageThumb: userInfo.headImageThumb,
-					ownerId: this.$store.state.userStore.userInfo.id
+					ownerId: this.userStore.userInfo.id
 				}
 			}
 		},
 		computed: {
 			isOwner() {
-				return this.$store.state.userStore.userInfo.id == this.group.ownerId
+				return this.userStore.userInfo.id == this.group.ownerId
 			}
 		},
 		onLoad(options) {
diff --git a/im-uniapp/pages/group/group-info.vue b/im-uniapp/pages/group/group-info.vue
index e25670f..a30e259 100644
--- a/im-uniapp/pages/group/group-info.vue
+++ b/im-uniapp/pages/group/group-info.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="$store.state.userStore.userInfo.type == 1" class="page group-info">
+	<view v-if="userStore.userInfo.type == 1" class="page group-info">
 		<view v-if="!group.quit"  class="group-members">
 			<view class="member-items">
 				<view v-for="(member,idx) in  groupMembers" :key="idx">
@@ -56,6 +56,9 @@
 	export default {
 		data() {
 			return {
+				chatStore: this.useChatStore(),
+				groupStore: this.useGroupStore(),
+				userStore: this.useUserStore(),
 				groupId: null,
 				group:{},
 				groupMembers: []
@@ -85,8 +88,8 @@
 					showName: this.group.showGroupName,
 					headImage: this.group.headImage,
 				};
-				this.$store.commit("openChat", chat);
-				let chatIdx = this.$store.getters.findChatIdx(chat);
+				this.chatStore.openChat(chat);
+				let chatIdx = this.chatStore.findChatIdx(chat);
 				uni.navigateTo({
 					url: "/pages/chat/chat-box?chatIdx=" + chatIdx
 				})
@@ -111,8 +114,8 @@
 										uni.switchTab({
 											url:"/pages/group/group"
 										});
-										this.$store.commit("removeGroup", this.groupId);
-										this.$store.commit("removeGroupChat",this.groupId);
+										this.groupStore.removeGroup(this.groupId);
+										this.chatStore.removeGroupChat(this.groupId);
 									},100)
 								}
 							})
@@ -121,7 +124,6 @@
 				});
 			},
 			onDissolveGroup() {
-				console.log(this.group.name)
 				uni.showModal({
 					title: '确认解散?',
 					content: `确认要解散群聊'${this.group.name}'吗?`,
@@ -141,8 +143,8 @@
 										uni.switchTab({
 											url:"/pages/group/group"
 										});
-										this.$store.commit("removeGroup", this.groupId);
-										this.$store.commit("removeGroupChat",this.groupId);
+										this.groupStore.removeGroup(this.groupId);
+										this.chatStore.removeGroupChat(this.groupId);
 									},100)	
 								}
 							})
@@ -158,9 +160,9 @@
 				}).then((group) => {
 					this.group = group;
 					// 更新聊天页面的群聊信息
-					this.$store.commit("updateChatFromGroup", group);
+					this.chatStore.updateChatFromGroup(group);
 					// 更新聊天列表的群聊信息
-					this.$store.commit("updateGroup", group);
+					this.groupStore.updateGroup(group);
 
 				});
 			},
@@ -180,7 +182,7 @@
 				return member && member.showNickName;
 			},
 			isOwner() {
-				return this.group.ownerId == this.$store.state.userStore.userInfo.id;
+				return this.group.ownerId == this.userStore.userInfo.id;
 			}
 		},
 		onLoad(options) {
diff --git a/im-uniapp/pages/group/group-invite.vue b/im-uniapp/pages/group/group-invite.vue
index 700e572..e14ee64 100644
--- a/im-uniapp/pages/group/group-invite.vue
+++ b/im-uniapp/pages/group/group-invite.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="$store.state.userStore.userInfo.type == 1" class="page group-invite">
+	<view class="page group-invite">
 		<view class="search-bar">
 			<uni-search-bar v-model="searchText" radius="100" cancelButton="none" placeholder="输入好友昵称搜索"></uni-search-bar>
 		</view>
@@ -17,7 +17,6 @@
 							<radio :checked="friend.checked" :disabled="friend.disabled" @click.stop="onSwitchChecked(friend)"/>
 						</view>
 					</view>
-		
 				</view>
 			</scroll-view>
 		</view>
@@ -31,6 +30,7 @@
 	export default {
 		data() {
 			return {
+				friendStore: this.useFriendStore(),
 				groupId: null,
 				searchText: "",
 				groupMembers: [],
@@ -78,11 +78,10 @@
 				if (!friend.disabled) {
 					friend.checked = !friend.checked;
 				}
-				console.log(this.inviteSize)
 			},
 			initFriendItems() {
 				this.friendItems = [];
-				let friends = this.$store.state.friendStore.friends;
+				let friends = this.friendStore.friends;
 				friends.forEach((f => {
 					if(f.delete){
 						return
diff --git a/im-uniapp/pages/group/group-member.vue b/im-uniapp/pages/group/group-member.vue
index 35ffd5a..2aeec03 100644
--- a/im-uniapp/pages/group/group-member.vue
+++ b/im-uniapp/pages/group/group-member.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="$store.state.userStore.userInfo.type == 1" class="page group-member">
+	<view  class="page group-member">
 		<view class="search-bar">
 			<uni-search-bar v-model="searchText" radius="100" cancelButton="none" placeholder="输入成员昵称搜索"></uni-search-bar>
 		</view>
@@ -29,6 +29,7 @@
 	export default {
 		data() {
 			return {
+				userStore: this.useUserStore(),
 				isModify: false,
 				searchText: "",
 				group: {},
@@ -79,12 +80,12 @@
 				})
 			},
 			isSelf(userId) {
-				return this.$store.state.userStore.userInfo.id == userId
+				return this.userStore.userInfo.id == userId
 			}
 		},
 		computed: {
 			isOwner() {
-				return this.$store.state.userStore.userInfo.id == this.group.ownerId;
+				return this.userStore.userInfo.id == this.group.ownerId;
 			}
 		},
 		onLoad(options) {
diff --git a/im-uniapp/pages/group/group.vue b/im-uniapp/pages/group/group.vue
index ed8d541..b12c2bb 100644
--- a/im-uniapp/pages/group/group.vue
+++ b/im-uniapp/pages/group/group.vue
@@ -9,12 +9,12 @@
 				<uni-icons type="personadd" size="35"></uni-icons>
 			</view>
 		</view>
-		<view class="group-tip" v-if="$store.state.groupStore.groups.length==0">
+		<view class="group-tip" v-if="groupStore.groups.length==0">
 			温馨提示：您现在还没有加入任何群聊，点击右上方'+'按钮可以创建群聊哦~
 		</view>
 		<view class="group-items" v-else>
 			<scroll-view class="scroll-bar" scroll-with-animation="true" scroll-y="true">
-				<view v-for="group in $store.state.groupStore.groups" :key="group.id">
+				<view v-for="group in groupStore.groups" :key="group.id">
 					<group-item v-if="!group.quit&&group.showGroupName.includes(searchText)"
 						:group="group"></group-item>
 				</view>
@@ -27,6 +27,7 @@
 	export default {
 		data() {
 			return {
+				groupStore: this.useGroupStore(),
 				searchText: ""
 			}
 		},
diff --git a/im-uniapp/pages/mine/mine-edit.vue b/im-uniapp/pages/mine/mine-edit.vue
index e2aca6c..ee4b483 100644
--- a/im-uniapp/pages/mine/mine-edit.vue
+++ b/im-uniapp/pages/mine/mine-edit.vue
@@ -31,6 +31,7 @@
 	export default {
 		data() {
 			return {
+				userStore: this.useUserStore(),
 				userInfo: {}
 			}
 		},
@@ -48,7 +49,7 @@
 					method: "PUT",
 					data: this.userInfo
 				}).then(()=>{
-					this.$store.commit("setUserInfo",this.userInfo);
+					this.userStore.setUserInfo(this.userInfo);
 					uni.showToast({
 						title:"修改成功",
 						icon: 'none'
@@ -61,7 +62,7 @@
 		},
 		onLoad() {
 			// 深拷贝一份数据
-			let mine = this.$store.state.userStore.userInfo;
+			let mine = this.userStore.userInfo;
 			this.userInfo = JSON.parse(JSON.stringify(mine));
 		}
 	}
diff --git a/im-uniapp/pages/mine/mine.vue b/im-uniapp/pages/mine/mine.vue
index 3c6b87e..a3c4506 100644
--- a/im-uniapp/pages/mine/mine.vue
+++ b/im-uniapp/pages/mine/mine.vue
@@ -34,7 +34,9 @@
 <script>
 	export default {
 		data() {
-			return {}
+			return {
+				userStore: this.useUserStore()
+			}
 		},
 		methods: {
 			onModifyInfo() {
@@ -60,7 +62,7 @@
 		},
 		computed: {
 			userInfo() {
-				return this.$store.state.userStore.userInfo;
+				return this.userStore.userInfo;
 			}
 		}
 
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index 5d9ae7d..ed52b01 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -1,33 +1,22 @@
-import {
-	MESSAGE_TYPE,
-	MESSAGE_STATUS
-} from '@/common/enums.js';
-import userStore from './userStore';
-/*
-	uniapp性能优化：
-	1.由于uniapp渲染消息性能非常拉胯,所以先把离线消息存储到cacheChats,等
-		待所有离线消息拉取完成后，再统一进行渲染
-	2.在vuex中对数组进行unshift,splice特别卡，所以删除会话、会话置顶、删
-		除消息等操作进行优化，不通过unshift,splice实现，改造方案如下：
-		删除会话： 通过delete标志判断是否删除
-		删除消息：通过delete标志判断是否删除
-		会话置顶：通过lastSendTime排序确定会话顺序
-*/
+import { defineStore } from 'pinia';
+import { MESSAGE_TYPE, MESSAGE_STATUS } from '@/common/enums.js';
+import useUserStore from './userStore';
 
 let cacheChats = [];
-export default {
-	state: {
-		chats: [],
-		privateMsgMaxId: 0,
-		groupMsgMaxId: 0,
-		loadingPrivateMsg: false,
-		loadingGroupMsg: false,
+export default defineStore('chatStore', {
+	state: () => {
+		return {
+			chats: [],
+			privateMsgMaxId: 0,
+			groupMsgMaxId: 0,
+			loadingPrivateMsg: false,
+			loadingGroupMsg: false
+		}
 	},
-
-	mutations: {
-		initChats(state, chatsData) {
+	actions: {
+		initChats(chatsData) {
 			cacheChats = [];
-			state.chats = [];
+			this.chats = [];
 			for (let chat of chatsData.chats) {
 				// 已删除的会话直接丢弃
 				if (chat.delete) {
@@ -36,13 +25,13 @@ export default {
 				// 暂存至缓冲区
 				cacheChats.push(JSON.parse(JSON.stringify(chat)));
 				// 加载期间显示只前15个会话做做样子,一切都为了加快初始化时间
-				if (state.chats.length < 15) {
+				if (this.chats.length < 15) {
 					chat.messages = [];
-					state.chats.push(chat);
+					this.chats.push(chat);
 				}
 			}
-			state.privateMsgMaxId = chatsData.privateMsgMaxId || 0;
-			state.groupMsgMaxId = chatsData.groupMsgMaxId || 0;
+			this.privateMsgMaxId = chatsData.privateMsgMaxId || 0;
+			this.groupMsgMaxId = chatsData.groupMsgMaxId || 0;
 			// 防止图片一直处在加载中状态
 			cacheChats.forEach((chat) => {
 				chat.messages.forEach((msg) => {
@@ -52,8 +41,8 @@ export default {
 				})
 			})
 		},
-		openChat(state, chatInfo) {
-			let chats = this.getters.findChats();
+		openChat(chatInfo) {
+			let chats = this.curChats;
 			let chat = null;
 			for (let idx in chats) {
 				if (chats[idx].type == chatInfo.type &&
@@ -61,7 +50,7 @@ export default {
 					chat = chats[idx];
 					chat.delete = false;
 					// 放置头部
-					this.commit("moveTop", idx)
+					this.moveTop(idx)
 					break;
 				}
 			}
@@ -81,17 +70,18 @@ export default {
 					delete: false
 				};
 				chats.push(chat);
-				this.commit("moveTop", chats.length - 1)
+				this.moveTop(chats.length - 1)
 			}
 		},
-		activeChat(state, idx) {
-			let chats = this.getters.findChats();
+		activeChat(idx) {
+			let chats = this.curChats;
 			if (idx >= 0) {
 				chats[idx].unreadCount = 0;
 			}
 		},
-		resetUnreadCount(state, chatInfo) {
-			let chats = this.getters.findChats();
+		resetUnreadCount(chatInfo) {
+			console.log("resetUnreadCount")
+			let chats = this.curChats;
 			for (let idx in chats) {
 				if (chats[idx].type == chatInfo.type &&
 					chats[idx].targetId == chatInfo.targetId) {
@@ -100,10 +90,10 @@ export default {
 					chats[idx].atAll = false;
 				}
 			}
-			this.commit("saveToStorage");
+			this.saveToStorage();
 		},
-		readedMessage(state, pos) {
-			let chats = this.getters.findChats();
+		readedMessage(pos) {
+			let chats = this.curChats;
 			for (let idx in chats) {
 				if (chats[idx].type == 'PRIVATE' &&
 					chats[idx].targetId == pos.friendId) {
@@ -117,58 +107,59 @@ export default {
 					})
 				}
 			}
-			this.commit("saveToStorage");
+			this.saveToStorage();
 		},
-		removeChat(state, idx) {
-			let chats = this.getters.findChats();
+		removeChat(idx) {
+			let chats = this.curChats;
 			chats[idx].delete = true;
-			this.commit("saveToStorage");
+			this.saveToStorage();
 		},
-		removePrivateChat(state, userId) {
-			let chats = this.getters.findChats();
+		removePrivateChat(userId) {
+			let chats = this.curChats;
 			for (let idx in chats) {
 				if (chats[idx].type == 'PRIVATE' &&
 					chats[idx].targetId == userId) {
-					this.commit("removeChat", idx);
+					this.removeChat(idx);
 				}
 			}
 		},
-		removeGroupChat(state, groupId) {
-			let chats = this.getters.findChats();
+		removeGroupChat(groupId) {
+			let chats = this.curChats;
 			for (let idx in chats) {
 				if (chats[idx].type == 'GROUP' &&
 					chats[idx].targetId == groupId) {
-					this.commit("removeChat", idx);
+					this.removeChat(idx);
 				}
 			}
 		},
-		moveTop(state, idx) {
-			let chats = this.getters.findChats();
+		moveTop(idx) {
+			console.log("moveTop")
+			let chats = this.curChats;
 			let chat = chats[idx];
 			// 最新的时间会显示在顶部
 			chat.lastSendTime = new Date().getTime();
-			this.commit("saveToStorage");
+			this.saveToStorage();
 		},
-		insertMessage(state, msgInfo) {
+		insertMessage(msgInfo) {
 			// 获取对方id或群id
 			let type = msgInfo.groupId ? 'GROUP' : 'PRIVATE';
 			// 记录消息的最大id
-			if (msgInfo.id && type == "PRIVATE" && msgInfo.id > state.privateMsgMaxId) {
-				state.privateMsgMaxId = msgInfo.id;
+			if (msgInfo.id && type == "PRIVATE" && msgInfo.id > this.privateMsgMaxId) {
+				this.privateMsgMaxId = msgInfo.id;
 			}
-			if (msgInfo.id && type == "GROUP" && msgInfo.id > state.groupMsgMaxId) {
-				state.groupMsgMaxId = msgInfo.id;
+			if (msgInfo.id && type == "GROUP" && msgInfo.id > this.groupMsgMaxId) {
+				this.groupMsgMaxId = msgInfo.id;
 			}
 			// 如果是已存在消息，则覆盖旧的消息数据
-			let chat = this.getters.findChat(msgInfo);
-			let message = this.getters.findMessage(chat, msgInfo);
+			let chat = this.findChat(msgInfo);
+			let message = this.findMessage(chat, msgInfo);
 			if (message) {
 				Object.assign(message, msgInfo);
 				// 撤回消息需要显示
 				if (msgInfo.type == MESSAGE_TYPE.RECALL) {
 					chat.lastContent = msgInfo.content;
 				}
-				this.commit("saveToStorage");
+				this.saveToStorage();
 				return;
 			}
 			// 会话列表内容
@@ -187,7 +178,6 @@ export default {
 			}
 			chat.lastSendTime = msgInfo.sendTime;
 			chat.sendNickName = msgInfo.sendNickName;
-
 			// 未读加1
 			if (!msgInfo.selfSend && msgInfo.status != MESSAGE_STATUS.READED &&
 				msgInfo.type != MESSAGE_TYPE.TIP_TEXT) {
@@ -196,7 +186,8 @@ export default {
 			// 是否有人@我
 			if (!msgInfo.selfSend && chat.type == "GROUP" && msgInfo.atUserIds &&
 				msgInfo.status != MESSAGE_STATUS.READED) {
-				let userId = userStore.state.userInfo.id;
+				const userStore = useUserStore();
+				let userId = userStore.userInfo.id;
 				if (msgInfo.atUserIds.indexOf(userId) >= 0) {
 					chat.atMe = true;
 				}
@@ -230,21 +221,21 @@ export default {
 			} else {
 				chat.messages.splice(insertPos, 0, msgInfo);
 			}
-			this.commit("saveToStorage");
+			this.saveToStorage();
 		},
-		updateMessage(state, msgInfo) {
+		updateMessage(msgInfo) {
 			// 获取对方id或群id
-			let chat = this.getters.findChat(msgInfo);
-			let message = this.getters.findMessage(chat, msgInfo);
+			let chat = this.findChat(msgInfo);
+			let message = this.findMessage(chat, msgInfo);
 			if (message) {
 				// 属性拷贝
 				Object.assign(message, msgInfo);
-				this.commit("saveToStorage");
+				this.saveToStorage();
 			}
 		},
-		deleteMessage(state, msgInfo) {
+		deleteMessage(msgInfo) {
 			// 获取对方id或群id
-			let chat = this.getters.findChat(msgInfo);
+			let chat = this.findChat(msgInfo);
 			for (let idx in chat.messages) {
 				// 已经发送成功的，根据id删除
 				if (chat.messages[idx].id && chat.messages[idx].id == msgInfo.id) {
@@ -258,92 +249,89 @@ export default {
 					break;
 				}
 			}
-			this.commit("saveToStorage");
+			this.saveToStorage();
 		},
-		updateChatFromFriend(state, friend) {
-			let chats = this.getters.findChats();
-			for (let i in chats) {
-				let chat = chats[i];
-				if (chat.type == 'PRIVATE' && chat.targetId == friend.id) {
-					chat.headImage = friend.headImageThumb;
-					chat.showName = friend.nickName;
-					break;
-				}
+		updateChatFromFriend(friend) {
+			let chat = this.findChatByFriend(friend.id)
+			if (chat.headImage != friend.headImageThumb ||
+				chat.showName != friend.nickName) {
+				// 更新会话中的群名和头像
+				chat.headImage = friend.headImageThumb;
+				chat.showName = friend.nickName;
+				this.saveToStorage();
 			}
-			this.commit("saveToStorage");
 		},
-		updateChatFromGroup(state, group) {
-			let chats = this.getters.findChats();
-			for (let i in chats) {
-				let chat = chats[i];
-				if (chat.type == 'GROUP' && chat.targetId == group.id) {
-					chat.headImage = group.headImageThumb;
-					chat.showName = group.showGroupName;
-					break;
-				}
+		updateChatFromGroup(group) {
+			let chat = this.findChatByGroup(group.id);
+			if (chat.headImage != group.headImageThumb ||
+				chat.showName != group.showGroupName) {
+				// 更新会话中的群名称和头像
+				chat.headImage = group.headImageThumb;
+				chat.showName = group.showGroupName;
+				this.saveToStorage();
 			}
-			this.commit("saveToStorage");
 		},
-		loadingPrivateMsg(state, loading) {
-			state.loadingPrivateMsg = loading;
-			if (!this.getters.isLoading()) {
-				this.commit("refreshChats")
+		setLoadingPrivateMsg(loading) {
+			this.loadingPrivateMsg = loading;
+			if (!this.isLoading()) {
+				this.refreshChats()
 			}
 		},
-		loadingGroupMsg(state, loading) {
-			state.loadingGroupMsg = loading;
-			if (!this.getters.isLoading()) {
-				this.commit("refreshChats")
+		setLoadingGroupMsg(loading) {
+			this.loadingGroupMsg = loading;
+			if (!this.isLoading()) {
+				this.refreshChats()
 			}
 		},
 		refreshChats(state) {
+			console.log("refreshChats")
 			// 排序
 			cacheChats.sort((chat1, chat2) => {
 				return chat2.lastSendTime - chat1.lastSendTime;
 			});
 			// 将消息一次性装载回来
-			state.chats = cacheChats;
+			this.chats = cacheChats;
 			// 断线重连后不能使用缓存模式，否则会导致聊天窗口的消息不刷新
-			cacheChats = state.chats;
-			this.commit("saveToStorage");
+			cacheChats = this.chats;
+			this.saveToStorage();
 		},
 		saveToStorage(state) {
+			console.log("saveToStorage")
 			// 加载中不保存，防止卡顿
-			if (this.getters.isLoading()) {
+			if (this.isLoading()) {
 				return;
 			}
-			let userId = userStore.state.userInfo.id;
+			const timeStamp = new Date().getTime();
+			const userStore = useUserStore();
+			let userId = userStore.userInfo.id;
 			let key = "chats-app-" + userId;
 			let chatsData = {
-				privateMsgMaxId: state.privateMsgMaxId,
-				groupMsgMaxId: state.groupMsgMaxId,
-				chats: state.chats
+				privateMsgMaxId: this.privateMsgMaxId,
+				groupMsgMaxId: this.groupMsgMaxId,
+				chats: this.chats
 			}
-			uni.setStorage({
-				key: key,
-				data: chatsData ,
-			})
+			uni.setStorageSync(key, chatsData)
+			console.log("耗时:", new Date().getTime() - timeStamp);
 		},
 		clear(state) {
 			cacheChats = [];
-			state.chats = [];
-			state.privateMsgMaxId = 0;
-			state.groupMsgMaxId = 0;
-			state.loadingPrivateMsg = false;
-			state.loadingGroupMsg = false;
-		}
-	},
-	actions: {
+			this.chats = [];
+			this.privateMsgMaxId = 0;
+			this.groupMsgMaxId = 0;
+			this.loadingPrivateMsg = false;
+			this.loadingGroupMsg = false;
+		},
 		loadChat(context) {
 			return new Promise((resolve, reject) => {
-				let userId = userStore.state.userInfo.id;
+				const userStore = useUserStore();
+				let userId = userStore.userInfo.id;
 				uni.getStorage({
 					key: "chats-app-" + userId,
-					success(res) {
-						context.commit("initChats", res.data);
+					success: (res) => {
+						this.initChats(res.data);
 						resolve()
 					},
-					fail(e) {
+					fail: (e) => {
 						resolve()
 					}
 				});
@@ -354,11 +342,11 @@ export default {
 		isLoading: (state) => () => {
 			return state.loadingPrivateMsg || state.loadingGroupMsg
 		},
-		findChats: (state, getters) => () => {
-			return getters.isLoading() ? cacheChats : state.chats;
+		curChats: (state) => {
+			return state.isLoading() ? cacheChats : state.chats;
 		},
-		findChatIdx: (state, getters) => (chat) => {
-			let chats = getters.findChats();
+		findChatIdx: (state) => (chat) => {
+			let chats = state.curChats;
 			for (let idx in chats) {
 				if (chats[idx].type == chat.type &&
 					chats[idx].targetId === chat.targetId) {
@@ -367,11 +355,12 @@ export default {
 				}
 			}
 		},
-		findChat: (state, getters) => (msgInfo) => {
-			let chats = getters.findChats();
+		findChat: (state) => (msgInfo) => {
+			let chats = state.curChats;
 			// 获取对方id或群id
 			let type = msgInfo.groupId ? 'GROUP' : 'PRIVATE';
-			let targetId = msgInfo.groupId ? msgInfo.groupId : msgInfo.selfSend ? msgInfo.recvId : msgInfo.sendId;
+			let targetId = msgInfo.groupId ? msgInfo.groupId : msgInfo.selfSend ? msgInfo.recvId : msgInfo
+				.sendId;
 			let chat = null;
 			for (let idx in chats) {
 				if (chats[idx].type == type &&
@@ -382,6 +371,14 @@ export default {
 			}
 			return chat;
 		},
+		findChatByFriend: (state) => (fid) => {
+			return state.curChats.find(chat => chat.type == 'PRIVATE' &&
+				chat.targetId == fid)
+		},
+		findChatByGroup: (state) => (gid) => {
+			return state.curChats.find(chat => chat.type == 'GROUP' &&
+				chat.targetId == gid)
+		},
 		findMessage: (state) => (chat, msgInfo) => {
 			if (!chat) {
 				return null;
@@ -394,10 +391,9 @@ export default {
 				// 正在发送中的消息可能没有id,只有tmpId
 				if (msgInfo.tmpId && chat.messages[idx].tmpId &&
 					chat.messages[idx].tmpId == msgInfo.tmpId) {
-						console.log("chat.messages[idx].tmpId == msgInfo.tmpId")
 					return chat.messages[idx];
 				}
 			}
 		}
 	}
-}
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/im-uniapp/store/configStore.js b/im-uniapp/store/configStore.js
index ba289c2..fde339e 100644
--- a/im-uniapp/store/configStore.js
+++ b/im-uniapp/store/configStore.js
@@ -1,32 +1,32 @@
+import { defineStore } from 'pinia';
 import http from '../common/request'
 
-export default {
-	state: {
-		webrtc: {}
-	},
-	mutations: {
-		setConfig(state, config) {
-			state.webrtc = config.webrtc; 
-		},
-		clear(state){
-			state.webrtc = {};
+export default defineStore('configStore', {
+	state: () => {
+		return {
+			webrtc: {}
 		}
 	},
-	actions:{
-		loadConfig(context){
+	actions: {
+		setConfig(config) {
+			this.webrtc = config.webrtc;
+		},
+		clear() {
+			this.webrtc = {};
+		},
+		loadConfig() {
 			return new Promise((resolve, reject) => {
 				http({
 					url: '/system/config',
 					method: 'GET'
 				}).then((config) => {
-					console.log("系统配置",config)
-					context.commit("setConfig",config);
+					console.log("系统配置", config)
+					this.setConfig(config);
 					resolve();
-				}).catch((res)=>{
+				}).catch((res) => {
 					reject(res);
 				});
 			})
 		}
 	}
-	
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/im-uniapp/store/friendStore.js b/im-uniapp/store/friendStore.js
index 5687bf8..62e1f4e 100644
--- a/im-uniapp/store/friendStore.js
+++ b/im-uniapp/store/friendStore.js
@@ -1,95 +1,92 @@
+import { defineStore } from 'pinia';
 import http from '../common/request'
-import {TERMINAL_TYPE} from '../common/enums.js'
+import { TERMINAL_TYPE } from '../common/enums.js'
 
-export default {
-
-	state: {
-		friends: [],
-		timer: null
+export default defineStore('friendStore', {
+	state: () => {
+		return {
+			friends: [],
+			timer: null
+		}
 	},
-	mutations: {
-		setFriends(state, friends) {
-			friends.forEach((f)=>{
+	actions: {
+		setFriends(friends) {
+			friends.forEach((f) => {
 				f.online = false;
 				f.onlineWeb = false;
 				f.onlineApp = false;
 			})
-			state.friends = friends;
+			this.friends = friends;
 		},
-		updateFriend(state, friend) {
-			state.friends.forEach((f, index) => {
+		updateFriend(friend) {
+			this.friends.forEach((f, index) => {
 				if (!f.delete && f.id == friend.id) {
 					// 拷贝属性
-					let online = state.friends[index].online;
-					Object.assign(state.friends[index], friend);
-					state.friends[index].online = online;
+					let online = this.friends[index].online;
+					Object.assign(this.friends[index], friend);
+					this.friends[index].online = online;
 				}
 			})
 		},
-		removeFriend(state, id) {
-			let friend = this.getters.findFriend(id);
-			if(friend){
+		removeFriend(id) {
+			let friend = this.findFriend(id);
+			if (friend) {
 				friend.delete = true;
 			}
 		},
-		addFriend(state, friend) {
-			let f = this.getters.findFriend(friend.id);
-			if(f){
+		addFriend(friend) {
+			let f = this.findFriend(friend.id);
+			if (f) {
 				Object.assign(f, friend);
 				f.delete = false;
-			}else{
-				state.friends.push(friend);
+			} else {
+				this.friends.push(friend);
 			}
 		},
-		setOnlineStatus(state, onlineTerminals) {
-			state.friends.forEach((f)=>{
-				let userTerminal = onlineTerminals.find((o)=> f.id==o.userId);
-				if(userTerminal){
+		setOnlineStatus(onlineTerminals) {
+			this.friends.forEach((f) => {
+				let userTerminal = onlineTerminals.find((o) => f.id == o.userId);
+				if (userTerminal) {
 					f.online = true;
-					f.onlineWeb = userTerminal.terminals.indexOf(TERMINAL_TYPE.WEB)>=0
-					f.onlineApp = userTerminal.terminals.indexOf(TERMINAL_TYPE.APP)>=0
-				}else{
+					f.onlineWeb = userTerminal.terminals.indexOf(TERMINAL_TYPE.WEB) >= 0
+					f.onlineApp = userTerminal.terminals.indexOf(TERMINAL_TYPE.APP) >= 0
+				} else {
 					f.online = false;
 					f.onlineWeb = false;
 					f.onlineApp = false;
 				}
 			});
 		},
-		refreshOnlineStatus(state) {
-			if (state.friends.length > 0) {
+		refreshOnlineStatus() {
+			if (this.friends.length > 0) {
 				let userIds = [];
-				state.friends.forEach((f) => {
-					userIds.push(f.id)
-				});
+				this.friends.forEach(f => userIds.push(f.id));
 				http({
 					url: '/user/terminal/online?userIds=' + userIds.join(','),
 					method: 'GET'
 				}).then((onlineTerminals) => {
-					this.commit("setOnlineStatus", onlineTerminals);
-					
+					this.setOnlineStatus(onlineTerminals);
 				})
 			}
 			// 30s后重新拉取
-			clearTimeout(state.timer);
-			state.timer = setTimeout(() => {
-				this.commit("refreshOnlineStatus");
+			clearTimeout(this.timer);
+			this.timer = setTimeout(() => {
+				this.refreshOnlineStatus();
 			}, 30000)
 		},
-		clear(state) {
-			clearTimeout(state.timer);
-			state.friends = [];
-			state.timer = null;
-		}
-	},
-	actions: {
-		loadFriend(context) {
+		clear() {
+			clearTimeout(this.timer);
+			this.friends = [];
+			this.timer = null;
+		},
+		loadFriend() {
 			return new Promise((resolve, reject) => {
 				http({
 					url: '/friend/list',
 					method: 'GET'
 				}).then((friends) => {
-					context.commit("setFriends", friends);
-					context.commit("refreshOnlineStatus");
+					this.setFriends(friends);
+					this.refreshOnlineStatus();
 					resolve()
 				}).catch((res) => {
 					reject();
@@ -97,9 +94,9 @@ export default {
 			});
 		}
 	},
-	getters:{
+	getters: {
 		findFriend: (state) => (id) => {
-			return state.friends.find((f)=>f.id==id);
+			return state.friends.find((f) => f.id == id);
 		}
 	}
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/im-uniapp/store/groupStore.js b/im-uniapp/store/groupStore.js
index 635eb3a..ddbfcf9 100644
--- a/im-uniapp/store/groupStore.js
+++ b/im-uniapp/store/groupStore.js
@@ -1,52 +1,52 @@
+import { defineStore } from 'pinia';
 import http from '@/common/request';
 
-export default {
-	state: {
-		groups: [],
-		activeIndex: -1,
+export default defineStore('groupStore', {
+	state: () => {
+		return {
+			groups: [],
+			activeIndex: -1
+		}
 	},
-	mutations: {
-		setGroups(state, groups) {
-			state.groups = groups;
+	actions: {
+		setGroups(groups) {
+			this.groups = groups;
 		},
-		activeGroup(state, index) {
-			state.activeIndex = index;
+		activeGroup(index) {
+			this.activeIndex = index;
 		},
-		addGroup(state, group) {
-			state.groups.unshift(group);
+		addGroup(group) {
+			this.groups.unshift(group);
 		},
-		removeGroup(state, groupId) {
-			state.groups.forEach((g, index) => {
+		removeGroup(groupId) {
+			this.groups.forEach((g, index) => {
 				if (g.id == groupId) {
-					state.groups.splice(index, 1);
-					if (state.activeIndex >= state.groups.length) {
-						state.activeIndex = state.groups.length - 1;
+					this.groups.splice(index, 1);
+					if (this.activeIndex >= this.groups.length) {
+						this.activeIndex = this.groups.length - 1;
 					}
 				}
 			})
-
 		},
-		updateGroup(state, group) {
-			state.groups.forEach((g, idx) => {
+		updateGroup(group) {
+			this.groups.forEach((g, idx) => {
 				if (g.id == group.id) {
 					// 拷贝属性
-					Object.assign(state.groups[idx], group);
+					Object.assign(this.groups[idx], group);
 				}
 			})
 		},
-		clear(state){
-			state.groups = [];
-			state.activeGroup = -1;
-		}
-	},
-	actions: {
-		loadGroup(context) {
+		clear() {
+			this.groups = [];
+			this.activeGroup = -1;
+		},
+		loadGroup() {
 			return new Promise((resolve, reject) => {
 				http({
 					url: '/group/list',
 					method: 'GET'
 				}).then((groups) => {
-					context.commit("setGroups", groups);
+					this.setGroups(groups);
 					resolve();
 				}).catch((res) => {
 					reject(res);
@@ -54,4 +54,4 @@ export default {
 			});
 		}
 	}
-}
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/im-uniapp/store/index.js b/im-uniapp/store/index.js
deleted file mode 100644
index fa52aac..0000000
--- a/im-uniapp/store/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import chatStore from './chatStore.js';
-import friendStore from './friendStore.js';
-import userStore from './userStore.js';
-import groupStore from './groupStore.js';
-import configStore from './configStore.js';
-import { createStore } from 'vuex';
-
-const store = createStore({
-	modules: {
-		chatStore,
-		friendStore,
-		userStore,
-		groupStore,
-		configStore
-	},
-	state: {},
-	actions: {
-		load(context) {
-			return this.dispatch("loadUser").then(() => {
-				const promises = [];
-				promises.push(this.dispatch("loadFriend"));
-				promises.push(this.dispatch("loadGroup"));
-				promises.push(this.dispatch("loadChat"));
-				promises.push(this.dispatch("loadConfig"));
-				return Promise.all(promises);
-			})
-		},
-		unload(context){
-			context.commit("clear");
-		}
-	},
-	strict: true
-})
-
-export default store;
\ No newline at end of file
diff --git a/im-uniapp/store/userStore.js b/im-uniapp/store/userStore.js
index a2e5a5a..0023d63 100644
--- a/im-uniapp/store/userStore.js
+++ b/im-uniapp/store/userStore.js
@@ -1,44 +1,32 @@
-import {USER_STATE} from "../common/enums"
+import { defineStore } from 'pinia';
 import http from '../common/request'
 
-
-export default {
-	state: {
-		userInfo: {},
-		config:{
-			webrtc:{}
-		},
-		state: USER_STATE.FREE 
+export default defineStore('userStore', {
+	state: () => {
+		return {
+			userInfo: {}
+		}
 	},
-
-	mutations: {
-		setUserInfo(state, userInfo) {
-			// 使用深拷贝方式，否则小程序页面不刷新
-			Object.assign(state.userInfo, userInfo); 
+	actions: {
+		setUserInfo(userInfo) {
+			this.userInfo = userInfo;
 		},
-		setUserState(state, userState) {
-			state.state = userState;
+		clear() {
+			this.userInfo = {};
 		},
-		clear(state){
-			state.userInfo = {};
-			state.state = USER_STATE.FREE;
-		}
-	},
-	actions:{
-		loadUser(context){
+		loadUser(context) {
 			return new Promise((resolve, reject) => {
 				http({
 					url: '/user/self',
 					method: 'GET'
 				}).then((userInfo) => {
 					console.log(userInfo)
-					context.commit("setUserInfo",userInfo);
+					this.setUserInfo(userInfo);
 					resolve();
-				}).catch((res)=>{
+				}).catch((res) => {
 					reject(res);
 				});
 			})
 		}
 	}
-	
-}
\ No newline at end of file
+})
\ No newline at end of file