Selaa lähdekoodia

Merge branch 'master' of http://git.izouma.com/xiongzhu/paimaide

panhui 3 vuotta sitten
vanhempi
commit
ed77ca322c
3 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 1 1
      src/mixins/phone.js
  2. 2 2
      src/plugins/http.js
  3. 1 1
      src/views/TabsPage.vue

+ 1 - 1
src/mixins/phone.js

@@ -86,7 +86,7 @@ export default {
                     return Promise.reject()
                     return Promise.reject()
                 })
                 })
                 .then(res => {
                 .then(res => {
-                    localStorage.setItem('nineToken', res)
+                    localStorage.setItem('appToken', res)
                     return this.$store.dispatch('getUserInfo')
                     return this.$store.dispatch('getUserInfo')
                 })
                 })
         }
         }

+ 2 - 2
src/plugins/http.js

@@ -3,9 +3,9 @@ import qs from 'qs'
 import { useStorage } from '@vueuse/core'
 import { useStorage } from '@vueuse/core'
 
 
 const baseURL = import.meta.env.VITE_BASE_URL
 const baseURL = import.meta.env.VITE_BASE_URL
-const axiosInstance = axios.create({ baseURL })
+const axiosInstance = axios.create({ baseURL, headers: { 'Accept-Language': 'en-US,en' } })
 
 
-const token = useStorage('token', '', localStorage)
+const token = useStorage('appToken', '', localStorage)
 if (token.value) {
 if (token.value) {
     axiosInstance.defaults.headers.common['Authorization'] = 'Bearer ' + token.value
     axiosInstance.defaults.headers.common['Authorization'] = 'Bearer ' + token.value
 }
 }

+ 1 - 1
src/views/TabsPage.vue

@@ -74,7 +74,7 @@ const tabChange = tabInfo => {
 
 
 const router = useRouter()
 const router = useRouter()
 function goRank() {
 function goRank() {
-    router.push('/rank')
+    router.replace({ name: 'rank' })
     activeTab.value = 'rank'
     activeTab.value = 'rank'
 }
 }
 </script>
 </script>