diff --git a/unitool.js b/unitool.js index f80ca2f..a09a8cc 100644 --- a/unitool.js +++ b/unitool.js @@ -168,6 +168,9 @@ export default { const thisRoute = getCurrentPages()?.pop?.()?.route || 'VueApp' // 立刻保存 route,因为在调用后台后,可能已切换到了其他页面。 const startTime = new Date().toJSON() let url = undefined + let { uniPlatform, deviceType, osName } = uni.getSystemInfoSync() + apiWhat._clientInfo = { uniPlatform, deviceType, osName } + apiWhat._passtoken = uni.getStorageSync('_passtoken') let result = {} if (baseType === 'UNICLOUD_OBJECT') { const uniObj = uniCloud.importObject(apiWho) @@ -183,7 +186,6 @@ export default { data: { apiTodo, apiWhat, - _passtoken: uni.getStorageSync('_passtoken'), // uniIdToken // uniCloud自动getStorageSync('uni_id_token')并传递为 uniIdToken;也可自行组装传入 uniIdToken }, }) @@ -208,8 +210,8 @@ export default { url = this.make_server_url(`${apiVersion}/${apiWho}/${apiTodo}`) let [error, { statusCode, header, errMsg, data: resultServer = {} } = {}] = await uni.request({ method: httpMethod, - url: url, - data: { ...apiWhat, _passtoken: uni.getStorageSync('_passtoken') }, + url, + data: apiWhat, timeout, }) if (error) {