1

pages/groupPage/collage-details/collage-details.js

@@ -156,32 +156,6 @@ Page({
           // joinUserList: this.data.joinUserList
         })
       }
-      /** 
-       * 话术判断
-       * */
-
-      // if(this.data.hosterUid === groupOrder.organizer){
-      //     console.log('团长本人浏览')
-      // }
-      // 如果是助力团 并且是非团员浏览
-      // res.data.data.joinUserList.forEach(item => {
-      //     if(item)
-      // });
-      // let text = '即可获得本课程三年使用权';
-      // const joinUserList = res.data.data.joinUserList;
-      // for (let i = 0; index < joinUserList; i++) {
-      //   const item = this.data.hosterUid;
-      //   if (this.data.hosterUid === groupOrder.organizer) {
-      //     console.log('团长本人浏览')
-      //     text = '即可获得本课程三年使用权'
-      //     return;
-      //   }
-      //   if(item.uid === hosterUid){
-      //       if(groupOrder.os === 'IOS'){
-      //         text = `即可助力团长`
-      //       }
-      //   }
-      // }
     })
   },
   /**

pages/groupPage/collage-details/collage-details.wxss

@@ -171,6 +171,7 @@
     margin: 0 auto 20rpx;
 }
 
+
 .invitation-btn image {
     position: absolute;
     left: 0;

pages/groupPage/group-details/group-details.js

@@ -30,9 +30,6 @@ Page({
     organizer: '',
     hide: true,
     isIPX: app.globalData.isIPX,
-    bookList: [],
-    sendGroupFlag: true,
-    selectFlag: [],
     flag: true,
     colonelName: '',
     article: '',
@@ -61,7 +58,10 @@ Page({
     // damnDialogLine2:'',
     damnDialogShow: false,
     knowFlag: true,
-    menuFlag: false
+    menuFlag: false,
+    ifGroupSuccessed: false,
+    groupOSType:'IOS',
+    hideBottomBtn: true
   },
   //tab切换
   //tab切换
@@ -87,52 +87,8 @@ Page({
     //登录页信息
     this.onLoad(this.data.onLoadOption);
   },
-  // 审核一定要通过啊
-  //发起团购
-  sendGroup: function () {
-    this.setData({
-      sendGroupFlag: !this.data.sendGroupFlag
-    })
-  },
-  //选中团购课程
-  selectImg: function ({
-    currentTarget
-  }) {
-    const ind = currentTarget.dataset.ind;
-    //判断单选
-    this.data.selectFlag.forEach((item, index) => {
-      if (index == ind) {
-        this.data.selectFlag[ind] = !this.data.selectFlag[ind];
-      } else {
-        this.data.selectFlag[index] = true;
-      }
-    })
-    this.setData({
-      selectFlag: this.data.selectFlag
-    })
-  },
-  //点击确定
-  sure: function () {
-    this.data.selectFlag.forEach((item, index) => {
-      if (!item) {
-        const productId = this.data.bookList[index].id;
-        const title = this.data.bookList[index].title
-        this.setData({
-          sendGroupFlag: !this.data.sendGroupFlag
-        })
-        wx.navigateTo({
-          url: `/pages/groupPage/grade-details/grade-details?productId=${productId}&title=${title}`
-        })
-      }
-    })
-
-  },
   //参团
   jionGroup: function (e) {
-    // if (app.globalData.isIOS) {
-    //   this.showAlert();
-    //   return;
-    // }
     console.log(this.data.haveTapJoin)
     if (this.data.haveTapJoin) {
       return false
@@ -147,24 +103,6 @@ Page({
     httpRequestApi.JoinGroupPurchas(orderId, formId).success((res) => {
       console.log('参加团购', res);
       if (res.data.message) {
-        // if (res.data.code === 801) {
-        //   this.setData({
-        //     isModalShow: true,
-        //     modalType: 'text'
-        //   })
-        // } else {
-        //   wx.showModal({
-        //     title: '提示',
-        //     content: res.data.message,
-        //     success(res) {
-        //       if (res.confirm) {
-        //         console.log('用户点击确定')
-        //       } else if (res.cancel) {
-        //         console.log('用户点击取消')
-        //       }
-        //     }
-        //   })
-        // }
         switch (res.data.code) {
           case 801:
             this.setData({
@@ -175,27 +113,20 @@ Page({
             break;
           case 802:
             this.setData({
-              // damnDialogLine1:'您已拥有本课程使用权',
-              // damnDialogLine2:'快去朗读吧',
               damnDialogShow: true,
               haveTapJoin: false
             })
             break;
           case 806:
-          console.log(this.data.haveTapJoin)
+            console.log(this.data.haveTapJoin)
             wx.pageScrollTo({
               scrollTop: 0,
               duration: 17
             })
             this.setData({
-              // isModalShow: true,
-              // modalType: 'text'
               alertFlag: true,
               haveTapJoin: false
             })
-            // wx.navigateTo({
-            //   url:'/pages/groupPage/my-group/my-group'
-            // })
             break;
           default:
             wx.showModal({
@@ -218,13 +149,10 @@ Page({
       }
       //掉起支付
       if (res.data.data.groupPurchaseOrder.os === 'IOS') {
-        this.jionSuccess(res.data.data.groupPurchaseOrder.id, 'join');
+        this.getGroupInfo(res.data.data.groupPurchaseOrder.id);
       } else {
-        this.prePayMap(res.data.data.prePayMap, 'join');
+        this.prePayMap(res.data.data.prePayMap);
       }
-
-    }).fail((error) => {
-
     })
   },
   showAlert: function () {
@@ -233,13 +161,8 @@ Page({
     })
   },
   //支付
-  prePayMap: function (prePayMap, type) {
+  prePayMap: function (prePayMap) {
     console.log(prePayMap)
-
-    // const that = this;
-    this.setData({
-      joinGroupType: type
-    })
     wx.requestPayment({
       'appId': prePayMap.appId,
       'timeStamp': prePayMap.timeStamp,
@@ -248,31 +171,10 @@ Page({
       'signType': 'MD5',
       'paySign': prePayMap.sign,
       'success': res => {
-        console.log('支付成功')
         this.setData({
           isModalShow: true,
           haveTapJoin: false
         })
-        // const type1 = type;
-        // wx.showModal({
-        //   title: '提示',
-        //   content: '支付成功',
-        //   success(res) {
-        //     //获取拼团信息
-        //     console.log(that.data.orderId)
-        //     wx.showLoading({
-        //       title: '支付查询中...',
-        //       mask: true
-        //     })
-        //     setTimeout(() => {
-        //       wx.hideLoading();
-        //       console.log(that.data.orderId)
-        //       that.jionSuccess(that.data.orderId, type1);
-        //       // that.groupSuccess(orderId, detailId);
-        //     }, 800)
-        //   }
-        // })
-
       },
       'fail': res => {
         console.log('支付失败', res)
@@ -283,170 +185,50 @@ Page({
     })
   },
   //拼团详情
-  jionSuccess: function (orderId, type) {
+  getGroupInfo: function (orderId) {
     httpRequestApi.getMygroupInfo(orderId).success(res => {
-      this.data.surplusList = [];
-      // 通过分享进入的用户，如果已经参加过本次团购，则跳转进入邀请好友的页面
-      console.log(res)
-      // if (this.data.goBackHome) {
-      const joinUser = res.data.data.joinUserList;
-      const groupId = res.data.data.groupPurchaseOrder.id;
-      const myUid = wx.getStorageSync('uid');
-      this.setData({
-        haveTapJoin: false
-      })
-      if (myUid === res.data.data.organizer.uid) {
-        wx.redirectTo({
-          url: `../collage-details/collage-details?orderId=${groupId}&goBackHome=${this.data.goBackHome}`
-        })
-        return;
-      }
-      joinUser.forEach(item => {
-        if (item.uid === myUid) {
-          wx.redirectTo({
-            url: `../collage-details/collage-details?orderId=${groupId}&goBackHome=${this.data.goBackHome}`
-          })
-          return;
-        }
-      })
-      // }
-
-      console.log('拼团详情', res);
       const groupOrder = res.data.data.groupPurchaseOrder;
       const surplusNum = groupOrder.headcount - groupOrder.joinCount;
-      if (this.data.article === '') {
-        this.getBooksInfo(res.data.data.groupPurchaseOrder.productId)
-      }
       this.setData({
-        organizer: groupOrder.organizer,
-        productId: res.data.data.groupPurchaseOrder.productId
+        organizerUid: groupOrder.organizer,
+        ifGroupSuccessed: groupOrder.status === 'SUCCESSED' ? true : false
       })
       for (var i = 0; i < surplusNum; i++) {
         this.data.surplusList.push(1);
       }
-      if (type === 'join') {
-        // this.data.surplusList.pop();
-        if (groupOrder.status === 'SUCCESSED') {
-          this.showSuccess(groupOrder.organizer, groupOrder.organizerPrice)
-        } else {
-          this.goToDetail(groupOrder.id)
-        }
-      } else if (type === 'create') {
-        this.showSuccess(groupOrder.organizer, groupOrder.organizerPrice)
-        this.setData({
-          orderId: groupOrder.id
-        })
-      } else {
-        // for (var i = 0; i < surplusNum; i++) {
-        //   this.data.surplusList.push(1);
-        // }
-      }
-      let timeList = [];
-      // || groupOrder.status ==='SUCCESSED'
+      // 剩余时间 如果团购已结束则不显示
+      let timeLast = '';
       const stillGoing = groupOrder.closeTime - Date.parse(new Date()) <= 0 ? false : true
       if (stillGoing) {
-        timeList = util.lastHoursInGroup(groupOrder.closeTime - Date.parse(new Date()));
-        console.log(timeList)
-      }
-      // 分享进来的并且团购失效 就跳转到详情页面
-      // if(this.data.goBackHome && (surplusNum ===0 || !stillGoing) ){
-      //   console.log(' productID>>>>>>>>>>>>>>>>'+ res.data.data.groupPurchaseOrder.productId)
-      //   wx.navigateTo({
-      //     url: `/pages/groupPage/grade-details/grade-details?productId=${res.data.data.groupPurchaseOrder.productId}`
-      //   })
-      // }
-      // const groupStatus = false;
-      if (groupOrder.status === 'SUCCESSED') {
-        this.data.groupStatus = true
+        timeLast = util.lastHours(groupOrder.closeTime - Date.parse(new Date()));
       }
       this.setData({
+        groupPurchaseInfo: res.data.data.groupPurchaseInfo,
+        organizer: res.data.data.organizer,
         surplusNum,
         joinUserList: res.data.data.joinUserList,
         surplusList: this.data.surplusList,
-        timeList,
+        timeLast,
         stillGoing,
-        groupStatus: this.data.groupStatus,
+        productId: groupOrder.productId,
+        groupId: groupOrder.groupId,
+        rewardMoney: res.data.data.groupPurchaseInfo.organizerPrice / 100,
         dataLoading: false,
-        groupOSType: groupOrder.os,
+        groupOsType: groupOrder.os,
         isLoading: false
-      }, () => {
-        if (groupOrder.os === 'ANDROID' && app.globalData.isIOS) {
-          wx.redirectTo({
-            url: `/pages/groupPage/grade-details/grade-details?productId=${res.data.data.groupPurchaseOrder.productId}&goBackHome=1`
-          })
-        }
       })
-
+      if (this.data.article === '') {
+        this.getBooksInfo(res.data.data.groupPurchaseOrder.productId)
+      }
       if (groupOrder.groupType === 'PROMOTION') {
-        //this.data.joinUserList.unshift(res.data.data.organizer);
-        this.setData({
-          colonelName: res.data.data.organizer.wechatName
-        })
-        //this.data.surplusList.pop();
         this.setData({
-          joinUserList: this.data.joinUserList,
-          //surplusList: this.data.surplusList,
-          surplusNum: this.data.surplusNum
+          colonelName: res.data.data.organizer.wechatName,
+          promotion: true
+          // joinUserList: this.data.joinUserList
         })
       }
-
-    }).fail(error => {
-      console.log('错误', error)
     })
-  },
-  // 弹成功信息框
-  showSuccess: function (organizerUid, price) {
-    if (wx.getStorageSync('uid') == organizerUid) {
-      this.setData({
-        typeOf: 'success',
-        titles: '恭喜 !',
-        headTextOne: '您发起的团购拼团成功',
-        headTextTwo: '领袖体质魅力无穷！',
-        content: [{
-            text: " 您可以继续发起新的团购，",
-            color: "#F97800"
-          },
-          {
-            text: " 不再需要支付本课程费用",
-            color: "#F97800"
-          },
-          {
-            text: `拼团成功，您将得到奖学金`,
-            color: "#F97800"
-          }
-        ],
-        btnContent: '再接再厉 赚奖学金'
-      }, () => {
-        this.popup.close()
-      })
-    } else {
-      this.setData({
-        typeOf: 'success',
-        titles: '拼团成功 ! ',
-        headTextOne: '您参与的团购拼团成功',
-        headTextTwo: '感谢团长的分享',
-        content: [{
-            text: " 您也可以发起新的团购",
-            color: "#F97800"
-          },
-          {
-            text: "作为新的发起人",
-            color: "#F97800"
-          },
-          {
-            text: " 您无需在支付本课程费用 ",
-            color: "#F97800"
-          },
-          {
-            text: `拼团成功，您将得到奖学金`,
-            color: "#F97800"
-          }
-        ],
-        btnContent: '我也试试 赚奖学金'
-      }, () => {
-        this.popup.close()
-      })
-    }
+
   },
   // 去详情页面
   goToDetail: function (detailId) {
@@ -509,14 +291,14 @@ Page({
         this.setData({
           orderId
         })
-        this.jionSuccess(orderId);
+        this.getGroupInfo(orderId);
       } else {
         // 从分享页面进入的
         const orderId = options.productId ? options.productId : options.scene ? options.scene.replace('QR', '') : options.shareId;
         this.setData({
           orderId
         })
-        this.jionSuccess(orderId);
+        this.getGroupInfo(orderId);
       }
       if (options.scene || options.shareId) {
         this.setData({
@@ -531,7 +313,25 @@ Page({
       })
       return;
     });
-
+  },
+  // 页面滚动
+  pageScroll: function(e){
+    console.log(e.target.offsetTop)
+    if(e.target.offsetTop < 600){
+      this.setData({
+        hideBottomBtn: true
+      })
+    }
+    if(e.target.offsetTop > 600){
+      this.setData({
+        hideBottomBtn: false
+      })
+    }
+    // if(e.target.offsetTop > 600){
+    //   this.setData({
+    //     btnClass: 'middle-btn'
+    //   })
+    // }
   },
   // 鉴权
   areYouSuperSecond: function (productId) {
@@ -550,7 +350,7 @@ Page({
     this.setData({
       surplusList: []
     }, () => {
-      this.jionSuccess(this.data.orderId);
+      this.getGroupInfo(this.data.orderId);
     })
     wx.showNavigationBarLoading() //在标题栏中显示加载
     //模拟加载
@@ -591,19 +391,19 @@ Page({
     }).fail((error) => {
 
     })
-    //全部课本
-    httpRequestApi.getAllBooks(1, 10).success((res) => {
-      console.log('全部课', res.data.data.list)
-      res.data.data.list.forEach(element => {
-        this.data.selectFlag.push(true);
-      });
-      this.setData({
-        bookList: res.data.data.list,
-        selectFlag: this.data.selectFlag
-      })
-    }).fail((error) => {
-      console.log('错误', error)
-    })
+    // //全部课本
+    // httpRequestApi.getAllBooks(1, 10).success((res) => {
+    //   console.log('全部课', res.data.data.list)
+    //   res.data.data.list.forEach(element => {
+    //     this.data.selectFlag.push(true);
+    //   });
+    //   this.setData({
+    //     bookList: res.data.data.list,
+    //     selectFlag: this.data.selectFlag
+    //   })
+    // }).fail((error) => {
+    //   console.log('错误', error)
+    // })
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -619,7 +419,7 @@ Page({
       isModalShow: false
     })
     if (this.data.modalType === 'image') {
-      this.jionSuccess(this.data.orderId, this.data.joinGroupType);
+      this.goToDetail();
     }
 
   },
@@ -628,7 +428,7 @@ Page({
       isModalShow: false
     })
     if (this.data.modalType === 'image') {
-      this.jionSuccess(this.data.orderId, this.data.joinGroupType);
+      this.goToDetail();
     }
   },
 })

pages/groupPage/group-details/group-details.wxml

@@ -1,131 +1,136 @@
-<!--pages/group-details/group-details.wxml-->
-<view class="group-details">
+<!-- pages/group-details/group-details.wxml -->
+<view class="group-details" ontouchmove="pageScroll" enable-back-to-top="{{true}}" >
     <view class="loading" wx:if="{{isLoading}}">
         <view class="loading-text">Loading...</view>
     </view>
-    <view class="details-head" bindtap="collage" wx:if="{{!isLoading}}">
+    <view class="green-placerholder"></view>
+    <image class="class-icon" src="{{groupPurchaseInfo.bgImg}}" />
+    团成功{{ifGroupSuccessed}}
+    团继续{{stillGoing}}
+    团类型{{groupOsType}}
+    剩余时间{{timeLast}}
+    剩余人数{{surplusNum}}
+    <view class="details-head">
+        <!-- 剩余时间盒子 -->
+        <view class="last-time-box" wx:if="{{!dataLoading}}">
+            <view class="last-time">
+                <image class="left-icon" src="../../../static/groupImg/right_icon.png" />
+                <text class="last-time-end">距结束</text>
+                <image class="right-icon" src="../../../static/groupImg/left_icon.png" />
+            </view>
+            <view class="last-text">{{timeLast}}</view>
+        </view>
+        <!-- 还剩几人参团 -->
+        <view class="last-member" wx:if="{{!ifGroupSuccessed}}">
+            <view class="group-regular-text" hidden="{{surplusNum == '0' || !stillGoing}}">
+                <view wx:if="{{surplusNum == '2'}}">
+                    你{{groupOsType === 'IOS' ? '助力' : '参团'}}后，就还差
+                    <text class="red-text">1</text>
+                    位
+                </view>
+                <view wx:else>
+                    还剩
+                    <text class="red-text">{{surplusNum}}</text>
+                    位好友{{groupOsType === 'IOS' ? '助力' : '参团'}}
+                </view>
+            </view>
+            <view class="group-organizer group-regular-text">
+                <!-- ios分销团提示小红花 安卓分销团提示获得本课 -->
+                <view wx:if="{{groupOsType === 'IOS'}}">
+                    即可助力团长
+                    <text class="red-text">{{organizer.wechatName}}</text>
+                    获得本课
+                </view>
+                <view wx:if="{{groupOsType === 'ANDROID'}}">即可拼团成功</view>
+                <view wx:if="{{groupOsType === 'IOS' && colonelName}}">
+                    即可获得300朵
+                    <image src="../../../static/image/flower_small.png" />
+                </view>
+            </view>
+            <view class="group-regular-text" hidden="{{stillGoing}}">团购已超过时限</view>
+            <view class="group-regular-text" hidden="{{surplusNum != '0'}}">
+                {{groupOsType === 'IOS' ? '助力' : '团购'}}成功!快去朗读吧
+            </view>
+        </view>
+        <!-- 头像 -->
         <view class="headImg">
             <block wx:for="{{joinUserList}}" wx:key="{{index}}">
-                <view class="headImg-item {{organizer == item.uid ? 'bg-boder' : ''}}">
-                    <image wx:if="{{organizer == item.uid}}" class="tuanzhangIcon" src="../../../static/groupImg/tuanzhangIcon.png"></image>
+                <view class="headImg-item bg-boder">
+                    <view wx:if="{{organizerUid == item.uid}}" class="organizerIcon">团长</view>
                     <image src="{{item.avatar}}"></image>
                 </view>
             </block>
             <block wx:for="{{surplusList}}" wx:key="{{index}}">
                 <view class="headImg-item">
                     <image src="../../../static/groupImg/no_head.png"></image>
-                </view>  
-            </block>                      
+                </view>
+            </block>
         </view>
         <view class="data-loading" wx:if="{{dataLoading}}">
-                <view class="line1"></view>
-                <view class="line2"></view>
-                <view class="line3"></view>
-            </view>
-        <view class="shengyu" wx:if="{{!dataLoading}}">
-            
-            <view class="shengyu-num" wx:if="{{colonelName}}">团长{{colonelName}}发起{{groupOSType === 'IOS' ? '助力' : '拼团'}}</view>
-            <view class="shengyu-num"  hidden="{{surplusNum == '0' || !stillGoing || groupStatus}}">仅剩<text>{{surplusNum}}</text>个名额就{{groupOSType === 'IOS' ? '助力' : '拼团'}}成功了</view>
-            <view class="shengyu-num" hidden="{{stillGoing}}">团购已超过时限</view>
-            <view class="shengyu-num" hidden="{{surplusNum != '0'}}">{{groupOSType === 'IOS' ? '助力' : '拼团'}}成功!</view>
-            <view class="shengyu-time" hidden="{{!stillGoing || groupStatus}}">
-                剩余时间:
-                <block wx:for="{{timeList[0]}}" wx:key="{{index}}">
-                    <view class="time">
-                        <text>{{item}}</text>
-                    </view>
-                </block>
-                小时
-                <block wx:for="{{timeList[1]}}" wx:key="{{index}}">
-                    <view class="time">
-                        <text>{{item}}</text>
-                    </view>
-                </block>
-                分钟       
-                <!-- <block wx:for="{{timeList[2]}}" wx:key="{{index}}">
-                    <view class="time">
-                        <text>{{item}}</text>
-                    </view>
-                </block>                
-                分              -->
-            </view>
+            <view class="line1"></view>
+            <view class="line2"></view>
+            <view class="line3"></view>
         </view>
-    </view>
-    <scroll-view scroll-y="{{true}}" wx:if="{{!isLoading}}">
-        <view class="grade-details" bindtap="gradeDetails">
-            <image src="{{titleIcon}}" ></image>
+        <view class="invitation-btn" bindtap="jionGroup">
+            <text>我要助力</text>
         </view>
+    </view>
+    <view scroll-y="{{true}}" wx:if="{{!isLoading}}">
         <view class="catalog">
-            <!-- <image class="bg2" src="../../../static/groupImg/Rectangle_9.png"></image>  -->
             <view class="switch {{knowFlag ? 'select' : ''}}" data-flag="know" bindtap="tabSwitch">
-                <image src="../../../static/image/know_menu_bg.jpg" wx:if="{{knowFlag}}"></image> 
-                <text >您需要知道</text>  
+                <image src="../../../static/image/know_menu_bg.jpg" wx:if="{{knowFlag}}"></image>
+                <text>您需要知道</text>
             </view>
-              
             <view class="switch {{menuFlag ? 'select' : ''}}" bindtap="tabSwitch" data-flag="menu" bindtap="tabSwitch">
-                <image src="../../../static/image/know_menu_bg.jpg" wx:if="{{menuFlag}}"></image> 
-                <text >课文目录</text>  
+                <image src="../../../static/image/know_menu_bg.jpg" wx:if="{{menuFlag}}"></image>
+                <text>课文目录</text>
             </view>
         </view>
         <view class="catalog-list" hidden="{{!menuFlag}}">
             <view class="catalog-item" wx:for="{{lessonList}}" wx:key="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToClass">
                 <text class="left">{{item.title}}</text>
                 <view class="right">
-            
-                    <image  src="../../../static/image/to.png"></image>
+                    <image src="../../../static/image/to.png"></image>
                 </view>
-            </view>           
+            </view>
         </view>
         <view class="know" hidden="{{!knowFlag}}">
-         <import src="../../../towxml/entry.wxml" />
+            <import src="../../../towxml/entry.wxml" />
             <template is="entry" data="{{...article}}" />
         </view>
-    </scroll-view>
-    <!-- 底部按钮 -->
-    <view class="group-details-btn {{isIPX ? 'bottomx' :''}}" hidden="{{surplusNum == '0' || !stillGoing }}" wx:if="{{!isLoading && (groupOSType === 'ANDROID') }}">
-          <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
-        <view class="left-btn" bindtap="sendGroup">
-            开团
-        </view>
-        <form class="right-btn {{isIPX ? 'bottomx' :''}}" report-submit="{{formIsANAsshole}}" bindsubmit="jionGroup">
-            参团
-            <button class="formBtn" form-type="submit"></button>
-        </form>
     </view>
-    <view class="group-details-btn {{isIPX ? 'bottomx' :''}}" hidden="{{stillGoing }}" wx:if="{{!isIOS}}">
-          <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
-        <view class="only-one-btn" bindtap="sendGroup">
-            重新开团
-        </view>
-    </view>
-    <!-- ios界面的底部按钮 -->
-    <view class="group-details-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{groupOSType === 'IOS' && stillGoing && !groupStatus }}">
-          <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
-        
-        <form class="only-one-btn {{isIPX ? 'bottomx' :''}}" report-submit="{{formIsANAsshole}}" bindsubmit="jionGroup">
-            我来助力！获得七天试用权
-            <button class="formBtn" form-type="submit"></button>
-        </form>
-    </view>
-    <!-- <view class="group-details-btn {{isIPX ? 'bottomx' :''}}" hidden="{{surplusNum == '0' || !stillGoing }}" wx:if="{{!isLoading && isIOS}}">
-          <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
-        <form class="only-one-btn {{isIPX ? 'bottomx' :''}}" report-submit="{{formIsANAsshole}}" bindsubmit="jionGroup">
-            我来助力
-            <button class="formBtn" form-type="submit"></button>
-        </form>
-    </view> -->
 </view>
-
-<view class="group-popup" bindtap="sendGroup" hidden="{{sendGroupFlag}}" wx:if="{{!isLoading}}">
+<!-- 底部按钮 -->
+<!-- <view class="group-details-btn {{isIPX ? 'bottomx' :''}}" hidden="{{surplusNum == '0' || !stillGoing }}" wx:if="{{!isLoading && (groupOSType === 'ANDROID') }}">
+    <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
+    <view class="left-btn" bindtap="sendGroup">开团</view>
+    <form class="right-btn {{isIPX ? 'bottomx' :''}}" report-submit="{{formIsANAsshole}}" bindsubmit="jionGroup">
+        参团
+        <button class="formBtn" form-type="submit"></button>
+    </form>
+</view> -->
+<!-- <view class="group-details-btn {{isIPX ? 'bottomx' :''}}" hidden="{{stillGoing }}" wx:if="{{!isIOS}}">
+    <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
+    <view class="only-one-btn" bindtap="sendGroup">重新开团</view>
+</view> -->
+<!-- ios界面的底部按钮 -->
+<view class="group-details-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{groupOSType === 'IOS' && stillGoing && !groupStatus }}" hidden="{{hideBottomBtn}}">
+    <image class="btn-image" src="../../../static/groupImg/group_in_ios.jpg" />
+    <form class="only-one-btn {{isIPX ? 'bottomx' :''}}" report-submit="{{formIsANAsshole}}" bindsubmit="jionGroup">
+        我来助力！获得七天试用权
+        <button class="formBtn" form-type="submit"></button>
+    </form>
+</view>
+<!-- <view class="group-popup" bindtap="sendGroup" hidden="{{sendGroupFlag}}" wx:if="{{!isLoading}}">
     <view class="group-content">
         <view class="group-title">请选择课本</view>
         <view class="group-list">
             <block wx:for="{{bookList}}" wx:key="{{index}}">
                 <view class="group-item" catchtap="selectImg" data-ind="{{index}}">
-                <image class="item-img" src="{{item.iconImg}}"></image>
-                <view id="grade">{{item.subTitle}}</view>
-                <image class="select-img" src="../../../static/groupImg/{{selectFlag[index] ? 'bai' : 'lan'}}.png"></image>
-                </view> 
+                    <image class="item-img" src="{{item.iconImg}}"></image>
+                    <view id="grade">{{item.subTitle}}</view>
+                    <image class="select-img" src="../../../static/groupImg/{{selectFlag[index] ? 'bai' : 'lan'}}.png"></image>
+                </view>
             </block>
         </view>
         <view class="sure" catchtap="sure">
@@ -133,23 +138,12 @@
             <text>确定</text>
         </view>
     </view>
-</view>
-
-<popup
-    id="popupup"
-    typeOf="{{typeOf}}"
-    title="{{titles}}"
-    headTextOne="{{headTextOne}}"
-    headTextTwo="{{headTextTwo}}"
-    btnContent="{{btnContent}}"
-    content="{{content}}"
-    bindGroup="group"
-></popup>
- <goBackHome id="goBackHome" shareType="{{goBackHome}}" wx:if="{{goBackHome}}" />
+</view> -->
+<popup id="popupup" typeOf="{{typeOf}}" title="{{titles}}" headTextOne="{{headTextOne}}" headTextTwo="{{headTextTwo}}" btnContent="{{btnContent}}" content="{{content}}" bindGroup="group"></popup>
+<goBackHome id="goBackHome" shareType="{{goBackHome}}" wx:if="{{goBackHome}}" />
 <view hidden="{{hide}}">
-  <Dialog bindmyevent="jurisdiction" />
+    <Dialog bindmyevent="jurisdiction" />
 </view>
 <myToast bindShowAlert="showAlert" wx:if="{{alertFlag}}" />
- <myModal id="myModal" type="{{modalType}}" isCloseShow="{{modalCloseShow}}"  text="{{modalText}}" wx:if="{{isModalShow}}" bindconfirm="modalConfirmHandler" bindclose="modalCloseHandler" />
-
-  <!-- <MyToast bindShowAlert="showAlert" wx:if="{{damnDialogShow}}"  /> -->
+<myModal id="myModal" type="{{modalType}}" isCloseShow="{{modalCloseShow}}" text="{{modalText}}" wx:if="{{isModalShow}}" bindconfirm="modalConfirmHandler" bindclose="modalCloseHandler" />
+<!-- <MyToast bindShowAlert="showAlert" wx:if="{{damnDialogShow}}"  /> -->

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

@@ -14,7 +14,8 @@
 .group-details {
 
     width: 100%;
-    background: rgba(240, 241, 245, 1);
+    height: auto;
+    background: #fff;
 }
 
 .loading {
@@ -71,61 +72,6 @@
 
 }
 
-.bg-boder {
-    border: 2px solid #61CA54;
-}
-
-.shengyu {
-    display: flex;
-    flex-direction: column;
-    color: #696969;
-    padding-bottom: 20px;
-}
-
-.shengyu-num {
-    text-align: center;
-}
-
-.shengyu-num text {
-    color: #FF4330;
-}
-
-.shengyu-time {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 8rpx;
-}
-
-.shengyu-time .time {
-    position: relative;
-    width: 32rpx;
-    height: 36rpx;
-    margin: 0 8rpx;
-}
-
-.shengyu-time .time image {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 24rpx;
-    height: 40rpx;
-}
-
-.shengyu-time .time text {
-    position: absolute;
-    left: 4rpx;
-    top: 0;
-    /* z-index: 2; */
-    color: #fff;
-    font-size: 28rpx;
-    width: 32rpx;
-    height: 36rpx;
-    line-height: 36rpx;
-    background: #ff9209;
-    text-align: center;
-    border-radius: 4rpx;
-}
 
 scroll-view {
     /* height: 74%; */
@@ -434,4 +380,250 @@ scroll-view {
     text-align: center;
     font-size: 32rpx;
     color: #000
+}
+
+
+/* 新复制粘贴的 */
+
+.green-placerholder {
+    width: 100%;
+    height: 132rpx;
+    background: #12c962;
+    position: absolute;
+    top: 0;
+}
+
+.class-icon {
+    width: 704rpx;
+    height: 294rpx;
+    border-radius: 20rpx;
+    box-shadow: 0 0 15rpx 0rpx rgba(0, 0, 0, .4);
+    margin: 0 auto;
+    display: block;
+    z-index: 1;
+    position: relative;
+    top: 15rpx;
+}
+
+.step {
+    width: 100%;
+    height: 250rpx;
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.step image {
+    height: 60rpx;
+    width: 70%;
+    margin: 0 auto;
+}
+
+.txt {
+    display: flex;
+    justify-content: space-around;
+    color: #535353;
+    font-size: 32rpx;
+    padding: 0 46rpx;
+    margin-top: 20rpx;
+}
+
+.details-head {
+    width: 100%;
+    /* height: 82%; */
+    margin-top: 12rpx;
+    background: #fff;
+    min-height: 98%;
+
+}
+
+.headImg {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    padding: 40rpx 0;
+    box-sizing: border-box;
+}
+
+.headImg-item {
+    position: relative;
+    width: 140rpx;
+    height: 140rpx;
+    border-radius: 50%;
+    margin: 20rpx 22rpx;
+    box-sizing:border-box;
+}
+
+.headImg-item image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+}
+
+.headImg-item .organizerIcon {
+    position: absolute;
+    bottom: -15rpx;
+    width: 70rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+    background: #f7b21d;
+    border-radius: 16rpx;
+    /* border: 2rpx solid rgba(255, 255, 255, 1); */
+    font-size: 24rpx;
+    /* font-family: PingFangSC-Medium; */
+    /* font-weight: 500; */
+    color: rgba(255, 255, 255, 1);
+    left: 0;
+    right: 0;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.bg-boder {
+    border: 2px solid #f7b21d;
+}
+
+.last-time-box {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top:30rpx;
+}
+
+.last-time {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.last-time-end {
+    width: 88rpx;
+    height: 38rpx;
+    font-size: 30rpx;
+    font-weight: 800;
+    color: #f14025;
+    margin: 0 15rpx;
+}
+
+.left-icon {
+    width: 80rpx;
+    height: 20rpx;
+}
+
+.right-icon {
+    width: 80rpx;
+    height: 20rpx;
+}
+
+.last-text {
+    width: 100%;
+    text-align: center;
+    font-size: 30rpx;
+    font-weight: 800;
+    color: #f14025;
+    margin-top: 8rpx;
+}
+
+.group-regular-text {
+    font-size: 30rpx;
+    font-weight: 800;
+    color: rgba(12, 10, 10, 1);
+    width: 100%;
+    text-align: center;
+    line-height: 45rpx;
+}
+
+.last-member{
+    margin-top: 17rpx;
+    
+}
+
+.invitation-btn {
+    /* position: absolute;
+    left: 50%;
+    top: 55%; */
+    /* transform: translate(-50%); */
+    width: 434rpx;
+    height: 80rpx;
+    margin: 0 auto 20rpx;
+}
+
+
+.middle-btn{
+    position: fixed;
+    top: 300rpx;
+    left: 0;
+    right: 0;
+    margin: 0 auto;
+}
+
+.invitation-btn image {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.invitation-btn text {
+    /* position: absolute; */
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+    text-align: center;
+    line-height: 80rpx;
+    z-index: 2;
+    color: #fff;
+    background: #FF653A;
+    border-radius: 56rpx;
+    font-size: 36rpx;
+    font-weight: 800;
+
+}
+
+.red-text{
+    color: #f13e25
+}
+
+.rule {
+    position: fixed;
+    right: 0;
+    top: 82%;
+    width: 84rpx;
+    height: 88rpx;
+    z-index: 2;
+}
+
+.rule image {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.rule text {
+    position: absolute;
+    left: 30rpx;
+    top: 10rpx;
+    font-size: 24rpx;
+    color: #fff;
+    z-index: 2;
+}
+
+.explain {
+    color: #8E8B8C;
+    width: 100%;
+    box-sizing: border-box;
+    text-align: center;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    position: absolute;
+    bottom: 20rpx;
+}
+
+.explain-title{
+    font-weight: 800;
 }

project.config.json

@@ -39,16 +39,17 @@
 			"current": 1,
 			"list": [
 				{
-					"id": -1,
-					"name": "5",
-					"pathName": "pages/groupPage/grade-details/grade-details",
-					"query": "productId=1&title=一年级上册课文朗读【部编版】"
+					"id": 0,
+					"name": "自己看到",
+					"pathName": "pages/groupPage/collage-details/collage-details",
+					"query": "orderId=1546827037627100",
+					"scene": "1012"
 				},
 				{
 					"id": 1,
-					"name": "分享团",
-					"pathName": "pages/groupPage/collage-details/collage-details",
-					"query": "orderId=1546590174010482&read=true",
+					"name": "别人看到",
+					"pathName": "pages/groupPage/group-details/group-details",
+					"query": "share=true&shareId=1546827037627100",
 					"scene": "1012"
 				}
 			]