allen пре 3 година
родитељ
комит
96bb171443
2 измењених фајлова са 17 додато и 1 уклоњено
  1. 13 1
      app/index/controller/Index.php
  2. 4 0
      update.sql

+ 13 - 1
app/index/controller/Index.php

@@ -123,6 +123,17 @@ class Index extends Controller
         if (empty($activity)) {
             $isBeginActivity = 0;
         }
+
+        $userInfo = [];
+        if ($count > 0) {
+            $userInfo = Db::table('awards_user_task_log')->alias('l')
+                ->leftJoin('awards_user_info u', 'l.uid = u.uid')
+                ->field(['u.nickname', 'u.portrait', 'u.uid', 'l.duration', 'l.number'])
+                ->order('l.number', 'desc')
+                ->order('l.duration', 'asc')
+                ->find();
+        }
+
         // 缓存用户信息1天
         Cache::set('u:' . $token, json_encode($cacheUser), 86400);
         return $this->successResponse([
@@ -130,7 +141,8 @@ class Index extends Controller
             'token' => $token,
             'isShare' => $isShare,
             'count' => $count,
-            'isBeginActivity' => $isBeginActivity
+            'isBeginActivity' => $isBeginActivity,
+            'task' => $userInfo
         ]);
     }
 

+ 4 - 0
update.sql

@@ -0,0 +1,4 @@
+UPDATE `awards_gift` SET `name` = '电影之夜专属礼包(帆布袋、雨伞、笔记本、电影票夹)' WHERE `id` = '2';
+UPDATE `awards_gift` SET `name` = '电影通兑券' WHERE `id` = '3';
+UPDATE `awards_gift` SET `name` = '电影之夜专属礼包(帆布袋、雨伞、笔记本、电影票夹)' WHERE `id` = '4';
+UPDATE `awards_gift` SET `name` = '电影通兑券' WHERE `id` = '5';