|
|
@@ -1633,17 +1633,18 @@ class User extends BaseController
|
|
|
return app('json')->fail("合约不存在");
|
|
|
}
|
|
|
$data = $data->toArray();
|
|
|
- $data2['record_content'] = json_decode($data['content']);
|
|
|
+ $data['content'] = json_decode($data['content']);
|
|
|
// 模版详情
|
|
|
$data2 = (new ContractTemplate())->where('id',$data['template_id'])->find();
|
|
|
if (empty($data2)) {
|
|
|
return app('json')->fail("模板不存在");
|
|
|
}
|
|
|
- $data2 = $data2 -> toArray();
|
|
|
+ $data = $data2 -> toArray();
|
|
|
// $data["is_use"] = 0;
|
|
|
- $data2["imgs"] = getImageAr($data["imgs"]);
|
|
|
- $data2['content'] = json_decode($data2['content']);
|
|
|
- $data2["img"] = empty($data["imgs"]) ? "" : $data["imgs"][0];
|
|
|
+ $data["imgs"] = getImageAr($data2["imgs"]);
|
|
|
+ $data['template_content'] = json_decode($data2['content']);
|
|
|
+ $data['template_title'] = $data2['title'];
|
|
|
+ $data["img"] = empty($data["imgs"]) ? "" : $data["imgs"][0];
|
|
|
// $data['time'] = date("Y-m-d H:i:s", $data["time"]);
|
|
|
// $data['admin_time'] = date("Y-m-d H:i:s", $data["admin_time"]);
|
|
|
// $data["sales_count"] = $data["real_sales"] + $data["unreal_sales"];
|
|
|
@@ -1655,6 +1656,6 @@ class User extends BaseController
|
|
|
// $data["is_use"] = (new UserShowTemplate)->where("uid", $this->user["uid"])->where("show_template_id", $data["id"])->count() > 0 ? 1 : 0;
|
|
|
// (new ShowTemplate)->where('id', $data["id"])->inc('look_count', 1)->update();
|
|
|
// }
|
|
|
- return app('json')->success($data2);
|
|
|
+ return app('json')->success($data);
|
|
|
}
|
|
|
}
|