Merge branch 'feature/group-buy' into 'release/313'

Feature/group buy



See merge request !1714

@@ -66,7 +66,8 @@
                                                       data-value="{{leftTime}}">{{formatLeftTime}}</span></div>
                                                       data-value="{{leftTime}}">{{formatLeftTime}}</span></div>
                         </div>
                         </div>
 
 
-                        <a href="/activity/group/progress?activity={{activityId}}&groupNo={{groupNo}}" class='ibutton' data-value="{{groupNo}}">
+                        <a href="/activity/group/progress?activityId={{@root.result.activityId}}&groupNo={{groupNo}}"
+                           class='ibutton' data-value="{{groupNo}}">
                             立即参团
                             立即参团
                         </a>
                         </a>
                     </div>
                     </div>

@@ -184,7 +184,8 @@ class Group extends Page {
             } else {
             } else {
                 $this.addClass('active');
                 $this.addClass('active');
                 filter.showFilter();
                 filter.showFilter();
-                innerScroll.disableScroll($('body'));
+                innerScroll.disableScroll($('.classify'));
+                innerScroll.disableScroll($('.sub-classify'));
             }
             }
         } else {
         } else {
             this.selector.filterTab.children('li').removeClass('active');
             this.selector.filterTab.children('li').removeClass('active');
@@ -457,7 +458,8 @@ class Group extends Page {
                     },
                     },
                     hCbFn: () => {
                     hCbFn: () => {
                         filterTab.children('.filter').removeClass('active');
                         filterTab.children('.filter').removeClass('active');
-                        innerScroll.enableScroll($('body'));
+                        innerScroll.enableScroll($('.classify'));
+                        innerScroll.enableScroll($('.sub-classify'));
                     },
                     },
                     missStatus: true
                     missStatus: true
                 });
                 });