2023-11-29-dist

src/component/HomePage/MoodboardUpload.vue

@@ -325,6 +325,7 @@ export default defineComponent({
 					type2:'Moodboard'
 				};
 				file.id_ = GO.id++
+				file.id = res.data.id
                 let fileList = this.fileList.filter(
                     (v: any) => v.status === "done"
                 );

src/component/HomePage/NewCollectionReview.vue

@@ -53,7 +53,7 @@
 		<div class="img_block_item img_block_item_sketch">
             <div class="lager_img_item" :class="'lager_img_item'+index" v-for="(item,index) in sketch" :key="item">
 				<div class="all_img_item_block" v-for="v in item" :key="sketch">
-                    <img class="all_img_content" :src="v?.imgUrl">
+                    <img class="all_img_content" :src="v?.urlWithWhiteSide">
 				</div>
             </div>
         </div>
@@ -77,7 +77,8 @@ export default defineComponent({
     setup() {
         const store:any = useStore();
 		let sketch:any = ref([[],[],[]])
-		let sketchList:any = ref([])
+		let sketchList:any = computed(()=>{
+			return store.state.UploadFilesModule.showSketchboard})
         let allBoardData:any = computed(()=>{
 			return store.state.UploadFilesModule.allBoardData})
         return {
@@ -95,9 +96,9 @@ export default defineComponent({
 	watch: {
 		allBoardData:{
 			handler(newVal:any,oldVal:any){
-				this.sketchList = []
+				// this.sketchList = []
 				// this.sketch = [[],[],[]]
-				this.sketchList = this.allBoardData.sketchboardFiles
+				// this.sketchList = this.allBoardData.sketchboardFiles
 				this.setSketch()
 			},
 			immediate: true

src/component/HomePage/PrintboardUpload.vue

@@ -250,12 +250,14 @@ export default defineComponent({
         },
         fileUploadChange(data:any){
             let file = data.file
+			let res = JSON.parse(file.xhr.response);
 			file.id_ = GO.id++
 			file.type_ = {
 				type1:'upload',
 				type2:'Printboard'
 			};
 			file.pin = false;
+			file.id = res.data.id
             let Cropper:any = this.$refs.Cropper
             if(this.currentFileNum === 1){
                 var reader = new FileReader();

src/component/HomePage/SketchboardUpload.vue

@@ -27,7 +27,7 @@
             <div v-show="openClick == 1" class="sketchboard_body">
                 <div class="upload_img_body scroll_style">
                     <div class="upload_item">
-                        <div
+                        <div 
                             class="upload_file_item"
                             v-for="(file, index) in fileList"
                             :key="file"
@@ -347,7 +347,9 @@ export default defineComponent({
 		sketchboardList:{
 			handler(newVal:any,oldVal:any){
 				if(newVal.length>=2 && this.driver__.driver){
-					driverObj__.moveTo(14)
+					console.log(newVal);
+					
+					driverObj__.moveTo(16)
 				}
 			}
 		}
@@ -395,11 +397,12 @@ export default defineComponent({
 				let res = JSON.parse(file.xhr.response);
                 file.imgUrl = res.data.url;
                 file.resData = res.data;
-                file.pin = false;
+                // file.pin = false;
                 file.categoryValue = this.sketchCatecoryList?.[0]?.value;
                 file.category = this.sketchCatecoryList?.[0]?.name;
                 file.categoryShow = false;
 				file.id_ = GO.id++
+				file.id = res.data.id
 				file.type_ = {
 					type1:'upload',
 					type2:'Sketchboard'

src/component/HomePage/collectionModal.vue

@@ -178,28 +178,24 @@ export default defineComponent({
 			let sketchList = this.store.state.UploadFilesModule.sketchboard
 			let arr:any = []
 			sketchList.forEach((item:any) => {
+				console.log(item);
 				let obj = {
 					designType:item.resData.designType,
-					isPin:item.pin,
+					isPin:item.pin ? 1 : 0,
 					level2Type:item.category,
-					sketchBoardId:item.id
+					sketchBoardId:item.id?item.id:item.resData.id
 				}
 				arr.push(obj)
 			});
 			let data = {sketchBoards:arr}
-			this.store.commit('clearAllId')
-			GO.id = 0
-			this.showCollectionModal =false
-			this.collectionStep = 1
-			this.$emit('finishCollection')
 			let elList = document.querySelectorAll('.img_block_item_sketch img')
 			Https.axiosPost(Https.httpUrls.sketchBoardsBoundingBox, data)
 				.then((rv: any) => {
-					elList.forEach((item:any)=>{
-						item.src = item.src
-					})
 					this.isShowMark = false
 					this.store.commit('clearAllId')
+					console.log(rv,data);
+					
+					this.store.commit('setShowSketchboard',rv)
 					GO.id = 0
 					this.showCollectionModal =false
 					this.collectionStep = 1