Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/Aida_Purchaser_Front

2026-05-26 10:55:32 +08:00
parent 0d10954251 f402c7b2aa
commit dc6658e1dd
21 changed files with 244 additions and 104 deletions
--- a/src/views/brand/brand-item.vue
+++ b/src/views/brand/brand-item.vue
@@ -33,7 +33,7 @@ const {} = toRefs(data);
 					{{ item.ownerName }} | 
 					{{ item?.listingTotal || 0 }} Collections
 				</div>
-				<div class="view-profile" @click="viewProfile(item)">View Profile</div>
+				<div class="view-profile" @click="viewProfile(item)">{{ $t('brand.brandItem.viewProfile') }}</div>
 			</div>
 		</div>
 		<div class="right">
--- a/src/views/brand/index.vue
+++ b/src/views/brand/index.vue
@@ -29,11 +29,11 @@ const searchHistory = ref([

 let changeSearchBrandTime = null
 const changeSearchBrand = () => {
+	merchantList.value = []
 	clearTimeout(changeSearchBrandTime)
 	getDesignerList({
 		keyword: searchBrand.value,
 	}).then((res)=>{
-		merchantList.value = []
 		merchantList.value.push(...res)
 	})
 	// changeSearchBrandTime = setTimeout(()=>{
@@ -103,6 +103,11 @@ const viewProfile = (item) => {
 	})
 }

+const setSearchHistory = (item) => {
+	searchBrand.value = item
+	changeSearchBrand()
+}
+
 onMounted(()=>{
 	const value = localStorage.getItem('brandSearchHistory');
 	if(value)searchHistory.value = JSON.parse(value)
@@ -113,23 +118,23 @@ defineExpose({})
 const {} = toRefs(data);
 </script>
 <template>
-	<div class="brand">
+		<div class="brand">
 		<div class="header-img" :class="{'active': searchBrand.length > 0}">
 			<img src="@/assets/images/brand/brandBg.png" alt="">
 			<div class="text-box">
-				<div class="title">Brand</div>
-				<span>Every brand, every story — discover who's behind the collections.</span>
+				<div class="title">{{ $t('brand.title') }}</div>
+				<span>{{ $t('brand.description') }}</span>
 			</div>
 		</div>
 		<div class="content">
 			<div class="input">
-				<input type="text" v-model="searchBrand" @input="changeSearchBrand" placeholder="Search brand">
+				<input type="text" v-model="searchBrand" @input="changeSearchBrand" :placeholder="$t('brand.search')">
 				<div class="icon">
 					<SvgIcon name="brand-search" size="32" />
 				</div>
 			</div>
 			<div class="merchantList" v-if="searchBrand.length > 0">
-				<brand-item v-for="item in merchantList" :key="item.name" :item="item" @viewProfile="viewProfile"></brand-item>
+				<brand-item v-for="item in merchantList" :key="item.sellerId" :item="item" @viewProfile="viewProfile"></brand-item>
 				<div class="end" v-show="!getMerchantData.isNoData && !getMerchantData.isShowMark">- The End-</div>
 				<!-- <div v-show="!getMerchantData.isNoData" class="material_content_list_loding">
 					<span class="page_loading" v-show="!getMerchantData.isShowMark" v-observe="getBrandList"></span>
@@ -140,8 +145,8 @@ const {} = toRefs(data);
 					<sc-list-null 
 						nullImage="brand"
 						:showButton="false" 
-						title="Brand No Found"
-						tip="Try using another keywords."
+						:title="$t('brand.noFound')"
+						:tip="$t('brand.noFoundTip')"
 					/>
 				</div>
 			</div>
@@ -150,10 +155,10 @@ const {} = toRefs(data);
 					<div class="icon">
 						<SvgIcon name="brand-time" size="20" />
 					</div>
-					<span>Searching History</span>
+					<span>{{ $t('brand.searchHistory') }}</span>
 				</div>
 				<div class="history">
-					<div v-for="item in searchHistory" :key="item" @click.stop="searchBrand = item" class="item">
+					<div v-for="item in searchHistory" :key="item" @click.stop="setSearchHistory(item)" class="item">
 						<span>{{item}}</span>
 						<div class="icon" @click.stop="deleteHistory(item)">
 							<SvgIcon name="brand-delete" size="18" />
@@ -287,7 +292,7 @@ const {} = toRefs(data);
 				.end{
 					font-family: 'KaiseiOpti-Regular';
 					font-weight: 400;
-					font-size: 12px;
+					font-size: 1.2rem;
 					line-height: 140%;
 					height: 7rem;
 					display: flex;
--- a/src/views/brandDetail/commodity-list.vue
+++ b/src/views/brandDetail/commodity-list.vue
@@ -25,6 +25,7 @@ const addShopping = (item) => {
 }
 const setType = (val) => {
 	type.value = val
+	listingList.value = []
 	getMerchantData.pageNum = 1
 	getMerchantData.isShowMark = false
 	getMerchantData.isNoData = false
@@ -72,9 +73,9 @@ defineExpose({})
 				Items
 			</div>
 			<div class="menu">
-				<div :class="{'active': type === 'all'}" @click="setType('all')">All</div>
-				<div :class="{'active': type === 'male'}" @click="setType('male')">Male</div>
-				<div :class="{'active': type === 'female'}" @click="setType('female')">Female</div>	
+				<div :class="{'active': type === 'all'}" @click="setType('all')">{{ $t('brandDetail.All') }}</div>
+				<div :class="{'active': type === 'male'}" @click="setType('male')">{{ $t('Wardrobe.assets.genders.male') }}</div>
+				<div :class="{'active': type === 'female'}" @click="setType('female')">{{ $t('Wardrobe.assets.genders.female') }}</div>	
 			</div>
 		</div>
 		<div class="list">
--- a/src/views/brandDetail/index.vue
+++ b/src/views/brandDetail/index.vue
@@ -8,6 +8,7 @@ import { ElMessage } from 'element-plus'
 import { getDesignerDetail } from '@/api/brand'
 import { AddShoppingCart } from '@/api/shoppingCart'
 import brandDetailBg from '@/assets/images/brand/brandDetailBg.png'
+import { useI18n } from 'vue-i18n'

 //const props = defineProps({
 //})
@@ -15,6 +16,7 @@ import brandDetailBg from '@/assets/images/brand/brandDetailBg.png'
 //])
 const router = useRouter()
 const route = useRoute()
+const { t, locale } = useI18n()

 const designerDetail = ref({
 	avatar: '',
@@ -28,7 +30,7 @@ const designerDetail = ref({
 })

 const addShopping = (item) => {
-	if(!item.price) return ElMessage.warning('Please log in first.')
+	if(!item.price) return ElMessage.warning(t('brandDetail.addShoppingTip'))
 	AddShoppingCart({listingIds:[item.id]}).then((res)=>{
 		item.shopName = designerDetail.value.shopName
 		myEvent.emit('addShopping', item)
--- a/src/views/brandDetail/merchant-info.vue
+++ b/src/views/brandDetail/merchant-info.vue
@@ -39,7 +39,7 @@ const {} = toRefs(data);
 				<div class="title">{{ designerDetail.shopName }}</div>
 			</div>
 			<div class="contact">
-				<div class="title">Contact</div>
+				<div class="title">{{ $t('brandDetail.merchantInfo.Contact') }}</div>
 				<div class="email label">
 					<div class="icon">
 						<svg-icon name="brand-email" size="24" />
@@ -60,7 +60,7 @@ const {} = toRefs(data);
 				</div>
 			</div>
 			<div class="about">
-				<div class="title">About</div>
+				<div class="title">{{ $t('brandDetail.merchantInfo.About') }}</div>
 				<div class="content">
 					{{ designerDetail.description }}
 				</div>
--- a/src/views/collectionStory/detail/join-us.vue
+++ b/src/views/collectionStory/detail/join-us.vue
@@ -15,17 +15,17 @@ const {} = toRefs(data);
 </script>
 <template>
 	<div class="joinUs">
-		<div class="title">Join Our Designer Community</div>
+		<div class="title">{{ $t('collectionStory.joinUs.title') }}</div>
 		<div class="info">
 			<div>
-				Join our community of visionaries and publish your collection story.
+				{{ $t('collectionStory.joinUs.info') }}
 			</div>
 			<div>
-				We are currently seeking collections that deeply integrate the AiDA creative workflow, specifically those that resonate through powerful core concepts and evocative inspiration. 
+				{{ $t('collectionStory.joinUs.info2') }}
 			</div>
 			<br />
 			<div>
-				This architecture is designed to elevate your exposure through profound "propositional expression," ensuring that soulful, story-driven designs achieve higher market premiums and superior sales conversion.
+				{{ $t('collectionStory.joinUs.info3') }}
 			</div>
 		</div>
 	</div>
--- a/src/views/collectionStory/index.vue
+++ b/src/views/collectionStory/index.vue
@@ -24,19 +24,21 @@ const {} = toRefs(data);
 			<img class="banner" src="@/assets/images/collectionStory/collection_story_banner.png" alt="">
 			<div class="back">
 				<SvgIcon name="collectionStory-back" size="20" />
-				<div class="text">Back to Home</div>
+				<div class="text">{{ $t('collectionStory.back') }}</div>	
 			</div>
 			<div class="title-content">
 				<div class="title-box">
 					<div class="title">
-						We’re Seeking 
+						 {{ $t('collectionStory.title') }}
 					</div>
 					<div class="info">
-						Fashion Voice Worth Featuring.
+						 {{ $t('collectionStory.description') }}
 					</div>
 				</div>
 				<div class="button">
-					<a href="mailto:info@code-create.com.hk">Contact Us if Interested</a>
+					<a href="mailto:info@code-create.com.hk">
+						 {{ $t('collectionStory.button') }}
+					</a>
 				</div>
 			</div>
 		</div>
--- a/src/views/digitalDetail/index.vue
+++ b/src/views/digitalDetail/index.vue
@@ -222,7 +222,7 @@ defineExpose({})
 				> .left{
 					border-right: 0.5px solid #C4C4C4;
 					.imgBox{
-						padding: 0 30px;
+						padding: 0 3rem;
 					}
 				}
 				> .right{
--- a/src/views/digitalItem/index.vue
+++ b/src/views/digitalItem/index.vue
@@ -4,7 +4,7 @@ import CommodityList from "./commodity-list.vue";
 import MerchantInfo from "./merchant-info.vue";
 import { useRouter } from "vue-router";
 import scListNull from '@/views/shoppingCart/sc-list-null.vue'
-import { getListingMallListApi } from '@/api/listing'
+import { useI18n } from 'vue-i18n'	

 // 定义组件名称
 defineOptions({
@@ -14,6 +14,7 @@ defineOptions({
 //})
 //const emit = defineEmits([
 //])
+const { t } = useI18n()
 const categories = ref(['all'])
 const gender = ref(['all'])
 const digitalItemRef = ref(null)
@@ -24,13 +25,13 @@ const commodityListRef = ref(null)
 const searechTypeList = ref([
 	{
 		value:'salesVolume',
-		label:'Best Selling'
+		label:t('digitalItem.BestSelling')
 	},{
 		value:'price',
-		label:'Price: Low to High'
+		label:t('digitalItem.Price')
 	},{
 		value:'updateTime',
-		label:'Newest First'
+		label:t('digitalItem.NewestFirst')
 	},
 ])

@@ -64,15 +65,15 @@ defineExpose({})
 		<div class="header-img">
 			<img src="@/assets/images/digitalItem/digital_item_banner.png" alt="">
 			<div class="text">
-				<div class="title">Digital Item</div>
-				<p class="info">Virtual fashion creations collected in your personal archive</p>
+				<div class="title">{{ $t('digitalItem.title') }}</div>
+				<p class="info">{{ $t('digitalItem.info') }}</p>
 			</div>
 		</div>
 		<div class="filters">
 			<div class="filter-item">
-				<el-select v-model="searechType" @change="updateSort" placeholder="Sort By" :teleported="false">
+				<el-select v-model="searechType" @change="updateSort" :placeholder="$t('digitalItem.sortBy')" :teleported="false">
 					<template #label="{ label }">
-						<span class="header-label">Sort By</span>
+						<span class="header-label">{{ $t('digitalItem.sortBy') }}</span>
 						<span class="header-value">{{ label }}</span>
 					</template>
 					<el-option
@@ -103,8 +104,8 @@ defineExpose({})
 					<sc-list-null 
 						nullImage="shopping-cart"
 						:showButton="false" 
-						title="Nothing in Digital Item"
-						tip="Try adjusting your filters or refreshing the page."
+						:title="$t('digitalItem.noData')"
+						:tip="$t('digitalItem.noDataTip')"
 					/>
 				</div>
 				
--- a/src/views/digitalItem/merchant-info.vue
+++ b/src/views/digitalItem/merchant-info.vue
@@ -36,15 +36,15 @@ defineExpose({})
 <template>
 	<div class="filters">
 		<div class="title">
-			<div class="left">Filters</div>
-			<div class="right" @click="clearFilters">Clear</div>
+			<div class="left">{{ $t('digitalItem.MerchantInfo.Filters') }}</div>
+			<div class="right" @click="clearFilters">{{ $t('digitalItem.MerchantInfo.Clear') }}</div>
 		</div>
-		<div class="categories">Categories</div>
+		<div class="categories">{{ $t('digitalItem.MerchantInfo.Categories') }}</div>
 		<div class="line"></div>
 		<div class="multiple">
 			<checked :list="categoriesList" @change="handleChange" v-model:selected="categories" />
 		</div>
-		<div class="categories">Gender</div>
+		<div class="categories">{{ $t('digitalItem.MerchantInfo.Gender') }}</div>	
 		<div class="line"></div>
 		<div class="multiple">
 			<checked :list="genderList" @change="handleChange" v-model:selected="gender" />
--- a/src/views/login/email-verify.vue
+++ b/src/views/login/email-verify.vue
@@ -22,18 +22,14 @@
 	import { useI18n } from 'vue-i18n'
 	const { t } = useI18n()
 	const router = useRouter()
-	const emit = defineEmits(['submit-email-code'])
+	const emit = defineEmits(['submit-email-code', 'resend-email-code'])
 	const props = defineProps({
 		email: { type: String, required: true },
-		type: {
-			type: String as () => 'LOGIN' | 'REGISTER' | 'FORGET_PWD',
-			required: true
-		},
 		password: { type: String, default: '' },
 		isShowOtherLogin: { type: Boolean, default: true }
 	})
 	const code = ref('')
-	const time = ref(60)
+	const time = ref(0)
 	const timeStr = computed(() => CountDown(time.value))
 	const timeout = ref(null)
 	const setTime = (s = 120) => {
@@ -55,7 +51,8 @@
 		clearTime()
 	})
 	onMounted(() => {
-		onSendCode()
+		// onSendCode()
+		setTime()
 	})
 	const inputCodeRef = ref(null)
 	const resetCode = () => {
@@ -68,19 +65,9 @@
 			console.warn('请输入邮箱')
 			return Promise.reject('请输入邮箱')
 		}
-		// const data = {
-		// 	email,
-		// 	type: props.type
-		// }
-		// if (props.type === 'LOGIN') {
-		// 	data['password'] = md5(props.password)
-		// }
-		// const res = await SendVerificationCode(data)
-		// if (!res) {
-		// 	ElMessage.error(t('Login.sendCodeError'))
-		// 	return Promise.reject('发送验证码失败')
-		// }
-		setTime()
+		emit('resend-email-code', () => {
+			setTime()
+		})
 		return Promise.resolve()
 	}
 	const onResend = () => {
--- a/src/views/login/login-dialog.vue
+++ b/src/views/login/login-dialog.vue
@@ -43,11 +43,11 @@
 					@login="onLogin"
 					@register="onRegister"
 					@submit-email-code="onSubmitEmailCode"
+					@resend-email-code="onResendEmailCode"
 					@back="onBack"
 					:name="data.name"
 					:email="data.email"
 					:password="data.password"
-					type="FORGET_PWD"
 				/>
 			</div>
 		</div>
@@ -128,26 +128,24 @@
 		myEvent.remove('openLoginDialog', open)
 	})

-	const onLogin = (res: any) => {
-		AccountSendLoginCode({
+	const onLogin = async (res: any) => {
+		await AccountSendLoginCode({
 			email: res.email,
 			password: md5(res.password)
-		}).then((v) => {
-			data.value = res
-			data.value.type = TabNames.login
-			currentTab.value = TabNames.email_verify
 		})
+		data.value = res
+		data.value.type = TabNames.login
+		currentTab.value = TabNames.email_verify
 	}
-	const onRegister = (res: any) => {
+	const onRegister = async (res: any) => {
 		const value = {
 			email: res.email,
 			operationType: 'REGISTER'
 		}
-		AccountSendVerifyCode(value).then((v) => {
-			data.value = res
-			data.value.type = TabNames.register
-			currentTab.value = TabNames.email_verify
-		})
+		await AccountSendVerifyCode(value)
+		data.value = res
+		data.value.type = TabNames.register
+		currentTab.value = TabNames.email_verify
 	}
 	const onSubmitEmailCode = (code: string) => {
 		const value = {
@@ -167,6 +165,14 @@
 			})
 		}
 	}
+	const onResendEmailCode = async (callback: () => void) => {
+		if (data.value.type === TabNames.login) {
+			await onLogin(data.value)
+		} else if (data.value.type === TabNames.register) {
+			await onRegister(data.value)
+		}
+		callback()
+	}
 </script>

 <style lang="less">
--- a/src/views/login/retrieve-password.vue
+++ b/src/views/login/retrieve-password.vue
@@ -19,9 +19,9 @@
 		</el-form>
 		<div class="verify-box" v-if="index === 1">
 			<email-verify
-				type="FORGOT_PWD"
 				:email="formData.email"
 				@submit-email-code="onVerifyCode"
+				@resend-email-code="SendVerifyCode"
 				:is-show-other-login="false"
 			/>
 		</div>
@@ -104,10 +104,7 @@
 	const onSubmit1 = () => {
 		form1Ref.value?.validate?.((valid) => {
 			if (valid) {
-				AccountSendVerifyCode({
-					email: formData.email,
-					operationType: 'FORGOT_PWD'
-				}).then(() => {
+				SendVerifyCode().then(() => {
 					index.value = 1
 				})
 			} else {
@@ -115,12 +112,18 @@
 			}
 		})
 	}
+	const SendVerifyCode = async () => {
+		await AccountSendVerifyCode({
+			email: formData.email,
+			operationType: 'FORGET_PWD'
+		})
+	}
 	const onVerifyCode = (code: string) => {
 		if (!code) return
 		AccountVerifyCode({
 			email: formData.email,
 			emailVerifyCode: code,
-			operationType: 'FORGOT_PWD'
+			operationType: 'FORGET_PWD'
 		}).then(() => {
 			formData.code = code
 			index.value = 2
--- a/src/views/main-header.vue
+++ b/src/views/main-header.vue
@@ -9,7 +9,10 @@
 				:key="v.path"
 				class="nav-item"
 				:class="{
-					active: v.path === '/' ? activePath === v.path : new RegExp(`^${v.path}`).test(activePath)
+					active:
+						v.path === '/'
+							? activePath === v.path
+							: new RegExp(`^${v.path}`).test(activePath)
 				}"
 				@click="onNavItemClick(v.path)"
 			>
@@ -141,8 +144,7 @@
 		hideProfilePopover()
 		ElMessageBox.confirm('Are you sure to log off?')
 			.then(() => {
-				userInfoStore.logout()
-				router.go(0)
+				userInfoStore.logout(true)
 			})
 			.catch(() => {})
 	}