diff --git a/components/EnergyDensityCalculator.vue b/components/EnergyDensityCalculator.vue index d4d3f22..c52cc9a 100644 --- a/components/EnergyDensityCalculator.vue +++ b/components/EnergyDensityCalculator.vue @@ -1230,7 +1230,7 @@ const showSuffix = ref(true); const result = ref(); onMounted(() => { // $fetch("/mshop/cal/battery/cellOutputResults", { - $fetch("/mshop/api/front/cal/battery/cellOutputResults", { + $fetch("/api/front/cal/battery/cellOutputResults", { method: "POST", body: initBody.value, }).then((res) => { @@ -1490,7 +1490,7 @@ onMounted(() => { const toCompute = async () => { // $fetch("/mshop/cal/battery/cellOutputResults", { - $fetch("/mshop/api/front/cal/battery/cellOutputResults", { + $fetch("/api/front/cal/battery/cellOutputResults", { method: "POST", body: requestBody.value, }).then((res) => { diff --git a/deploy/prod2.sh b/deploy/prod2.sh index 7b137e1..72dd8a9 100644 --- a/deploy/prod2.sh +++ b/deploy/prod2.sh @@ -1,7 +1,7 @@ #!/bin/bash # 变量定义 -LAST_TAG="1.0.45" -TAG="1.0.46" +LAST_TAG="1.0.46" +TAG="1.0.47" TARGET_PATH="/root/web/canrud-outside-nuxt-front" DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front" IMAGE_NAME="canrud-outside-front" diff --git a/nuxt.config.ts b/nuxt.config.ts index b72d560..2160f56 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -55,8 +55,8 @@ export default defineNuxtConfig({ // target: process.env.BASE_URL || 'http://39.108.227.113:8002/shop', // 目标接口域名 changeOrigin: true, // 表示是否跨域 }, - "/mshop": { - target: "http://www.canrd.com/mshop", + "/api/front/cal": { + target: "http://www.canrd.com/mshop/api/front/cal", // proxy: "http://127.0.0.1:8002/shop/**", // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' changeOrigin: true, // 表示是否跨域 @@ -70,8 +70,8 @@ export default defineNuxtConfig({ // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' }, - "/mshop/**": { - proxy: "http://www.canrd.com/mshop/**", + "/api/front/cal/**": { + proxy: "http://www.canrd.com/mshop/api/front/cal/**", // proxy: "http://127.0.0.1:8002/shop/**", // proxy: process.env.BASE_URL || 'http://39.108.227.113:8002/shop/**' }, diff --git a/pages/index.vue b/pages/index.vue index f465ad6..98c42cf 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -421,7 +421,20 @@ button .recommendButton { .recommend-left-box { } - +@media screen and (min-width: 1537px) { + .recommend-img-left { + width: 26px; + height: 27px; + margin-right: 20px; + } +} +@media screen and (min-width: 1537px) { + .recommend-img-right { + width: 26px; + height: 27px; + margin-left: 20px; + } +} .recommend-img-left { width: 26px; height: 27px; diff --git a/pages/products/index.vue b/pages/products/index.vue index 3e57880..ebe26d5 100644 --- a/pages/products/index.vue +++ b/pages/products/index.vue @@ -576,14 +576,14 @@ const hotLength = computed(() => .tabs { border-bottom: 2px solid #1f88e5; margin: 10px auto 40px; - width: 78%; + width: 77%; } } @media screen and (max-width: 1280px) { .tabs { border-bottom: 2px solid #1f88e5; margin: 10px auto 40px; - width: 92%; + width: 92.5%; } } /* .tabs { @@ -752,6 +752,38 @@ button .recommendButton { margin-left: 30px; margin-bottom: 60px; } +@media screen and (max-width: 1536px) and (min-width: 1281px) { + .recommend-img-left { + width: 26px; + height: 27px; + margin-right: 30px; + margin-bottom: 60px; + } +} +@media screen and (max-width: 1536px) and (min-width: 1281px) { + .recommend-img-right { + width: 26px; + height: 27px; + margin-left: 30px; + margin-bottom: 60px; + } +} +@media screen and (min-width: 1600px) { + .recommend-img-left { + width: 26px; + height: 27px; + margin-right: 70px; + margin-bottom: 60px; + } +} +@media screen and (min-width: 1600px) { + .recommend-img-right { + width: 26px; + height: 27px; + margin-left: 70px; + margin-bottom: 60px; + } +} .recommend-img-right:hover { cursor: pointer;