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

Merge branch 'stat' into preview

Browse Source
This commit is contained in:
daihh
2022-12-06 16:01:02 +08:00
parent 482cf5be66 0d33987984
commit d914b4eac1
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/ajax.js
View File

@@ -41,7 +41,8 @@ const formRequest=function(method,url,data){
// #endif
// #ifdef H5
//window.open(loginPath)
location.href=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({
@@ -89,8 +90,8 @@ const jsonRequest=function(method,url,data){
plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// #endif
// #ifdef H5
//window.open(loginPath)
location.href=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({

2
pages/login/loading.vue
View File

@@ -27,7 +27,7 @@
plus.runtime.openURL(this.$config.loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
// #endif
// #ifdef H5
console.log('this.$config.loginPath',this.$config.loginPath);
//console.log('this.$config.loginPath',this.$config.loginPath);
if(this.$config.loginPath.startsWith('http')){
let returnUrl=window.location.protocol+'//'+window.location.host+this.$config.context;
location.href=this.$config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading');

2
pages/my/index.vue
View File

@@ -51,7 +51,7 @@
</view>
<view class="hear-info">
<view class="info-name index-one-line-ellipsis">
{{userInfoObj.name}} <text>{{ userData.sign }}</text>
{{userInfoObj.name}} <!-- <text>{{ userData.sign }}</text> -->
</view>
<view class="information">
<text class="grade">{{ statData.level }}</text>

6
utils/xajax.js
View File

@@ -40,7 +40,8 @@ const formRequest=function(method,url,data){
// #endif
// #ifdef H5
//window.open(loginPath)
location.href=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({
@@ -89,7 +90,8 @@ const jsonRequest=function(method,url,data){
// #endif
// #ifdef H5
//window.open(loginPath)
location.href=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({