diff --git a/FrontEnd/components/exhibition/ExhibitionBannerArea.vue b/FrontEnd/components/exhibition/ExhibitionBannerArea.vue index 13885e5..ec754da 100644 --- a/FrontEnd/components/exhibition/ExhibitionBannerArea.vue +++ b/FrontEnd/components/exhibition/ExhibitionBannerArea.vue @@ -122,8 +122,8 @@ - -
{{ exhibition.shortName }}, {{ exhibition.enname }}
diff --git a/FrontEnd/pages/service/_id.vue b/FrontEnd/pages/service/_id.vue index 66dd662..d8c1474 100644 --- a/FrontEnd/pages/service/_id.vue +++ b/FrontEnd/pages/service/_id.vue @@ -448,8 +448,8 @@ export default { }; }, async created() { - // if(this.$route.params.id == "fb48072e-2d82-4ec6-9aeb-759df42a9ab0"){ - if(this.$route.params.id == "1c6e0001-e2dd-46b5-a617-4dac2f34894f"){ + if(this.$route.params.id == "fb48072e-2d82-4ec6-9aeb-759df42a9ab0"){ + // if(this.$route.params.id == "1c6e0001-e2dd-46b5-a617-4dac2f34894f"){ this.serviceID = true; }else{ this.serviceID = false; diff --git a/FrontEnd/pages/service/checkout/_id.vue b/FrontEnd/pages/service/checkout/_id.vue index 74b155a..23678e8 100644 --- a/FrontEnd/pages/service/checkout/_id.vue +++ b/FrontEnd/pages/service/checkout/_id.vue @@ -341,6 +341,8 @@ export default { }, async created() { + console.log(this.$auth.loggedIn) + const beforePathCookie = this.$route.fullPath; this.$auth.$storage.setUniversal('userBeforePath', beforePathCookie); @@ -359,8 +361,8 @@ export default { //思考可以如何優化 //高雄 - // if(this.serviceID == "fb48072e-2d82-4ec6-9aeb-759df42a9ab0"){ - if(this.serviceID == "1c6e0001-e2dd-46b5-a617-4dac2f34894f"){ + if(this.serviceID == "fb48072e-2d82-4ec6-9aeb-759df42a9ab0"){ + // if(this.serviceID == "1c6e0001-e2dd-46b5-a617-4dac2f34894f"){ let selectExhibitionData = JSON.parse(decodeURIComponent(data.selectExhibitionData)); @@ -808,8 +810,8 @@ export default { console.log(err); }); }, - getCompanyList() { - this.$axios + async getCompanyList() { + await this.$axios .get( `/trending/api/Members/Companies?Lang=${this.$i18n.localeProperties["langQuery"]}` ) @@ -846,9 +848,9 @@ export default { console.log(err); }); }, - updateCompanyList() { + async updateCompanyList() { const patchData = {}; - this.$axios + await this.$axios .post( `/trending/api/Members/Company`,patchData ) diff --git a/FrontEnd/pages/user/editPersonalInfo.vue b/FrontEnd/pages/user/editPersonalInfo.vue index 536f050..c97387c 100644 --- a/FrontEnd/pages/user/editPersonalInfo.vue +++ b/FrontEnd/pages/user/editPersonalInfo.vue @@ -327,8 +327,8 @@ export default { this.phoneValid = phoneData.isValid; }, - //Save Member Info - patchUserData() { + //Save Member Info(待優化) + async patchUserData() { this.validators(); if(this.validators()){ @@ -350,19 +350,24 @@ export default { } const patchData = JSON.parse(JSON.stringify(this.userData)); - this.$axios + console.log(patchData) + + await this.$axios .post( `/trending/api/Members/Member`, patchData ) .then((response) => { //console.log(JSON.stringify(response)); + + console.log('testresponse: ', response) + if (response.status == 200) { this.$notify({ type: "success", text: "更新成功", }); } - this.fetchUserData(); + // this.fetchUserData(); this.$auth.$storage.setUniversal("userPicture", patchData.MemberPicture); this.$store.dispatch("updatePicture"); }) @@ -373,8 +378,8 @@ export default { }, //Get Member Info - fetchUserData() { - this.$axios + async fetchUserData() { + await this.$axios .get( `/trending/api/Members/Info` ) @@ -428,7 +433,13 @@ export default { }else{ const space = this.userData.BirthDate.split("T"); + + console.log('space: ', space) + const date = space[0].split("-"); + + console.log('date: ', date) + this.yearSelect = date[0]; this.monthSelect = date[1]; this.daySelect = date[2]; @@ -480,8 +491,8 @@ export default { console.log(error); }); }, - fetchCountry() { - this.$axios + async fetchCountry() { + await this.$axios .get(`/trending/api/location/countries?RegionID&Lang=${this.$i18n.localeProperties["langQuery"]}`) .then((response) => { //console.log(JSON.stringify(response));