jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/CSR-1621

Browse source
This commit is contained in:
Leah Schumann 2023-09-05 07:20:32 -04:00
commit 8c67e8c720
3 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
View file

@ -5,7 +5,7 @@
<label
for="mobileLocationLinkPromptId"
:aria-label="mobileLocationLinkPromptText"
class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
class="form-label fw-bold w-100 ps-4 pe-4 pt-4 text-black"
v-html="mobileLocationLinkPromptText"></label>
<div class="update-mobile-location-text-link">
<textLink
@ -309,4 +309,7 @@ export default {
#mobileLocationLinkPromptId {
white-space: pre-line;
}
.text-black {
color: $black;
}
</style>

1
src/layouts/service-location/service-location.vue
View file

@ -430,6 +430,7 @@ export default {
.question-text {
& > span {
text-align: center;
color: $black;
}
}
</style>

31
src/layouts/vehicle/vehicle.vue
View file

@ -112,11 +112,11 @@ export default {
selectedMake: this.selectedMakefromStore(),
selectedModel: this.selectedModelfromStore(),
selectedStyle: this.selectedStylefromStore(),
carId: this.getCarIdFromStore(),
category: null,
carId: this.getCarIdfromStore(),
category: this.getCategoryfromStore(),
imageUrl: this.getImagefromStore(),
imageVifNumber: null,
imageVifColor: null,
imageVifNumber: this.getImageVifNumberfromStore(),
imageVifColor: this.getImageVifColorfromStore(),
yearOptions: [],
makeOptions: [],
modelOptions: [],
@ -251,9 +251,9 @@ export default {
if (make) {
const result = await this.getModelOptions(this.selectedYear, make);
this.modelOptions = result?.data;
if (this.selectedMakefromStore() !== make) {
if (this.modelOptions.length === 1) this.selectedModel = this.modelOptions[0];
else this.selectedModel = null;
if (this.modelOptions.length === 1) this.selectedModel = this.modelOptions[0];
else {
this.selectedModel = null;
this.selectedStyle = null;
}
} else {
@ -270,10 +270,8 @@ export default {
model
);
this.styleOptions = result?.data;
if (this.selectedModelfromStore() !== model) {
if (this.styleOptions.length === 1) this.selectedStyle = this.styleOptions[0];
else this.selectedStyle = null;
}
if (this.styleOptions.length === 1) this.selectedStyle = this.styleOptions[0];
else this.selectedStyle = null;
} else {
this.styleOptions = [];
this.selectedStyle = null;
@ -385,9 +383,18 @@ export default {
getImagefromStore() {
return store.getters.vehicle.imageUrl;
},
getCarIdFromStore() {
getCarIdfromStore() {
return store.getters.vehicle.carId;
},
getCategoryfromStore() {
return store.getters.vehicle.category;
},
getImageVifNumberfromStore() {
return store.getters.vehicle.imageVifNumber;
},
getImageVifColorfromStore() {
return store.getters.vehicle.imageVifColor;
},
},
components: {