Bläddra i källkod

修改request

panxingxin 5 år sedan
förälder
incheckning
623550ea6f
2 ändrade filer med 14 tillägg och 12 borttagningar
  1. 13 11
      api/request.js
  2. 1 1
      pages/login/login.js

+ 13 - 11
api/request.js

@@ -20,7 +20,7 @@ fly.interceptors.request.use((request) => {
     wx.hideLoading();
   }
   // 请求资源服务器时,不添加token
-  if (whiteList.nullHeaderToken.indexOf(request.url) !== -1) {
+  if (request.url.indexOf(whiteList.nullHeaderToken) !== -1) {
     request.timeout = 30000; // 请求超时
     request.headers = {
       'content-type': 'application/json',
@@ -31,6 +31,17 @@ fly.interceptors.request.use((request) => {
   }
   // fly.lock()
   // 延迟发请求 等 getStorageSync 存储
+  if (request.headers.Authorization) {
+    // 给所有请求添加自定义header
+    request.timeout = 30000;
+    Object.assign(request.headers, {
+      'content-type': 'application/json',
+      'X-Tag': 'flyio'
+    })
+    // fly.unlock(); //解锁请求
+    return request;
+  }
+
   if(wx.getStorageSync('token')) {
      // 给所有请求添加自定义header
      request.timeout = 30000;
@@ -41,16 +52,7 @@ fly.interceptors.request.use((request) => {
      })
     //  fly.unlock(); //解锁请求
      return request;
-  } else if (request.headers.Authorization) {
-    // 给所有请求添加自定义header
-    request.timeout = 30000;
-    Object.assign(request.headers, {
-      'content-type': 'application/json',
-      'X-Tag': 'flyio'
-    })
-    // fly.unlock(); //解锁请求
-    return request;
-  }
+  } 
   //  else if(!wx.getStorageSync('token')&&app.getCurrentPages()=='pages/login/login') {
   //   request.headers = {
   //     'content-type': 'application/json',

+ 1 - 1
pages/login/login.js

@@ -40,7 +40,7 @@ Page({
     wx.login({
       success(wxres) {
         requestAPI.userLogin(wxres.code).then(res => {
-          if (res.statusCode === 401) {
+          if (res.status === 401) {
             self.setData({
               ifUser: false
             })