Authored by 郭成尧

Merge branch 'feature/growthdetail' into release/6.5.3

@@ -62,15 +62,24 @@ function droitHtml(contents) { @@ -62,15 +62,24 @@ function droitHtml(contents) {
62 }; 62 };
63 } else if (item.displayName === '购物返币') { 63 } else if (item.displayName === '购物返币') {
64 item.content = { 64 item.content = {
65 - banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/0160bd2c93e5730608a7921181eb826ab2.jpg${imageView2}` 65 + banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/0160bd2c93e5730608a7921181eb826ab2.jpg${imageView2}`,
  66 + intros: [
  67 + {title: 'Dear:', data: ['近期将针对有货的VIP会员推出购物返有货币服务,成功购物之后自动到账,服务即将开启请随时关注最新APP会员权益动态!']},
  68 + ]
66 }; 69 };
67 } else if (item.displayName === '升级礼包') { 70 } else if (item.displayName === '升级礼包') {
68 item.content = { 71 item.content = {
69 - banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/0100d72b57f8c364e69cdfeb708b5d852a.jpg${imageView2}` 72 + banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/0100d72b57f8c364e69cdfeb708b5d852a.jpg${imageView2}`,
  73 + intros: [
  74 + {title: 'Dear:', data: ['近期将针对有货的VIP会员推出专享升级礼包服务,等级提升后即可领取,服务即将开启请随时关注最新APP会员权益动态!']},
  75 + ]
70 }; 76 };
71 } else if (item.displayName === '优享客服') { 77 } else if (item.displayName === '优享客服') {
72 item.content = { 78 item.content = {
73 - banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/01ded1925ced60db1a63937bcd3afbbb1d.jpg${imageView2}` 79 + banner: `http://img11.static.yhbimg.com/sort/2018/03/26/13/01ded1925ced60db1a63937bcd3afbbb1d.jpg${imageView2}`,
  80 + intros: [
  81 + {title: 'Dear:', data: ['近期将针对有货的VIP会员推出优享客服服务,感受更优质的客服体验,服务即将开启请随时关注最新APP会员权益动态!']},
  82 + ]
74 }; 83 };
75 } 84 }
76 }); 85 });
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 </div> 28 </div>
29 {{/content.intros}} 29 {{/content.intros}}
30 </div> 30 </div>
  31 + {{#if content.interlocution}}
31 <div class="interlocution"> 32 <div class="interlocution">
32 {{#content.interlocution}} 33 {{#content.interlocution}}
33 <div class="interlocution-item"> 34 <div class="interlocution-item">
@@ -43,6 +44,7 @@ @@ -43,6 +44,7 @@
43 </div> 44 </div>
44 {{/content.interlocution}} 45 {{/content.interlocution}}
45 </div> 46 </div>
  47 + {{/if}}
46 {{else}} 48 {{else}}
47 <div class="empty">敬请期待…</div> 49 <div class="empty">敬请期待…</div>
48 {{/if}} 50 {{/if}}
@@ -323,10 +323,6 @@ class FamilyIndex extends Page { @@ -323,10 +323,6 @@ class FamilyIndex extends Page {
323 let isLogin = $this.data('login'); 323 let isLogin = $this.data('login');
324 let isNoOpen = $this.data('noopen'); 324 let isNoOpen = $this.data('noopen');
325 325
326 - if (appType === 'yohobuy') {  
327 - return;  
328 - }  
329 -  
330 if (!this.vipInfo || !this.vipInfo[appType]) { 326 if (!this.vipInfo || !this.vipInfo[appType]) {
331 this.viewVipInfo(); 327 this.viewVipInfo();
332 return false; 328 return false;
@@ -342,7 +338,7 @@ class FamilyIndex extends Page { @@ -342,7 +338,7 @@ class FamilyIndex extends Page {
342 }, true); 338 }, true);
343 } 339 }
344 340
345 - if (isLogin && !isNoOpen) { 341 + if (isLogin && !isNoOpen && appType !== 'yohobuy') {
346 this.selector.$diaC.append(this.view.vipDetailInfo(this.vipInfo[appType])); 342 this.selector.$diaC.append(this.view.vipDetailInfo(this.vipInfo[appType]));
347 343
348 $('.vip-detail').addClass(appType); 344 $('.vip-detail').addClass(appType);