Authored by htoooth

Merge remote-tracking branch 'origin/release/5.4' into release/5.4

... ... @@ -151,7 +151,7 @@ const getMessageList = (uid, params, limit) => {
resData.messages = msg;
let pagerList = setPager(_.get(result, 'data.page_total', 0),
let pagerList = setPager(_.get(data, 'page_total', 1),
Object.assign(params, {page: page}));
resData.pager = Object.assign({
... ...
... ... @@ -15,6 +15,8 @@ var pickBusy = false;
var Alert = Dialog.Alert,
Confirm = Dialog.Confirm;
require('../common');
function msgOperation(data) {
if (!data) {
return;
... ...