Merge remote-tracking branch 'origin/StableVersion' into develop

src/views/HomeView/HomeView.vue

@@ -277,12 +277,10 @@ export default defineComponent({
 		let userGroupId: any = computed(() => {
 			return store.state.HomeStoreModule.userGroupId;
 		}); //模特id //当likeDesignCollectionList长度为0时清空，startdesign时清空
-		let beenPublished = ref(0)
-		let setBeenPublished = ()=>{
-			beenPublished.value = 1
+		let setPortfolio = (data:any)=>{
+			portfolio.value = data
 		}
-		provide('beenPublished',beenPublished)
-		provide('setBeenPublished',setBeenPublished)
+		provide('setPortfolio',setPortfolio)
 		let designCollectionId: any = computed(() => {
 			return store.state.HomeStoreModule.designCollectionId;
 		});
@@ -341,12 +339,14 @@ export default defineComponent({
 		let isMannequinShow = ref(false)
 		let chooseIsDesign:any = computed(()=>{
 			return store.state.UploadFilesModule.chooseIsDesign})
+		let portfolio:any = ref({})
+		provide('portfolio',portfolio)
 		return {
 			store,
 			likeDesignCollectionList,
 			designCollectionList,
 			userGroupId,
-			beenPublished,
+			setPortfolio,
 			designCollectionId,
 			designId,
 			contentImgMax,
@@ -361,6 +361,7 @@ export default defineComponent({
 			allBoardData,
 			isMannequinShow,
 			chooseIsDesign,
+			portfolio,
 		};
 	},
 	data() {
@@ -536,9 +537,10 @@ export default defineComponent({
 		// },
 		affiche(text:any){
 			nextTick(()=>{
-				let affiche:any = this.$refs.affiche
+			    let affiche:any = this.$refs.affiche
 				affiche.init(text)
 			})
+			
 			// affiche.afficheMask = true
 		},
 		dragstart (e:any, index:any) {
@@ -920,7 +922,7 @@ export default defineComponent({
 				Https.httpUrls.historyChoose + `?userGroupId=${userGroupId}`;
 			Https.axiosGet(url)
 				.then((rv: any) => {
-					this.beenPublished = rv.beenPublished
+					this.setPortfolio(rv.portfolioDTO)
 					this.store.commit("setUserGroupId", rv.userGroupId);
 					this.dealHistoryChooseData(rv, type);
 					this.isShowMark = false;
@@ -947,7 +949,7 @@ export default defineComponent({
 			this.isShowMark = true;
 			Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
 					(rv: any) => {
-						this.beenPublished = rv.beenPublished
+						this.setPortfolio(rv.portfolioDTO)
 						this.store.commit("setUserGroupId", rv.userGroupId);
 						this.dealHistoryChooseData(rv, type);
 						this.isShowMark = false;