Merge branch 'dev' of wugg/fivechang into master

application/Admin/controller/Account.php

@@ -105,7 +105,7 @@ class Account extends Base
 //            return error_show(1004,"参数mobile 不能为空");
 //        }
         $remark = isset($this->post['remark'])&&$this->post['remark']!=="" ? trim($this->post['remark']) :"";
-        $video =  isset($this->post['video'])&&$this->post['video']!=="" ? trim($this->post['video']) :"";
+        $video =  isset($this->post['video'])&&$this->post['video']!=="" ? $this->post['video'] :"";
 
         Db::startTrans();
         try {
@@ -190,7 +190,12 @@ class Account extends Base
             return error_show(1005,"账户已被删除");
         }
         $info['status_n'] = $info['status']==0 ? "未激活": $info['status']==1? "已激活":"已失效";
-        return app_show(0,"获取成功",$info);
+
+        $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,])->select();
+       // var_dump(Db::name('rela_video')->getLastSql());
+        $info['info']= $vi;
+        return app_show(0,"获取成功",$info );
+
     }
 
     /**