diff --git a/src/views/applymember.vue b/src/views/applymember.vue index 9da305352e657382b2a82f1d4d1033bae140edb4..c1ee8927a295b0241603ebede22e32125da58bca 100644 --- a/src/views/applymember.vue +++ b/src/views/applymember.vue @@ -3,7 +3,6 @@ <div class="detail"> <NavClub id="navClub"></NavClub> <div> - {{member}} 이름: {{member[0].name}} <br> 학과: {{member[0].department}} diff --git a/src/views/club_top_bar/club_Manage.vue b/src/views/club_top_bar/club_Manage.vue index 09a3032375fa86419574d5f5f66abd2c5df51b97..b79a340ab702ea41612b0255886734d24581adc0 100644 --- a/src/views/club_top_bar/club_Manage.vue +++ b/src/views/club_top_bar/club_Manage.vue @@ -5,16 +5,14 @@ <h3>동아리원 목록</h3> <div class="clubmember"> <div v-for="clubmem in member"> - {{clubmem}} <h3 style="display:inline">이름: {{clubmem.user}}</h3> <button><router-link :to="{name:'club_detail', params:{clubId: `${club[0].id}`, id:clubmem.user}}">자세히</router-link></button> </div> </div> - <h3>가입 신청자 목록</h3> + <h3 v-if="isManager">가입 신청자 목록</h3> <div class="waitmember"> <div v-for="applymem in applymember"> <h3 style="display:inline">이름: {{applymem.user}}</h3> - {{applymem}} <button><router-link :to="{name:'applymember', params:{clubId: `${club[0].id}`, name: applymem.user}}">자세히</router-link></button> </div> </div> @@ -25,6 +23,7 @@ <script> import NavClub from '@/components/NavClub.vue' import axios from "axios" +import {mapState} from "vuex" export default { components: { 'NavClub': NavClub @@ -33,9 +32,13 @@ export default { return { club:[], member:[], - applymember:[] + applymember:[], + isManager: false } }, + computed: { + ...mapState(['userInfo']) + }, async created() { let id = this.$route.params.clubId; const res = await axios.get(`http://jnhonlinux.ddns.net:3000/club/${id}`) @@ -44,10 +47,18 @@ export default { const member = await axios.get(`http://jnhonlinux.ddns.net:3000/joinedClub/${id}`) this.member = member.data.result - const applymember = await axios.get(`http://jnhonlinux.ddns.net:3000/applyClub/${id}`) - this.applymember = applymember.data.result + // const applymember = await axios.get(`http://jnhonlinux.ddns.net:3000/applyClub/${id}`) + // this.applymember = applymember.data.result - }, + const res2 = await axios.post(`http://jnhonlinux.ddns.net:3000/applyClub/auth/${id}`,{ + uid : this.userInfo.uid + }) + if(res2.data.success == true){ + this.applymember = res2.data.result + this.isManager = res2.data.success + } + } + } </script> diff --git a/src/views/left_bar/club.vue b/src/views/left_bar/club.vue index a4e395594fcc5563cfda72c2b1e96441940c23a5..25c429a47d604b0db41b84eee5ae126681d7b192 100644 --- a/src/views/left_bar/club.vue +++ b/src/views/left_bar/club.vue @@ -16,6 +16,7 @@ <br><br> <h4 style="display:inline">동아리 검색:</h4> <select v-model="selected"> + <option></option> <option value="name">클럽 이름</option> <option value="content">클럽 내용</option> </select> @@ -25,7 +26,6 @@ </div> <div class="clublist"> <div v-for = "club in searching" class="clubImage"> - {{club.isClub}} <router-link :to="{path:`/club_page/${club.id}`,params:{clubId:club.id}}"> <div> <h3>{{club.name}}</h3> @@ -67,7 +67,7 @@ export default { }) if(this.selected == 'content' && this.search != ''){ return this.clublist.filter((ele)=>{ - return ele.detail.match(this.search) + return ele.introduce.match(this.search) }) } if(this.search == ''){