From c56e67c77e2a36c894346830c1ab1e6df36fe935 Mon Sep 17 00:00:00 2001 From: 819527061@qq.com <123456> Date: 星期五, 01 十二月 2023 16:55:02 +0800 Subject: [PATCH] 测试bug调整 --- utils/request.js | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/utils/request.js b/utils/request.js index a9a4c2a..91402b3 100644 --- a/utils/request.js +++ b/utils/request.js @@ -6,6 +6,7 @@ jihua } from './jihua.js'; + // 鎴愬姛 const responseOK = (response) => { const { @@ -18,21 +19,16 @@ const responseFailedDependency = () => { uni.showToast({ title: '鐧诲綍鐘舵�佽繃鏈�,鍗冲皢杩斿洖鐧诲綍锛�', - icon: 'error', + icon: 'none', position: 'top', duration: 2000 }); setTimeout(() => { - try { - uni.clearStorageSync(); - // 閲嶅畾鍚戠櫥褰� - uni.redirectTo({ - url: '/pages/login/login' - }) - } catch (e) { - // error - console.log(e) - } + uni.clearStorageSync(); + // 閲嶅畾鍚戠櫥褰� + uni.redirectTo({ + url: '/pages/login/login' + }) }, 2000); return false; } @@ -87,14 +83,20 @@ 500: responseError } + //let BaseUrl = 'http://192.168.0.159:9999'; +const BaseUrl = 'https://mx.jzeg.cn:9998'; +// let BaseUrl = 'http://192.168.0.114:9999'; +// const BaseUrl = 'http://192.168.0.102:9999'; // 椋炲摜 + +//const BaseUrl = "https://mx.jzeg.cn:9998"; // 姝e紡鏈嶅姟 // 璇锋眰鎷︽埅 -const fetch = (url, opt ,urlParam) => { - let baseUrl = 'http://192.168.3.159:9999'; +const fetch = (url, opt, urlParam) => { + let urls = (api[opt.url]?.url || api[url]?.url || jihua[opt.url]?.url || jihua[url]?.url); let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) : - ''; - opt.url = urlParam ? baseUrl + urls + `/${urlParam}` + params : baseUrl + urls + params + ''; + opt.url = urlParam ? BaseUrl + urls + `/${urlParam}` + params : BaseUrl + urls + params opt.method = opt.method || "GET"; var header = {} if (uni.getStorageSync('access_token')) { @@ -102,7 +104,7 @@ "TENANT-ID": 5, Authorization: 'Bearer ' + uni.getStorageSync('access_token'), VERSION: "zzl", - Accept:'application/json, text/plain, */*' // 瀹㈡埛绔墍鑳芥帴鍙楃殑鏁版嵁绫诲瀷 + // Accept: 'application/json, text/plain, */*' // 瀹㈡埛绔墍鑳芥帴鍙楃殑鏁版嵁绫诲瀷 } } @@ -154,5 +156,6 @@ export { - fetch + fetch, + BaseUrl } -- Gitblit v1.9.1