修复preview修改颜色没有成功问题

src/component/Detail/DesignDetail.vue

@@ -87,7 +87,7 @@
                         </div>
 						<div class="clothes_detail_item clothes_detail_item_print" :class="[current.id?'':'hideCursor']">
                             <div class="clothes_item_header">
-								<i class="fi fi-rs-comments"></i>{{ current.id }}
+								<i class="fi fi-rs-comments"></i>
 								<div>{{ $t('DesignDetail.CurrentPrint') }}</div>
 								<i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i>
 							</div>
@@ -265,6 +265,7 @@ export default defineComponent({
 						num++
 					}
 				});
+				
 				this.designItemDetailNum = num
 				await this.setImgSize()
 				let url = ''

src/component/Detail/DesignDetailAlter.vue

@@ -591,6 +591,7 @@ export default defineComponent({
 			DesignDetailEnd.type_ = 0
 			this.colorFileList = []
 			this.selectColorList = []
+			DesignDetailEnd.sketchImg = {}
 		},
 
 		//切换整体衣服

src/component/Detail/DesignDetailEnd.vue

@@ -295,18 +295,27 @@ export default defineComponent({
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.designSingle, data).then(
 				(rv) => {
+					let bor = false
 					rv.clothes.forEach((item)=>{
-						if(item.id == this.sketchImg.id_){
+						if(item.type != 'body'){
-							designItemDetail.clothes[index].color = item.color
+							if(item.id == designItemDetail.clothes[index].id || item.id == this.sketchImg.id_){
-							designItemDetail.clothes[index].printObject = item.printObject
+								designItemDetail.clothes[index].color = item.color
-							designItemDetail.clothes[index].layersObject = item.layersObject
+								designItemDetail.clothes[index].layersObject = item.layersObject
-							designItemDetail.clothes[index].minIOPath = item.minIOPath
+								designItemDetail.clothes[index].minIOPath = item.minIOPath
-							designItemDetail.clothes[index].path = item.path
+								designItemDetail.clothes[index].path = item.path
-							designItemDetail.clothes[index].id = item.id
+								designItemDetail.clothes[index].id = item.id
-							designItemDetail.clothes[index].type = item.type
+								designItemDetail.clothes[index].type = item.type
-							designItemDetail.clothes[index].priority = zIndex
+								designItemDetail.clothes[index].printObject = item.printObject
+								bor = true
+							}else{
+
+							}
+							if(!designItemDetail.clothes[index].id){
+								designItemDetail.clothes[index].priority = zIndex
+							}
 						}
 					})
+					
 					designItemDetail.currentFullBodyView = rv.currentFullBodyView
 					designItemDetail.ifSubmit = true
 					designItemDetail.clothes.forEach((item,index)=>{

src/component/Detail/setDesignItem.vue

@@ -419,7 +419,6 @@ export default defineComponent({
 							if(item.id === i.id){
 								i.layersObject = item.layersObject
 								i.priority = item.layersObject[0].priority
-							console.log(item,i);
 							}
 						})
 					})

src/component/HomePage/RobotAssist.vue

@@ -339,7 +339,6 @@ export default defineComponent({
 		},
 		removeDriver(index:number){
 			if(this.driver__.driver){
-				driverObj__.destroy();
 				let data = {
 					index : 0,
 					driver : false,
@@ -349,6 +348,10 @@ export default defineComponent({
 				// this.robotInput = false
 				this.createTimer()
 			}
+			console.log('销毁');
+			
+			driverObj__.destroy();
+			// setCookie("isBeginner", false);
 			this.record[index].driver = false
 			sessionStorage.setItem('record', JSON.stringify(this.record));  
 			this.textScroll()

src/router/index.ts

@@ -33,6 +33,11 @@ const routes: Array<RouteRecordRaw> = [
     name: 'library',
     component: _import('LibraryPage')
   },
+  {
+    path: '/trialApproval',
+    name: 'trialApproval',
+    component: _import('trialApproval')
+  },
 ]
 
 const router = createRouter({

src/tool/guide.js

@@ -155,6 +155,7 @@ const driverObj__ = driver({
 			index : driverIndex__,
 			driver : false,
 		}
+		console.log('销毁');
 		store?.commit("setGuide", data);
 		setCookie("isBeginner", false);
 		driverObj__.destroy();//销毁方法
@@ -204,6 +205,7 @@ function removeDiv(element){
 
 const openGuide = () =>{
 	let isBeginner = JSON.parse(getCookie('isBeginner'))
+	console.log(isBeginner);
 	// console.log(isBeginner);
 	let isBeginnerNum = JSON.parse(getCookie('isBeginnerNum')?getCookie('isBeginnerNum'):'0')
 	let data

src/views/HomeView.vue

@@ -299,6 +299,7 @@ export default defineComponent({
 		let driver__:any = computed(()=>{
 			return store.state.Guide.guide
 		})
+		let likeDesignItemIdList = ref([])
 		return {
 			store,
 			likeDesignCollectionList,
@@ -312,7 +313,8 @@ export default defineComponent({
 			isShowOperate,
 			userInfo,
 			t,
-			driver__
+			driver__,
+			likeDesignItemIdList
 		};
 	},
 	data() {
@@ -818,6 +820,7 @@ export default defineComponent({
 							...v,
 							groupDetailId: v.id,
 							designItemUrl: v.designOutfitUrl,
+							designItemId: v.designItemId,
 						};
 						return data;
 					}
@@ -904,8 +907,9 @@ export default defineComponent({
 					driverObj__.moveNext();
 				})
 			}
+			
 			let a = document.createElement("a");
-			this.isShowMark = true;
+			// this.isShowMark = true;
 			let img:any = []
 			await html2canvas(collectionReview, { useCORS: true, scale: 3 }).then(
 				(canvas) => {
@@ -943,6 +947,7 @@ export default defineComponent({
 							num++
 						}
 					}
+					let dataList:any = []
 					this.likeDesignCollectionList.forEach((item:any)=>{
 						let nameTail = item?.designOutfitUrl?.split(".").pop().split("?").shift();
 						let data = {
@@ -953,9 +958,31 @@ export default defineComponent({
 								"." +
 								nameTail,
 						};
+						dataList.push(item.designItemId)
 						img.push(data);
 						index++;
 					})
+					let mannequinList:any = []
+					// Https.axiosPost(Https.httpUrls.designLike, dataList)
+					// 	.then((rv: any) => {
+						// 	})
+					// 	.catch((rv) => {
+					// 	});
+					mannequinList.forEach((item:any) => {
+						let nameTail = item?.imgUrl?.split(".").pop().split("?").shift();
+						let data = {
+							imgUrl: item.imgUrl,
+							name:
+								'mannequin' +
+								index +
+								"." +
+								nameTail,
+						};
+						img.push(data);
+						index++;	
+					});
+					
+					
 
 
 					// a.setAttribute('href', URL.createObjectURL(blob));
@@ -985,9 +1012,6 @@ export default defineComponent({
 			// 		});
 			// 	}
 			// );
-			// console.log(img);
-			
-			return
 			this.downImg(img);
 		},
 

src/views/LoginPage.vue

@@ -454,7 +454,7 @@ export default defineComponent({
                         let token = rv.token;
                         setCookie("token", token);
                         setCookie("isTest", isTest);
-                        setCookie("isBeginner", isBeginner);
+                        setCookie("isBeginner", true);
                         setCookie("isBeginnerNum", 0);
                         setCookie("userInfo", JSON.stringify(rv));
                         this.turnToHomePage();

src/views/trialApproval.vue

@@ -0,0 +1,431 @@
+<template>
+	<div class="history_page">
+	   <div class="page_content">
+		   <img
+			   class="page_content_bg"
+			   src="@/assets/images/homePage/bg.png"
+		   />
+		   <div class="page_content_body">
+			   <HeaderComponent></HeaderComponent>
+			   <div class="history_page_body">
+				   <div class="history_header">{{ $t('HistoryPage.History') }}</div>
+				   <div class="history_table_search">
+					   <a-range-picker class="range_picker" v-model:value="rangePickerValue" :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]" valueFormat="YYYY-MM-DD">
+						   <template #suffixIcon>
+							   <span class="icon iconfont range_picker_icon icon-rili"></span>
+						   </template>
+					   </a-range-picker>
+					   <div class="content_search_block">
+						   <input class="search_input" :placeholder="$t('HistoryPage.inputContent1')" v-model="searchCollectionName"  @keydown.enter="searchHistoryList()">
+						   <div class="search_icon_block" @click="searchHistoryList()"><span class="icon iconfont icon-sousuo"></span></div>
+					   </div>
+				   </div>
+
+				   <div class="history_table_content" ref="historyTable">
+						<a-table :columns="columns" :data-source="collectionList" :scroll="{ y: historyTableHeight }" @change="changePage"
+						:pagination="{
+						   showSizeChanger:true,
+						   current: currentPage,
+						   pageSize:pageSize,
+						   total: total,
+						   showQuickJumper:true,
+						   bordered:false
+						}">
+						 <template #bodyCell="{ column, text, record ,index}">
+							   <div class="operate_list" v-if="column?.Operations">
+								   <div class="operate_item" @click="turnToDetail(record)">{{ $t('HistoryPage.Detail') }}</div>
+								   <div class="operate_item" @click="renameCollection(record,index)">{{ $t('HistoryPage.Rename') }}</div>
+								   <div class="operate_item" @click="retrieveHome(record)">{{ $t('HistoryPage.Retrieve') }}</div>
+								   <div class="operate_item" @click="deleteGroup(record, index)">{{ $t('HistoryPage.Delete') }}</div>
+							   </div>
+						   </template>
+					   </a-table>
+				   </div>
+			   </div>
+		   </div>
+	   </div>
+	   <HistoryDetail ref="historyDetail" :groupDetails="groupDetails" :collectionName="collectionName"></HistoryDetail>
+
+	   <a-modal class="rename_modal_component" 
+		   v-model:visible="renameVisivle" 
+		   :footer="null" 
+		   :title="renameData?.name"
+		   :keyboard="false"
+		   width="56rem"
+		   :maskClosable="false"
+		   :centered="true"
+	   >
+		   <div class="collection_rename_content">
+			   <div class="rename_form_content">
+				   <input class="rename_form_input" :placeholder="$t('HistoryPage.inputContent2')" v-model="newCollectionName" @keydown.enter="confrimRename()">
+			   </div>
+			   <div class="rename_submit_button"  @click="confrimRename()">{{ $t('HistoryPage.Submit') }}</div>
+		   </div>
+	   </a-modal>
+	   <RobotAssist></RobotAssist>
+   </div>
+</template>
+<script lang="ts">
+import { defineComponent,ref,createVNode,computed} from 'vue'
+import HeaderComponent from "@/component/HomePage/Header.vue";
+import HistoryDetail from "@/component/Detail/HistoryDetail.vue";
+import router from '@/router/index'
+import { Https } from "@/tool/https";
+import { formatTime } from "@/tool/util"
+import { Modal,message } from 'ant-design-vue';
+import RobotAssist from "@/component/HomePage/RobotAssist.vue";
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { useI18n } from 'vue-i18n';
+export default defineComponent({
+   components: {
+	   HeaderComponent,
+	   HistoryDetail,
+	   RobotAssist
+   },
+   setup() {
+	   let rangePickerValue:any = ref([])
+	   let renameData:any = ref({}) //修改名字选中的数据
+	   const columns:any = computed(()=>{
+		   return [
+			   { title: useI18n().t('HistoryPage.CollectionsName'), align:'center', ellipsis: true, width: 150, dataIndex: 'name', key: 'collectionName' },
+			   { title: useI18n().t('HistoryPage.UptateTime'), align:'center', ellipsis: true,width: 150, dataIndex: 'updateDate', key: 'updateTime',customRender:(record:any)=>{
+				   let time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+				   return time
+			   }},
+			   { title: useI18n().t('HistoryPage.SketchCounts'), align:'center', ellipsis: true, width: 150, dataIndex: 'sketchCount', key: 'sketchCounts' },
+			   {
+				   title: useI18n().t('HistoryPage.Operations'),
+				   key: 'operation',
+				   align:'center', 
+				   fixed: 'right',
+				   width: 150, 
+				   // slots:{customRender:'action'}
+				   Operations:true,
+			   },
+		   ]
+	   });
+	   let collectionList:any = ref([])
+		let userInfo:any = {}
+	   let {t} = useI18n()
+	   return {
+		   rangePickerValue,
+		   columns,
+		   collectionList,
+		   renameData,
+		   userInfo,
+		   t,
+	   }
+   },
+   data(){
+	   return{
+		   currentPage:1,
+		   pageSize:10,
+		   total:0,
+		   historyTableHeight:0,
+		   newCollectionName:'',
+		   renameVisivle:false,//修改名字弹窗
+		   groupDetails:{},//每个collection的详情
+		   collectionName:'',//选中的名字
+		   searchCollectionName:'',
+	   }
+   },
+   mounted(){
+	   let historyTable:any = this.$refs.historyTable
+	   this.historyTableHeight = historyTable.clientHeight - 130
+	   this.getHistoryList()
+	   if()
+	   router.replace('/login')
+
+   },
+   methods:{
+	   turnToDetail(record:any){
+		   this.groupDetails = record.groupDetails
+		   let historyDetail:any = this.$refs.historyDetail
+		   this.collectionName = record.name
+		   historyDetail.changeDetailShow()
+	   },
+
+
+	   //改变页码
+	   changePage(e:any){
+		   this.currentPage = e.current
+		   this.pageSize = e.pageSize
+		   this.getHistoryList()
+	   },
+
+	   //查询列表
+	   searchHistoryList(){
+			this.currentPage = 1
+			this.getHistoryList()
+	   },
+
+	   getHistoryList(){
+		   let startDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[0]).getTime(): ''
+		   let endDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[1]).getTime(): ''
+		   let data = {
+			   page:this.currentPage,
+			   size:this.pageSize,
+			   collectionName:this.searchCollectionName,
+			   startDate:startDate,
+			   endDate:endDate
+		   }
+		   Https.axiosPost( Https.httpUrls.queryUserGroup, data).then(
+			   (rv: any) => {
+				   this.collectionList = rv.content
+				   this.total = rv.total
+			   }
+		   );
+	   },
+
+	   //删除分组
+	   deleteGroup(record:any,index:number){
+		   let deleteGroupFun = (id:any,index:number) =>{
+			   let data = {
+				   userGroupId:id
+			   }
+			   Https.axiosPost(Https.httpUrls.deleteUserGroup,data).then(
+				   (rv: any) => {
+					   message.success(this.t('HistoryPage.jsContent1'))
+					   this.collectionList.splice(index,1)
+				   }
+			   );
+		   }
+		   Modal.confirm({
+			   title: this.t('HistoryPage.jsContent2'),
+			   icon: createVNode(ExclamationCircleOutlined),
+			   okText: 'Yes',
+			   cancelText: 'No',
+			   centered:true,
+			   mask:false,
+			   onOk() {
+				   deleteGroupFun(record.id,index)
+			   }
+		   });
+	   },
+
+	   //修改名字
+	   renameCollection(record:any,index:number){
+		   this.renameVisivle = true
+		   this.renameData = {
+			   ...record,
+			   index:index
+		   }
+	   },
+
+	   //确定修改名字
+	   confrimRename(){
+		   let data = {
+			   timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+			   userGroupId: this.renameData.id,
+			   userGroupName: this.newCollectionName
+		   }
+		   Https.axiosPost(Https.httpUrls.updateUserGroupName,data).then(
+			   (rv: any) => {
+				   message.success(this.t('HistoryPage.jsContent3'))
+				   this.collectionList[this.renameData.index].name = this.newCollectionName
+				   this.collectionList[this.renameData.index].updateDate = rv.updateDate
+				   this.renameVisivle = false
+				   this.newCollectionName = ''
+				   this.renameData = {}
+			   }
+		   );
+	   },
+
+	   retrieveHome(record:any){
+		   this.$router.push({name:'home',params: {id:record.id}})
+	   }
+   }
+})
+</script>
+<style lang="less">
+.history_page {
+   width: 100%;
+   height: 100%;
+   padding: 0 9rem;
+   overflow: hidden;
+   // min-width: 1440px;
+   position: relative;
+   .page_content {
+	   position: relative;
+
+	   .page_content_bg {
+		   position: absolute;
+		   width: 100%;
+		   height: 100%;
+	   }
+
+	   .page_content_body {
+		   position: absolute;
+		   width: 100%;
+		   height: 100%;
+		   box-sizing: border-box;
+
+		   .history_page_body{
+			   width: 100%;
+			   height: calc(100% - 7rem);
+			   padding: 0 2.5rem 4rem;
+			   box-sizing: border-box;
+
+			   .history_header{
+				   font-size: 1.8rem;
+				   height: 6.3rem;
+				   line-height: 6.3rem;
+				   font-weight: 500;
+				   color: #333333;
+			   }
+
+			   .history_table_search{
+				   display: flex;
+				   align-items: center;
+
+				   .range_picker{
+					   width: 36rem;
+					   height: 4.8rem;
+
+					   .ant-picker-input > input{
+						   font-size: 1.6rem;
+					   }
+
+					   .range_picker_icon{
+						   font-size: 2.2rem;
+					   }
+				   }
+
+				   .content_search_block{
+					   margin-left: 4rem;
+					   display: flex;
+
+					   .search_input{
+						   width: 32.8rem;
+						   padding-left: 1.5rem;
+						   height: 4.8rem;
+						   line-height: 4.6rem;
+						   background: #FFFFFF;
+						   border: 0.1rem solid #F1F1F1;
+						   font-size: 1.6rem;
+						   font-weight: 400;
+
+						   &::placeholder {
+							   color: #C2C2C2;
+						   }
+					   }
+
+					   .search_icon_block{
+						   width: 7.2rem;
+						   height: 4.8rem;
+						   line-height: 4.8rem;
+						   text-align: center;
+						   background: #343579;
+						   cursor: pointer;
+
+						   .icon-sousuo{
+							   font-size: 2rem;
+							   color: #FFFFFF;
+						   }
+					   }
+				   }
+			   }
+
+			   .history_table_content{
+				   margin-top: 2.6rem;
+				   width: 100%;
+				   height: calc(100% - 13.7rem);
+				   background: rgba(255, 255, 255, 0.6);
+				   padding-bottom: 3rem;
+
+				   .ant-table{
+					   background: transparent;
+				   }
+				   
+				   .ant-table-body{
+					   overflow-y: auto !important;
+					   -ms-overflow-style: none;
+					   overflow: -moz-scrollbars-none;
+
+					   &::-webkit-scrollbar { width: 0 !important }
+
+				   }
+
+				   .ant-table-thead > tr > th{
+					   background: #FFFFFF;
+				   }
+
+				   .ant-table-tbody > tr > td{
+					   border: none;
+					   background: transparent;
+
+					   
+				   }
+
+					.ant-table-tbody > tr{
+
+						&:hover > td{
+						   background: #FFFFFF;
+					   }
+					}
+
+					.ant-table-pagination-right{
+						padding-right: 3.5rem;
+					}
+
+				   .operate_list{
+					   display: flex;
+					   align-items: center;
+					   justify-content: space-between;
+					   padding: 0 1rem;
+
+					   .operate_item{
+						   font-size: 1.4rem;
+						   font-family: Roboto;
+						   font-weight: 400;
+						   color: #343579;
+						   cursor: pointer;
+					   }
+				   }
+			   }
+		   }
+	   }
+   }
+
+   
+}
+
+.rename_modal_component{
+
+   .collection_rename_content{
+	   padding:2rem 9.2rem 3rem;
+
+
+	   .rename_form_content{
+
+		   .rename_form_input{
+			   width: 100%;
+			   height: 4.6rem;
+			   margin-top: 1rem;
+			   border: 0.1rem solid #B4BED7;
+			   padding-left: 2.1rem;
+			   line-height: 4.6rem;
+			   font-size: 1.8rem;
+			   box-sizing: border-box;
+
+			   &::placeholder {
+				   color:#A5B0C2,
+			   }
+		   }
+	   }
+
+	   .rename_submit_button{
+		   height: 4.8rem;
+		   line-height: 4.8rem;
+		   background: #343579;
+		   font-size: 2.4rem;
+		   font-weight: 500;
+		   color: #FFFFFF;
+		   width: 16rem;
+		   text-align: center;
+		   cursor: pointer;
+		   margin: 4.5rem auto 0;
+	   }
+   }
+}
+</style>