|
@@ -1281,7 +1281,7 @@ class User extends BaseController
|
|
|
if (empty($uid)) {
|
|
if (empty($uid)) {
|
|
|
return app('json')->fail("参数错误");
|
|
return app('json')->fail("参数错误");
|
|
|
}
|
|
}
|
|
|
- $post['content'] = json_encode($post['content']);
|
|
|
|
|
|
|
+// $post['content'] = $post['content'];
|
|
|
$post['start_time'] = strtotime($post['start_time']);
|
|
$post['start_time'] = strtotime($post['start_time']);
|
|
|
$post['end_time'] = strtotime($post['end_time']);
|
|
$post['end_time'] = strtotime($post['end_time']);
|
|
|
$start = (new UserContractRecordModel)->where('to_uid', $post['to_uid'])->where('status', 1)->whereBetween('start_time', [$post['start_time'], $post['end_time']])->find();
|
|
$start = (new UserContractRecordModel)->where('to_uid', $post['to_uid'])->where('status', 1)->whereBetween('start_time', [$post['start_time'], $post['end_time']])->find();
|
|
@@ -1633,7 +1633,7 @@ class User extends BaseController
|
|
|
return app('json')->fail("合约不存在");
|
|
return app('json')->fail("合约不存在");
|
|
|
}
|
|
}
|
|
|
$data = $data->toArray();
|
|
$data = $data->toArray();
|
|
|
- $data['content'] = $data['content'];
|
|
|
|
|
|
|
+// $data['content'] = $data['content'];
|
|
|
// 模版详情
|
|
// 模版详情
|
|
|
$data2 = (new ContractTemplate())->where('id',$data['template_id'])->find();
|
|
$data2 = (new ContractTemplate())->where('id',$data['template_id'])->find();
|
|
|
if (empty($data2)) {
|
|
if (empty($data2)) {
|
