@@ -1,7 +1,7 @@ | |||
const __request_base_url__ = { | |||
// develop: "https://apifangke.t-aaron.com:18063/api", | |||
develop: "http://192.168.11.241:18061/api", | |||
trial: "https://apifangke-test.t-aaron.com:18062/api", | |||
develop: "https://apifangke-test.t-aaron.com/api", | |||
// develop: "http://192.168.11.241:18061/api", | |||
trial: "https://apifangke-test.t-aaron.com/api", | |||
release: "https://apifangke.t-aaron.com:18063/api" | |||
} | |||
const platform = wx.getSystemInfoSync().platform |
@@ -117,7 +117,7 @@ Page({ | |||
// 登录 | |||
userLogin(this.data.form).then(res=> { | |||
wx.hideLoading() | |||
if (res.code === 0) { | |||
if (res?.code === 0) { | |||
// 以token获取用户信息 | |||
let token = res.data.token | |||
wx.setStorageSync('token', token) // token存入storage | |||
@@ -135,10 +135,9 @@ Page({ | |||
}) | |||
} else{ | |||
wx.showToast({ | |||
title: res?.data?.msg || '', | |||
icon: 'error', | |||
image: '', | |||
duration: 1500, | |||
title: res?.msg || '用户名密码错误', | |||
icon: 'none', | |||
duration: 2000, | |||
}); | |||
} | |||
}) |
@@ -8,13 +8,14 @@ export const request = function(data) { | |||
mask: true | |||
}) | |||
} | |||
// 接口api拼接环境地址 | |||
data.url = baseurl + data.url | |||
let currentUrl = data.url | |||
// 处理需要token的请求 | |||
if(!isWithoutToken(data)) { | |||
let baseHeader = {Authorization: wx.getStorageSync('token')} | |||
data.header = Object.assign(data.header || {}, baseHeader) | |||
} | |||
// 接口api拼接环境地址 | |||
data.url = baseurl + data.url | |||
wx.request({ | |||
...data, | |||
success: function(res) { | |||
@@ -25,11 +26,19 @@ export const request = function(data) { | |||
if(res.data.code == 0) { // 请求成功状态码 | |||
resolve(res.data) | |||
} else if ((res.data.code == 401) || (res.data.code == 402)) { // token过期状态码 | |||
reject(res.data.msg) | |||
// 重新登录 | |||
wx.reLaunch({ | |||
url: '/pages/login/login', | |||
}) | |||
if(currentUrl !== '/user/login') { | |||
reject(res.data.msg) | |||
// 重新登录 | |||
wx.reLaunch({ | |||
url: '/pages/login/login', | |||
}) | |||
} | |||
// else { | |||
// wx.showToast({ | |||
// icon: "error", | |||
// title: '用户名密码错误', | |||
// }) | |||
// } | |||
} else { | |||
reject(res.data.msg) | |||
} |
@@ -1,4 +1,4 @@ | |||
const WITHOUT_TOKEN_API = [{url: '/member/login', method: 'POST'}] | |||
const WITHOUT_TOKEN_API = [{url: '/user/login', method: 'POST'}] | |||
export const isWithoutToken = function({url, method=''}){ | |||
return WITHOUT_TOKEN_API.some((item) => item.url === url && item.method === method.toUpperCase()) |