Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/lang/cn.ts

@@ -1734,7 +1734,7 @@ export default {
 		step3Info: '详情信息已从AiDA自动填充，请检查并补充任何缺失的信息。',
 		step4Title: '上架发布',
 		step4Info: '发布后，你的设计将立即在市场上线。',
-		showAgain: '不再提示',
+		showAgain: '7天内不再提示',
 		GetStarted: '开始体验',
 	},
 	SellerListEdit: {

src/lang/en.ts

@@ -1785,7 +1785,7 @@ export default {
 		step3Info: 'Details are pre-filled from AiDA. Review and complete any missing information.',
 		step4Title: 'Listing Live',
 		step4Info: 'Publish and your design goes live on the marketplace.',
-		showAgain: 'Don’t show me again',
+		showAgain: 'Don’t show this again for 7 days',
 		GetStarted: 'Get Started',
 	},
 	SellerListEdit:{

src/views/SellerDashboard/MyListings/EditDetail/index.vue

@@ -594,13 +594,18 @@
 		if (!validatePublishRequired()) return
 
 		await handleSaveForm(status)
+		
+		// 从 sessionStorage 获取参数
+		const paramsStr = sessionStorage.getItem('listingEditParams')
+		const params = paramsStr ? JSON.parse(paramsStr) : {}
+		
 		if (status === "draft") {
 			ROUTER.push({
 				name: "Status",
 				params: { status: "draft" },
 				state: {
-					type: history.state?.type,
+					type: params.type,
-					collectionId: history.state?.collectionId
+					collectionId: params.collectionId
 				}
 			})
 		} else if (status === "publish") {
@@ -608,8 +613,8 @@
 				name: "Status",
 				params: { status: "publish" },
 				state: {
-					type: history.state?.type,
+					type: params.type,
-					collectionId: history.state?.collectionId
+					collectionId: params.collectionId
 				}
 			})
 		}
@@ -642,12 +647,15 @@
 	}
 
 	onMounted(() => {
-		const data = history.state
+		// 从 sessionStorage 获取参数
+		const paramsStr = sessionStorage.getItem('listingEditParams')
+		const data = paramsStr ? JSON.parse(paramsStr) : {}
+		
 		if (data?.type === "edit") {
-			itemId.value = history.state?.id
+			itemId.value = data?.id
 			handleGetDetailById()
 		} else {
-			const designItemIds = history.state?.designItemIds || []
+			const designItemIds = data?.designItemIds || []
 
 			if (!designItemIds.length) return
 
@@ -659,6 +667,7 @@
 			// console.log("list", list.length, list)
 			handleFetchItemDetial(list)
 		}
+	
 	})
 </script>
 

src/views/SellerDashboard/MyListings/createSelect/historyList.vue

@@ -55,6 +55,7 @@ defineExpose({getCreateList})
 </script>
 <template>
 	<div class="historyList">
+		<div class="listBox">
 			<div class="list">
 				<div v-for="(item,index) in list" :key="index" class="item" @click="selectCollectionItem(item)">
 					<div class="imgList">
@@ -77,6 +78,7 @@ defineExpose({getCreateList})
 					</div>
 				</div>
 			</div>
+		</div>
 		<div class="pagination">
 			<a-pagination v-model:current="page" @change="getCreateList" :pageSize="6" :showSizeChanger="false" show-quick-jumper :total="total" show-less-items />
 		</div>
@@ -94,15 +96,18 @@ defineExpose({getCreateList})
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 3rem;
-		> .list{
+		> .listBox{
 			height: 100%;
-			overflow: hidden;
+			overflow-y: auto;
+			&::-webkit-scrollbar{
+				display: none;
+			}
+			> .list{
 				display: grid;
 				grid-template-columns: repeat(3, 1fr);
 				row-gap: 2.4rem;      /* 垂直间距 3px */
 				column-gap: 3.2rem;   /* 横向间距 2px */
 				align-content: start;
-			overflow-y: auto;
 				&::-webkit-scrollbar{
 					display: none;
 				}
@@ -193,6 +198,8 @@ defineExpose({getCreateList})
 					}
 				}
 			}
+		}
+		
 		> .pagination{
 			margin-top: 3rem;
 		}

src/views/SellerDashboard/MyListings/createSelect/index.vue

@@ -11,7 +11,7 @@ import { useRouter } from "vue-router"
 //])
 const router = useRouter()
 let getCollectionListData = reactive({
-	process: [],
+	process: ['SERIES_DESIGN','SINGLE_DESIGN'],
 	projectName: '',
 
 })
@@ -21,11 +21,7 @@ const handleSearch = () => {
 	historyListRef.value.getCreateList()
 }
 const setProcess = (type:any) => {
-	if(type){
+	getCollectionListData.process = type
-		getCollectionListData.process = [type]
-	}else{
-		getCollectionListData.process = []
-	}
 	historyListRef.value.getCreateList()
 }
 const selectCollectionItem = (item:any) => {
@@ -44,9 +40,9 @@ defineExpose({})
 		<div class="content">
 			<div class="title">
 				<div class="left">
-					<div :class="{active:!getCollectionListData.process?.[0]}" @click="setProcess('')">{{$t('Seller.All')}}</div>
+					<div :class="{active:getCollectionListData.process?.includes('SERIES_DESIGN') && getCollectionListData.process?.includes('SINGLE_DESIGN')}" @click="setProcess(['SERIES_DESIGN','SINGLE_DESIGN'])">{{$t('Seller.All')}}</div>
-					<div :class="{active:getCollectionListData.process[0] == 'SERIES_DESIGN'}" @click="setProcess('SERIES_DESIGN')">{{$t('Seller.SeriesDesign')}}</div>
+					<div :class="{active:getCollectionListData.process[0] == 'SERIES_DESIGN' && getCollectionListData.process.length == 1}" @click="setProcess(['SERIES_DESIGN'])">{{$t('Seller.SeriesDesign')}}</div>
-					<div :class="{active:getCollectionListData.process[0] == 'SINGLE_DESIGN'}" @click="setProcess('SINGLE_DESIGN')">{{$t('Seller.SingleDesign')}}</div>
+					<div :class="{active:getCollectionListData.process[0] == 'SINGLE_DESIGN' && getCollectionListData.process.length == 1}" @click="setProcess(['SINGLE_DESIGN'])">{{$t('Seller.SingleDesign')}}</div>
 				</div>
 				<div class="right">
 					<div class="search_input flex flex-align-center">

src/views/SellerDashboard/MyListings/createSelectItem/index.vue

@@ -57,13 +57,16 @@ const chooseItem = (item:any)=>{
 const next = ()=>{
 	if(chooseList.value.length == 0)return
 	let designItemIds = chooseList.value.map((item:any)=>({designOutfitUrl:item.designOutfitUrl,designItemId:item.designItemId}))
-	router.push({	
+	
-		path:'/home/seller/myListings/edit',
+	// 使用 sessionStorage 传递参数
-		state: {
+	sessionStorage.setItem('listingEditParams', JSON.stringify({
 		designItemIds,
 		type:'create',
 		collectionId: route.params.collectionId
-		}
+	}))
+	
+	router.push({	
+		path:'/home/seller/myListings/edit'
 	})
 }