diff --git a/src/assets/data/index.js b/src/assets/data/index.js index 016f34f..2b875c9 100644 --- a/src/assets/data/index.js +++ b/src/assets/data/index.js @@ -7,14 +7,14 @@ export { adminLevelType, logOption, eventStatus, - wellType, + currencyType, blockStatus, blockSanctions, blockPeriod, blockType, caliumStatus, landSize, - userSearchType, + userType, landAuctionStatus, landSearchType, CurrencyType, diff --git a/src/assets/data/options.js b/src/assets/data/options.js index 4349ce5..915e9d3 100644 --- a/src/assets/data/options.js +++ b/src/assets/data/options.js @@ -81,7 +81,7 @@ export const landAuctionStatus = [ { value: 'FAIL', name: '실패' }, ]; -export const wellType = [ +export const currencyType = [ { value: '19010001', name: '골드' }, { value: '19010002', name: '사파이어' }, { value: '19010005', name: '루비' }, @@ -129,6 +129,7 @@ export const blockStatus = [ { value: 'EXPIRATION', name: '기간만료' }, { value: 'WAIT', name: '대기 중' }, { value: 'FAIL', name: '실패' }, + { value: 'CANCEL', name: '해지' }, ]; export const blockSanctions = [ @@ -156,11 +157,16 @@ export const blockPeriod = [ { value: 'PERMANENT', name: '영구정지' }, ]; -export const userSearchType = [ +export const userType = [ { value: 'GUID', name: 'GUID' }, { value: 'NAME', name: '닉네임' }, ]; +export const userType2 = [ + { value: 'GUID', name: 'GUID' }, + { value: 'NICKNAME', name: '닉네임' }, +]; + export const userSearchType2 = [ { value: 'GUID', name: 'GUID' }, { value: 'NICKNAME', name: '닉네임' }, diff --git a/src/assets/data/pages/itemSearch.json b/src/assets/data/pages/itemSearch.json index 32047e4..04e64a9 100644 --- a/src/assets/data/pages/itemSearch.json +++ b/src/assets/data/pages/itemSearch.json @@ -12,7 +12,7 @@ "type": "select", "id": "searchType", "label": "대상", - "optionsRef": "userSearchType", + "optionsRef": "userType", "col": 1, "required": true }, diff --git a/src/assets/data/pages/userBlockSearch.json b/src/assets/data/pages/userBlockSearch.json index 960c47c..5a0179f 100644 --- a/src/assets/data/pages/userBlockSearch.json +++ b/src/assets/data/pages/userBlockSearch.json @@ -16,7 +16,7 @@ "type": "select", "id": "searchType", "label": "대상", - "optionsRef": "userSearchType", + "optionsRef": "userType", "col": 1 }, { diff --git a/src/assets/data/pages/userBlockTable.json b/src/assets/data/pages/userBlockTable.json index 8a3b4ea..97cd2ab 100644 --- a/src/assets/data/pages/userBlockTable.json +++ b/src/assets/data/pages/userBlockTable.json @@ -11,7 +11,7 @@ "buttons": [ { "id": "delete", - "text": "선택 삭제", + "text": "선택 해지", "theme": "line", "disableWhen": "noSelection", "requiredAuth": "blackListDelete", diff --git a/src/assets/data/types.js b/src/assets/data/types.js index 8a15169..a16a1dc 100644 --- a/src/assets/data/types.js +++ b/src/assets/data/types.js @@ -119,6 +119,13 @@ export const commonStatus = { delete: "DELETE", reject: "REJECT", complete: "COMPLETE", + cancel: "CANCEL" +} + +export const customStatus = { + inprogress: "INPROGRESS", + expiration: "EXPIRATION", + } export const ViewTitleCountType = { diff --git a/src/components/DataManage/UserInventoryInfo.js b/src/components/DataManage/UserInventoryInfo.js index 212ac23..18db1cb 100644 --- a/src/components/DataManage/UserInventoryInfo.js +++ b/src/components/DataManage/UserInventoryInfo.js @@ -194,7 +194,7 @@ const UserInventoryInfo = ({ userInfo }) => { ID 아이템 보유개수 - 삭제 + {/*삭제*/} @@ -205,9 +205,9 @@ const UserInventoryInfo = ({ userInfo }) => { {el.item_id} {el.item_name} {el.count} - -