Authored by 毕凯

Merge branch 'feature/grow' into 'release/5.7'

分页+-错误



See merge request !570
@@ -272,7 +272,8 @@ module.exports = class extends global.yoho.BaseModel { @@ -272,7 +272,8 @@ module.exports = class extends global.yoho.BaseModel {
272 build.push({ 272 build.push({
273 title: val.typeDesc, 273 title: val.typeDesc,
274 time: _formatDay(val.createTime * 1000), 274 time: _formatDay(val.createTime * 1000),
275 - value: val.growthValue 275 + value: val.growthValue,
  276 + plus: val.growthValue >= 0 ? true : false
276 }); 277 });
277 }); 278 });
278 279
@@ -4,6 +4,6 @@ @@ -4,6 +4,6 @@
4 <p>{{title}}</p> 4 <p>{{title}}</p>
5 <p>{{time}}</p> 5 <p>{{time}}</p>
6 </div> 6 </div>
7 - <div class="num">+{{value}}</div> 7 + <div class="num">{{#if plus}}+{{/if}}{{value}}</div>
8 </div> 8 </div>
9 {{/ detailHis}} 9 {{/ detailHis}}