fix: 调整服务端渲染接口请求方式

xinkeaboard-web/components/NavCatHeader.vue

@@ -159,6 +159,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
   justify-content: center;
   overflow: visible;
   position: relative;
+  padding-left: 40px;
   .product_sort {
     position: relative;
     overflow: visible;

xinkeaboard-web/components/NavTopBar.vue

@@ -147,7 +147,8 @@ const goToByPush = (type, param = {}) => {
 };
 
 const goSupplierUrl = () => {
-  let url = supplierUrl;
+  const config = useRuntimeConfig()
+  let url = config.public.supplierUrl;
   window.open(url, '_blank');
 };
 
@@ -190,6 +191,9 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
   display: flex;
   align-items: center;
   justify-content: center;
+  padding-bottom: 10px;
+  padding-left: 150px;
+  border-bottom: 1px solid #dbdbdb;
 
   .header {
     width: 100%;

xinkeaboard-web/components/SldDiy.vue

@@ -1186,7 +1186,8 @@ const loginOut = async () => {
 };
 
 const goSupplierUrl = () => {
-  let url = supplierUrl;
+  const config = useRuntimeConfig()
+  let url = config.public.supplierUrl;
   window.open(url, '_blank');
 };
 

xinkeaboard-web/composables/index.js

@@ -1,9 +1,9 @@
 // 测试环境
-export const apiUrl = 'http://54.46.9.88:8001/';
+export const apiUrl = '/api/';
 
 // 本地后端
 // export const apiUrl = 'http://192.168.0.158:8001/';
 
-export const defaultUrl = 'http://54.46.9.88:8001/';
-export const supplierUrl = 'http://54.46.9.88:82/user/login';
+export const defaultUrl = '/api/';
+// export const supplierUrl = 'http://54.46.9.88:82/user/login';
 export const curLang = 'en'

xinkeaboard-web/composables/useFetchRaw.ts

@@ -3,12 +3,14 @@ import { webSiteFlagRelation, webSiteLanguageRelation } from "../utils/common";
 
 export async function useFetchRaw<T = any>(url: string, options?: any) {
   const config = useRuntimeConfig()
+  const { appType, serverPath } = config.public as any;
+  url = url.replace('/api/', serverPath)
   const newOptions = {
     ...(options ?? {}),
     headers: {
       ...(options?.headers || {}),
-      'Web-Site': webSiteFlagRelation[config.public.appType],
-      Language: webSiteLanguageRelation[config.public.appType]
+      'Web-Site': webSiteFlagRelation[appType],
+      Language: webSiteLanguageRelation[appType]
     },
   }
   const { data, error, pending, refresh, execute } = await _useFetch<T>(url, newOptions)

xinkeaboard-web/nuxt.config.ts

@@ -5,7 +5,9 @@ import ElementPlus from "unplugin-element-plus/vite";
 // import { visualizer } from 'rollup-plugin-visualizer'
 const isDev = process.env.NODE_ENV === 'development';
 const appType = process.env.APP_TYPE;
+const SERVICE = process.env.SERVICE;
 export default defineNuxtConfig({
+  // ssr: !isDev,
   nitro: {
     output: {
       dir: isDev ? undefined : `.output-${appType}`
@@ -59,7 +61,7 @@ export default defineNuxtConfig({
     server: {
       proxy: {
         "/api": {
-          target: "http://54.46.9.88:8001/",
+          target: "http://54.46.9.88:8001",
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/api/, ""),
         },
@@ -77,7 +79,9 @@ export default defineNuxtConfig({
   },
   runtimeConfig: {
     public: {
-      appType: process.env.APP_TYPE,
+      appType,
+      supplierUrl: SERVICE === 'test' ? 'http://54.46.9.88:82/user/login' : 'https://seller.njnaexport.com/user/login',
+      serverPath: SERVICE === 'test' ? 'http://54.46.9.88:8001/' : 'http://10.0.130.251:8001/'
     }
   },
   app: {

xinkeaboard-web/package.json

@@ -1,11 +1,16 @@
 {
   "private": true,
   "scripts": {
-    "build:user": "cross-env APP_TYPE=user nuxt build",
-    "build:distributor": "cross-env APP_TYPE=distributor nuxt build",
+    "build:user": "cross-env APP_TYPE=user SERVICE=test nuxt build",
+    "build-prod:user": "cross-env APP_TYPE=user SERVICE=prod nuxt build",
+    "build:distributor": "cross-env APP_TYPE=distributor SERVICE=test nuxt build",
+    "build-prod:distributor": "cross-env APP_TYPE=distributor SERVICE=prod nuxt build",
+    "build-prod": "pnpm build-prod:user && pnpm build-prod:distributor",
     "build": "pnpm build:user && pnpm build:distributor",
-    "dev:user": "cross-env APP_TYPE=user nuxt dev",
-    "dev:distributor": "cross-env APP_TYPE=distributor nuxt dev",
+    "dev:user": "cross-env APP_TYPE=user SERVICE=test nuxt dev",
+    "dev-prod:user": "cross-env APP_TYPE=user SERVICE=prod nuxt dev",
+    "dev:distributor": "cross-env APP_TYPE=distributor SERVICE=test nuxt dev",
+    "dev-prod:distributor": "cross-env APP_TYPE=distributor SERVICE=prod nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare"

xinkeaboard-web/pages/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <NavTopBar/>
     <SldHomeTopSearch />
+    <NavTopBar/>
     <NavCatHeader />
     <!-- <div class="bottom_line"></div> -->
     <Home></Home>