fix: fix password page

Author: reco_luan

components/Common.vue

@@ -5,8 +5,8 @@
     @touchstart="onTouchStart"
     @touchend="onTouchEnd">
     <transition name="fade">
-      <LoadingPage v-if="firstLoad"></LoadingPage>
-      <Password v-else-if="!isHasKey"></Password>
+      <LoadingPage v-if="firstLoad" />
+      <Password v-else-if="!isHasKey" />
       <div v-else>
         <Navbar
         v-if="shouldShowNavbar"
@@ -30,7 +30,7 @@
         <Password v-if="!isHasPageKey" :isPage="true"></Password>
         <div v-else>
           <slot></slot>
-          <Comments :isShowComments="isShow"/>
+          <Comments :isShowComments="shouldShowComments"/>
         </div>
       </div>
     </transition>
@@ -70,18 +70,24 @@ export default {
 
   computed: {
     // 是否显示评论
-    isShow () {
+    shouldShowComments () {
       const { isShowComments, home } = this.$frontmatter
-      return !(this.isComment == false || isShowComments == false || home == true)
+      return !(
+        this.isComment == false ||
+        isShowComments == false ||
+        home == true
+      )
     },
+
     shouldShowNavbar () {
       const { themeConfig } = this.$site
       const { frontmatter } = this.$page
+
       if (
         frontmatter.navbar === false ||
-        themeConfig.navbar === false) {
-        return false
-      }
+        themeConfig.navbar === false
+      ) return false
+
       return (
         this.$title ||
         themeConfig.logo ||
@@ -188,10 +194,8 @@ export default {
 
   watch: {
     $frontmatter (newVal, oldVal) {
-      if (newVal.home) {
-        this.hasKey()
-        this.hasPageKey()
-      }
+      this.hasKey()
+      this.hasPageKey()
     }
   }
 }

components/Password.vue

@@ -52,29 +52,27 @@ export default {
   computed: {
     year () {
       return new Date().getFullYear()
-    },
-    isHasKey () {
-      const keyPage = this.$themeConfig.keyPage
-      const keys = keyPage.keys
-      return keys && keys.indexOf(sessionStorage.getItem('key')) > -1
-    },
-    isHasPageKey () {
-      const pageKeys = this.$frontmatter.keys
-
-      return pageKeys && pageKeys.indexOf(sessionStorage.getItem(`pageKey${window.location.pathname}`)) > -1
     }
   },
   methods: {
     inter () {
-      const keyVal = this.key.trim()
-      const key = this.isPage ? `pageKey${window.location.pathname}` : 'key'
-      sessionStorage.setItem(key, keyVal)
-      const isHasKey = this.isPage ? this.isHasPageKey : this.isHasKey
-      if (!isHasKey) {
+      const {
+        key,
+        isPage,
+        isHasPageKey,
+        isHasKey,
+        $refs: { passwordBtn }
+      } = this
+      const keyVal = key.trim()
+      const pageKey = `pageKey${window.location.pathname}`
+      const keyName = isPage ? pageKey : 'key'
+      sessionStorage.setItem(keyName, keyVal)
+      const isKeyTrue = isPage ? isHasPageKey() : isHasKey()
+      if (!isKeyTrue) {
         this.warningText = 'Key Error'
         return
       }
-      const passwordBtn = this.$refs.passwordBtn
+
       const width = document.getElementById('box').getClientRects()[0].width
 
       passwordBtn.style.width = `${width - 2}px`
@@ -88,6 +86,17 @@ export default {
     },
     inputBlur () {
       this.warningText = 'Konck! Knock!'
+    },
+    isHasKey () {
+      const keyPage = this.$themeConfig.keyPage
+      const keys = keyPage.keys
+      return keys && keys.indexOf(sessionStorage.getItem('key')) > -1
+    },
+    isHasPageKey () {
+      const pageKeys = this.$frontmatter.keys
+      const pageKey = `pageKey${window.location.pathname}`
+
+      return pageKeys && pageKeys.indexOf(sessionStorage.getItem(pageKey)) > -1
     }
   }
 }