接入画布

src/component/HomePage/Generate.vue

@@ -141,18 +141,6 @@
 				<div class="generage_btn_box">
 					<div class="generage_btn started_btn"  v-show="!isGenerate">
 						<i class="fi fi-bs-magic-wand" style="background-color: #000; font-size: 2.3rem; flex: 1;margin: 0;" @click="getgenerate()"></i>
-<!-- 						
-						<div :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click.stop="getgenerate">
-							<span 
-								v-if="
-								type_.type2 == 'Moodboard' || 
-								(type_.type2 == 'Printboard' && scene?.value == 'Pattern') || 
-								(type_.type2 == 'Sketchboard' && scene?.value == 'generate')"
-								>
-								{{ speedData.label }}
-							</span>
-							<span v-else>{{ $t('Generate.Generate') }}</span>
-						</div> -->
 						<div class="icon iconfont icon-xiala" v-show="
 							type_.type2 == 'Moodboard' || 
 							(type_.type2 == 'Printboard' && scene?.value == 'Pattern') || 
@@ -247,6 +235,7 @@ export default defineComponent({
 		UpgradePlan,
 	},
     props: ["msg",'sketchCatecoryList','scene','gender'],
+	emits:['setLibrary'],
     setup(props) {
         // console.log(prop.msg);
         let userDetail:any= computed(()=>{
@@ -301,6 +290,10 @@ export default defineComponent({
 					title:'Generate image in high quality low speed',
 					label:'High',
 					value:'high',
+				},{
+					title:'Generate using Wanxiang',
+					label:'WX',
+					value:'wx',
 				},
 			],
 			speedState:false,
@@ -485,6 +478,12 @@ export default defineComponent({
 			if(this.type_.type2 == 'Sketchboard'){
 				maxImg = 20
 			}
+			let parent:any = this.$parent
+			if(parent.isUseGenerate){
+				// parent.useGenerate.designType = 'collection'
+				this.$emit('setLibrary',data)
+				return
+			}
 			data.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
             this.store.commit("addGenerateMaterialFils", data);
 			// console.log(this.fileList);
@@ -609,7 +608,7 @@ export default defineComponent({
 				seed:this.searchPictureSeed,
 				userId:this?.userDetail?.userId,
 				timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
-				version:this.speedData.value,//为1就是Print
+				modelName:this.speedData.value,//为1就是Print
 				isTestUser:this.driver__.driver?false:this.isTest,
 				gender:this.workspace.sex,
 				sloganBase64:base64,

src/component/HomePage/Material.vue

@@ -319,7 +319,7 @@ export default defineComponent({
 				this.setUseGenerate([])
 				let obj = {
 					imgId : imgData.id,
-					imgUr: imgData.imgUrl,
+					imgUrl: imgData.imgUrl,
 					level2Type:imgData.level2Type,
 					categoryValue:imgData.categoryValue,
 					category:imgData.category,

src/component/HomePage/NewCollectionReview.vue

@@ -50,14 +50,14 @@
 				<div>Colorboard</div>
 				<i class="fi fi-rr-edit" @click="openCollection('colorBoard')"></i>
 			</div>
-            <div class="color_item"  v-for="(color) in allBoardData?.colorBoards" :key="color">
-                <div class="color_content" v-if="!color?.gradient" :style="{background:`rgb(${color?.rgbValue?.r},${color?.rgbValue?.g},${color?.rgbValue?.b},${color?.rgbValue?.a})`}"></div>
-                <div class="color_content" v-else :style="{height:'11rem','background-image':color?.gradient?`linear-gradient(${color?.gradient.angle}deg,${setGradient(color?.gradient)}`:'none'}"></div>
-                <div class="color_content_body" v-if="!color?.gradient"  :style="{'text-align':color?.name?'left':'center'}">
-                    <div class="color_des">{{color.tcx}}</div>
-                    <div class="color_des">{{color.name}}</div>
-                </div>
-            </div>
+			<div class="color_item"  v-for="(color,i) in allBoardData?.colorBoards" :key="color">
+				<div class="color_content" v-if="!color?.gradient" :style="{background:`rgb(${color?.rgbValue?.r},${color?.rgbValue?.g},${color?.rgbValue?.b},${color?.rgbValue?.a})`}"></div>
+				<div class="color_content" v-else :style="{height:'11rem','background-image':color?.gradient?`linear-gradient(${color?.gradient.angle}deg,${setGradient(color?.gradient)}`:'none'}"></div>
+				<div class="color_content_body" v-if="!color?.gradient"  :style="{'text-align':color?.name?'left':'center'}">
+					<div class="color_des">{{color.tcx}}</div>
+					<div class="color_des">{{color.name}}</div>
+				</div>
+		   </div>
         </div>
 		<div class="img_block_item mannquin">
 			<div class="title">
@@ -311,16 +311,17 @@ export default defineComponent({
         }
         .color_item{
             display: inline-block;
-            vertical-align: top;
+            // vertical-align: top;
             // padding: 0 0.5rem;
             // margin-right: 1.6rem;
 			margin-right: 4%;
             margin-bottom: 0.5rem;
 			width: 21%;
-            &:nth-child(5n){
-                margin-right: 0;
-            }
+           &:nth-child(4n+1){
+				margin-right: 0;
+			}
         }
+		
 
         .color_content{
             height:6.2rem;

src/component/HomePage/PrintboardUpload.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="printboard_upload_modal" :class="[driver__.driver?'showEvents':'']">
+    <div class="printboard_upload_modal">
 		
         <div class="printboard_left_upload">
             <div class="left_upload_header">