From 2eb1def257d674b8a78e0f48b9cb7c5beb49b1af Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Mon, 25 Apr 2022 09:10:17 +0800
Subject: [PATCH] no message

---
 api/index.js               | 16 ++++++++--------
 components/Login/Login.vue | 22 ++++++++--------------
 lu/post.js                 | 28 +++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/api/index.js b/api/index.js
index 1d92088..bf2885b 100644
--- a/api/index.js
+++ b/api/index.js
@@ -7,7 +7,7 @@ import {
 
 export function setUserAccountAction(data, then, error = () => {}) {
 	$post({
-		url: $api('设置账号'),
+		url: '设置账号',
 		data,
 		then: (response) => {
 			$res({
@@ -25,7 +25,7 @@ export function setUserAccountAction(data, then, error = () => {}) {
 }
 export function bindUserPhoneAction(data, then, error = () => {}) {
 	$post({
-		url: $api('设置手机号'),
+		url: '设置手机号',
 		data,
 		then: (response) => {
 			$res({
@@ -43,7 +43,7 @@ export function bindUserPhoneAction(data, then, error = () => {}) {
 }
 export function editUserNicknameAction(nickname, then, error = () => {}) {
 	$post({
-		url: $api('修改昵称'),
+		url: '修改昵称',
 		data: {
 			nickname
 		},
@@ -63,7 +63,7 @@ export function editUserNicknameAction(nickname, then, error = () => {}) {
 }
 export function uploadUserAvatarAction(avatar, then, error = () => {}) {
 	$post({
-		url: $api('上传头像'),
+		url: '上传头像',
 		data: {
 			avatar
 		},
@@ -83,7 +83,7 @@ export function uploadUserAvatarAction(avatar, then, error = () => {}) {
 }
 export function getConfigAction(config_arr, then) {
 	$post({
-		url: $api('基础参数'),
+		url: '基础参数',
 		data: {
 			config_arr
 		},
@@ -102,7 +102,7 @@ export function getConfigAction(config_arr, then) {
 }
 export function userLoginAction(code, then, error = () => {}) {
 	$post({
-		url: $api('微信登录'),
+		url: '微信登录',
 		data: {
 			code
 		},
@@ -122,7 +122,7 @@ export function userLoginAction(code, then, error = () => {}) {
 }
 export function getUserInfoAction(then, msg = true) {
 	$post({
-		url: $api('用户信息'),
+		url: '用户信息',
 		then: (response) => {
 			$res({
 				response,
@@ -139,7 +139,7 @@ export function getUserInfoAction(then, msg = true) {
 }
 export function yo(then) {
 	$post({
-		url: $api('YO'),
+		url: 'YO',
 		then: (response) => {
 			$res({
 				response,
diff --git a/components/Login/Login.vue b/components/Login/Login.vue
index 4782201..df17832 100644
--- a/components/Login/Login.vue
+++ b/components/Login/Login.vue
@@ -11,9 +11,6 @@
 		getUserInfoAction,
 		getConfigAction
 	} from '@/api/index.js'
-	import {
-		getToken
-	} from '@/tool/member.js'
 	const is_login = ref(false)
 	const login_show = ref(true)
 	const phone_show = ref(true)
@@ -53,17 +50,14 @@
 		login_show.value = true
 		phone_show.value = true
 		is_login.value = false
-		if (getToken()) {
-			getUserInfoAction((info) => {
-				is_login.value = true
-				if (info.phone) {
-					login_show.value = false
-				} else {
-					getConfigPhone()
-				}
-
-			}, false)
-		}
+		getUserInfoAction((info) => {
+			is_login.value = true
+			if (info.phone) {
+				login_show.value = false
+			} else {
+				getConfigPhone()
+			}
+		}, false)
 	}
 
 	const toUserSetInfo = () => {
diff --git a/lu/post.js b/lu/post.js
index afb9cf7..5910b94 100644
--- a/lu/post.js
+++ b/lu/post.js
@@ -1,4 +1,16 @@
-import {getToken} from '../tool/member.js';
+import {
+	getToken,
+	delToken
+} from '../tool/member.js';
+import $api from "../api/api.js"
+
+const noLogin = [
+	'用户信息',
+	'微信登录',
+	'基础参数',
+]
+const expirationJumpPath = '/pages/main/login/login'
+
 const post = (e) => {
 	if (typeof e.url === 'undefined') return console.error({
 		'data': {
@@ -12,6 +24,7 @@ const post = (e) => {
 	let then = typeof e.then === 'undefined' ? response => console.log(response) : e.then;
 	let error = typeof e.error === 'undefined' ? err => console.log(err) : e.error;
 	let token = getToken() ? getToken() : '';
+	if (noLogin.indexOf(url) === -1 && token === '') return false
 	data.SYSTEM_TYPE = 'WMP';
 	let header = typeof e.header === 'undefined' ? {
 		'content-type': 'application/json',
@@ -21,11 +34,20 @@ const post = (e) => {
 		...e.header
 	};
 	uni.request({
-		url: url,
+		url: $api(url),
 		method: 'POST',
 		data: data,
 		header: header,
-		success: (res) => then(res.data),
+		success: (res) => {
+			if (Number(res.data.code) === 20003) {
+				delToken()
+				uni.navigateTo({
+					url: expirationJumpPath
+				})
+			} else {
+				then(res.data)
+			}
+		},
 		fail: (e) => error(e)
 	});
 }