提交

.env.development

@@ -1,14 +1,14 @@
 ENV = 'development'
 #  NUXT_PUBLIC_API_BASE ='/api/'
 # NUXT_PUBLIC_API_BASE ='https://www.dirmarketresearch.com/api'
-NUXT_PUBLIC_API_BASE = 'http://192.168.0.70:8980/js/a/api'
+# NUXT_PUBLIC_API_BASE = 'http://192.168.0.70:8980/js/a/api'
 # NUXT_PUBLIC_API_BASE = 'http://192.168.0.132/js/a/api'
 #
 # 图片地址
 # NUXT_PUBLIC_API_BASEURL = "https://bjfl.dirmarketresearch.com/js/userfiles"
-NUXT_PUBLIC_API_BASEURL = "http://192.168.0.70:8980/js/userfiles"
+# NUXT_PUBLIC_API_BASEURL = "http://192.168.0.70:8980/js/userfiles"
 # NUXT_PUBLIC_API_BASEURL = "http://192.168.0.132/js/userfiles"
 
-# NUXT_PUBLIC_DOMAIN_NAME='https://www.wenkh.com.cn'
-# NUXT_PUBLIC_API_BASE = 'https://www.wenkh.com/api/js/a/api'
-# NUXT_PUBLIC_API_BASEURL="https://www.wenkh.com/api/js/userfiles"
+NUXT_PUBLIC_DOMAIN_NAME='https://www.driveintelresearch.com'
+NUXT_PUBLIC_API_BASE = 'https://www.driveintelresearch.com/api/js/a/api'
+NUXT_PUBLIC_API_BASEURL="https://www.driveintelresearch.com/api/js/userfiles"

.env.production

@@ -1,4 +1,4 @@
 ENV = 'production'
-# NUXT_PUBLIC_API_BASE = 'https://www.wenkh.com/js/a/api'
-NUXT_PUBLIC_API_BASE = 'http://192.168.0.132/js/a/api'
-NUXT_PUBLIC_API_BASEURL = "http://192.168.0.132/js/userfiles"
+NUXT_PUBLIC_API_BASE = 'https://www.driveintelresearch.com/js/a/api'
+NUXT_PUBLIC_API_BASE = 'https://www.driveintelresearch.com/js/a/api'
+NUXT_PUBLIC_API_BASEURL = "https://www.driveintelresearch.com/js/userfiles"

app/router.options.ts

@@ -65,12 +65,12 @@ export default <RouterConfig>{
         component: () => import('~/pages/about/term.vue'),
         meta: { title: '相关条款', titleEn: 'Terms and Conditions', activeIndex: 5 }
       },
-      {
-        name: 'qualify',
-        path: '/:lang?/qualify',
-        component: () => import('~/pages/about/qualify.vue'),
-        meta: { title: '企业资质', titleEn: 'Enterprise Qualifications', activeIndex: 5 }
-      },
+      // {
+      //   name: 'qualify',
+      //   path: '/:lang?/qualify',
+      //   component: () => import('~/pages/about/qualify.vue'),
+      //   meta: { title: '企业资质', titleEn: 'Enterprise Qualifications', activeIndex: 5 }
+      // },
       {
         name: 'contactUsIndex',
         path: '/:lang?/contactUs',

lang/i18n.ts

@@ -2,7 +2,7 @@ import zh from './zh-cn.js'//中文
 import en from './en-us.js'//英文
 
 const i18n = {
-  fallbackLocale: 'en',//回退策略，指定的locale中没有找到对应资源的情况下使用的locale
+  fallbackLocale: 'zh',//回退策略，指定的locale中没有找到对应资源的情况下使用的locale
   messages: { //要渲染的信息，有多少语言就添加多少种
     en: en,
     zh: zh

nuxt.config.ts

@@ -29,8 +29,8 @@ export default defineNuxtConfig({
     // 代理
     devProxy: {
       '/api': {
-        // target: 'https://bjfl.dirmarketresearch.com/api/js/a/api',
-        target: 'http://192.168.0.70:8980/js/a/api',
+        target: 'https://www.driveintelresearch.com/api/js/a/api',
+        // target: 'http://192.168.0.70:8980/js/a/api',
         // target: 'http://192.168.0.132//js/a/api',
         changeOrigin: true,
         prependPath: true,
@@ -43,6 +43,7 @@ export default defineNuxtConfig({
     // apiSecret: '123',
     // public 命名空间中定义的，在服务器端和客户端都可以普遍访问
     public: {
+      domainName: process.env.NUXT_PUBLIC_DOMAIN_NAME,
       apiBase: process.env.NUXT_PUBLIC_API_BASE,
       baseUrl: process.env.NUXT_PUBLIC_API_BASEURL
     }
@@ -54,7 +55,7 @@ export default defineNuxtConfig({
   plugins: [
     { src: './public/wow.js', mode: 'client' },
     // { src: './public/myWow.js', mode: 'client' },
-    '~/plugins/pinia.js',
+    '~/plugins/pinia.js'
   ],
   css: [
     '@/assets/css/root.scss',
@@ -70,7 +71,7 @@ export default defineNuxtConfig({
   modules: ["nuxtjs-naive-ui", '@nuxtjs/i18n', '@pinia/nuxt'],
   i18n: {
     locales: ['en', 'zh'],
-    defaultLocale: 'en',
+    defaultLocale: 'zh',
     vueI18n: './lang/i18n.ts',
     customRoutes: 'config',
     // parsePages: false,

package-lock.json

@@ -31,6 +31,7 @@
         "vuex": "^4.1.0"
       },
       "devDependencies": {
+        "cross-env": "^10.0.0",
         "naive-ui": "^2.38.2",
         "sass": "^1.77.2",
         "unplugin-auto-import": "^0.17.6",
@@ -579,6 +580,13 @@
       "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
       "dev": true
     },
+    "node_modules/@epic-web/invariant": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/@epic-web/invariant/-/invariant-1.0.0.tgz",
+      "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.23.0",
       "resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
@@ -5051,6 +5059,24 @@
         "cronstrue": "bin/cli.js"
       }
     },
+    "node_modules/cross-env": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmmirror.com/cross-env/-/cross-env-10.0.0.tgz",
+      "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@epic-web/invariant": "^1.0.0",
+        "cross-spawn": "^7.0.6"
+      },
+      "bin": {
+        "cross-env": "dist/bin/cross-env.js",
+        "cross-env-shell": "dist/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -12805,6 +12831,12 @@
       "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==",
       "dev": true
     },
+    "@epic-web/invariant": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/@epic-web/invariant/-/invariant-1.0.0.tgz",
+      "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
+      "dev": true
+    },
     "@esbuild/aix-ppc64": {
       "version": "0.23.0",
       "resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
@@ -15765,6 +15797,16 @@
       "resolved": "https://registry.npmmirror.com/cronstrue/-/cronstrue-2.50.0.tgz",
       "integrity": "sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg=="
     },
+    "cross-env": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmmirror.com/cross-env/-/cross-env-10.0.0.tgz",
+      "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
+      "dev": true,
+      "requires": {
+        "@epic-web/invariant": "^1.0.0",
+        "cross-spawn": "^7.0.6"
+      }
+    },
     "cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz",

package.json

@@ -35,6 +35,7 @@
     "vuex": "^4.1.0"
   },
   "devDependencies": {
+    "cross-env": "^10.0.0",
     "naive-ui": "^2.38.2",
     "sass": "^1.77.2",
     "unplugin-auto-import": "^0.17.6",

pages/about/qualify.vue

@@ -1,165 +0,0 @@
-<template>
-  <div class="page" id="page">
-    <div class="top-title wow fadeInUp" data-wow-duration="2s" data-wow-delay="0s" data-wow-offset="0">
-      <div class="top-container">
-        <n-icon :component="MdPaper" size="40" style="vertical-align: middle;" />
-        <span>{{ t('common.navAboutUs.qualify') }}</span>
-      </div>
-    </div>
-
-    <div class="page-nav-container wow fadeInLeft" data-wow-duration="2s" data-wow-delay="0s" data-wow-offset="0">
-      <div class="nav-txt">
-        <n-breadcrumb separator=">">
-          <n-breadcrumb-item>
-            <n-icon :component="MdHome" /><router-link to="/home">{{ t('common.navigate.home') }}</router-link>
-          </n-breadcrumb-item>
-          <n-breadcrumb-item>
-            <n-icon :component="MdPaper" />{{ t('common.navAboutUs.qualify') }}
-          </n-breadcrumb-item>
-        </n-breadcrumb>
-      </div>
-    </div>
-
-    <div class="qualify-container">
-      <div class="container">
-        <div class="title">
-          <h2>{{ t('common.navAboutUs.qualify') }}</h2>
-        </div>
-        <div class="qualify-box">
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua12.jpg" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua01.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua02.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua03.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua04.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua05.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua06.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua07.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua08.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua09.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua10.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua11.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua13.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua14.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <n-card size="medium" content-style="display:flex">
-              <img src="@/assets/images/qua15.png" />
-            </n-card>
-          </div>
-          <div class="box">
-            <!-- <n-card size="medium" content-style="display:flex">
-            </n-card> -->
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script lang="ts" setup>
-import { MdHome, MdPaper } from "@vicons/ionicons4";
-import { NIcon, NBreadcrumb, NBreadcrumbItem, NCard } from "naive-ui";
-import { onMounted } from "vue";
-import { useI18n } from "#imports";
-const { t } = useI18n();
-
-onMounted(() => {
-  onMounted(() => {
-    if (typeof window !== "undefined") {
-      window.scrollTo(0, 1);
-    }
-  });
-});
-useHead({
-  title: t("common.navAboutUs.qualify") + "-" + t("defaultSettings.title"),
-  viewport: "width=device-width,initial-scale=1,maximum-scale=1 ",
-  charset: "utf-8",
-  meta: [
-    {
-      hid: "keywords",
-      name: "keywords",
-      content: t("defaultSettings.keyword"),
-    },
-    {
-      hid: "description",
-      name: "description",
-      content: t("defaultSettings.desc"),
-    },
-  ],
-});
-</script>
-<style lang="scss" scoped>
-.qualify-container {
-  background-color: #fff;
-  border-bottom: 1px solid #eee;
-  .qualify-box {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    .box {
-      width: 24%;
-      padding-bottom: 20px;
-    }
-  }
-}
-
-img {
-  width: 100%;
-  height: 300px;
-  object-fit: contain;
-}
-</style>

pages/bulletin/index.vue

@@ -538,7 +538,7 @@ useHead({
     width: 100%;
     height: 152px;
     overflow: hidden;
-    background: url("@/assets/images/bulletin-search-bg.png") no-repeat;
+    // background: url("@/assets/images/bulletin-search-bg.png") no-repeat;
     background-size: 100% 100%;
 
     .search-box {

pages/contact/index.vue

@@ -92,6 +92,7 @@ import { useI18n } from "#imports";
 import { useUserStore } from "@/store/user";
 const userStore = useUserStore();
 const lang = userStore.getLang;
+const config = useRuntimeConfig();
 const { t } = useI18n();
 onMounted(() => {
   if (typeof window !== "undefined") {
@@ -208,6 +209,30 @@ function handleSubmit() {
     }
   });
 }
+useHead({
+  title: t("common.navigate.contactUs") + "-" + t("defaultSettings.title"),
+  viewport: "width=device-width,initial-scale=1,maximum-scale=1 ",
+  charset: "utf-8",
+  link: [
+    {
+      rel: "alternate",
+      hreflang: userStore.getLang,
+      href: config.public.domainName + "/contactUs",
+    },
+  ],
+  meta: [
+    {
+      hid: "keywords",
+      name: "keywords",
+      content: t("defaultSettings.keyword"),
+    },
+    {
+      hid: "description",
+      name: "description",
+      content: t("defaultSettings.desc"),
+    },
+  ],
+});
 </script>
 <style lang="scss" scoped>
 @import "~/assets/css/tool.scss";

pages/report-industries/detail.vue

@@ -231,7 +231,6 @@ async function getData() {
       }${ret.vo.reportScopeHtml}`;
     }
     record.value = ret.vo;
-
     let keys = "",
       fullKeys = "",
       pageKeys = "";
@@ -280,7 +279,7 @@ async function getData() {
     pageNum.value = c3[0].configValue;
     chartNum.value = c3[1].configValue;
     moreList.value = ret.list;
-    return ret.vo;
+    // return ret.vo;
   } else {
     const language = lang === "zh-CN" ? "" : "en";
     router.push({ name: "reports", params: { lang: language } });

pages/report-industries/index.vue

@@ -493,6 +493,13 @@ useHead({
   title: t("common.navigate.report") + "-" + t("defaultSettings.title"),
   viewport: "width=device-width,initial-scale=1,maximum-scale=1 ",
   charset: "utf-8",
+  link: [
+    {
+      rel: "alternate",
+      hreflang: userStore.getLang,
+      href: config.public.domainName + route.path,
+    },
+  ],
   meta: [
     {
       hid: "keywords",

store/user.ts

@@ -5,8 +5,8 @@ export const useUserStore = defineStore("user", {
   state: () => ({
     userInfo: null,
     token: "",
-    // lang: 'zh-CN',
-    lang: "en-US",
+    lang: 'zh-CN',
+    // lang: "en-US",
     searchType: undefined,
     showLoginDialog: false,
   }),