Merge branch 'dev' of https://github.com/JX3BOX/pvx into dev

JX3BOX · Jun 21, 2024 · c30ff1c · c30ff1c
2 parents b585b38 + 3015526
commit c30ff1c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 40 deletions.
diff --git a/src/components/Nav.vue b/src/components/Nav.vue
@@ -59,13 +59,6 @@ export default {
                             status: true,
                             target: "_blank",
                         },
-                        // {
-                        //     path: "/share/facedata",
-                        //     label: "妆容解析",
-                        //     icon: "el-icon-setting",
-                        //     key: "facedata",
-                        //     status: true,
-                        // },
                     ],
                 },
 
@@ -74,6 +67,13 @@ export default {
                     label: "珍奇",
                     index: "2",
                     submenus: [
+                        // {
+                        //     path: "/exterior",
+                        //     label: "外观大全",
+                        //     icon: "el-icon-setting",
+                        //     key: "exterior",
+                        //     status: false,
+                        // },
                         {
                             path: "/pet",
                             label: "宠物大全",
@@ -116,13 +116,6 @@ export default {
                             key: "reputation",
                             status: true,
                         },
-                        // {
-                        //     path: "/exterior",
-                        //     label: "外观大全",
-                        //     icon: "el-icon-setting",
-                        //     key: "exterior",
-                        //     status: false,
-                        // },
                     ],
                 },
 
@@ -160,36 +153,36 @@ export default {
                 //     label: "家园",
                 //     index: "4",
                 //     submenus: [
-                        // {
-                        //     path: "/homeland/tutorial",
-                        //     label: "家园建设",
-                        //     icon: "el-icon-reading",
-                        //     key: "tutorial",
-                        //     status: true,
-                        // },
-                        // {
-                        //     path: "/homeland/maps",
-                        //     label: "家园地图",
-                        //     icon: "el-icon-map-location",
-                        //     key: "maps",
-                        //     status: true,
-                        // },
-                        // {
-                        //     path: "/homeland/flower",
-                        //     label: "家园花价",
-                        //     icon: "el-icon-sunny",
-                        //     key: "flower",
-                        //     status: true,
-                        // },
-                    // ],
+                // {
+                //     path: "/homeland/tutorial",
+                //     label: "家园建设",
+                //     icon: "el-icon-reading",
+                //     key: "tutorial",
+                //     status: true,
+                // },
+                // {
+                //     path: "/homeland/maps",
+                //     label: "家园地图",
+                //     icon: "el-icon-map-location",
+                //     key: "maps",
+                //     status: true,
+                // },
+                // {
+                //     path: "/homeland/flower",
+                //     label: "家园花价",
+                //     icon: "el-icon-sunny",
+                //     key: "flower",
+                //     status: true,
+                // },
+                // ],
                 // },
             ],
         };
     },
     computed: {
         active: function () {
             let arr = compact(location.pathname?.split("/"));
-            return arr[0]
+            return arr[0];
         },
         client() {
             return location.href.includes("origin") ? "origin" : "std";

diff --git a/src/components/Nav_v3.vue b/src/components/Nav_v3.vue
@@ -66,7 +66,7 @@ export default {
             let str = arr[0];
             if (str === "pvg") str = arr[1];
             if (str === "homeland") str = "blueprint";
-            if (str === "body") str = "exterior";
+            // if (str === "body") str = "exterior";
             return str;
         },
         client() {

diff --git a/src/components/Nav_v4.vue b/src/components/Nav_v4.vue
@@ -81,7 +81,7 @@ export default {
             let str = arr[0];
             if (str === "pvg") str = arr[1];
             if (str === "homeland") str = "blueprint";
-            if (str === "body") str = "exterior";
+            // if (str === "body") str = "exterior";
             return str;
         },
         client() {

diff --git a/src/components/Nav_v5.vue b/src/components/Nav_v5.vue
@@ -83,7 +83,7 @@ export default {
             let str = arr[0];
             if (str === "pvg") str = arr[1];
             if (str === "homeland") str = "blueprint";
-            if (str === "body") str = "exterior";
+            // if (str === "body") str = "exterior";
             return str;
         },
         client() {