order

@@ -10,7 +10,10 @@ namespace app\portal\controller;
 
 
 
 
 use app\portal\model\EquipmentModel;
 use app\portal\model\EquipmentModel;
+use app\portal\model\OrderModel;
 use cmf\controller\AdminBaseController;
 use cmf\controller\AdminBaseController;
+use EasyWeChat\Payment\Order;
+
 /**
 /**
  * Class AdminOrderController
  * Class AdminOrderController
  * @package app\portal\controller
  * @package app\portal\controller
@@ -27,8 +30,11 @@ use cmf\controller\AdminBaseController;
 class AdminOrderController extends AdminBaseController{
 class AdminOrderController extends AdminBaseController{
 
 
     public function index(){
     public function index(){
-        $Equipment=new EquipmentModel();
-        $data=$Equipment->paginate(10);
+        $Order=new OrderModel();
+        $data=$Order->alias('a')
+            ->join('equipment b','a.mac_address=b.mac_address')
+            ->paginate(10);
+        dump($data->items());
         $this->assign('data',$data);
         $this->assign('data',$data);
         return $this->fetch();
         return $this->fetch();
     }
     }