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

FrontEnd/components/user/userServiceItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="booking-info-item tw-p-[20px] tw-mb-[20px] tw-bg-white tw-rounded-[20px] xl:tw-p-[20px]"
+    class="booking-info-item tw-p-[20px] tw-mb-[20px] tw-bg-white tw-border tw-border-solid tw-border-[#e5e5e5] tw-rounded-[20px] xl:tw-p-[20px]"
   >
   <nuxt-link :to="localePath('/user/booking/' + info.BookingNo)">
     <div

FrontEnd/pages/user/myBooking.vue

@@ -10,7 +10,7 @@
       </userSidebar>
       <!-- <div class="xl:tw-hidden"></div> -->
       <div
-        class="tw-bg-transparent xl:tw-bg-neutrals-100 xl:tw-p-[30px] xl:tw-rounded-[20px] xl:tw-min-w-[900px] xl:tw-max-w-[900px]"
+        class="tw-bg-transparent xl:tw-bg-white xl:tw-p-[30px] xl:tw-rounded-[20px] xl:tw-min-w-[900px] xl:tw-max-w-[900px]"
       >
         <div
           class="tw-flex tw-flex-col md:tw-flex-row md:tw-justify-between md:tw-items-center tw-mb-[20px] md:tw-mb-[34px]"
@@ -20,47 +20,18 @@
           >
             <two-dots class="tw-mr-[30px]"></two-dots>{{ $t("My Bookings") }}
           </div>
-          <div class="element tw-w-full md:tw-w-[320px]">
-            <!-- <userSearchBar
-              :input="{
-                id: 'searchQuery',
-                placeHolder: $t('Enter exhibitions, booking number ...'),
-                type: 'text',
-              }"
-              :default="searchQuery"
-              @change="searchQuery = $event"
-            ></userSearchBar> -->
-          </div>
         </div>
         <bookingListContent
           :width="width"
           :userData="userData"
         ></bookingListContent>
-        <!-- <bookingListContent
-          :searchQuery="searchQuery"
-          :width="width"
-          :userData="userData"
-        ></bookingListContent> -->
-        <!-- <section class="step sercion-6 tw-w-full md:tw-px-0 xl:tw-col-span-2">
-          <h2 class="title-icon-left t16 md:t20 xl:t18 xl:tw-font-bold">
-            {{ $t("You might like ...") }}
-          </h2>
-          <userYouMightLike
-            :list="youMightLikeList"
-            :countrycode="countrycode"
-            :regionName="regionName"
-          >
-          </userYouMightLike>
-        </section> -->
       </div>
     </div>
   </div>
 </template>
 <script>
 import TwoDots from "@/components/TwoDots";
-import userSearchBar from "@/components/user/userSearchBar.vue";
 import bookingListContent from "@/components/user/bookingListContent.vue";
-import userYouMightLike from "@/components/user/userYouMightLike.vue";
 import userSidebar from "@/components/user/userSidebar.vue";
 export default {
   name: "myBooking",
@@ -68,9 +39,7 @@ export default {
 
   components: {
     TwoDots,
-    userSearchBar,
     bookingListContent,
-    userYouMightLike,
     userSidebar,
   },
   data() {
@@ -78,20 +47,7 @@ export default {
       firstName: "",
       lastName: "",
       userData: {},
-      userCompanyId: [],
-      userCompanyList: [],
-      userAddNewCompanyList: [],
-      userSavedExhibitionList: [],
-      userVisibleSavedExhibitionList: [],
-      yearOptions: [],
-      monthOptions: [],
-      dayOptions: [],
-      yearSelect: "",
-      monthSelect: "",
-      daySelect: "",
-      phoneValid: false,
       width: 0,
-      searchQuery: "",
       youMightLikeList: [],
       countrycode: [],
       regionName: [],
@@ -107,25 +63,6 @@ export default {
     this.handleResize();
   },
   mounted() {
-    this.yearOptions = Array.from(new Array(103), (val, index) =>
-      (index + 1920).toString()
-    );
-    this.monthOptions = Array.from(new Array(13), (val, index) => {
-      if (index < 10 && index > 0) {
-        return "0" + index.toString();
-      }
-      if (index >= 10) {
-        return index.toString();
-      }
-    });
-    this.dayOptions = Array.from(new Array(32), (val, index) => {
-      if (index < 10 && index > 0) {
-        return "0" + index.toString();
-      }
-      if (index >= 10) {
-        return index.toString();
-      }
-    });
     this.$nextTick(() => {
       window.addEventListener("resize", this.onResize);
     });     
@@ -153,11 +90,6 @@ export default {
         // }
         
         const patchData = JSON.parse(JSON.stringify(this.userData));
-
-        // delete patchData.LoginLog;
-        //delete patchData.UserCompany;
-        // delete patchData.UserSocialRelation;
-        // delete patchData.UserExhibition;
         this.$axios
           .post(
             `/trending/api/Members/Member`, patchData
@@ -190,37 +122,7 @@ export default {
               this.userData = data;
               this.firstName = this.userData.FirstName;
               this.lastName = this.userData.LastName;
-              this.userData.Phone ? (this.phoneValid = true): (this.phoneValid = false);
-              //this.countryCode = this.userData.PhoneCode;
 
-              if(this.userData.LanguageID == "en-US"){
-                this.languageSelect.en = true;
-
-              }else if(this.userData.LanguageID == "zh-TW"){
-                this.languageSelect.zhtw = true;
-
-              }else{
-                this.languageSelect.en = "";
-                this.languageSelect.zhtw = "";
-
-              }
-
-              if (
-                this.userData.BirthDate && typeof this.userData.BirthDate === "object"
-
-              ){
-                this.yearSelect = "";
-                this.monthSelect = "";
-                this.daySelect = "";
-
-              }else{
-                const space = this.userData.BirthDate.split("T");
-                const date = space[0].split("-");
-                this.yearSelect = date[0];
-                this.monthSelect = date[1];
-                this.daySelect = date[2];
-
-              }
             }
           }
         })