diff --git a/Dockerfile b/Dockerfile index 372cf3f..910e2cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,17 @@ WORKDIR /app COPY --from=build /app/.output/ ./ ENV PORT=80 + ENV BSPB_MERCHANT_ID=TT00001 ENV BSPB_MERCHANT_PASSWORD=ztTGre1OBZg3 ENV BSPB_API_URL=https://pgtest.bspb.ru:5443 -ENV VITE_BASE_URL=https://paxton.koptilnya.xyz +ENV VITE_YANDEX_MAPS_TOKEN=13f4c06b-cb7e-4eeb-81f1-af52f12587b2 + +ENV VITE_YANDEX_B2B_BASE_URL=https://b2b-authproxy.taxi.yandex.net/api/b2b/platform +ENV VITE_YANDEX_B2B_TOKEN=y0__xCqxdamBhjVmRUgrIqL1BRb-Au03gwwIZjInV31ftl35o5nNA + +ENV VITE_BASE_URL=http://localhost:3000 EXPOSE 80 diff --git a/pages/checkout/PayBlock.vue b/components/PayBlock.vue similarity index 93% rename from pages/checkout/PayBlock.vue rename to components/PayBlock.vue index 5356cfc..1cd335e 100644 --- a/pages/checkout/PayBlock.vue +++ b/components/PayBlock.vue @@ -4,7 +4,7 @@ товары {{ `(${cart?.line_items?.length} шт)` }} - итого {{ cartSum }} + diff --git a/components/ProductPrice.vue b/components/ProductPrice.vue index 08dcb79..faaeae3 100644 --- a/components/ProductPrice.vue +++ b/components/ProductPrice.vue @@ -1,6 +1,12 @@ - {{ price }} + + {{ text }} {{ price }} + + + + {{ text }} {{ price }} + @@ -10,12 +16,20 @@ defineProps({ type: [String, Number], required: true, }, + isHeadline: { + type: Boolean, + default: true, + }, + text: { + type: String, + default: '', + }, }) diff --git a/nuxt.config.ts b/nuxt.config.ts index 0c85087..8af6600 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -15,7 +15,11 @@ export default defineNuxtConfig({ autoImports: true, }, ], + 'vue-yandex-maps/nuxt', ], + yandexMaps: { + apikey: process.env.VITE_YANDEX_MAPS_TOKEN, + }, css: ['~/assets/css/main.css', '~/assets/scss/main.scss'], i18n: { locales: [ diff --git a/package.json b/package.json index 86aee6c..b87b5d5 100644 --- a/package.json +++ b/package.json @@ -30,12 +30,12 @@ "swiper": "^12.0.2", "typescript": "^5.6.3", "vue": "^3.5.17", - "vue-router": "^4.5.1" + "vue-router": "^4.5.1", + "vue-yandex-maps": "^2.2.3" }, "devDependencies": { "@antfu/eslint-config": "^4.13.2", "@nuxt/devtools": "latest", - "@yandex/ymaps3-types": "^1.0.17734864", "eslint": "^9.27.0", "eslint-plugin-format": "^1.0.1", "sass": "^1.71.0", diff --git a/pages/cart.vue b/pages/cart.vue index 4d81260..c36908b 100644 --- a/pages/cart.vue +++ b/pages/cart.vue @@ -15,7 +15,7 @@