diff --git a/application/admin/controller/Moments.php b/application/admin/controller/Moments.php index 594d06b1..f86bf0b9 100644 --- a/application/admin/controller/Moments.php +++ b/application/admin/controller/Moments.php @@ -9,7 +9,7 @@ class Moments extends AdminBase public function lists() { $list = MomentsServer::getMoments(); - var_dump($list); + $this->assign('list', $list); return $this->fetch(); } } \ No newline at end of file diff --git a/application/admin/server/MomentsServer.php b/application/admin/server/MomentsServer.php index aa864c80..5a30f499 100644 --- a/application/admin/server/MomentsServer.php +++ b/application/admin/server/MomentsServer.php @@ -10,8 +10,12 @@ class MomentsServer public static function getMoments() { $data = MomentsModel::with([ - 'getStaff'=>function ($query) {}, - 'getOrder'=>function ($query) {} + 'getStaff'=>function ($query) { + $query->field('id,name'); + }, + 'getOrder'=>function ($query) { + $query->field('id,order_sn'); + } ]) ->order('id desc') ->select(); diff --git a/application/api/controller/ApiBase.php b/application/api/controller/ApiBase.php index 45b6e305..1a2d97c2 100644 --- a/application/api/controller/ApiBase.php +++ b/application/api/controller/ApiBase.php @@ -28,7 +28,7 @@ use think\Response; header("Access-Control-Allow-Origin: *"); header("Access-Control-Allow-Methods: GET, POST, PUT, DELETE, OPTIONS"); -header("Access-Control-Allow-Headers: Content-Type, Authorization"); +header("Access-Control-Allow-Headers: Content-Type, Authorization, version"); class ApiBase extends Controller {