Merge branch 'dev' of wugg/fivechang into master

application/Admin/controller/Login.php

@@ -34,11 +34,7 @@ class Login
         $account = Db::name("admin")->where(["is_del"=>0,"username"=>$username])->find();
 
         if(empty($account)){
-           // User::get(1);
-            //echo User::getLastSql();
-            //var_dump(\app\Admin\model\User::getLastSql());
             return error_show(1005,"账户未找到");
-
         }
        if($account['status']==0){
            return error_show(1005,"账户已禁用");

application/Admin/controller/Stock2.php

@@ -45,7 +45,7 @@ class Stock2 extends Base
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $video = Db::name("video")->where($where)->page($page, $size)->order("addtime desc")->select();
-        return app_show(0, "获取成功", ["video" => $video, "count " => $count]);
+        return app_show(0, "获取成功", ["video" => $video, "count" => $count]);
     }
 
     public function Create()

application/Home/controller/Order.php

@@ -35,6 +35,7 @@ class Order extends Base
     /**
      * @param id 订单id
      */
+
     public function info(){
         $id = isset($this->post['id'])&&$this->post['id']!="" ? intval($this->post['id']):"";
         if($id==""){
@@ -52,11 +53,23 @@ class Order extends Base
      * @param  num
      * @param  addrid
      */
+    public function ist(){
+        $name = isset($this->post['name'])&&$this->post['name']!==""? intval($this->post['name']): "";
+        if($name==""){
+            return error_show(1004,'参数name');
+        }
+    }
     public function add(){
         $num = isset($this->post['num'])&&$this->post['num']!="" ? intval($this->post['num']):"";
         if($num==""){
             return error_show(1004,"参数num 不能为空或0");
         }
+        $id = isset($this->post['unit_id'])&&$this->post['unit_id']!=""? intval($this->post['id']):"";
+        if($id==""){
+            return error_show(1004,"参数id不能为空");
+        }
+
+
         $addrid = isset($this->post['addrid'])&&$this->post['addrid']!="" ? intval($this->post['addrid']):"";
         if($addrid==""){
             return error_show(1004,"参数addrid 不能为空");

application/Home/controller/Vdlist.php

@@ -30,7 +30,7 @@ class Vdlist extends Base
 
         $where = ['b.id'=>$id,'a.accountid'=>$this->userinfo['id'],'b.is_del'=>0,'b.status'=>1,'a.is_del'=>0,'a.status'=>1];
 
-        $look = Db::name("rela_video")->alias('a')->join("video b","a.video_id=b.id","left")->where($where)->field("b.id,b.video_sn,b.video_name,b.video_url,b.video_img,b.remark")->order("b.weight desc")->find();
+        $look = Db::name("rela_video")->alias('a')->join("video b","a.video_id=b.id","left")->where($where)->field("b.id,b.video_sn,b.video_name,b.video_url,b.video_img,b.remark,b.video_desc")->order("b.weight desc")->find();
        //var_dump(Db::name("rela_video")->getLastSql());
         return app_show(0,"预览成功",$look);
     }