Commit 52612a6a12310737063bb390de495feb80cdbfed
1 parent
8444d69f
fix: 修改热销,prod2-46/47
Showing
5 changed files
with
56 additions
and
11 deletions
components/EnergyDensityCalculator.vue
@@ -1230,7 +1230,7 @@ const showSuffix = ref(true); | @@ -1230,7 +1230,7 @@ const showSuffix = ref(true); | ||
1230 | const result = ref(); | 1230 | const result = ref(); |
1231 | onMounted(() => { | 1231 | onMounted(() => { |
1232 | // $fetch("/mshop/cal/battery/cellOutputResults", { | 1232 | // $fetch("/mshop/cal/battery/cellOutputResults", { |
1233 | - $fetch("/mshop/api/front/cal/battery/cellOutputResults", { | 1233 | + $fetch("/api/front/cal/battery/cellOutputResults", { |
1234 | method: "POST", | 1234 | method: "POST", |
1235 | body: initBody.value, | 1235 | body: initBody.value, |
1236 | }).then((res) => { | 1236 | }).then((res) => { |
@@ -1490,7 +1490,7 @@ onMounted(() => { | @@ -1490,7 +1490,7 @@ onMounted(() => { | ||
1490 | 1490 | ||
1491 | const toCompute = async () => { | 1491 | const toCompute = async () => { |
1492 | // $fetch("/mshop/cal/battery/cellOutputResults", { | 1492 | // $fetch("/mshop/cal/battery/cellOutputResults", { |
1493 | - $fetch("/mshop/api/front/cal/battery/cellOutputResults", { | 1493 | + $fetch("/api/front/cal/battery/cellOutputResults", { |
1494 | method: "POST", | 1494 | method: "POST", |
1495 | body: requestBody.value, | 1495 | body: requestBody.value, |
1496 | }).then((res) => { | 1496 | }).then((res) => { |
deploy/prod2.sh
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # 变量定义 | 2 | # 变量定义 |
3 | -LAST_TAG="1.0.45" | ||
4 | -TAG="1.0.46" | 3 | +LAST_TAG="1.0.46" |
4 | +TAG="1.0.47" | ||
5 | TARGET_PATH="/root/web/canrud-outside-nuxt-front" | 5 | TARGET_PATH="/root/web/canrud-outside-nuxt-front" |
6 | DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front" | 6 | DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front" |
7 | IMAGE_NAME="canrud-outside-front" | 7 | IMAGE_NAME="canrud-outside-front" |
nuxt.config.ts
@@ -55,8 +55,8 @@ export default defineNuxtConfig({ | @@ -55,8 +55,8 @@ export default defineNuxtConfig({ | ||
55 | // target: process.env.BASE_URL || 'http://39.108.227.113:8002/shop', // 目标接口域名 | 55 | // target: process.env.BASE_URL || 'http://39.108.227.113:8002/shop', // 目标接口域名 |
56 | changeOrigin: true, // 表示是否跨域 | 56 | changeOrigin: true, // 表示是否跨域 |
57 | }, | 57 | }, |
58 | - "/mshop": { | ||
59 | - target: "http://www.canrd.com/mshop", | 58 | + "/api/front/cal": { |
59 | + target: "http://www.canrd.com/mshop/api/front/cal", | ||
60 | // proxy: "http://127.0.0.1:8002/shop/**", | 60 | // proxy: "http://127.0.0.1:8002/shop/**", |
61 | // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' | 61 | // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' |
62 | changeOrigin: true, // 表示是否跨域 | 62 | changeOrigin: true, // 表示是否跨域 |
@@ -70,8 +70,8 @@ export default defineNuxtConfig({ | @@ -70,8 +70,8 @@ export default defineNuxtConfig({ | ||
70 | // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' | 70 | // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' |
71 | }, | 71 | }, |
72 | 72 | ||
73 | - "/mshop/**": { | ||
74 | - proxy: "http://www.canrd.com/mshop/**", | 73 | + "/api/front/cal/**": { |
74 | + proxy: "http://www.canrd.com/mshop/api/front/cal/**", | ||
75 | // proxy: "http://127.0.0.1:8002/shop/**", | 75 | // proxy: "http://127.0.0.1:8002/shop/**", |
76 | // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' | 76 | // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' |
77 | }, | 77 | }, |
pages/index.vue
@@ -421,7 +421,20 @@ button .recommendButton { | @@ -421,7 +421,20 @@ button .recommendButton { | ||
421 | 421 | ||
422 | .recommend-left-box { | 422 | .recommend-left-box { |
423 | } | 423 | } |
424 | - | 424 | +@media screen and (min-width: 1537px) { |
425 | + .recommend-img-left { | ||
426 | + width: 26px; | ||
427 | + height: 27px; | ||
428 | + margin-right: 20px; | ||
429 | + } | ||
430 | +} | ||
431 | +@media screen and (min-width: 1537px) { | ||
432 | + .recommend-img-right { | ||
433 | + width: 26px; | ||
434 | + height: 27px; | ||
435 | + margin-left: 20px; | ||
436 | + } | ||
437 | +} | ||
425 | .recommend-img-left { | 438 | .recommend-img-left { |
426 | width: 26px; | 439 | width: 26px; |
427 | height: 27px; | 440 | height: 27px; |
pages/products/index.vue
@@ -576,14 +576,14 @@ const hotLength = computed(() => | @@ -576,14 +576,14 @@ const hotLength = computed(() => | ||
576 | .tabs { | 576 | .tabs { |
577 | border-bottom: 2px solid #1f88e5; | 577 | border-bottom: 2px solid #1f88e5; |
578 | margin: 10px auto 40px; | 578 | margin: 10px auto 40px; |
579 | - width: 78%; | 579 | + width: 77%; |
580 | } | 580 | } |
581 | } | 581 | } |
582 | @media screen and (max-width: 1280px) { | 582 | @media screen and (max-width: 1280px) { |
583 | .tabs { | 583 | .tabs { |
584 | border-bottom: 2px solid #1f88e5; | 584 | border-bottom: 2px solid #1f88e5; |
585 | margin: 10px auto 40px; | 585 | margin: 10px auto 40px; |
586 | - width: 92%; | 586 | + width: 92.5%; |
587 | } | 587 | } |
588 | } | 588 | } |
589 | /* .tabs { | 589 | /* .tabs { |
@@ -752,6 +752,38 @@ button .recommendButton { | @@ -752,6 +752,38 @@ button .recommendButton { | ||
752 | margin-left: 30px; | 752 | margin-left: 30px; |
753 | margin-bottom: 60px; | 753 | margin-bottom: 60px; |
754 | } | 754 | } |
755 | +@media screen and (max-width: 1536px) and (min-width: 1281px) { | ||
756 | + .recommend-img-left { | ||
757 | + width: 26px; | ||
758 | + height: 27px; | ||
759 | + margin-right: 30px; | ||
760 | + margin-bottom: 60px; | ||
761 | + } | ||
762 | +} | ||
763 | +@media screen and (max-width: 1536px) and (min-width: 1281px) { | ||
764 | + .recommend-img-right { | ||
765 | + width: 26px; | ||
766 | + height: 27px; | ||
767 | + margin-left: 30px; | ||
768 | + margin-bottom: 60px; | ||
769 | + } | ||
770 | +} | ||
771 | +@media screen and (min-width: 1600px) { | ||
772 | + .recommend-img-left { | ||
773 | + width: 26px; | ||
774 | + height: 27px; | ||
775 | + margin-right: 70px; | ||
776 | + margin-bottom: 60px; | ||
777 | + } | ||
778 | +} | ||
779 | +@media screen and (min-width: 1600px) { | ||
780 | + .recommend-img-right { | ||
781 | + width: 26px; | ||
782 | + height: 27px; | ||
783 | + margin-left: 70px; | ||
784 | + margin-bottom: 60px; | ||
785 | + } | ||
786 | +} | ||
755 | 787 | ||
756 | .recommend-img-right:hover { | 788 | .recommend-img-right:hover { |
757 | cursor: pointer; | 789 | cursor: pointer; |