diff --git a/owner-vue/src/common/jwt.js b/owner-vue/src/common/jwt.js index 0783eb5..5c88e66 100644 --- a/owner-vue/src/common/jwt.js +++ b/owner-vue/src/common/jwt.js @@ -23,6 +23,9 @@ export default { localStorage.removeItem(EXPIRED_TIME_NAME); }, isExpired() { + if (this.getToken() == null) return true; + if (this.getExpiredTime() == null) return true; + const expiredTime = this.getExpiredTime(); const expiredMoment = moment(expiredTime); diff --git a/owner-vue/src/components/OrderCard.vue b/owner-vue/src/components/OrderCard.vue index eed4cd5..15dffad 100644 --- a/owner-vue/src/components/OrderCard.vue +++ b/owner-vue/src/components/OrderCard.vue @@ -15,7 +15,7 @@ {{ itemNames[0] }} 외 {{ itemNames.length - 1 }}건 - {{this.getOrderStatusName(orderStatus)}} + {{ orderStatus | getOrderStatusName }} {{ orderTime }} @@ -128,22 +128,6 @@ export default { console.log(error); } }, - getOrderStatusName: function(orderStatus) { - switch (orderStatus) { - case "PLACED": - return "주문신청됨"; - case "ACCEPTED": - return "주문수락됨"; - case "REJECTED": - return "주문거절됨"; - case "WAITING": - return "픽업대기중"; - case "FINISHED": - return "픽업완료됨"; - default: - break; - } - }, clickDetail: function() { alert("준비중 입니다..."); } diff --git a/owner-vue/src/main.js b/owner-vue/src/main.js index b2cbbf0..4473876 100644 --- a/owner-vue/src/main.js +++ b/owner-vue/src/main.js @@ -15,6 +15,28 @@ new Vue({ render: h => h(App) }).$mount('#app') +Vue.filter('getOrderStatusName', function (orderStatus) { + switch (orderStatus) { + case "PLACED": + return "주문신청됨"; + case "ACCEPTED": + return "주문수락됨"; + case "REJECTED": + return "주문거절됨"; + case "WAITING": + return "픽업대기중"; + case "FINISHED": + return "픽업완료됨"; + default: + break; + } +}); + +Vue.filter('currency', function (value) { + var num = new Number(value); + return num.toFixed(0).replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, "$1,") +}); + axios.interceptors.response.use( (response) => { return response; diff --git a/owner-vue/src/views/LoginUser.vue b/owner-vue/src/views/LoginUser.vue index 30884a0..5539c1a 100644 --- a/owner-vue/src/views/LoginUser.vue +++ b/owner-vue/src/views/LoginUser.vue @@ -38,9 +38,15 @@