活动参与

application/api/controller/Active.php

@@ -192,17 +192,31 @@ class Active extends Api
 
     //活动参与
     public function my_active_log(){
-        $qi = Db::name('active_user_number')->where('user_id',$this->auth->id)->group('createdate')->column('createdate');
+        //所有的期
+        $createdate = Db::name('active_user_number')->where('user_id',$this->auth->id)->group('createdate')->column('createdate');
 
-        $qi = array_chunk($qi,10);
+        $limit = input('listrow',10);
+        $createdate = array_chunk($createdate,$limit);
 
-        $pagenum = count($qi);
         $page = input('page',1);
-
-        if($page > $pagenum){
+        if($page > count($createdate)){
             $this->success(1,[]);
         }
-        $limit = $qi[$page];
+        $page_qi = $createdate[$page-1]; //这一页的期
+
+        //开始
+        $result = [];
+        foreach($page_qi as $key => $qi){
+            $qi_text = '第'.$qi.'期 '. $this->get_week(date('N',strtotime($qi)));
+            $list = Db::name('active_user_number')->where('user_id',$this->auth->id)->where('createdate',$qi)->select();
+
+            $result[] = [
+                'qi'   => $qi_text,
+                'list' => $list,
+            ];
+        }
+
+        $this->success(1,$result);
     }
 
     //历史中奖
@@ -214,7 +228,7 @@ class Active extends Api
     //中奖榜
     public function active_finish_result(){
         $qi = date('Ymd');
-        $qi = '20241225';
+//        $qi = '20241225';
         $sql = Db::name('active_user_number')->field('user_id,sum(gold) as sum_gold')->where('createdate',$qi)->where('status',1)->group('user_id')->buildSql();
 
         $list = Db::Table($sql)->alias('a')->field('user.avatar,user.nickname,a.user_id,a.sum_gold')->join('user','a.user_id = user.id','LEFT')->order('a.sum_gold desc')->select();