Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

2025-09-27 13:56:16 +08:00
parent 93c49292b9 e8be0c11db
commit 1523038c7d
19 changed files with 209 additions and 108 deletions
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -237,7 +237,7 @@ li {
  color: #fff;
  background-color: #000;
  text-align: center;
-  font-weight: 600;
+  font-weight: 500;
  border: 2px solid #000;
  cursor: pointer;
  box-sizing: border-box;
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -241,7 +241,7 @@ input:focus{
 	color: #fff;
 	background-color: #000;
 	text-align: center;
-	font-weight: 600;
+	font-weight: 500;
 	border: 2px solid #000;
 	cursor: pointer;
 	box-sizing: border-box;
--- a/src/component/Account/account.vue
+++ b/src/component/Account/account.vue
@@ -50,10 +50,10 @@
 									<div v-if="!isEditEmail">{{ userDetail.email }}</div>
 									<input v-else type="text" :value="editEmail">
 								</div>
-								<div class="icon">
+								<!-- <div class="icon">
 									<i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i>
 									<i v-else class="fi fi-br-check" @click="editChek('email')"></i>
-								</div>
+								</div> -->
 							</div>
 						</div>
 						<div class="content_item_user_left_detail_bottom">
--- a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue
+++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue
@@ -256,7 +256,7 @@ function addText() {
 }

 function openTutorial() {
-	if(locale == 'ENGLISH'){
+	if(locale.value == 'ENGLISH'){
 		window.open('https://aida-user-manual.super.site/specific-scenarios/freely-sketching-in-canvas', '_blank');
 	}else{
 		window.open('https://aida-user-manual-chinese.super.site/%e4%bd%bf%e7%94%a8%e7%94%bb%e5%b8%83%e8%bf%9b%e8%a1%8c%e7%bc%96%e8%be%91 ', '_blank');
--- a/src/component/Canvas/ExistsImageList/index.vue
+++ b/src/component/Canvas/ExistsImageList/index.vue
@@ -179,6 +179,7 @@ const handleImageError = (event) => {

 //提交选中的T图片
 const confirm = ()=>{
+	selectList.value = []
 	emits("select", selectList.value);
 	showPanel.value = false;
 }
@@ -487,6 +488,10 @@ const confirm = ()=>{
  justify-content: space-between;
  align-items: center;
  flex-shrink: 0;
+  > .image-submit{
+	font-size: 1.2rem;
+	line-height: 4rem;
+  }
 }

 .image-count {
--- a/src/component/Canvas/canvasExample.vue
+++ b/src/component/Canvas/canvasExample.vue
@@ -176,6 +176,10 @@ const canvasInit = () => {
  // });
 };

+const frontBackChange =(value)=>{
+	console.log(value)
+}
+
 const isShowLeft = ref(true);
 </script>

@@ -195,6 +199,7 @@ const isShowLeft = ref(true);
      <RedGreenModeExample
        v-if="currentView === 'redGreenExample'"
        key="redGreenExample"
+		@trigger-red-green-mouseup="frontBackChange"
      >
      </RedGreenModeExample>

--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -62,13 +62,14 @@
 						@addSketch="()=>isEditPattern.value = ''"
 						@revocation="revocation"
 						@oppositeRevocation="oppositeRevocation"
+						@modelOnLoad="modelOnLoad"
 					></model>
 					<div class="btn">
 						<div class="gallery_btn" style="margin-right: 0;" @click="submit">{{$t('DesignPrintOperation.Submit')}}</div>
 						<div v-show="isEditPattern.value" style="margin-left: 2rem;" class="gallery_btn" @click="previwe">{{$t('DesignPrintOperation.Preview')}}</div>
 					</div>
 				</div>
-				<div class="item detailRight">
+				<div class="item detailRight" :class="{canvas:isEditPattern.value}">
 					<div class="submit">
 					</div>
 					<div class="contentRight" v-if="currentDetailType && !isEditPattern.value">
@@ -154,6 +155,7 @@ export default defineComponent({
 				fun:null,
 			},
 			positionKey:0,
+			isUndividedLayerWithSinglePrint:false,
 		})
 		
 		provide('getCanvasIfEdit',detailData.getCanvasIfEdit)
@@ -207,16 +209,24 @@ export default defineComponent({
 									element.designType = 'Library'
 								}
 							});
+							if(!item.layersObject[0].undividedLayerWithSinglePrint){
+								detailData.isUndividedLayerWithSinglePrint = true
+							}
 						})
 						detailData.singleOveral.value = rv.singleOverall
 						detailData.designDetailShow = true
 						// this.deleteShow = false
 						initialize()
 						setRevocation()
-						detailData.loadingShow = false
 						if(rv.singleOverall == "single"){
 							store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
 						}
+
+
+						if(detailData.isUndividedLayerWithSinglePrint){
+						}else{
+							detailData.loadingShow = false
+						}
 						resolve(rv)
 					}
 				).catch(rv=>{
@@ -308,10 +318,11 @@ export default defineComponent({
 				`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:
 				'')
 				if(detailData.currentDetailType == 'sketch' && newData){
-					color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
+					color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
 					detailData.selectDetail.maskUrl = ''
 					detailData.selectDetail.maskMinioUrl = ''
 				}
+				console.log(list[i])
 				let data:any = {
 					changed:false,
 					color,
@@ -339,7 +350,7 @@ export default defineComponent({
 					sketchString:list[i].sketchString?list[i].sketchString:'',
 					trims:(newData && detailData.currentDetailType == 'element' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
 				}
-				if((list[i].color?.gradient || list[i].newDetail?.color?.gradient) && !detailData.isEditPattern.value){
+				if((detailData.isEditPattern.value && list[i].color?.gradient) || (!detailData.isEditPattern.value && (list[i].newDetail?.color?.gradient || list[i].color?.gradient))){
 					gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient
 					gradient.colorImg = await setGradual(gradient,320,700)
 					data.gradient = gradient
@@ -351,9 +362,9 @@ export default defineComponent({
 		const getSubmitData = async (str:string)=>{
 			// return
 			let workspace = store.state.Workspace.probjects
-			if(!detailData.selectDetail.path && !detailData.selectDetail.newDetail?.sketch?.minIOPath)return
+			if(!detailData?.selectDetail?.path && !detailData?.selectDetail?.newDetail?.sketch?.minIOPath)return
 			let clothes:any
-			if(detailData.currentDetailType == 'models'){
+			if(detailData.currentDetailType == 'models' || detailData.isUndividedLayerWithSinglePrint){
 				clothes = await setClothes(detailData.designDetail.clothes)
 			}else{
 				clothes = await setClothes([detailData.selectDetail])
@@ -382,6 +393,7 @@ export default defineComponent({
 				delete detailData.designDetail.newModel
 				store.commit('DesignDetail/setPraeview',value)
 				detailData.loadingShow = false
+				detailData.isUndividedLayerWithSinglePrint = false
 				canvasReload()
 				// setRevocation()
 			}).catch(res=>{ 
@@ -431,6 +443,12 @@ export default defineComponent({
 			let data = getSubmitData('preview')
 			store.dispatch('DesignDetail/setSubmit',data)
 		}
+		const modelOnLoad = ()=>{
+			if(!detailData.isUndividedLayerWithSinglePrint)return
+			setTimeout(()=>{
+				previwe()
+			})
+		}
 		const detailEdit = async (str:any)=>{
 			if(str){
 				if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
@@ -482,6 +500,7 @@ export default defineComponent({
 			oppositeRevocation,
 			detailEdit,
 			canvasReload,
+			modelOnLoad,
        }
    },
 	
@@ -579,10 +598,12 @@ export default defineComponent({
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
+					overflow: hidden;
 				}
 				&.isEditPattern{width: 0px;}
 				&.model{
-					width: 45rem;
+					flex: 1;
+					// width: 45rem;
 					// width: 50rem;
 					margin: 0 8rem;
 					// margin: 0 10rem;
@@ -590,7 +611,10 @@ export default defineComponent({
 					flex-direction: column;
 				}
 				&.detailRight{
-					flex: 1;
+					width: 30%;
+					&.canvas{
+						width: 60%;
+					}
 					display: flex;
 					flex-direction: column;
 					// padding-bottom: calc(6rem + 1rem);
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -10,7 +10,7 @@
 							@canvasInit="canvasInit"
 							@changeCanvas="changeCanvas" 
 							is-edit
-							:clothingImageUrl="selectDetail.undividedLayer || selectDetail.path"
+							:clothingImageUrl="selectDetail?.undividedLayerWithSinglePrint || selectDetail.undividedLayer || selectDetail.path"
 							showFixedLayer
 							:canvasJSON="canvasJSON"
 							:clothing-image-opts="{
@@ -136,7 +136,7 @@ export default defineComponent({
 			}else{
 				if(detailData.currentView === 'redGreenExample'){
 					nextTick(()=>{
-						setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
+						setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
 							detailData.canvasLoad = true
 						})
 					})
@@ -222,7 +222,7 @@ export default defineComponent({


 		const frontBackChange = (value:any)=>{
-			let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path
+			let full = detailData.frontBack.front[detailData.imgDomIndex]?.undividedLayerWithSinglePrint || detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path
 			let size = {
 				...detailData.canvasConfig,
 			}
@@ -244,7 +244,6 @@ export default defineComponent({

 		}
 		const canvasInit = (value:any)=>{
-			// detailDom.editCanvas.addImageToLayer(detailData.selectDetail.undividedLayer,{layerId:value.layers.value[0].id,imageMode:'contains',undoable:false})
 			detailData.canvasInstance = value
 			detailData.getCanvasIfEdit.fun = getCanvasLength
 			detailData.isShowMark = false
@@ -328,7 +327,7 @@ export default defineComponent({
 						});
 					})
 				}
-				setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
+				setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
 					detailData.canvasLoad = true
 				})
 			})
--- a/src/component/Detail/detailLeft/module/libraryList.vue
+++ b/src/component/Detail/detailLeft/module/libraryList.vue
@@ -347,7 +347,7 @@ export default defineComponent({
 			margin-top: 1rem;
 			justify-content: space-between;
 			align-content: flex-start;
-			&::-webkit-scrollbar{display: none;}
+			// &::-webkit-scrollbar{display: none;}
 			> .content_img_item{
 				width: calc((50% - 1rem));
 				> .content_img_item_block{
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -70,7 +70,7 @@
 						</div>
 					</div>
 					<!-- <img :src="selectDetail.path" alt="" class="designOpenrtion_sketch" ref="sketchImg"> -->
-					<img :src="selectDetail?.undividedLayer?selectDetail.undividedLayer:selectDetail.path" alt="" class="designOpenrtion_sketch" ref="sketchImg">
+					<img :src="selectDetail?.undividedLayer?selectDetail.undividedLayer:selectDetail.path" alt="" class="designOpenrtion_sketch" ref="sketchImg" @load="()=>isSketchLoad = true">
 					<div class="designOpenrtion_btn">
 						<ul v-if="stateOverallSingle == 'single'" v-for="item,index in printStyleList[type][stateOverallSingle]" :key="item" :class="{active:item?.pattern.designOpenrtionBtn?item?.pattern.designOpenrtionBtn:false}" class="designOpenrtion_Mousingle" :style="item?.pattern.style" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))">
 							<li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('top',getMousePosition($event,true))"></li>
@@ -147,6 +147,7 @@ export default defineComponent({
 			},
 			loadingShow:false,
 			printElementList:null as any,
+			isSketchLoad:false,
 		})
 		const collItemSize = reactive({
 			collValue:18,
@@ -202,6 +203,7 @@ export default defineComponent({
 			})
 		}
 		const addPrintELement = async (data:any)=>{
+			if(!editPrintElementData.isSketchLoad)return
 			let {scale,location} = await setScaleLocation(data)
 			let item = {
 				angle:0,
@@ -377,6 +379,7 @@ export default defineComponent({
 		})
 		watch(()=>((editPrintElementData.selectDetail?.undividedLayer || editPrintElementData.selectDetail?.id)),(newVal)=>{
 			if(!newVal)return
+			editPrintElementData.isSketchLoad = false,
 			editPrintElementData.printStyleList[props.type] = {
 				single:[],
 				overall:[],
@@ -912,6 +915,7 @@ export default defineComponent({
 				
 				.itemList{
 					height: 100%;
+					object-fit: contain;
 				}
 				.imgItem{
 					width: 8rem;
--- a/src/component/Detail/model/index.vue
+++ b/src/component/Detail/model/index.vue
@@ -28,7 +28,7 @@
 				<i class="fi fi-rr-copy" :title="$t('DesignDetail.compareTitle')" @mousedown="mousedownDesignImg" @mouseup="mousedownDesignImg" @touchstart="mousedownDesignImg" @touchend="mousedownDesignImg"></i>
 				
 			</div>
-			<position ref="position" @canvasReload="()=>$emit('canvasReload')" :imgDesignImg=imgDesignImg></position>
+			<position ref="position" @modelOnLoad="()=>$emit('modelOnLoad')" @canvasReload="()=>$emit('canvasReload')" @addSketch="()=>$emit('addSketch')" :imgDesignImg=imgDesignImg></position>
 		</div>
 		
    </div>
@@ -47,7 +47,7 @@ export default defineComponent({
    components:{
 		position,modelNav
    },
-	emits:['detailEdit','canvasReload','addSketch','revocation','oppositeRevocation'],
+	emits:['detailEdit','canvasReload','addSketch','revocation','oppositeRevocation','modelOnLoad'],
    setup(props,{emit}) {
 		const {t} = useI18n()
        const store = useStore();
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -18,7 +18,7 @@
 			</div>
 		</div>
 		<div class="designOpenrtion_imgMask" v-if="!frontBack?.body?.path">
-			<img :src="designDetail?.undividedLayer || selectDetail?.path" style="object-fit: cover;" alt="">
+			<img :src="selectDetail?.undividedLayer || selectDetail?.path" style="object-fit: cover;" alt="">
 			<!-- <img @load="setSelectSketch()" :src="designDetail?.currentFullBodyView || selectDetail?.undividedLayer" style="object-fit: cover;" alt=""> -->
 		</div>
    </div>
@@ -49,7 +49,7 @@ export default defineComponent({
 			type:Boolean,
 		}
 	},
-	emits:['canvasReload'],
+	emits:['canvasReload','addSketch','modelOnLoad'],
    setup(props,{emit}) {
 		const {t} = useI18n()
        const store = useStore();
@@ -82,6 +82,11 @@ export default defineComponent({
 				let dom = document.querySelector('.molepositon .perview_img') as any
 				if(!detailData.frontBack?.body?.path || !dom)return
 				img.onload = () => {
+					if(detailData.designDetail.clothes.length == 0){
+						store.commit('DesignDetail/addDesignColthes')
+						emit('addSketch')
+						return
+					}
 					if(!detailData.selectDetail?.id){
 						let item = detailData.designDetail.clothes.reduce((max, current) => {
 							return current.priority > max.priority ? current : max;
@@ -114,6 +119,8 @@ export default defineComponent({
 							// detailData.frontBack.back[index].style[key] = value*sacle+'px'
 						}
 					});
+					console.log(111,detailData.frontBack?.body?.path)
+					emit('modelOnLoad')
 				};
 				img.src = detailData.frontBack?.body?.path;
 			})
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -40,8 +40,7 @@
 						</div>
 					</div>
 					<a-dropdown>
-						<!-- <i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}"></i> -->
-						<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}" :title="$t('Generate.uploadTitle')" v-show="!isTextarea && upload.level1Type !== 'Moodboard' && scene?.value != 'Slogan' && scene?.value != 'Logo'"></i>
+						<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}"></i>
 						<template #overlay>
 							<a-menu>
 								<a-menu-item>
@@ -61,7 +60,7 @@
 											@change="(file) => fileUploadChange(file)"
 										>
 										<div class="drop-container">
-											<folder-outlined />
+										<i class="fi fi-br-upload" :class="{ Guide_1_2_6:type_.type2 == 'Printboard'}" :title="$t('Generate.uploadTitle')" v-show="!isTextarea && upload.level1Type !== 'Moodboard' && scene?.value != 'Slogan' && scene?.value != 'Logo'"></i>
 											<div>{{ $t('PrintboardUpload.Upload') }}</div>
 										</div>
 										</a-upload>
@@ -155,13 +154,13 @@
 							(type_.type2 == 'Printboard' && scene.value == 'Pattern') || type_.type2 == 'Moodboard'"  :class="{active:speedState}" @click.stop="openSpeed"></div>
 						<div class="content" v-show="speedState && scene?.value != 'extract'">
 							<div v-for="item in speedList" 
-								v-show="(type_.type2 == 'Moodboard' && item?.value != 'flux') || 
-								(type_.type2 == 'Sketchboard' && item?.value != 'flux' && item?.value != 'wx') || 
-								(type_.type2 == 'Printboard' && item?.value != 'wx')" 
+								v-show="(type_.type2 == 'Moodboard') || 
+								(type_.type2 == 'Sketchboard' && item?.value != 'high') || 
+								(type_.type2 == 'Printboard')" 
 								:key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 						</div>
-						<div class="content"  v-show="speedState && scene?.value == 'extract'">
-							<div v-for="item in extractList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+						<div class="content" v-show="speedState && scene?.value == 'extract'">
+							<div v-for="item in extractList" :class="{active:item.value == speedData.value}" :key="item.value" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 						</div>
 					</div>
 					<div class="generage_btn started_btn" v-show="isGenerate && !remGenerate">
@@ -228,9 +227,7 @@
 				ref="selectImages"
 				@select="handleImageSelect"
 				:api="Https.httpUrls.queryLibraryPage"
-				isLibrary 
-				:libraryType="type_.type2"
-				/>
+				isLibrary/>
    </div>
 </template>
 <script lang="ts">
@@ -251,7 +248,6 @@ import createSlogan from "@/component/HomePage/createSlogan.vue";
 import { useI18n } from "vue-i18n";
 import sketchCategory from "@/component/HomePage/sketchCategory.vue";
 import SelectImages from '@/component/common/SelectImages.vue'
-import { FolderOutlined } from '@ant-design/icons-vue';

 export default defineComponent({
 	components: {
@@ -259,8 +255,7 @@ export default defineComponent({
 		generalMenu,
 		createSlogan,
 		sketchCategory,
-		SelectImages,
-		FolderOutlined
+		SelectImages
 	},
    props: ["msg",'sketchCatecoryList','scene','gender'],
 	emits:['setLibrary'],
@@ -321,7 +316,7 @@ export default defineComponent({
 				{
 					title:'',
 					label:t('speedList.generateWx'),
-					value:'wx',
+					value:'advanced',
 				},{
 					title:'',
 					label:t('speedList.toproductFlus'),
@@ -329,13 +324,13 @@ export default defineComponent({
 				},{
 					title:'',
 					label:t('speedList.generateNormal'),
-					value:'fast',
-
-				},{
-					title:'',
-					label:t('speedList.generateFlux'),
-					value:'flux',
+					value:'normal',
 				},
+				// {
+				// 	title:'',
+				// 	label:t('speedList.generateFlux'),
+				// 	value:'flux',
+				// },
 			],
 			extractList:[
 				{
@@ -348,7 +343,7 @@ export default defineComponent({
 			speedData:{
 				title:'',
 				label:t('speedList.generateWx'),
-				value:'wx',
+				value:'advanced',
 			},
 		})
 		const openSpeed = ()=>{
@@ -370,11 +365,12 @@ export default defineComponent({
 				speed.speedData.value = ''
 				speed.speedData.label = ''
 			}else{
-				if(newVal.value == "Pattern" || props.msg == 'Sketchboard'){
-					speed.speedData = speed.speedList[1]
-				}else{
-					speed.speedData = speed.speedList[0]
-				}
+				// if(newVal.value == "Pattern" || props.msg == 'Sketchboard'){
+				// 	speed.speedData = speed.speedList[1]
+				// }else{
+				// 	speed.speedData = speed.speedList[0]
+				// }
+				speed.speedData = speed.speedList[0]
 			}
 		})
 		const setSpeed = (item:any)=>{
@@ -382,9 +378,9 @@ export default defineComponent({
 		}
 		onMounted(() => {
 			instance.appContext.config.globalProperties.$dropdownEvents.onClose(removeOpenSpeed)
-			if(props.msg == 'Sketchboard'){
-				speed.speedData = speed.speedList[1]
-			}
+			// if(props.msg == 'Sketchboard'){
+			// 	speed.speedData = speed.speedList[1]
+			// }
 		})

 		onUnmounted(() => {
--- a/src/component/common/SelectImages.vue
+++ b/src/component/common/SelectImages.vue
@@ -714,6 +714,10 @@ defineExpose({
  justify-content: space-between;
  align-items: center;
  flex-shrink: 0;
+  > .image-submit{
+	font-size: 1.2rem;
+	line-height: 4rem;
+  }
 }

 .image-count {
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -1591,12 +1591,10 @@ export default defineComponent({
 		//设计新的collection
 		async designNewCollection() {
 			clearTimeout(this.getDesignTime);
+			let probjects = this.store.state.Workspace.probjects
+								
+			if(probjects.type == "seriesDesign" && probjects?.model?.length == 0)return message.info(this.t('collectionModal.jsContent7'));
 			let data = await this.getDesignData("");
-			if(this.driver__.driver){
-				nextTick().then(()=>{
-					driverObj__.moveNext();
-				})
-			}
 			this.isShowMark = true
 			// this.store.commit("setLikeDesignCollectionList", []);
 			Https.axiosPost(Https.httpUrls.designCollection, data)
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -584,6 +584,7 @@ export default {
    jsContent3: "您必须选择一种或多种颜色进行下一步。",
    jsContent5: "我们检测到您的({str})上的PIN数量超过了八个，这可能会导致一些已钉住的项目未被使用。您是否仍要继续？",
    jsContent6: "画布内容没有保存，请点击预保存后继续。",
+    jsContent7: "请至少选择一个模特",
  },
  DesignDetail: {
    Details: "详情",
@@ -1341,7 +1342,7 @@ export default {
 	toproductBasic:'基础',
 	generateWx:'高级',
 	generateFlux:'进阶',
-	generateNormal:'基础',
+	generateNormal:'标准',
  },
  liquifyPanel:{
 	push:'推',
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -584,6 +584,7 @@ export default {
    jsContent3: "You must choose one or more colors for further process.",
    jsContent5: "We've detected that the number of pins on your ({str}) exceeds eight, which may result in some pinned items not being used. Would you like to continue anyway?",
    jsContent6: 'The content on the canvas has not been saved. Please click "Preview" to continue.',
+    jsContent7: "Please select at least one model.",
  },
  DesignDetail: {
    Details: "Details",
@@ -1339,8 +1340,8 @@ export default {
 	changeBackground:'Change the background',
 	toproductFlus:'High',
 	toproductBasic:'Basic',
-	generateWx:'Premium',
-	generateFlux:'Advanced',
+	generateWx:'Advanced',
+	generateFlux:'Premium',
 	generateNormal:'Normal',
  },
  liquifyPanel:{
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -1,5 +1,6 @@
 import {Module} from 'vuex'
 import {RootState} from '../index'
+import { forEach } from 'jszip'

 interface DesignDetail{
    designDetail:any,
@@ -42,7 +43,6 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 			state.currentPrintElement = null
 		},
        setDesignDetail(state,data){
-			console.log(data)
 			if(data.others.length > 0 && data.others[0].type == "Body"){
 				state.frontBack.body = data.others[0]
 			}
@@ -72,11 +72,13 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 						// front[index].style.zIndex = v.priority
 						front[index].id = v.id
 						front[index].undividedLayer = v.undividedLayer
+						front[index].undividedLayerWithSinglePrint = v?.undividedLayerWithSinglePrint
 					}else{
 						back[index] = v.layersObject[i]
 						back[index].style.zIndex = v.priority
 						back[index].id = v.id
 						back[index].undividedLayer = v.undividedLayer
+						back[index].undividedLayerWithSinglePrint = v?.undividedLayerWithSinglePrint
 						// back[index].style.zIndex = backIndex==0?v.layersObject[i]:backIndex++
 					}
 					if(state.printZIndex < v.priority){
@@ -194,6 +196,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 				trims:null,
 				type:null,
 				undividedLayer:null,
+				undividedLayerWithSinglePrint:null,
 			}
 			if(!state.currentDetailType)state.currentDetailType = 'sketch'
 			state.designDetail.clothes.forEach((item:any) => {
@@ -205,7 +208,6 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 		},
 		async setPraeview(state,value){//preview
 			let data = value?.rv || value 
-			console.log(data,'preview')
 			let currentType = value?.currentType
 			if(state.designDetail.oldModel?.url)state.frontBack.body.path = state.designDetail.oldModel.url
 			if(value?.rv?.currentFullBodyView)state.designDetail.currentFullBodyView = value.rv.currentFullBodyView
@@ -217,14 +219,21 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 				}
 				let id_:any
 				if(state.currentDetailType != 'models'){
-					id_ = state.selectDetail.id || state.selectDetail.newDetail?.sketch?.id
+					if(data.clothes.length > 2){
+						//缺少字段临时添加
+						id_ = item.id || state.selectDetail.newDetail?.sketch?.id
+					}else{
+						id_ = state.selectDetail.id || state.selectDetail.newDetail?.sketch?.id
+					}
 				}else{
 					id_ = item.id
 				}
+				console.log(id_)
 				let el:any = document.querySelector('.molepositon .perview_img')
 				await new Promise((resolve, reject) => {
 					if(!state.frontBack?.body?.path){
 						state.frontBack.front[0].undividedLayer = value.rv.clothes[0].undividedLayer
+						state.frontBack.front[0].undividedLayerWithSinglePrint = value.rv.clothes[0]?.undividedLayerWithSinglePrint
 						resolve('')
 					}
 					const img = new Image();
@@ -255,11 +264,13 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 										// state.frontBack.front[index].style.zIndex = v.priority
 										state.frontBack.front[index].id = item.id
 										state.frontBack.front[index].undividedLayer = item.undividedLayer
+										state.frontBack.front[index].undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
 									}else{
 										state.frontBack.back[index] = item.layersObject[i]
 										// state.frontBack.back[index].style.zIndex = v.priority
 										state.frontBack.back[index].id = item.id
 										state.frontBack.back[index].undividedLayer = item.undividedLayer
+										state.frontBack.back[index].undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
 									}
 								}
 							}
@@ -267,39 +278,89 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 						resolve('')
 					};
 				})
-				if(state.currentDetailType != 'models'){
-					state.selectDetail.change = item.change
-					if(state.selectDetail?.newDetail?.color && currentType != 'color'){
-						state.selectDetail.color = state.selectDetail?.newDetail?.color
-						state.selectDetail.newDetail.color = null
+				let uploadDetail = (detailItem)=>{
+					detailItem.change = item.change
+					if(detailItem?.newDetail?.color && currentType != 'color'){
+						detailItem.color = detailItem?.newDetail?.color
+						detailItem.newDetail.color = null
 					}
 					if(item.partialDesign){
-						state.selectDetail.partialDesign = item.partialDesign
+						detailItem.partialDesign = item.partialDesign
 					}
-					state.selectDetail.designType = item.designType
-					state.selectDetail.gradient = item.gradient
-					state.selectDetail.layersObject = item.layersObject
-					state.selectDetail.path = item.path
-					state.selectDetail.minIOPath = item.minIOPath
-					state.selectDetail.scale = [1,1]
-					state.selectDetail.offset = [0,0]
-					state.selectDetail.printObject = item.printObject
-					state.selectDetail.trims = item.trims
-					state.selectDetail.type = item.type
-					state.selectDetail.color = {
+					detailItem.designType = item.designType
+					detailItem.layersObject = item.layersObject
+					detailItem.path = item.path
+					detailItem.minIOPath = item.minIOPath
+					detailItem.scale = [1,1]
+					detailItem.offset = [0,0]
+					detailItem.printObject = item.printObject
+					detailItem.trims = item.trims
+					detailItem.type = item.type
+					detailItem.maskMinioUrl = item.layersObject?.[0]?.maskMinioUrl
+					detailItem.maskUrl = item.layersObject?.[0]?.maskUrl
+					detailItem.color = {
 						...item.color,
 						rgba:{
 							r:item.color?.r,
 							g:item.color?.g,
 							b:item.color?.b,
+						},
+						gradient:item.gradient,
+					}
+					detailItem.undividedLayer = item.undividedLayer
+					detailItem.undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
+					if(detailItem.newDetail?.sketch?.id && !detailItem.id){
+						state.designDetail.clothes.push(detailItem)
+					}
+					detailItem.id = item.id
+					if(currentType)if(detailItem.newDetail?.[currentType] && currentType != 'color')delete detailItem.newDetail[currentType]
+				}
+				if(data.clothes.length > 2){
+					state.designDetail.clothes.forEach((detailItem:any) => {
+						if(detailItem.id == id_){
+							uploadDetail(detailItem)
 						}
-					}
-					state.selectDetail.undividedLayer = item.undividedLayer
-					if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){
-						state.designDetail.clothes.push(state.selectDetail)
-					}
-					state.selectDetail.id = item.id
-					if(currentType)if(state.selectDetail.newDetail?.[currentType] && currentType != 'color')delete state.selectDetail.newDetail[currentType]
+					});
+				}else{
+					uploadDetail(state.selectDetail)
+				}
+				
+				if(state.currentDetailType != 'models'){
+					// state.selectDetail.change = item.change
+					// if(state.selectDetail?.newDetail?.color && currentType != 'color'){
+					// 	state.selectDetail.color = state.selectDetail?.newDetail?.color
+					// 	state.selectDetail.newDetail.color = null
+					// }
+					// if(item.partialDesign){
+					// 	state.selectDetail.partialDesign = item.partialDesign
+					// }
+					// state.selectDetail.designType = item.designType
+					// state.selectDetail.layersObject = item.layersObject
+					// state.selectDetail.path = item.path
+					// state.selectDetail.minIOPath = item.minIOPath
+					// state.selectDetail.scale = [1,1]
+					// state.selectDetail.offset = [0,0]
+					// state.selectDetail.printObject = item.printObject
+					// state.selectDetail.trims = item.trims
+					// state.selectDetail.type = item.type
+					// state.selectDetail.maskMinioUrl = item.layersObject?.[0]?.maskMinioUrl
+					// state.selectDetail.maskUrl = item.layersObject?.[0]?.maskUrl
+					// state.selectDetail.color = {
+					// 	...item.color,
+					// 	rgba:{
+					// 		r:item.color?.r,
+					// 		g:item.color?.g,
+					// 		b:item.color?.b,
+					// 	},
+					// 	gradient:item.gradient,
+					// }
+					// state.selectDetail.undividedLayer = item.undividedLayer
+					// state.selectDetail.undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
+					// if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){
+					// 	state.designDetail.clothes.push(state.selectDetail)
+					// }
+					// state.selectDetail.id = item.id
+					// if(currentType)if(state.selectDetail.newDetail?.[currentType] && currentType != 'color')delete state.selectDetail.newDetail[currentType]
 				}
 			}
 			if(value.fun)value.fun()
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -435,9 +435,9 @@
 													</div>
 													<div class="content" v-if="scene?.value != 'extract'" v-show="speedState">
 														<div v-for="item in speedList" :class="{active:item.value == speedData.value}" 
-															v-show="(selectCode == 'Moodboard' && item?.value != 'flux') || 
-															(selectCode == 'Sketchboard' && item?.value != 'flux' && item?.value != 'wx') || 
-															(selectCode == 'Printboard' && item?.value != 'wx')" 
+															v-show="(selectCode == 'Moodboard') || 
+															(selectCode == 'Sketchboard' && item?.value != 'high') || 
+															(selectCode == 'Printboard')" 
 															:key="item.value" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
 													</div>
 													<div class="content" v-else v-show="speedState">
@@ -720,10 +720,10 @@ export default defineComponent({
 		let printModelList:any = ref([])
 		let speed = reactive({
 			speedList:[
-				{
+			{
 					title:'',
 					label:t('speedList.generateWx'),
-					value:'wx',
+					value:'advanced',
 				},{
 					title:'',
 					label:t('speedList.toproductFlus'),
@@ -731,26 +731,21 @@ export default defineComponent({
 				},{
 					title:'',
 					label:t('speedList.generateNormal'),
-					value:'fast',
-
-				},{
-					title:'',
-					label:t('speedList.generateFlux'),
-					value:'flux',
+					value:'normal',
 				},
 			],
 			extractList:[
 				{
 					title:'',
-					label:t('speedList.generateFlux'),
-					value:'flux',
+					label:t('speedList.generateWx'),
+					value:'advanced',
 				},
 			],
 			speedState:false,
 			speedData:{
 				title:'',
 				label:t('speedList.generateWx'),
-				value:'wx',
+				value:'advanced',
 			},
 		})
 		const openSpeed = ()=>{
@@ -994,11 +989,12 @@ export default defineComponent({
 						label:''
 					}
 				}else{
-					if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){
-						this.speedData = this.speedList[1]
-					}else{
-						this.speedData = this.speedList[0]
-					}
+					// if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){
+					// 	this.speedData = this.speedList[1]
+					// }else{
+					// 	this.speedData = this.speedList[0]
+					// }
+					this.speedData = this.speedList[0]
 				}
 				this.speedState = false
 			}