yingzi 2 years ago
parent
commit
13c6da143a
2 changed files with 11 additions and 33 deletions
  1. 5 2
      app/model/api/ShowTemplate.php
  2. 6 31
      app/system/controller/ShowTemplate.php

+ 5 - 2
app/model/api/ShowTemplate.php

@@ -21,10 +21,10 @@ class ShowTemplate extends Model
         if(!empty($post["title"])){
             $where[]=["title","like","%{$post["title"]}%"];
         }
-        if(isset($post["is_hot"]) && in_array($post["is_hot"], ["0","1"])){
+        if(isset($post["is_hot"]) && in_array((string)$post["is_hot"], ["0","1"])){
             $where[]=["is_hot","=",(int)$post["is_hot"]];
         }
-        if(isset($post["is_recommend"]) && in_array($post["is_recommend"], ["0","1"])){
+        if(isset($post["is_recommend"]) && in_array((string)$post["is_recommend"], ["0","1"])){
             $where[]=["is_recommend","=",(int)$post["is_recommend"]];
         }
         $totalCount = $this->where($where)->count();
@@ -50,6 +50,9 @@ class ShowTemplate extends Model
             if($is_admin==0){
                 unset($data[$k]["real_sales"]);
                 unset($data[$k]["unreal_sales"]);
+            }else{
+                $data[$k]["time"]       = date("Y-m-d H:i:s",$v["time"]);
+                $data[$k]["admin_time"] = date("Y-m-d H:i:s",$v["admin_time"]);
             }
         }
         

+ 6 - 31
app/system/controller/ShowTemplate.php

@@ -26,42 +26,17 @@ class ShowTemplate extends  BaseController{
      */
     public function list(Request $request) {
         $post = UtilService::getMore([
-            ['is_hot', '0'],
-            ['is_recommend', '0'],
+            ['is_hot', ''],
+            ['is_recommend', ''],
             ['status', ''],
             ['page', 1],
             ['pageSize', 50],
         ], $request);
         $post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
-        $post["page"]     = $post["page"]<=0 ? 1 : (int)$post["page"];
-        $where=[];
-        if(is_numeric($post['status'])) {
-            $where[]=["status","=",(int)$post['status']];
-        }
-        if((int)$post["is_hot"]==1){
-            $where[]=["is_hot","=",1];
-        }
-        if((int)$post["is_recommend"]==1){
-            $where[]=["is_recommend","=",1];
-        }
-        
-        $totalCount = (new ShowTemplateModel)->where($where)->count();
-        $data=null;
-        if($totalCount>0){
-            $data = (new ShowTemplateModel)
-                ->field("*")
-                ->where($where)
-                ->order("id", "desc")
-                ->page($post["page"], $post["pageSize"])
-                ->select();
-            foreach($data as $k=>$v){
-                $data[$k]["time"]       = date("Y-m-d H:i:s",$v["time"]);
-                $data[$k]["imgs"]       = getImageAr($v["imgs"]);
-                $data[$k]["admin_time"] = date("Y-m-d H:i:s",$v["admin_time"]);
-            }
-        }
-        $data = empty($data)?[]:$data;
-        return app('json')->success(["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount]);
+        $post["page"]     = $post["page"]<=0     ? 1  : (int)$post["page"];
+        $post["status"]   = (int)$post['status'];
+        $data = (new ShowTemplateModel)->getDataList($post,"*",1);
+        return app('json')->success(["list" =>$data["list"], "pageSize" => $data["pageSize"],"page"=>$data["page"],"pageCount"=>$data["totalCount"]]);
     }