resolve conflicts

src/components/MyModal.vue

@@ -22,9 +22,9 @@
             :until-country=true
             @select-country="getCountryInfo"/>
           <div v-if="checkCountry">
-            <button class="modal-default-button" v-on:click="clickMakePlan()">Make Plan!</button>
+            <button class="modal-default-button" v-on:click="clickMakePlan()"><img id="illu" src="../assets/makePlan.png">!</button>
           </div>
-          <button class="modal-default-button" @click="$emit('close')">Close
+          <button class="modal-default-button" @click="$emit('close')"><img id="illu" src="../assets/close.png">
           </button>
           <br>
         </div>
@@ -110,6 +110,10 @@ export default {
   .closeModalBtn {
     color: #62acde;
   }
+  #illu {
+    width: 80px;
+    height: 35px;
+  }
 
   .modal-mask {
     position: fixed;
@@ -149,11 +153,12 @@ export default {
   }
 
   .modal-default-button {
-    color: #fff;
     float: right;
-    background-color: #64b99f;
-    font-size: 20px;
-    border-radius: 8px;
+    background-color:#ffffff;
+    width: 80px;
+    height: 35px;
+    border : none;
+    margin: 0px 5px;
   }
 
   /*

src/views/AttractionList.vue

@@ -62,7 +62,7 @@ export default {
     font-size: 26px;
   }
   #attractionlist {
-    margin: 15% auto auto auto;
+    margin: 10% auto auto auto;
   }
   hr{
     border: none;
@@ -74,6 +74,7 @@ export default {
     .illu{
       width: 80px;
       height: 35px;
+      margin: 4px 0px;
     }
 
     .img{

src/views/LogIn.vue

 <template>
   <div id="LogIn">
-    <p>LogIn Page</p>
+    <h2 class="text-info">LogIn Page</h2>
+    <br>
     <input required v-model='user_id' placeholder="ID"><br><br>
     <input required v-model='user_password' placeholder="PASSWORD"><br><br>
-    <button v-on:click="login()" id="bu1">
+    <button class="btn" v-on:click="login()">
     <img id="illu1" src="../assets/login.png">
     </button>
     <br>
@@ -45,13 +46,17 @@ export default {
 }
 </script>
 <style>
+h2{
+  font-weight: 2px
+}
   #illu, #illu1, #bu1 {
     width: 80px;
     height: 35px;
   }
 
-  #bu1 {
-    background-color: #ffffff
+  .btn {
+    background-color: none;
+    border : none;
   }
 
   #LogIn {

src/views/MainPage.vue

@@ -4,7 +4,7 @@
   -o-background-size: cover;">
     <li class="triplan-li">
       <router-link to="/attractionlist" id="menu1">
-        <img id="illu1" src="../assets/menu1.png">
+        <img id="illu11" src="../assets/menu1.png">
       </router-link>
       <img id="illu2" src="../assets/menu2.png" @click="showModal = true">
       <modal v-if="showModal" @close="showModal = false">
@@ -62,7 +62,7 @@ export default {
     background-color: none;
   }
 
-  #illu1, #illu2, #illu3 {
+  #illu11, #illu2, #illu3 {
     width: 200px;
     height: 200px;
     cursor: pointer;

src/views/MakePlan.vue

 <template>
   <div class="makePlan">
+    <br><br><br>
     <h1>Make Plan</h1>
     <div id="div0">
       <div v-for="item in Days" v-bind:key='item.idx'>
@@ -9,16 +10,17 @@
             {{item.st}}
           </button>
       </div>
+            <br><br>
       <button id="addBtn" v-on:click="newAdd">+</button>
-      <br>
+
     </div>
-    <br>
+    <div>
     <div id="div1">
       <div class="tourList">
         <p class="w1">관광지</p>
       </div>
       <br>
-      <button v-on:click="cl1">고르기</button>
+      <button v-on:click="cl1" class="btn"><img id="illu1" src="../assets/choose.png"></button>
       <div v-if="showM" @close="showM=false">
         <select @change="selectCity($event)" name="city">
           <!--      <option disabled value="">Select City</option>-->
@@ -26,7 +28,7 @@
           <option v-for="city in cities" v-bind:key="city.id">{{city.city_name}}</option>
         </select>
       </div>
-      <br><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)">{{idx.place_name}}</button>
         <br>
@@ -42,8 +44,9 @@
         <div id="div_tour"> {{pl.place_name}}
         </div>
       </div>
-      <button class="btn" v-on:click="addTour">저장</button>
-      <button class="btn" v-on:click="sendResult">최종 저장</button>
+      <button class="btn" v-on:click="addTour"><img id="illu1" src="../assets/submit.png"></button>
+      <button class="btn" v-on:click="sendResult"><img id = "illu2" src="../assets/totalSubmit.png"></button>
+    </div>
     </div>
   </div>
 </template>
@@ -55,6 +58,7 @@ import API from '../components/API'
 var number = 1
 var dayNum = 0
 var cc = ''
+var clicked=''
 export default {
   name: 'makePlan',
   data () {
@@ -67,7 +71,8 @@ export default {
       places: [],
       Days: [],
       checking: [],
-      placeNames: []
+      placeNames: [],
+      dayplanNames: []
     }
   },
   methods: {
@@ -141,30 +146,31 @@ export default {
       })
     },
     makeTour (idx) {
-      this.tours.push({
-        place_id: idx.place_id
-      })
+      this.tours.push(idx.place_id)
       this.placeNames.push({
         place_name: idx.place_name
       })
     },
     addTour () {
       const data = {
-        place_id: this.tours,
-        day: dayNum,
         city_id: cc,
+        place_id: this.tours
+      }
+      const data2 = {
+        day: dayNum,
         place_name: this.placeNames
       }
-      this.dayplan[data.day - 1] = data
+      this.dayplan[data2.day - 1] = data
+      this.dayplanNames[data2.day - 1] = data2
+      this.tours = []
       this.checking[dayNum] = 1
       this.placeNames = []
     },
     showTour (idx) {
-      this.tours = []
+      this.placeNames = []
       dayNum = idx
       if (this.checking[dayNum] === 1) {
-        const result = this.dayplan[idx - 1].place_name
-        console.log(result)
+        const result = this.dayplanNames[idx - 1].place_name
         this.placeNames = result
       }
     },
@@ -187,13 +193,19 @@ export default {
 }
 </script>
 <style>
-
+#illu1, #illu2{
+    width: 80px;
+    height: 35px;
+}
 #btnDay{
   float:left;
-  margin: 2px 5px;
+  margin:0px 5px;
   background-color: #ffffff;
   border: 2px dashed  #FF6D6A;
-
+  bottom : 0%;
+}
+ #btnDay:hover{
+   background-color: #FF6D6A
   }
 
   #div0 {
@@ -224,7 +236,7 @@ export default {
   }
 
   .btn {
-    position: relative;
+
     bottom: 0;
     /*background-color: #FF6D6A;*/
   }
@@ -239,9 +251,11 @@ export default {
     border: solid 3px #3d3b3b;
     border-radius: 7px;
     color: #ffffff;
+    bottom: 0%;
   }
 
   #div_tour {
     height: auto;
+    margin: 2px 0px
   }
 </style>

src/views/MyPage.vue

@@ -95,6 +95,9 @@ export default {
   *{
     color:#000000;
   }
+  .btn{
+    padding: 1px 1px;
+  }
   #mypage {
     margin: 15% auto auto auto
   }

src/views/SharePlan.vue

@@ -92,18 +92,21 @@ export default {
 
 <style>
 
+  .btn {
+    background: #ffffff
+  }
   h1 {
     size: 70px;
     margin: 50px;
   }
 
-  #illu {
+  #illu, .btn{
     width: 80px;
     height: 35px;
   }
 
   .example {
-    margin: 15% auto auto auto
+    margin: 10% auto auto auto
   }
 
   .example input {

src/views/SignUp.vue

 <template>
   <div id="LogIn">
-    <p>Sign Up</p>
+    <h2 class="text-info">Sign Up</h2>
     <input type="email" required v-model="user_email" placeholder="EMAIL"><br><br>
     <input required v-model='user_id' placeholder="ID">
     <button v-on:click="overlap()">중복확인</button>
@@ -12,7 +12,7 @@
     <input type="radio" v-model="user_gender" name="user_gender" value="0">Female<br><br>
     <input required v-model='user_phone' placeholder="PHONE"><br><br>
     <button v-on:click="register()" id="bu1">
-      가입
+    <img id="illu" src="../assets/adding.png">
     </button>
     <br>
     <router-link to='/'>
@@ -108,13 +108,17 @@ export default {
 }
 </script>
 <style>
-  #illu, #illu1, #bu1 {
+  #illu, #illu1 {
     width: 80px;
     height: 35px;
   }
 
   #bu1 {
-    background-color: #ffffff
+    background-color: #ffffff;
+    border : none;
+    width: 80px;
+    height: 35px;
+    margin: 3px 0px;
   }
 
   #LogIn {