fix: 修复测试验证v1.4

components/business/categories/list.vue

@@ -4,13 +4,15 @@
 import templateTwo from './comp/temp2.vue'
 import templateOne from './comp/temp1.vue'
 import { Api } from '@/api/model/url'
+const config = useRuntimeConfig()
+const baseURL = config.public.apiBaseUrl
 
 const categoryList = ref<any>([])
 const list_column_one = ref<any>([])
 const list_column_two = ref<any>([])
 const list_column_three = ref<any>([])
 
-const requestUrl = `${process.env.MY_ENV_DEV_URL}${Api.CategoryList}`
+const requestUrl = `${baseURL}${Api.CategoryList}`
 const { data, pending, error, refresh } = await useAsyncData(
   'category-catalogue',
   () => $fetch(`${requestUrl}`, { params: { all: true } }),

components/business/home/banner.vue

@@ -5,23 +5,24 @@ import { onMounted, ref } from 'vue'
 import { Swiper, SwiperSlide } from 'swiper/vue'
 import { Autoplay, Navigation, Pagination } from 'swiper/modules'
 import { Api } from '@/api/model/url'
-import { useUserStore } from '@/stores/modules/user'
 import 'swiper/css'
 import 'swiper/css/navigation'
 import 'swiper/css/autoplay'
 
-const userStore = useUserStore()
-const { isLogin } = storeToRefs(userStore)
+const config = useRuntimeConfig()
+const baseURL = config.public.apiBaseUrl
+
 const modules = [Navigation, Pagination, Autoplay]
 const categoryList = ref<any>([])
 const swiperVertical = ref<any>(null)
 
-const requestUrl = `${process.env.MY_ENV_DEV_URL}${Api.CategoryList}`
+const requestUrl = `${baseURL}${Api.CategoryList}`
 const { data, pending, error, refresh } = await useAsyncData(
   'category-catalogue',
   () => $fetch(`${requestUrl}`, { params: { all: true } }),
 )
 categoryList.value = data.value?.result || []
+console.log('categoryList.value', categoryList.value, requestUrl)
 
 function onVerticalSwiper(swiper: any) {
   swiperVertical.value = swiper

components/business/trends/index.vue

@@ -3,9 +3,11 @@
 <script lang="ts" setup>
 import { Api } from '@/api/model/url'
 
+const config = useRuntimeConfig()
+const baseURL = config.public.apiBaseUrl
 const list = ref([])
 
-const requestUrl = `${process.env.MY_ENV_DEV_URL}${Api.CatalogueList}`
+const requestUrl = `${baseURL}${Api.CatalogueList}`
 const params = { pageNo: 1, pageSize: 3, state: 1, trend: 1, order: 'desc' }
 const { data, pending, error, refresh } = await useAsyncData(
   'catalogue-list',

components/common/block/blog.vue

@@ -1,8 +1,11 @@
 <script lang='ts' setup>
 import { Api } from '@/api/model/url'
 
+const config = useRuntimeConfig()
+const { apiBaseSiteUrl, apiBaseUrl } = config.public
+
 const list = ref<any>([])
-const requestUrl = `${process.env.MY_ENV_DEV_URL}${Api.BlogsList}`
+const requestUrl = `${apiBaseUrl}${Api.BlogsList}`
 const params = { pageNo: 1, pageSize: 3, orderBy: 'createTime', orderType: 'desc' }
 const { data, pending, error, refresh } = await useAsyncData(
   'blog-list',

components/common/block/catalogs.vue

@@ -5,9 +5,11 @@ import { Swiper, SwiperSlide } from 'swiper/vue'
 import { Navigation, Pagination } from 'swiper/modules'
 import 'swiper/css'
 import 'swiper/css/navigation'
- 
 import { Api } from '@/api/model/url'
 
+const config = useRuntimeConfig()
+const baseURL = config.public.apiBaseUrl
+
 const modules = [Navigation, Pagination]
 const catalogueList = ref<any>([])
 const swiperVertical = ref<any>(null)
@@ -23,7 +25,7 @@ const list = ref([
     title: 'By Trend',
   },
 ])
-const requestUrl = `${process.env.MY_ENV_DEV_URL}${Api.CatalogueList}`
+const requestUrl = `${baseURL}${Api.CatalogueList}`
 const params = { pageNo: 1, pageSize: 9, state: 1, trend: 0, order: 'desc' }
 const { data, pending, error, refresh } = await useAsyncData(
   'catalogue-list',

components/common/navigation/index.vue

@@ -6,6 +6,9 @@ import IconGroup from './icon-group.vue'
 import { useCommonStore } from '@/stores/modules/common'
 import { Api } from '@/api/model/url'
 
+const config = useRuntimeConfig()
+const baseURL = config.public.apiBaseUrl
+
 const router = useRouter()
 const commonStore = useCommonStore()
 const { navigateTextColor, navigateBgColor } = storeToRefs(commonStore)
@@ -16,7 +19,7 @@ const aboutVisible = ref<boolean>(false)
 const list = ref<any>([])
 const TrendList = ref<any>([])
 
-const requestUrl = `${process.env.MY_ENV_DEV_URL}${Api.CategoryList}`
+const requestUrl = `${baseURL}${Api.CategoryList}`
 const { data: res } = await useAsyncData(
   'category-catalogue',
   () => $fetch(`${requestUrl}`, { params: { all: true } }),
@@ -24,7 +27,7 @@ const { data: res } = await useAsyncData(
 const params = { pageNo: 1, pageSize: 3, state: true, trend: 0, order: 'desc' }
 const { data: res2 } = await useAsyncData(
   'catalogue-list',
-  () => $fetch(`${process.env.MY_ENV_DEV_URL}${Api.CatalogueList}`, { params }),
+  () => $fetch(`${baseURL}${Api.CatalogueList}`, { params }),
 )
 list.value = res.value?.result || []
 TrendList.value = res2.value?.result?.records || []

nuxt.config.ts

@@ -51,6 +51,8 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       apiBase: process.env.MY_ENV_BASE,
+      apiBaseUrl: process.env.MY_ENV_DEV_URL,
+      apiBaseSiteUrl: process.env.NUXT_PUBLIC_SITE_URL,
       scrollToTop: true,
     },
   },

pages/blog/[slug].vue

@@ -1,8 +1,10 @@
 <script lang='ts' setup>
- 
 import { Api } from '@/api/model/url'
 import { useCommonStore } from '@/stores/modules/common'
 
+const config = useRuntimeConfig()
+const { apiBaseSiteUrl, apiBaseUrl } = config.public
+
 const route = useRoute()
 const detail = ref<any>({})
 const tabValue = ref('blog')
@@ -23,7 +25,7 @@ const slug = route.params.slug
 const { data, pending, error, refresh } = await useAsyncData(
   'blog-detail',
   () =>
-    $fetch(`${process.env.MY_ENV_DEV_URL}${Api.BlogDetail}`, { params: { slug } }),
+    $fetch(`${apiBaseUrl}${Api.BlogDetail}`, { params: { slug } }),
 )
 const seoData = data.value?.result
 // 把createTime和updateTime转换为ISO格式
@@ -56,7 +58,7 @@ useHead({
     },
     {
       property: 'og:url',
-      content: `${process.env.MY_ENV_DEV_URL}/blog/${slug}`,
+      content: `${apiBaseSiteUrl}/blog/${slug}`,
     },
     {
       property: 'og:type',
@@ -72,7 +74,7 @@ useHead({
     },
     {
       property: 'twitter:site',
-      content: `${process.env.MY_ENV_DEV_URL}/blog/${slug}`,
+      content: `${apiBaseSiteUrl}/blog/${slug}`,
     },
     {
       property: 'twitter:image',
@@ -96,7 +98,7 @@ useHead({
   link: [
     {
       rel: 'canonical',
-      href: `${process.env.MY_ENV_DEV_URL}/blog/${slug}`,
+      href: `${apiBaseSiteUrl}/blog/${slug}`,
     },
   ],
 })

pages/blog/index.vue

@@ -3,6 +3,8 @@ import { submitSubscribeApi } from '~/api/model/common'
 import { PageSizeEnum } from '~/enums/sizeEnum'
 import { Api } from '@/api/model/url'
 
+const config = useRuntimeConfig()
+const { apiBaseSiteUrl, apiBaseUrl } = config.public
 const list = ref<any>([])
 const currentPage = ref(PageSizeEnum.PAGE)
 const total = ref()
@@ -26,7 +28,7 @@ const params = ref({
 })
 const { data: res } = await useAsyncData(
   'blog-category-list',
-  () => $fetch(`${process.env.MY_ENV_DEV_URL}${Api.BlogsCategoryList}`, { params: { all: true } }),
+  () => $fetch(`${apiBaseUrl}${Api.BlogsCategoryList}`, { params: { all: true } }),
 )
 // Ensure we have a valid array before spreading
 const arr = Array.isArray(res.value?.result) ? res.value.result : []
@@ -37,7 +39,7 @@ categories.value = [
 params.value.categoryId = categories.value[0].key
 const { data: res2, pending, error, refresh } = await useAsyncData(
   'blog-list',
-  () => $fetch(`${process.env.MY_ENV_DEV_URL}${Api.BlogsList}`, { params: params.value }),
+  () => $fetch(`${apiBaseUrl}${Api.BlogsList}`, { params: params.value }),
 )
 watch(() => res2.value, (newValue) => {
   if (newValue?.result) {

pages/categories/[slug].vue

@@ -5,18 +5,20 @@ import { Api } from '@/api/model/url'
 const route = useRoute()
 const commonStore = useCommonStore()
 const list = ref<any>([])
+const config = useRuntimeConfig()
+const { apiBaseSiteUrl, apiBaseUrl } = config.public
 
 const slug = route.params.slug
 const { data: res } = await useAsyncData(
   'category-detail',
   () =>
-    $fetch(`${process.env.MY_ENV_DEV_URL}${Api.CategoryDetail}`, { params: { slug } }),
+    $fetch(`${apiBaseUrl}${Api.CategoryDetail}`, { params: { slug } }),
 )
 const seoData = res.value?.result
 const { data: res2 } = await useAsyncData(
   'category-catalogue-list',
   () =>
-    $fetch(`${process.env.MY_ENV_DEV_URL}${Api.CategoryCatalogueList}`, { params: { slug } }),
+    $fetch(`${apiBaseUrl}${Api.CategoryCatalogueList}`, { params: { slug } }),
 )
 list.value = res2.value?.result?.records || []
 

pages/privacy-policy.vue

@@ -1,8 +1,8 @@
 <!-- @format -->
 
 <script setup lang="ts">
- 
-
+const config = useRuntimeConfig()
+const { apiBaseSiteUrl } = config.public
 useHead({
   title: 'EJET Selection |  Privacy Policy',
   meta: [
@@ -41,7 +41,7 @@ useHead({
   link: [
     {
       rel: 'canonical',
-      href: `${process.env.MY_ENV_DEV_URL}/policy`,
+      href: `${apiBaseSiteUrl}/policy`,
     },
   ],
 })