Merge branch 'feature/growthdetail' of git.yoho.cn:fe/yohobuywap-node into feature/growthdetail

@@ -14,7 +14,7 @@
         <div class="calculate">
         <div class="calculate">
             <div class="calculate-item">
             <div class="calculate-item">
                 <p class="introduce">
                 <p class="introduce">
-                    您已经加入YOHO！FAMILY
+                    您已经加入YoHo!Family
                 </p>
                 </p>
                 <P class="numerical">{{registTime}} <b class="unit">天</b></P>
                 <P class="numerical">{{registTime}} <b class="unit">天</b></P>
             </div>
             </div>
@@ -29,11 +29,11 @@
                     当前成长值
                     当前成长值
                 </p>
                 </p>
                 <P class="numerical">{{growthValue}}</P>
                 <P class="numerical">{{growthValue}}</P>
-                <p class="supplement">超越了<b class="percent">{{exceedRate}}%</b>的YOHO！FAMILY成员</p>
+                <p class="supplement">超越了<b class="percent">{{exceedRate}}%</b>的YoHo!Family成员</p>
             </div>
             </div>
             <div class="calculate-item">
             <div class="calculate-item">
                 <p class="introduce">
                 <p class="introduce">
-                    您已经成为YOHO！FAMILY
+                    您已经成为YoHo!Family
                 </p>
                 </p>
                 <P class="vip-le small-font">
                 <P class="vip-le small-font">
                 {{levelInfo.title}}会员<div class="vip-ico vip-{{levelInfo.id}}"></div>
                 {{levelInfo.title}}会员<div class="vip-ico vip-{{levelInfo.id}}"></div>

@@ -323,10 +323,6 @@ class FamilyIndex extends Page {
         let isLogin = $this.data('login');
         let isLogin = $this.data('login');
         let isNoOpen = $this.data('noopen');
         let isNoOpen = $this.data('noopen');
 
 
-        if (appType === 'yohobuy') {
-            return;
-        }
-
         if (!this.vipInfo || !this.vipInfo[appType]) {
         if (!this.vipInfo || !this.vipInfo[appType]) {
             this.viewVipInfo();
             this.viewVipInfo();
             return false;
             return false;
@@ -342,7 +338,7 @@ class FamilyIndex extends Page {
             }, true);
             }, true);
         }
         }
 
 
-        if (isLogin && !isNoOpen) {
+        if (isLogin && !isNoOpen && appType !== 'yohobuy') {
             this.selector.$diaC.append(this.view.vipDetailInfo(this.vipInfo[appType]));
             this.selector.$diaC.append(this.view.vipDetailInfo(this.vipInfo[appType]));
 
 
             $('.vip-detail').addClass(appType);
             $('.vip-detail').addClass(appType);

@@ -158,6 +158,7 @@ body {
                 overflow-y: hidden;
                 overflow-y: hidden;
                 white-space: nowrap;
                 white-space: nowrap;
                 width: 100%;
                 width: 100%;
+                -webkit-overflow-scrolling: touch;
             }
             }
 
 
             .equities-text {
             .equities-text {