fix

src/assets/style/style.css

@@ -218,6 +218,9 @@ li {
 .delete_like_file_block i.fi-sr-heart {
   color: red;
 }
+.delete_like_file_block.left {
+  left: 0rem;
+}
 .el-popper .el-cascader-panel {
   --el-cascader-menu-selected-text-color: #000;
 }

src/assets/style/style.less

@@ -242,6 +242,9 @@ ul,li{
 			color: red;
 		}
 	}
+	&.left{
+		left: 0rem;
+	}
 }
 
 .el-popper{

src/component/Detail/DesignDetail.vue

@@ -253,7 +253,11 @@ export default defineComponent({
 			handler: async function(newVal,oldVal) {
 				let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
 				this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false
-				this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex]))
+				if(newVal.clothes.length == 0){
+					this.current = ''					
+				}else{
+					this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex]))
+				}
 				if(designItemDetail.others[0].layersObject.length != 0){
 					this.body = false
 				}else{
@@ -781,7 +785,22 @@ export default defineComponent({
 			this.designItemDetail.clothes.forEach((item:any)=>{
 				item.clothesOpen = false
 			})
-			let color = this.designItemDetail.clothes[0].color
+			let color
+			if(this.designItemDetail.clothes[0]){
+				color = this.designItemDetail.clothes[0].color
+			}else{
+				color = {
+					"id": '',
+					"name": "Brilliant White New",
+					"tcx": "11-1123",
+					"r": 255,
+					"g": 255,
+					"b": 255,
+					"h": 0,
+					"s": 0,
+					"v": 100
+				}
+			}
 			let aa = {
 				"id": '',
 				"type": "",
@@ -802,17 +821,21 @@ export default defineComponent({
 			// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
 			// DesignDetailAlter.changePlace()
 			this.designOrder = true
-			if(this.designItemDetail.clothes[this.designItemDetail.clothes.length-1].id){
+			this.designItemDetail.clothes.push(aa)
-				this.designItemDetail.clothes.push(aa)
+			this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
-				this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
+			let DesignDetailAlter:any = this.$refs.DesignDetailAlter
-				let DesignDetailAlter:any = this.$refs.DesignDetailAlter
+			DesignDetailAlter.init(1)
-				DesignDetailAlter.init(1)
+			// if(this.designItemDetail.clothes?.[this.designItemDetail.clothes.length-1]?.id){
-				// this.current = aa
+			// 	// this.current = aa
-				// this.designOrder = true
+			// 	// this.designOrder = true
-				// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
+			// 	// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
-				// DesignDetailAlter.changePlace()
+			// 	// DesignDetailAlter.changePlace()
-			}else{
+			// }else{
-			}
+			// 	this.designItemDetail.clothes.push(aa)
+			// 	this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
+			// 	let DesignDetailAlter:any = this.$refs.DesignDetailAlter
+			// 	DesignDetailAlter.init(1)
+			// }
 			
 		},
         //元素替换

src/component/Detail/DesignDetailAlter.vue

@@ -1431,12 +1431,23 @@ export default defineComponent({
 								bottom: -.5rem;
 								right: .5rem;
 								border-radius: .5rem;
+								
 							}
 							.vc-chrome-fields{
 								.vc-input__label{
 									margin-top: 1rem;
 								}
 							}
+							.vc-chrome-fields:nth-child(2){
+								>:last-of-type {
+									display: none;
+								}
+							}
+							.vc-chrome-fields:nth-child(3){
+								>:last-of-type {
+									display: none;
+								}
+							}
 						}
 						.vc-chrome-controls{
 							align-items: center;

src/component/Detail/DesignDetailEnd.vue

@@ -251,6 +251,7 @@ export default defineComponent({
 			})
 			if(!this.current.id){
 				data.designSingleItemDTOList[index].priority = zIndex+=1
+
 			}
 			if(this.type_ == 1){
 				if(data.designSingleItemDTOList[index].path != this.sketchImg.minIOPath && this.sketchImg.id_){
@@ -267,30 +268,7 @@ export default defineComponent({
 				let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
 				data.designSingleItemDTOList[index].color = color
 			}
-			// if(!bor){
+			
-			// 	index = designItemDetail.clothes.length
-			// 	let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}`
-			// 	let obj = {
-			// 			"color": color,
-			// 			"id": this.sketchImg.id_? this.sketchImg.id_:this.current.id_,
-			// 			"path": this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath,
-			// 			"offset": [
-			// 				0,
-			// 				0
-			// 			],
-			// 			"scale": 1,
-			// 			"printObject": {
-			// 				"ifSingle": false,
-			// 				"prints": [
-			// 				]
-			// 			},
-			// 			priority:zIndex,
-			// 			"type": this.sketchImg.type
-			// 		}
-			// 	// data.designSingleItemDTOList.push(obj)
-			// 	// designItemDetail.clothes.push(obj)
-			// }
-			// return
 			data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.designSingle, data).then(
@@ -310,7 +288,7 @@ export default defineComponent({
 							}else{
 
 							}
-							if(!designItemDetail.clothes[index].id){
+							if(!this.current.id ){
 								designItemDetail.clothes[index].priority = zIndex
 							}
 						}

src/component/HomePage/ColorboardUpload.vue

@@ -781,6 +781,16 @@ export default defineComponent({
 										margin-top: 1rem;
 									}
 								}
+								.vc-chrome-fields:nth-child(2){
+									>:last-of-type {
+										display: none;
+									}
+								}
+								.vc-chrome-fields:nth-child(3){
+									>:last-of-type {
+										display: none;
+									}
+								}
 							}
 							.vc-chrome-controls{
 								align-items: center;

src/component/HomePage/Generate.vue

@@ -658,7 +658,6 @@ export default defineComponent({
 		},
 		scaleImage(){
 			let scaleImage:any = this.$refs.scaleImage
-			 
 			scaleImage.init(this.fileList)
 		},
         closeModal() {

src/component/HomePage/PrintboardUpload.vue

@@ -117,6 +117,9 @@
 							<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
 							<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
 						</div>
+						<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
+							<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
+						</div>
 						<div class="pin_block">
 							<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
 						</div>
@@ -128,7 +131,7 @@
 				</div>
 			</div>
 		</div>
-		
+		<scaleImage ref="scaleImage"></scaleImage>
         <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
     </div>
 </template>
@@ -146,12 +149,14 @@ import Generate from "@/component/HomePage/Generate.vue";
 import GO from "@/tool/GO";
 import { useI18n } from 'vue-i18n';
 import { openGuide,driverObj__ } from "@/tool/guide";
+import scaleImage from "@/component/HomePage/scaleImage.vue";
 
 export default defineComponent({
     components:{
         Cropper,
         Material,
-		Generate
+		Generate,
+		scaleImage,
     },
     setup(){
         let store:any =useStore()
@@ -164,7 +169,8 @@ export default defineComponent({
 			})
         let openClick: any = ref(1);
 		let generateCheckbox:any = ref()
-		let generateList:any = ref([])
+		let generateList:any = ref([
+		])
 		let loadingShow = ref(false)
 		let inputShow = ref(false)
 		let inputTime = ref()
@@ -601,6 +607,9 @@ export default defineComponent({
 					return
 				}
 			}
+			if(generateType == 'image'){
+				data.text = ''
+			}
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
                 (rv) => {
@@ -712,7 +721,10 @@ export default defineComponent({
             })
 
         },
-
+		scaleImage(){
+			let scaleImage:any = this.$refs.scaleImage
+			scaleImage.init(this.generateList)
+		},
 		generageAdd(item:any){
 			item.type_ = {
                 type1: "generate",
@@ -912,6 +924,9 @@ export default defineComponent({
 		text-align: center;
 		line-height: 3.2rem;
 		left: auto;
+		&.left{
+			left: .9rem;
+		}
 		.icon-shanchu{
 			font-size: 1.6rem;
 			color: #fff;

src/component/HomePage/RobotAssist.vue

@@ -27,6 +27,9 @@
 								<i v-if="imgItem.id == null" class="fi fi-rr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
 								<i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
 							</div>
+							<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
+								<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img)"></i>
+							</div>
 						</div>
 					</div>
 				</div>
@@ -46,11 +49,13 @@
 				<div class="robot_btn">
 					<i class="fi fi-ss-paper-plane-top" @click="roborSend"></i>
 				</div>
+				
 			</div>
 			<div class="robot_img">
 				<img src="@/assets/images/homePage/robot.png" @click="robotBtn">
 			</div>
 		</div>
+		<scaleImage ref="scaleImage"></scaleImage>
 	</div>
 </template>
 <script lang="ts">
@@ -61,11 +66,13 @@ import { getCookie,setCookie } from "@/tool/cookie";
 import { useStore } from "vuex";
 import { message } from "ant-design-vue";
 import { openGuide,driverObj__,setDestroy } from "@/tool/guide";
+import scaleImage from "@/component/HomePage/scaleImage.vue";
 import { useI18n } from "vue-i18n";
 export default defineComponent({
     components: {
         DownOutlined,
         UserOutlined,
+		scaleImage,
     },
 	setup() {
 		const robotDom = ref<HTMLElement | null>(null);
@@ -224,6 +231,14 @@ export default defineComponent({
 				}
 			})
 		},
+		scaleImage(img){
+			let scaleImage:any = this.$refs.scaleImage
+			img.forEach((item:any) => {
+				item.imgUrl = item.presignedUrl
+			});
+			scaleImage.init(img)
+			scaleImage.scaleImageMask = true
+		},
 		robotmax(){//点击内容就设置为true显示 重置定时器
 			this.createTimer()
 		},

src/component/HomePage/SketchboardUpload.vue

@@ -239,6 +239,9 @@
 							<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
 							<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
 						</div>
+						<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
+							<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
+						</div>
 						<div class="pin_block">
 							<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
 						</div>
@@ -249,6 +252,7 @@
 				</div>
 			</div>
 		</div>
+		<scaleImage ref="scaleImage"></scaleImage>
 		
 		<!-- <layout ref="layout" :moodb_className="moodb_className" :flex_direction="flex_direction" @setmoodbClass="setmoodbClass"></layout> -->
        	
@@ -265,16 +269,17 @@ import { useStore } from "vuex";
 import { message, Upload } from "ant-design-vue";
 import Material from "@/component/HomePage/Material.vue";
 import Generate from "@/component/HomePage/Generate.vue";
+import scaleImage from "@/component/HomePage/scaleImage.vue";
 import { Https } from "@/tool/https";
 import { openGuide,driverObj__ } from "@/tool/guide";
 import { useI18n } from "vue-i18n";
 export default defineComponent({
-    components: { Material, Generate },
+    components: { Material, Generate,scaleImage },
     setup() {
-        let fileList: any = ref([]);
+        let fileList: any = ref([
+		]);
         let openClick: any = ref(1);
 		let generateList:any = ref([
-	
 		])
         let store:any =useStore()
 
@@ -429,6 +434,10 @@ export default defineComponent({
 				})
             }
         },
+		scaleImage(){
+			let scaleImage:any = this.$refs.scaleImage
+			scaleImage.init(this.generateList)
+		},
 		getgenerateCheckbox(value:any){
 			this.generateCheckbox = value
 		},
@@ -700,6 +709,9 @@ export default defineComponent({
 					return
 				}
 			}
+			if(generateType == 'image'){
+				data.text = ''
+			}
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
                 (rv) => {
@@ -917,6 +929,9 @@ export default defineComponent({
 		text-align: center;
 		line-height: 3.2rem;
 		left: auto;
+		&.left{
+			left: .9rem;
+		}
 		.icon-shanchu{
 			font-size: 1.6rem;
 			color: #fff;

src/component/HomePage/scaleImage.vue

@@ -7,7 +7,7 @@
             :maskClosable="false"
             :centered="true"
             :closable="false"
-            :mask="false"
+            :mask="scaleImageMask"
 			:keyboard="false"
 			:destroyOnClose="true"
         >
@@ -66,6 +66,7 @@ export default defineComponent({
 		let scaleImageList:any = ref([
 			
 		])
+		let scaleImageMask:any = ref(false)
 		let scaleImageIndex:any = ref(0)
         return {
             scaleImage,
@@ -73,6 +74,7 @@ export default defineComponent({
 			visible,
 			setVisible,
 			scaleImageList,
+			scaleImageMask,
 			scaleImageIndex,
         };
     },
@@ -89,6 +91,8 @@ export default defineComponent({
 		init(list:any){
 			this.scaleImage = true
 			this.scaleImageList = list
+			console.log(list);
+			
 			// let scaleImageList = this.store.state.UploadFilesModule.moodboard
 		},
 		cancelDsign(){
@@ -177,7 +181,7 @@ export default defineComponent({
 	.scaleImage_content{
 		display: flex;
 		justify-content: center;
-		height: 100%;
+		height: 75%;
 		margin-top: 5rem;
 		img{
 			width: auto;

src/views/LibraryPage.vue

@@ -1178,6 +1178,10 @@ export default defineComponent({
 					);
 					return
 				}
+				
+			}
+			if(generateType == 'image'){
+				data.text = ''
 			}
 			this.isShowMark = true
 			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(

src/views/LoginPage.vue

@@ -58,7 +58,7 @@
 					<!-- <div v-show="loginType == 'email'" class="login_form_email"> -->
 						<!-- <div v-show="emailStap === 1" class="forget_password_content">
 							<div class="forget_password_content_block" @click="changeLoginType('username')">
-								<span class="icon iconfont icon--shangyibu"></span
+								<span class="icon iconfont fi-br-arrow-left"></span
 								><span class="forget_password_content_title"
 									>Log on to AiDA</span
 								>
@@ -150,8 +150,10 @@
             <!-- 忘记密码 start -->
             <div class="forget_password_content" v-else>
                 <div class="forget_password_content_block" @click="forgetPasswordLastStepFun()">
-                    <span class="icon iconfont icon--shangyibu"></span
+                    <!-- <span class="icon iconfont fi-br-arrow-left"></span
-                    ><span class="forget_password_content_title"
+                    > -->
+					<i class="fi fi-br-arrow-left"></i>
+					<span class="forget_password_content_title"
                         >Retrieve password</span
                     >
                 </div>
@@ -692,10 +694,12 @@ export default defineComponent({
 					}
                 }
 
-                .icon--shangyibu {
+                .fi-br-arrow-left {
                     font-size: 2.5rem;
                     font-weight: bold;
                     color: #030303;
+					transform: translateY(1rem);
+					display: inline-block;
                 }
 
                 
@@ -744,10 +748,12 @@ export default defineComponent({
                 cursor: pointer;
             }
 
-            .icon--shangyibu {
+            .fi-br-arrow-left {
                 font-size: 3.8rem;
                 font-weight: bold;
                 color: #030303;
+				transform: translateY(1rem);
+				display: inline-block;
             }
             .forget_password_content_title {
                 font-size: 3.2rem;