|
|
|
@ -1,7 +1,6 @@
|
|
|
|
import { back, showModal } from "./traoAPI";
|
|
|
|
import { back, showModal, setStorageSync, getStorageSync } from "./traoAPI";
|
|
|
|
import { WCUserLogin } from "./Interface";
|
|
|
|
import { WCUserLogin } from "./Interface";
|
|
|
|
import Taro from "@tarojs/taro";
|
|
|
|
import Taro from "@tarojs/taro";
|
|
|
|
|
|
|
|
|
|
|
|
import formdata from "./wxFormdata/formData";
|
|
|
|
import formdata from "./wxFormdata/formData";
|
|
|
|
|
|
|
|
|
|
|
|
import store from "../store";
|
|
|
|
import store from "../store";
|
|
|
|
@ -29,11 +28,12 @@ export const Ajax = (params) => {
|
|
|
|
requestUrlList.push(params.url);
|
|
|
|
requestUrlList.push(params.url);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return new Promise((reslove, reject) => {
|
|
|
|
return new Promise((reslove, reject) => {
|
|
|
|
|
|
|
|
let token = getStorageSync("token");
|
|
|
|
Taro.request({
|
|
|
|
Taro.request({
|
|
|
|
url: domain + params.url,
|
|
|
|
url: domain + params.url,
|
|
|
|
method: params.method || "GET",
|
|
|
|
method: params.method || "GET",
|
|
|
|
header: {
|
|
|
|
header: {
|
|
|
|
Authorization: "Bearer " + Taro.getStorageSync("token"),
|
|
|
|
Authorization: "Bearer " + token,
|
|
|
|
...params.header,
|
|
|
|
...params.header,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
data: params.data,
|
|
|
|
data: params.data,
|
|
|
|
@ -45,7 +45,7 @@ export const Ajax = (params) => {
|
|
|
|
content: "登录已过期，请重新登录",
|
|
|
|
content: "登录已过期，请重新登录",
|
|
|
|
showCancel: false,
|
|
|
|
showCancel: false,
|
|
|
|
}).then((res) => {
|
|
|
|
}).then((res) => {
|
|
|
|
Taro.setStorageSync("token", null);
|
|
|
|
setStorageSync("token", null);
|
|
|
|
Taro.clearStorage(); // 清空所有缓存
|
|
|
|
Taro.clearStorage(); // 清空所有缓存
|
|
|
|
Taro.reLaunch({
|
|
|
|
Taro.reLaunch({
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
@ -82,7 +82,7 @@ export const Ajax = (params) => {
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
reject(res);
|
|
|
|
reject(res);
|
|
|
|
if (res.data.code == 401 || res.data.msg === "登录状态已过期") {
|
|
|
|
if (res.data.code == 401 || res.data.msg === "登录状态已过期") {
|
|
|
|
Taro.setStorageSync("token", null);
|
|
|
|
setStorageSync("token", null);
|
|
|
|
Taro.reLaunch({
|
|
|
|
Taro.reLaunch({
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -127,6 +127,7 @@ export const AjaxUploadFile = (params, formData) => {
|
|
|
|
mask: true,
|
|
|
|
mask: true,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return new Promise((reslove, reject) => {
|
|
|
|
return new Promise((reslove, reject) => {
|
|
|
|
|
|
|
|
let token = getStorageSync("token");
|
|
|
|
Taro.uploadFile({
|
|
|
|
Taro.uploadFile({
|
|
|
|
filePath: params.filePath,
|
|
|
|
filePath: params.filePath,
|
|
|
|
name: "file",
|
|
|
|
name: "file",
|
|
|
|
@ -135,9 +136,8 @@ export const AjaxUploadFile = (params, formData) => {
|
|
|
|
...formData,
|
|
|
|
...formData,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
header: {
|
|
|
|
header: {
|
|
|
|
Authorization: "Bearer " + Taro.getStorageSync("token"),
|
|
|
|
Authorization: "Bearer " + token,
|
|
|
|
...params.header,
|
|
|
|
...params.header,
|
|
|
|
// token: Taro.getStorageSync("token"),
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
success(res) {
|
|
|
|
success(res) {
|
|
|
|
let o = JSON.parse(res.data);
|
|
|
|
let o = JSON.parse(res.data);
|
|
|
|
@ -191,11 +191,12 @@ export const AjaxFormData = (params) => {
|
|
|
|
requestUrlList.push(params.url);
|
|
|
|
requestUrlList.push(params.url);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return new Promise((reslove, reject) => {
|
|
|
|
return new Promise((reslove, reject) => {
|
|
|
|
|
|
|
|
let token = getStorageSync("token");
|
|
|
|
Taro.request({
|
|
|
|
Taro.request({
|
|
|
|
url: domain + params.url,
|
|
|
|
url: domain + params.url,
|
|
|
|
method: params.method || "GET",
|
|
|
|
method: params.method || "GET",
|
|
|
|
header: {
|
|
|
|
header: {
|
|
|
|
Authorization: "Bearer " + Taro.getStorageSync("token"),
|
|
|
|
Authorization: "Bearer " + token,
|
|
|
|
...params.header,
|
|
|
|
...params.header,
|
|
|
|
"content-type": params.data.contentType,
|
|
|
|
"content-type": params.data.contentType,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -208,7 +209,7 @@ export const AjaxFormData = (params) => {
|
|
|
|
content: "登录已过期，请重新登录",
|
|
|
|
content: "登录已过期，请重新登录",
|
|
|
|
showCancel: false,
|
|
|
|
showCancel: false,
|
|
|
|
}).then((res) => {
|
|
|
|
}).then((res) => {
|
|
|
|
Taro.setStorageSync("token", null);
|
|
|
|
setStorageSync("token", null);
|
|
|
|
Taro.clearStorage(); // 清空所有缓存
|
|
|
|
Taro.clearStorage(); // 清空所有缓存
|
|
|
|
Taro.reLaunch({
|
|
|
|
Taro.reLaunch({
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
@ -240,7 +241,7 @@ export const AjaxFormData = (params) => {
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
reject(res);
|
|
|
|
reject(res);
|
|
|
|
if (res.data.code == 401 || res.data.msg === "登录状态已过期") {
|
|
|
|
if (res.data.code == 401 || res.data.msg === "登录状态已过期") {
|
|
|
|
Taro.setStorageSync("token", null);
|
|
|
|
setStorageSync("token", null);
|
|
|
|
Taro.reLaunch({
|
|
|
|
Taro.reLaunch({
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
url: "/pages/initiate/initiate",
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
blak-kong
2 years ago
