| 
					
				 | 
			
			
				@@ -43,18 +43,24 @@ class Applet extends Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public function login() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data = array(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data = $this->getLoginInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data += $this->getWechatData($data['session_key']); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $data['username'] = Dever::input('nickname'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $data['avatar'] = Dever::input('avatarurl'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $data['sex'] = Dever::input('gender'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['username'] = Dever::input('username', Dever::input('nickname')); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['avatar'] = Dever::input('avatar', Dever::input('avatarurl')); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['sex'] = Dever::input('sex', Dever::input('gender')); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data['city'] = Dever::input('city'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //$data['mobile'] = Dever::input('mobile'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data['province'] = Dever::input('province'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data['country'] = Dever::input('country'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //$str = 'session_key=9qHi7e3pyeHc4cN57XTZ3A==&expires_in=7200&openid=otiUg0Q-UimEsyVJnc3mHz7K9PvQ&unionid=o-vA6wrgxnhElDR-O6XdzuGCbKLA&mobile=&phone=&username=于斌&avatar=https://wx.qlogo.cn/mmopen/vi_32/DYAIOgq83erFfFF75hv0AOZsx4p8cXJEC7icg88c5686eHic1MticOCW75icKsmdGjfEnWpmAgLibm4TwwfcJYIQ1RQ/132&sex=1&city=Chaoyang&province=Beijing&country=China'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //parse_str($str, $data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $result = $this->create($data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return $result; 
			 |