소스 검색

修改了页面刷新,或者页面更改,用户就失去登录

liyangbin 2 년 전
부모
커밋
30722321d7
12개의 변경된 파일50개의 추가작업 그리고 35개의 파일을 삭제
  1. 5 2
      layouts/components/NavBar.vue
  2. 6 3
      layouts/components/navbar2.vue
  3. 7 5
      middleware/user.js
  4. 1 1
      pages/converter.vue
  5. 1 1
      pages/index.vue
  6. 1 1
      pages/members/me/expenses.vue
  7. 1 0
      pages/pdf-reader/download.vue
  8. 1 0
      pages/pricing.vue
  9. 25 21
      pages/question.vue
  10. 1 0
      pages/resetPsw.vue
  11. 1 0
      pages/sdk.vue
  12. 0 1
      store/index.js

+ 5 - 2
layouts/components/NavBar.vue

@@ -8,9 +8,12 @@
 <template>
   <div class="h-80px flex relative z-3 justify-between px-[10%] border-b-1 border-b-[#f0f0f0] border-b-solid">
     <div class="flex items-center ml-16px">
-      <a href="/" title="17PDF Reader阅读器支持文件扫描和文件格式转换">
+      <nuxt-link to="/" title="17PDF Reader阅读器支持文件扫描和文件格式转换">
+        <img src="http://cn-file.17pdf.com/website/index/logo_pdf_top.png"/>
+      </nuxt-link>
+      <!-- <a href="/" title="17PDF Reader阅读器支持文件扫描和文件格式转换">
         <img src="http://cn-file.17pdf.com/website/index/logo_pdf_top.png"></img>
-      </a>
+      </a> -->
     </div>
     <div class="flex justify-between">
       <div class="text-[#666] flex">

+ 6 - 3
layouts/components/navbar2.vue

@@ -17,12 +17,15 @@
           class="navbar-header tiny:float-left <tiny:flex <tiny:items-center <tiny:justify-between <tiny:h-56px <tiny:py-0 <tiny:px-16px"
         >
           <!-- logo -->
-          <a class="home" href="/">
+        <nuxt-link to="/" title="17PDF Reader阅读器支持文件扫描和文件格式转换">
+          <img src="http://cn-file.17pdf.com/website/index/logo_pdf_top.png"/>
+        </nuxt-link>
+          <!-- <a class="home" href="/">
             <img
               src="http://cn-file.17pdf.com/website/index/logo_pdf_top.png"
               class="tiny:ml-16px <tiny:w-170px align-middle"
             />
-          </a>
+          </a> -->
           <!-- 按钮 -->
           <button
             type="button"
@@ -72,7 +75,7 @@
             </li>
             <li class="relative block tiny:float-left text-[0px] tiny:ml-35px">
               <a
-                class="download-contain relative block no-underline text-[16px] text-[#666] p-0 leading-[22px] <tiny:py-8px <tiny:px-0"
+                class="download-contain relative block no-underline text-[16px] text-[#666] p-0 leading-[22px] <tiny:py-8px <tiny:px-0 tiny:text-[#e93636b2]"
                 href="/pdf-reader/download"
                 >下载</a
               >

+ 7 - 5
middleware/user.js

@@ -7,10 +7,12 @@
  */
 export default function({store, app: {$axios}}) {
   if(store?.state?.token !== '') {
-    return $axios.get('members/getMemberInfo').then((res)=> {
-      if(res.code === 200) {
-        store.commit('setUser',res.result.memberInfo)
-      }
-    })
+    if( !store.state.userInfo.id ){
+      return $axios.get('members/getMemberInfo').then((res)=> {
+        if(res.code === 200) {
+          store.commit('setUser',res.result.memberInfo)
+        }
+      })
+    }
   }
 }

+ 1 - 1
pages/converter.vue

@@ -311,7 +311,7 @@ export default {
       visiable: false
     }
   },
-  // middleware: 'user',
+  middleware: 'user',
   head() {
     return {
       title: 'PDF转换器免费在线转档',

+ 1 - 1
pages/index.vue

@@ -1,6 +1,6 @@
 <script>
 export default {
-  // middleware: 'user',
+  middleware: 'user',
   data() {
     return {
       indexActive: 1

+ 1 - 1
pages/members/me/expenses.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <div>
-    <div class="expenses-date-tips flex content-center py-6px ">
+    <div class="expenses-date-tips flex content-center py-6px min-w-700px">
       <img src="http://cn-file.17pdf.com/website/common/ic_notice.svg" class="align-middle">
       <div class="text-container">
         <span class="text">

+ 1 - 0
pages/pdf-reader/download.vue

@@ -492,6 +492,7 @@
 <script>
 export default {
   layout: 'downnav',
+  middleware:'user',
   head() {
     return {
       title: 'PDF Reader - PDF阅读, 编辑, 转换软件, 移动端PDF文件解决方案',

+ 1 - 0
pages/pricing.vue

@@ -1926,6 +1926,7 @@ export default {
       }
     }
   },
+  middleware:'user',
   setup() {
     // 已经订阅了还想再次订阅的弹出框
     const noteShow = ref(false)

+ 25 - 21
pages/question.vue

@@ -256,30 +256,34 @@
 
     </div>
 </template>
-<script setup>
+<script >
 import { onMounted, reactive } from "vue"
-
-
-// const router = $nuxt.$router
-
-const ins = reactive(
-    { 
-        hash: "#reading"
-    }
-)
-function active(hash) {
-    ins.hash = hash
-};
-onMounted(() => {
-    const hash = window.location.hash
-    if (hash === '') {
-         window.location.hash = "reading";
+export default{
+    middleware:'user',
+    setup(){      
+        const ins = reactive(
+            { 
+                hash: "#reading"
+            }
+        )
+        function active(hash) {
+            ins.hash = hash
+        };
+        onMounted(() => {
+            const hash = window.location.hash
+            if (hash === '') {
+                 window.location.hash = "reading";
+                }
+            else {
+                ins.hash=hash
+            }       
+        })
+        return {
+            ins,
+            active
         }
-    else {
-        ins.hash=hash
     }
-
-})
+}
 </script>
 
 <style>

+ 1 - 0
pages/resetPsw.vue

@@ -182,6 +182,7 @@ export default {
   layout(){
     return 'custom'
   },
+  middleware:'user',
   head(){
     return {
       title:'17PDF Reader - 账号管理'

+ 1 - 0
pages/sdk.vue

@@ -210,6 +210,7 @@ import { throttle } from 'throttle-debounce';
 import sdkForm from '~/components/SdkForm.vue'
 export default {
   components: { sdkForm},
+  middleware:'user',
   data() {
     return {
       modalViable: false,

+ 0 - 1
store/index.js

@@ -46,7 +46,6 @@ export const actions = {
       } catch (err) {
       }
       commit('SET_TOKEN', token)
-      commit('setUser', userInfo)
     }
   },