diff --git a/public/images/home/digital-items-1.png b/public/images/home/digital-items-1.png new file mode 100644 index 0000000..6828ffd Binary files /dev/null and b/public/images/home/digital-items-1.png differ diff --git a/public/images/home/digital-items-2.jpg b/public/images/home/digital-items-2.jpg new file mode 100644 index 0000000..fb5c275 Binary files /dev/null and b/public/images/home/digital-items-2.jpg differ diff --git a/public/images/home/digital-items-3.png b/public/images/home/digital-items-3.png new file mode 100644 index 0000000..d14b1c0 Binary files /dev/null and b/public/images/home/digital-items-3.png differ diff --git a/public/images/home/digital-items-4.png b/public/images/home/digital-items-4.png new file mode 100644 index 0000000..d3f0fdb Binary files /dev/null and b/public/images/home/digital-items-4.png differ diff --git a/public/images/home/digital-items-5.png b/public/images/home/digital-items-5.png new file mode 100644 index 0000000..23d247e Binary files /dev/null and b/public/images/home/digital-items-5.png differ diff --git a/public/images/home/digital-items-6.png b/public/images/home/digital-items-6.png new file mode 100644 index 0000000..63e5b0a Binary files /dev/null and b/public/images/home/digital-items-6.png differ diff --git a/public/images/home/digital-items-7.png b/public/images/home/digital-items-7.png new file mode 100644 index 0000000..833cd73 Binary files /dev/null and b/public/images/home/digital-items-7.png differ diff --git a/public/images/home/digital-items-8.png b/public/images/home/digital-items-8.png new file mode 100644 index 0000000..c809e5e Binary files /dev/null and b/public/images/home/digital-items-8.png differ diff --git a/src/assets/icons/order/shop.svg b/src/assets/icons/order/shop.svg index 2aa4cae..07a535d 100644 --- a/src/assets/icons/order/shop.svg +++ b/src/assets/icons/order/shop.svg @@ -1,5 +1,34 @@ - - - - + + + + + + + + diff --git a/src/components/CommodityItem.vue b/src/components/CommodityItem.vue index 1e470e2..2eb7ef8 100644 --- a/src/components/CommodityItem.vue +++ b/src/components/CommodityItem.vue @@ -41,7 +41,7 @@
- +
diff --git a/src/directives/avatarLoad.js b/src/directives/avatarLoad.js index 7965abb..1f11e7f 100644 --- a/src/directives/avatarLoad.js +++ b/src/directives/avatarLoad.js @@ -14,7 +14,7 @@ export default { }; function loadImage(el, src) { if (!src) return - + if (el.src === src) return const img = new Image() img.src = src img.onload = () => { diff --git a/src/directives/loadimg.js b/src/directives/loadimg.js index ef3ede3..9cec84a 100644 --- a/src/directives/loadimg.js +++ b/src/directives/loadimg.js @@ -1,6 +1,10 @@ +import img from '@/assets/images/shopping-cart-null.png' // 加载图片 export default { name: 'loadimg', + beforeMount(el, binding) { + if (!el.src) el.src = img + }, mounted(el, binding) { const src = binding.value if (el.src === src) return diff --git a/src/utils/UrlList.js b/src/utils/UrlList.js index 464ac2f..9b42d1d 100644 --- a/src/utils/UrlList.js +++ b/src/utils/UrlList.js @@ -3,7 +3,9 @@ export const UrlList = { codeCreate: 'https://www.code-create.com/', terms: 'https://www.code-create.com.hk/terms-of-use/', privacy: 'https://www.code-create.com.hk/privacy-policy/', - + faq: 'https://code-create.com.hk/help-centre/', + aboutUs: 'https://code-create.com.hk/about-us/', + joinWithUs: 'https://code-create.com.hk/contact-us/', } export const openView = (url) => { window.open(url, '_blank') diff --git a/src/views/brandDetail/commodity-list.vue b/src/views/brandDetail/commodity-list.vue index 3d31377..0919764 100644 --- a/src/views/brandDetail/commodity-list.vue +++ b/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%; diff --git a/src/views/brandDetail/index.vue b/src/views/brandDetail/index.vue index e2ccba5..d091f9a 100644 --- a/src/views/brandDetail/index.vue +++ b/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%; diff --git a/src/views/digitalDetail/index.vue b/src/views/digitalDetail/index.vue index fdb2920..42b6d7d 100644 --- a/src/views/digitalDetail/index.vue +++ b/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; diff --git a/src/views/digitalItem/commodity-list.vue b/src/views/digitalItem/commodity-list.vue index 5cd1701..c543f64 100644 --- a/src/views/digitalItem/commodity-list.vue +++ b/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%; diff --git a/src/views/home/section-digital-items1.vue b/src/views/home/section-digital-items1.vue index 11a3a7f..6446652 100644 --- a/src/views/home/section-digital-items1.vue +++ b/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 = () => { diff --git a/src/views/home/section-digital-items2.vue b/src/views/home/section-digital-items2.vue index 34eca01..5116c20 100644 --- a/src/views/home/section-digital-items2.vue +++ b/src/views/home/section-digital-items2.vue @@ -17,25 +17,25 @@ diff --git a/src/views/home/section-footer.vue b/src/views/home/section-footer.vue index 2e51c4c..0446d35 100644 --- a/src/views/home/section-footer.vue +++ b/src/views/home/section-footer.vue @@ -21,26 +21,11 @@
-
-
{{ $t('Home.Help') }}
-
{{ $t('Home.FAQ') }}
-
{{ $t('Home.MyAccount') }}
-
{{ $t('Home.MyOrders') }}
-
{{ $t('Home.PaymentInvoices') }}
-
{{ $t('Home.CopyrightLicense') }}
-
-
-
{{ $t('Home.Polices') }}
-
{{ $t('Home.Legal') }}
-
{{ $t('Home.PrivacyPolicy') }}
-
{{ $t('Home.CookiesSettings') }}
-
{{ $t('Home.PurchaseConditions') }}
-
-
-
{{ $t('Home.Company') }}
-
{{ $t('Home.AboutUs') }}
-
{{ $t('Home.Offices') }}
-
{{ $t('Home.JoinWithUs') }}
+
+
{{ $t(v.title) }}
+
+ {{ $t(item.title) }} +
@@ -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 }) + } + }