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

src/views/brandDetail/commodity-list.vue

@@ -163,6 +163,7 @@ defineExpose({})
 				border-right: 0.5px solid #585858;
 				margin-right: -1px;
 				margin-bottom: -1px;
+				min-width: 0;
 			}
 			> .material_content_list_loding{
 				width: 100%;

src/views/brandDetail/index.vue

@@ -81,7 +81,7 @@ defineExpose({})
 		overflow-y: auto;
 		.header-img{
 			width: 100%;
-			border-bottom: 1px solid #232323;
+			border-bottom: 1px solid #585858;
 			>img{
 				width: 100%;
 				height: 100%;				

src/views/digitalDetail/index.vue

@@ -376,6 +376,9 @@ defineExpose({})
 						font-size: 3rem;
 						line-height: 120%;
 						margin-bottom: 1rem;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
 					}
 					.img-price{
 						font-family: KaiseiOpti-Bold;

src/views/digitalItem/commodity-list.vue

@@ -114,7 +114,6 @@ const {} = toRefs(data);
 		position: relative;
 		display: flex;
 		flex-direction: column;
-		margin-top: -1px;
 		.list{
 			width: 100%;
 			flex: 1;
@@ -125,7 +124,6 @@ const {} = toRefs(data);
 			display: grid;
 			align-content: start;
 			grid-template-columns: repeat(auto-fill, minmax(min(100%, 28rem), 1fr));
-			border-top: 0.5px solid #585858;
 			padding: .5px 0 0 .5px;
 			
 			/* 垂直线（右边框） */
@@ -136,6 +134,7 @@ const {} = toRefs(data);
 				border-right: 0.5px solid #585858;
 				margin-right: -1px;
 				margin-bottom: -1px;
+				min-width: 0;
 			}
 			> .material_content_list_loding{
 				width: 100%;

src/views/home/section-digital-items1.vue

@@ -25,22 +25,22 @@
 		{
 			title: 'Women’s Item',
 			tip: 'Blue Pleat Aria',
-			url: 'http://118.31.39.42:3000/falls/digital-items-1.png'
+			url: '/images/home/digital-items-1.png'
 		},
 		{
 			title: 'Girls’ Item',
 			tip: 'Candy Riot',
-			url: 'http://118.31.39.42:3000/falls/digital-items-2.jpg'
+			url: '/images/home/digital-items-2.jpg'
 		},
 		{
 			title: 'Men’s Item',
 			tip: 'Void Armour',
-			url: 'http://118.31.39.42:3000/falls/digital-items-3.png'
+			url: '/images/home/digital-items-3.png'
 		},
 		{
 			title: 'Boys’ Item',
 			tip: 'Jester Edit',
-			url: 'http://118.31.39.42:3000/falls/digital-items-4.png'
+			url: '/images/home/digital-items-4.png'
 		}
 	])
 	const onShopAll = () => {

src/views/home/section-digital-items2.vue

@@ -17,25 +17,25 @@
 <script setup lang="ts">
 	import { computed, ref } from 'vue'
 	const list = ref([
-		{
-			title: 'Women’s Item',
-			tip: 'Blue Pleat Aria',
-			url: 'http://118.31.39.42:3000/falls/digital-items-1.png'
-		},
 		{
 			title: 'Girls’ Item',
-			tip: 'Candy Riot',
-			url: 'http://118.31.39.42:3000/falls/digital-items-2.jpg'
+			tip: 'Meadow Wrap',
+			url: '/images/home/digital-items-5.png'
 		},
 		{
-			title: 'Men’s Item',
-			tip: 'Void Armour',
-			url: 'http://118.31.39.42:3000/falls/digital-items-3.png'
+			title: 'Women’s Item',
+			tip: 'Onyx Silhouette',
+			url: '/images/home/digital-items-6.png'
 		},
 		{
 			title: 'Boys’ Item',
-			tip: 'Jester Edit',
-			url: 'http://118.31.39.42:3000/falls/digital-items-4.png'
+			tip: 'Autumn Roam',
+			url: '/images/home/digital-items-7.png'
+		},
+		{
+			title: 'Men’s Item',
+			tip: 'Archive Casual',
+			url: '/images/home/digital-items-8.png'
 		}
 	])
 </script>

src/views/home/section-footer.vue

@@ -21,26 +21,11 @@
 					<span class="icon"><svg-icon name="arrow_right" size="12" /></span>
 				</div>
 			</div>
-			<div class="help">
-				<div class="title">{{ $t('Home.Help') }}</div>
-				<div class="item">{{ $t('Home.FAQ') }}</div>
-				<div class="item">{{ $t('Home.MyAccount') }}</div>
-				<div class="item">{{ $t('Home.MyOrders') }}</div>
-				<div class="item">{{ $t('Home.PaymentInvoices') }}</div>
-				<div class="item">{{ $t('Home.CopyrightLicense') }}</div>
-			</div>
-			<div class="polices">
-				<div class="title">{{ $t('Home.Polices') }}</div>
-				<div class="item">{{ $t('Home.Legal') }}</div>
-				<div class="item">{{ $t('Home.PrivacyPolicy') }}</div>
-				<div class="item">{{ $t('Home.CookiesSettings') }}</div>
-				<div class="item">{{ $t('Home.PurchaseConditions') }}</div>
-			</div>
-			<div class="company">
-				<div class="title">{{ $t('Home.Company') }}</div>
-				<div class="item">{{ $t('Home.AboutUs') }}</div>
-				<div class="item">{{ $t('Home.Offices') }}</div>
-				<div class="item">{{ $t('Home.JoinWithUs') }}</div>
+			<div v-for="v in list" :key="v.title" :class="[v.class]">
+				<div class="title">{{ $t(v.title) }}</div>
+				<div v-for="item in v.child" :key="item.title" class="item" @click="onItem(item)">
+					{{ $t(item.title) }}
+				</div>
 			</div>
 		</div>
 		<HomeFooter class="footer" isHome />
@@ -53,6 +38,81 @@
 	const router = useRouter()
 	import HomeFooter from '@/components/Footer.vue'
 	import { UrlList, openView } from '../../utils/UrlList'
+	const list = ref([
+		{
+			title: 'Home.Help',
+			class: 'help',
+			child: [
+				{
+					title: 'Home.FAQ',
+					url: UrlList.faq
+				},
+				{
+					title: 'Home.MyAccount',
+					name: 'settings'
+				},
+				{
+					title: 'Home.MyOrders',
+					name: 'wardrobe'
+				},
+				{
+					title: 'Home.PaymentInvoices',
+					url: ''
+				},
+				{
+					title: 'Home.CopyrightLicense',
+					url: ''
+				}
+			]
+		},
+		{
+			title: 'Home.Polices',
+			class: 'polices',
+			child: [
+				{
+					title: 'Home.Legal',
+					url: ''
+				},
+				{
+					title: 'Home.PrivacyPolicy',
+					url: UrlList.privacy
+				},
+				{
+					title: 'Home.CookiesSettings',
+					url: ''
+				},
+				{
+					title: 'Home.PurchaseConditions',
+					url: ''
+				}
+			]
+		},
+		{
+			title: 'Home.Company',
+			class: 'company',
+			child: [
+				{
+					title: 'Home.AboutUs',
+					url: UrlList.aboutUs
+				},
+				{
+					title: 'Home.Offices',
+					url: ''
+				},
+				{
+					title: 'Home.JoinWithUs',
+					url: UrlList.joinWithUs
+				}
+			]
+		}
+	])
+	const onItem = (item) => {
+		if (item.url) {
+			openView(item.url)
+		} else if (item.name) {
+			router.push({ name: item.name })
+		}
+	}
 </script>
 
 <style lang="less">

src/views/shoppingCart/sc-item.vue

@@ -7,9 +7,9 @@
 		}"
 	>
 		<slot name="checkbox" />
-		<img :src="info.cover" />
+		<img v-loadimg="info.cover" />
 		<div class="content">
-			<div class="title">{{ info.title }}</div>
+			<div class="title" :title="info.title">{{ info.title }}</div>
 			<div class="brand" v-if="showBrand" @click="handleBrandClick">
 				<span class="icon"><svg-icon name="order-shop" size="24" /></span>
 				<span class="text">{{ info.brand }}</span>
@@ -107,6 +107,7 @@
 			flex: 1;
 			margin: var(--sc-item-content-margin, 0 4rem);
 			align-self: var(--sc-item-content-align-self);
+			overflow: hidden;
 			> * {
 				margin-bottom: var(--sc-item-margin-bottom, 1.6rem);
 				&:last-child {
@@ -117,6 +118,14 @@
 				font-family: KaiseiOpti-Bold;
 				font-size: var(--sc-item-title-font-size, 2.4rem);
 				color: var(--sc-item-title-color, #232323);
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				display: -webkit-box;
+				line-clamp: 2;
+				box-orient: vertical;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
 			}
 			> .brand {
 				display: flex;