merge: 合并main分支到CareerMap

utilsRc/store/modules/user.js

@@ -4,10 +4,10 @@ import constant from '@/utilsRc/constant'
 import {
 	login,
 	// logout,
-	// getInfo,
-	// register,
-	// smsLogin,
-	// wechatLogin
+	getInfo,
+	register,
+	smsLogin,
+	wechatLogin
 } from '@/apiRc/login'
 import {
 	getToken,
@@ -99,7 +99,6 @@ const user = {
 				// info.password = '04' + sm2.doEncrypt(info.password, state.publicKey, 0)
 				// info.username = '04' + sm2.doEncrypt(info.username, state.publicKey, 0)
 				login(userInfo).then(res => {
-					console.log('登录接口返回:', res);
 					setToken(res.data.token)
 					commit('SET_TOKEN', res.data.token)
 					resolve(res)
@@ -229,22 +228,19 @@ const user = {
 			commit,
 			state
 		}) {
-			return new Promise((resolve, reject) => {
-				logout(state.token).then(() => {
-					commit('SET_TOKEN', '')
-					commit('SET_ROLES', [])
-					commit('SET_PERMISSIONS', [])
-					commit('SET_TYPE', '')
-					commit('SET_NICK', '')
-					commit('SET_PHONENUMBER', '')
-					commit('SET_USER_ID', '')
-					commit('SET_SHOWEXITPOPUP', false)
-					removeToken()
-					storage.clean()
-					resolve()
-				}).catch(error => {
-					reject(error)
-				})
+			return new Promise((resolve) => {
+				// 直接清理本地数据，不调用后端接口
+				commit('SET_TOKEN', '')
+				commit('SET_ROLES', [])
+				commit('SET_PERMISSIONS', [])
+				commit('SET_TYPE', '')
+				commit('SET_NICK', '')
+				commit('SET_PHONENUMBER', '')
+				commit('SET_USER_ID', '')
+				commit('SET_SHOWEXITPOPUP', false)
+				removeToken()
+				storage.clean()
+				resolve()
 			})
 		}
 	}