Commit 64670f4c by xiexiaoqin

perf:修改登录和请求

parent b79a3152
...@@ -18,6 +18,7 @@ export default async function login() { ...@@ -18,6 +18,7 @@ export default async function login() {
method: 'POST', method: 'POST',
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {
if (res.data.code == 0) {
const { oapiUser } = res.data.data; const { oapiUser } = res.data.data;
getApp().globalData.token = res.data.data.accessToken.access_token; getApp().globalData.token = res.data.data.accessToken.access_token;
getApp().globalData.name = res.data.data.oapiUser.name; getApp().globalData.name = res.data.data.oapiUser.name;
...@@ -31,18 +32,20 @@ export default async function login() { ...@@ -31,18 +32,20 @@ export default async function login() {
}); });
lock = false; lock = false;
resolve(res) resolve(res)
} else {
lock = false;
reject(res.data);
}
}, },
fail: function (err) { fail: function (err) {
lock = false; lock = false;
reject(err); reject(err);
console.log('err:' + err);
} }
}) })
}, },
fail: function (err) { fail: function (err) {
lock = false; lock = false;
reject(err); reject(err);
console.log('fail:' + err);
} }
}) })
}) })
......
import login from "./login";
export default function xFetch({ url, method, data, type }) { export default function xFetch({ url, method, data, type }) {
if (type == 'binding') { if (type == 'binding') {
url = `${getApp().globalData.globalUrl2}${url}` url = `${getApp().globalData.globalUrl2}${url}`
...@@ -14,22 +16,35 @@ export default function xFetch({ url, method, data, type }) { ...@@ -14,22 +16,35 @@ export default function xFetch({ url, method, data, type }) {
method: method, method: method,
dataType: "json", dataType: "json",
data: data, data: data,
timeout: 10000, timeout: 15000,
success: function (res) { success: function (res) {
if (res.data.code == 0) { if (res.data.code == 0) {
resolve(res); resolve(res);
} else { } else {
rejects({ ...res.data, refresh: true }); if (res.data.code == 401) {
dd.alert({ login();
content: res.data.msg || "请求数据异常", }
buttonText: "确定" alertOnce('请求异常,请重试', rejects);
});
} }
}, },
fail: function (err) { fail: function (err) {
rejects({ refresh: true }); alertOnce('网络异常,请重试', rejects);
} }
}); });
}); });
} }
let alert = false;
function alertOnce(content, rejects) {
if (alert == false) {
dd.alert({
content: content,
buttonText: "确定",
success: () => {
rejects({ refresh: true });
alert = false;
}
});
}
alert = true;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment