Merge remote-tracking branch 'origin/feature/expandNew2' into release/6.0

@@ -185,7 +185,6 @@ module.exports = class extends global.yoho.BaseModel {
             friendInviteData.goUrl = result[0].data ? helpers.urlFormat('/reg.html', {
                 inviteCode: result[0].data.trendWord ? result[0].data.trendWord : result[0].data.inviteCode
             }) : '//m.yohobuy.com/reg.html';
-            friendInviteData.bannerUrl = _.get(result[2], 'data[0].url', '');
 
             return friendInviteData;
         });

@@ -2,9 +2,9 @@
     {{# friendInviteData}}
     <div class="banner">
         <span class="title">您的好友{{nickname}}<br><b>邀请您来有货玩潮流</b></span>
-        <a class="tip-text" href="{{bannerUrl}}">
+        <div class="tip-text">
             <img src="{{image imgSrc 636 311}}">
-        </a>
+        </div>
         <a class="btn" href="{{goUrl}}"></a>
     </div>
     <div class="recommend-goods">

@@ -174,8 +174,7 @@ const index = (params) => {
                 trendWord: _.get(result[6].data, 'trendWord', false),
                 inviteCode: _.get(result[6].data, 'inviteCode', ''),
                 trendGuidePopUpDesc: _.get(result[6].data, 'trendGuidePopUpDesc', ''),
-                bannerSrc: _.get(result[7], 'data[0].src', ''),
-                bannerUrl: _.get(result[7], 'data[0].url', '')
+                bannerSrc: _.get(result[7], 'data[0].src', '')
             });
         }
 

 <div class="set-trend-world set-trend-hide{{#if trendWord}} trend-world{{/if}}">
     <div class="back"></div>
     <div class="set-content">
-        <a class="banner" href="{{bannerUrl}}">
+        <div class="banner">
             <img src="{{image bannerSrc 540 240}}">
-        </a>
+        </div>
         <div class="main">
             <div class="title"></div>
             <textarea type="text" class="trend-world-area trend-code" placeholder="请设置15位以内的潮流口令">{{#if trendWord}}{{trendWord}}{{/if}}</textarea>

@@ -2,7 +2,7 @@
     .back {
         width: 100%;
         height: 100%;
-        position: absolute;
+        position: fixed;
         left: 0;
         right: 0;
         top: 0;
@@ -18,7 +18,7 @@
         margin-top: 205px;
         margin-left: -270px;
         background-color: #fff;
-        position: absolute;
+        position: fixed;
         top: 0;
         left: 50%;
         border-bottom-right-radius: 10px;
@@ -29,7 +29,6 @@
         .banner {
             width: 100%;
             height: 240px;
-            display: block;
         }
 
         .title {