[WHAT] 整理展覽相關程式碼

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;

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);
       }
 
     },