2023-10-20

src/component/Detail/DesignDetailAlter.vue

@@ -398,7 +398,6 @@ export default defineComponent({
 				function callback(entries, observer) {
 					entries.forEach((entry) => {
 						if (entry.isIntersecting) {
-							console.log(11);
 							this_.getLibraryList()
 						} else {
 						}
@@ -494,12 +493,11 @@ export default defineComponent({
 				rgba:{
 					r:Number(arr.r),
 					g:Number(arr.g),
-					b:Number(arr.g),
+					b:Number(arr.b),
 					a:Number(arr.a?arr.a:1),
 				},
 				hex:this.rgbaToHex([arr.r,arr.g,arr.b,arr.a?arr.a:1])
 			}
-
 			this.uploadList = []
 			if (num == 1) {
 				this.selectCode = 'Sketchboard'
@@ -589,21 +587,20 @@ export default defineComponent({
 			this.select = false
 			DesignDetailEnd.selectIndex = 0
 			DesignDetailEnd.type_ = 0
+			this.colorFileList = []
+			this.selectColorList = []
 		},
 
 		//切换整体衣服
 		changePlace(){
 			this.uploadList = []
 			let DesignDetailEnd = this.$refs.DesignDetailEnd
-			this.select = false
-			DesignDetailEnd.type_ = 0
 			this.uploadList = []
 			this.apparelList = []
 			this.printList = []
-			this.select = false
 			DesignDetailEnd.colorList = [{},{},{},{},{},{},{},{}]
-			DesignDetailEnd.selectIndex = 0
 			DesignDetailEnd.sketchImg={}
+			this.terminate()
 		},
 		// this.getLibraryList('Moodboard')
 		// this.getLibraryList('Printboard')
@@ -849,51 +846,60 @@ export default defineComponent({
                 this.colorFileList.push(file)
 
 				setTimeout(async ()=>{
-                    const colorThief = new ColorThief();
-                    let colorImage = this.$refs.colorImage
-                    let domImg = colorImage[0];
-                    let color = colorThief.getColor(domImg)
-					let colorHex = this.rgbaToHex(color)
-					let selectColorList = [];
-					let selectColor = colorThief.getPalette(domImg,9)
-					//排序
-					let obj = {
-						max : 30,
-						min: 30,
-					}
-					let colorSort
-					await GO.setColor(selectColor,file.imgUrl,obj).then(
-						(rv) => {
-							if(rv){
-								colorSort = rv.ratio
-							}
+					const img = new Image();
+					let colorImage = this.$refs.colorImage
+					img.src = colorImage[0].src;
+
+					img.onload = async () => {
+						const colorThief = new ColorThief();
+						// let domImg = colorImage[0];
+						// let color = colorThief.getColor(img)
+						// let colorHex = this.rgbaToHex(color)
+						let selectColorList = [];
+						let selectColor = colorThief.getPalette(img,8)
+						//排序
+						let obj = {
+							max : 5,
+							min: 5,
 						}
-					)
-					colorSort.sort((a, b) => {
-						var a_num = a.ratio;
-						var b_num = b.ratio;
-						return b_num - a_num;
-					});
-					selectColor = []
-					colorSort.forEach(v=>{
-						selectColor.push(v.rgb)
-					})
-					
-					selectColor = selectColor.join('&')
-					selectColor = selectColor.split("&")
-					let colorLi = []
-					new Set(selectColor).forEach((item)=>{
-						colorLi.push(item.split(","))
-					})
-					colorLi.forEach(element => {
-						let colorLiHex = this.rgbaToHex(element)
-						selectColorList.push(
-							{rgba:{r:element[0],g:element[1],b:element[2],a:1},hex:colorLiHex}
+						let colorSort
+						await GO.setColor(selectColor,file.imgUrl,obj).then(
+							(rv) => {
+								if(rv){
+									colorSort = rv.ratio
+								}
+							}
 						)
-					});
-					this.selectColorList = selectColorList
-                    this.getHsvColor(selectColorList)
-                    this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
+						colorSort.sort((a, b) => {
+							var a_num = a.ratio;
+							var b_num = b.ratio;
+							return b_num - a_num;
+						});
+						selectColor = []
+						colorSort.forEach(v=>{
+							selectColor.push(v.rgb)
+						})
+						selectColor = selectColor.join('&')
+						selectColor = selectColor.split("&")
+						let color = selectColor[0].split(',')
+						let colorHex = this.rgbaToHex(color)
+
+						let colorLi = []
+						new Set(selectColor).forEach((item)=>{
+							colorLi.push(item.split(","))
+						})
+						colorLi.forEach(element => {
+							let colorLiHex = this.rgbaToHex(element)
+							selectColorList.push(
+								{rgba:{r:element[0],g:element[1],b:element[2],a:1},hex:colorLiHex}
+							)
+						});
+						this.selectColorList = selectColorList
+						// this.getHsvColor(selectColorList)
+						this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
+					};
+                    
+				
                 },100)
             };
             // 转化为base64S
@@ -1081,18 +1087,20 @@ export default defineComponent({
                         max-height: 100%;
                     }
 					.operate_file_block{
-						height: 2.5rem;
+						height: 1.5rem;
 						.select_img_type{
+							line-height: 1;
 							.select_category{
-								zoom: .8;
+								zoom: .6;
+								height: 100%;
 								.icon-xiala{
 									zoom: .8;
 								}
 							}
 							.category_list{
-								margin-top: -.4rem;
+								margin-top: .1rem;
 								.category_item{
-									zoom: .8;
+									zoom: .7;
 								}
 							}
 						}