fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit c7323b02b59710d14e1f41118883a63460d45ecd 2 parents d2226395 057e68a2

Merge branch 'feature/vip2' into 'release/6.6' 

msg



See merge request !1361
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
@@ -430,6 +430,7 @@ class payModel extends global.yoho.BaseModel { @@ -430,6 +430,7 @@ class payModel extends global.yoho.BaseModel {
430 resu.packageTitle = _.get(result[3], 'data.notice', ''); 430 resu.packageTitle = _.get(result[3], 'data.notice', '');
431 resu.gain_yoho_coin = _.get(result[3], 'data.gain_yoho_coin', 0); 431 resu.gain_yoho_coin = _.get(result[3], 'data.gain_yoho_coin', 0);
432 resu.growth_value = _.get(result[3], 'data.growth_value', 0); 432 resu.growth_value = _.get(result[3], 'data.growth_value', 0);
  433 + resu.msg = _.get(result[3], 'data.msg', '');
433 434
434 resu.payment = result[2].data.payment_amount; 435 resu.payment = result[2].data.payment_amount;
435 436
@@ -41,9 +41,9 @@ @@ -41,9 +41,9 @@
41 </tr> 41 </tr>
42 {{/if}} 42 {{/if}}
43 </table> 43 </table>
44 - {{#ifor gain_yoho_coin growth_value}}  
45 - <div class="growth-tip"><span class="iconfont icon-tan"></span>有货币与VIP成长值在确认收货后自动到账</div>  
46 - {{/ifor}} 44 + {{#if msg}}
  45 + <div class="growth-tip"><span class="iconfont icon-tan"></span>{{msg}}</div>
  46 + {{/if}}
47 </div> 47 </div>
48 <div class="btn-c"> 48 <div class="btn-c">
49 <a href="/">随便逛逛</a> 49 <a href="/">随便逛逛</a>