daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.5.5版本

Browse Source
This commit is contained in:
雨中磐石
2023-04-05 13:00:20 +08:00
parent bc69541c7b
commit 33ce4c6298
102 changed files with 570 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webmain/we/login/loginAction.php
View File

@@ -28,17 +28,17 @@ class loginClassAction extends ActionNot{
if($this->rock->isqywx){
if(!isempt($qycrid))$iskj=2;
}else{
//$coppid = $this->option->getval('weixin_corpid');
//if(!isempt($coppid))$iskj=1;
if($iskj==0 && !isempt($qycrid))$iskj=2;
if(!isempt($qycrid))$iskj=2;
if($iskj==0 && $this->option->getval('wxgzh_tplmess')=='1')$iskj=4;
}
$kjdl = $this->option->getval('qywxplat_kjdl');
if($this->getsession('olaizhi') || $kjdl=='1')$iskj = 5;
}
return $iskj;
}
/**
* 微信快捷登录
* 企业微信快捷登录
*/
public function wxloginAction()
{
@@ -48,8 +48,10 @@ class loginClassAction extends ActionNot{
m('weixinqy:oauth')->login();
}else if($iskj==4){
m('wxgzh:oauth')->oauthto('we','login');
}else if($iskj==5){
c('rockqywx')->authlogin($this->getsession('olaizhi'));
}else{
m('weixin:oauth')->login();
return 'wuxiaoopen';
}
}
@@ -61,10 +63,15 @@ class loginClassAction extends ActionNot{
if($iskj==2){
m('weixinqy:oauth')->logincode();
}else{
m('weixin:oauth')->logincode();
//m('weixin:oauth')->logincode();
}
}
public function wxqybackAction()
{
$this->display= false;
c('rockqywx')->authloginback($this->get('userid'), $this->get('errmsg'));
}
/**
* 微信授权绑定

2
webmain/we/login/tpl_login.html
View File

@@ -317,7 +317,7 @@ if($iskj>0){
if($iskj==3){
echo '<div onclick="dingdengl()" style="text-align:center;padding-top:10px;color:#1389D3">钉钉快捷登录</div>';
}else{
echo '<div onclick="yanzdengl('.$iskj.')" style="text-align:center;padding-top:10px;color:#1389D3">'.(($iskj==2)?'企业':'').'微信'.(($iskj==4)? '公众号':'快捷').'登录</div>';
echo '<div onclick="yanzdengl('.$iskj.')" style="text-align:center;padding-top:10px;color:#1389D3">'.(($iskj==2 || $iskj==5)?'企业':'').'微信'.(($iskj==4)? '公众号':'快捷').'登录</div>';
}
}
if($da['platsign'])echo '<div onclick="reimplatlogin(this)" style="text-align:center;padding-top:10px;color:#336699">快捷登录</div>';