Merge branch 'limengbo'

component/group/group.js

@@ -59,7 +59,7 @@ export const groupInit = (that) => {
   //点击换一换
   that.change = function () {
     that.data.groupData.baseIndex++;
-    if(that.data.groupData.listLength < 3 * (that.data.groupData.baseIndex)) {
+    if(that.data.groupData.listLength <= 3 * (that.data.groupData.baseIndex)) {
       that.data.groupData.baseIndex = 0;
     }
     that.setData({

component/group/group.wxml

@@ -60,6 +60,7 @@
           </view>
         </view>
     </scroll-view>
+    <!--
     <view class="Collage-bottom {{groupData.isIPX ? 'Collage-bottomx' :''}}">
       <image class="bg" src="../../static/groupImg/Rectangle_9.png"></image>
       <view bindtap="sendGroup">
@@ -71,6 +72,7 @@
         <text>我的拼团</text>
       </view>
     </view>
+    -->
   </view>
   <!--
   <view class="group-popup" bindtap="sendGroup" hidden="{{groupData.sendGroupFlag}}">

component/group/group.wxss

@@ -5,8 +5,10 @@
 .group {
     height: 100%;
     width: 100%;
+    /*
     padding-bottom: 102rpx;
     box-sizing: border-box;
+    */
 }
 
 scroll-view {

pages/groupPage/grade-details/grade-details.wxss

@@ -39,7 +39,7 @@ scroll-view {
     display: flex;
     align-items: center;
     width: 100%;
-    height: 136rpx;
+    height: 110rpx;
     background: #fff;
     position: relative;
 }

pages/groupPage/group-details/group-details.wxss

@@ -111,7 +111,7 @@ scroll-view {
     display: flex;
     align-items: center;
     width: 100%;
-    height: 136rpx;
+    height: 110rpx;
     background: #fff;
     position: relative;
 }