合并代码

src/store/userHabit/userHabit.ts

@@ -42,6 +42,7 @@ const userHabit : Module<UserHabit,RootState> = {
 		},
 		messageSystem:{
 			messageNum:4,
+			messageType:{},
 		},
     },
     mutations:{
@@ -77,7 +78,30 @@ const userHabit : Module<UserHabit,RootState> = {
 			state.systemUser.value = -1
 		},
 		setMessageSystem(state,data){
-			state.messageSystem = data
+			let num = 0
+			for (const iterator in data) {
+				num+=data[iterator]
+				if(!state.messageSystem.messageType[iterator]){
+					state.messageSystem.messageType[iterator] = data[iterator]
+				}else{
+					for (const key in state.messageSystem.messageType) {
+						if(key == iterator){
+							state.messageSystem.messageType[key] = data[iterator]
+							break
+						}
+					}
+				}
+			}
+			state.messageSystem.messageNum = num
+		},
+		closeMessageSystem(state,data){
+			if(!data){
+				state.messageSystem.messageNum = 0
+				state.messageSystem.messageType = {}
+			}else{
+
+			}
+			
 		},
        
     },