Merge branch 'master' into 버그픽스_상범

owner-vue/src/api/store.js

@@ -20,7 +20,8 @@ export default {
         return axios.get(process.env.VUE_APP_OWNER_SERVICE_BASEURL+'/store-service/api/owner/item/'+itemId)
     },
     saveItem(method, itemData){
-        const _url = process.env.VUE_APP_OWNER_SERVICE_BASEURL+'/store-service/api/owner/item'+(method==='put'?+"/"+itemData.itemId:'')
+        const _url = process.env.VUE_APP_OWNER_SERVICE_BASEURL+'/store-service/api/owner/item'+(method==='put'? "/"+itemData.itemId:'')
+
         return axios({
             method:method,
             url: _url,

owner-vue/src/components/MenuItem.vue

@@ -163,6 +163,7 @@ export default {
   },
   methods:{
     save : function () {
+      this.dialog =false
       this.$emit('save')
     },
     addItemOption : function (itemOptionValue,optionType){

owner-vue/src/views/Layout/DashboardLayout.vue

@@ -1,9 +1,8 @@
 <template>
   <v-app id="inspire">
-    <side-bar v-bind:drawer="drawer"></side-bar>
-    <top-bar v-on:drawEvent="drawer = !drawer"
-             :notificationCounts="notificationCounts"
-    ></top-bar>
+    <side-bar :drawer="drawer"></side-bar>
+    <top-bar @drawerEvent="drawer = !drawer"
+              :notificationCounts="notificationCounts"/>
     <v-main style="background: #f5f5f540">
       <v-container class="py-8, px-6" fluid>
         <router-view

owner-vue/src/views/Layout/Sidebar.vue

@@ -5,20 +5,9 @@
       app>
     <v-img
       height="140"
-      class="pa-4"
-      src="https://preview.pixlr.com/images/800wm/1439/2/1439104804.jpg"
-
-    >
-      <div class="text-center">
-        <v-avatar class="mb-4" color="grey darken-1" size="64">
-          <v-img
-            aspect-ratio="30"
-            src="https://yt3.ggpht.com/esazPAO03T0f0vKdByJvkDy6MSwjyG5f-c_2S2CJapszQ3KPQyZarpoqvgv0Us0atUbILytj=s88-c-k-c0x00ffffff-no-rj"
-          />
-        </v-avatar>
-        <h2 class="white--text">Web Burden</h2>
-      </div>
-    </v-img>
+      class="px-7 mx-7"
+      :src="require('@/assets/just-logo.png')"
+      contain/>
     <v-divider></v-divider>
     <v-list>
       <v-list-item v-for="(link,index) in links" :key="link.icon" link @click="clickGo(index, link.url)">
@@ -41,10 +30,10 @@ export default {
   data() {
     return {
       links: [
-        {name: "지난 주문", url: "/prev-order", icon: "mdi-home-outline"},
-        {name: "카테고리", url: "/category", icon: "mdi-magnify"},
-        {name: "주문", url: "/order", icon: "mdi-cards-heart"},
-        {name: "메뉴 관리", url: "/menu", icon: "mdi-cards-heart-outline"},
+        {name: "지난 주문", url: "/prev-order", icon: "mdi-clipboard-check-outline"},
+        {name: "카테고리", url: "/category", icon: "mdi-shape-outline"},
+        {name: "주문", url: "/order", icon: "mdi-order-numeric-ascending"},
+        {name: "메뉴 관리", url: "/menu", icon: "mdi-cog-outline"},
       ],
     };
   },