From d916977fc896b24d9980e6eeb9fae8e118f2c8cc Mon Sep 17 00:00:00 2001 From: Konstantin Vinokurov Date: Thu, 2 Jun 2022 23:00:58 +0700 Subject: [PATCH] Vue, back edited,added --- frontend/src/components/ProfileAbout.vue | 4 ++-- frontend/src/components/TheHeader.vue | 15 ++++++++++++++- frontend/src/views/CatalogView.vue | 17 +++++++++++++++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/ProfileAbout.vue b/frontend/src/components/ProfileAbout.vue index 46ee91a..2f053c2 100644 --- a/frontend/src/components/ProfileAbout.vue +++ b/frontend/src/components/ProfileAbout.vue @@ -22,8 +22,8 @@ export default { computed: { ...mapGetters({ user: 'user' }), name() { - return this.user.last_name && this.user.first_name && this.user.middle_name - ? `${this.user.last_name} ${this.user.first_name} ${this.user.middle_name}` + return this.user.last_name && this.user.first_name + ? `${this.user.last_name} ${this.user.first_name} ${this.user.middle_name ?? ''}` : 'Не указано'; } } diff --git a/frontend/src/components/TheHeader.vue b/frontend/src/components/TheHeader.vue index f2bf2b3..1812f11 100644 --- a/frontend/src/components/TheHeader.vue +++ b/frontend/src/components/TheHeader.vue @@ -57,7 +57,20 @@ diff --git a/frontend/src/views/CatalogView.vue b/frontend/src/views/CatalogView.vue index 5f18466..6985ac3 100644 --- a/frontend/src/views/CatalogView.vue +++ b/frontend/src/views/CatalogView.vue @@ -133,10 +133,23 @@ export default { const offers = await offerService.filter(this.sortParams); this.offers = offers.data.data; }, + async addSearchParam(value) { + if (!value || !value.q) { + this.sortParams = this.sortParams.filter((e) => e.name !== 'search'); + this.reloadOffers(); + return; + } + + await this.addSortParam('search', value.q); + } }, async mounted() { - const offers = await offerService.all(); - this.offers = offers.data.data; + await this.addSearchParam(this.$route.query); + }, + watch: { + '$route.query'(value) { + this.addSearchParam(value); + } } }