From d0dc9b2af006fb8af4cfeed50c61e1c79d358241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Wed, 27 May 2026 09:29:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/home/{design-bg.jpg => aida-bg.jpg} | Bin src/utils/tools.ts | 4 ++++ src/views/home/index.vue | 4 ++-- .../home/{section-design.vue => section-aida.vue} | 13 +++++++------ src/views/home/section-digital-items1.vue | 8 +++++++- src/views/home/section-footer.vue | 9 ++++++--- src/views/shoppingCart/sc-list-null.vue | 1 - src/views/shoppingCart/sc-list.vue | 11 ++++++++--- 8 files changed, 34 insertions(+), 16 deletions(-) rename src/assets/images/home/{design-bg.jpg => aida-bg.jpg} (100%) rename src/views/home/{section-design.vue => section-aida.vue} (73%) diff --git a/src/assets/images/home/design-bg.jpg b/src/assets/images/home/aida-bg.jpg similarity index 100% rename from src/assets/images/home/design-bg.jpg rename to src/assets/images/home/aida-bg.jpg diff --git a/src/utils/tools.ts b/src/utils/tools.ts index dab25f2..2ddd80c 100644 --- a/src/utils/tools.ts +++ b/src/utils/tools.ts @@ -210,4 +210,8 @@ export function FormatBytes(bytes, options: { decimals?: number, unitBig?: boole const i = Math.floor(Math.log(bytes) / Math.log(k)); const value = bytes / Math.pow(k, i); return `${Number(value.toFixed(decimals))} ${sizes[i]}`; +} + +export const openAida = () => { + window.open('https://www.aida.com.hk/', '_blank') } \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 20241e1..ad62926 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -2,7 +2,7 @@
- + @@ -13,7 +13,7 @@ import { computed } from 'vue' import SectionIndex from './section-index.vue' import SectionDesigner from './section-designer.vue' - import SectionDesign from './section-design.vue' + import SectionAida from './section-aida.vue' import SectionDigitalItems1 from './section-digital-items1.vue' import SectionDigitalItems2 from './section-digital-items2.vue' import SectionFooter from './section-footer.vue' diff --git a/src/views/home/section-design.vue b/src/views/home/section-aida.vue similarity index 73% rename from src/views/home/section-design.vue rename to src/views/home/section-aida.vue index 833f868..ade0002 100644 --- a/src/views/home/section-design.vue +++ b/src/views/home/section-aida.vue @@ -1,24 +1,25 @@ \ No newline at end of file diff --git a/src/views/shoppingCart/sc-list.vue b/src/views/shoppingCart/sc-list.vue index dd7de06..b5ec69c 100644 --- a/src/views/shoppingCart/sc-list.vue +++ b/src/views/shoppingCart/sc-list.vue @@ -3,7 +3,7 @@
- {{ title || 'Shopping Cart' }} + {{ title || $t('ShoppingCart.title') }} @@ -15,22 +15,32 @@ :indeterminate="selectedCount === 0 ? false : selectedCount < maxLength" @click="handleAllAllClick" /> - {{ selectedCount }}  Selected + {{ + $t('Wardrobe.assets.selectedCount', { count: selectedCount }) + }}
-
Select All
-
Deselect All
+
+ {{ $t('Wardrobe.assets.selectAll') }} +
+
+ {{ $t('Wardrobe.assets.deselectAll') }} +
- +
@@ -40,8 +50,8 @@
@@ -85,6 +95,8 @@ import scItem from './sc-item.vue' import scListNull from './sc-list-null.vue' import { useRouter } from 'vue-router' + import { useI18n } from 'vue-i18n' + const { t } = useI18n() const router = useRouter() const emit = defineEmits(['close', 'selected-change']) const props = defineProps({ @@ -103,19 +115,19 @@ const sortBy = ref('DateAdded') const sortByOptions = ref([ { - label: 'Best Selling', + label: 'digitalItem.BestSelling', value: 'BestSelling' }, { - label: 'Price: Low to High', + label: 'digitalItem.Price', value: 'PriceLowToHigh' }, { - label: 'Selected First', + label: 'digitalItem.SelectedFirst', value: 'SelectedFirst' }, { - label: 'Date Added', + label: 'digitalItem.DateAdded', value: 'DateAdded' } ]) @@ -177,7 +189,7 @@ handleSelectedChange() }) const handleRemoveClick = (value: any) => { - ElMessageBox.confirm('Are you sure to remove this item?') + ElMessageBox.confirm(t('ShoppingCart.removeTip')) .then(() => { RemoveShoppingCartItem({ listingId: value.listingId }).then(() => { GetList() @@ -365,6 +377,7 @@ height: 4.6rem; --button-font-size: 1.4rem; margin-top: 2rem; + text-transform: uppercase; } } } From 92c625fb89a5acfad7ffbfd7de9c5b2baecf5b01 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Wed, 27 May 2026 11:16:15 +0800 Subject: [PATCH 4/7] fix --- src/views/brand/index.vue | 19 ++++++++++++------- src/views/brandDetail/commodity-list.vue | 4 ++-- src/views/digitalDetail/index.vue | 9 +++++++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/views/brand/index.vue b/src/views/brand/index.vue index 4f50ba0..52e233a 100644 --- a/src/views/brand/index.vue +++ b/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);
-
+
diff --git a/src/views/brandDetail/commodity-list.vue b/src/views/brandDetail/commodity-list.vue index 32bd09f..3d31377 100644 --- a/src/views/brandDetail/commodity-list.vue +++ b/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{ diff --git a/src/views/digitalDetail/index.vue b/src/views/digitalDetail/index.vue index 95f03a9..12b8211 100644 --- a/src/views/digitalDetail/index.vue +++ b/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({})
-
{{ detail.shopName }}
+
{{ detail.shopName }}
{{ $t('digitalDetail.ReleaseIn') }} {{ detail.updateTime }}
@@ -301,6 +305,7 @@ defineExpose({}) font-size: 3rem; line-height: 120%; margin-bottom: 1rem; + cursor: pointer; } .img-price{ font-family: KaiseiOpti-Bold; From 22ebbba451e9703a0a7b58ffc2a3cce7f081e26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Wed, 27 May 2026 11:16:40 +0800 Subject: [PATCH 5/7] aaa --- src/views/shoppingCart/sc-item.vue | 14 ++++++++++++-- src/views/shoppingCart/sc-list.vue | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/shoppingCart/sc-item.vue b/src/views/shoppingCart/sc-item.vue index b179360..f03423a 100644 --- a/src/views/shoppingCart/sc-item.vue +++ b/src/views/shoppingCart/sc-item.vue @@ -10,7 +10,7 @@
{{ info.title }}
-
+
{{ info.brand }}
@@ -49,7 +49,9 @@