diff --git a/package-lock.json b/package-lock.json index 646ae0f..ea04592 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "pinia": "^2.0.32", "pinia-persistedstate-plugin": "^0.1.0", "pinia-plugin-persistedstate": "^3.1.0", + "swiper": "^12.1.3", "vue": "^3.2.47", "vue-i18n": "^11.2.8", "vue-router": "^4.1.6" @@ -7611,6 +7612,25 @@ "node": ">= 10" } }, + "node_modules/swiper": { + "version": "12.1.3", + "resolved": "https://registry.npmmirror.com/swiper/-/swiper-12.1.3.tgz", + "integrity": "sha512-XcWlVmkHFICI4fuoJKgbp8PscDcS4i7pBH8nwJRBi3dpQvhCySwsWRYm4bOf/BzKVWkHOYaFw7qz9uBSrY3oug==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "license": "MIT", + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz", @@ -14245,6 +14265,11 @@ } } }, + "swiper": { + "version": "12.1.3", + "resolved": "https://registry.npmmirror.com/swiper/-/swiper-12.1.3.tgz", + "integrity": "sha512-XcWlVmkHFICI4fuoJKgbp8PscDcS4i7pBH8nwJRBi3dpQvhCySwsWRYm4bOf/BzKVWkHOYaFw7qz9uBSrY3oug==" + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz", diff --git a/package.json b/package.json index 7af1ef2..67c6294 100644 --- a/package.json +++ b/package.json @@ -17,14 +17,15 @@ "crypto-js": "^4.2.0", "element-plus": "^2.13.2", "gsap": "^3.13.0", - "vue-i18n": "^11.2.8", "markdown-it": "^14.1.0", "md5": "^2.3.0", "normalize.css": "^8.0.1", "pinia": "^2.0.32", "pinia-persistedstate-plugin": "^0.1.0", "pinia-plugin-persistedstate": "^3.1.0", + "swiper": "^12.1.3", "vue": "^3.2.47", + "vue-i18n": "^11.2.8", "vue-router": "^4.1.6" }, "devDependencies": { @@ -57,4 +58,4 @@ "npm run lint" ] } -} \ No newline at end of file +} diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 93fc772..59eb23e 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -19,6 +19,7 @@ body, width: 100%; height: 100%; overflow: hidden; + font-family: 'KaiseiOpti-Medium'; } @keyframes loading { 0% { diff --git a/src/assets/css/style.less b/src/assets/css/style.less index 7aeebd6..9aad643 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -21,7 +21,7 @@ body, width: 100%; height: 100%; overflow: hidden; - // font-family: 'Medium'; + font-family: 'KaiseiOpti-Medium'; } @keyframes loading { diff --git a/src/assets/icons/collectionStory/back.svg b/src/assets/icons/collectionStory/back.svg new file mode 100644 index 0000000..f8c01bc --- /dev/null +++ b/src/assets/icons/collectionStory/back.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/collectionStory/scrollingLearnMore.svg b/src/assets/icons/collectionStory/scrollingLearnMore.svg new file mode 100644 index 0000000..ec490ba --- /dev/null +++ b/src/assets/icons/collectionStory/scrollingLearnMore.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/collectionStory/swiperRight.svg b/src/assets/icons/collectionStory/swiperRight.svg new file mode 100644 index 0000000..5aac38f --- /dev/null +++ b/src/assets/icons/collectionStory/swiperRight.svg @@ -0,0 +1,2 @@ + + diff --git a/src/assets/icons/share.svg b/src/assets/icons/share.svg new file mode 100644 index 0000000..9f4fb4b --- /dev/null +++ b/src/assets/icons/share.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/collectionStory/Rectangle.png b/src/assets/images/collectionStory/Rectangle.png new file mode 100644 index 0000000..0085be0 Binary files /dev/null and b/src/assets/images/collectionStory/Rectangle.png differ diff --git a/src/assets/images/collectionStory/collection_story_banner.png b/src/assets/images/collectionStory/collection_story_banner.png new file mode 100644 index 0000000..5dee32c Binary files /dev/null and b/src/assets/images/collectionStory/collection_story_banner.png differ diff --git a/src/views/collectionStory/detail/coreConcept.vue b/src/views/collectionStory/detail/coreConcept.vue new file mode 100644 index 0000000..f6b0d95 --- /dev/null +++ b/src/views/collectionStory/detail/coreConcept.vue @@ -0,0 +1,137 @@ + + + \ No newline at end of file diff --git a/src/views/collectionStory/detail/feelingWithAiDA.vue b/src/views/collectionStory/detail/feelingWithAiDA.vue new file mode 100644 index 0000000..25aff60 --- /dev/null +++ b/src/views/collectionStory/detail/feelingWithAiDA.vue @@ -0,0 +1,84 @@ + + + \ No newline at end of file diff --git a/src/views/collectionStory/detail/index.vue b/src/views/collectionStory/detail/index.vue new file mode 100644 index 0000000..03c2245 --- /dev/null +++ b/src/views/collectionStory/detail/index.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/src/views/collectionStory/detail/inspiration.vue b/src/views/collectionStory/detail/inspiration.vue new file mode 100644 index 0000000..e3ebe36 --- /dev/null +++ b/src/views/collectionStory/detail/inspiration.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file diff --git a/src/views/collectionStory/index.vue b/src/views/collectionStory/index.vue index e29ef80..617a1c6 100644 --- a/src/views/collectionStory/index.vue +++ b/src/views/collectionStory/index.vue @@ -1,11 +1,13 @@ @@ -25,5 +56,92 @@ const {} = toRefs(data); width: 100%; height: 100%; position: relative; + overflow-y: auto; + .first-screen{ + position: relative; + height: auto; + display: flex; + overflow: hidden; + > .back{ + position: absolute; + top: 2.4rem; + left: 2.4rem; + display: flex; + align-items: center; + gap: .8rem; + color: #fff; + cursor: pointer; + > .text{ + font-size: 2rem; + font-weight: 500; + white-space: nowrap; + } + } + > .title-content{ + width: 100%; + height: 63.2rem; + margin-top: 24.8rem; + background: linear-gradient(180deg, rgba(0, 0, 0, 0) 38.37%, rgba(0, 0, 0, 0.192) 90.74%); + padding: 0 4rem; + > .title-box{ + margin-top: 36.7rem; + color: #fff; + display: flex; + justify-content: space-between; + align-items: center; + > .left{ + font-family: 'KaiseiOpti-Bold'; + font-weight: 700; + > .title{ + font-size: 6rem; + line-height: 6rem; + } + > .info{ + margin-top: 1.7rem; + font-size: 1.8rem; + line-height: 100%; + vertical-align: bottom; + } + } + > .right{ + > .info{ + font-weight: 500; + font-size: 1.8rem; + line-height: 100%; + text-align: right; + } + } + } + } + .scrolling-learn-more{ + position: absolute; + bottom: 2.1rem; + left: 50%; + transform: translateX(-50%); + display: flex; + flex-direction: column; + color: #fff; + > div{ + font-family: 'KaiseiOpti-Regular'; + font-weight: 400; + font-size: 1.4rem; + line-height: 100%; + text-align: center; + margin-bottom: 1.5rem; + white-space: nowrap; + } + } + .banner{ + width: 100%; + position: absolute; + z-index: -1; + } + } + .content{ + width: 100%; + min-height: 100%; + height: 100%; + } + } \ No newline at end of file