修改印花合成图方式

src/component/HomePage/Generate.vue

@@ -39,7 +39,7 @@
 					<li class="printModel_item" @click="setprintModel(1)">{{ $t('Generate.Model1') }}</li>
 					<li class="printModel_item" @click="setprintModel(2)">{{ $t('Generate.Model2') }}</li>
 					<li class="printModel_item" @click="setprintModel(3)">{{ $t('Generate.Model3') }}</li>
-					<li v-show="printBoards.length >= 1" class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Merge') }}</li>
+					<li v-show="(sketchboardList.length>=1 && moodboarList.length>=1&& checkbox[0].type) || (sketchboardList.length>=2 && checkbox[0].type) " class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Merge') }}</li>
 				</ul>
 			</div>
         </div>
@@ -239,7 +239,8 @@ export default defineComponent({
 			value:'Painting Style',
 			name:useI18n().t('Generate.Model'+1)
 		})
-		let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
+		// let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
+		let moodboarList:any = computed(()=>{return store.state.UploadFilesModule.moodboard})
 		// let sketchCatecoryList:any = ref([])
 		let workspace:any = ref({})
 
@@ -248,6 +249,7 @@ export default defineComponent({
 		let inputTime = ref()
 		let driver__:any = inject('driver__')
 		let {t} = useI18n()
+		let isMmerge = ref(false)
 
 		let isTest = ref()
         return {
@@ -271,13 +273,15 @@ export default defineComponent({
 			checkboxImage,
 			printModel,
 			loadingShow,
-			printBoards,
+			// printBoards,
+			moodboarList,
 			// sketchCatecoryList,
 			workspace,
 			inputShow,
 			inputTime,
 			driver__,
 			t,
+			isMmerge,
 			isTest,
         };
     },
@@ -297,17 +301,15 @@ export default defineComponent({
             },
             token: "",
             uploadUrl: "",
-            moodboarList: computed(() => {
-                return useStore().state.UploadFilesModule.moodboard;
-            }),
+           
             type_: {
                 type1: "generate",
                 type2: prop.msg,
             },
-			workspaceCom:{}
-
+			workspaceCom:{},
         };
     },
+	
     mounted() {
         // this.fileList.forEach((item,index)=>{
         // 	item.checked = true
@@ -343,6 +345,17 @@ export default defineComponent({
 			this.workspace = newVal
 			this.upload.gender = newVal.sexEnum.name
 		},
+		moodboarList(newVal,oldVal){
+			if(newVal.length>=1 || this.sketchboardList.length >= 2){
+			}else{
+				this.printModel = {
+					num:'',
+					optype:false,
+					value:'Painting Style',
+					name:this.t('Generate.Model'+1)
+				}
+			}
+		},
 	},
     computed: {
         getSketchLabel(value: any) {
@@ -406,12 +419,18 @@ export default defineComponent({
 				}
 			})
 			if(num == 1){
-				this.level2Type = ''
+				this.level2Type = ''//点击文字生成就把衣服类型清空
 			}
 			if(num == 2 || num == 1){
 				if(this.driver__.driver){
 					driverObj__.moveNext()
 				}
+				this.printModel = {
+					num:'',
+					optype:false,
+					value:'Painting Style',
+					name:this.t('Generate.Model'+1)
+				}
 			}
         },
 		PrintModel(){
@@ -640,27 +659,14 @@ export default defineComponent({
 			// this.sketchboardList
 			this.collectionElementid = ''
 			this.sketchboardList.splice(item, 1);
-            // if (item.type_ == "generate" || item.type_ == "material") {
-			// 	let maxImg = 8
-			// 	if(this.type_.type2 == 'Sketchboard'){
-			// 		maxImg = 20
-			// 	}
-			// 	item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
-            //     this.store.commit("addGenerateMaterialFils", item);
-            // } else {
-            //     this.sketchboardList =
-            //         this.store.state.UploadFilesModule.moodboardFiles;
-            //     let moodboard;
-            //     this.store.state.UploadFilesModule.moodboardFiles.forEach(
-            //         (items: any, index: Number) => {
-            //             if (items.id_ == item.id_) {
-            //                 moodboard = index;
-            //             }
-            //         }
-            //     );
-            //     this.sketchboardList.splice(moodboard, 1);
-            //     this.store.commit("setSketchboardFile", this.sketchboardList);
-            // }
+			if((this.sketchboardList.length<2 && this.moodboarList.length == 0) || this.sketchboardList.length == 0){
+				this.printModel = {
+					num:'',
+					optype:false,
+					value:'Painting Style',
+					name:this.t('Generate.Model'+1)
+				}
+			}
         },
 		likeFile(item:any,str:string){
 			if(str == 'like'){