commit

src/store/Detail/designDetail.ts

@@ -3,12 +3,13 @@ import {RootState} from '../index'
 
 interface DesignDetail{
     designItemDetail:any,
-   
+	designPreviewData:any,
 }
 
 const DesignDetailModule : Module<DesignDetail,RootState> = {
     state:{
-        designItemDetail:{}
+        designItemDetail:{},
+		designPreviewData:{}
     },
     mutations:{
         setDesignItemDetail(state,files){
@@ -19,6 +20,9 @@ const DesignDetailModule : Module<DesignDetail,RootState> = {
         },
         setDesignItemOthers(state,data){
             state.designItemDetail.others[data.index] = data.others
+        },
+		setDesignPreviewData(state,files){
+            state.designPreviewData = files
         },
 		// setDesignItemOthers(state,data){
         //     state.designItemDetail.others[data.index] = data.others

src/store/index.ts

@@ -3,7 +3,7 @@ import UploadFilesModule from './uploadFile/uploadFile'
 import DesignDetailModule from './Detail/designDetail'
 import HomeStoreModule  from './homeStore/homeStore'
 import UserHabit  from './userHabit/userHabit'
-import Woekspace  from './workspace/workspace'
+import Workspace  from './workspace/workspace'
 export interface RootState{
 
 }
@@ -22,6 +22,6 @@ export default createStore<RootState>({
     DesignDetailModule,
     HomeStoreModule,
 	UserHabit,
-	Woekspace
+	Workspace
   }
 })

src/store/uploadFile/uploadFile.ts

@@ -62,9 +62,9 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         },
 		addGenerateMaterialFils(state,data:any){
 			let file
-			let arr = state.moodboard
-			if(data.type_.type1 == 'generate'){
-				data.resData.designType = 'generate'
+			let arr
+			if(data.type_.type1 == 'generate'){//判断是generate||library
+				data.resData.designType = 'Generate'
 				if(data.type_.type2 == 'Moodboard'){
 					file = state.moodboardGenerateFiles
 				}else if(data.type_.type2 == 'Sketchboard'){
@@ -73,7 +73,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 					file = state.printGenerateFiles
 				}
 			}else{
-				data.resData.designType = 'library'
+				data.resData.designType = 'Library'
 				if(data.type_.type2 == 'Moodboard'){
 					file = state.moodboardMaterialFiles
 				}else if(data.type_.type2 == 'Sketchboard'){
@@ -82,9 +82,16 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 					file = state.printMaterialFiles
 				}
 			}
+			if(data.type_.type2 == 'Moodboard'){//判断选中图片数量
+				arr = state.moodboard
+			}else if(data.type_.type2 == 'Sketchboard'){
+				arr = state.sketchboard
+			}else{
+				arr = state.printboard
+			}
 			if(file.length == 0){
 				if(arr.length >= 8){
-					message.error('You can select up to 8 images')
+					message.warning('You can select up to 8 images')
 				}else{
 					data.checked = true
 					file.push(data)
@@ -92,21 +99,21 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 			}else{
 				let str = true
 				for (let index = 0; index < file.length; index++) {
-					if(file[index].id_ == data.id_){
-						// data.id_ = GO.id++
+					if(file[index].id == data.id){
+						// data.id = GO.id++
 						str = false
 					}
 				}
 				if(str){
 					if(arr.length >= 8){
-						message.error('You can select up to 8 images')
+						message.warning('You can select up to 8 images')
 					}else{
 						data.checked = true
 						file.push(data)
 					}
 				}else{
 					data.checked = false
-					file = file.filter((v:any)=> v.id_ != data.id_)
+					file = file.filter((v:any)=> v.id != data.id)
 				}
 			}
 			if(data.type_.type1 == 'generate'){
@@ -194,6 +201,17 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
             state.moodTemplateId = ''
 			state.disposeMoodboard = []
         },
+		clearAllId(state){
+            state.moodboard.forEach((v:any) => {
+				delete v.id_
+			});
+			state.sketchboard.forEach((v:any) => {
+				delete v.id_
+			});
+			state.printboard.forEach((v:any) => {
+				delete v.id_
+			});
+		},
         setMoodTemplateId(state,moodTemplateId){
             state.moodTemplateId = moodTemplateId
         },

src/store/userHabit/userHabit.ts

@@ -19,8 +19,6 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
     mutations:{
         res_clothingType(state,data){
             state.clothingType = data
-			console.log(data);
-			
         },
     },
 

src/store/workspace/workspace.ts

@@ -6,12 +6,12 @@ interface DesignDetail{
    
 }
 
-const Woekspace : Module<DesignDetail,RootState> = {
+const Workspace : Module<DesignDetail,RootState> = {
     state:{
         workspace:{}
     },
     mutations:{
-        setWoekspace(state,files){
+        setWorkspace(state,files){
             state.workspace = files
         },
        
@@ -22,4 +22,4 @@ const Woekspace : Module<DesignDetail,RootState> = {
     }
 }
 
-export default Woekspace
+export default Workspace