diff --git a/src/pages_mine/pages/info/edit.vue b/src/pages_mine/pages/info/edit.vue index 9eb0306..5ec9b7b 100644 --- a/src/pages_mine/pages/info/edit.vue +++ b/src/pages_mine/pages/info/edit.vue @@ -21,112 +21,112 @@ diff --git a/src/pages_mine/pages/info/index.vue b/src/pages_mine/pages/info/index.vue index 65c861a..74de413 100644 --- a/src/pages_mine/pages/info/index.vue +++ b/src/pages_mine/pages/info/index.vue @@ -1,44 +1,46 @@ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e169ddb..7025a45 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -47,7 +47,7 @@ const user = { return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { setToken(res.token) - commit('SET_TOKEN',res.token ) + commit('SET_TOKEN', res.token) resolve() }).catch(error => { reject(error) @@ -60,10 +60,8 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - //const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "@/static/images/profile.jpg" : baseUrl + user.avatar - /* cloud */ - const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "/static/images/profile.jpg" : user.avatar - const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName + const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "@/static/images/profile.jpg" : baseUrl + user.avatar + const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName if (res.roles && res.roles.length > 0) { commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) diff --git a/src/utils/request.js b/src/utils/request.ts similarity index 76% rename from src/utils/request.js rename to src/utils/request.ts index fef21ba..aca2a39 100644 --- a/src/utils/request.js +++ b/src/utils/request.ts @@ -4,10 +4,28 @@ import { getToken } from '@/utils/auth' import errorCode from '@/utils/errorCode' import { toast, showConfirm, tansParams } from '@/utils/common' -let timeout = 10000 const baseUrl = config.baseUrl -const request = config => { +interface RequestConfig{ + headers?:{ + isToken:boolean + }, + header?:any, + params?:any, + url:string, + method?:"OPTIONS" | "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "TRACE" | "CONNECT" | undefined + baseUrl?:string, + timeout?:number | undefined, + data?:any +} + +interface ResponseData{ + code:number, + data:any, + msg:string +} + +const request = (config:RequestConfig) => { // 是否需要设置 token const isToken = (config.headers || {}).isToken === false config.header = config.header || {} @@ -22,8 +40,8 @@ const request = config => { } return new Promise((resolve, reject) => { uni.request({ - method: config.method || 'get', - timeout: config.timeout || timeout, + method: config.method || 'GET', + timeout: config.timeout || 10000, url: config.baseUrl || baseUrl + config.url, data: config.data, header: config.header, @@ -36,8 +54,10 @@ const request = config => { return } */ const res = response - const code = res.data.code || 200 - const msg = errorCode[code] || res.data.msg || errorCode['default'] + const data:ResponseData = res.data as ResponseData + const code = data.code || 200 + // @ts-ignore + const msg:string = errorCode[code] || data.msg || errorCode['default'] if (code === 401) { showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => { if (res.confirm) {