JXDS18FUJT преди 2 години
родител
ревизия
d2d4f0ef59
променени са 2 файла, в които са добавени 25 реда и са изтрити 22 реда
  1. 2 2
      src/api/request.ts
  2. 23 20
      src/views/home/index.vue

+ 2 - 2
src/api/request.ts

@@ -7,12 +7,12 @@ const request = axios.create({
 });
 request.interceptors.request.use(config => {
 	const token = window.localStorage.getItem("token") || ""
-	if (config.headers.isToken === "0"||!token) {
+	if (config.headers.isToken === "0") {
 		config.headers["Authorization"] = ""
 	}
 
 	else {
-		config.headers["Authorization"] = "Bearer " + token;
+		config.headers["Authorization"] = token?"Bearer " + token:"";
 
 	}
 	// 让每个请求携带自定义token 请根据实际情况自行修改

+ 23 - 20
src/views/home/index.vue

@@ -92,31 +92,34 @@ export default defineComponent({
         const todayIncome = ref(0)
         const yesterdayIncome = ref(0)
         const totalIncome = ref(0)
-        if (route.query.state === 'LOGIN') {
 
-            api.login.logingzhcode({
-                authorizationCode: route.query.code as string
-            }).then(res => {
-                Toast.success({
-                    message: '登陆成功',
-                    forbidClick: true
-                })
-                window.localStorage.setItem("token", res.data.data.token)
 
-            }).catch(err => {
-                Toast.fail({
-                    message: err,
-                    forbidClick: true
+        onMounted(async () => {
+            if (route.query.state === 'LOGIN') {
+
+                await api.login.logingzhcode({
+                    authorizationCode: route.query.code as string
+                }).then(res => {
+                    Toast.success({
+                        message: '登陆成功',
+                        forbidClick: true
+                    })
+                    window.localStorage.setItem("token", res.data.data.token)
+
+                }).catch(err => {
+                    Toast.fail({
+                        message: err,
+                        forbidClick: true
+                    })
                 })
-            })
 
-        }
-        api.user.studentUserInfo().then(res => {
-            store.commit('SET_USERINFO', res.data.data)
-            window.localStorage.setItem("userInfo", JSON.stringify(res.data.data))
+            }
+            //获取用户信息
+            api.user.studentUserInfo().then(res => {
+                store.commit('SET_USERINFO', res.data.data)
+                window.localStorage.setItem("userInfo", JSON.stringify(res.data.data))
 
-        })
-        onMounted(() => {
+            })
             //昨日收益
             api.order.studentOrderInfoYesterdayTotal({
             }).then(res => {