|
@@ -123,9 +123,11 @@ class Base
|
|
return $user;
|
|
return $user;
|
|
}
|
|
}
|
|
|
|
|
|
- public function wechat($data, $user = array(), $account, $system, $source_type, $system_source, $source = false, $invite = false)
|
|
|
|
|
|
+ public function wechat($data, $user = array(), $account, $system, $source_type, $system_source, $source = false, $invite = false, $uid = false)
|
|
{
|
|
{
|
|
- $uid = false;
|
|
|
|
|
|
+ if ($uid <= 0) {
|
|
|
|
+ $uid = false;
|
|
|
|
+ }
|
|
|
|
|
|
if (!$data['openid']) {
|
|
if (!$data['openid']) {
|
|
Dever::alert('错误的openid');
|
|
Dever::alert('错误的openid');
|
|
@@ -150,9 +152,7 @@ class Base
|
|
if (!$info) {
|
|
if (!$info) {
|
|
if (isset($data['unionid']) && $data['unionid']) {
|
|
if (isset($data['unionid']) && $data['unionid']) {
|
|
$info = Dever::db('passport/wechat')->one(array('unionid' => $data['unionid']));
|
|
$info = Dever::db('passport/wechat')->one(array('unionid' => $data['unionid']));
|
|
- if (!$info) {
|
|
|
|
- $uid = false;
|
|
|
|
- } else {
|
|
|
|
|
|
+ if ($info) {
|
|
$uid = $info['uid'];
|
|
$uid = $info['uid'];
|
|
}
|
|
}
|
|
$wechat['unionid'] = $data['unionid'];
|
|
$wechat['unionid'] = $data['unionid'];
|