hz/learning-system-mobile
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git synced 2025-12-06 17:36:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'origin/master'"

Browse Source 
This reverts commit 9e16ad6913, reversing
changes made to 4b3b6cdf16.
This commit is contained in:
yujicun
2023-03-17 17:29:37 +08:00
parent 9e16ad6913
commit f0f86482ac
6 changed files with 53 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
App.vue
View File

@@ -1,6 +1,5 @@
<script>
import Vue from 'vue'
import apiUserbasic from '@/api/boe/userbasic.js'
export default {
name: 'App',
onLaunch: function() {
@@ -19,21 +18,22 @@
//console.log(this.$width,'$width');
}
});
//获取或加载一次用户信息
//console.log('App Launch');
//登录页面不需要，此页面用于本地测试
//console.log(location.href,'location.href');
var href=location.href;
//不包含登录页和加载页
if(href.indexOf('/pages/login/login')==-1 && href.indexOf('/pages/login/loading')==-1){
//先做登录校验
//每次加载，增加一次对token的验证，直接调用用户中心的接口,如果token不对，这里会直接返回登录
apiUserbasic.getUserInfo();
if(href.indexOf('/pages/login/login')==-1){
this.$store.dispatch('GetUserInfo');
}
},
mounted() {
},
onShow: function() {
},
onHide: function() {

63
api/boe/boeUserbasic.js
View File

@@ -1,5 +1,4 @@
import config from '@/config/index.js'
import {toLogin} from '@/utils/tologin.js'
import {getToken,removeToken} from '@/utils/token.js'
import qs from 'qs'
@@ -36,22 +35,21 @@ const formRequest=function(method,url,data){
if(rs.data.status==6001){
//uni.removeStorageSync('userInfo');
removeToken();
toLogin(reUrl);
// let loginPath=config.loginPath;
// if(loginPath.startsWith('http')){
// // #ifdef APP-PLUS
// plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// // #endif
// // #ifdef H5
// //window.open(loginPath)
// let returnUrl=window.location.protocol+'//'+window.location.host+config.context;
// location.href=config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
// // #endif
// }else{
// uni.redirectTo({
// url:loginPath
// })
// }
let loginPath=config.loginPath;
if(loginPath.startsWith('http')){
// #ifdef APP-PLUS
plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// #endif
// #ifdef H5
//window.open(loginPath)
let returnUrl=window.location.protocol+'//'+window.location.host+config.context;
location.href=config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
// #endif
}else{
uni.redirectTo({
url:loginPath
})
}
}else{
resolve(rs.data);
}
@@ -87,22 +85,21 @@ const jsonRequest=function(method,url,data){
if(rs.statusCode==200){
if(rs.data.status==6001){
removeToken();
toLogin(reUrl);
// let loginPath=config.loginPath;
// if(loginPath.startsWith('http')){
// // #ifdef APP-PLUS
// plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// // #endif
// // #ifdef H5
// //window.open(loginPath)
// let returnUrl=window.location.protocol+'//'+window.location.host+config.context;
// location.href=config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
// // #endif
// }else{
// uni.redirectTo({
// url:loginPath
// })
// }
let loginPath=config.loginPath;
if(loginPath.startsWith('http')){
// #ifdef APP-PLUS
plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// #endif
// #ifdef H5
//window.open(loginPath)
let returnUrl=window.location.protocol+'//'+window.location.host+config.context;
location.href=config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');
// #endif
}else{
uni.redirectTo({
url:loginPath
})
}
}else{
resolve(rs.data);
}

6
api/boe/userbasic.js
View File

@@ -31,11 +31,6 @@ const getUserInfoById = function(id) {
return ajax.postJson('/user/list',{id});
}
/**获取当前登录用户的信息*/
const getUserInfo = function() {
return ajax.postJson('/user/info',{});
}
/**
* https://u-pre.boe.com/userbasic/audience/userAudiences
* 获取当前用户受众信息
@@ -86,7 +81,6 @@ export default {
getOrgInfo,
findOrgTreeByOrgId,
getUserInfoById,
getUserInfo,
getUserCrowds,
getOrgHrbpInfo,
modifyPassword,

3
pages/login/loading.vue
View File

@@ -6,7 +6,6 @@
<script>
import apiLogin from '@/api/login.js'
import {toLogin} from '@/utils/tologin.js'
import { getToken,setToken } from '@/utils/token'
export default{
data(){
@@ -29,7 +28,7 @@
});
this.toUrl=this.toUrl+params;
}
//console.log(this.toUrl,'options.returnUrl');
console.log(this.toUrl,'options.returnUrl');
},
mounted() {
let token=getToken();

19
pages/study/courseStudy.vue
View File

@@ -863,20 +863,21 @@
// console.log(con,'con');
this.playerBoxShow=false;
if(con.contentType==40){
//如果是文档，需要再次加载pdf,之所以不直接判断 con.contentRefId 是为了兼容一期老版本的
//如果是文档，需要再次加载pdf
if(con.content!='' && con.content.indexOf('.pdf')==-1){
// 先置空，否则会有延迟
con.content = '';
apiCourseFile.detail(con.contentRefId).then(cfrs=>{
if(cfrs.status==200){
con.content=cfrs.result.previewFilePath;
//console.log(r.content);
}else{
$this.$refs.messager.show({message:'加载pdf课件文件失败',type:'error'});
}
});
}
apiCourseFile.detail(con.contentRefId).then(cfrs=>{
if(cfrs.status==200){
con.content=cfrs.result.previewFilePath;
//console.log(r.content);
}else{
$this.$refs.messager.show({message:'加载pdf课件文件失败',type:'error'});
}
});
}else if(con.contentType==50){ //scorm课件的内容
apiCourseFile.detail(con.contentRefId).then(cfrs => {
if(cfrs.status==200){
//this.curCFile = cfrs.result;

10
utils/tologin.js
View File

@@ -2,14 +2,14 @@ import config from '@/config/index.js'
export function toLogin(ajaxUrl) {
let pageUrl=location.href;
//console.log(pageUrl,'pageUrl');
console.log(pageUrl,'pageUrl');
let urlPre=window.location.protocol+'//'+window.location.host;
//console.log(urlPre,'urlPre');
console.log(urlPre,'urlPre');
let urlContext=config.context;
//console.log(urlContext,'urlContext');
console.log(urlContext,'urlContext');
let returnPage=pageUrl.substring((urlPre+urlContext).length);
//console.log(returnPage,'returnPage');
//console.log(config.loginPath+"?returnUrl="+urlPre+urlContext+'/pages/login/loading?returnUrl='+returnPage,'生成的url');
console.log(returnPage,'returnPage');
console.log(config.loginPath+"?returnUrl="+urlPre+urlContext+'/pages/login/loading?returnUrl='+returnPage,'生成的url');
if(ajaxUrl && ajaxUrl.indexOf('/xboe/portal/init')>-1){
return;