'213'

@@ -23,8 +23,7 @@ class Client extends Api
         $this->postParam = $postParam;
         $this->postParam = $postParam;
 
 
         parent::_initialize();
         parent::_initialize();
-        print_r($this->auth->id);return;
-        $this->auth->id = 1;//测试用
+        $this->auth->id ;//测试用
         $postParam = $this->request->param();
         $postParam = $this->request->param();
         $this->postParam = $postParam;
         $this->postParam = $postParam;
         if (empty($postParam['code'])) {
         if (empty($postParam['code'])) {
@@ -45,6 +44,8 @@ class Client extends Api
      * 1、获取活动
      * 1、获取活动
      */
      */
     public function getactivity(){
     public function getactivity(){
+        print_r($this->auth->id);
+        return;
         //根据门店查询活动
         //根据门店查询活动
         $time=time();
         $time=time();
         $where["closetime"] = [">", $time];
         $where["closetime"] = [">", $time];

@@ -183,6 +183,9 @@ class Wechat extends Api
 			$user = Db::name('user')->where($w)->find();
 			$user = Db::name('user')->where($w)->find();
 			//登录成功 存储服务器本地
 			//登录成功 存储服务器本地
 			$res=$this->auth->direct($user['id']);
 			$res=$this->auth->direct($user['id']);
+			$res=new Client();
+            $row=$res->getactivity();
+			print_r($row);
             $this->prepare_order(123);
             $this->prepare_order(123);
 			//返回给前端
 			//返回给前端
 			$user_id = $user['id'];
 			$user_id = $user['id'];