From c4f9c1f7d85272def5126f6d1e8cfeca747ad7fa Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 13 Nov 2023 17:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpkg/shareCapital/shareCapital.vue | 1199 +++++++++++++------------- utils/oahttp.js | 210 ++--- 2 files changed, 710 insertions(+), 699 deletions(-) diff --git a/subpkg/shareCapital/shareCapital.vue b/subpkg/shareCapital/shareCapital.vue index a237cfc..dd5edc4 100644 --- a/subpkg/shareCapital/shareCapital.vue +++ b/subpkg/shareCapital/shareCapital.vue @@ -1,93 +1,95 @@ \ No newline at end of file diff --git a/utils/oahttp.js b/utils/oahttp.js index 063cdb7..0eec1e3 100644 --- a/utils/oahttp.js +++ b/utils/oahttp.js @@ -1,127 +1,127 @@ import { - HTTP_REQUEST_URL_THREE, - HEADER, - TOKENNAME, + HTTP_REQUEST_URL_THREE, + HEADER, + TOKENNAME, } from '@/config/app'; import { - Toast + Toast } from '../libs/uniApi'; // import { checkLogin } from '../libs/login'; import store from '../store'; function toLogin() { - uni.showToast({ - title: '请先登录', - icon: 'none', - duration: 1000 - }); + uni.showToast({ + title: '请先登录', + icon: 'none', + duration: 1000 + }); } function baseRequestTwo(url, method, data, { - noAuth = false, - noVerify = false, - onReLogin = false + noAuth = false, + noVerify = false, + onReLogin = false }) { - let Url = HTTP_REQUEST_URL_THREE, - header = HEADER; - if (!noAuth) { - // 已经未登录了,禁止请求 - if (!store.state.config.request) return Promise.reject({ - msg: '未登录' - }); - //登录过期自动登录 - if (!store.state.app.token) { - toLogin(); - store.commit("SET_REQUEST", false); - return Promise.reject({ - msg: '未登录' - }); - } - } + let Url = HTTP_REQUEST_URL_THREE, + header = HEADER; + if (!noAuth) { + // 已经未登录了,禁止请求 + if (!store.state.config.request) return Promise.reject({ + msg: '未登录' + }); + //登录过期自动登录 + if (!store.state.app.token) { + toLogin(); + store.commit("SET_REQUEST", false); + return Promise.reject({ + msg: '未登录' + }); + } + } - // if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; - if (store.state.app.token) header[TOKENNAME] = store.state.app.token; + // if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; + if (store.state.app.token) header[TOKENNAME] = store.state.app.token; - // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv'; - return new Promise((reslove, reject) => { - // uni.showLoading({ - // title: '加载中' - // }) - uni.request({ - // url: Url + '/api/v1' + url, - url: Url + '/api' + url, - method: method || 'GET', - header: { - ...header - }, - data: method != 'GET' ? data || {} : {}, - params: method == 'GET' ? data : {}, - success: (res) => { - if (noVerify) - reslove(res.data); - else if (res.data.code == -1) { - if(onReLogin) { - store.commit('LOGOUT'); - return reject(); - } - // 如果登录超时,自动重新登录并且继续发送请求 - store.dispatch("RE_LOGIN", { - url: url, - method: method, - data: data, - opt: { - noAuth, - noVerify - } - }).then((e)=>{ - reslove(e); - }).catch((err)=>{ - reject(res.data); - }) - // store.commit("SET_REQUEST", false); - } else if (res.data.code == 0) { - if (res.data.msg != '无登录信息') { - uni.showToast({ - title: res.data.msg || '请检查网络', - icon: 'none', - }) - } - reject(res.data); - } else if (res.data.code == 1) { - store.commit("SET_REQUEST"); - reslove(res.data); - } else if (res.data.code == 200) { - store.commit("SET_REQUEST"); - reslove(res.data.data); - } else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) { - toLogin(); - reject(res.data); - } else if (res.data.code == 501) { - reject(res.data); - } else { - uni.showToast({ - title: res.data.msg || '请检查网络', - icon: 'none' - }) - reject(res.data.msg || '请检查网络'); - } - }, - fail: (message) => { - // uni.hideLoading() - uni.showToast({ - title: '网络错误', - icon: 'none' - }) - reject('请求失败'); - } - }) - }); + // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv'; + return new Promise((reslove, reject) => { + // uni.showLoading({ + // title: '加载中' + // }) + uni.request({ + // url: Url + '/api/v1' + url, + url: Url + '/api' + url, + method: method || 'GET', + header: { + ...header + }, + data: method != 'GET' ? data || {} : {}, + params: method == 'GET' ? data : {}, + success: (res) => { + if (noVerify) + reslove(res.data); + else if (res.data.code == -1) { + if (onReLogin) { + store.commit('LOGOUT'); + return reject(); + } + // 如果登录超时,自动重新登录并且继续发送请求 + store.dispatch("RE_LOGIN", { + url: url, + method: method, + data: data, + opt: { + noAuth, + noVerify + } + }).then((e) => { + reslove(e); + }).catch((err) => { + reject(res.data); + }) + // store.commit("SET_REQUEST", false); + } else if (res.data.code == 0) { + if (res.data.msg != '无登录信息') { + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none', + }) + } + reject(res.data); + } else if (res.data.code == 1) { + store.commit("SET_REQUEST"); + reslove(res.data); + } else if (res.data.code == 200) { + store.commit("SET_REQUEST"); + reslove(res.data.data); + } else if ([410000, 410001, 410002, 40000].indexOf(res.data.code) !== -1) { + toLogin(); + reject(res.data); + } else if (res.data.code == 501) { + reject(res.data); + } else { + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none' + }) + reject(res.data.msg || '请检查网络'); + } + }, + fail: (message) => { + // uni.hideLoading() + uni.showToast({ + title: '网络错误', + icon: 'none' + }) + reject('请求失败'); + } + }) + }); } const oahttp = {}; ['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => { - oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) + oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) }); export default oahttp; \ No newline at end of file