Merge branch 'master' of http://101.43.33.174:8080/crs_20240527/crs-double-resistance

src/components/homeHeader.vue

@@ -9,7 +9,7 @@
         <div class="input_box">
 
           <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" text-color="#065BA9" active-text-color="#065BA9" @select="handleSelect">
-            <el-menu-item index="overView">全览图</el-menu-item>
+            <el-menu-item index="home">全览图</el-menu-item>
             <el-menu-item index="article">相关文章</el-menu-item>
             <el-menu-item index="product">产品详情</el-menu-item>
             <el-menu-item index="antibody">抗体数据库</el-menu-item>
@@ -33,7 +33,7 @@
           </div>
           <!-- 移动端菜单 -->
           <el-menu class="el-menu-demo" default-active="1" background-color="#005bab" text-color="#ffffff" active-text-color="#ffffff" @select="handleSelect">
-            <el-menu-item index="overView">全览图</el-menu-item>
+            <el-menu-item index="home">全览图</el-menu-item>
             <el-menu-item index="article">相关文章</el-menu-item>
             <el-menu-item index="product">产品详情</el-menu-item>
             <el-menu-item index="antibody">抗体数据库</el-menu-item>

src/router/routerList.js

@@ -8,17 +8,30 @@
 import login from './login.js'
 export default [
   ...login,
+  // {
+  //   path: "/home",
+  //   name: "home",
+  //   component: () => import("@/view/home/index"),
+  //   hidden: true,
+  //   meta: {
+  //     pageTitle: "Home",
+  //     requireLogin: true,
+  //     fullScreen: true
+  //   }
+  // }, 
   {
     path: "/",
     name: "home",
-    component: () => import("@/view/home/index"),
+    component: () => import("@/view/overView/index"),
     hidden: true,
     meta: {
-      pageTitle: "Home",
-      requireLogin: true,
+      pageTitle: "overView",
+      chineseTitle: "全览图",
+      navActive: "overView",
       fullScreen: true
     }
-  }, {
+  },
+  {
     path: "/product",
     name: "product",
     component: () => import("@/view/product/index"),
@@ -71,17 +84,6 @@ export default [
       chineseTitle: "购物车",
       navActive: "Mycart" // 购物车页
     }
-  }, {
-    path: "/overView",
-    name: "overView",
-    component: () => import("@/view/overView/index"),
-    hidden: true,
-    meta: {
-      pageTitle: "overView",
-      chineseTitle: "全览图",
-      navActive: "overView",
-      fullScreen: true
-    }
   }, {
     path: "/article",
     name: "article",