Merge remote-tracking branch 'origin/StableVersion' into develop

src/store/uploadFile/uploadFile.ts

@@ -23,6 +23,7 @@ interface UploadFiles{
     marketingSketchFiles:any,
     allBoardData:any, //备份的所有数据，点finish之后备份
     moodTemplateId:any,
+	chooseIsDesign:any,
 }
 
 const UploadFilesModule : Module<UploadFiles,RootState> = {
@@ -46,6 +47,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         marketingSketchFiles:[],
         allBoardData:{},
         moodTemplateId:'',
+		chooseIsDesign:{value:true},
 		
     },
     mutations:{
@@ -212,6 +214,9 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         },
         setAllBoardDataChoose(state,data){
             state.allBoardData = data
+        },
+		setChooseIsDesign(state,data){
+            state.chooseIsDesign.value = data
         },
         clearAllData(state){
             state.moodboard = []
@@ -232,6 +237,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 			state.disposeMoodboard = []
 			state.disposeMoodboardPostition = {}
 			// state.showSketchboard = []
+			state.chooseIsDesign.value = true
         },
 		clearAllId(state){
             state.moodboard.forEach((v:any) => {