Merge branch 'preview'
This commit is contained in:
commit
282a18dfc5
|
@ -47,6 +47,7 @@ class IndexController extends BaseApiController
|
||||||
$productDevice = ProductDevice::where('product_id',$landProduct['product_id'])->findOrEmpty();
|
$productDevice = ProductDevice::where('product_id',$landProduct['product_id'])->findOrEmpty();
|
||||||
$device = Device::where('id', $productDevice['device_id'])->findOrEmpty();
|
$device = Device::where('id', $productDevice['device_id'])->findOrEmpty();
|
||||||
$data['video_url'] = $device['video_url'];
|
$data['video_url'] = $device['video_url'];
|
||||||
|
$data['device_id'] = $device['id'];
|
||||||
$landCollection = LandCollection::where('land_id',$params['land_id'])->order('id desc')->findOrEmpty();
|
$landCollection = LandCollection::where('land_id',$params['land_id'])->order('id desc')->findOrEmpty();
|
||||||
if($landCollection->isEmpty()){
|
if($landCollection->isEmpty()){
|
||||||
$data['monitor'] = [];
|
$data['monitor'] = [];
|
||||||
|
|
Loading…
Reference in New Issue