Merge branch 'main' of http://18.167.251.121:10003/aidlab/Aida_Purchaser_Front

src/views/brand/index.vue

@@ -28,14 +28,19 @@ const searchHistory = ref([
 ])
 
 let changeSearchBrandTime = null
+
 const changeSearchBrand = () => {
-	merchantList.value = []
+	if(!searchBrand.value)return
 	clearTimeout(changeSearchBrandTime)
-	getDesignerList({
-		keyword: searchBrand.value,
-	}).then((res)=>{
-		merchantList.value.push(...res)
-	})
+	changeSearchBrandTime = setTimeout(()=>{
+		merchantList.value = []
+		getDesignerList({
+			keyword: searchBrand.value,
+		}).then((res)=>{
+			merchantList.value.push(...res)
+		})
+	},500)
+	
 	// changeSearchBrandTime = setTimeout(()=>{
 	// 	getMerchantData.pageNum = 1
 	// 	getMerchantData.isShowMark = false
@@ -129,7 +134,7 @@ const {} = toRefs(data);
 		<div class="content">
 			<div class="input">
 				<input type="text" v-model="searchBrand" @input="changeSearchBrand" :placeholder="$t('brand.search')">
-				<div class="icon">
+				<div class="icon" @click="changeSearchBrand">
 					<SvgIcon name="brand-search" size="32" />
 				</div>
 			</div>

src/views/brandDetail/commodity-list.vue

@@ -97,8 +97,8 @@ defineExpose({})
 		display: flex;
 		flex-direction: column;
 		.header{
-			position: sticky;
-			top: 0;
+			// position: sticky;
+			// top: 0;
 			z-index: 2;
 			background-color: #fff;
 			.title{

src/views/digitalDetail/index.vue

@@ -26,6 +26,7 @@ let detail:any = ref({
 	shopName: '',
 	updateTime: '',
 	gender: '',
+	sellerId: '',
 })
 const sketchList = ref([])
 const illustrationList = ref([])
@@ -75,11 +76,14 @@ const getListingDetail = ()=>{
 	getListingDetailApi({
 		id:route.params.id + '',
 	}).then((res)=>{
-		console.log(res)
 		if(res)detail.value = res
 		setImgList(res.images)
 	})
 }
+const gobrand = () => {		
+	if(!detail.value.sellerId)return
+	router.push({path: `/brand/${detail.value.sellerId}`})
+}
 // const vObserve  = {
 // 	mounted (el,binding) {
 // 	},
@@ -146,7 +150,7 @@ defineExpose({})
 					<div class="info">
 						<img class="profile" v-avatarLoad="detail.avatar" alt="">
 						<div class="detail">
-							<div class="name">{{ detail.shopName }}</div>
+							<div class="name" @click="gobrand">{{ detail.shopName }}</div>
 							<div class="release-time">
 								<span>{{ $t('digitalDetail.ReleaseIn') }} {{ detail.updateTime }}</span>
 							</div>
@@ -301,6 +305,7 @@ defineExpose({})
 						font-size: 3rem;
 						line-height: 120%;
 						margin-bottom: 1rem;
+						cursor: pointer;
 					}
 					.img-price{
 						font-family: KaiseiOpti-Bold;