0924

application/Admin/controller/Account.php

@@ -191,7 +191,7 @@ class Account extends Base
         }
         $info['status_n'] = $info['status']==0 ? "未激活": $info['status']==1? "已激活":"已失效";
 
-        $vi = Db::name('rela_video')->join('fc_video a','a.id=fc_rela_video.video_id','left')->field('a.video_sn,a.video_name,a.video_url,a.video_img,fc_rela_video.video_id')->where(['accountid'=>$id,'a.is_del'=>0,'fc_rela_video.is_del'=>0])->select();
+        $vi = Db::name('rela_video')->join('fc_video a','a.id=fc_rela_video.video_id','left')->field('a.video_sn,a.video_name,a.video_url,a.video_img,fc_rela_video.video_id,a.status')->where(['accountid'=>$id,'a.is_del'=>0,'fc_rela_video.is_del'=>0])->select();
         //var_dump(Db::name('rela_video')->getLastSql());
         $info['info']= $vi;
         return app_show(0,"获取成功",$info );

application/Admin/controller/Stock2.php

@@ -124,11 +124,11 @@ class Stock2 extends Base
         if(empty($video_sn)){
             return error_show(1005,"未找到视频编号");
         }
-        if($video_sn["is_del"]==1){
-            return error_show(1005,"视频编号已删除");
+        if($video_sn["is_del"]==1) {
+            return error_show(1005, "视频编号已删除");
         }
-
         $video_sn['status_n'] = $video_sn['status']==0? "禁用视频": $video_sn['status']==1? "启用视频":"禁用视频";
+
         return app_show(0,"成功获取",$video_sn);
 
     }