From 208bc0b610a6ec1723d8c0eda89b43c90d98b001 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 20 Apr 2023 16:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/Reservation.js        | 108 +++++++++++++++++++------------
 src/views/reservation/Newest.jsx |   2 +-
 2 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js
index fc870c0..37158a2 100644
--- a/src/stores/Reservation.js
+++ b/src/stores/Reservation.js
@@ -1,5 +1,6 @@
 import { makeAutoObservable, runInAction } from "mobx";
 import * as req from '@/utils/request';
+import { HT_HOST } from "@/config";
 import { prepareUrl } from '@/utils/commons';
 
 class Reservation {
@@ -10,50 +11,71 @@ class Reservation {
   }
 
   fetchRecent() {
-    runInAction(() => {
-      this.reservationList = [
-        {
-          key: '1',
-          id: '1',
-          referenceNumber: '111029-N111025076',
-          arrivalDate: '2023-04-08',
-          pax: '5AD 1CH',
-          status: 'Confirm',
-          reservationDate: '2023-04-08 19:31',
-          guide: 'Bill',
-        },
-        {
-          key: '2',
-          id: '3',
-          referenceNumber: '111029-N111025076',
-          arrivalDate: '2023-04-08',
-          pax: '5AD 1CH',
-          status: 'Confirm',
-          reservationDate: '2023-04-08 19:31',
-          guide: 'Jim',
-        },
-        {
-          key: '3',
-          id: '3',
-          referenceNumber: '111029-N111025076',
-          arrivalDate: '2023-05-08',
-          pax: '3AD',
-          status: 'Confirm',
-          reservationDate: '2023-01-08 19:31',
-          guide: 'Giffigan',
-        },
-        {
-          key: '3',
-          id: '3',
-          referenceNumber: '111029-N111025076',
-          arrivalDate: '2023-05-08',
-          pax: '3AD',
-          status: 'Confirm',
-          reservationDate: '2023-01-08 19:31',
-          guide: 'Laurie Notaro',
-        },
-      ];
+    
+    req.fetchJSON(HT_HOST + '/service-tourdesign/GetPlanSearchList?VEISn=628&GroupNo=&DateStart=2023-01-01&DataEnd=2023-05-01&ReTotal=0&PageSize=10&PageNum=0&PageIndex=1')
+    .then(json => {
+      runInAction(() => {
+        this.reservationList = json.data.map((data, index) => {
+          return {
+            key: '1',
+            id: data.vas_gri_sn,
+            referenceNumber: data.GriName,
+            arrivalDate: data.GetGDate,
+            pax: data.PersonNum,
+            status: data.GState,
+            reservationDate: data.GetGDate,
+            guide: data.Guide,
+          }
+        });
+      });
+    })
+    .then(() => {
     });
+
+    // runInAction(() => {
+    //   this.reservationList = [
+    //     {
+    //       key: '1',
+    //       id: '1',
+    //       referenceNumber: '111029-N111025076',
+    //       arrivalDate: '2023-04-08',
+    //       pax: '5AD 1CH',
+    //       status: 'Confirm',
+    //       reservationDate: '2023-04-08 19:31',
+    //       guide: 'Bill',
+    //     },
+    //     {
+    //       key: '2',
+    //       id: '3',
+    //       referenceNumber: '111029-N111025076',
+    //       arrivalDate: '2023-04-08',
+    //       pax: '5AD 1CH',
+    //       status: 'Confirm',
+    //       reservationDate: '2023-04-08 19:31',
+    //       guide: 'Jim',
+    //     },
+    //     {
+    //       key: '3',
+    //       id: '3',
+    //       referenceNumber: '111029-N111025076',
+    //       arrivalDate: '2023-05-08',
+    //       pax: '3AD',
+    //       status: 'Confirm',
+    //       reservationDate: '2023-01-08 19:31',
+    //       guide: 'Giffigan',
+    //     },
+    //     {
+    //       key: '3',
+    //       id: '3',
+    //       referenceNumber: '111029-N111025076',
+    //       arrivalDate: '2023-05-08',
+    //       pax: '3AD',
+    //       status: 'Confirm',
+    //       reservationDate: '2023-01-08 19:31',
+    //       guide: 'Laurie Notaro',
+    //     },
+    //   ];
+    // });
   }
 
   reservationList = [];
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index 9f22b7b..27a4684 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -44,7 +44,7 @@ function Newest() {
   ];
   
   function guideRender(text, record) {
-    if (record.key === '3') {
+    if (record.guide === '') {
       return (
         <Space size="middle">
           <Button type="link" onClick={() => showModal()}>Fill in</Button>