0922

application/Admin/controller/Account.php

@@ -192,7 +192,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();
-       // var_dump(Db::name('rela_video')->getLastSql());
+        //var_dump(Db::name('rela_video')->getLastSql());
         $info['info']= $vi;
         return app_show(0,"获取成功",$info );
 

application/Admin/controller/Stock2.php

@@ -127,6 +127,7 @@ class Stock2 extends Base
         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);
 

application/Home/controller/Order.php

@@ -20,15 +20,46 @@ class Order extends Base
         $page = isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']):1;
         $size = isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']):10;
         $status = isset($this->post['status'])&&$this->post['status']!="" ? intval($this->post['status']):0;
-        $where=["is_del"=>0,"accountid"=>$this->userinfo['id']];
+        $where=["a.is_del"=>0,"a.accountid"=>$this->userinfo['id']];
         if($status!=0 && in_array($status,[1,2])){
-            $where['status']=$status;
+            $where['a.status']=$status;
         }
-        $count =Db::name("order_info")->where($where)->count();
+        $count =Db::name("order a")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page>$total?$total:$page;
-        $list = Db::name("order_info")->where($where)->page($page,$size)->field("id,order_sn,order_num,order_time,delivery_time,post_code,post_name,status,unit,unit_weight")
-            ->select();
+        $list = Db::name("order a")->where($where)->page($page,$size)
+            ->join("fc_order_post b","a.`order_sn` = `b`.`order_sn`","left")
+            ->join("fc_addr c","`b`.`addrid` = `c`.`id`","left")
+            ->join("fc_account e","a.`accountid` = `e`.`id`","left")
+            ->join("fc_rela_account f","a.`accountid` = `f`.`accountid`","left")
+            ->join("fc_account_info g","`f`.`account_info` = `g`.`id`","left")
+            ->field("a.id AS id,
+	a.`order_sn` AS `order_sn`,
+	a.`accountid` AS `accountid`,
+	a.`order_num` AS `order_num`,
+	a.`status` AS `status`,
+	a.`is_del` AS `is_del`,
+	a.`delivery_time` AS `delivery_time`,
+	a.`order_time` AS `order_time`,
+	`b`.`addrid` AS `addrid`,
+	`b`.`order_num` AS `border_num`,
+	`b`.`post_code` AS `post_code`,
+	`b`.`post_name` AS `post_name`,
+	`b`.`status` AS `bstatus`,
+	`c`.`addr` AS `addr`,
+	`c`.`provice` AS `provice`,
+	`c`.`city` AS `city`,
+	`c`.`provice_name` AS `provice_name`,
+	`c`.`city_name` AS `city_name`,
+	`c`.`area` AS `area`,
+	`c`.`area_name` AS `area_name`,
+	`c`.`contector` AS `contector`,
+	`c`.`mobile` AS `contector_mobile`,
+	`e`.`username` AS `username`,
+	`g`.`nickname` AS `nickname`,
+	`g`.`mobile` AS `mobile`,
+	a.`unit_weight` AS `unit_weight`,
+	a.`unit` AS `unit`")->select();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 

application/Home/controller/Vdlist.php

@@ -21,7 +21,9 @@ class Vdlist extends Base
         //var_dump(Db::name("rela_video")->getLastSql());
         $total = ceil($count/$size);
         $page = $page>$total?$total:$page;
+        //var_dump(Db::name("rela_video")->getLastSql());
         $list = Db::name("rela_video")->alias('a')->join("video b","a.video_id=b.id","left")->where($where)->page($page,$size)->field("b.id,b.video_sn,b.video_name,b.video_url,b.video_img,b.remark")->select();
+
         return app_show(0,"视频列表获取成功",["list"=>$list,"count"=>$count]);
 
     }
@@ -37,8 +39,4 @@ class Vdlist extends Base
         }else
             return app_show(0,"预览成功",$look);
     }
-
-
-
-
 }

application/route.php

@@ -78,3 +78,4 @@ Route::rule("home/orderstock","Home/Order/Stock");
 Route::rule("home/obtainlist","Home/Vdlist/Obtainlist");
 Route::rule("home/preview","Home/Vdlist/Preview");
 
+