From 34823827349819d056e5e3fe62501389edc31abb Mon Sep 17 00:00:00 2001
From: gitfjn <2860488097@qq.com>
Date: Tue, 23 Dec 2025 10:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=A8=E5=9F=9F=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=90=8E=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Moments.php   | 2 +-
 application/admin/server/MomentsServer.php | 8 ++++++--
 application/api/controller/ApiBase.php     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

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
 {