Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

order process improved #59

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
- 05.2020 - В футере добавить форму для ввода email и кнопку. Необходимо добавить валидацию email. Пока пусть отправляет данные на https://vuemmerce.herokuapp.com/api/new-subscription и всегда показывает всплывающее окно об успешной подписке. by @Vshinf
- 05.2020 - Добавлена форма для фильтрации товаров (цена и произоводитель) by @iskangiz
- 05.2020 - Добавить форму обратной связи by @Dalion
- 07.2020 - Добавлен ввоод почты/телефона при создании заказа неавторизованным пользователем, отправка данных на api/order
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vuemmerce",
"version": "0.8.7",
"version": "0.8.8",
"private": true,
"description": "Responsive ecommerce template built with Vue.js",
"author": "ivan lori <[email protected]>",
Expand Down
28 changes: 26 additions & 2 deletions src/components/order_page/CustomStepper.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<b-tabs v-model="activeTab" position="is-centered" class="block" type="is-toggle" expanded>
<b-tab-item v-for="(stepTab, index) in stepTabs" :label="stepTab.title" :key="index">
<b-tab-item v-for="(stepTab, index) in tabs" :label="stepTab.title" :key="index">
<slot :name="'step' + (index + 1)">Контент для этого шага не указан</slot>

<button v-if="(index + 1) !== stepTabs.length"
class="is-pulled-right button is-primary"
@click="activeTab = index + 1">
@click="nextTab(index)">
Продолжить
</button>
<button v-else class="is-pulled-right button is-primary"
Expand All @@ -31,13 +31,37 @@
submit: {
type: Function,
required: true
},
next: {
type: Function,
required: false
},
filterIndex: {
type: Number,
required: false
}
},
data: function() {
return {
activeTab: 0
};
},
computed: {
tabs: function() {
if (this.filterIndex >= 0) {
return this.stepTabs.filter(st => this.stepTabs.indexOf(st) !== this.filterIndex)
}
return this.stepTabs;
}
},
methods: {
nextTab: function(index) {
if (this.next) {
this.next(index);
}
this.activeTab = index + 1
}
}
};
</script>

Loading