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

src/views/HomeMain.vue

@@ -197,6 +197,7 @@ export default defineComponent({
 		payOrder,
 		TaskPage,
 		navRouter,
+		navRouter,
     },
 	setup(){
         const store = useStore();
@@ -611,6 +612,8 @@ export default defineComponent({
 						this.store.commit('clearAllData')
 						// window.location.reload()
 						window.location.href = '/home';
+						// window.location.reload()
+						window.location.href = '/home';
                     }
 				}
 			})

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;

src/views/HomeView/Works.vue

@@ -7,8 +7,8 @@
 			<div v-show="isScroll" v-for="item in worksType" :key="item" class="modal_title_text_assistant" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
 				{{ item.name }}
 			</div>
-			<!-- <div v-show="!isScroll" class="modal_title_text_assistant active">All</div> -->
-			 
+			<div v-show="!isScroll" class="modal_title_text_assistant" :class="{active:'all' == worksSelect}" @click="setWorksSelect({value:'all'})">All</div>
+			<div v-show="!isScroll" class="modal_title_text_assistant" :class="{active:'RCAworkshop_2024' == worksSelect}" @click="setWorksSelect({value:'RCAworkshop_2024'})">AiDA Workshop 2024</div>
 			<!-- <div class="modal_search_menu">
 				<generalMenu :dataList="menuList" @setprintModel="setprintModel" :item="selectMenu"></generalMenu>
 			</div> -->
@@ -90,8 +90,8 @@ export default defineComponent({
 					value: 'myWorks'
 				},
 				{
-					name: 'RCA Workshop',
-					value: 'myWorks'
+					name: useI18n().t('works.RCAworkshop_2024'),
+					value: 'RCAworkshop_2024'
 				},
 			],
 			worksList: [
@@ -101,6 +101,7 @@ export default defineComponent({
 				"getMyPortfolio": 0,
 				page:1,
 				size:10,
+				tagId:'',
 			},
 			isShowMark:false,
 			isNoData:false,//如果数据为空就不加载
@@ -137,12 +138,16 @@ export default defineComponent({
 			filter.worksSelect = val.value
 			filter.getListDate.getLikePortfolio = 0
 			filter.getListDate.getMyPortfolio = 0
+			filter.getListDate.tagId = ''
 			if(val.value == 'all'){
 			}else if(val.value == 'favoriteWorks'){
 				filter.getListDate.getLikePortfolio = 1
 			}else if(val.value == 'myWorks'){
 				filter.getListDate.getMyPortfolio = 1
+			}else if(val.value == 'RCAworkshop_2024'){
+				filter.getListDate.tagId = 1
 			}
+			
 			filter.getListDate.page = 0
 			fall.value.clearData()
 			filter.isShowMark = false

src/views/HomeView/library.vue

@@ -775,7 +775,7 @@ export default defineComponent({
 					if(this.selectCode != 'DesignElements'){
 						this.getClass()
 					}
-					if(this.selectCode == 'Sketchboard')this.getSex()
+					if(this.selectCode == 'Sketchboard' || this.selectCode == 'Models')this.getSex()
 					
 
 					this.getLibraryList('')