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

# Conflicts:
#	FrontEnd/pages/exhibition/_id.vue

FrontEnd/components/home/CookieUnderModal.vue

@@ -145,15 +145,19 @@ export default {
     };
   },
   created(){
-    let storeCache = this.$cookies.get("storeCache");
-    if(storeCache!=undefined){
-      this.isCookieHasBeenClicked = JSON.parse(storeCache);
+    if(process.client){
+      let storeCache = this.$cookies.get("storeCache");
+      if(storeCache!=undefined){
+        this.isCookieHasBeenClicked = JSON.parse(storeCache);
+      }
     }
   },
   methods:{
     closeCookie(){
-      this.isCookieHasBeenClicked = false;
-      this.$cookies.set("storeCache",JSON.stringify(false),1);
+      if(process.client){
+        this.isCookieHasBeenClicked = false;
+        this.$cookies.set("storeCache",JSON.stringify(false),1);
+      }
     }
   }
 };

FrontEnd/pages/exhibition/_id.vue

@@ -1,14 +1,14 @@
 <template>
   <div
     class="exhibition-content tw-grid tw-grid-cols-1 tw-gap-[30px] tw-mt-[20px] tw-mb-[60px] md:tw-px-[30px] md:tw-mt-[30px] xl:tw-px-[60px] xl:tw-max-w-screen-xl xl:tw-mx-auto xl:tw-grid-cols-[auto_364px]">
-    {{ relatedservicelist.category }}
+    <!-- {{ relatedservicelist.category }} ÓІ–î}-->
     <mobileFixTopBar ref="stickySwiper" :fixBar="fixBar" :currStep="currStep" :list="fixBarList"></mobileFixTopBar>
 
     <section class="section1 tw-px-[30px] md:tw-px-0 xl:tw-w-full xl:tw-col-span-2">
       <ExhibitionBannerArea :exhibition="exhibition"></ExhibitionBannerArea>
     </section>
     <section class="section2 tw-px-[30px] md:tw-px-0 xl:tw-pr-[30px] xl:tw-col-start-1 xl:tw-row-start-2">
-      <Breadcrumbs class="tw-px-0 md:tw-mb-[22px]"></Breadcrumbs>
+      <!-- <Breadcrumbs class="tw-px-0 md:tw-mb-[22px]"></Breadcrumbs> ÓІ–î}-->
       <div class="tw-hidden md:tw-block">
         <div class="md:tw-h-[48px] md:tw-grid md:tw-grid-cols-3 md:tw-gap-[12px]">
           <a :href="exhibition.website" :target="exhibition.website == '#' ? '_self' : '_blank'">
@@ -39,9 +39,9 @@
         </div>
       </div>
     </section>
-    <!-- <section class="step section3 tw-px-[30px] md:tw-px-0 xl:tw-pr-[30px] xl:tw-col-start-1 xl:tw-row-start-3">
+    <section class="step section3 tw-px-[30px] md:tw-px-0 xl:tw-pr-[30px] xl:tw-col-start-1 xl:tw-row-start-3">
       <ExhibitionIntro class="d-block" :exhibition="exhibition"></ExhibitionIntro>
-    </section> -->
+    </section>
     <section >
 
       <div ref="about" id="about" data-step="about" class="step section3 tw-px-[30px] md:tw-px-0 xl:tw-pr-[30px] xl:tw-col-start-1 xl:tw-row-start-3">
@@ -397,7 +397,7 @@ export default {
         )
         .then((result) => {
 
-          if (result && result.data && result.data.DATA && result.data.DATA.rel) {
+          if (result && result.data && result.data.DATA && result.data.DATA.rel) { 
 
             let exhib = result.data.DATA.rel;
             this.exhibition.id = exhib.ExhibitionID;