'1233'

@@ -183,7 +183,7 @@ class Wechat extends Api
 			}else{
 				Db::name('user')->where($w)->update($save);
 			}
-			
+
 			//设置同域下的登录缓存
 			$user = Db::name('user')->where($w)->find();
 			//登录成功 存储服务器本地
@@ -195,13 +195,10 @@ class Wechat extends Api
 			$this->error($e->getMessage());
 		}
 		if($user_id !=0){
-<<<<<<< HEAD
-			$this->success('完成',$user_id);
-=======
+
 			$data['token'] = $this->auth->getToken();
 			$data['user_info'] = $user;
 			$this->success('完成',$data);
->>>>>>> 0dba521a562d536413694ddd919d77475f2e2ee8
 		}else{
 			$this->error('code处理失败');
 		}
@@ -209,7 +206,7 @@ class Wechat extends Api
 	}
 
 
-	
+
 
 
 	/*
@@ -233,7 +230,7 @@ class Wechat extends Api
 	*/
 	public function prepare_order($order_no = ''){
 		$user_id = $this->auth->id;
-		
+
 		if(empty($user_id)){
 			return $this->error('用户信息错误');
 		}