Merge branch 'refs/heads/release/6.9.17'

@@ -225,6 +225,16 @@ class GroupService extends global.yoho.BaseModel {
         let code = indexFilter.resources_code;
 
         result.floors = code && await this.newIndex(code);
+        result.floors.map(item => {
+            if (item.template_name === 'collageBuyPrdList') {
+                item.data.data.prdList.map(listItem => {
+                 // eslint-disable-next-line max-len
+                listItem.collagedPersonNum = listItem.collagedPersonNum > 10000 ? (listItem.collagedPersonNum / 10000).toFixed(1) + '万' : listItem.collagedPersonNum;
+                return listItem;
+               });
+            }
+            return item;
+        });
         result.filterGroupList = await this.filterGroupList({
             ...query
         });

@@ -21,7 +21,7 @@
             {{/if}}
             {{> group/resources/filter-tab}}
         </div> --}}
-        <div class="goods-list-title">猜你喜欢</div>
+        {{!-- <div class="goods-list-title">猜你喜欢</div> --}}
         <div id="goodsContainer" class="goods-container">
             {{#if filterList.length}}
             <div class="new-goods-list">

-<div class="banner-top templates" data-f-name="{{template_name}}" data-f-id="{{template_id}}" data-id="{{@index}}" {{#ifcond is_extend '!==' '1'}}style="margin: 0 15px"{{/ifcond}}>
+<div class="banner-top templates  {{#ifcond is_extend '!==' '1'}}pad{{/ifcond}}" data-num="{{data.length}}" data-f-name="{{template_name}}" data-f-id="{{template_id}}" data-id="{{@index}}">
     <div class="banner-swiper swiper-container">
         <ul class="swiper-wrapper">
             {{#each data}}

 {{#data}}
-<div class="split-image templates" data-id="{{@index}}" data-f-name="{{../template_name}}" data-f-id="{{../template_id}}" {{#ifcond ../is_extend '!==' '1'}}style="margin: 0 15px"{{/ifcond}}>
+<div class="split-image templates {{#ifcond ../is_extend '!==' '1'}}pad{{/ifcond}}" data-id="{{@index}}" data-f-name="{{../template_name}}" data-f-id="{{../template_id}}">
 <img src="{{image2 src w=../image_width h=../image_height q=60 mode=3}}"></img>
 <div class='url-content'>
     {{#each urls}}

@@ -88,6 +88,7 @@
     "uglifyjs-webpack-plugin": "^2.1.3",
     "urlencode": "^1.1.0",
     "uuid": "^3.2.1",
+    "vue-loader": "^15.8.1",
     "xml2js": "^0.4.19",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",

+/* eslint-disable max-len */
 
 import qs from 'yoho-qs';
 const yoho = require('js/yoho-app');
@@ -69,9 +70,9 @@ class ResourceShowYasRpter {
         let cacheTheShowSkns = []; // 暂存此次上报的楼层，上报后复制给 lastReportSkns
         let tabParams = {};
 
-        tabParams.TAB_NAME = $('.guess-like-tab-active').parent().data('tab-name');
-        tabParams.TAB_ID = $('.guess-like-tab-active').parent().data('item-idx') + 1;
-        tabParams.P_PARAM = $('.guess-like-tab-active').parent().data('code');
+        tabParams.TAB_NAME = $('.guess-like-tab-active').parent().data('tab-name') || $('.guess-tab-active').parent().data('tab-name');
+        tabParams.TAB_ID = $('.guess-like-tab-active').parent().data('item-idx') + 1 || $('.guess-tab-active').parent().data('item-idx') + 1;
+        tabParams.P_PARAM = $('.guess-like-tab-active').parent().data('code') || $('.guess-tab-active').parent().data('code');
 
         $('.templates').each((floorIndex, theFloor) => {
             let $theFloor = $(theFloor);
@@ -86,19 +87,46 @@ class ResourceShowYasRpter {
             if ($.inviewport($theFloor, { threshold: 0 })) {
                 // 楼层可见
                 $theFloor.find('ul > li').each((aIndex, theA) => {
-                    let $theA = $(theA);
-                    let href = $theA.attr('data-href');
-
-                    F_INDEX = $theFloor.data('id') + 1;
-
-                    if ($.inviewport($theA, { threshold: 0 }) && href) {
-                        floorsRawArr.push({
-                            href: href,
-                            I_INDEX: aIndex + 1,
-                            F_INDEX,
-                            F_ID,
-                            F_NAME
-                        });
+                    if (F_NAME === 'focus') {
+                        let len = $theFloor.data('num');
+
+                        if (aIndex > 0 && aIndex < len + 1) { // 轮播loop会复制swiper元素 需截取
+                            let $theA = $(theA);
+                            let href = $theA.attr('data-href');
+                            let iIndex = $theA.data('item-idx');
+
+                            F_INDEX = $theFloor.data('id') + 1;
+
+                            if ($.inviewport($theA, {
+                                    threshold: 0
+                                }) && href) {
+                                floorsRawArr.push({
+                                    href: href,
+                                    I_INDEX: iIndex + 1,
+                                    F_INDEX,
+                                    F_ID,
+                                    F_NAME
+                                });
+                            }
+                        }
+                    } else {
+                        let $theA = $(theA);
+                        let href = $theA.attr('data-href');
+                        let iIndex = $theA.data('item-idx');
+
+                        F_INDEX = $theFloor.data('id') + 1;
+
+                        if ($.inviewport($theA, {
+                                threshold: 0
+                            }) && href) {
+                            floorsRawArr.push({
+                                href: href,
+                                I_INDEX: iIndex + 1,
+                                F_INDEX,
+                                F_ID,
+                                F_NAME
+                            });
+                        }
                     }
                 });
 

@@ -239,9 +239,8 @@ class Group extends Page {
             this.sendCustomInfo($this, {
                 F_ID: this.templateId,
                 F_NAME: this.templateName,
-                TAB_ID: this.tabId,
-                TAB_NAME: this.tabName,
-                F_INDEX: this.indexIdx
+                F_INDEX: this.indexIdx,
+                PRD_SKN: productSkn
             });
         }
 
@@ -274,7 +273,7 @@ class Group extends Page {
         let tabName = $this.data('tab-name');
         let templateName = $this.data('template-name');
         let templateId = $this.data('template-id');
-        let indexIdx = $this.data('index-idx');
+        let itemIdx = $this.data('item-idx');
         let queryObject = {};
         let newNavType = this.judgeNavType(this.newFilterTab);
         let newNav = this.newNavInfo[newNavType];
@@ -282,8 +281,8 @@ class Group extends Page {
         this.tabName = tabName;
         this.templateId = templateId;
         this.templateName = templateName;
-        this.tabId = indexIdx;
-        this.contentCode = code;
+        this.tabId = itemIdx;
+        this.contentCode = code || '';
         let stateObj = {
             tab_name: this.tabName,
             index_idx: this.indexIdx,
@@ -402,7 +401,7 @@ class Group extends Page {
 
         let params = {
             P_NAME: this.getPname(),
-            F_ID: templateId,
+            F_ID: templateId || 0,
             F_NAME: templateName,
             F_INDEX: indexIdx + 1,
             I_INDEX: itemIdx + 1,
@@ -774,8 +773,8 @@ class Group extends Page {
     renderMoreData(list, isLoad) {
         let appendHtml = '';
 
-        list.forEach(item => {
-            appendHtml += groupListItem(item);
+        list.forEach((item, index) => {
+            appendHtml += groupListItem(item, index);
         });
         if (isLoad) {
             $('.new-goods-list').append(appendHtml);

@@ -38,6 +38,10 @@
     }
 }
 
+.pad {
+    margin: 0 20px;
+}
+
 .banner-swiper {
     position: static;
     max-height: 312px;

@@ -43,15 +43,16 @@
     }
 
     .guess-like-tab {
-        width: 160px;
+        width: 140px;
         line-height: 88px;
         text-align: center;
         font-size: 28px;
+        font-weight: 600;
         color: #b0b0b0;
     }
 
     .guess-like-tab-active {
-        font-size: 32px;
+        font-size: 34px;
         font-weight: bold;
         color: #222;
     }

@@ -27,3 +27,7 @@
         }
     }
 }
+
+.pad {
+    margin: 0 20px;
+}

@@ -13,12 +13,12 @@
 
 .group {
     .resources {
-        background-color: #fff;
+        background-color: #f5f5f5;
         margin-bottom: 90px;
     }
 
     .tab-content {
-        padding-top: 80px;
+        padding-top: 88px;
     }
 
     .bottom {

@@ -57,7 +57,7 @@
         font-family: PingFang-SC-Regular, sans-serif;
         color: #222;
         letter-spacing: 0;
-        line-height: 30px;
+        line-height: 1.6;
         font-size: 28px;
         display: -webkit-box;
         overflow: hidden;
@@ -71,13 +71,13 @@
     .new-group-invite,
     .new-group-free-post1 {
         padding: 0 10px;
-        height: 30px;
+        height: 32px;
         font-size: 18px;
         color: #fff;
         background-color: #ff575c;
         text-align: center;
-        line-height: 30px;
-        border-radius: 30px;
+        line-height: 32px;
+        border-radius: 32px;
         margin-right: 10px;
     }
 
@@ -102,6 +102,7 @@
         background: url("img/activity/group/group/go-group@3x.png") no-repeat;
         background-size: contain;
         left: -5px;
+        margin-bottom: 10px;
     }
 
     .group-free-number {
@@ -114,8 +115,8 @@
         font-family: PingFang-SC-Regular, sans-serif;
         letter-spacing: 0;
         box-sizing: border-box;
-        height: 30px;
-        line-height: 30px;
+        height: 32px;
+        line-height: 32px;
         padding-left: 10px;
         padding-right: 10px;
         border-radius: 15px;
@@ -126,7 +127,7 @@
     .forcefontsize10 {
         display: inline-block;
         font-size: 18px;
-        font-weight: 1000;
+        // font-weight: 1000;
     }
 
     .new-group-prict-bg {
@@ -151,9 +152,13 @@
         margin-bottom: 4px;
     }
 
+    .new-group-people-numer {
+        font-size: 24px;
+    }
+
     .new-group-price-collage {
         margin-left: 10px;
-        font-size: 30px;
+        font-size: 36px;
         font-weight: bold;
         font-family: BrownStd-Bold, sans-serif;
     }
@@ -166,7 +171,7 @@
 
     .new-group-price-market {
         font-family: PingFang-SC-Regular, sans-serif;
-        font-size: 22px;
+        font-size: 24px;
         color: #b0b0b0;
     }