edit

src/Applet.php

@@ -126,15 +126,17 @@ class Applet extends Base
         } else {
             $uid = $info['uid'];
             if (isset($data['unionid']) && $data['unionid']) {
-                $wechat['unionid'] = $data['unionid'];
+                //$wechat['unionid'] = $data['unionid'];
                 # 判断用户是否存在，是否需要合并
-                $wechat['uid'] = $this->combine($uid, $data['unionid']);
+                //$wechat['uid'] = $this->combine($uid, $data['unionid']);
+            }
+
+            if (isset($wechat)) {
+                $wechat['session_key'] = $data['session_key'];
+                $wechat['where_id'] = $info['id'];
+                $id = $info['id'];
+                Dever::load('passport/wechat-update', $wechat);
             }
-            
-            $wechat['session_key'] = $data['session_key'];
-            $wechat['where_id'] = $info['id'];
-            $id = $info['id'];
-            Dever::load('passport/wechat-update', $wechat);
         }
 
         $user = Dever::load('passport/user-one', $uid);