會員My Booking 訂單內容頁資料顯示問題未修正

FrontEnd/components/booking/BookingInfo.vue

@@ -46,7 +46,10 @@
             class="tw-text-primary-1 tw-font-bold tw-mr-[12px] md:tw-mr-[28px]"
           >
             ${{ BookingOrder.TotalPrice }} 
-            {{ BookingOrder.Currency.CurrencyName }}
+            <!-- <div>
+              {{ BookingOrder.Currency.CurrencyName }}
+            </div> -->
+            
           </div>
           <button
             class="tw-text-complementary-1 tw-flex md:tw-mr-[33px] hover:tw-text-[#A0B5FF]"
@@ -114,8 +117,8 @@ import { bookingStatusMap, paymentStatusMap, mybookingStatusMap, mypaymentStatus
         window.navigator.clipboard.writeText(copyText);
       }
     },
-    created() {
-      // console.log(this.BookingOrder);
+    updated() {
+      console.log(this.BookingOrder.Currency);
     },
   };
 </script>

FrontEnd/pages/user/booking/_id.vue

@@ -8,6 +8,7 @@
       >
         {{ $t("Booking info") }}
       </h2>
+
       <BookingInfo
         class="tw-mb-[20px]"
         :BookingOrder="BookingOrder"
@@ -18,9 +19,9 @@
       ></BookingInfo>
       <ContactUs :ContactUs="ContactUs"></ContactUs>
       <CancellationPolicy :Policy="BookingOrder.CancellationPolicy"></CancellationPolicy>
-      <ViewDetails :TotalPrice="BookingOrder.TotalPrice" :CurrencyID="BookingOrder.Currency.CurrencyName"></ViewDetails>
+      <!-- <ViewDetails :TotalPrice="BookingOrder.TotalPrice" :CurrencyID="BookingOrder.Currency.CurrencyName"></ViewDetails> -->
       <CancelBooking :BookingOrder="BookingOrder"></CancelBooking>
-      <BookingInfoItem :info="BookingOrder" :onsiteService="onsiteService" @other-details="activeOtherDetails" @notice-details="activeNoticeDetails"></BookingInfoItem>
+      <!-- <BookingInfoItem :info="BookingOrder" :onsiteService="onsiteService" @other-details="activeOtherDetails" @notice-details="activeNoticeDetails"></BookingInfoItem>
       <OtherDetails :BookingOrder="BookingOrder"></OtherDetails>
       <NoticeDetails :BookingOrder="BookingOrder"></NoticeDetails> 
       <PaymentDetails
@@ -31,7 +32,7 @@
         :payment="payment"
       ></PaymentDetails>
       <BankingDetails :BankingDetails="BankingDetails"></BankingDetails>
-      <UploadRemittanceSlip></UploadRemittanceSlip> 
+      <UploadRemittanceSlip></UploadRemittanceSlip>  -->
       <Cancellation :Policy="BookingOrder.CancellationPolicy" class="tw-mb-[20px]"></Cancellation>
       <div class="element tw-hidden xl:tw-flex xl:tw-justify-center xl:tw-items-center xl:tw-mt-[12px] no-print">
         <button @click="onPrint()"
@@ -156,6 +157,7 @@ export default {
     };
   },
   async created() {
+    console.log(this.$route.params.id);
     await this.getOrder();
     if (this.$auth.authtoken != null) {
       
@@ -184,29 +186,38 @@ export default {
       await this.$axios
       .get(`/trending/api/BookingOnline/Booking?BookingID&BookingNo=${this.$route.params.id}&Lang=${this.$i18n.localeProperties["langQuery"]}`)
       .then((response) => {
-        console.log(response);
-        if(response && response.data && response.data.DATA && response.data.DATA.rel){
-          let data = response.data.DATA.rel
-          if(data){
-            this.BookingOrder = data;
-            this.onsiteService = this.BookingOrder.OnSiteService;
-            this.payment = this.BookingOrder.Payment;
-            this.ContactInfo = this.BookingOrder.BookingContact;
-            this.PaymentDetails = this.BookingOrder.map((item) => {
-                return {
-                    method: item.Payment.PaymentMethod,
-                    terms: item.Payment.PaymentTerms,
-                    date: item.Payment.PaymentDate,
-                    amount: item.TotalPrice,
+        // console.log(response.data.DATA.rel);
+        const data = response.data.DATA.rel;
+        this.BookingOrder = data;
+        // this.onsiteService = this.BookingOrder.OnSiteService;
+        // console.log("OnSiteService: " + this.BookingOrder.OnSiteService);
+        console.log(this.BookingOrder.OnSiteService);
+        // if(response && response.data && response.data.DATA && response.data.DATA.rel){
+        //   let data = response.data.DATA.rel
+        //   if(data){
+        //     this.BookingOrder = data;
+        //     this.onsiteService = this.BookingOrder.OnSiteService;
+        //     console.log("OnSiteService: " + this.this.BookingOrder.OnSiteService);
+        //     console.log("ProviderName: " + this.this.BookingOrder.OnSiteService.Provider.ProviderName);
+        //     this.payment = this.BookingOrder.Payment;
+        //     //console.log(this.BookingOrder.Provider.ProviderID);
 
-                };
-              });
-            this.serviceId = this.BookingOrder.OnSiteService.ServiceID;
-            this.currency = this.BookingOrder.CurrencyID;
+        //     this.ContactInfo = this.BookingOrder.BookingContact;
+        //     this.PaymentDetails = this.BookingOrder.map((item) => {
+        //         return {
+        //             method: item.Payment.PaymentMethod,
+        //             terms: item.Payment.PaymentTerms,
+        //             date: item.Payment.PaymentDate,
+        //             amount: item.TotalPrice,
 
+        //         };
+        //       });
+        //     this.serviceId = this.BookingOrder.OnSiteService.ServiceID;
+        //     this.currency = this.BookingOrder.CurrencyID;
 
-          }
-        }
+
+        //   }
+        // }
       })
       .catch((error) => {
         console.log(error);