push Develop

src/views/HomeView/HomeView.vue

@@ -269,6 +269,7 @@ export default defineComponent({
 		let userGroupId: any = computed(() => {
 			return store.state.HomeStoreModule.userGroupId;
 		}); //模特id //当likeDesignCollectionList长度为0时清空，startdesign时清空
+		let beenPublished = null
 		let designCollectionId: any = computed(() => {
 			return store.state.HomeStoreModule.designCollectionId;
 		});
@@ -330,6 +331,7 @@ export default defineComponent({
 			likeDesignCollectionList,
 			designCollectionList,
 			userGroupId,
+			beenPublished,
 			designCollectionId,
 			designId,
 			contentImgMax,
@@ -808,6 +810,7 @@ export default defineComponent({
 				let data: any = {
 					id: v.resData.id,
 					designType: v.resData.designType,
+					level2Type: v.category,
 					isPin: v.pin ? 1 : 0,
 				};
 				return data;
@@ -912,11 +915,13 @@ export default defineComponent({
 
 		//获取选择的组
 		getHistoryChoose(userGroupId: any, type: any) {
+			
 			this.isShowMark = true;
 			let url =
 				Https.httpUrls.historyChoose + `?userGroupId=${userGroupId}`;
 			Https.axiosGet(url)
 				.then((rv: any) => {
+					this.beenPublished = rv.beenPublished
 					this.store.commit("setUserGroupId", rv.userGroupId);
 					this.dealHistoryChooseData(rv, type);
 					this.isShowMark = false;
@@ -954,6 +959,8 @@ export default defineComponent({
 		},
 		//处理选择组的数据
 		dealHistoryChooseData(data: any, type: any) {
+			console.log(data);
+			
 			let collectionData = {
 				disposeMoodboard: data.collection.moodTemplateId?[{
 					id:data.collection.moodTemplateId,
@@ -980,6 +987,8 @@ export default defineComponent({
 				),
 				
 			};
+			console.log(collectionData);
+			
 			// console.log(data);
 			this.store.commit("setAllBoardDataChoose", collectionData);
 			// this.store.commit('clearShowSketchboard')
@@ -1027,9 +1036,11 @@ export default defineComponent({
 				if (v.level1Type === "Sketchboard") {
 					newData.pin = v.isPin;
 					newData.category = v.level2Type;
+					newData.level2Type = v.level2Type;
 				}
 				if (v.level1Type === "Printboard") {
 					newData.pin = v.isPin;
+					newData.level2Type = v.level2Type;
 				}
 				return newData;
 			});
@@ -1078,7 +1089,7 @@ export default defineComponent({
 			
 			let productImg:any = this.$refs.productImg
 			productImg.productImgMask = true
-			productImg.init()			
+			productImg.init(this.userGroupId,this.beenPublished)			
 		},
 
 		//打开图片详情