更改细节

component/popup/popup.wxml

@@ -14,14 +14,14 @@
                 {{headTextTwo}}
             </view>
         </view>
-        <view class="content" style="font-size:32rpx;">    
+        <view class="content" style="font-size:32rpx; margin-top: 54rpx;">    
             <block wx:for="{{content}}" wx:key="{{index}}">
                 <text style="color: {{item.color}};">{{item.text}}</text>
             </block>
         </view>
+        <view style="font-size: 28rpx; color: #7D7D7D; text-align: center; margin-top: 20rpx">您收到的奖学金会自动到您的微信钱包</view>
          <view class="send-btn" bindtap="launchGroup">
-            <image src="../../static/groupImg/Invitation.png"></image>
-            <text>邀请好友赚奖学金</text>
+            <text>再接再厉赚 取奖学金</text>
         </view>
     </view>
     <!--失败 -->
@@ -47,12 +47,10 @@
     </view>
     <!--发起拼团成功 -->
     <view class="popup-container"  wx:if="{{typeOf == 'sendSuccess' ? true : false}}">
-        <view class="head-img"style="text-align: center;margin-top: 29rpx;">
-            <image src="../../static/groupImg/tuanzhang.png" style="width: 160rpx; height: 160rpx;"></image>
-        </view>
         <view class="content">
             <text style="color: #F66C1C; font-weight: bolder;">{{title}}</text>
-            <text style="color: #F66C1C;">{{headTextTwo}}</text>
+            <text style="font-size: 28rpx">{{headTextOne}}</text>
+            <text style="font-size: 28rpx">{{headTextTwo}}</text>
         </view>
         <view class="content" style="margin-top: 30rpx; font-size:28rpx;">
             <block wx:for="{{content}}" wx:key="{{index}}">

component/popup/popup.wxss

@@ -18,6 +18,7 @@
     width: 90%;
     height: auto;
     border-radius: 20rpx;
+    overflow: hidden;
 }
 
 .head-img {
@@ -65,24 +66,18 @@
     width: 70%;
     height: 80rpx;
     margin: 72rpx auto 40rpx auto;
-    position: relative;
+    background: #FF9209;
+    border-radius: 80rpx;
 }
 
-.send-btn image {
-    width: 100%;
-    height: 100%;
-}
 
 .send-btn text {
-    position: absolute;
-    left: 0;
-    top: 0;
     width: 100%;
     height: 100%;
     text-align: center;
     line-height: 80rpx;
     color: #fff;
-    z-index: 3;
+    display: inline-block;
 }
 
 .cha {

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

@@ -31,7 +31,8 @@ Page({
       }
     ],
     read: false,
-    organizerUid: ''
+    organizerUid: '',
+    colonelName: ''
   },
   //显示分享页 
   openShare: function () {
@@ -103,7 +104,10 @@ Page({
         groupId: groupOrder.groupId
       })
       if(groupOrder.groupType === 'PROMOTION'){
-        this.data.joinUserList.unshift(res.data.data.organizer);
+        //this.data.joinUserList.unshift(res.data.data.organizer);
+        this.setData({
+          colonelName: res.data.data.organizer.wechatName
+        })
         this.setData({
           joinUserList: this.data.joinUserList,
         })

pages/groupPage/collage-details/collage-details.wxml

@@ -23,8 +23,11 @@
             </block>                   
         </view>
         <view class="shengyu">
-            <view class="shengyu-num" hidden="{{surplusNum == '0'}}">还需邀请<text>{{surplusNum}}</text>名好友</view>
+            <view class="shengyu-num" wx:if="{{colonelName}}">团长{{colonelName}}发起团购</view>
+            <view class="shengyu-num" hidden="{{surplusNum == '0'}}">还需邀请<text>{{surplusNum}}</text>名好友拼团成功</view>
+            <!--
             <view class="shengyu-num" hidden="{{surplusNum == '0'}}">即可获得一年级语文同步辅导(上学期)</view>
+            -->
             <view class="shengyu-num" hidden="{{surplusNum != '0'}}">拼团成功!快去朗读吧</view>
             <view class="shengyu-time" >
                 剩余时间:
@@ -56,10 +59,10 @@
     </view>  
     <view class="explain">
         <text>拼团规则</text>
-        <view>转发给自己的朋友们，分享好课， 追随您一起学习进步 您的魅力不是吹的</view>
-        <view>在限定时间内成功拼团，您将得到xx元的奖励金</view>
+        <view style="margin-top:30rpx;">转发给自己的朋友们，分享好课， 追随您一起学习进步 您的魅力不是吹的</view>
+        <view style="margin-top:20rpx;">在限定时间内成功拼团，您将得到xx元的奖励金</view>
         <view>如果拼团失败 </view>
-        <view>您预付的课程费将在48小时内退回您的账户</view>
+        <view style="margin-top:20rpx;">您预付的课程费将在48小时内退回您的账户</view>
     </view>
 </view> 
 <canvas canvas-id="myCanvas" style="width:375px; height: 668px; position: absolute; left: -999rpx; top: -9999rpx;"></canvas>

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

@@ -40,6 +40,7 @@
 .headImg {
     display: flex;
     flex-wrap: wrap;
+    justify-content: center;
     padding: 40rpx 0;
     box-sizing: border-box;
 }

pages/groupPage/grade-details/grade-details.js

@@ -13,15 +13,19 @@ Page({
     bookInfo: '',
     lessonList: [],
     content: [{
-        text: "转发给自己的朋友们，分享好课，",
+        text: "转发给自己的朋友们",
         color: "#000"
       },
       {
-        text: " 追随您一起学习进步。您的魅力不是吹的！",
+        text: " 分享好课，追随您一起学习进步",
         color: "#000"
       },
       {
-        text: `在限定时间内成功拼团，您将得到xx元的奖励金哦。`,
+        text: " 您的魅力不是吹的！",
+        color: "#000"
+      },
+      {
+        text: `在限定时间内成功拼团，您将得到奖学金。`,
         color: "#FF4600"
       }
     ],

pages/groupPage/grade-details/grade-details.wxml

@@ -12,24 +12,27 @@
         <view class="catalog-list" hidden="{{!flag}}">
             <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>
-                <text class="right">{{item.readingNum}}朗读 ></text>
+                <view class="right">
+                    <image src="../../../static/groupImg/bofnag.png"></image>
+                    <text>{{item.readNum}} ></text>
+                </view>
             </view>
         </view>
         <view class="know" hidden="{{flag}}">
         </view>       
     </scroll-view>
     <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{!share}}">
-        <image class="bg1" src="../../../static/groupImg/Rectangle_9.png"></image>
-        <image class="bg2" src="../../../static/groupImg/Rectangle_9.png"></image>      
+        <image class="bg1" src="../../../static/groupImg/baise.png"></image>
+        <image class="bg2" src="../../../static/groupImg/baise.png"></image>      
         <block wx:for="{{payList}}" wx:key="{{index}}">
             <view class="Price" bindtap="pay" data-id="{{item.id}}" wx:if="{{share ? (index != 0) : true }}">
                 <text>￥{{item.price / 100}}</text>
-                <text>{{item.headcount == '1' ? '单' : item.headcount}}人团</text>
+                <text>{{item.headcount == '1' ? '单' : item.headcount}}人{{item.headcount == '1' ? '购' : '团'}}</text>
             </view>
         </block>
     </view>
     <view class="group-btn {{isIPX ? 'bottomx' :''}}" wx:if="{{share}}">
-        <image class="bg1" src="../../../static/groupImg/Rectangle_9.png" style="left: 50%"></image>   
+        <image class="bg1" src="../../../static/groupImg/baise.png" style="left: 50%"></image>   
         <block wx:for="{{payList}}" wx:key="{{index}}">
             <view class="Price" bindtap="pay" data-id="{{item.id}}" wx:if="{{share ? (index != 0) : true }}">
                 <view>继续开团 赚奖学金</view>
@@ -40,4 +43,4 @@
         </block>
     </view>
 </view>
-<popup id="popup" typeOf="sendSuccess" title="报告团长" headTextOne="您发起的团购已经成立" content="{{content}}"></popup>
+<popup id="popup" typeOf="sendSuccess" title="报告团长" headTextOne="您发起的团购已经成立" headTextTwo="订单号：{{groupPurchaseOrder.id}}" content="{{content}}"></popup>

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

@@ -33,10 +33,11 @@ scroll-view {
     position: relative;
 }
 
+
 .catalog image {
     position: absolute;
     left: 374rpx;
-    top: 36rpx;
+    top: 20rpx;
     width: 2rpx;
     height: 66rpx;
 }
@@ -46,7 +47,7 @@ scroll-view {
     height: 60rpx;
     text-align: center;
     font-size: 36rpx;
-    margin: 0 100rpx;
+    margin: 0 90rpx;
     box-sizing: border-box;
 }
 
@@ -62,6 +63,11 @@ scroll-view {
     margin-bottom: 100rpx;
 }
 
+.know {
+    padding: 18rpx;
+    box-sizing: border-box;
+}
+
 .catalog-item {
     display: flex;
     justify-content: space-between;
@@ -85,6 +91,17 @@ scroll-view {
     font-size: 28rpx;
 }
 
+.catalog-item .right image {
+    width: 26rpx;
+    height: 26rpx;
+    vertical-align: middle;
+    margin-right: 6rpx;
+}
+
+.catalog-item .right text {
+    vertical-align: middle;
+}
+
 .group-btn {
     width: 100%;
     height: 102rpx;

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

@@ -23,7 +23,7 @@ Page({
     groupId: '',
     orderId: '',
     typeOf: '',
-    title: '',
+    titles: '',
     headTextOne: '',
     headTextTwo: '',
     content: [],
@@ -33,7 +33,8 @@ Page({
     bookList: [],
     sendGroupFlag: true,
     selectFlag: [],
-    flag: true
+    flag: true,
+    colonelName: ''
   },
   //tab切换
   tabSwitch: function () {
@@ -232,7 +233,10 @@ Page({
         timeList,
       })
       if(groupOrder.groupType === 'PROMOTION'){
-        this.data.joinUserList.unshift(res.data.data.organizer);
+        //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,
@@ -252,23 +256,21 @@ Page({
     if (wx.getStorageSync('uid') == organizerUid) {
       this.setData({
         typeOf: 'success',
-        title: '恭喜 !',
+        titles: '恭喜 !',
         headTextOne: '您发起的团购拼团成功',
-        content: [{
-            text: "领袖体质魅力无穷！",
-            color: "#000"
-          },
+        headTextTwo: '领袖体质魅力无穷！',
+        content: [
           {
             text: " 您可以继续发起新的团购，",
-            color: "#000"
+            color: "#F97800"
           },
           {
-            text: " 不再需要支付本课程费用，拼团成功，",
-            color: "#FF9B00"
+            text: " 不再需要支付本课程费用",
+            color: "#F97800"
           },
           {
-            text: `您将得到${price / 100}元奖励。`,
-            color: "#FF0000"
+            text: `拼团成功，您将得到奖学金`,
+            color: "#F97800"
           }
         ],
       },()=>{
@@ -277,24 +279,25 @@ Page({
     } else {
       this.setData({
         typeOf: 'success',
-        title: '拼团成功 ! ',
+        titles: '拼团成功 ! ',
         headTextOne: '您参与的团购拼团成功',
-        headTextTwo: '',
-        content: [{
-            text: "感谢团长的分享",
-            color: "#000"
+        headTextTwo: '感谢团长的分享',
+        content: [
+          {
+            text: " 您也可以发起新的团购",
+            color: "#F97800"
           },
           {
-            text: " 您也可以发起新的团购分享给需要的朋友们，",
-            color: "#000"
+            text: "作为新的发起人",
+            color: "#F97800"
           },
           {
-            text: "作为新的发起人，您无需在支付本课程费用；",
-            color: "#FF0000"
+            text: " 您无需在支付本课程费用 ",
+            color: "#F97800"
           },
           {
-            text: `团购成功，您将得到${price/ 100}元奖励。`,
-            color: "#FF0000"
+            text: `拼团成功，您将得到奖学金`,
+            color: "#F97800"
           }
         ],
       },()=>{

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

@@ -15,6 +15,7 @@
             </block>                      
         </view>
         <view class="shengyu">
+            <view class="shengyu-num" wx:if="{{colonelName}}">团长{{colonelName}}发起团购</view>
             <view class="shengyu-num" hidden="{{surplusNum == '0'}}">仅剩<text>{{surplusNum}}</text>个名额就拼团成功了</view>
             <view class="shengyu-num" hidden="{{surplusNum != '0'}}">拼团成功!快去朗读吧</view>
             <view class="shengyu-time" hidden="{{surplusNum == '0'}}">
@@ -53,7 +54,10 @@
         <view class="catalog-list" hidden="{{!flag}}">
             <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>
-                <text class="right">{{item.readingNum}}朗读 ></text>
+                <view class="right">
+                    <image src="../../../static/groupImg/bofnag.png"></image>
+                    <text>{{item.readNum}} ></text>
+                </view>
             </view>           
         </view>
         <view class="know" hidden="{{flag}}">
@@ -96,7 +100,7 @@
 <popup
     id="popupup"
     typeOf="{{typeOf}}"
-    title="{{title}}"
+    title="{{titles}}"
     headTextOne="{{headTextOne}}"
     headTextTwo="{{headTextTwo}}"
     content="{{content}}"

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

@@ -13,6 +13,7 @@
 .headImg {
     display: flex;
     flex-wrap: wrap;
+    justify-content: center;
     padding: 40rpx 0;
     box-sizing: border-box;
 }
@@ -90,7 +91,7 @@
 }
 
 scroll-view {
-    height: 68%;
+    height: 64%;
     width: 100%;
 }
 
@@ -119,7 +120,7 @@ scroll-view {
 .catalog image {
     position: absolute;
     left: 374rpx;
-    top: 36rpx;
+    top: 20rpx;
     width: 2rpx;
     height: 66rpx;
 }
@@ -129,7 +130,7 @@ scroll-view {
     height: 60rpx;
     text-align: center;
     font-size: 36rpx;
-    margin: 0 100rpx;
+    margin: 0 90rpx;
     box-sizing: border-box;
 }
 
@@ -145,6 +146,11 @@ scroll-view {
     box-sizing: border-box;
 }
 
+.know {
+    padding: 18rpx;
+    box-sizing: border-box;
+}
+
 .catalog-item {
     display: flex;
     justify-content: space-between;
@@ -168,6 +174,17 @@ scroll-view {
     font-size: 28rpx;
 }
 
+.catalog-item .right image {
+    width: 26rpx;
+    height: 26rpx;
+    vertical-align: middle;
+    margin-right: 6rpx;
+}
+
+.catalog-item .right text {
+    vertical-align: middle;
+}
+
 .group-details-btn {
     position: fixed;
     bottom: 0;