From aa5d3e8a331c81902dfee69febebc14ca98d59b5 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 17 Jul 2024 17:28:02 +0800
Subject: [PATCH] fix

---
 src/component/Events/eventsDetail.vue | 73 ++++++++++++---------------
 src/component/modules/navRouter.vue   |  2 +-
 src/router/index.ts                   | 30 ++++++-----
 src/views/HomeMain.vue                | 10 ++--
 src/views/HomeRecommend.vue           |  4 +-
 src/views/HomeView/Events.vue         | 10 ++--
 6 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue
index d94b6e55..c931b451 100644
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -1,6 +1,13 @@
 <template>
-    <div class="eventsDetail_page" :class="{active:isScroll}">
-		<div class="modal_title_text modal_search">
+    <div class="eventsDetail_page">
+		<div class="eventsDetail_title modal_title_text" @click="setBack">
+			<i class="fi fi-sr-left"></i>
+			<div class="">Back</div>
+		</div>
+		<div class="eventsDetail_content">
+
+		</div>
+		<!-- <div class="modal_title_text modal_search">
 			<div v-show="isScroll || systemUser.value>-1" v-for="item in worksType" :key="item" class="modal_title_text_assistant" @click="setWorksSelect(item)" :class="{active:item.value == worksSelect}">
 				{{ item.name }}
 			</div>
@@ -22,7 +29,7 @@
 					<a-spin size="large" />
 				</span>
 			</div>
-		</div>
+		</div> -->
     </div>
 </template>
 <script lang="ts">
@@ -31,6 +38,7 @@ import { defineComponent,h ,toRefs,ref,reactive,onMounted,nextTick,provide,compu
 // import HeaderComponent from "@/component/HomePage/Header.vue";
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
 import { Https } from "@/tool/https";
+import { useRouter } from 'vue-router';
 import { useI18n } from "vue-i18n";
 import generalMenu from "@/component/HomePage/generalMenu.vue";
 import { useStore } from "vuex";
@@ -46,6 +54,7 @@ export default defineComponent({
 	},
     setup() {
 		// console.log(this.$route.params.id);
+		const router = useRouter();
         const store = useStore();
 		let filter:any = reactive({
 			worksSelect: 'all',
@@ -114,40 +123,9 @@ export default defineComponent({
 		}
 		let likeFile = (item:any,type:string) => {
 		}
-		let getImgScale = (item:any)=>{
+		let setBack = ()=>{
+			router.go(-1);
 		}
-		let getPorfolio = ()=>{
-			let data = filter.getListDate
-			if(filter.isShowMark && !filter.isNoData)return
-			filter.isShowMark = true
-			Https.axiosPost(Https.httpUrls.getPorfolio, data)
-                .then((rv) => {
-					if (rv.content.length > 0) {
-
-					} else {
-						filter.isNoData = true
-					}
-					filter.isShowMark = false
-                })
-                .catch((rv) => {
-					filter.isShowMark = false
-					filter.isNoData = true
-				});
-		}
-		let {t} = useI18n()
-		let setprintModel= (data:any)=>{
-			selectMenu.value = data
-		}
-		let setPortfolioLike = (value:any) =>{
-			// let data = {id:value.id}
-			// Https.axiosGet(Https.httpUrls.portfolioLike, {params:data})
-			// .then((rv) => {
-				
-			// })
-			// .catch((rv) => {
-			// });
-		}
-		
 		onMounted (()=>{
 			// filter.isShowMark = false
 			// filter.isNoData = false
@@ -169,10 +147,7 @@ export default defineComponent({
 			selectMenu,
 			setWorksSelect,
 			likeFile,
-			getImgScale,
-			t,
-			setprintModel,
-			setPortfolioLike,
+			setBack,
         }
     },
     async mounted(){
@@ -182,7 +157,21 @@ export default defineComponent({
 </script>
 <style lang="less">
 .eventsDetail_page {
-	
-	
+	min-height: 100%;
+    width: 100%;
+	.eventsDetail_title{
+		display: flex;
+		padding: 2rem 4rem;
+		align-items: center;
+		cursor: pointer;
+		i{
+			display: flex;
+			align-items: center;
+			margin-right: 1rem;
+		}
+	}
+	.eventsDetail_title:hover div{
+		text-decoration: underline;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/src/component/modules/navRouter.vue b/src/component/modules/navRouter.vue
index 678f132e..d802dd98 100644
--- a/src/component/modules/navRouter.vue
+++ b/src/component/modules/navRouter.vue
@@ -12,7 +12,7 @@
 		<router-link  :class="['nav_item',$route.name === 'works' ? 'select_nav' : '', ]" :to="`/home/works`">
 			{{$t('Header.WORKS')}}
 		</router-link> -->
-		<router-link v-for="item in routerList" :class="['nav_item',$route.name === item.routerName ? 'select_nav' : '', ]" :to="item.router">{{ item.name }}</router-link>
+		<router-link v-for="item in routerList" :class="['nav_item',item.routerName.indexOf($route.name) > -1 ? 'select_nav' : '', ]" :to="item.router">{{ item.name }}</router-link>
 	</nav>
 </template>
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 07821652..0f1ea9cf 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -85,19 +85,23 @@ const routes: Array<RouteRecordRaw> = [
 				path:'events',
 				name:'SquareEvents',
 				component: _import_custom('HomeView/Events.vue'),
-				children:[
-					{
-						path: "",
-						name:'eventsDetail',
-						redirect: "/Square/events/eventsDetail"
-					},
-					{
-						path:'eventsDetail',
-						name:'eventsDetail',
-						component: _import_custom('Events/eventsDetail.vue'),
-					}
-				]
-			},
+				// children:[
+				// 	{
+				// 		path: "",
+				// 		name:'eventsDetail',
+				// 		redirect: "/Square/events/eventsDetail"
+				// 	},
+				// 	{
+				// 		path:'eventsDetail',
+				// 		name:'eventsDetail',
+				// 		component: _import_component('Events/eventsDetail.vue'),
+				// 	}
+				// ]
+			},{
+				path:'eventsDetail',
+				name:'eventsDetail',
+				component: _import_component('Events/eventsDetail.vue'),
+			}
 		]
 	},
 	{
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index bf821c94..4cc48a2b 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -157,23 +157,23 @@ export default defineComponent({
 		let AdministratorUserIdList = [88,6,46,31,73,83,87,4]
 		let navRouterList = [
 			{
-				routerName:'homePage',
+				routerName:['homePage'],
 				router:'/home/homePage',
 				name:t('Header.HOME')
 			},{
-				routerName:'library',
+				routerName:['library'],
 				router:'/home/library',
 				name:t('Header.LIBRARY')
 			},{
-				routerName:'history',
+				routerName:['history'],
 				router:'/home/history',
 				name:t('Header.HISTORY')
 			},{
-				routerName:'works',
+				routerName:['works'],
 				router:'/home/works',
 				name:t('Header.WORKS')
 			},{
-				routerName:'events',
+				routerName:['events'],
 				router:'/home/events',
 				name:t('Header.EVENTS')
 			},
diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue
index 1d8d5e00..a5db93bc 100644
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -86,11 +86,11 @@ export default defineComponent({
 		})
 		let navRouterList = [
 			{
-				routerName:'SquareWorks',
+				routerName:['SquareWorks'],
 				router:'/Square/works',
 				name:'GALLERY'
 			},{
-				routerName:'SquareEvents',
+				routerName:['SquareEvents','eventsDetail'],
 				router:'/Square/events',
 				name:'EVENTS'
 			},
diff --git a/src/views/HomeView/Events.vue b/src/views/HomeView/Events.vue
index 7b283be7..ed32269b 100644
--- a/src/views/HomeView/Events.vue
+++ b/src/views/HomeView/Events.vue
@@ -73,12 +73,12 @@ export default defineComponent({
 				},{
 					title:'Source Fashion 2024 Culture x AI - KAN TAI KEUNG X AIDLAB X HONG KONG FASHION DESIGNERS SHOW',
 					time:'14 Jul 2024',
-					id:1,
+					id:2,
 					imgUrl:'https://www.aidlab.hk/uploads/n_image2_1715053576.png'
 				},{
 					title:'Source Fashion 2024',
 					time:'14 Jul 2024',
-					id:1,
+					id:3,
 					imgUrl:'https://www.aidlab.hk/uploads/n_image2_1715053576.png'
 				},
 			],
@@ -137,7 +137,9 @@ export default defineComponent({
 		}
 		let {t} = useI18n()
 		let openEventsDetail = (item:any)=>{
-			router.push(`${router.currentRoute._value.path}/eventsDetail?id=${item.id}`)
+			let path = router.currentRoute._value.path
+			router.push(`/Square/eventsDetail?id=${item.id}`)
+			// router.push(`${path}?id=${item.id}`)
 		}
 		onMounted (()=>{
 			// filter.isShowMark = false
@@ -180,7 +182,7 @@ export default defineComponent({
 	// overflow: hidden;
     // height: 100%;
 	height: auto;
-		min-height: 100%;
+	min-height: 100%;
 	padding: 0 9rem;
 	// min-width: 1440px;
 	position: relative;