From 32d90ba74dc08b8db566b9a5a7b05c4754c37447 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Fri, 14 Apr 2023 07:44:17 -0400 Subject: [PATCH] WIP --- .../shop-list-button/shop-list-button.vue | 62 ++++++++- .../shop-question/shop-question.vue | 120 +++++++----------- src/store/index.js | 2 +- 3 files changed, 102 insertions(+), 82 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue index 898194951..2fa1b1392 100644 --- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue +++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue @@ -8,10 +8,14 @@ class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4">
{{ buttonLabel }} - {{ buttonLabelSubCopy }} -
- {{ buttonAuxillaryCopy }} -
+ {{ + buttonLabelSubCopy + }} +
+ {{ buttonAuxillaryCopy }} +
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue index c8066eb2f..5d6eaba7f 100644 --- a/src/layouts/service-location/shop-question/shop-question.vue +++ b/src/layouts/service-location/shop-question/shop-question.vue @@ -12,7 +12,6 @@ buttonTypeString="shopListButton" :buttonTypeObject="shopListButton" class="radioQuestion" - isOverflowScrollable :questionText="questionText" :answers="answers" groupName="ChooseShop" @@ -21,6 +20,7 @@ isRequired /> { var end = this.shopIndex + n; var part = array.slice(this.shopIndex, end); this.shopIndex = end < l ? end : this.shopIndex.length - 1; return part; - }; + }; }, - getNextShopsFromList() { + async getNextShopsFromList() { const nextShop = this.shopIterator(this.shops, 3); // Map API result data @@ -134,12 +134,18 @@ export default { if (this.answers.length === 0) { this.answers = mappedData; } else { - mappedData.forEach(shop => { + mappedData.forEach((shop) => { this.answers.push(shop); - }) + }); } - - } + + await this.$nextTick(); + window.scrollTo(0,document.body.scrollHeight); + + // const shopQuestion = document.getElementsByClassName("shop-question")[0]; + + // shopQuestion.scrollIntoView({ behavior: "smooth", block: "end", inline: "end"}); + }, }, watch: { serviceZipCode: { @@ -154,78 +160,38 @@ export default {