diff --git a/src/components/market/ItemDetail.vue b/src/components/market/ItemDetail.vue index bb05736..6122ae2 100644 --- a/src/components/market/ItemDetail.vue +++ b/src/components/market/ItemDetail.vue @@ -174,9 +174,6 @@ export default class extends Vue { align-self: flex-end; } - .backButton { - height: 3.75em; - } .top { display: flex; flex-direction: row; @@ -206,12 +203,12 @@ export default class extends Vue { // Phone @include media(' +
+
+ + +
+ +
+ + + + + diff --git a/src/components/market/SearchPanel.vue b/src/components/market/SearchPanel.vue index fd2d769..b5cb79e 100644 --- a/src/components/market/SearchPanel.vue +++ b/src/components/market/SearchPanel.vue @@ -1,5 +1,10 @@ @@ -179,6 +187,9 @@ export default class extends Vue { battleShow = true priceShow = true levelShow = true + hideFilter() { + this.$emit('filter-show', false) + } } diff --git a/src/components/market/SearchResult.vue b/src/components/market/SearchResult.vue index e43d70a..ed7febf 100644 --- a/src/components/market/SearchResult.vue +++ b/src/components/market/SearchResult.vue @@ -2,9 +2,9 @@
- - - +
@@ -24,7 +24,11 @@ import ResultNo from '@/components/market/ResultNo.vue' SortSelect } }) -export default class extends Vue {} +export default class extends Vue { + showFilter() { + this.$emit('filter-show', true) + } +} diff --git a/src/components/market/TopMenu.vue b/src/components/market/TopMenu.vue index 49e4d85..f1ca9ee 100644 --- a/src/components/market/TopMenu.vue +++ b/src/components/market/TopMenu.vue @@ -1,49 +1,58 @@ @@ -62,18 +71,21 @@ export default class extends Vue { --tooltip-margin: 1.875em; --tooltip-arrow-size: 0.75em; } + .top-header .header-menu { display: flex; height: 100%; position: relative; z-index: 1; } + .top-header .header-menu .menu-item { display: flex; justify-content: center; align-items: center; position: relative; } + .top-header .header-menu .menu-item .item { font-weight: bold; font-size: 1.125em; @@ -86,6 +98,7 @@ export default class extends Vue { width: 13.438em; box-sizing: border-box; } + .top-header .header-menu .menu-item .active { background: linear-gradient( 90deg, @@ -95,6 +108,7 @@ export default class extends Vue { margin-left: -2em; clip-path: polygon(15% 0, 100% 0, 85% 100%, 0 100%); } + .active-bottom { border-bottom: 0.3125em #563cb8 solid; width: 120%; @@ -110,6 +124,7 @@ export default class extends Vue { display: flex; justify-content: center; } + .logo { height: 3rem; } @@ -122,14 +137,17 @@ export default class extends Vue { padding-right: 2.5em; z-index: 1; } + .rightContainer .contact { margin-right: 1.875em; } + .rightContainer .contact .span { cursor: pointer; font-size: 1.125em; color: #a796e1; } + .connectButton { border-radius: 0.25em; background: radial-gradient( @@ -142,6 +160,7 @@ export default class extends Vue { padding: 0 1.688em; font-size: 1.125em !important; } + .connectButton span { text-decoration: none; @@ -150,10 +169,15 @@ export default class extends Vue { line-height: 1.33; color: white; } + .avatar { width: 3.125em; height: 3.125em; border-radius: 1.563em; cursor: pointer; } + +@media (max-width: 767px) { + +} diff --git a/src/components/market/TopUserInfo.vue b/src/components/market/TopUserInfo.vue new file mode 100644 index 0000000..c28d1d3 --- /dev/null +++ b/src/components/market/TopUserInfo.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/src/views/Item.vue b/src/views/Item.vue index a7715a4..ba94e88 100644 --- a/src/views/Item.vue +++ b/src/views/Item.vue @@ -1,6 +1,7 @@