fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit c11a2a4bd34f86060efd971bad69761d72c17e34 2 parents b1942e1c 006126cf

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
@@ -151,7 +151,7 @@ const getMessageList = (uid, params, limit) => { @@ -151,7 +151,7 @@ const getMessageList = (uid, params, limit) => {
151 151
152 resData.messages = msg; 152 resData.messages = msg;
153 153
154 - let pagerList = setPager(_.get(result, 'data.page_total', 0), 154 + let pagerList = setPager(_.get(data, 'page_total', 1),
155 Object.assign(params, {page: page})); 155 Object.assign(params, {page: page}));
156 156
157 resData.pager = Object.assign({ 157 resData.pager = Object.assign({
@@ -15,6 +15,8 @@ var pickBusy = false; @@ -15,6 +15,8 @@ var pickBusy = false;
15 var Alert = Dialog.Alert, 15 var Alert = Dialog.Alert,
16 Confirm = Dialog.Confirm; 16 Confirm = Dialog.Confirm;
17 17
  18 +require('../common');
  19 +
18 function msgOperation(data) { 20 function msgOperation(data) {
19 if (!data) { 21 if (!data) {
20 return; 22 return;