From 473d0c67052a0399243e630d8a2d11822b028d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Fri, 12 Apr 2019 21:47:57 +0900 Subject: [PATCH] Fix: maestro type --- src/web/admin/admin_all_list.html | 4 ++-- src/web/js/lib/account_info.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/web/admin/admin_all_list.html b/src/web/admin/admin_all_list.html index d0f2385..d5dd2bb 100644 --- a/src/web/admin/admin_all_list.html +++ b/src/web/admin/admin_all_list.html @@ -94,14 +94,14 @@ for(var i = 0; i < jsonList.length; i++) { var maestroInfo = jsonList[i]; var status = accountStatus(jsonList[i].accountType, jsonList[i].activateStatus); - var statusBgColor = accountStatusColorClass(status); + var statusColorClass = accountStatusColorClass(status); var type = accountType(jsonList[i].accountType); var registerDate = jsonList[i].acceptClausesDateTime.substring(0, 10); $("#maestro_list_result_contents").append( "
" + " " - + " " + + " " + " " + " " + " " diff --git a/src/web/js/lib/account_info.js b/src/web/js/lib/account_info.js index 9f7e842..3a3c125 100644 --- a/src/web/js/lib/account_info.js +++ b/src/web/js/lib/account_info.js @@ -44,7 +44,7 @@ function accountStatus(accountType, activateStatus) { if(activateStatus == 0) return "입금대기"; else if(activateStatus == 100) - return "취소"; + return "환불"; switch(accountType) { case 1: @@ -77,11 +77,12 @@ function accountStatusColorClass(status) { case "비활성화": return " text-muted"; - case "취소": + case "환불": return " text-white bg-danger"; case "입금대기": - return " bg-warning"; + // return " text-muted bg-warning"; + return " text-warning bg-dark"; case "학생체험": case "마에체험":