From 312a0715744d168feadcc78048015b5a03b3a7a3 Mon Sep 17 00:00:00 2001 From: berlin-tzen Date: Tue, 14 Mar 2023 10:40:02 +0800 Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=9C=83=E5=93=A1=E5=B1=95=E8=A6=BD?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=BB=A5=E7=8B=80=E6=85=8B=E7=AF=A9=E9=81=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontEnd/pages/user/saveExhibition.vue | 221 +++++++------------------ 1 file changed, 60 insertions(+), 161 deletions(-) diff --git a/FrontEnd/pages/user/saveExhibition.vue b/FrontEnd/pages/user/saveExhibition.vue index dbaca9a..534f6a3 100644 --- a/FrontEnd/pages/user/saveExhibition.vue +++ b/FrontEnd/pages/user/saveExhibition.vue @@ -21,10 +21,11 @@ - @@ -41,42 +42,17 @@
- -
- +
- - - -
-
@@ -101,57 +77,48 @@ export default { pagination, }, data() { + return { - test: false, + firstName: "", lastName: "", userData: {}, userCompanyId: [], userCompanyList: [], userAddNewCompanyList: [], - userSavedExhibitionList: [], - userVisibleSavedExhibitionList: [], - userSavedExhibitionPageLength: 0, - savedExhibitionPerPage: 6, + yearOptions: [], monthOptions: [], dayOptions: [], + yearSelect: "", monthSelect: "", daySelect: "", + languageSelect: { en: "", zhtw: "", }, + phoneValid: false, - // countrySelect: 999, - statusList: [], - statusOptions: [], - statusSelect: 999, - page: 1, - filterList: [], - countryFilterList: [], - // userSaveExhibitionList: [], - exhibitionList: [], - showUserExhibitionList: [], - // userSaveExhibition: [], - CountryName: [], - test: "", isRouterAlive: true, + + countrySelect: "", + statusSelect: "", currentPage: 1, - itemsPerPage: 10, + itemsPerPage: 6, total: 0, selectedCountry: [], selectedSubCategory: [], selectedStatus: [], countryOptions: [], + statusOptions: [], exhibitionCardList: [], - userFavoriateList: [], }; @@ -159,78 +126,10 @@ export default { async created() { this.fetchUserData(); - await this.fetchExhibitionListCard(); + await this.fetchNewExhibitionCardList(); await this.fetchCountryList(); - this.fetchStatusList(); - - - // await this.userSavedExhib(); - - - - // await this.filterSavedExhibition(); - // //await this.showUserExhibitionList(); - // this.$axios - // .get(`/trending/api/location/countries?RegionID&Lang=${this.$i18n.localeProperties["langQuery"]}`) - // .then((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){ - // this.countryList = data; - // //console.log(this.countryList); - // this.countryOptions = this.countryList.map((item) => { - // return { - // id: item.CountryID, - // name: item.CountryName, - // }; - // }); - // const initial = { - // name: this.$t("userProfile.allCountries"), - // id: 999, - // }; - // this.countryOptions.splice(0, 0, initial); - - // } - // } - // }) - // .catch((error) => { - // console.log(error); - // }); - - // this.$axios - // .get(`/trending/api/exhibition/statuses?Lang=${this.$i18n.localeProperties["langQuery"]}`) - // .then((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){ - // this.statusList = data; - - // this.statusOptions = this.statusList.map((item) => { - // return { - // id:"", - // Key: item.Key, - // Value: item.Value, - // }; - // }); - - // const initial = { - // id: 999, - // Key: 999, - // Value: this.$t("userProfile.allStatus"), - // }; - - // this.statusOptions.splice(0, 0, initial); - - // } - // } - // }) - // .catch((error) => { - // console.log(error); - // }); - - // this.countryFilterList = this.showUserExhibitionList; + await this.fetchStatusList(); + }, mounted() { this.yearOptions = Array.from(new Array(103), (val, index) => @@ -258,28 +157,6 @@ export default { }, watch: { - // countrySelect: { - // handler: function (value) { - - // console.log("countrySelected "+ value); - - // if (this.countrySelect) { - // console.log(this.countrySelect); - // // this.filterSavedExhibition(this.countrySelect,this.statusSelect); - // //this.fetchSavedExhibition(); - // //this.fetchExhibition(); - // } - // }, - // }, - // statusSelect: { - // handler: function () { - // if (this.statusSelect) { - // this.filterSavedExhibition(this.countrySelect,this.statusSelect); - // //this.fetchSavedExhibition(); - // //this.fetchExhibition(); - // } - // }, - // }, }, computed: { @@ -324,6 +201,37 @@ export default { }, + async fetchStatusList() { + + await this.$axios + .get( + `/trending/api/Favorite/ExhibitionStatusList?Lang=${this.$i18n.localeProperties["langQuery"]}` + ) + .then((response) => { + if (response && response.data && response.data.DATA && response.data.DATA.rel) { + let data = response.data.DATA.rel + + if (data) { + + const statusList = data; + this.statusOptions = statusList.map((item) => { + + return { + id: item.Key, + name: item.Value, + }; + }); + + } + + } + }) + .catch((error) => { + console.log(error); + }); + + }, + async fetchExhibitionListCard() { await this.$axios @@ -363,40 +271,31 @@ export default { countryOptionSelected() { - this.currentPage = 1; this.selectedCountry = []; if (this.countrySelect) { this.selectedCountry.push(this.countrySelect.id); } - this.updateExhibitionCardList(); + this.fetchNewExhibitionCardList(); }, - async fetchStatusList() { + statusOptionSelected() { - await this.$axios - .get( - `/trending/api/Favorite/Favorites?Type=Exhibition` - ) - .then((response) => { - if (response && response.data && response.data.DATA && response.data.DATA.rel) { - let data = response.data.DATA.rel - if (data) { + this.selectedStatus = []; - this.userFavoriateList = data; + if (this.statusSelect) { + this.selectedStatus.push(this.statusSelect.id); + } - } - } - }) - .catch((error) => { - console.log(error); - }); + this.fetchNewExhibitionCardList(); }, - async updateExhibitionCardList() { + async fetchNewExhibitionCardList() { + + this.currentPage = 1; await this.fetchExhibitionListCard();