dedsudiyu il y a 11 mois
Parent
commit
e949f4de9e
2 fichiers modifiés avec 34 ajouts et 108 suppressions
  1. 33 75
      api/request/request.js
  2. 1 33
      pages/login/login.vue

+ 33 - 75
api/request/request.js

@@ -36,21 +36,7 @@ export const apiResquest = (prams) => {
 					if (res.data.code == 200) {
 						resolve(res);
 					} else if (res.data.code == 401) {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: "登录超时,请重新登录~",
-							duration: 2000
-						});
-						uni.removeStorageSync('token');
-						uni.removeStorageSync('userId');
-						uni.removeStorageSync('userType');
-						setTimeout(function() {
-							uni.redirectTo({
-								url: '/pages/login',
-							});
-						}, 2000);
+						loginTimeout();
 					} else {
 						uni.showToast({
 							mask: true,
@@ -61,6 +47,8 @@ export const apiResquest = (prams) => {
 						});
 						resolve(res);
 					}
+				} else if (res.statusCode == 401) {
+					loginTimeout();
 				} else {
 					uni.showToast({
 						mask: true,
@@ -119,21 +107,7 @@ export const apiResquestForm = (prams) => {
 					if (res.data.code == 200) {
 						resolve(res);
 					} else if (res.data.code == 401) {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: "登录超时,请重新登录~",
-							duration: 2000
-						});
-						uni.removeStorageSync('token');
-						uni.removeStorageSync('userId');
-						uni.removeStorageSync('userType');
-						setTimeout(function() {
-							uni.redirectTo({
-								url: '/pages/login',
-							});
-						}, 2000);
+						loginTimeout();
 					} else {
 						uni.showToast({
 							mask: true,
@@ -144,6 +118,8 @@ export const apiResquestForm = (prams) => {
 						});
 						resolve(res);
 					}
+				} else if (res.statusCode == 401) {
+					loginTimeout();
 				} else {
 					uni.showToast({
 						mask: true,
@@ -200,21 +176,7 @@ export const apiResquestJsonList = (prams) => {
 					if (res.data.code == 200) {
 						resolve(res);
 					} else if (res.data.code == 401) {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: "登录超时,请重新登录~",
-							duration: 2000
-						});
-						uni.removeStorageSync('token');
-						uni.removeStorageSync('userId');
-						uni.removeStorageSync('userType');
-						setTimeout(function() {
-							uni.redirectTo({
-								url: '/pages/login',
-							});
-						}, 2000);
+						loginTimeout();
 					} else {
 						uni.showToast({
 							mask: true,
@@ -225,6 +187,8 @@ export const apiResquestJsonList = (prams) => {
 						});
 						resolve(res);
 					}
+				} else if (res.statusCode == 401) {
+					loginTimeout();
 				} else {
 					uni.showToast({
 						mask: true,
@@ -283,21 +247,7 @@ export const apiResquestFormVideo = (prams) => {
 					if (res.data.code == 200) {
 						resolve(res);
 					} else if (res.data.code == 401) {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: "登录超时,请重新登录~",
-							duration: 2000
-						});
-						uni.removeStorageSync('token');
-						uni.removeStorageSync('userId');
-						uni.removeStorageSync('userType');
-						setTimeout(function() {
-							uni.redirectTo({
-								url: '/pages/login',
-							});
-						}, 2000);
+						loginTimeout();
 					} else {
 						uni.showToast({
 							mask: true,
@@ -308,6 +258,8 @@ export const apiResquestFormVideo = (prams) => {
 						});
 						resolve(res);
 					}
+				} else if (res.statusCode == 401) {
+					loginTimeout();
 				} else {
 					uni.showToast({
 						mask: true,
@@ -363,21 +315,7 @@ export const apiResquestTimer = (prams) => {
 					if (res.data.code == 200) {
 						resolve(res);
 					} else if (res.data.code == 401) {
-						uni.showToast({
-							mask: true,
-							icon: "none",
-							position: "center",
-							title: "登录超时,请重新登录~",
-							duration: 2000
-						});
-						uni.removeStorageSync('token');
-						uni.removeStorageSync('userId');
-						uni.removeStorageSync('userType');
-						setTimeout(function() {
-							uni.redirectTo({
-								url: '/pages/login',
-							});
-						}, 2000);
+						loginTimeout();
 					} else {
 						uni.showToast({
 							mask: true,
@@ -388,6 +326,8 @@ export const apiResquestTimer = (prams) => {
 						});
 						resolve(res);
 					}
+				} else if (res.statusCode == 401) {
+					loginTimeout();
 				} else {
 					uni.showToast({
 						mask: true,
@@ -415,4 +355,22 @@ export const apiResquestTimer = (prams) => {
 			}
 		});
 	})
+}
+//登录超时-退出至登录页面
+export function loginTimeout(params) {
+	uni.showToast({
+		mask: true,
+		icon: "none",
+		position: "center",
+		title: "登录超时,请重新登录~",
+		duration: 2000
+	});
+	uni.removeStorageSync('token');
+	uni.removeStorageSync('userId');
+	uni.removeStorageSync('userType');
+	setTimeout(function() {
+		uni.redirectTo({
+			url: '/pages/login/login',
+		});
+	}, 2000);
 }

+ 1 - 33
pages/login/login.vue

@@ -27,7 +27,6 @@
 				<view>记住我</view>
 			</view>
 			<view class="button-box" @click="login">登录</view>
-			<view class="button-box" @click="getCode">huoqu </view>
 		</view>
 	</view>
 </template>
@@ -76,43 +75,12 @@
 				this.password = uni.getStorageSync('password');
 				this.checkedType = true;
 			}
-
-
 		},
 		onShow() {
 			// this.getConfigInfo();
-			// #ifdef MP-WEIXIN
-
-			uni.login({
-				"provider": "weixin",
-				"onlyAuthorize": true, // 微信登录仅请求授权认证
-				success: function(event) {
-					const {
-						code
-					} = event
-					console.log(code)
-				},
-				fail: function(err) {
-					// 登录授权失败
-					// err.code是错误码
-				}
-			})
-			// #endif
-			// #ifdef H5
-
-			// #endif
-
-
+			console.log(navigator.userAgent.toLowerCase())
 		},
 		methods: {
-			getCode(){
-				
-				const appid = 'YOUR_APP_ID';
-				const redirectUri = encodeURIComponent('http://yourwebsite.com/callback.html');
-				const authUrl =
-					`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
-				window.location.href = authUrl;
-			},
 			//顶部tab点击
 			tabClick(index) {
 				this.curTab = index;