|
|
@@ -149,7 +149,7 @@ class Applet extends Base
|
|
|
if (isset($data['unionid']) && $data['unionid']) {
|
|
|
$wechat['unionid'] = $data['unionid'];
|
|
|
# 判断用户是否存在，是否需要合并
|
|
|
- $wechat['uid'] = $this->combine($uid, $data['unionid']);
|
|
|
+ //$wechat['uid'] = $this->combine($uid, $data['unionid']);
|
|
|
}
|
|
|
|
|
|
$wechat['session_key'] = $data['session_key'];
|
|
|
@@ -255,15 +255,15 @@ class Applet extends Base
|
|
|
Dever::load('passport/wechat-update', $wechat);
|
|
|
} elseif ($vinfo && $vinfo['id'] != $vid) {
|
|
|
$wechat['set_unionid'] = $unionid;
|
|
|
- $wechat['set_uid'] = $vinfo['uid'];
|
|
|
+ //$wechat['set_uid'] = $vinfo['uid'];
|
|
|
$wechat['where_id'] = $vid;
|
|
|
|
|
|
# 删除user信息
|
|
|
if ($uid != $vinfo['uid']) {
|
|
|
- Dever::load('passport/user-update', array('set_state' => 2, 'where_id' => $uid));
|
|
|
+ //Dever::load('passport/user-update', array('set_state' => 2, 'where_id' => $uid));
|
|
|
}
|
|
|
|
|
|
- $uid = $vinfo['uid'];
|
|
|
+ //$uid = $vinfo['uid'];
|
|
|
Dever::load('passport/wechat-update', $wechat);
|
|
|
}
|
|
|
|
dever