diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 402a6f4f..ddbdc5bb 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -836,6 +836,7 @@ MESSAGES_SEND: 'Send Messages', ADMIN_MESSAGES_SEND: 'Send System Messages', MESSAGES_SEND_BUTTON: 'Send', + MESSAGES_IS_LOADING: 'Loading messages, please wait ...', MESSAGES_IS_EMPTY: 'Messages Box is empty!', MESSAGES_FIELD: { TO: 'Send to:', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 3bc62897..8a21e194 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -836,7 +836,8 @@ MESSAGES_SEND: '发送消息', ADMIN_MESSAGES_SEND: '发送系统消息', MESSAGES_SEND_BUTTON: '发送', - MESSAGES_IS_EMPTY: '消息盒子为空!', + MESSAGES_IS_LOADING: '正在装载, 请稍候 ...', + MESSAGES_IS_EMPTY: '消息列表为空!', MESSAGES_FIELD: { TO: '发送至:', TYPE: '消息类型:', diff --git a/modules/messages/client/controllers/messages.client.controller.js b/modules/messages/client/controllers/messages.client.controller.js index 502c5916..eb2fc068 100644 --- a/modules/messages/client/controllers/messages.client.controller.js +++ b/modules/messages/client/controllers/messages.client.controller.js @@ -89,6 +89,8 @@ * getMessageList */ vm.getMessageList = function () { + vm.pagedItems = []; + vm.resultMsg = 'MESSAGES_IS_LOADING'; MessagesService.get({ type: vm.messageType, role: vm.getMessageTypeRole() @@ -123,6 +125,11 @@ var end = begin + vm.itemsPerPage; vm.pagedItems = vm.filteredItems.slice(begin, end); + if (vm.pagedItems.length === 0) { + vm.resultMsg = 'MESSAGES_IS_EMPTY' + } else { + vm.resultMsg = undefined; + } if (callback) callback(); }; diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html index 1b692937..a3ec51fe 100644 --- a/modules/messages/client/views/box.client.view.html +++ b/modules/messages/client/views/box.client.view.html @@ -46,10 +46,7 @@ -
-

{{ 'MESSAGES_IS_EMPTY' | translate }}

-
-
+
@@ -65,7 +62,14 @@ - + + + +
+
+

{{vm.resultMsg | translate}}

+
+
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html index 56dd9e3a..6dcdd60a 100644 --- a/modules/vip/client/views/vip.client.view.html +++ b/modules/vip/client/views/vip.client.view.html @@ -179,7 +179,7 @@
-

{{vm.tooltipMsg | translate}}

+

{{vm.tooltipMsg | translate}}