合并代码

src/store/uploadFile/uploadFile.ts

@@ -6,6 +6,7 @@ import GO from '@/tool/GO';
 interface UploadFiles{
 	moodboard:any,
 	disposeMoodboard:any,
+	disposeMoodboardPostition:any,
     moodboardFiles:any,
 	moodboardGenerateFiles:any,
 	moodboardMaterialFiles:any,
@@ -28,6 +29,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
     state:{
 		moodboard:[],
 		disposeMoodboard:[],
+		disposeMoodboardPostition:{},
         moodboardFiles:[],
 		moodboardGenerateFiles:[],
 		moodboardMaterialFiles:[],
@@ -54,6 +56,9 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         },
 		setDisposeMoodboard(state,files){
 			state.disposeMoodboard = [files]
+        },
+		setDisposeMoodboardPosition(state,files){
+			state.disposeMoodboardPostition = files
         },
 		setMoodboardGenerateFiles(state,files){
 			state.moodboardGenerateFiles = files
@@ -196,6 +201,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         setAllBoardData(state){
             state.allBoardData = {
 				disposeMoodboard:state.disposeMoodboard,
+				disposeMoodboardPostition:state.disposeMoodboardPostition,
                 moodboardFiles:state.moodboard,
                 printboardFiles:state.printboard,
                 colorBoards:state.colorBoards,
@@ -224,6 +230,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
             state.marketingSketchFiles = []
             state.moodTemplateId = ''
 			state.disposeMoodboard = []
+			state.disposeMoodboardPostition = {}
 			// state.showSketchboard = []
         },
 		clearAllId(state){
@@ -242,6 +249,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         },
         clearMoodTemplateId(state){
 			state.disposeMoodboard = []
+			state.disposeMoodboardPostition = {}
         },
     },
     actions:{

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{
+
+			}
+			
 		},
        
     },