Merge remote-tracking branch 'boe/cloud'

This commit is contained in:
yujicun
2023-08-10 11:25:33 +08:00
6 changed files with 12 additions and 1259 deletions

View File

@@ -25,7 +25,7 @@
var href=location.href; var href=location.href;
//不包含登录页和加载页 //不包含登录页和加载页
if(href.indexOf('/pages/login/login')==-1 && href.indexOf('/pages/login/loading')==-1){ if(href.indexOf('/pages/login/login')==-1 && href.indexOf('/pages/login/loading')==-1){
console.log('href='+href) //console.log('href='+href)
//先做登录校验 //先做登录校验
//每次加载增加一次对token的验证直接调用用户中心的接口,如果token不对这里会直接返回登录 //每次加载增加一次对token的验证直接调用用户中心的接口,如果token不对这里会直接返回登录
//apiUserbasic.getUserInfo(); //apiUserbasic.getUserInfo();

View File

@@ -178,7 +178,6 @@
import apiQa from '@/api/modules/qa.js' import apiQa from '@/api/modules/qa.js'
import apiMessage from '@/api/system/message.js' import apiMessage from '@/api/system/message.js'
import {toScore} from '@/utils/tools.js' import {toScore} from '@/utils/tools.js'
import apiBoeCourse from '@/api/boe/course.js'
import apiUserGroup from "@/api/modules/usergroup.js"; import apiUserGroup from "@/api/modules/usergroup.js";
import apiUserbasic from '@/api/boe/userbasic.js' import apiUserbasic from '@/api/boe/userbasic.js'
import apiOnceMedal from '@/api/phase2/onceMedal.js' import apiOnceMedal from '@/api/phase2/onceMedal.js'

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,6 @@
import { getToken, setToken, removeToken } from '@/utils/token' import { getToken, setToken, removeToken } from '@/utils/token'
import app from '@/api/app.js' import app from '@/api/app.js'
import apiLogin from '@/api/login.js' import apiLogin from '@/api/login.js'
import apiBoeLogin from '@/api/boe/login.js'
import apiMessage from '@/api/system/message.js' import apiMessage from '@/api/system/message.js'
import config from '@/config/index.js' import config from '@/config/index.js'
import apiUserbasic from '@/api/boe/userbasic.js' import apiUserbasic from '@/api/boe/userbasic.js'
@@ -133,7 +132,7 @@ const user = {
// 退出系统 // 退出系统
LogOut({ commit, state }) { LogOut({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
//apiBoeLogin.logout();
commit('SET_PERMISSIONS', []) commit('SET_PERMISSIONS', [])
removeToken() removeToken()
//resolve() //resolve()

View File

@@ -34,11 +34,12 @@ export function setToken(token) {
} }
export function removeToken() { export function removeToken() {
uni.removeStorageSync(TOKEN_KEY); // uni.removeStorageSync(TOKEN_KEY);
uni.removeStorageSync('returnUrl'); // uni.removeStorageSync('returnUrl');
uni.setStorageSync('oh','quit'); // //uni.setStorageSync('oh','quit');
uni.removeStorageSync('userInfo'); // uni.removeStorageSync('userInfo');
uni.removeStorageSync('inner'); // uni.removeStorageSync('inner');
uni.clearStorageSync();
// #ifdef H5 // #ifdef H5
document.cookie = "token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;"; document.cookie = "token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
document.cookie = "userInfo=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;"; document.cookie = "userInfo=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";

View File

@@ -1,4 +1,5 @@
import config from '@/config/index.js' import config from '@/config/index.js'
import {removeToken} from '@/utils/token.js'
export function toLogin(ajaxUrl) { export function toLogin(ajaxUrl) {
let pageUrl=location.href; let pageUrl=location.href;
@@ -14,6 +15,8 @@ export function toLogin(ajaxUrl) {
if(ajaxUrl && ajaxUrl.indexOf('/xboe/portal/init')>-1){ if(ajaxUrl && ajaxUrl.indexOf('/xboe/portal/init')>-1){
return; return;
} }
//跳转到登录,先把本地的登录信息清空
//removeToken();
//http://localhost:8081/mobile/pages/study/courseStudy?id=1028700304503054336 //http://localhost:8081/mobile/pages/study/courseStudy?id=1028700304503054336
if(pageUrl.indexOf('returnUrl')>-1){ if(pageUrl.indexOf('returnUrl')>-1){
console.log(pageUrl,'to pageUrl') console.log(pageUrl,'to pageUrl')