From f4d1f96567d1d3a1c168b251248562c8453ef392 Mon Sep 17 00:00:00 2001
From: berlin-tzen <berlintzen@gmail.com>
Date: Thu, 16 Feb 2023 13:26:36 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=95=B4=E7=90=86=E5=B1=95=E8=A6=BD?=
 =?UTF-8?q?=E7=9B=B8=E9=97=9C=E7=A8=8B=E5=BC=8F=E7=A2=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontEnd/pages/exhibition/_id.vue   |  8 ++-----
 FrontEnd/pages/exhibition/index.vue | 35 +++++++++--------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/FrontEnd/pages/exhibition/_id.vue b/FrontEnd/pages/exhibition/_id.vue
index e13e492..5fbef66 100644
--- a/FrontEnd/pages/exhibition/_id.vue
+++ b/FrontEnd/pages/exhibition/_id.vue
@@ -166,10 +166,10 @@ export default {
   },
   head() {
     return {
-      title: this.rsexhibition.ExhibitionName,
+      title: this.exhibition.ExhibitionName,
       meta: [
         {
-          name: this.rsexhibition.ExhibitionName,
+          name: this.exhibition.ExhibitionName,
           content: this.exhibition.description,
         },
         { hid: "og:title", name: "og:title", content: this.exhibition.name },
@@ -201,7 +201,6 @@ export default {
         mobnav: false,
       },
       ads: [],
-      rsexhibition: {},
       exhibitionID: "",
       tab: "0",
       saved: false,
@@ -386,9 +385,6 @@ export default {
           if (result.data.DATA.rel) {
 
             let exhib = result.data.DATA.rel;
-            this.rsexhibition = exhib;
-            // console.log(exhib.ExhibitionName);
-
             this.exhibition.id = exhib.ExhibitionID;
             this.exhibition.name = exhib.ExhibitionName;
             this.exhibition.enname = exhib.ExhibitionENName;
diff --git a/FrontEnd/pages/exhibition/index.vue b/FrontEnd/pages/exhibition/index.vue
index a7dbfba..1ef7dc0 100644
--- a/FrontEnd/pages/exhibition/index.vue
+++ b/FrontEnd/pages/exhibition/index.vue
@@ -707,35 +707,20 @@ export default {
     async getQuery() {
 
       let vm = this;
-      this.categoryQueryFilter = "";
-      this.locationQueryFilter = "";
-      // if (this.$route.query.hasOwnProperty("country") && this.countryNameList.length>0) {
-      //   this.locationQueryFilter =
-      //     this.countryNameList[Number(this.$route.query.country)];
-      // }
-      // if (this.$route.query.hasOwnProperty("city") && this.cityNameList.length>0) {
-      //   this.locationQueryFilter =
-      //     this.cityNameList[Number(this.$route.query.city)];
-      // }
-      // if (this.$route.query.hasOwnProperty("region")) {
-      //   this.locationQueryFilter =
-      //     this.regionNameList[Number(this.$route.query.region)];
-      // }
-      // if (this.$route.query.hasOwnProperty("category") && this.categoryNameList.length>0) {
-      //   this.categoryQueryFilter =
-      //     this.categoryNameList[Number(this.$route.query.category)];
-      // }
-      // if (this.$route.query.hasOwnProperty("subcategory")) {
-      //   this.categoryQueryFilter =
-      //     this.unsortSubcategoryList[Number(this.$route.query.subcategory)];
-      // }
-
-      if (vm.$route.query.hasOwnProperty("category")) {
+      
+      if (this.$route.query.category) {
         vm.categoryQueryFilter = vm.$route.query.category;
+        this.selectedMainCategory.push(vm.$route.query.category);
       }
 
-      if (vm.$route.query.hasOwnProperty("country")) {
+      if (this.$route.query.subcategory) {
+        vm.categoryQueryFilter = vm.$route.query.category;
+        this.selectedSubCategory.push(vm.$route.query.subcategory);
+      }
+
+      if (this.$route.query.country) {
         vm.locationQueryFilter = vm.$route.query.country;
+        this.selectedCountry.push(vm.$route.query.country);
       }
 
     },