From 207914af8b72dbd525f8b05e3587e0e8ae910613 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 10 Feb 2023 17:36:03 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=94=B6=E8=97=8F=E5=B1=95=E8=A6=BD?=
 =?UTF-8?q?=20[WHY]=20=E9=96=8B=E7=99=BC=20ShowEasy=20=E5=89=8D=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontEnd/components/user/userSidebar.vue |  4 ++--
 FrontEnd/pages/user/saveExhibition.vue   | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/FrontEnd/components/user/userSidebar.vue b/FrontEnd/components/user/userSidebar.vue
index 05a554d..6a6ede2 100644
--- a/FrontEnd/components/user/userSidebar.vue
+++ b/FrontEnd/components/user/userSidebar.vue
@@ -2,9 +2,9 @@
   <div
     class="tw-bg-white tw-rounded-[20px] tw-px-[30px] tw-pt-[30px] tw-pb-[20px] md:tw-px-[40px] md:tw-pt-[40px] xl:tw-pb-[40px] xl:tw-w-[308px]">
     <div class="tw-mb-[10px]">
-      <img v-if="userData.picture"
+      <img v-if="userData.MemberPicture"
         class="tw-border tw-flex tw-border-solid tw-border-neutrals-300 tw-rounded-[50px] tw-mx-auto tw-max-w-[64px] tw-h-[64px]"
-        :src="userData.picture" />
+        :src="userData.MemberPicture" />
       <div v-else
         class="tw-flex tw-justify-center tw-items-center tw-bg-primary-default tw-rounded-[50px] tw-mx-auto tw-w-[64px] tw-h-[64px]">
         <span class="tw-text-white tw-font-normal tw-text-[40px] tw-uppercase">{{ lastName.split("")[0] || "" }}</span>
diff --git a/FrontEnd/pages/user/saveExhibition.vue b/FrontEnd/pages/user/saveExhibition.vue
index 8658f7f..d1cb218 100644
--- a/FrontEnd/pages/user/saveExhibition.vue
+++ b/FrontEnd/pages/user/saveExhibition.vue
@@ -210,7 +210,7 @@ export default {
           console.log(error);
         });
 
-        this.countryFilterList = this.showUserExhibitionList;
+    this.countryFilterList = this.showUserExhibitionList;
   },
   mounted() {
     this.yearOptions = Array.from(new Array(103), (val, index) =>
@@ -390,7 +390,7 @@ export default {
           `/trending/api/Favorite/Favorites?Type=Exhibition`
         )
         .then((response) => {
-          //console.log(JSON.stringify(response));
+          console.log(JSON.stringify(response));
           if(response && response.data && response.data.DATA && response.data.DATA.rel){
             let data = response.data.DATA.rel
             if(data){
@@ -419,10 +419,10 @@ export default {
     async fetchExhibition() {
       this.$axios
         .get(
-          `/trending/api/Exhibition/Cards?RegionIDs&CountryIDs&CityIDs&MainCategoryIDs&SubCategoryIDs&Status&Date&Lang=${this.$i18n.localeProperties["langQuery"]}`
+          `/trending/api/Exhibition/Cards?RegionIDs&CountryIDs&CityIDs&MainCategoryIDs&SubCategoryIDs&Status&Date&Sort&Lang=${this.$i18n.localeProperties["langQuery"]}`
         )
         .then((response) => {
-          //console.log(JSON.stringify(response));
+          console.log(JSON.stringify(response));
           if(response && response.data && response.data.DATA && response.data.DATA.rel){
             let data = response.data.DATA.rel
             if(data){
@@ -434,6 +434,8 @@ export default {
                   }
                 })
               });
+              this.countryFilterList = JSON.parse(
+              JSON.stringify(this.showUserExhibitionList));
 
               //Berlin示範的
               // this.exhibitionList.forEach((exhib) => {
@@ -447,7 +449,11 @@ export default {
               // })
 
 
+
+
             };
+
+            
           };
         })
         .catch((error) => {