Merge remote-tracking branch 'refs/remotes/origin/feature/groupTab' into develop

@@ -6,9 +6,9 @@
                     <div id="tab-{{@index}}" data-template-name="{{../template_name}}" data-tab-name="{{tab_name}}" data-template-id="{{../template_id}}" data-index="{{@index}}" data-index-idx="{{@index}}" data-item-idx="{{@index}}" class="guess-tab first" data-query="{{queryString}}" data-code="{{resources_code}}">
                     <div id="tab-{{@index}}" data-template-name="{{../template_name}}" data-tab-name="{{tab_name}}" data-template-id="{{../template_id}}" data-index="{{@index}}" data-index-idx="{{@index}}" data-item-idx="{{@index}}" class="guess-tab first" data-query="{{queryString}}" data-code="{{resources_code}}">
                         {{#if src}}
                         {{#if src}}
                         <img class="guess-img" src="{{image2 src w=200 h=160 q=60 mode=3}}" />
                         <img class="guess-img" src="{{image2 src w=200 h=160 q=60 mode=3}}" />
-                        <div class=""></div>
+                        <div class="guess-tab-active"></div>
                         {{else}}
                         {{else}}
-                        <span class="guess-like-tab">{{tab_name}}</span>
+                        <span class="guess-like-tab guess-like-tab-active">{{tab_name}}</span>
                         {{/if}}
                         {{/if}}
                     </div>
                     </div>
                 {{^}}
                 {{^}}
@@ -24,4 +24,4 @@
             {{/each}}
             {{/each}}
         </div>
         </div>
     </div>
     </div>
-</div>
+</div>

@@ -70,8 +70,12 @@ class ResourceShowYasRpter {
         let cacheTheShowSkns = []; // 暂存此次上报的楼层，上报后复制给 lastReportSkns
         let cacheTheShowSkns = []; // 暂存此次上报的楼层，上报后复制给 lastReportSkns
         let tabParams = {};
         let tabParams = {};
 
 
+        let $tapDom = $('.guess-like-tab-active');
+
+        $tapDom = $tapDom.length ? $tapDom.parent() : $('.guess-tab-active').parent();
+
         tabParams.TAB_NAME = $('.guess-like-tab-active').parent().data('tab-name') || $('.guess-tab-active').parent().data('tab-name');
         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.TAB_ID = $tapDom.data('item-idx');
         tabParams.P_PARAM = $('.guess-like-tab-active').parent().data('code') || $('.guess-tab-active').parent().data('code');
         tabParams.P_PARAM = $('.guess-like-tab-active').parent().data('code') || $('.guess-tab-active').parent().data('code');
 
 
         $('.templates').each((floorIndex, theFloor) => {
         $('.templates').each((floorIndex, theFloor) => {

@@ -380,7 +380,7 @@ class Group extends Page {
         let tabName = $this.data('tab-name');
         let tabName = $this.data('tab-name');
 
 
         let params = {
         let params = {
-            TAB_ID: itemIdx + 1,
+            TAB_ID: itemIdx,
             TAB_NAME: tabName || '',
             TAB_NAME: tabName || '',
             ...custom_params
             ...custom_params
         };
         };
@@ -406,7 +406,7 @@ class Group extends Page {
             F_INDEX: indexIdx + 1,
             F_INDEX: indexIdx + 1,
             I_INDEX: itemIdx + 1,
             I_INDEX: itemIdx + 1,
             ACTION_URL: '', // 拼团不传
             ACTION_URL: '', // 拼团不传
-            TAB_ID: this.tabId + 1,
+            TAB_ID: this.tabId,
             TAB_NAME: this.tabName,
             TAB_NAME: this.tabName,
             P_PARAM: this.contentCode,
             P_PARAM: this.contentCode,
             ...custom_params
             ...custom_params