From 21b0af13657397844537db32fe83cf9945d296f2 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 27 Sep 2024 16:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=BB=E5=B8=83=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/iconfont2/iconfont.css             |  10 +-
 src/assets/iconfont2/iconfont.woff            | Bin 4852 -> 5008 bytes
 src/assets/iconfont2/iconfont.woff2           | Bin 4044 -> 4256 bytes
 src/component/Account/account.vue             |   4 +-
 src/component/Account/accountFollowFans.vue   |   3 +
 src/component/Account/accountMessage.vue      |   3 +
 src/component/Account/followFans/fans.vue     |  15 +-
 src/component/Account/followFans/follow.vue   |  18 +-
 src/component/Administrator/questionnaire.vue |   1 -
 .../Administrator/recentActiveUser.vue        |   1 -
 .../trialUserConversionRateChart.vue          |   3 -
 src/component/Detail/DesignElementsMobile.vue |   2 -
 src/component/Detail/addDetails.vue           | 469 +-----------------
 src/component/Detail/editFrontBack.vue        |  69 +--
 src/component/Events/eventsDetail.vue         |   2 -
 src/component/HomePage/ExportModel.vue        | 122 +++--
 src/component/HomePage/Generate.vue           |   2 +-
 src/component/HomePage/MoodboardUpload.vue    |   4 +-
 src/component/HomePage/collectionModal.vue    |  53 +-
 src/component/HomePage/generalMenu.vue        |  17 +-
 src/component/HomePage/layout.vue             |  11 +-
 src/component/HomePage/scaleImage.vue         |  50 +-
 src/component/modules/generalCanvas.vue       | 122 +++--
 src/component/modules/generalMiniCanvas.vue   |   6 +-
 src/store/uploadFile/uploadFile.ts            |   2 +
 src/tool/canvasGeneral.js                     |   3 -
 src/tool/domTurnImg.js                        |   1 -
 src/tool/webSocket.js                         |   5 -
 src/views/HomeMain.vue                        |   3 +-
 src/views/HomeView/HomeView.vue               |  63 +--
 src/views/HomeView/history.vue                |   2 -
 src/views/emailVerify.vue                     | 242 +++------
 32 files changed, 423 insertions(+), 885 deletions(-)

diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css
index c67fa179..1aba4c42 100644
--- a/src/assets/iconfont2/iconfont.css
+++ b/src/assets/iconfont2/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4292253 */
-  src: url('iconfont.woff2?t=1727254748810') format('woff2'),
-       url('iconfont.woff?t=1727254748810') format('woff'),
-       url('iconfont.ttf?t=1727254748810') format('truetype');
+  src: url('iconfont.woff2?t=1727415711578') format('woff2'),
+       url('iconfont.woff?t=1727415711578') format('woff'),
+       url('iconfont.ttf?t=1727415711578') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-caizhi:before {
+  content: "\e647";
+}
+
 .icon-IC-yehua:before {
   content: "\e61b";
 }
diff --git a/src/assets/iconfont2/iconfont.woff b/src/assets/iconfont2/iconfont.woff
index 79eddb557e9c1e5556dac2b3ff290ef9670d524e..a1c35fd049a94c413e62634300c43f0a7001d78c 100644
GIT binary patch
delta 4505
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

delta 4344
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

diff --git a/src/assets/iconfont2/iconfont.woff2 b/src/assets/iconfont2/iconfont.woff2
index 5fd17c13b44cbb064cbbeff357a1f186a0e28cdf..3fc507c20730f3ecfe9b7fce75d6217da78d1de7 100644
GIT binary patch
literal 4256
zcmV;R5MS?iPew8T0RR9101%)63jhEB03SpE01!|B0RR9100000000000000000000
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
CbOtN{

literal 4044
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

diff --git a/src/component/Account/account.vue b/src/component/Account/account.vue
index 22c98b30..769032b7 100644
--- a/src/component/Account/account.vue
+++ b/src/component/Account/account.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="account_page">
-		<div class="account_page_titleImg">
+		<!-- <div class="account_page_titleImg">
 			<img src="https://code-create.com.hk/wp-content/uploads/2022/12/about_banner-1.jpg" alt="">
-		</div>
+		</div> -->
 		<div class="account_page_content_box">
 			<div class="account_page_content">
 				<div class="account_page_content_left">
diff --git a/src/component/Account/accountFollowFans.vue b/src/component/Account/accountFollowFans.vue
index fcf02785..ad07ff36 100644
--- a/src/component/Account/accountFollowFans.vue
+++ b/src/component/Account/accountFollowFans.vue
@@ -130,6 +130,9 @@ export default defineComponent({
 	}
 	.account_followFans_body{
 		padding-bottom: 3rem;
+		:deep(.ant-badge){
+			font-size: var(--aida-fsize2);
+		}
 		:deep(.ant-tabs-nav){
 			padding: 0rem 5rem;
 			.ant-tabs-nav-wrap{
diff --git a/src/component/Account/accountMessage.vue b/src/component/Account/accountMessage.vue
index 853a89c6..02c17606 100644
--- a/src/component/Account/accountMessage.vue
+++ b/src/component/Account/accountMessage.vue
@@ -193,6 +193,9 @@ export default defineComponent({
 	}
 	.account_message_body{
 		padding-bottom: 3rem;
+		:deep(.ant-badge){
+			font-size: var(--aida-fsize2);
+		}
 		:deep(.ant-tabs-nav){
 			padding: 0rem 5rem;
 			.ant-tabs-nav-wrap{
diff --git a/src/component/Account/followFans/fans.vue b/src/component/Account/followFans/fans.vue
index d786ee2b..21650c47 100644
--- a/src/component/Account/followFans/fans.vue
+++ b/src/component/Account/followFans/fans.vue
@@ -15,7 +15,7 @@
 						<img :src="item.avatar" alt="">
 					</div>
 					<div class="account_generalMessage_item_right_title">
-						<div class="">{{ item.senderUserName }}</div>
+						<div class="">{{ item.userName }}</div>
 						<div class="modal_title_text_intro">{{ item.createTime }}</div>
 					</div>
 				</div>
@@ -88,14 +88,15 @@ export default defineComponent({
 		}
 		let setFollow = (item:any) =>{
 			let url = Https.httpUrls.porfolioFollow
-			if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
+			// if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
 			Https.axiosGet(url, {params:{followeeId:item.senderId}})
 			.then((rv) => {
-				if(item.isFollow == 1){
-					item.isFollow = 0
-				}else{
-					item.isFollow = 1
-				}
+				searchFollowFansList()
+				// if(item.isFollow == 1){
+				// 	item.isFollow = 0
+				// }else{
+				// 	item.isFollow = 1
+				// }
 			})
 		}
 		let openOtherUsers = (item:any)=>{
diff --git a/src/component/Account/followFans/follow.vue b/src/component/Account/followFans/follow.vue
index 7e00003e..f326a31e 100644
--- a/src/component/Account/followFans/follow.vue
+++ b/src/component/Account/followFans/follow.vue
@@ -16,7 +16,7 @@
 						<img :src="item.avatar" alt="">
 					</div>
 					<div class="account_generalMessage_item_right_title">
-						<div class="">{{ item.senderUserName }}</div>
+						<div class="">{{ item.userName }}</div>
 						<div class="modal_title_text_intro">{{ item.createTime }} </div>
 					</div>
 				</div>
@@ -88,15 +88,17 @@ export default defineComponent({
 			})
 		}
 		let setFollow = (item:any) =>{
-			let url = Https.httpUrls.porfolioFollow
-			if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
+			// let url = Https.httpUrls.porfolioFollow
+			// if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
+			let url = Https.httpUrls.porfolioCancelFollow
 			Https.axiosGet(url, {params:{followeeId:item.senderId}})
 			.then((rv) => {
-				if(item.isFollow == 1){
-					item.isFollow = 0
-				}else{
-					item.isFollow = 1
-				}
+				searchFollowFansList()
+				// if(item.isFollow == 1){
+				// 	item.isFollow = 0
+				// }else{
+				// 	item.isFollow = 1
+				// }
 			})
 		}
 		let openOtherUsers = (item:any)=>{
diff --git a/src/component/Administrator/questionnaire.vue b/src/component/Administrator/questionnaire.vue
index 4d32a0a9..07ef49ae 100644
--- a/src/component/Administrator/questionnaire.vue
+++ b/src/component/Administrator/questionnaire.vue
@@ -134,7 +134,6 @@ export default defineComponent({
 				Https.axiosGet(Https.httpUrls.getAllQuestionnaire).then((res:any)=>{
 					if(res){
 						dataList.value = res
-						console.log(dataList);
 						// console.log(allEchartsList.value);
 						
 						resolve('')
diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue
index 0ca0d747..b4687e9f 100644
--- a/src/component/Administrator/recentActiveUser.vue
+++ b/src/component/Administrator/recentActiveUser.vue
@@ -273,7 +273,6 @@ export default defineComponent({
 				if (rv) {
 					// this.dataList = rv
 					filter.dataList = rv.records
-					console.log(rv);
 					filterData.total = rv.total
 					filter.tableLoading = false
 					
diff --git a/src/component/Administrator/trialUserConversionRateChart.vue b/src/component/Administrator/trialUserConversionRateChart.vue
index 71e6fd42..4fa3ce00 100644
--- a/src/component/Administrator/trialUserConversionRateChart.vue
+++ b/src/component/Administrator/trialUserConversionRateChart.vue
@@ -51,9 +51,6 @@ export default defineComponent({
                     let data: any = [];
 					for (let [key, value] of entries) {
 						let str 
-						console.log(key);
-						
-						
 						if(key != 'conversionRate'){
 							if(key == 'trialToOfficialCount'){
 								str = 'Trial To Official'
diff --git a/src/component/Detail/DesignElementsMobile.vue b/src/component/Detail/DesignElementsMobile.vue
index 62b8534f..251396d8 100644
--- a/src/component/Detail/DesignElementsMobile.vue
+++ b/src/component/Detail/DesignElementsMobile.vue
@@ -452,8 +452,6 @@ export default defineComponent({
 				if(sketch.offsetHeight < item.location[1]/sketchNum){
 					top = sketch.offsetHeight +'px'
 				}
-				console.log(sketch.offsetWidth,this.sketch.width.replace(/rem/g,''));
-				
 				this.printStyleList[index]={
 					centers:{
 						left:0,
diff --git a/src/component/Detail/addDetails.vue b/src/component/Detail/addDetails.vue
index a78c6a81..75238731 100644
--- a/src/component/Detail/addDetails.vue
+++ b/src/component/Detail/addDetails.vue
@@ -1,7 +1,7 @@
 <template>
     <a-modal
         class="addDetails_modal generalModel"
-        v-model:visible="showPayOrder"
+        v-model:visible="addDetails"
         :footer="null"
         width="50%"
         :maskClosable="false"
@@ -21,350 +21,40 @@
 				<div>{{ $t('addDetails.AddDetails') }}</div>
 				<div class="modal_title_text_intro"></div>
 			</div>
-			<div class="addDetails_canvasCenter">
-				<div class="addDetails_center_btn addDetails_center_item" :class="{spread:spreadState}">
-					<!-- <div @click="setOperation('')" class="addDetails_center_btn_item">
-						<div>新增</div>
-					</div> -->
-					<i class="icon iconfont icon-chehui" @click="historyState('')"></i>
-					<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i>
-					<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:canvasState == 'move'}"></i>
-					<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:canvasState == 'pencil'}"></i>
-					<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}"></i>
-					<input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
-					<!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> -->
-				</div>
-				<div class="exportCanvasBox_center_box">
-					<div class="exportCanvasBox_center">
-						<!-- <div class="editFrontBack_bgImg" v-show="loadingShow">
-							<img :src="imgData?.undividedLayer" alt="">
-						</div> -->
-					</div>
-					<div class="editFrontBack_pencilbtn" v-show="loadingShow" :style="pencilbtnStyle"></div>
-				</div>
-			</div>
-			
-			<div class="exportCanvasBox_submit" @click="setSubmit">
-				<div class="started_btn">
-					{{ $t('addDetails.submit') }}
-				</div>
-			</div>
-			
+			<generalMiniCanvas :imgUrl="imgUrl" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
 		</div>
 		<div></div>
     </a-modal>
-	<!-- <div class="mark_loading" v-show="loadingShow">
-		<a-spin size="large" />
-	</div> -->
 </template>
 <script>
 import { defineComponent, ref, reactive, watch, onMounted, nextTick, toRefs } from "vue";
-import { Https } from "@/tool/https";
-import { formatTime } from "@/tool/util";
-import { setCookie, getCookie } from "@/tool/cookie";
-import { Modal, message } from "ant-design-vue";
-import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import allOrder from "@/component/Pay/allOrder.vue";
-import creditsDetail from "@/component/Pay/creditsDetail.vue";
-import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
-import { useI18n } from "vue-i18n";
-import { getMousePosition } from "@/tool/mdEvent";
+import generalMiniCanvas from "../modules/generalMiniCanvas.vue";
 export default defineComponent({
     components: {
-		creditsDetail,
-		allOrder,
+		generalMiniCanvas,
     },
 	emits: ['setSloganData'],
     setup(props,{emit}) {
-        let presentState = ref('paypal');
-        let showPayOrder = ref(false);
-        let loadingShow = ref(false);
-        let { t } = useI18n();
-        let canvas = reactive({});
-		let scale = 2;
-		let ratio = [1,1]
-		let exportWH = 512
-		let pencilbtnStyle = ref({
-			background:'',
-			width:0+'px',
-			height:0+'px',
-			display:'none',
-			left:0+'px',
-			top:0+'px',
-		})
-		let canvasBtn = reactive({
-			canvasState:'move',
-			canvasPencilWidth:{
-				pencil:4,
-				eraser:4,
-			},
-			spreadState:false,
-		})
-		let canvasWH = ref(0);
-		onMounted(()=>{
-		})
-		let exportUrl = ''
-		let reverseCanvasState = ref([])//存放canvas操作
-		let normalCanvasState = ref([])//存放canvas操作
-		let canvasState = ref()//存放canvas操作
-		let keyDown = []//监听键盘的 keydown 和 keyup 事件
+        let addDetail = reactive({
+			imgUrl:''
+		});
+        let addDetails = ref(false);
 		let init = (data,index)=>{
-			normalCanvasState.value = []
-			reverseCanvasState.value = []
-            showPayOrder.value = true;
-			ratio = [1,1]
-			exportWH = 512
-			nextTick(()=>{
-				let canvasBox = document.querySelector(".addDetails_modal .exportCanvasBox_center");
-				document.removeEventListener('mousemove', mouseMove);
-				document.removeEventListener('touchmove', touchmove);
-				let img = new Image();
-
-				img.onload = function(){
-					loadingShow.value = true
-					let height = canvasBox.offsetHeight;
-					canvasWH.value = height
-					canvasBox.style.width = height+'px'
-					let wScale = 1
-					let hScale = 1
-					if(img.width>img.height){
-						hScale = img.height/img.width
-						exportWH = img.width
-					}else{
-						wScale = img.width/img.height
-						exportWH = img.height
-					}
-					ratio = [wScale,hScale]
-					canvas = canvasGeneral.canvasInit(canvasBox,{
-						width:canvasWH.value * wScale,
-						height:canvasWH.value * hScale,
-					})
-					scale = img.height/canvas.height
-					pencilbtnStyle.value.background = rgba
-					
-					fabric.Object.prototype.cornerSize = 10
-					fabric.Object.prototype.transparentCorners = false 
-					exportUrl = data.path
-					fabric.Image.fromURL(data.path, function(img) {
-						// 设置背景图对象的宽度和高度与 canvas 相同
-						img.scaleToWidth(canvas.width);
-						img.scaleToHeight(canvas.height);
-						img.set({
-							scaleX: canvas.width / img.width,
-							scaleY: canvas.height / img.height
-						});
-						// 将背景图添加到 canvas 的底层
-						canvas.setBackgroundImage(img, canvas.renderAll.bind(canvas));
-						if(!fabric.Object.prototype.controls.deleteControl){
-							JSSetRemoveImage(deleteObj)
-						}else{
-							fabric.Object.prototype.controls.deleteControl.mouseUpHandler = deleteObj
-						}
-						setPencilWidth()
-						updateCanvasState()
-					},{ crossOrigin: "Anonymous" });
-					// 鼠标抬起事件
-					canvas.on('mouse:up', function(event) {
-						if(canvasBtn.canvasState != 'move'){
-							updateCanvasState('mouseUp')
-						}
-					});
-
-					//画布上移动
-					document.addEventListener('mousemove', mouseMove);
-					document.addEventListener('touchmove', touchmove);
-					setOperation('pencil')
-					img.remove()
-				}
-				img.src = data.path
-				
-			})
+			addDetails.value = true
+			addDetail.imgUrl = data.path
         }
-		let canvasKeyDown = (event) => {
-			if(keyDown.indexOf(event.key)>-1){
-			}else{
-				keyDown.push(event.code)
-				if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1 && keyDown.indexOf('ShiftLeft') > -1){
-					historyState('reverse')
-				}else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1){
-					historyState('')
-				}
-			}
-		}
-		let canvasKeyUp = (event) =>{
-				keyDown = keyDown.filter(function(item) {
-					return event.code !== item;
-				})
-				
-			}
-		let clearCanvas = ()=>{
-		    canvasBtn.canvasState = 'move'
-		    canvasBtn.spreadState = false
-			document.removeEventListener("keydown", canvasKeyDown);
-			document.removeEventListener("keyup", canvasKeyUp);
-		}
-		let rgba = 'rgba(0, 0, 0, 1)'
-		let mouseMove = (event)=>{
-			let e = getMousePosition(event,false)
-			setCanvasMove(e)
-		}
-		let touchmove = (event)=>{
-			let e = getMousePosition(event,true)
-			setCanvasMove(e)
-		}
-		let setCanvasMove = (event)=>{
-			if(canvas.isDrawingMode){
-				canvas.setCursor('none');
-			}
-			let canvasCenterBox = document.querySelector(".addDetails_modal .exportCanvasBox_center_box");
-			if(!canvasCenterBox)return
-			let parentX = event.clientX - canvasCenterBox.getBoundingClientRect().left
-			let parentY = event.clientY - canvasCenterBox.getBoundingClientRect().top
-			pencilbtnStyle.value.left = parentX + "px"
-			pencilbtnStyle.value.top =  parentY+'px'
-		}
-		let setOperation = (str)=>{
-			canvasBtn.canvasState = str
-			if(str == 'move'){
-				setMove()
-				pencilbtnStyle.value.display = `none`
-			}else if(str == 'pencil'){
-				setPencil()
-				pencilbtnStyle.value.display = `block`
-			}else if(str == 'eraser'){
-				setEraser()
-				pencilbtnStyle.value.display = `block`
-			}
-		}
-		let setMove = ()=>{
-			canvas.isDrawingMode = false
-			canvas.forEachObject((obj) =>obj.selectable = true);
-		}
-		let setPencil = ()=>{
-			canvas.isDrawingMode = true//开启绘画模式
-			canvas.freeDrawingBrush = new fabric.PencilBrush(canvas,{});
-			canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]);
-			canvas.freeDrawingBrush.color = rgba
-			pencilbtnStyle.value.background = rgba
-			canvas.freeDrawingBrush.isEraser = false
-			setPencilWidth()
-		}
-		let setEraser = ()=>{
-			canvas.isDrawingMode = true
-			let eraser = new fabric.EraserBrush(canvas)
-            canvas.freeDrawingBrush = eraser
-			canvas.requestRenderAll();
-			canvas.freeDrawingBrush.isEraser = true
-			pencilbtnStyle.value.background = `rgb(255,255,255)`
-			canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]);
-			setPencilWidth()
-		}
-		let deleteObj = ()=> {
-			// if(!canvas.getActiveObjects()){
-			// 	return
-			// }
-			let target = canvas.getActiveObjects()
-			target.forEach((item)=>{
-				canvas.fxRemove(item, {
-					onComplete(){
-					canvas.discardActiveObject(); // 丢弃当前选中的对象
-					canvas.renderAll(); // 重新渲染 Canvas
-					}
-				})
-				canvas.FX_DURATION = 300
-			})
-		}
-		let setTimeOutWidth
-		let setPencilWidth = ()=>{//切换颜色给铅笔设置颜色
-			clearTimeout(setTimeOutWidth)
-			setTimeOutWidth = setTimeout(()=>{
-				canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState])
-				pencilbtnStyle.value.height = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
-				pencilbtnStyle.value.width = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
-			},300)
-		}
-		let updateCanvasState = (str) =>{
-			if(str != 'mouseUp'){
-			}
-			const canvasAsJson = JSON.stringify(canvas.toJSON());
-			normalCanvasState.value.push(canvasAsJson);
-		}
-		//撤回
-		let historyState = (str)=> {
-			if(str == 'reverse' && reverseCanvasState.value.length > 0){//反撤回
-				let obj = reverseCanvasState.value.pop()
-				// canvasState.value = reverseCanvasState.value[reverseCanvasState.value.length-1]
-				canvasState.value = obj 
-				normalCanvasState.value.push(obj);
-			}else if(str == '' && normalCanvasState.value.length > 1){
-				let obj = normalCanvasState.value.pop()
-				canvasState.value = normalCanvasState.value[normalCanvasState.value.length-1]
-				reverseCanvasState.value.push(obj);
-			}else{
-				return
-			}
-			canvas.loadFromJSON(canvasState.value, () => {});
-		}
-		let setSubmit = ()=>{
-			var allObjects = canvas.getObjects('path');
-			// if(allObjects.length == 0){
-			// 	return message.info(t('addDetails.jsContent1'))
-			// }
-			var canvasDom = document.createElement("canvas");
-			let exportCanvas = new fabric.Canvas(canvasDom, {
-				backgroundColor: "rgba(255, 255, 255,1)",
-				width: exportWH * ratio[0],
-				height: exportWH * ratio[1],
-				isDrawingMode: false, // 开启绘图模式
-			});
-			canvas.backgroundImage.clone((back)=>{
-				back.set({
-					scaleX:1,
-					scaleY:1,
-					left:back.left*scale,
-					top:back.top*scale ,
-				})
-				exportCanvas.backgroundImage = back
-				allObjects.forEach((item,index)=>{
-					// let obj = fabric.util.object.clone(item);
-					if(item.type == 'circle')return
-					let obj 
-					item.clone((cloned)=>{
-						obj = cloned
-					})
-					obj.set(
-						{
-							scaleX:(item.scaleX?item.scaleX:1)*scale,
-							scaleY:(item.scaleY?item.scaleY:1)*scale,
-							left:item.left*scale,
-							top:item.top*scale,
-						}
-					)
-					exportCanvas.add(obj)
-				})
-				let data = exportCanvas.toDataURL('jpg')
-				cancelDsign()
-				clearCanvas()
-				emit('setSloganData',data)
-			})
+		let submitBase64Data = (data)=>{
+			emit('setSloganData',data)
+			cancelDsign()
 		}
 		let cancelDsign = ()=>{
-			document.removeEventListener('keydown',canvasKeyDown);
-			document.removeEventListener('keyup', canvasKeyUp);
-			showPayOrder.value = false
+			addDetails.value = false
 		}
         return {
-            presentState,
-            showPayOrder,
-			loadingShow,
-            t,
-			pencilbtnStyle,
-			...toRefs(canvasBtn),
+			...toRefs(addDetail),
+			addDetails,
 			init,
-			setOperation,
-			setPencilWidth,
-			historyState,
-			setSubmit,
+			submitBase64Data,
 			cancelDsign,
         };
     },
@@ -385,135 +75,10 @@ export default defineComponent({
     }
 	.addDetails_center{
 		position: relative;
-		// width: calc(512px / 2);
-		// width: 256px;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
-		// height: calc(512px / 2);
 		margin: 0 auto;
-		.addDetails_center_item{
-			// position: relative;
-			background: #fff;
-			position: absolute;
-			
-			display: flex;
-			border: 0.2rem solid #c4c4c4;
-			width: 25rem;
-			border-radius: 4px; /* 设置圆角半径 */
-			flex-wrap: wrap;
-			.addDetails_center_btn_item{
-				display: flex;
-				align-items: center;
-				padding: 1rem 0;
-			}
-		}
-		.addDetails_center_btn{
-				z-index: 2;
-				// left: 50%;
-				// transform: translate(-50%,-135%);
-				// transition: all .3s;
-				padding: 1rem 1.5rem;
-				// transform: translate(-50%,0);
-				position: relative;
-				width: 100%;
-				flex-direction: row;
-				input{
-					// width: 100%;
-					// margin-top: 1rem;
-					flex: 1;
-				}
-				.icon-xiala{
-					position: absolute;	
-					width: 2rem;
-					bottom: 0;
-					transform: translate(-50%, 90%);
-					left: 50%;
-					width: 6rem;
-					background: #fff;
-					text-align: center;
-					cursor: pointer;
-					&.icon-xiala::before{
-						transition: all .3s;
-					}
-					&.btnRotate::before{
-						transform: rotate(180deg);
-						display: block;
-					}
-				}
-				i{
-					font-size: 2.5rem;
-					cursor: pointer;
-					width: 4rem;
-					height: 4rem;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					&.active{
-						border: 1px solid;
-						border-radius: .4rem;
-					}
-				}
-				&.spread{
-					transform: translate(-50%,0);
-				}
-			}
-		.addDetails_canvasCenter{
-			flex: 1;
-			overflow: hidden;
-			display: flex;
-			flex-direction: column;
-			position: relative;
-			margin: 0 auto;
-		}
-		.exportCanvasBox_center_box{
-			padding: 3rem;
-			height: 100%;
-			flex: 1;
-			position: relative;
-			width: 100%;
-			background: #e6e6e6;
-			&:hover{
-				cursor: none;
-			}
-			.editFrontBack_pencilbtn{
-				position: absolute;
-				z-index: 1;
-				border-radius: 50%;
-				border: 1px solid #000;
-				pointer-events: none;
-				transform: translate(-50%,-50%);
-			}
-		}
-		.exportCanvasBox_center{
-			height: 100%;
-			flex: 1;
-			position: relative;
-			overflow: hidden;
-			background: #e6e6e6;
-			// overflow: scroll;
-			.canvas-container{
-				left: 50%;
-				top: 50%;
-				transform: translate(-50%,-50%);
-			}
-			.editFrontBack_pencilbtn{
-				position: absolute;
-				z-index: 1;
-				border-radius: 50%;
-				border: 1px solid #000;
-				pointer-events: none;
-				transform: translate(-50%,-50%);
-			}
-		}
-		.exportCanvasBox_center:hover{
-			.addDetails_center_btn{
-				// transform: translate(-50%,-101%);
-				// &.spread{
-				// 	transform: translate(-50%,0);
-				// }
-			}
-		}
 	}
 	.exportCanvasBox_submit{
 		margin-top: 2.4rem;
diff --git a/src/component/Detail/editFrontBack.vue b/src/component/Detail/editFrontBack.vue
index 2463ea68..9ec8f77b 100644
--- a/src/component/Detail/editFrontBack.vue
+++ b/src/component/Detail/editFrontBack.vue
@@ -36,6 +36,7 @@ import creditsDetail from "@/component/Pay/creditsDetail.vue";
 import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
 import { getMousePosition } from "@/tool/mdEvent";
 import { useI18n } from "vue-i18n";
+import canvasGeneral from "@/tool/canvasGeneral";
 export default defineComponent({
     components: {
 		creditsDetail,
@@ -68,6 +69,7 @@ export default defineComponent({
 			if(newVal == -1) return
 			imgDomIndex = newVal
 			props.patchData.front.imageUrl=  ''
+			clearTimeout(setTimeSubmit)
 			init(props.patchData.front[newVal],'')
 		})
 		let canvasBtn = reactive({
@@ -92,14 +94,12 @@ export default defineComponent({
 			imgData.value = data
 			nextTick(()=>{
 				let canvasBox = document.querySelector(".editFrontBack_center .exportCanvasBox_center");
-				var canvasDom = document.createElement("canvas");
 				document.addEventListener("keydown", canvasKeyDown);
 				document.addEventListener("keyup", canvasKeyUp);
 				document.removeEventListener('mousemove', mouseMove);
 				document.removeEventListener('touchmove', touchmove);
-				canvasBox.appendChild(canvasDom);
 				let img = new Image();
-				img.onload = function(){
+				img.onload = async function(){
 					loadingShow.value = true
 					let height = canvasBox.offsetHeight;
 					canvasWH.value = height
@@ -124,32 +124,36 @@ export default defineComponent({
 					fabric.Object.prototype.cornerSize = 10
 					fabric.Object.prototype.transparentCorners = false 
 					exportUrl = data.maskUrl
-					fabric.Image.fromURL(data.maskUrl, function(img) {
-						// 设置背景图对象的宽度和高度与 canvas 相同
-						img.scaleToWidth(canvas.width);
-						img.scaleToHeight(canvas.height);;
-						img.set({
-							// width: canvas.width,
-							// height: canvas.height,
-							// scaleX:2,
-							// scaleY:1,
-							scaleX: canvas.width / img.width,
-							scaleY: canvas.height / img.height
-						});
-						// 将背景图添加到 canvas 的底层
-						// canvas.add(img);
-						canvas.setBackgroundImage(img, canvas.renderAll.bind(canvas));
-						if(!fabric.Object.prototype.controls.deleteControl){
-							JSSetRemoveImage(deleteObj)
-						}else{
-							fabric.Object.prototype.controls.deleteControl.mouseUpHandler = deleteObj
-						}
-						setPencilWidth()
-						updateCanvasState()
-					},{ crossOrigin: "Anonymous" });
+					await new Promise((resolve, reject) => {
+						fabric.Image.fromURL(data.maskUrl, function(img) {
+							// 设置背景图对象的宽度和高度与 canvas 相同
+							img.scaleToWidth(canvas.width);
+							img.scaleToHeight(canvas.height);;
+							img.set({
+								// width: canvas.width,
+								// height: canvas.height,
+								// scaleX:2,
+								// scaleY:1,
+								scaleX: canvas.width / img.width,
+								scaleY: canvas.height / img.height
+							});
+							// 将背景图添加到 canvas 的底层
+							// canvas.add(img);
+							canvas.setBackgroundImage(img, canvas.renderAll.bind(canvas));
+							if(!fabric.Object.prototype.controls.deleteControl){
+								JSSetRemoveImage(deleteObj)
+							}else{
+								fabric.Object.prototype.controls.deleteControl.mouseUpHandler = deleteObj
+							}
+							setPencilWidth()
+							updateCanvasState()
+							resolve('')
+						},{ crossOrigin: "Anonymous" });
+					})
+					
 					// 鼠标抬起事件
 					canvas.on('mouse:up', function(event) {
-							if(canvasBtn.canvasState != 'move'){
+						if(canvasBtn.canvasState != 'move'){
 							updateCanvasState('mouseUp')
 						}
 					});
@@ -286,16 +290,16 @@ export default defineComponent({
 		}
 		let setTimeSubmit = null
 		let createSetTimeSubmit = ()=>{
-			clearTimeout(setTimeSubmit)
-			setTimeSubmit = setTimeout(()=>{
-				setSubmit()
-			},1000)
+			setSubmit()
 		}
 		let updateCanvasState = (str) =>{
 			if(str != 'mouseUp'){
 				// editFrontBackPencilbtn.value.style.display = 'none'
 			}else{
-				createSetTimeSubmit()
+				clearTimeout(setTimeSubmit)
+				setTimeSubmit = setTimeout(()=>{
+					createSetTimeSubmit()
+				},1000)
 			}
 			const canvasAsJson = JSON.stringify(canvas.toJSON());
 			normalCanvasState.value.push(canvasAsJson);
@@ -505,6 +509,7 @@ export default defineComponent({
 		height: 100%;
 		flex: 1;
 		position: relative;
+		overflow: hidden;
 		width: 100%;
 		background: #e6e6e6;
 		&:hover{
diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue
index b64c2ea7..7d9391cb 100644
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -85,8 +85,6 @@ export default defineComponent({
 			Https.axiosGet(data.https).then(
                 (rv: any) => {
 					if(rv){
-						console.log(rv);
-						
 						message.success(data.success)
 						filter.loadingShow[index] = false
 					}
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index d4580c9c..9ecd4d34 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -47,7 +47,6 @@
 							class="exportCanvasBox_allItem"
 							v-for="(item,key) in allBoardData"
 						>	
-
 							<div v-if="item[0] && key == 'disposeMoodboard'" class="exportCanvasBox_intro">Entirety Moodboard</div>
 							<div v-if="item[0] && key == 'printboardFiles'" class="exportCanvasBox_intro">Printboard</div>
 							<div v-if="item[0] && key == 'moodboardFiles'" class="exportCanvasBox_intro">Moodboard</div>
@@ -64,10 +63,9 @@
 										<div>{{colorItem.name}}</div>
 									</div>
 								</div>
-								
 							</div>
-
 							<div
+								v-if="key != 'moodboardPosition'"
 								class="exportCanvasBox_item"
 								v-for="imgItem in item"
 								:class="[key == 'disposeMoodboard'?'exportCanvasBox_item_dispose':'',imgItem?.upScaleChecked?'active':'']"
@@ -83,27 +81,29 @@
 					</div>
 				</div>
 				<div class="exportCanvasBox_operation_bor_item exportCanvasBox_left_tool_item_column">
-					<label v-show="operation != 'move' && operation != 'eraser' && operation != 'texture'">
+					<div class="label_item" v-show="operation != 'move' && operation != 'eraser' && operation != 'texture'">
 						<div >{{ $t('exportModel.Color') }}</div>
 						<input type="color" @input="setPencilColor" v-model="canvasPencilColor">
-					</label>
-					<label v-show="operation != 'move'">
+						<div class="labelHover_show exportCanvasBox_imgbor">
+							<div v-for="item in colorHistoryList" :style="{'background':item}" @click="setColorHistory(item)"></div>
+						</div>
+					</div>
+					<div class="label_item" v-show="operation != 'move'">
 						<div >{{ $t('exportModel.Size') }}:</div>
 						<input @change="setFontFamily" type="range" @input="setPencilWidth" min="3" max="50" v-model="canvasPencilWidth[operation]">
-					</label>
-					<label v-show="operation == 'pencil'">
+					</div>
+					<div class="label_item" v-show="operation == 'pencil'">
 						<div >{{ $t('exportModel.Brushwork') }}:</div>
 						<a-select ref="select" class="label_select" size="small" v-model:value="brushworkValue"
 							style="flex: 1"
 							@change="brushworkChange"
 							>
-							<!-- v-model:value="brushwork" -->
 							<a-select-option class="label_select_item" v-for="item in brushList" :value="item.value">
 								<img :src="item.url" alt="">
 							</a-select-option>
 						</a-select>
-					</label>
-					<label v-show="operation == 'texture'" class="texture">
+					</div>
+					<div class="label_item texture" v-show="operation == 'texture'">
 						<div >{{ $t('exportModel.Texture') }}:</div>
 						<a-select ref="select" class="label_select" size="small" v-model:value="textureValue"
 							style="flex: 1"
@@ -114,15 +114,15 @@
 								<img :src="item.url" alt="">
 							</a-select-option>
 						</a-select>
-					</label>
-					<label v-show="operation != 'pencil' && operation != 'eraser'&&operation != 'move'&&operation != 'text'&&operation != 'texture'&&operation != ''">
+					</div>
+					<div class="label_item" v-show="operation != 'pencil' && operation != 'eraser'&&operation != 'move'&&operation != 'text'&&operation != 'texture'&&operation != ''">
 						<div >{{ $t('exportModel.FillBack') }}:</div>
 						<div class="exportCanvasBox_left_tool_item leftAlign">
 							<i class="icon iconfont icon-tuceng1" @click="setOperationMode('fill')" :class="{active:operationMode == 'fill'}"></i>
 							<i class="icon iconfont icon-tuceng" @click="setOperationMode('border')" :class="{active:operationMode == 'border'}"></i>
 						</div>
-					</label>
-					<label v-show="operation === 'move'">
+					</div>
+					<div class="label_item" v-show="operation === 'move'">
 						<div >{{ $t('exportModel.Layer') }}:</div>
 						<div class="exportCanvasBox_left_tool_item top">
 							<i class="icon iconfont icon-shangyiceng" @click="setLayerIndex('Front')"></i>
@@ -130,12 +130,12 @@
 							<i class="icon iconfont icon-xiayiceng" @click="setLayerIndex('Backwards')"></i>
 							<i class="icon iconfont icon-shangyiceng1" @click="setLayerIndex('Back')"></i>
 						</div>
-					</label>
-					<!-- <label v-show="allSelectWidth > -1 && operation != 'move'">
+					</div>
+					<!-- <div class="label_item" v-show="allSelectWidth > -1 && operation != 'move'">
 						<div >{{ $t('exportModel.Width') }}</div>
 						<input type="number" @input="setAllSelectWidth" v-model="allSelectWidth">
-					</label> -->
-					<label v-show="(operation == '' || operation == 'text' || textDataShow) && operation != 'move'">
+					</div> -->
+					<div class="label_item" v-show="(operation == '' || operation == 'text' || textDataShow) && operation != 'move'">
 						<div>Font Family</div>
 						<a-select ref="select" class="label_select" size="small" v-model:value="fontFamily"
 							style="flex: 1"
@@ -146,11 +146,11 @@
 								{{item.name}}
 							</a-select-option>
 						</a-select>
-					</label>
+					</div>
 					<!-- <label v-show="operation != 'move' && operation != 'eraser' && operation != 'texture'">
 						<div >{{ $t('exportModel.Height') }}</div>
 						<input type="number" @input="setPencilColor" v-model="canvasPencilColor">
-					</label> -->
+					</div> -->
 				</div>
 				<!-- <div class="exportCanvasBox_title" @click.stop="setCloseNav('move')">
 					{{ $t('exportModel.More') }}
@@ -1527,31 +1527,40 @@ export default defineComponent({
 		let setTimeOut = {
 			color:null,
 			width:null,
+			colorHistory:null,
 		}//给切换颜色设置防抖
+		let colorHistoryList = ref(['rgb(0, 0, 0)'])
+		let setColorHistory = (value)=>{
+			canvasPencilColor.value = value
+			pencilColor()
+		}
+		let pencilColor = ()=>{
+			if(createText.set){
+				setFontFamily()
+				return
+			}
+			// brushIndicator.fill = canvasPencilColor.value;
+			if(canvas.freeDrawingBrush.isEraser){
+			}else{
+				pencilbtnStyle.value.background = canvasPencilColor.value
+			}
+			if(brushworkValue.value == 'Marking'){
+				canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.5);
+			}else if(brushworkValue.value == 'InkBrush'){
+				canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.2);
+			}else{
+				canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,1);
+			}
+		}
 		let setPencilColor = ()=>{//切换颜色给铅笔设置颜色
 			clearTimeout(setTimeOut.color)
+			clearTimeout(setTimeOut.colorHistory)
 			setTimeOut.color = setTimeout(()=>{
-				if(createText.set){
-					setFontFamily()
-					return
-				}
-				// brushIndicator.fill = canvasPencilColor.value;
-				
-				if(canvas.freeDrawingBrush.isEraser){
-
-				}else{
-					pencilbtnStyle.value.background = canvasPencilColor.value
-				}
-				if(brushworkValue.value == 'Marking'){
-					canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.5);
-				}else if(brushworkValue.value == 'InkBrush'){
-					canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.2);
-				}else{
-					canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,1);
-				}
-
-
-			},100)
+				pencilColor()
+			},200)
+			setTimeOut.colorHistory = setTimeout(()=>{
+				colorHistoryList.value.push(canvasPencilColor.value)
+			},1000)
 		}
 		let setPencilWidth = ()=>{//切换颜色给铅笔设置颜色
 			clearTimeout(setTimeOut.width)
@@ -1956,7 +1965,6 @@ export default defineComponent({
 		let submitLiquefaction = (rv)=>{
 			const originalWidth = liquefactionData.width * liquefactionData.scaleX; // 保存原始宽度
 			const originalHeight = liquefactionData.height * liquefactionData.scaleY; // 保存原始高度
-			console.log(liquefactionData);
 			liquefactionData.setSrc(rv, function() {
 				liquefactionData.scaleToWidth(originalWidth);
 				liquefactionData.scaleToHeight(originalHeight);
@@ -1971,7 +1979,6 @@ export default defineComponent({
 				liquefactionData = activeObjects[0]
 				liquefaction.value.init(activeObjects[0])
 			} else {
-				console.log('No object selected.');
 				message.info(useI18.t('exportModel.jsContent6'))
 				return null;
 			}
@@ -2031,6 +2038,8 @@ export default defineComponent({
 			canvasPencilWidth,//input选择宽度
 			setAllSelectWidth,//多选设置宽度
 			allSelectWidth,//多选设置宽度的值
+			colorHistoryList,//历史颜色
+			setColorHistory,//设置历史颜色
 			setPencilColor,//切换颜色执行函数 给当前矩形或者笔触设置颜色
 			setPencilWidth,//切换宽度执行函数 给当前矩形或者笔触设置宽度
 			setHDExport,//高清导出选择的图片
@@ -2192,7 +2201,7 @@ export default defineComponent({
 			.exportCanvasBox_left_tool{
 				margin: 0;
 			}
-			label {
+			.label_item,label {
                 display: flex;
 				align-items: center;
 				width: 23%;
@@ -2340,8 +2349,29 @@ export default defineComponent({
 				flex: 1;
 				margin-left: 8rem;
 				display: flex;
-				label{
+				.label_item{
 					margin-right: 2rem;
+					position: relative;
+					.labelHover_show{
+						position: absolute;
+						width: 100%;
+						height: 10rem;
+						top: 100%;
+						z-index: 2;
+						flex-wrap: wrap;
+						div{
+							width: 3rem;
+							height: 3rem;
+							margin-right: 1rem;
+							margin-bottom: 1rem;
+							cursor: pointer;
+						}
+					}
+				}
+				.label_item:hover{
+					.labelHover_show{
+						display: flex;
+					}
 				}
 			}
 			.exportCanvasBox_left_tool_item{
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 3f7156ec..298188db 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -114,7 +114,7 @@
 						</a-upload>
 					</i>
 					<div :title="$t('Generate.style')">
-						<generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel"></generalMenu>
+						<generalMenu :dataList="printModelList" :isCanvas="type_.type2 == 'Sketchboard'" @setprintModel="setprintModel" :item="printModel"></generalMenu>
 					</div>
 				</div>
 				<textarea 
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index 39b4b676..ca3ee6e0 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -440,7 +440,9 @@ export default defineComponent({
 				// let layout:any = isMoible() ? this.$refs.layoutMobile : this.$refs.layout
 				let layout:any = this.$refs.layout
 				if(this.layoutList.length <= 0){
-					// await this.layout()
+					let styleObj = this.store.state.UploadFilesModule.moodboardPosition
+					if(!styleObj.domStyle)await this.layout()
+					// 
 					let arr = JSON.parse(JSON.stringify(this.store.state.UploadFilesModule.moodboard))
 					this.layoutList = arr
 				}
diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue
index 7b8b1685..7ab90c50 100644
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -66,6 +66,7 @@ import ColorboardUpload from '@/component/HomePage/ColorboardUpload.vue'
 import SketchboardUpload from '@/component/HomePage/SketchboardUpload.vue'
 import MarketingSketchUpload from '@/component/HomePage/MarketingSketchUpload.vue'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { rgbToHsv, dataURLtoBlob } from "@/tool/util";
 import { Modal,message } from 'ant-design-vue';
 import { Https } from "@/tool/https";
 import {useStore} from 'vuex'
@@ -83,7 +84,13 @@ export default defineComponent({
         SketchboardUpload,
         MarketingSketchUpload
     },
-	setup(){
+	props:{
+		getDesignData: {
+			type: Function,
+			required: true
+		}
+	},
+	setup(props){
 		const store = useStore()
 		let {t} = useI18n()
 		let driver__:any = computed(()=>{
@@ -285,9 +292,46 @@ export default defineComponent({
 			})
 			return bor
 		},
+		getPantongName() {
+			let colorBoards = this.store.state.UploadFilesModule.colorBoards;
+			let data: any = [];
+			for (let v of colorBoards) {
+				let color: any = [v.rgbValue.r, v.rgbValue.g, v.rgbValue.b];
+				let hsv = rgbToHsv(color);
+				v.hsv = hsv[0] + hsv[1] + hsv[2];
+				data.push({
+					h: hsv[0],
+					s: hsv[1],
+					v: hsv[2],
+				});
+			}
+			
+			return new Promise((resolve: any, reject: any) => {
+				Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data)
+					.then((rv: any) => {
+						if (rv) {
+							rv.forEach((ele: any, index: number) => {
+								colorBoards[index].id = ele.id;
+								colorBoards[index].tcx = ele.tcx;
+								colorBoards[index].name = ele.name;
+							});
+							this.store.commit("setColorboardList", colorBoards);
+							resolve();
+						}
+					})
+					.catch((res) => {
+						reject();
+					});
+			});
+		},
         //完成
         async finishCollection(){
 			this.isShowMark = true
+			this.store.commit('clearAllId')
+			this.$emit('finishCollection')
+			await this.getPantongName()
+			this.store.commit("setAllBoardData");
+
 			let sketchList = this.store.state.UploadFilesModule.sketchboard
 			let arr:any = []
 			sketchList.forEach((item:any) => {
@@ -299,12 +343,14 @@ export default defineComponent({
 				}
 				arr.push(obj)
 			});
-			let data = {sketchBoards:arr}
+			// let data = {sketchBoards:arr}
+			let data = this.getDesignData(-1)
+			data.moodboardPosition = JSON.stringify(this.store.state.UploadFilesModule.moodboardPosition)
+			data.collectionId = this.store.state.HomeStoreModule.designCollectionId?this.store.state.HomeStoreModule.designCollectionId:null
 			if(!await this.isPinOpen(sketchList)){
 				this.isShowMark = false
 				return
 			}
-			
 			let elList = document.querySelectorAll('.img_block_item_sketch img')
 			Https.axiosPost(Https.httpUrls.sketchBoardsBoundingBox, data)
 				.then((rv: any) => {
@@ -314,7 +360,6 @@ export default defineComponent({
 					GO.id = 0
 					this.showCollectionModal =false
 					this.collectionStep = 1
-					this.$emit('finishCollection')
 					if(this.driver__.driver){
 						driverObj__.moveNext()
 					}
diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue
index c78df66c..4a051d62 100644
--- a/src/component/HomePage/generalMenu.vue
+++ b/src/component/HomePage/generalMenu.vue
@@ -1,17 +1,21 @@
 <template>
 	<div class="generalMenu_printModel">
 		<div @click.stop="openPrintModel" :class="driverClass.class1">
-			<a-popover>
+			<a-popover v-if="isCanvas">
 				<template #content>
 					<img style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
 				</template>
 				<span v-if="item.label">{{ item.label }}</span>
 				<span v-else>{{ item.name }}</span>
 			</a-popover>
+			<div v-else>
+				<span v-if="item.label">{{ item.label }}</span>
+				<span v-else>{{ item.name }}</span>
+			</div>
 		</div>
 		<ul :class="driverClass.class2" v-show="openClick">
 			<li v-for="item,index in dataList" :class="{active:deleteItem == index}" class="printModel_item" @click="setprintModel(item,index)">
-				<a-popover placement="right">
+				<a-popover placement="right" v-if="isCanvas">
 					<template #content>
 						<img v-if="item.img != -1" style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
 						<div v-else-if="item.img == -1" class="generalMenu_printModel_upload ">
@@ -37,7 +41,10 @@
 					<span v-if="item.label">{{ item.label }}</span>
 					<span v-else>{{ item.name }}</span>
 				</a-popover>
-				
+				<div v-else>
+					<span v-if="item.label">{{ item.label }}</span>
+					<span v-else>{{ item.name }}</span>
+				</div>
 			</li>
 		</ul>
 	</div>
@@ -64,6 +71,10 @@ import { message, Upload, Modal } from "ant-design-vue";
 			 type:Boolean,
 			 default:false,
 		 },
+		 isCanvas:{
+			 type:Boolean,
+			 default:false,
+		 },
 		 deleteItem:{
 			type:Number,
 			default:-1
diff --git a/src/component/HomePage/layout.vue b/src/component/HomePage/layout.vue
index 06be050d..6744a228 100644
--- a/src/component/HomePage/layout.vue
+++ b/src/component/HomePage/layout.vue
@@ -140,9 +140,7 @@ export default defineComponent({
 		let layoutList:any = ref([])
 		const content:any = ref<HTMLElement | null>(null);
 		let loadingShow = ref(false)
-		let styleObj:any = computed(()=>{
-			return store.state.UploadFilesModule.moodboardPosition
-		})
+		let styleObj:any = {}
 		let moodItemScale = ref(0)
 		let domObj = {
 			dom:['img','ul','.layout_rotote','.layout_translate','.layout_angle_tr','.layout_angle_tl','.layout_angle_br','.layout_angle_bl'],
@@ -692,6 +690,7 @@ export default defineComponent({
     methods: {
 		init(){
 			let parentList:any = this.$parent
+			this.styleObj = this.store.state.UploadFilesModule.moodboardPosition
 			parentList = parentList.layoutList
 			this.layout = true
 			// let layoutList = this.store.state.UploadFilesModule.moodboard
@@ -756,7 +755,7 @@ export default defineComponent({
 					zIndex: obj['z-index']?obj['z-index']:1
 				}
 			});
-			const sortedNums = nums.sort((a, b) => a.zIndex - b.zIndex);
+			const sortedNums = nums.sort((a:any, b:any) => a.zIndex - b.zIndex);
 			
 			GO.zIndex = sortedNums.length + 1
 			// GO.zIndex = sortedNums[sortedNums.length - 1].zIndex + 1
@@ -817,8 +816,9 @@ export default defineComponent({
         //提交模板
         submitTemplate() {
 			this.loadingShow = true
+			this.setDomStyle()
 			this.styleObj.domStyle = this.setIndex(this.styleObj.domStyle)//index统一排序设置值
-			this.store.commit("setDisposeMoodboardPosition", this.styleObj);
+			this.store.commit("setDisposeMoodboardPosition", JSON.parse(JSON.stringify(this.styleObj)));
 			this.layoutList.forEach((v:any)=>{
 				v.setPitch = false
 			})
@@ -841,7 +841,6 @@ export default defineComponent({
 							this.loadingShow = false
 							this.store.commit("setDisposeMoodboard", rv);
 
-							this.setDomStyle()
 
 						}
 					).catch(rv=>{
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index 84e9bbd1..77dad3b3 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -110,7 +110,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="scaleImage_nav" @keydown="handleKeyDown">
+		<div class="scaleImage_nav">
 			<div class="nav_left">
 				<i class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
 			</div>
@@ -163,7 +163,7 @@ export default defineComponent({
 	},
     setup(props:any,{emit}) {
 		const store = useStore();
-		
+		let {t} = useI18n()
 		let productimg = reactive({
 			isProductimg:false,
 			productimgSearchName:'',
@@ -301,12 +301,34 @@ export default defineComponent({
 				});
 			}
 		}
-		let submitBase64Data = (rv:any)=>{
+		let submitBase64Data = async (rv:any)=>{
 			loadingShow.value = true
+			let isOverlay = false
+			await new Promise<void>((resolve, reject) => {
+				Modal.confirm({
+					title: t('scaleImage.overlayOrNot'),
+					icon: createVNode(ExclamationCircleOutlined),
+					okText: 'Yes',
+					cancelText: 'No',
+					mask:false,
+					centered:true,
+					onOk() {
+						resolve()
+						isOverlay = true
+
+					},
+					onCancel(){
+						isOverlay = false
+						resolve()
+					}
+				});
+			})
 			let data = {
 				"base64": rv,
 				"category": scaleImageList.value[scaleImageIndex.value]?.categoryValue,
 				"gender": props.workspace.sexEnum.value,
+				"originalId":scaleImageList.value[scaleImageIndex.value]?.id,
+				"isOverride":isOverlay,
 			}
 			Https.axiosPost(Https.httpUrls.modifySketch, data).then(
 				(rv) => {
@@ -314,25 +336,9 @@ export default defineComponent({
 					rv.status = 'Success'
 					rv.category = scaleImageList.value[scaleImageIndex.value]?.category
 					rv.categoryValue = scaleImageList.value[scaleImageIndex.value]?.categoryValue
-					delete rv.url
-					Modal.confirm({
-						title: useI18n().t('scaleImage.overlayOrNot'),
-						icon: createVNode(ExclamationCircleOutlined),
-						okText: 'Yes',
-						cancelText: 'No',
-						mask:false,
-						centered:true,
-						onOk() {
-							scaleImageList.value[scaleImageIndex.value] = rv
-							loadingShow.value = false
-							scaleImage.value = false
-						},
-						onCancel(){
-							scaleImageList.value.unshift(rv)
-							loadingShow.value = false
-							scaleImage.value = false
-						}
-					});
+					isOverlay?(scaleImageList.value[scaleImageIndex.value] = rv):(scaleImageList.value.unshift(rv))
+					loadingShow.value = false
+					scaleImage.value = false
 				}
 			).catch(res=>{
 				loadingShow.value = false
diff --git a/src/component/modules/generalCanvas.vue b/src/component/modules/generalCanvas.vue
index e4e0c837..b827995d 100644
--- a/src/component/modules/generalCanvas.vue
+++ b/src/component/modules/generalCanvas.vue
@@ -1,20 +1,23 @@
 <template>
 	<div class="generalCanvas">
 		<div class="generalCanvas_left">
-			<label>
+			<div class="label_item">
 				<div>{{ $t('exportModel.Height') }}:</div>
 				<input type="number" @input="setMaxInput('height', 30000)" v-model="canvasWH.height" />
-			</label>
+			</div>
 			<div class="generalCanvas_operation_bor_item generalCanvas_left_tool_item_column">
-				<label v-show="operation != 'move' && operation != 'eraser' && operation != 'texture'">
+				<div class="label_item" v-show="operation != 'move' && operation != 'eraser' && operation != 'texture'">
 					<div >{{ $t('exportModel.Color') }}</div>
 					<input type="color" @input="setPencilColor" v-model="canvasPencilColor">
-				</label>
-				<label v-show="operation != 'move'">
+					<div class="labelHover_show exportCanvasBox_imgbor">
+						<div v-for="item in colorHistoryList" :style="{'background':item}" @click="setColorHistory(item)"></div>
+					</div>
+				</div>
+				<div class="label_item" v-show="operation != 'move'">
 					<div >{{ $t('exportModel.Size') }}:</div>
 					<input @change="setFontFamily" type="range" @input="setPencilWidth" min="3" max="50" v-model="canvasPencilWidth[operation]">
-				</label>
-				<label v-show="operation == 'pencil'">
+				</div>
+				<div class="label_item" v-show="operation == 'pencil'">
 					<div >{{ $t('exportModel.Brushwork') }}:</div>
 					<a-select ref="select" class="label_select" size="small" v-model:value="brushworkValue"
 						style="flex: 1"
@@ -24,8 +27,8 @@
 							<img :src="item.url" alt="">
 						</a-select-option>
 					</a-select>
-				</label>
-				<label v-show="operation == 'texture'" class="texture">
+				</div>
+				<div class="label_item texture" v-show="operation == 'texture'">
 					<div >{{ $t('exportModel.Texture') }}:</div>
 					<a-select ref="select" class="label_select" size="small" v-model:value="textureValue"
 						style="flex: 1"
@@ -35,15 +38,15 @@
 							<img :src="item.url" alt="">
 						</a-select-option>
 					</a-select>
-				</label>
-				<label v-show="operation != 'pencil' && operation != 'eraser'&&operation != 'move'&&operation != 'text'&&operation != 'texture'&&operation != ''">
+				</div>
+				<div class="label_item" v-show="operation != 'pencil' && operation != 'eraser'&&operation != 'move'&&operation != 'text'&&operation != 'texture'&&operation != ''">
 					<div >{{ $t('exportModel.FillBack') }}:</div>
 					<div class="generalCanvas_left_tool_item leftAlign">
 						<i class="icon iconfont icon-tuceng1" @click="setOperationMode('fill')" :class="{active:operationMode == 'fill'}"></i>
 						<i class="icon iconfont icon-tuceng" @click="setOperationMode('border')" :class="{active:operationMode == 'border'}"></i>
 					</div>
-				</label>
-				<label v-show="operation === 'move'">
+				</div>
+				<div class="label_item" v-show="operation === 'move'">
 					<div >{{ $t('exportModel.Layer') }}:</div>
 					<div class="generalCanvas_left_tool_item top">
 						<i class="icon iconfont icon-shangyiceng" @click="setLayerIndex('Front')"></i>
@@ -51,8 +54,8 @@
 						<i class="icon iconfont icon-xiayiceng" @click="setLayerIndex('Backwards')"></i>
 						<i class="icon iconfont icon-shangyiceng1" @click="setLayerIndex('Back')"></i>
 					</div>
-				</label>
-				<label v-show="(operation == '' || operation == 'text' || textDataShow) && operation != 'move'">
+				</div>
+				<div class="label_item" v-show="(operation == '' || operation == 'text' || textDataShow) && operation != 'move'">
 					<div>Font Family</div>
 					<a-select ref="select" class="label_select" size="small" v-model:value="fontFamily"
 						style="flex: 1"
@@ -62,7 +65,7 @@
 							{{item.name}}
 						</a-select-option>
 					</a-select>
-				</label>
+				</div>
 			
 			</div>
 		</div>
@@ -83,10 +86,10 @@
 						<!-- <i class="icon iconfont icon-circle" @click="setOperation('circle')" :class="{active:operation == 'circle'}"></i> -->
 						<i class="icon iconfont icon-sanjiaoxing" @click="setOperation('triangle')" :class="{active:operation == 'triangle'}"></i>
 						<i class="icon iconfont icon-tx-fill-tuoyuanxing" @click="setOperation('ellipse')" :class="{active:operation == 'ellipse'}"></i>
-						<label class="uploadImage">
+						<div class="label_item uploadImage">
 							<i class="icon iconfont icon-shangchuantupian" ></i>
 							<input type="file" @change="uploadImage">
-						</label>
+						</div>
 						<i class="icon iconfont" @click="setOperation('text')" :class="{active:operation == 'text'}">T</i>
 				</div>
 			</div>
@@ -100,7 +103,7 @@
 	</div>
 </template>
 <script>
-import {defineComponent, computed, h, ref, nextTick, inject, reactive, onMounted,
+import {defineComponent, computed, h, ref, nextTick, onBeforeUnmount, reactive, onMounted,
 } from "vue";
 import { Https } from "@/tool/https";
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -759,31 +762,40 @@ export default defineComponent({
 		let setTimeOut = {
 			color:null,
 			width:null,
+			colorHistory:null,
 		}//给切换颜色设置防抖
+		let colorHistoryList = ref(['rgb(0, 0, 0)'])
+		let setColorHistory = (value)=>{
+			canvasPencilColor.value = value
+			pencilColor()
+		}
+		let pencilColor = ()=>{
+			if(createText.set){
+				setFontFamily()
+				return
+			}
+			// brushIndicator.fill = canvasPencilColor.value;
+			if(canvas.freeDrawingBrush.isEraser){
+			}else{
+				pencilbtnStyle.value.background = canvasPencilColor.value
+			}
+			if(brushworkValue.value == 'Marking'){
+				canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.5);
+			}else if(brushworkValue.value == 'InkBrush'){
+				canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.2);
+			}else{
+				canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,1);
+			}
+		}
 		let setPencilColor = ()=>{//切换颜色给铅笔设置颜色
 			clearTimeout(setTimeOut.color)
+			clearTimeout(setTimeOut.colorHistory)
 			setTimeOut.color = setTimeout(()=>{
-				if(createText.set){
-					setFontFamily()
-					return
-				}
-				// brushIndicator.fill = canvasPencilColor.value;
-				
-				if(canvas.freeDrawingBrush.isEraser){
-
-				}else{
-					pencilbtnStyle.value.background = canvasPencilColor.value
-				}
-				if(brushworkValue.value == 'Marking'){
-					canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.5);
-				}else if(brushworkValue.value == 'InkBrush'){
-					canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,.2);
-				}else{
-					canvas.freeDrawingBrush.color = hexToRgba(canvasPencilColor.value,1);
-				}
-
-
-			},100)
+				pencilColor()
+			},200)
+			setTimeOut.colorHistory = setTimeout(()=>{
+				colorHistoryList.value.push(canvasPencilColor.value)
+			},1000)
 		}
 		let setPencilWidth = ()=>{//切换颜色给铅笔设置颜色
 			clearTimeout(setTimeOut.width)
@@ -1000,6 +1012,9 @@ export default defineComponent({
 			fontFamily.value = arr[0].value
 			init()
 		});
+		onBeforeUnmount(()=>{
+			canvasGeneral.canvasClear()
+		})
         return {
 			toSvg,
 			t,
@@ -1029,6 +1044,8 @@ export default defineComponent({
 			canvasPencilWidth,//input选择宽度
 			setAllSelectWidth,//多选设置宽度
 			allSelectWidth,//多选设置宽度的值
+			colorHistoryList,//历史颜色
+			setColorHistory,//设置历史颜色
 			setPencilColor,//切换颜色执行函数 给当前矩形或者笔触设置颜色
 			setPencilWidth,//切换宽度执行函数 给当前矩形或者笔触设置宽度
 			brushworkChange,//切换笔触的回调
@@ -1173,7 +1190,7 @@ export default defineComponent({
 			align-items: flex-start;
 			position: relative;
 			flex-direction: row;
-			>label{
+			>.label_item{
 				width: 20%;
 			}
 			.generalCanvas_title {
@@ -1273,8 +1290,29 @@ export default defineComponent({
 				flex: 1;
 				margin-left: 8rem;
 				display: flex;
-				label{
+				.label_item{
 					margin-right: 2rem;
+					position: relative;
+					.labelHover_show{
+						position: absolute;
+						width: 100%;
+						height: 10rem;
+						top: 100%;
+						z-index: 2;
+						flex-wrap: wrap;
+						div{
+							width: 3rem;
+							height: 3rem;
+							margin-right: 1rem;
+							margin-bottom: 1rem;
+							cursor: pointer;
+						}
+					}
+				}
+				.label_item:hover{
+					.labelHover_show{
+						display: flex;
+					}
 				}
 			}
 			.generalCanvas_left_tool_item{
diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue
index f8f37f90..ba4b80f6 100644
--- a/src/component/modules/generalMiniCanvas.vue
+++ b/src/component/modules/generalMiniCanvas.vue
@@ -30,7 +30,7 @@
 	</div>
 </template>
 <script>
-import { defineComponent, ref, reactive, watch, onMounted, nextTick, toRefs } from "vue";
+import { defineComponent, ref, reactive, watch, onMounted, onBeforeUnmount, nextTick, toRefs } from "vue";
 import { Https } from "@/tool/https";
 import { formatTime } from "@/tool/util";
 import { setCookie, getCookie } from "@/tool/cookie";
@@ -98,6 +98,9 @@ export default defineComponent({
 		onMounted(()=>{
 			init()
 		})
+		onBeforeUnmount(()=>{
+			canvasGeneral.canvasClear()
+		})
 		let reverseCanvasState = ref([])//存放canvas操作
 		let normalCanvasState = ref([])//存放canvas操作
 		let canvasState = ref()//存放canvas操作
@@ -460,6 +463,7 @@ export default defineComponent({
 		height: 100%;
 		flex: 1;
 		position: relative;
+		overflow: hidden;
 		width: 100%;
 		background: #e6e6e6;
 		&:hover{
diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts
index 3f4c4e2b..3f9478ab 100644
--- a/src/store/uploadFile/uploadFile.ts
+++ b/src/store/uploadFile/uploadFile.ts
@@ -61,6 +61,8 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
         },
 		setDisposeMoodboardPosition(state,files){
 			state.moodboardPosition = files
+			console.log(state.moodboardPosition);
+			
         },
 		setMoodboardGenerateFiles(state,files){
 			state.moodboardGenerateFiles = files
diff --git a/src/tool/canvasGeneral.js b/src/tool/canvasGeneral.js
index edf694c0..8e238de3 100644
--- a/src/tool/canvasGeneral.js
+++ b/src/tool/canvasGeneral.js
@@ -104,7 +104,6 @@ class myCanvas {
 		this.canvas.on("object:added", (event)=>{
 			if(!this.isLoadCanvas)this.updateCanvasState('')
 		});
-
 		return this.canvas
 	}
 
@@ -135,10 +134,8 @@ class myCanvas {
 	canvasClear(){
 		let oldCanvasDom = this.canvasDomParent.querySelector('.canvas-container')
 		let oldCanvasDom1 =  this.canvasDomParent.querySelector('canvas')
-	
 		if(oldCanvasDom)oldCanvasDom.remove()
 		if(oldCanvasDom1)oldCanvasDom1.remove()
-
 		document.removeEventListener("keydown", this.canvasKeyDown);
 		document.removeEventListener("keyup", this.canvasKeyUp);
 	
diff --git a/src/tool/domTurnImg.js b/src/tool/domTurnImg.js
index 074be9db..48dab3cc 100644
--- a/src/tool/domTurnImg.js
+++ b/src/tool/domTurnImg.js
@@ -30,7 +30,6 @@ function base64ToFile(base64,filename) {
    
    // 创建 File 对象
    const file = new File([byteArray], filename, { type: 'image/jpeg' }); // 根据需要的类型进行修改
-   console.log(file);
    return file;
 }
 	//base64转成blob
diff --git a/src/tool/webSocket.js b/src/tool/webSocket.js
index 44b1274f..f455ff42 100644
--- a/src/tool/webSocket.js
+++ b/src/tool/webSocket.js
@@ -7,7 +7,6 @@ class MyWs {
 		this.messageUrl = http+'/notification'
 	}
 	linkWs(url) {
-		console.log(this.ws && this.ws.readyState == 1);
 		if (this.ws && this.ws.readyState == 1) return
 		this.ws = new WebSocket(url)
 		this.ws.onmessage = (e)=>{
@@ -17,14 +16,11 @@ class MyWs {
 				console.error('websocket',error)
 			}
 		}
-		console.log(this.ws);
 	}
 	static receiveText(data,call){
-		console.log('receive',data);
 		MyEvent.emit('getMessage',data)
 	}
 	sendMessage(data) {
-		console.log(this);
 		if (this.ws && this.ws.readyState == 1) {
 			let obj = {
 				cmd: 1,
@@ -50,7 +46,6 @@ class MyWs {
 		}
 	}
  	send(obj) {
-		console.log(2323);
 		this.ws.send(JSON.stringify(obj))
 	}
 	close(){
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 114fc983..46b99014 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -596,7 +596,8 @@ export default defineComponent({
 						// 	this.$router.push("/home")
 						// }
 						this.store.commit('clearAllData')
-						window.location.reload()
+						// window.location.reload()
+						window.location.href = '/home';
                     }
 				}
 			})
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 23dc4baf..11d0ea3f 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -195,7 +195,7 @@
 			</div>
 		</div>
 		<KeepAlive>
-			<CollectionModal ref="collectionModal" @finishCollection="finishCollection()"></CollectionModal>
+			<CollectionModal :getDesignData="getDesignData" ref="collectionModal" @finishCollection="finishCollection()"></CollectionModal>
 		</KeepAlive>
 		<productImg ref="productImg" @setTask="setTask"></productImg>
 		<DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail>
@@ -616,53 +616,9 @@ export default defineComponent({
 		},
 		//完成设计
 		finishCollection() {
-			let _this = this;
-			_this.isFinishLoading = true;
-			this.getPantongName()
-				.then((res) => {
-					_this.store.commit("setAllBoardData");
-					_this.isHaveReviewCollection = true;
-					_this.isFinishLoading = false;
-				})
-				.catch((res) => {
-					_this.isFinishLoading = false;
-				});
+			this.isHaveReviewCollection = true;
+			this.isFinishLoading = false;
 		},
-
-		//查询颜色的潘通值和txc
-		getPantongName() {
-			let colorBoards = this.store.state.UploadFilesModule.colorBoards;
-			let data: any = [];
-			for (let v of colorBoards) {
-				let color: any = [v.rgbValue.r, v.rgbValue.g, v.rgbValue.b];
-				let hsv = rgbToHsv(color);
-				v.hsv = hsv[0] + hsv[1] + hsv[2];
-				data.push({
-					h: hsv[0],
-					s: hsv[1],
-					v: hsv[2],
-				});
-			}
-			
-			return new Promise((resolve: any, reject: any) => {
-				Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data)
-					.then((rv: any) => {
-						if (rv) {
-							rv.forEach((ele: any, index: number) => {
-								colorBoards[index].id = ele.id;
-								colorBoards[index].tcx = ele.tcx;
-								colorBoards[index].name = ele.name;
-							});
-							this.store.commit("setColorboardList", colorBoards);
-							resolve();
-						}
-					})
-					.catch((res) => {
-						reject();
-					});
-			});
-		},
-
 		getContainer() {
 			return document.querySelector("#system_silder");
 		},
@@ -781,11 +737,16 @@ export default defineComponent({
 				timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
 				processId:this.designRandom
 			};
-			if (designCollectionId) {
+			let isLoad = false
+			if(designCollectionId == -1){
+				isLoad = true
+			} else if (designCollectionId) {
 				data.collectionId = designCollectionId;
 			}
-			this.designProgress = 0;
-			this.showDesignMark = true;
+			if(!isLoad){
+				this.designProgress = 0;
+				this.showDesignMark = true;
+			}
 			return data;
 		},
 
@@ -1001,7 +962,7 @@ export default defineComponent({
 						name:data.collection.moodTemplateName,
 					}
 				}]:[],
-				moodboardPosition:data.collection.moodboardPosition?data.collection.moodboardPosition:{},
+				moodboardPosition:data.collection.moodboardPosition?JSON.parse(data.collection.moodboardPosition):{},
 				moodboardFiles: this.dealViewChooseData(
 					data.collection.moodBoards,"Moodboard"
 				),
diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue
index 70b9ddd8..0837d07b 100644
--- a/src/views/HomeView/history.vue
+++ b/src/views/HomeView/history.vue
@@ -324,8 +324,6 @@ export default defineComponent({
 							this.store.commit("setAllBoardDataChoose",{});
 							this.store.commit("clearShowSketchboard",{});
 						}
-						console.log(this.store.state.HomeStoreModule.userGroupId,record);
-						
                     }
                 );
             }
diff --git a/src/views/emailVerify.vue b/src/views/emailVerify.vue
index cd85df7c..e40fb566 100644
--- a/src/views/emailVerify.vue
+++ b/src/views/emailVerify.vue
@@ -1,32 +1,33 @@
 <template>
-    <div class="emailVerify" :class="{'active': forbid}">
+    <div class="emailVerify">
         <main class="main">
-            <h1 id="title">Welcome</h1>
-            <p id="description" v-if="!forbid">Please take the survey</p>
-            
+            <div class="survey-form">
+				<h1 id="title"><span>√</span>邮箱修改成功</h1>
+				<div class="text">
+					<p id="description">您的新邮箱为：*********************</p>
+				</div>
+				<div class="mark_loading" v-show="!isSucceed">
+				</div>
+			</div>
         </main>
     </div>
+	<div class="mark_loading" v-show="isShowMark">
+		<a-spin size="large" />
+	</div>
 </template>
 
 <script lang="ts">
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Modal,message } from 'ant-design-vue';
+import { useRoute } from 'vue-router';
 import { Https } from "@/tool/https";
 import { defineComponent, toRefs,ref, reactive, createVNode } from "vue";
 export default defineComponent({
     setup() {
+		const route = useRoute();
         let feedbackData:any = reactive({
-			userName:'',
-			gender:'Female',
-			occupation:'',
-			country:'',
-			email:'',
-			age:'20-30',
-			helpful:[],
-			improve:[],
-			isSubscribe:'',
-			reasonForNotSubscribe:[],
-			designTools:'',
+			isShowMark:false,
+			isSucceed:false,
 		});
 		let setSubmit = (value:any)=>{
 			Https.axiosPost(Https.httpUrls.questionnaire, value).then(
@@ -36,12 +37,10 @@ export default defineComponent({
 			).catch(res=>{
 			});
 		}
-		let forbid = ref(false)
 		
         return {
             ...toRefs(feedbackData),
             setSubmit,
-			forbid,
         };
     },
 
@@ -63,73 +62,58 @@ export default defineComponent({
     text-align: center;
     line-height: 1.5;
     // background: linear-gradient(180deg, #f3f3e6 0%, #eee4f3 100%);
-    margin: 1rem;
-	height: 100%;
 	overflow-y: auto;
-	&.active{
-		#title {
-			font-size: 3rem;
-		}
-		#description {
-			font-size: 1.4rem;
-		}
-		#survey-form {
-			width: 90%;
-			padding: 1.5rem;
-			font-size: 1.2rem;
-		}
-		p{
-			font-size: 1.4rem;
-		}
-		input,
-		#dropdown {
-			padding: 5px;
-		}
-
-		textarea {
-			max-height: 125px;
-			padding: 5px;
-		}
-		input[type="radio"],
-		input[type="checkbox"] {
-			width: 1rem;
-			height: 1rem;
-		}
-		input,select{
-			height: 3.5rem;	
-		}
+	*{
+		padding: 0;
+		margin: 0;
 	}
 	.main{
 		background: linear-gradient(45deg, #eee4f3, #f3f4e6);
-		padding: 2rem;
+		// background: #f5f5f5;
+		width: 100vw;
+		height: 100vh;
 	}
     #title {
         font-size: 6rem;
         margin: 0;
 		font-weight: 900;
     }
-
-    #description {
-        font-size: 2.8rem;
-        font-style: italic;
-    }
-	
-    #survey-form {
-        position: relative;
-        background: rgba(255, 255, 255, 0.2);
-        width: 60%;
-        left: 50%;
-        transform: translateX(-50%);
-        text-align: left;
-        border-radius: 15px;
-        padding: 3rem;
-        box-shadow: -1px 1px 5px 0.5px;
-        font-size: 2.4rem;
-        display: flex;
-        flex-wrap: wrap;
-		justify-content: space-between;
-		&.active{
-			transition: width 1s ease;
+	#title{
+		display: flex;
+		align-items: center;
+		span{
+			background: #39215b;
+			width: 8rem;
+			height: 8rem;
+			border-radius: 50%;
+			color: #fff;
+			display: block;
+			font-size: 6rem;
+			line-height: 8rem;
+			text-align: center;
+			margin: 10px;
+		}
+	}
+    .survey-form {
+		position: relative;
+		background: rgba(255, 255, 255);
+		width: 50%;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		font-size: 2.4rem;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		border-radius: 2rem;
+		padding: 4rem 0;
+		.mark_loading{
+			background: #fff;
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
 		}
     }
 	
@@ -138,117 +122,9 @@ export default defineComponent({
             width: 75%;
         }
     }
-    h2 {
-        width: 100%;
-		font-weight: 900;
-    }
-    .section {
-        display: flex;
-        flex-direction: column;
-        margin: 1rem;
-        width: 100%;
-    }
-	.section:last-child{
-		margin-bottom: 4rem;
-	}
-    .w40 {
-        width: 40%;
-    }
-	.fontColor{
-		color: rgb(255, 2, 2);
-	}
+    
 	p{
 		font-size: 2.8rem;
 	}
-    p,
-    label {
-        font-weight: bold;
-        margin: 0;
-        margin-left: 5px;
-    }
-	
-    input,
-    #dropdown {
-        border: none;
-        border-radius: 5px;
-        padding: 10px;
-        outline: 0;
-    }
-
-    input:focus,
-    #dropdown:focus {
-        border: 2px solid rgb(173, 173, 173);
-    }
-	input,select{
-		height: 7rem;	
-	}
-    input,
-    button,
-    select,
-    textarea {
-		cursor: pointer;
-        font-family: inherit;
-        font-size: inherit;
-    }
-
-    input[type="radio"],
-    input[type="checkbox"] {
-        display: inline-block;
-        width: 2rem;
-        height: 2rem;
-        vertical-align: middle;
-        margin: 0;
-    }
-	label{
-		vertical-align: baseline;
-		cursor: pointer;
-		.others-input{
-			background: rgba(255, 255, 255, 0);
-			border-top: none;
-			border-right: none;
-			border-left: none;
-			border-radius: 0;
-			border-bottom: 2px solid;
-		}
-		.others-input:focus{
-			border: none;
-			border-bottom: 2px solid;
-		}
-		span{
-			vertical-align: top;
-		}
-		textarea{
-			width: 80%;
-			vertical-align: top;
-			margin-left: 1rem;
-
-		}
-	}
-    textarea {
-        min-height: 75%;
-		max-height: 250px;
-        width: 100%;
-        resize: vertical;
-        border: none;
-        border-radius: 10px;
-        padding: 10px;
-        box-sizing: border-box;
-    }
-
-    #submit {
-        background: green;
-		background: #39215b;
-
-        border: none;
-        border-radius: 10px;
-        color: white;
-        font-size: 3rem;
-        transition: all 0.3s ease-in;
-    }
-
-    #submit:hover {
-        background: darkgreen;
-		background: #543087;
-    }
 }
 </style>
\ No newline at end of file