Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

FrontEnd/components/booking/Modal/UploadRemittanceSlipModal.vue

@@ -123,8 +123,6 @@ export default {
       this.upload = true;
       this.uploaded = new FormData();
       this.uploaded.append("file", e.target.files[0]);
-      console.log(this.uploaded);
-      console.log("uploadBookingID" + this.uploadBookingID);
       this.size = Math.ceil(e.target.files[0].size / 1000);
       this.$axios
           .post(
@@ -132,12 +130,10 @@ export default {
           .then((response) => {
             //console.log(JSON.stringify(response))
             if(response && response.data){
-              console.log("是有沒有傳成功阿肝");
               this.upload = false;
               this.success = true;
               this.$emit('reload-BookingContent');
-              
-
+            
             }
         })
         .catch((error) => {

FrontEnd/components/user/bookingListContent.vue

@@ -145,12 +145,12 @@ export default {
       // }
       //return this.sliceRenderList(this.bookingFilter);
     },
-    result() {
-      return this.bookingFilter.length;
-    },
-    pageLength() {
-      return Math.ceil(this.result / this.perPageItems);
-    },
+    // result() {
+    //   return this.bookingFilter.length;
+    // },
+    // pageLength() {
+    //   return Math.ceil(this.result / this.perPageItems);
+    // },
   },
   methods: {
     getCategory(value){

FrontEnd/pages/user/booking/_id.vue

@@ -23,14 +23,14 @@
       <BookingInfoItem :info="BookingOrder" @other-details="activeOtherDetails" @notice-details="activeNoticeDetails"></BookingInfoItem>
       <OtherDetails :BookingOrder="BookingOrder"></OtherDetails>
       <NoticeDetails :BookingOrder="BookingOrder"></NoticeDetails> 
-      <PaymentDetails v-if="BookingOrder.BookingStatus == '02' && BookingOrder.PaymentStatus == '01'"
+      <PaymentDetails v-if="BookingOrder.BookingStatus != '01'"
         class="tw-mb-[20px]"
         @banking-details = "activeBankingDetails"
         @upload-remittanceSlip = "activeUpload"
         :BookingOrder="BookingOrder"
       ></PaymentDetails>
       <BankingDetails :BankingDetails="BankingDetails"></BankingDetails>
-      <UploadRemittanceSlip @reload-BookingContent="reloadBookingContent"></UploadRemittanceSlip>
+      <UploadRemittanceSlip @reload-BookingContent="reloadBookingContent" :uploadBookingID="BookingOrder.BookingID"></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()"
@@ -183,10 +183,9 @@ 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.data.DATA.rel);
         const data = response.data.DATA.rel;
         this.BookingOrder = data;
-        console.log("reload");
+        console.log("訂單:" + JSON.stringify(this.BookingOrder));
       })
       .catch((error) => {
         console.log(error);
@@ -292,7 +291,6 @@ export default {
     },
     reloadBookingContent(){
       this.getOrder();
-      console.log("給我新的bookingdataaaaa");
       this.$nuxt.refresh();
     }
   },