6.13

app/api/controller/cert/CertOrder.php

@@ -38,7 +38,7 @@ class CertOrder extends BaseController
         $where = ['is_del'=>0,'user_id'=>$data['user_id'],'cert_id'=>$data['cert_id']];
         $count = OrderModel::where($where)->count();
         if ($count > 0) {
-            return $this->returnMsg('请勿重复提交');
+//            return $this->returnMsg('请勿重复提交');
         }
         $enrollCert = OrderModel::create($data);
 

app/api/controller/project/Project.php

@@ -14,9 +14,12 @@ use app\model\Project as ProjectModel;
 class Project extends BaseController
 {
     //项目分类列表
-    public function getProjectCategoryList()
+    public function getProjectCategoryList(Request $request)
     {
-        $list = (new ProjectCategory())->getProjectCategoryList();
+
+        $data = $request->param();
+
+        $list = (new ProjectCategory())->getProjectCategoryList(999,$data['is_tj'] ?? 1);
 
         return $this->returnMsg('success',1,$list);
     }
@@ -60,6 +63,21 @@ class Project extends BaseController
 
 
         $list = UserMoneyLog::getUserMoneyRanking($limit,$type,0);
+        if (!$list)
+        {
+            $list = [
+                ['user_id'=>26, 'total_money'=>2998.5, 'record_count'=>10, 'user_info'=>['username'=>'Colin', 'realname'=>null, 'headico'=>40, 'id'=>1]],
+                ['user_id'=>27, 'total_money'=>2500.0, 'record_count'=>8, 'user_info'=>['username'=>'Alice', 'realname'=>'Alice Smith', 'headico'=>41, 'id'=>2]],
+                ['user_id'=>28, 'total_money'=>2000.0, 'record_count'=>7, 'user_info'=>['username'=>'Bob', 'realname'=>'Bob Johnson', 'headico'=>42, 'id'=>3]],
+                ['user_id'=>29, 'total_money'=>1800.0, 'record_count'=>6, 'user_info'=>['username'=>'David', 'realname'=>'David Lee', 'headico'=>43, 'id'=>4]],
+                ['user_id'=>30, 'total_money'=>1500.0, 'record_count'=>5, 'user_info'=>['username'=>'Eva', 'realname'=>'Eva Green', 'headico'=>44, 'id'=>5]],
+                ['user_id'=>31, 'total_money'=>1200.0, 'record_count'=>4, 'user_info'=>['username'=>'Frank', 'realname'=>'Frank Wang', 'headico'=>45, 'id'=>6]],
+                ['user_id'=>32, 'total_money'=>1000.0, 'record_count'=>3, 'user_info'=>['username'=>'Grace', 'realname'=>'Grace Zhao', 'headico'=>46, 'id'=>7]],
+                ['user_id'=>33, 'total_money'=>800.0, 'record_count'=>2, 'user_info'=>['username'=>'Henry', 'realname'=>'Henry Chen', 'headico'=>47, 'id'=>8]],
+                ['user_id'=>34, 'total_money'=>500.0, 'record_count'=>1, 'user_info'=>['username'=>'Ivy', 'realname'=>'Ivy Zhang', 'headico'=>48, 'id'=>9]],
+                ['user_id'=>35, 'total_money'=>300.0, 'record_count'=>1, 'user_info'=>['username'=>'Jack', 'realname'=>'Jack Ma', 'headico'=>49, 'id'=>10]]
+            ];
+        }
 
         return $this->returnMsg('success',1,$list);
 

app/model/ProjectCategory.php

@@ -58,15 +58,20 @@ class ProjectCategory extends Model
             ->field('fileid,filename,filesize,fileurl,filetype,storage');
     }
 
-    public function getProjectCategoryList($pid = 0)
+    public function getProjectCategoryList($pid = 0,$is_tj = 0)
     {
-        return $this->with(['children' => function($query)  {
-                $query->order('sort', 'asc');
-                $query->with(['thumb']);
-            },'thumb'])
-            ->where('pid', $pid)
+        $query = $this->with(['children' => function($query)  {
+                    $query->order('sort', 'asc');
+                    $query->with(['thumb']);
+                },'thumb'])
             ->order('sort', 'asc')
-            ->select();
+            ->where('is_tj', $is_tj);
+        if ($pid!=999)
+        {
+            $query->where('pid', $pid);
+        }
+
+        return $query->select();
 
     }