WIN-2308041133\Administrator 4 дней назад
Родитель
Сommit
2eaf7ff53c

+ 3 - 5
app/model/api/ContractTemplate.php

@@ -42,7 +42,7 @@ class ContractTemplate extends Model
             $data[$k]["is_use"]      = 0;//是否已经购买或者可以使用
             $data[$k]["imgs"]        = getImageAr($v["imgs"]);
             $data[$k]["img"]         = empty($data[$k]["imgs"]) ? "" : $data[$k]["imgs"][0];
-            $data[$k]["sales_count"] = $data[$k]["real_sales"] + $data[$k]["unreal_sales"];
+//            $data[$k]["sales_count"] = $data[$k]["real_sales"] + $data[$k]["unreal_sales"];
 //            if($is_admin==0){
 //                unset($data[$k]["real_sales"]);
 //                unset($data[$k]["unreal_sales"]);
@@ -50,13 +50,11 @@ class ContractTemplate extends Model
                 $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"]);
 //            }
-            $data[$k]["content"] = json_decode($data[$k]["content"]);
-            unset($data[$k]["code"]);
+//            $data[$k]["content"] = json_decode($data[$k]["content"]);
         }
-        
-        
         return ["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount];
     }
+
     
     
 }

+ 47 - 5
app/system/controller/ContractTemplate.php

@@ -25,7 +25,6 @@ class ContractTemplate extends BaseController
     /**
      * 商品列表
      * @param Request $request
-     * @return type
      */
     public function list(Request $request)
     {
@@ -38,15 +37,58 @@ class ContractTemplate extends BaseController
         ], $request);
         $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
         $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
-        $data = (new ContractTemplateModel)->getDataList($post, "*", 1);
+        $data = (new ContractTemplateModel)->getDataList($post, "id,title,is_show,imgs,time,admin_time", 1);
         return app('json')->success(["list" => $data["list"], "pageSize" => $data["pageSize"], "page" => $data["page"], "pageCount" => $data["totalCount"]]);
     }
 
+    /**
+     * 合约模版详情
+     * @param Request $request
+     */
+    public function info(Request $request)
+    {
+        [$id] = UtilService::getMore([
+            ['id', '', 'empty', '参数错误'],
+        ], $request, true);
+        $oData = (new ContractTemplateModel)
+            ->field("*")
+            ->where("id", $id)
+            ->find();
+        if (empty($oData)) {
+            return app('json')->fail('找不到模版号');
+        }
+        //主订单数据
+        $data = [];
+        $data['id'] = $oData['id'];
+        $data['imgs'] = getImageAr($oData["imgs"]);
+        $data['title'] = $oData['title'];
+        $data['is_show'] = $oData['is_show'];
+        $data['content'] = json_decode($oData['content']);
+        $data['time'] = date("Y-m-d H:i:s", $oData["time"]);
+        $data['admin_time'] = date("Y-m-d H:i:s", $oData["admin_time"]);
+        //订单详情
+//        $info                 = (new OrderInfo)->where("o_id", $oData['id'])->select()->toArray();
+//        $infoData             = [];
+//        foreach ($info as $v) {
+//            $d               = [];
+//            $d['id']         = $v['id'];
+//            $d['p_id']       = $v['p_id'];
+//            $d['title']      = $v['title'];
+//            $d['img']        = $v['img'];
+//            $d['count']      = $v['count'];
+//            $d['price']      = $v['price'];
+//            $d['money']      = $v['money'];
+//            $d['is_ip_buy']  = $v['is_ip_buy'];
+//            $d['give_score'] = $v['give_score'];
+//            $infoData[] = $d;
+//        }
+//        $data['info'] = $infoData;
+        return app('json')->success($data);
+    }
 
     /**
      * 添加编辑商品
      * @param Request $request
-     * @return type
      */
     public function add(Request $request)
     {
@@ -86,10 +128,10 @@ class ContractTemplate extends BaseController
             if ($r) {
                 return app('json')->success("数据保存成功");
             } else {
-                return app('json')->fail("数据保存失败".$r);
+                return app('json')->fail("数据保存失败" . $r);
             }
         } catch (\Exception $e) {
-            @file_put_contents('quanju.txt', $e->getLine(). $e->getMessage(). $e->getFile() . "-报错内容\r\n", 8);
+            @file_put_contents('quanju.txt', $e->getLine() . $e->getMessage() . $e->getFile() . "-报错内容\r\n", 8);
             return '数据保存失败: ' . $e->getMessage();
         }
     }

+ 2 - 0
app/system/route/contractTemplate.php

@@ -16,6 +16,8 @@ Route::group('contractTemplate', function () {
     Route::rule('list', 'contractTemplate/list');
     //@添加或编辑
     Route::rule('add', 'contractTemplate/add');
+    //详情
+    Route::rule('info', 'contractTemplate/info');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,