diff --git a/src/App.vue b/src/App.vue index 5126c79abe1c3330616229c23296f02e4ffe4c47..8e5c5fe646fc4b55720c98ea5d73b2af18bc7b33 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,7 +19,7 @@ <router-link to="/mypage" class="nav-link">MY PAGE</router-link> </li> <li class="nav-item"> - <a @click="logout" class="nav-link">SIGN OUT</a> + <a @click="logout" class="nav-link" href="/">SIGN OUT</a> </li> </div> <div v-else class="navbar-nav"> diff --git a/src/assets/choose.png b/src/assets/choose.png new file mode 100644 index 0000000000000000000000000000000000000000..c03be4c6570448f22499401ebdafc7dd39f23de7 Binary files /dev/null and b/src/assets/choose.png differ diff --git a/src/assets/close.png b/src/assets/close.png new file mode 100644 index 0000000000000000000000000000000000000000..b9b42920a77d09cc2701f8255fa18b174e93687d Binary files /dev/null and b/src/assets/close.png differ diff --git a/src/assets/makePlan.png b/src/assets/makePlan.png new file mode 100644 index 0000000000000000000000000000000000000000..26b512b4d39c7bb9cd100471294e54f82f6659cd Binary files /dev/null and b/src/assets/makePlan.png differ diff --git a/src/assets/menu1.png b/src/assets/menu1.png index 241dd09013dd50d251fbf2451359e9e48155dac1..859a043ae10a248c99299e1ac55d9357c4d7b9b9 100644 Binary files a/src/assets/menu1.png and b/src/assets/menu1.png differ diff --git a/src/assets/menu2.png b/src/assets/menu2.png index c500bb76a12da9c5929e72bd9789ef9b64098ab4..45bbfe8b13bc71951947d1c60bf61e962d8e37e9 100644 Binary files a/src/assets/menu2.png and b/src/assets/menu2.png differ diff --git a/src/assets/menu3.png b/src/assets/menu3.png index 279e7a9117a8c27ecc8ba4fed5e5b585c91c4892..10de58b1dc3c63a8c0b705d2d6a27132d04f6e75 100644 Binary files a/src/assets/menu3.png and b/src/assets/menu3.png differ diff --git a/src/assets/search.png b/src/assets/search.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6bffd96b79b8059de9a23975c68078de847f9a Binary files /dev/null and b/src/assets/search.png differ diff --git a/src/assets/submit.png b/src/assets/submit.png new file mode 100644 index 0000000000000000000000000000000000000000..306c4405729409272573d9df4c610cd47b012043 Binary files /dev/null and b/src/assets/submit.png differ diff --git a/src/assets/totalSubmit.png b/src/assets/totalSubmit.png new file mode 100644 index 0000000000000000000000000000000000000000..068aed213028aaec346c009d648f0417271bf2b0 Binary files /dev/null and b/src/assets/totalSubmit.png differ diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue index 9bd02d2d707136d55f1aa7f14a86fcc5fffaf6ed..4b3146ba17234884a9efa7593f7d1d97a66c11af 100644 --- a/src/views/MainPage.vue +++ b/src/views/MainPage.vue @@ -59,7 +59,7 @@ export default { height: 200px; border: 0; margin: 3rem 5rem; - background-color: #ffffff; + background-color: none; } #illu1, #illu2, #illu3 { diff --git a/src/views/MakePlan.vue b/src/views/MakePlan.vue index d59e1baa3eccc53532b9f198429bf101968e3dd4..29498d250674000ef8976262eaeec95850a97edb 100644 --- a/src/views/MakePlan.vue +++ b/src/views/MakePlan.vue @@ -28,7 +28,7 @@ </div> <br><br> <div v-for="idx in places" v-bind:key='idx.place_id'> - <button class="btn btn-outline-secondary" v-on:click="makeTour(idx.place_id, idx.place_name)">{{idx.place_name}}</button> + <button class="btn btn-outline-secondary" v-on:click="makeTour(idx)">{{idx.place_name}}</button> <br> </div> </div> @@ -169,12 +169,10 @@ export default { showTour (idx) { this.tours = [] dayNum = idx - console.log(idx) - console.log(dayNum) if (this.checking[dayNum] === 1) { - const result = this.dayplan[idx - 1].placeNames + const result = this.dayplan[idx - 1].place_name console.log(result) - this.tours = result + this.placeNames = result } }, sendResult () {