From b6fecc30f72ed3cd83ddd6d7355e83a618f17c16 Mon Sep 17 00:00:00 2001
From: berlin-tzen <berlintzen@gmail.com>
Date: Thu, 9 Feb 2023 19:26:24 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E8=AA=BF=E6=95=B4=E5=B1=95=E8=A6=BD?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8D=A1=E7=89=87UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exhibition/ExhibitionListCard.vue         | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/FrontEnd/components/exhibition/ExhibitionListCard.vue b/FrontEnd/components/exhibition/ExhibitionListCard.vue
index 1fcdc9b..41a26b3 100644
--- a/FrontEnd/components/exhibition/ExhibitionListCard.vue
+++ b/FrontEnd/components/exhibition/ExhibitionListCard.vue
@@ -40,7 +40,7 @@
             <img src="~/assets/svg/noLogo.svg" class="md:tw-w-[160px] md:tw-p-[10px]" alt="" />
           </div>
           <nuxt-link v-else :to="localePath('/exhibition/' + item.ExhibitionID)"><img :src="item.Logo"
-              class="tw-py-[35px]" alt="" />
+              class="tw-p-[10px]" alt="" />
           </nuxt-link>
 
         </div>
@@ -67,16 +67,18 @@
               {{ item.ExhibitionName }}
             </div>
 
-            <nuxt-link class="tw-text-neutrals-800" :to="localePath(`/exhibition?region=${item.RegionID}`)">{{
-              item.RegionName == null ? "" : item.RegionName + "．"
-            }}</nuxt-link>
-            <nuxt-link class="tw-text-neutrals-800" :to="localePath(`/exhibition?country=${item.CountryID}`)">{{
-              item.CountryName == null ? "" : item.CountryName + "．"
-            }}</nuxt-link>
-            <nuxt-link class="tw-text-neutrals-800" :to="localePath(`/exhibition?city=${item.CityID}`)">{{
-              item.CityName
-                == null ? "" : item.CityName
-            }}</nuxt-link>
+            <div class="tw-flex">
+              <div v-if="item.RegionName != ''" class="tw-text-neutrals-800 tw-body-3">
+                {{ item.RegionName == null ? "" : item.RegionName + "．" }}
+              </div>
+              <div v-if="item.CountryName != ''" class="tw-text-neutrals-800 tw-body-3">
+                {{ item.CountryName == null ? "" : item.CountryName + "．" }}
+              </div>
+              <div v-if="item.RegionName != ''" class="tw-text-neutrals-800 tw-body-3">
+                {{ item.CityName == null ? "" : item.CityName }}
+              </div>
+
+            </div>
 
             <!-- star and review-->
             <!-- <div class="tw-hidden md:tw-block md:tw-mb-[8px]">
@@ -91,16 +93,34 @@
               </div>
             </div> -->
 
-            <div v-if="item.MainCategoryList.length > 0"
+            <!-- <div v-if="item.MainCategoryList.length > 0"
               class="tw-w-fit tw-p-[5px] tw-body-5 tw-rounded-[10px] tw-bg-[#f6f6f6] tw-text-hint tw-mb-[8px] md:tw-text-[14px] md:tw-px-[10px] md:tw-py-[6px]">
 
               <div v-for="(Category, index) in item.MainCategoryList">
                 {{ Category.CategoryName }}
               </div>
 
+            </div> -->
+
+
+            <div>
+              <div v-if="item.MainCategoryList != null"
+                class="md:tw-flex md:tw-flex-row md:tw-items-center tw-mb-[8px]">
+                <div v-for="(item, index) in item.MainCategoryList" v-show="index < 1" :key="index"
+                  class="tw-bg-[#f6f6f6] tw-w-fit tw-rounded-[10px] tw-px-[10px] tw-py-[5px] tw-text-[14px] tw-mr-[10px]">
+                  <div class="tw-text-neutrals-800">
+                    {{ item.CategoryName }}
+                  </div>
+                </div>
+
+                <div class="tw-text-[12px] tw-text-complementary-1" v-if="item.MainCategoryList.length > 1">
+                  More ＋
+                </div>
+              </div>
             </div>
-            <div class="tw-hidden xl:tw-block tw-h-[62px]">
-              {{ item.Intro }}
+            <div class="tw-hidden xl:tw-block xl:tw-line-clamp-2 tw-text-neutrals-600 tw-text-[14px] xl:tw-mb-[14px]"
+              v-if="!!item.Intro">
+              <div v-html="item.Intro"></div>
             </div>
             <div class="tw-body-3 tw-text-black md:tw-text-[18px]">
               {{ formatDate(item.StartDate) + " - " + formatDate(item.EndDate) }}