test: temp merge

beodomi · Jun 10, 2023 · 539965d · 539965d
1 parent 56dd9d7
commit 539965d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/src/router/index.js b/src/router/index.js
@@ -65,7 +65,6 @@ const routes = [
     // 승차벨 페이지
     path: '/riding',
     name: 'RidingView',
-    props: true,
     component: () => import('@/views/passenger/RidingView.vue'),
   },
   {

diff --git a/src/store/passsengerStore.js b/src/store/passsengerStore.js
@@ -1,4 +1,5 @@
 import {defineStore} from 'pinia';
+import {ref} from 'vue';
 
 export const usePassengerStore = defineStore('passenger', () => {
   /** 커스텀 콘텐츠를 읽어주는 함수
@@ -16,7 +17,15 @@ export const usePassengerStore = defineStore('passenger', () => {
       htmlElement.removeAttribute('aria-live');
     }, 100);
   }
+
+  const busData = ref({});
+  const startStation = ref({});
+  const endStation = ref({});
+
+  busData.value = {id: 123};
+
   return {
     announcePageContent,
+    busData,
   };
 });
diff --git a/src/views/passenger/KeyboardSearchView.vue b/src/views/passenger/KeyboardSearchView.vue
@@ -78,8 +78,10 @@
 
         // 사용자 위치 기준으로 가까운 정류장 get
         // TODO: 현재 위치를 동대문 DDP 으로 고정! 나중에 현재 위치로 바꾸깅
+        const tmpX = 126.910257;
+        const tmpY = 37.581632;
 
-        const url = `http://ws.bus.go.kr/api/rest/stationinfo/getStationByPos?serviceKey=${process.env.VUE_APP_ROUTE_SERVICE_KEY}&tmX=${127.00911}&tmY=${37.56652}&radius=${2000}&resultType=json`;
+        const url = `http://ws.bus.go.kr/api/rest/stationinfo/getStationByPos?serviceKey=${process.env.VUE_APP_ROUTE_SERVICE_KEY}&tmX=${tmpX}&tmY=${tmpY}&radius=${2000}&resultType=json`;
         axios
           .get(url)
           .then(res => {

diff --git a/src/views/passenger/RidingView.vue b/src/views/passenger/RidingView.vue
@@ -20,22 +20,20 @@
 <script>
   import NavCompVue from '@/components/NavComp.vue';
   import {ref} from 'vue';
+  import {usePassengerStore} from '@/store/passsengerStore';
 
   export default {
     components: {
       NavCompVue,
     },
-    props: {
-      busData: Object,
-    },
-    mounted() {
-      console.log(this.busData);
-    },
     setup() {
+      const passengerStore = usePassengerStore();
+      console.log(passengerStore.busData);
       // 버스 도착 여부
       const isBusArrive = ref(false);
       return {
         isBusArrive,
+        passengerStore,
       };
     },
   };

diff --git a/src/views/passenger/StopBusListView.vue b/src/views/passenger/StopBusListView.vue
@@ -33,6 +33,7 @@
   import {useRoute} from 'vue-router';
   import router from '@/router';
   import NavComp from '@/components/NavComp.vue';
+  import {usePassengerStore} from '@/store/passsengerStore';
 
   export default {
     name: 'StopBusList',
@@ -113,11 +114,12 @@
         return res.msgBody.itemList[0].arrmsg1;
       };
 
+      const passengerStore = usePassengerStore();
       const ridingReserve = busData => {
         console.log('넘겨주는쪽:', busData);
+        passengerStore.busData = busData;
         router.push({
           name: 'RidingView',
-          props: {busData: busData},
         });
       };