From 7cead36a3951ebf906b996d1e02ea2a0c46485cb Mon Sep 17 00:00:00 2001 From: berlin-tzen Date: Fri, 3 Feb 2023 11:17:57 +0800 Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E5=B1=95=E8=A6=BD=E5=8D=A1=E7=89=87?= =?UTF-8?q?=EF=BC=8C=E5=B1=95=E8=A6=BD=E5=88=97=E8=A1=A8=E9=A0=81=E9=96=8B?= =?UTF-8?q?=E7=99=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exhibition/ExhibitionListCard.vue | 194 ++++++++---------- FrontEnd/pages/exhibition/index.vue | 102 ++++----- 2 files changed, 131 insertions(+), 165 deletions(-) diff --git a/FrontEnd/components/exhibition/ExhibitionListCard.vue b/FrontEnd/components/exhibition/ExhibitionListCard.vue index 4b4937a..62a7da5 100644 --- a/FrontEnd/components/exhibition/ExhibitionListCard.vue +++ b/FrontEnd/components/exhibition/ExhibitionListCard.vue @@ -1,143 +1,123 @@ diff --git a/FrontEnd/pages/exhibition/index.vue b/FrontEnd/pages/exhibition/index.vue index d9189c8..345c9cf 100644 --- a/FrontEnd/pages/exhibition/index.vue +++ b/FrontEnd/pages/exhibition/index.vue @@ -210,6 +210,7 @@ export default { data: () => ({ page: 1, perPage: 10, + adList: [], exhibitionList: [], datesChecked: [], statusesChecked: [], @@ -252,6 +253,7 @@ export default { sortBy: "Show Dates", }), async created() { + this.getAdList(); this.getStatusList(); this.getLocationList(); this.getCategoryList(); @@ -406,6 +408,17 @@ export default { } }); }, + getAdList() { + + this.ads = [{ + image: require('/assets/img/thems/Frame33.png') + },{ + image: require('/assets/img/thems/Frame33.png') + },{ + image: require('/assets/img/thems/Frame33.png') + }] + + }, getStatusList() { this.$axios .get( @@ -431,33 +444,6 @@ export default { console.log(err); }); }, - async getUnsortLocationList() { - await this.$axios - .get( - `/t/exhibitions/locations?lang=${this.$i18n.localeProperties["langQuery"]}&sort=false` - ) - .then((result) => { - this.unsortRegionList = result.data.region_name_list; - this.unsortCountryList = result.data.country_name_list; - this.unsortCityList = result.data.city_name_list; - }) - .catch((err) => { - console.log(err); - }); - }, - async getUnsortCategoryList() { - await this.$axios - .get( - `/t/exhibitions/categories?lang=${this.$i18n.localeProperties["langQuery"]}&sort=false` - ) - .then((result) => { - this.unsortCategoryList = result.data.category_name_list; - this.unsortSubcategoryList = result.data.subcategory_name_list; - }) - .catch((err) => { - console.log(err); - }); - }, getCategoryList() { this.$axios .get( @@ -572,37 +558,37 @@ export default { this.exhibitionList = []; }); }, - async getQuery() { - this.locationQueryFilter = ""; - this.categoryQueryFilter = ""; - this.datesChecked = []; - if (this.$route.query.hasOwnProperty("country")) { - this.locationQueryFilter = - this.unsortCountryList[Number(this.$route.query.country)]; - } - if (this.$route.query.hasOwnProperty("city")) { - this.locationQueryFilter = - this.unsortCityList[Number(this.$route.query.city)]; - } - if (this.$route.query.hasOwnProperty("region")) { - this.locationQueryFilter = - this.unsortRegionList[Number(this.$route.query.region)]; - } - if (this.$route.query.hasOwnProperty("category")) { - this.categoryQueryFilter = - this.unsortCategoryList[Number(this.$route.query.category)]; - } - if (this.$route.query.hasOwnProperty("subcategory")) { - this.categoryQueryFilter = - this.unsortSubcategoryList[Number(this.$route.query.subcategory)]; - } - if (this.$route.query.hasOwnProperty("startdate")) { - this.datesChecked.push(this.$route.query.startdate); - } - if (this.$route.query.hasOwnProperty("enddate")) { - this.datesChecked.push(this.$route.query.enddate); - } - }, + // async getQuery() { + // this.locationQueryFilter = ""; + // this.categoryQueryFilter = ""; + // this.datesChecked = []; + // if (this.$route.query.hasOwnProperty("country")) { + // this.locationQueryFilter = + // this.unsortCountryList[Number(this.$route.query.country)]; + // } + // if (this.$route.query.hasOwnProperty("city")) { + // this.locationQueryFilter = + // this.unsortCityList[Number(this.$route.query.city)]; + // } + // if (this.$route.query.hasOwnProperty("region")) { + // this.locationQueryFilter = + // this.unsortRegionList[Number(this.$route.query.region)]; + // } + // if (this.$route.query.hasOwnProperty("category")) { + // this.categoryQueryFilter = + // this.unsortCategoryList[Number(this.$route.query.category)]; + // } + // if (this.$route.query.hasOwnProperty("subcategory")) { + // this.categoryQueryFilter = + // this.unsortSubcategoryList[Number(this.$route.query.subcategory)]; + // } + // if (this.$route.query.hasOwnProperty("startdate")) { + // this.datesChecked.push(this.$route.query.startdate); + // } + // if (this.$route.query.hasOwnProperty("enddate")) { + // this.datesChecked.push(this.$route.query.enddate); + // } + // }, updateSortBy(data) { this.sortBy = data; },