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

FrontEnd/components/exhibition/ExhibitionBannerArea.vue

@@ -37,7 +37,7 @@
           </div>
           <div class="tw-justify-start md:tw-max-w-[528px] xl:tw-max-w-[976px]">
             <div class="tw-flex tw-flex-row tw-mb-[8px] md:tw-mb-[12px]">
-              <div v-if="exhibition.isRecommend != null"
+              <div v-if="exhibition.isRecommend != null && exhibition.isRecommend == 'Y' "
                 class="tw-grid tw-grid-cols-[12px_auto] tw-gap-[4px] tw-items-center tw-border-solid tw-border tw-border-primary-2 tw-bg-primary-1 tw-rounded-[8px] tw-px-[10px] tw-py-[4px] tw-mr-[8px]">
                 <img src="~/assets/svg/recommend.svg" alt="" />
                 <div class="tw-text-white tw-text-[12px] md:tw-text-[14px]">

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">