Merge branch 'master' into 즐겨찾기

customer-vue/.env

@@ -1,3 +1,4 @@
 VUE_APP_BASEURL=https://just-pickup.com:8080
 VUE_APP_OWNER_SERVICE_BASEURL=https://just-pickup.com:8001
-VUE_APP_CUSTOMER_SERVICE_BASEURL=https://just-pickup.com:8000
+VUE_APP_CUSTOMER_SERVICE_BASEURL=https://just-pickup.com:8000
+VUE_APP_STORE_API_URL=https://just-pickup.com:8000/store-service/api/customer

customer-vue/src/api/store.js

@@ -10,7 +10,7 @@ export default {
           page: page
         }
       }
-      return axios.get(process.env.VUE_APP_CUSTOMER_SERVICE_BASEURL+"/store-service/search-store", options);
+      return axios.get(process.env.VUE_APP_STORE_API_URL + '/store/search', options);
     },
     getCategoryList(){
         return axios.get(process.env.VUE_APP_CUSTOMER_SERVICE_BASEURL+'/store-service/category/');

customer-vue/src/views/SearchStore.vue

@@ -33,7 +33,16 @@
           ></v-img>
           <v-card-title>{{ card.name }}</v-card-title>
           <v-card-text>
-            거리 : {{ card.distance }}
+            <v-row>
+              <div class="orange--text ms-4">
+                <v-icon color="orange" dense>mdi-heart</v-icon>
+                {{ card.favoriteCounts }}
+              </div>
+              <div class="grey--text ms-4">
+                <v-icon dense>mdi-map-marker</v-icon>
+                {{ card.distance }}
+              </div>
+            </v-row>
           </v-card-text>
         </v-card>
       </v-col>
@@ -132,9 +141,10 @@ export default {
 
       stores.forEach( (store) => {
         this.cards.push({
-          storeId: store.storeId,
+          storeId: store.id,
           name: store.name,
-          distance: store.distance
+          distance: store.distance,
+          favoriteCounts: store.favoriteCounts
         })
       });
     }