zhangtao
/
prevention
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改测试环境域名

This commit is contained in:
余菲 2022-11-22 16:19:39 +08:00
parent 11dc76d765
commit cebe27eac7
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
environments.js
View File

@ -1,7 +1,7 @@
const __request_base_url__ = { const __request_base_url__ = {
// develop: "https://apifangke.t-aaron.com:18063/api", develop: "https://apifangke-test.t-aaron.com/api",
develop: "http://192.168.11.241:18061/api", // develop: "http://192.168.11.241:18061/api",
trial: "https://apifangke-test.t-aaron.com:18062/api", trial: "https://apifangke-test.t-aaron.com/api",
release: "https://apifangke.t-aaron.com:18063/api" release: "https://apifangke.t-aaron.com:18063/api"
} }
const platform = wx.getSystemInfoSync().platform const platform = wx.getSystemInfoSync().platform

9
pages/login/login.js
View File

@ -117,7 +117,7 @@ Page({
// 登录 // 登录
userLogin(this.data.form).then(res=> { userLogin(this.data.form).then(res=> {
wx.hideLoading() wx.hideLoading()
if (res.code === 0) { if (res?.code === 0) {
// 以token获取用户信息 // 以token获取用户信息
let token = res.data.token let token = res.data.token
wx.setStorageSync('token', token) // token存入storage wx.setStorageSync('token', token) // token存入storage
@ -135,10 +135,9 @@ Page({
}) })
} else{ } else{
wx.showToast({ wx.showToast({
title: res?.data?.msg || '', title: res?.msg || '用户名密码错误',
icon: 'error', icon: 'none',
image: '', duration: 2000,
duration: 1500,
}); });
} }
}) })

23
request/index.js
View File

@ -8,13 +8,14 @@ export const request = function(data) {
mask: true mask: true
}) })
} }
// 接口api拼接环境地址 let currentUrl = data.url
data.url = baseurl + data.url
// 处理需要token的请求 // 处理需要token的请求
if(!isWithoutToken(data)) { if(!isWithoutToken(data)) {
let baseHeader = {Authorization: wx.getStorageSync('token')} let baseHeader = {Authorization: wx.getStorageSync('token')}
data.header = Object.assign(data.header || {}, baseHeader) data.header = Object.assign(data.header || {}, baseHeader)
} }
// 接口api拼接环境地址
data.url = baseurl + data.url
wx.request({ wx.request({
...data, ...data,
success: function(res) { success: function(res) {
@ -25,11 +26,19 @@ export const request = function(data) {
if(res.data.code == 0) { // 请求成功状态码 if(res.data.code == 0) { // 请求成功状态码
resolve(res.data) resolve(res.data)
} else if ((res.data.code == 401) || (res.data.code == 402)) { // token过期状态码 } else if ((res.data.code == 401) || (res.data.code == 402)) { // token过期状态码
reject(res.data.msg) if(currentUrl !== '/user/login') {
// 重新登录 reject(res.data.msg)
wx.reLaunch({ // 重新登录
url: '/pages/login/login', wx.reLaunch({
}) url: '/pages/login/login',
})
}
// else {
// wx.showToast({
// icon: "error",
// title: '用户名密码错误',
// })
// }
} else { } else {
reject(res.data.msg) reject(res.data.msg)
} }

2
request/whiteList.js
View File

@ -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=''}){ export const isWithoutToken = function({url, method=''}){
return WITHOUT_TOKEN_API.some((item) => item.url === url && item.method === method.toUpperCase()) return WITHOUT_TOKEN_API.some((item) => item.url === url && item.method === method.toUpperCase())