4.23

2025-04-23 18:00:35 +08:00
parent 44cba1950d
commit d2c8a95723
6 changed files with 609 additions and 459 deletions
@@ -1,31 +1,101 @@
-// const baseUrl = "https://pandamimi.lzyyj.com/prod-api";
-// const baseUrl = "http://192.168.31.121:9221";

-import baseUrl from "./baseUrl.js"
+import allUrl  from "./baseUrl.js"
 // const baseUrl = bootUrl
 export function request ( optaions ) {
 	let { url, method, data, header1 } = optaions
 	method = method || "GET"
 	data = data || {}
+	let newData = {}
+	for( let key in data){
+		if( data[key] !== null && data[key] !== ''){
+			newData[key] = data[key]
+		}
+	}
+	data = newData || {}
 	header1 =  header1 || {
-		Authorization: uni.getStorageSync('token')
+		Authorization: 'Bearer ' + uni.getStorageSync('token')
 	} 
-	// console.log(com.getCacheToken("userInfo").token)
 	return new Promise((reslove,reject)=>{
 		uni.request({
-			url: baseUrl + url,
+			url: allUrl + url,
 			method,
 			header: header1,
 			data,
 			success: (res) => {
-				if(res.data.code == 401 ){
-					uni.showToast({ title: '登录已失效,请重新登录！', icon: 'none' });
+				if(res.data.errcode == 401 ){
+					uni.showToast({ title: '登录已失效,即将重新登录！', icon: 'none' });
 					uni.removeStorageSync('userInfo');
 					uni.removeStorageSync('token');
 					setTimeout(()=>{
-						uni.navigateTo({ url: '/pages/user/login' });
+						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
 					}, 1000);
-				}else if(res.data.code != 200){
+				}else if(res.data.errcode != 0){
+					console.log('不正确走的')
+					reject(res)
+					uni.showToast({ title: res.data.errmsg, icon: 'none', duration: 2000 });
+				}else {
+					reslove(res.data)
+				}
+				
+			},
+			fail: (err) => {
+				console.log('请求失败',err)
+				uni.hideLoading()
+				if(err.statusCode == 401 ){
+					uni.showToast({ title: '登录已失效,即将重新登录！', icon: 'none' });
+					uni.removeStorageSync('userInfo');
+					uni.removeStorageSync('token');
+					setTimeout(()=>{
+						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+					}, 1000);
+				}
+				if(err.data.errcode == 401 ){
+					uni.showToast({ title: '登录已失效,即将重新登录！', icon: 'none' });
+					uni.removeStorageSync('userInfo');
+					uni.removeStorageSync('token');
+					setTimeout(()=>{
+						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+					}, 1000);
+				}else{
+					uni.showToast({ title: err.data.errmsg, icon: 'none' });
+				}
+				reject()
+			},
+			complete: () => {
+				setTimeout(()=>{
+					uni.hideLoading()
+				}, 2000)
+			}
+		})
+	})
+}
+
+
+export function requestLogin ( optaions ) {
+	let { url, method, data } = optaions
+	method = method || "GET"
+	data = data || {}
+	let newData = {}
+	for( let key in data){
+		if( data[key] !== null && data[key] !== ''){
+			newData[key] = data[key]
+		}
+	}
+	data = newData || {}
+	return new Promise((reslove,reject)=>{
+		uni.request({
+			url: allUrl + url,
+			method,
+			data,
+			success: (res) => {
+				if(res.statusCode == 401 ){
+					uni.showToast({ title: '登录已失效,即将返回首页！', icon: 'none' });
+					uni.removeStorageSync('userInfo');
+					uni.removeStorageSync('token');
+					setTimeout(()=>{
+						uni.reLaunch({ url: '/pages/newHomePage/newHomePage' });
+					}, 1000);
+				}else if(res.statusCode != 200){
 					reject(res)
 					uni.showToast({ title: res.data.msg, icon: 'none', duration: 2000 });
 				}else {
@@ -41,4 +111,4 @@ export function request ( optaions ) {
 			}
 		})
 	})
-}
+}