Merge branch 'master' of github.com:JX3BOX/pvx

Author: iRuxu

src/assets/img/nav/codexachievement.svg

@@ -89,6 +89,11 @@ export default {
             if (str === "pvg") str = arr[1];
             if (str === "homeland") str = "blueprint";
             // if (str === "body") str = "exterior";
+            // 处理 /pvx/codex/* 路径
+            if (str === "pvx" && arr[1] === "codex") {
+                if (arr[2] === "adventure") str = "codextreature";
+                if (arr[2] === "achievement") str = "codexachievement";
+            }
             return str;
         },
         client() {

src/assets/img/nav/codextreature.svg

@@ -11,6 +11,7 @@
                 </router-view>
             </div>
         </Main>
+        <CommonFooter></CommonFooter>
     </div>
 </template>
 

src/components/Nav_v5.vue

@@ -5,6 +5,7 @@
         <Main :class="navStatusClass" :withoutRight="true" :withoutLeft="true" :withoutBread="true">
             <div class="m-main"><router-view></router-view></div>
         </Main>
+        <CommonFooter></CommonFooter>
     </div>
 </template>
 

src/views/adventure/Adventure.vue

@@ -8,6 +8,7 @@
             </div>
             <PvxBacktop color="#fff" :bgColor="bgColor"></PvxBacktop>
         </Main>
+        <CommonFooter></CommonFooter>
     </div>
 </template>
 

src/views/body/Body.vue

@@ -5,6 +5,7 @@
         <Main :class="navStatusClass" :withoutRight="true" :withoutLeft="true" :withoutBread="true">
             <div class="m-main"><router-view></router-view></div>
         </Main>
+        <CommonFooter></CommonFooter>
     </div>
 </template>
 

src/views/book/Book.vue

@@ -15,6 +15,7 @@
             </div>
             <!-- <Footer></Footer> -->
         </Main>
+        <CommonFooter></CommonFooter>
     </div>
 </template>
 

src/views/face/Face.vue

@@ -8,6 +8,7 @@
             </div>
             <PvxBacktop color="#fff" bgColor="#6b52ff"></PvxBacktop>
         </Main>
+        <CommonFooter></CommonFooter>
     </div>
 </template>
 

src/views/furniture/Furniture.vue

@@ -8,7 +8,10 @@
             </div>
             <PvxBacktop color="#fff" bgColor="#d16400"></PvxBacktop>
         </Main>
+        <CommonFooter></CommonFooter>
+
     </div>
+
 </template>
 
 <script>