1

component/flowerBox/flowerBox.js

@@ -42,6 +42,19 @@ Component({
             this.setData({
               animationData: this.animation.export()
             })
+            this.replace();
           },
+          // 复位
+          replace: function(){
+            this.animation = wx.createAnimation({
+              duration: 1,
+              timingFunction: 'linear',
+            })
+            this.animation.opacity(1).step();
+            this.animation.bottom('-100rpx').step();
+            this.setData({
+              animationData: this.animation.export()
+            })
+          }
     }
   })

component/group/group.js

@@ -45,12 +45,14 @@ export const groupInit = (that) => {
       })
       const recommendListStr = "groupData.recommendList";
       const listLengthStr = "groupData.listLength";
+      const totalSizeStr = "groupData.totalSize";
       // const recommendListThreeStr = "groupData.recommendListThree";
       that.setData({
         [recommendListStr]: recommendListTemp,
         // [recommendListThreeStr]: that.data.groupData.recommendList.slice(that.data.groupData.baseIndex, that.data.groupData.baseIndex + 3),
         listLength: res.data.data.totalNo,
-        [listLengthStr]: res.data.data.totalNo
+        [listLengthStr]: res.data.data.totalNo,
+        [totalSizeStr]: res.data.data.totalSize
       })
       that.getMyGroupGoing()
     }).fail((error) => {

component/group/group.wxml

@@ -26,16 +26,20 @@
           </view>
         </block>
         <view class="btn-area">
-            <view class="btn-item" bindtap='toMyCollage' wx:if="{{groupData.myGroupGoing > 0 && groupData.recommendList.length >3 }}">我的{{groupData.isIOS ? '助力' : '拼团'}}<text class="red-text">({{groupData.myGroupGoing}})</text>
+            <view class="btn-item" bindtap='toMyCollage' wx:if="{{groupData.myGroupGoing > 0 && groupData.totalSize >3 }}">我的{{groupData.isIOS ? '助力' : '拼团'}}<text class="red-text">({{groupData.myGroupGoing}})</text>
               <image src="../../static/image/little_firends.png" />
             </view>
-            <view class="btn-item"  wx:if="{{groupData.myGroupGoing <= 0 || groupData.recommendList.length <=3}}" bindtap="more" data-type="course ">
+            <view class="btn-item {{groupData.totalSize === 0 ? 'expect-margin' : ''}}"  wx:if="{{groupData.myGroupGoing <= 0 || groupData.totalSize <=3 }}" bindtap="more" data-type="course ">
                开个团试试
               <image src="../../static/image/little_firends.png" />
             </view>
-            <view class="btn-item" wx:if="{{groupData.recommendList.length >3}}" bindtap="change">换一批看看
+            <view class="btn-item" wx:if="{{groupData.totalSize >3}}" bindtap="change">换一批看看
               <image src="../../static/image/refresh.png" />
             </view>
+            <!-- <view class="btn-item expect-margin"  wx:if="{{groupData.totalSize === 0}}" bindtap="more" data-type="course ">
+               开个团试试
+              <image src="../../static/image/little_firends.png" />
+            </view> -->
         </view>
       </view>
       <view class="title">

component/group/group.wxss

@@ -191,7 +191,7 @@ scroll-view {
     flex-wrap: wrap;
     flex-direction: row;
     overflow-x: hidden;
-    margin-top: 77rpx;
+    margin-top: 65rpx;
 }
 
 .group-item {
@@ -228,7 +228,7 @@ scroll-view {
     color: #393939;
     text-align: center;
     font-size: 30rpx;
-    font-weight: 800;
+    font-weight: 400;
 
 
 }
@@ -336,4 +336,8 @@ scroll-view {
     top: 10rpx;
     width: 52rpx;
     height: 52rpx;
+}
+
+.expect-margin{
+    margin: 30rpx 
 }

component/hot/hot.js

@@ -7,7 +7,8 @@ export const hotInit = (that) => {
     that.setData({
       hotData: {
         title: '热门',
-        autoplay: true,
+        autoplay: false,
+        swiperCurrent: 0,
         interval: 5000,
         duration: 700,
         circular: true,
@@ -21,18 +22,23 @@ export const hotInit = (that) => {
         searchIcon: true,
         unReadMessageNum: 0,
         myCourse: [],
-        inputFocus: false
+        inputFocus: false,
+        inputValue: ''
         // circular: true
       }
     })
-  }
+  } 
   // 搜索方法
   that.searchHandler = () => {
-      // if (that.data.hotInput.lenght !== 0) {
-      //   wx.navigateTo({
-      //     url: `../main/searchResult/searchResult?keyWords=${that.data.hotInput}`
-      //   })
-      // }
+      if (that.data.hotInput.lenght !== 0) {
+        wx.navigateTo({
+          url: `../main/searchResult/searchResult?keyWords=${that.data.hotInput}`
+        })
+      }
+      const str = 'hotData.inputValue';
+      that.setData({
+        [str]: ''
+      })
     },
     // 输入框获取焦点 放大镜消失
     that.searchIconDisappear = () => {
@@ -167,6 +173,36 @@ export const hotInit = (that) => {
     })
   }
 
+  that.getHotRecommendSecond = (uid,pageNo,pageSize) =>{
+    httpRequestApi.getHotRecommendSecond(uid,pageNo,pageSize).success(res => {
+      console.log(res)
+      const recommendRes = res.data.data.list;
+      if(recommendRes.length === 0) return;
+      // const recommendWorks = [];
+      recommendRes.forEach(item => {
+        const temp = {};
+        temp.title = item.userRead.title;
+        temp.summary = item.userRead.summary;
+        temp.img = item.userRead.iconImg;
+        temp.plays = item.userRead.playAmount ? item.userRead.playAmount : 0;
+        temp.likes = item.userRead.likeAmount ? item.userRead.likeAmount : 0;
+        temp.classId = item.userRead.id;
+        temp.time = formatDate(item.userRead.gmtCreated, 3);
+        temp.avatar = item.user.avatar;
+        temp.profession = item.user.profession;
+        temp.uid = item.user.uid;
+        // temp.avatar = item.user.avatar;
+        temp.nickName = item.user.wechatName;
+        // recommendWorks.push(temp);
+        that.data.hotData.hotWorks.push(temp);
+      });
+      const hotStr = 'hotData.hotWorks'
+      that.setData({
+        [hotStr]: that.data.hotData.hotWorks,
+        recommendTotalNo: res.data.data.totalNo
+      })
+    })
+  }
   // 去全部课本
   that.goToBooks = () => {
     wx.navigateTo({
@@ -203,12 +239,12 @@ export const hotInit = (that) => {
 
   // 获取全部课本
   // that.getBookList();
-  that.swiperChange = (e) => {
-    const str = 'hotData.swiperCurrent'
-    that.setData({
-      [str]: e.detail.current
-    });
-  }
+  // that.swiperChange = (e) => {
+  //   const str = 'hotData.swiperCurrent'
+  //   that.setData({
+  //     [str]: e.detail.current
+  //   });
+  // }
   //跳转到课程详情
   that.goToBook = function (e) {
     console.log(e.currentTarget.dataset)

component/hot/hot.wxml

@@ -26,7 +26,7 @@
         </view>
     </view>
     <view class="searchSection">
-        <input bindinput="inputHandler" focus="{{hotData.inputFocus}}" bindfocus="searchIconDisappear" bindblur="searchIconCome" bindconfirm="searchHandler" placeholder="{{hotData.hotSearch}}" placeholder-style="text-indent:20rpx" confirm-type="search"></input>
+        <input bindinput="inputHandler" value="{{hotData.inputValue}}" focus="{{hotData.inputFocus}}" bindfocus="searchIconDisappear" bindblur="searchIconCome" bindconfirm="searchHandler" placeholder="{{hotData.hotSearch}}" placeholder-style="text-indent:20rpx" confirm-type="search"></input>
         <view>{{searchIcon}}</view>
         <view bindtap="inputFocus" class="searchBtn" wx:if="{{hotData.searchIcon}}">
             <!-- <icon type="search" size="14" /> -->
@@ -79,7 +79,7 @@
                             <text>{{item.plays}}</text>
                         </view>
                         <view class="wareCardLikes">
-                            <image class="wareCardLikesImg" lazy-load="true" src="../../static/image/flower_small.png" />
+                            <image class="wareCardLikesImg" lazy-load="true" src="../../static/image/flower_small_pink.png" />
                             <text>{{item.likes}}</text>
                         </view>
                     </view>

component/hot/hot.wxss

@@ -1,5 +1,6 @@
 .messageSection {
     width: 720rpx;
+    
     height: 80rpx;
     background: #fff;
     border-radius: 40rpx;
@@ -27,7 +28,7 @@
 }
 
 swiper {
-    margin-top: 60rpx;
+    margin-top: 64rpx;
     /* padding-top: 20rpx; */
     background: #fff;
     display: block;
@@ -339,13 +340,14 @@ swiper {
 .book-box {
     display: flex;
     width: 100%;
+    height: 328rpx;
     flex-wrap: wrap;
     flex-direction: row;
     overflow-x: hidden;
-    justify-content: space-around;
+    /* justify-content: space-around; */
     align-items: center;
-
-    padding: 0 20rpx;
+  overflow: hidden;
+    /* padding: 0 20rpx; */
     box-sizing: border-box;
     position: absolute;
     top: 64rpx;
@@ -359,6 +361,7 @@ swiper {
     justify-content: space-between;
     width: 214rpx;
     height: 330rpx;
+    margin-left: 2.7%;
 }
 
 .book-item .book-img {
@@ -371,7 +374,7 @@ swiper {
     color: #393939;
     text-align: center;
     font-size: 30rpx;
-    font-weight: 800;
+    /* font-weight: 800; */
     line-height: 36rpx;
     margin-top: 16rpx;
 }

component/my/my.js

@@ -55,6 +55,7 @@ export const myInit = (that) => {
           console.log(item.userRead.id)
           temp.nickName = item.user.wechatName;
           temp.avatar = item.user.avatar;
+          temp.uid = item.user.uid;
           temp.plays = item.userRead.playAmount;
           temp.likes = item.userRead.likeAmount;
           temp.img = item.userRead.iconImg;
@@ -76,5 +77,6 @@ export const myInit = (that) => {
       wx.navigateTo({
         url: `../../pages/user/walletDetails/walletDetails?title=资金明细`
       });
-    }
+    },
+    that.getFollowWorks(1, 3);
 }

component/my/my.wxml

@@ -30,10 +30,13 @@
           <image class="" src='../../static/image/flower_small.png' />
           <view>小红花：{{myData.user.integralAmount || 0 }}</view>
         </view>
-        <view class="flower-tips">
+        <view class="flower-tips" wx:if="{{myData.user.unfinishedAmount > 0}}">
           <text class="flower-last">{{myData.user.unfinishedAmount }}</text>
           个任务福利还没有领哦
         </view>
+                <view class="flower-tips" wx:if="{{myData.user.unfinishedAmount <= 0}}">
+          今天任务全部完成，真棒
+        </view>
       </view>
       <!-- android 显示两个 -->
       <view class="wallet-section" wx:if="{{!myData.isIOS}}">
@@ -100,7 +103,7 @@
                   <text>{{myData.user.myRead.playAmount}}</text>
                 </view>
                 <view class="wareCardLikes">
-                  <image class="wareCardLikesImg" lazy-load="true" src="../../static/image/flower_small.png" />
+                  <image class="wareCardLikesImg" lazy-load="true" src="../../static/image/flower_small_pink.png" />
                   <text>{{myData.user.myRead.likeAmount}}</text>
                 </view>
               </view>
@@ -139,7 +142,7 @@
                   <text>{{item.plays}}</text>
                 </view>
                 <view class="wareCardLikes">
-                  <image class="wareCardLikesImg" lazy-load="true" src="../../static/image/flower_small.png" />
+                  <image class="wareCardLikesImg" lazy-load="true" src="../../static/image/flower_small_pink.png" />
                   <text>{{item.likes}}</text>
                 </view>
               </view>

component/my/my.wxss

@@ -75,8 +75,13 @@ page {
 .avatar-nickname {
   /* width: 500rpx; */
   display: flex;
-  height: 26rpx;
+  height: 27rpx;
+  line-height: 27rpx;
+
   margin-top: 17rpx;
+  width: 100%;
+  overflow-x: hidden;
+
 }
 
 
@@ -247,6 +252,7 @@ image {
   height: 63rpx;
   margin-left: 51rpx;
   margin-right: 25rpx;
+  margin-top:-7rpx;
 }
 
 .flower-icon {
@@ -283,7 +289,7 @@ image {
   height: 170rpx;
   display: flex;
   flex-direction: column;
-  margin-top:6rpx;
+  margin-top: 6rpx;
 }
 
 .btn image {

component/myToast/myToast.wxml

@@ -2,7 +2,7 @@
     <view class="toastBox" wx:if="{{noRightRules==='1'}}">
         <view class="line1">
             <!-- <image class="myToastIcon" src="../../static/image/alert_icon.png" /> -->
-            <text class="line1Text">无助力资格</text>
+            <text class="line1Text">无参加资格</text>
         </view>
         <view class="line2">
             <text class="line2Text">您已拥有本课使用权或曾拥有过本课临时使用权</text>

component/share/share.js

@@ -34,15 +34,15 @@ Component({
     touchMove: true,
     randomSologan: [
       '开发右脑最简单的方式就是大声朗读',
-      '大声朗读之后，孩子的性格都变了',
-      '享受跟你一起朗读的每分每秒',
-      '凡读书，须要读得字字响亮——朱熹',
-      '读对不等于读懂 反复朗读才能深入理解',
+      '大声朗读  有利于建立自信心',
+      '大声朗读  能帮助孩子提高写作能力',
+      '朗读是感知世界的一种重要方式',
+      '增强记忆力的方法之一大声朗读',
       '大声朗读是语感形成的最佳途径',
-      '大声朗读  还原课文的“诗性美”',
-      '在朗读中 提升孩子的思辨能力',
-      '重温经典课文 享受亲子美好时光',
-      '跟你一起读 仿佛看到了童年的自己'
+      '大声朗读  还原课文的诗性美',
+      '在朗读中  提升孩子的思辨能力',
+      '重温经典课文  享受亲子美好时光',
+      '大声朗读  能帮助孩子提高写作能力'
     ]
   },
 

component/share/share.wxml

@@ -10,7 +10,7 @@
             </button>
             <view class="share-circle" catchtap="PreservationImg">
                <image  src="../../static/groupImg/circle.png"></image>
-               <text>朋友圈</text>
+               <text>保存海报</text>
             </view>           
        </view>
    </view>

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

@@ -36,7 +36,7 @@ Page({
     ],
     ifGroupSuccessed: false,
     organizerUid: '',
-    hosterUid: wx.getStorageSync('uid'),
+    hosterUid: '',
     colonelName: '',
     rewardMoney: '',
     goBackHome: false,
@@ -90,6 +90,7 @@ Page({
     //   })
     //   return 
     // }
+    
     if (options.read) {
       this.setData({
         ifGroupSuccessed: options.read
@@ -107,13 +108,10 @@ Page({
     console.log(options);
     console.log(options.orderId);
     const orderId = options.orderId ? options.orderId : options.scene.replace('QR', '');
-    // if (options.orderId) {
-    //   return false;
-    // }
-
-    console.log(orderId)
+    const hosterUid =  wx.getStorageSync('uid')
     this.setData({
-      orderId
+      orderId,
+      hosterUid
     }, () => {
       this.getInfo()
     })

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

@@ -28,23 +28,32 @@
                 位好友{{groupOsType === 'IOS' ? '助力' : '参团'}}
             </view>
             <!-- 团长本人浏览话术 -->
-            <view class="group-regular-text" wx:if="{{organizerUid === hosterUid}}">
+            <view class="group-regular-text" wx:if="{{organizerUid === hosterUid && !colonelName}}">
                 即可获得本课程3年使用权
             </view>
+            <!-- 安卓推广团团长看到 -->
+            <view class="group-regular-text" wx:if="{{groupOsType === 'ANDROID' && organizerUid === hosterUid && colonelName}}">
+                即可获得{{rewardMoney}}元奖学金和300朵小红花
+            </view>
+            <view class="group-regular-text" wx:if="{{groupOsType === 'IOS' && organizerUid === hosterUid && colonelName}}">
+                即可获得300朵小红花
+            </view>
+            <!-- 团员看到的分享助力团 -->
+            <view class="group-regular-text" wx:if="{{groupOsType === 'IOS' && organizerUid !== hosterUid && colonelName}}">
+                即可助力团长<text class="red-text">{{organizer.wechatName}}</text>获得300朵小红花
+            </view>
             <!-- 其他人浏览 -->
             <view class="group-organizer group-regular-text" wx:if="{{organizerUid !== hosterUid}}">
                 <!-- <view class="group-organizer group-regular-text" wx:if="{{colonelName}}"> -->
                 <!-- ios分销团提示小红花 安卓分销团提示获得本课 -->
-                <view wx:if="{{groupOsType === 'IOS'}}">
-                    即可助力团长
-                    <text class="red-text">{{organizer.wechatName}}</text>
-                    获得本课
+                <view wx:if="{{groupOsType === 'IOS' && !colonelName}}">
+                    即可助力团长<text class="red-text">{{organizer.wechatName}}</text>获得本课
                 </view>
                 <view wx:if="{{groupOsType === 'ANDROID'}}">即可拼团成功</view>
-                <view wx:if="{{groupOsType === 'IOS' && colonelName}}">
+                <!-- <view wx:if="{{groupOsType === 'IOS' && colonelName}}">
                     即可获得300朵
                     <image src="../../../static/image/flower_small.png" />
-                </view>
+                </view> -->
             </view>
             <view class="group-regular-text" hidden="{{stillGoing}}">
                 {{groupOsType === 'IOS' ? '助力' : '团购'}}已超过时限
@@ -65,9 +74,19 @@
                 <view class="group-regular-text">您获得了7天的本课程试用权哦</view>
             </view>
             <!-- 团购成功了 -->
-            <view class="help-success" wx:if="{{groupOsType === 'ANDROID'}}">
-                <view class="group-regular-text">拼团成功！</view>
-                <view class="group-regular-text">你获得了本课3年试用权哦</view>
+            <view class="help-success" wx:if="{{groupOsType === 'ANDROID' && !colonelName}}">
+                <view class="group-regular-text">拼团成功</view>
+                <view class="group-regular-text">你获得了本课3年使用权哦</view>
+            </view>
+            <!-- 推广团成功了 团员看到 -->
+            <view class="help-success" wx:if="{{groupOsType === 'ANDROID' && organizerUid !== hosterUid && colonelName}}">
+                <view class="group-regular-text">拼团成功</view>
+                <view class="group-regular-text">你获得了本课3年使用权哦</view>
+            </view>
+            <!-- 团购成功并且是团长看到并且是推广团 -->
+            <view class="help-success" wx:if="{{groupOsType === 'ANDROID' && organizerUid === hosterUid && colonelName}}">
+                <view class="group-regular-text">拼团成功</view>
+                <view class="group-regular-text">你获得了{{rewardMoney}}元奖学金和300朵小红花</view>
             </view>
         </view>
         <!-- 头像 -->

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

@@ -120,12 +120,14 @@
 }
 
 .last-time-end {
-    width: 88rpx;
+    width: 99rpx;
     height: 38rpx;
     font-size: 30rpx;
     font-weight: 800;
     color: #f14025;
     margin: 0 15rpx;
+    text-align:center;
+
 }
 
 .left-icon {

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

@@ -371,7 +371,7 @@ Page({
     })
     if(this.data.modalType === 'image'){
       if (this.data.groupCount !== 1) {
-        this.popup.close();
+        // this.popup.close();
         setTimeout(() => {
           wx.navigateTo({
             url: `/pages/groupPage/collage-details/collage-details?orderId=${this.data.orderId}`
@@ -379,7 +379,7 @@ Page({
           wx.setNavigationBarTitle({
             title: '拼团详情'
           })
-        }, 1800)
+        }, 200)
       } else {
         wx.redirectTo({
           url: `/pages/groupPage/grade-details/grade-details?productId=${this.data.productId}`

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

@@ -195,21 +195,21 @@ Page({
         return;
       }
       // 团员进入collage页面
-      // const myUid = wx.getStorageSync('uid');
-      // if (myUid === groupOrder.organizer) {
-      //   wx.redirectTo({
-      //     url: `../collage-details/collage-details?orderId=${orderId}&goBackHome=${this.data.goBackHome}`
-      //   })
-      //   return;
-      // }
-      // res.data.data.joinUserList.forEach(item => {
-      //   if (item.uid === myUid) {
-      //     wx.redirectTo({
-      //       url: `../collage-details/collage-details?orderId=${orderId}&goBackHome=${this.data.goBackHome}`
-      //     })
-      //     return;
-      //   }
-      // })
+      const myUid = wx.getStorageSync('uid');
+      if (myUid === groupOrder.organizer) {
+        wx.redirectTo({
+          url: `../collage-details/collage-details?orderId=${orderId}&goBackHome=${this.data.goBackHome}`
+        })
+        return;
+      }
+      res.data.data.joinUserList.forEach(item => {
+        if (item.uid === myUid) {
+          wx.redirectTo({
+            url: `../collage-details/collage-details?orderId=${orderId}&goBackHome=${this.data.goBackHome}`
+          })
+          return;
+        }
+      })
 
 
 

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

@@ -501,12 +501,13 @@ scroll-view {
 }
 
 .last-time-end {
-    width: 88rpx;
+    width: 99rpx;
     height: 38rpx;
     font-size: 30rpx;
     font-weight: 800;
     color: #f14025;
     margin: 0 15rpx;
+    text-align:center;
 }
 
 .left-icon {

pages/index/index.js

@@ -51,9 +51,9 @@ Page({
     winH: 568,
     myIndex: 1,
     followData: [],
-    recommendPageNo: 1,
-    recommendTotalNo: 0,
-    followPageNo: 0,
+    recommendPageNo: 0,
+    recommendTotalNo: 1,
+    followPageNo: 1,
     followPageTotalNo: 1,
     myData: {},
     templates: 'hot',
@@ -66,7 +66,7 @@ Page({
     ifHaveMore: true,
     indexSignDialog: false,
     indexMissionDialog: false,
-    unfinishedCount:0
+    unfinishedCount: 0
   },
   jurisdiction: function () {
     //隐藏弹框
@@ -94,14 +94,14 @@ Page({
     if (myIndex == 0) {
       // groupInit(this);
       this.setData({
-        followPageNo: 0,
+        followPageNo: 1,
       })
       myInit(this);
     }
     if (myIndex == 1) {
-      this.setData({
-        recommendPageNo: 1
-      })
+      // this.setData({
+      //   recommendPageNo: 0
+      // })
       hotInit(this);
     }
     if (myIndex == 2) {
@@ -121,21 +121,35 @@ Page({
       this.updateData(options.index)
     }
     setTimeout(() => {
-      if(wx.getStorageSync('uid')){
+      if (wx.getStorageSync('uid')) {
         httpRequestApi.userLoginRecord().success(res => {
           if (res.data.data) {
             // 有数据弹任务窗口
-            if(this.data.unfinishedCount > 0){
+            if (this.data.unfinishedCount > 0) {
               this.setData({
                 indexSignDialog: true
               })
             }
-            
+
           } else {
             // 没数据弹签到
-            this.setData({
-              indexMissionDialog: true
-            })
+            let oldDay = wx.getStorageSync('oldDay');
+            let newDate = new Date();
+            let timeStep =(newDate.getMonth() + 1).toString() + newDate.getDate().toString()
+            if (oldDay) {
+              let temp = parseInt(timeStep) - parseInt(oldDay)
+              if (temp > 0) {
+                wx.setStorageSync('oldDay', timeStep);
+                this.setData({
+                  indexMissionDialog: true
+                })
+              }
+            } else {
+              wx.setStorageSync('oldDay', timeStep);
+              this.setData({
+                indexMissionDialog: true
+              })
+            }
           }
         })
       }
@@ -163,6 +177,12 @@ Page({
       this.getUserWorksInfo(true);
     }
   },
+  onHide: function(){
+    const str = 'hotData.inputFocus'
+      this.setData({
+        [str]: false
+      });
+  },
   //初始化数据
   // init: function () {
   //   httputil.getOpenidSessionKey((res) => {
@@ -209,9 +229,8 @@ Page({
   },
   // 触底加载
   onReachBottom: function () {
+    console.log(this.data.myIndex )
     if (this.data.myIndex === 0) {
-      console.log(this.data.followPageTotalNo)
-      console.log(this.data.followPageNo)
       this.setData({
         followPageNo: this.data.followPageNo + 1
       })
@@ -224,26 +243,27 @@ Page({
           ifHaveMore: false
         })
       }
-    }
+    } 
     // 当前在推荐页面 加载推荐
-    // if (this.data.myIndex === 1) {
-    //   console.log(this.data.recommendPageNo)
-    //   this.setData({
-    //     recommendPageNo: this.data.recommendPageNo + 1
-    //   })
-    //   if (this.data.recommendPageNo <= this.data.recommendTotalNo) {
-    //     this.getHotRecommend(this.uid, this.data.recommendPageNo, 3);
+    if (this.data.myIndex === 1) {
+      console.log(this.data.recommendPageNo)
+      console.log(this.data.recommendTotalNo)
+      this.setData({
+        recommendPageNo: this.data.recommendPageNo + 1
+      })
+      if (this.data.recommendPageNo <= this.data.recommendTotalNo) {
+        this.getHotRecommendSecond(this.uid, this.data.recommendPageNo, 3);
 
-    //   } else {
-    //     console.log('没有更多')
-    //   }
-    // }
+      } else {
+        console.log('没有更多')
+      }
+    }
 
   },
   onPullDownRefresh: function () {
     //当前在团购页下拉加载
     if (this.data.myIndex === 0) {
-      groupInit(this);
+      // groupInit(this);
     }
 
     wx.showNavigationBarLoading() //在标题栏中显示加载
@@ -288,7 +308,7 @@ Page({
     }
 
   },
-  toMyCourse: function(){
+  toMyCourse: function () {
     wx.navigateTo({
       url: `../../pages/user/mycourse/mycourse?title=我的课程`
     });
@@ -298,15 +318,17 @@ Page({
       url: `../../pages/social/littleFlower/littleFlower`
     });
   },
-  signInBtn: function (e){
+  signInBtn: function (e) {
     this.setData({
       indexSignDialog: false
     })
     console.log(e.detail.formId)
-    httpRequestApi.postFormId(e.detail.formId).success(res=>{console.log(res)})
+    httpRequestApi.postFormId(e.detail.formId).success(res => {
+      console.log(res)
+    })
     this.goToFlower();
   },
-  missionBtn: function(){
+  missionBtn: function () {
     this.setData({
       indexMissionDialog: false
     })

pages/index/index.json

@@ -4,6 +4,7 @@
         "MyToast": "../../component/myToast/myToast",
         "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
     },
+    "enablePullDownRefresh": false,
     "window": {
         "onReachBottomDistance": 50
       }

pages/index/index.wxss

@@ -175,7 +175,8 @@
   flex-direction: row-reverse;
   align-items: center;
   padding-right: 35rpx;
-
+margin-bottom:6rpx;
+margin-left: 4rpx;
 }
 
 .worksCard .topData .authorAvatar {
@@ -207,6 +208,8 @@
 .topData .numberInfo {
   display: flex;
   flex-direction: column;
+  margin-top:-5rpx;
+
 }
 
 .worksCard .wareCardTip {
@@ -234,6 +237,8 @@
   text-align: right;
   /* width:57%; */
   float: right;
+  line-height:37rpx;
+
 }
 
 .worksCard .wareCardLikes {

pages/main/books/books.wxss

@@ -22,9 +22,9 @@
     margin-top: 20rpx;
     width: 214rpx;
     height: 38rpx;
-    font-size: 28rpx;
+    font-size: 30rpx;
     color:#393939;
-    font-weight: 800;
+    font-weight: 400;
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;

pages/main/class/class.js

@@ -241,7 +241,7 @@ Page({
         temp.nickName = item.user.wechatName;
         temp.time = formatDate(item.userRead.gmtModified, 3);
         temp.avatar = item.user.avatar;
-        temp.likes = item.userRead.likeAmount ? item.userRead.likeAmount : 0;
+        temp.likes = item.userRead.playAmount ? item.userRead.playAmount : 0;
         temp.uid = item.userRead.uid;
         temp.id = item.userRead.id;
         this.data.works.push(temp);

pages/main/class/class.wxml

@@ -17,7 +17,7 @@
                 <text class="time">{{item.time}}</text>
             </view>
             <view class="likes">
-                <image class="likeTag" src="../../../static/image/like_gray.png" />
+                <image class="likeTag" src="../../../static/image/hotPlays.png" />
                 <text class="likeNum">{{item.likes}}</text>
             </view>
         </view>

pages/main/class/class.wxss

@@ -193,20 +193,23 @@ height:106rpx;
 
 .readWorksSection .likes {
     display: flex;
-    flex-direction: column;
+    flex-direction: row-reverse;
     /* margin-left: 270rpx; */
-    width: 104rpx;
+    width: 116rpx;
     overflow: hidden;
     text-align: center;
+    align-items: center;
+    margin-right: 28rpx;
 }
 
 .likes .likeTag {
-    margin: 0 auto;
+    /* margin: 0 auto; */
     width: 32rpx;
     height: 28rpx;
+    margin-left: 7rpx;
 }
 
 .likes .likeNum {
     color: #444;
-    font-size: 32rpx;
+    font-size: 29rpx;
 }

pages/main/searchResult/searchResult.js

@@ -1,32 +1,7 @@
 import httpRequestApi from '../../../utils/APIClient';
 Page({
   data: {
-    wareCards:[
-        {
-          title:"铺满色巴掌的水泥道1",
-          grade:"一年级 上学期",
-          img: "../../../static/image/timg.jpg",
-          plays: "1",
-          likes: "2",
-          classId: "1001"
-        },
-        {
-          title:"铺满金色巴掌的水泥道2",
-          grade:"一年级 上学期",
-          img: "../../../static/image/timg.jpg",
-          plays: "12345",
-          likes: "54321",
-          classId: "1002"
-        },
-        {
-          title:"铺满金色巴掌的水泥道3",
-          grade:"一年级 上学期",
-          img: "../../../static/image/timg.jpg",
-          plays: "12345",
-          likes: "54321",
-          classId: "1003"
-        },
-      ]
+    wareCards: []
   },
   onLoad: function (option) {
     console.log(option);
@@ -43,27 +18,27 @@ Page({
     //     })
     // })
   },
-  search: function(key){
-    httpRequestApi.getSearchResult(1,key,1,10).success(res =>{
-        console.log(res);
-        const result = res.data.data.list;
-        const resultTemp = [];
-        result.forEach(item => {
-            console.log(item)
-            const temp = {};
-            temp.title = item.lesson.title;
-            temp.grade = item.lesson.gradeClassify;
-            temp.img = item.lesson.iconImg;
-            temp.classId = item.lesson.id
-            resultTemp .push(temp);
-        });
-        this.setData({
-            wareCards: resultTemp
-        })
-        console.log(this.data.wareCards)
+  search: function (key) {
+    httpRequestApi.getSearchResult(1, key, 1, 10).success(res => {
+      console.log(res);
+      const result = res.data.data.list;
+      const resultTemp = [];
+      result.forEach(item => {
+        console.log(item)
+        const temp = {};
+        temp.title = item.lesson.title;
+        temp.grade = item.lesson.gradeClassify;
+        temp.img = item.lesson.iconImg;
+        temp.classId = item.lesson.id
+        resultTemp.push(temp);
+      });
+      this.setData({
+        wareCards: resultTemp
+      })
+      console.log(this.data.wareCards)
     });
   },
-  openClass: (e) =>{
+  openClass: (e) => {
     let id = e.currentTarget.dataset.classid;
     let title = e.currentTarget.dataset.title;
     wx.navigateTo({

pages/main/searchResult/searchResult.json

@@ -1 +1,5 @@
-{}
+{
+    "usingComponents": {
+        "myPlacerholder": "/component/myPlacerholder/myPlacerholder"
+    }
+}

pages/main/searchResult/searchResult.wxml

@@ -9,4 +9,5 @@
                     <text class="wareCardTip">{{item.grade}}</text>
                 </view> -->
     </view>
+     <myPlacerholder line1="{{'没有您想要的结果'}}" line2="{{'换个关键词再试'}}" wx:if="{{wareCards.length <= 0}}" />  
 </view>

pages/main/searchResult/searchResult.wxss

@@ -10,11 +10,11 @@
 .hotWares .hotWareCard {
     position: relative;
     overflow: hidden;
-    width: 720rpx;
+    width: 100%;
     height: 374rpx;
     background: #fff;
     /* padding: 26rpx; */
-    border-radius: 12rpx;
+    /* border-radius: 12rpx; */
     /* margin: 0 0 18rpx 16rpx; */
     margin: 0 auto 20rpx;
     /* box-shadow: 0 8rpx 6rpx 0 rgba(0, 0, 0, .28); */
@@ -24,8 +24,8 @@
 
 .hotWareCard .wareCardImg {
     display: block;
-    width: 662rpx;
-    height: 272rpx;
+    width: 704rpx;
+    height: 290rpx;
     margin: 26rpx auto 0;
     border-radius: 20rpx;
 }
@@ -82,4 +82,15 @@
     font-size: 24rpx;
     line-height: 41rpx;
 
+}
+
+.search-placerholder{
+    width: 100%;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 800;
+    color: #393939;
+    background: #fff;
 }

pages/social/insideMessage/insideMessage.js

@@ -4,25 +4,40 @@ import {
 } from '../../../utils/util';
 Page({
     data: {
-        messageList: []
+        messageList: [],
+        totalNo: 1,
+        totalSize: 0,
+        index: 1
     },
     onLoad: function (options) {
         wx.setNavigationBarTitle({
             title: '消息列表'
         })
-        httpRequestApi.getMessageList(1, 10).success((res) => {
-            res.data.data.list.forEach( item => {
-                item.gmtCreated = formatDate(item.gmtCreated,1)
+        this.getMessage();
+    },
+    getMessage: function () {
+        console.log(this.data.totalNo)
+        console.log(this.data.index)
+        if (this.data.totalNo < this.data.index) {
+            return;
+        }
+        httpRequestApi.getMessageList(this.data.index, 10).success((res) => {
+            
+            res.data.data.list.forEach(item => {
+                item.gmtCreated = formatDate(item.gmtCreated, 1)
+                this.data.messageList.push(item);
             })
             this.setData({
-                messageList: res.data.data.list
+                messageList: this.data.messageList,
+                totalNo: res.data.data.totalNo,
+                index: this.data.index + 1
             })
-            httpRequestApi.refreshMessageStatus().success((res)=>{
+            httpRequestApi.refreshMessageStatus().success((res) => {
                 console.log(res)
             })
         });
     },
-    // onHide: function(){
-        
-    // }
+    onReachBottom: function () {
+        this.getMessage();
+    }
 })

pages/social/insideMessage/insideMessage.json

@@ -1,3 +1,6 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "window": {
+    "onReachBottomDistance": 50
+  }
 }

pages/social/insideMessage/insideMessage.wxml

@@ -1,6 +1,7 @@
 <view class="message-view">
     <view class="message-box" wx:for="{{messageList}}" wx:key="{{index}}">
         <view class="message-time">{{item.gmtCreated}}</view>
-        <view class="message-text">{{item.type === 'MESSAGE' ? '通知' : item.type === 'OFFICIAL' ? '官方消息' : '本周学习报告'}}: {{item.content}}</view>
+        <view class="message-text">{{item.type === 'MESSAGE' ? '[通知]' : item.type === 'OFFICIAL' ? '[官方消息]' : '[本周学习报告]'}}: {{item.content}}</view>
     </view>
+    <view wx:if="{{messageList.length === 0}}" class="message-box-placerholder">暂无更多消息</view>
 </view>

pages/social/insideMessage/insideMessage.wxss

@@ -25,7 +25,8 @@
 .message-text{
     color: #464646;
     font-weight: 800;
-    font-size: 24rpx;
+    font-size: 29rpx;
+    line-height: 40rpx;
     width: 704rpx;
     min-height: 80rpx;
     margin: 20rpx auto;
@@ -33,4 +34,14 @@
     border-radius: 20rpx;
     padding: 20rpx;
     box-sizing: border-box;
+}
+
+.message-box-placerholder{
+    width: 100%;
+    color: #979797;
+    font-weight: 400;
+    font-size: 29rpx;
+    text-align: center;
+    height: 100rp;
+    line-height: 100rpx;
 }

pages/social/littleFlower/littleFlower.js

@@ -9,7 +9,7 @@ Page({
     },
     onLoad: function (options) {
         wx.setNavigationBarTitle({
-            title: '小红花'
+            title: '每日任务'
         })
         httpRequestApi.getMissionList().success((res) => {
 

pages/social/littleFlower/littleFlower.wxml

@@ -12,7 +12,7 @@
             <view class="cross-red-line" wx:if="{{index !== 6}}"></view>
         </view>
     </view>
-    <view class="flower-title">小小任务条，朗读好习惯</view>
+    <view class="flower-title">天天做任务，领取小红花</view>
     <scroll-view class="mission-box">
         <view class="mission-item" wx:for="{{misssionList}}" wx:key="{{index}}">
             <view>

pages/social/littleFlower/littleFlower.wxss

@@ -132,10 +132,10 @@ margin-left:7rpx;
 }
 
 .mission-item .mission-bonus {
-    display: block;
+    /* display: block; */
     color: #f75642;
     margin-left: 20rpx;
-
+    align-items: stretch;
 }
 
 .mission-bonus .bonus-icon {

pages/social/works/works.js

@@ -202,14 +202,13 @@ Page({
         this.setData({
             addComeOut: 'add-one-come-out'
         })
-
         setTimeout(() => {
             if (this.data.addComeOut) {
                 this.setData({
                     addComeOut: ''
                 })
             }
-        }, 1200)
+        }, 1100)
 
         // 恭喜获得x朵小红花
         if (this.data.isLike) {

pages/social/works/works.wxml

@@ -90,7 +90,7 @@
         </view>
     </view>
     <!-- 分享框 -->
-    <canvas canvas-id="myCanvas" style="width:600rpx; height: 1050rpx; position: absolute; left: -999rpx; top: -9999rpx;"></canvas>
+    <canvas canvas-id="myCanvas" style="width:300px; height: 525px; position: absolute; left: -999rpx; top: -9999rpx;"></canvas>
     <shareDialog id="share-dialog" shareType='works' bindShareDialogClose="shareDialogClose" shareId="{{id}}" />
     <!-- 评论框 -->
     <view class="replySection" wx:if="{{replyModal}}">

pages/social/works/works.wxss

@@ -112,7 +112,7 @@
     height: 23rpx;
     position: absolute;
     left: 13rpx;
-    bottom: 20rpx;
+    bottom: 28rpx;
     opacity: 1;
     
 }

pages/user/myEdit/myEdit.wxml

@@ -4,7 +4,7 @@
       <view class='nickname-box'>
         <text class='setting-title'>宝贝昵称</text>
         <view class='user-action'>
-          <input name='nickname' class='nickname' type='text' placeholder='{{user.nickName}}' placeholder-class='placeholderStyle' focus='{{ true }}' value='{{user.nickName}}' bindblur='saveNickName'>
+          <input name='nickname' class='nickname' type='text' maxlength="9" placeholder='{{user.nickName}}' placeholder-class='placeholderStyle' focus='{{ true }}' value='{{user.nickName}}' bindblur='saveNickName'>
           </input>
         </view>
         <view class='edit-img'>
@@ -42,7 +42,7 @@
       </view>
       <view class='school-box'>
         <text class='setting-title'>学校</text>
-        <input name='address' class='address' type='text' placeholder='{{user.schoolName}}' value='{{ user.schoolName }}' bindblur='saveAddress'></input>
+        <input name='address' maxlength="14" class='address' type='text' placeholder='{{user.schoolName}}' value='{{ user.schoolName }}' bindblur='saveAddress'></input>
         <view class='edit-image'>
           <image src='../../../static/image/edit.png' class='icon'></image>
         </view>

pages/user/mycollection/mycollection.wxss

@@ -9,18 +9,18 @@
 .collection-article {
   position: relative;
   overflow: hidden;
-  width: 720rpx;
+  width: 100%;
   height: 374rpx;
   background: #fff;
-  border-radius: 12rpx;
+  /* border-radius: 12rpx; */
   margin: 0 auto 20rpx;
 
 }
 
 .video-preview {
   display: block;
-  width: 662rpx;
-  height: 272rpx;
+  width: 704rpx;
+  height: 290rpx;
   margin: 26rpx auto 0;
   border-radius: 20rpx;
 

pages/user/mycourse/mycourse.wxss

@@ -25,12 +25,12 @@
 .book-item>.item-title{
   margin-top:18rpx;
   width: 100%;
-  font-size: 24rpx;
+  font-size: 30rpx;
   color:#373737;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
   text-align: center;
-  font-weight:800;
+  font-weight:400;
 
 }

pages/user/myread/myread.js

@@ -26,7 +26,7 @@ Page({
     console.log(option.title);
     if (option.title) {
       wx.setNavigationBarTitle({
-        title: option.title//页面标题为路由参数
+        title: '我的作品'//页面标题为路由参数
       });
       this.setData({
         title: option.title

pages/user/myread/myread.wxml

@@ -42,12 +42,12 @@
       </view>
       <view class="numberInfo">
           <view class="wareCardPlays">
-            <text>{{item.playAmount || 0}}</text>
             <image class="wareCardPlaysImg" lazy-load="true" src="../../../static/image/hotPlays.png" />
+            <text>{{item.playAmount || 0}}</text>
           </view>
           <view class="wareCardLikes">
+            <image class="wareCardLikesImg" lazy-load="true" src="../../../static/image/flower_small_pink.png" />
             <text>{{item.likeAmount || 0}}</text>
-            <image class="wareCardLikesImg" lazy-load="true" src="../../../static/image/like.png" />
           </view>
         </view>
     </view>

pages/user/myread/myread.wxss

@@ -12,11 +12,11 @@
 .worksCard {
   position: relative;
   overflow: hidden;
-  width: 720rpx;
-  height: 476rpx;
+  width: 100%;
+  height: 484rpx;
   background: #fff;
   /* padding: 26rpx; */
-  border-radius: 12rpx;
+  /* border-radius: 12rpx; */
   /* margin: 0 0 18rpx 16rpx; */
   margin: 0 auto 20rpx;
   /* box-shadow: 0 8rpx 6rpx 0 rgba(0, 0, 0, .28); */
@@ -26,8 +26,8 @@
 
 .worksCard .wareCardImg {
   display: block;
-  width: 662rpx;
-  height: 272rpx;
+  width: 704rpx;
+  height: 290rpx;
   margin: 22rpx auto 0;
   border-radius: 20rpx;
 }
@@ -142,7 +142,7 @@
 }
 
 .worksCard .wareCardPlays text {
-  margin-left: 4rpx;
+  margin-right:6rpx;
   color: #5e5e5e;
   font-size: 22rpx;
   text-align: right;
@@ -165,7 +165,7 @@
 }
 
 .worksCard .wareCardLikes text {
-  margin-left: 4rpx;
+  margin-right:6rpx;
   color: #FF9800;
   font-size: 24rpx;
 }

pages/user/myworks/myworks.js

@@ -16,7 +16,7 @@ Page({
     isMyself: false,
   },
   toMyWorks: function(e){
-    let id = e.currentTarget.dataset.id;
+    let id = e.currentTarget.dataset.readid;
     let title = e.currentTarget.dataset.title;
     wx.navigateTo({
       url: `../../social/works/works?id=${id}&title=${title}`

pages/user/myworks/myworks.wxml

@@ -60,7 +60,7 @@
         </view>
       </view>
       <view class='flower-count'>
-        <view class='color'>{{ wareCards.pointAmount || 0 }}</view>
+        <view class='color'>{{ wareCards.integralAmount || 0 }}</view>
         <view class='border-right'>
           <view class='play-img'>
             <image src='../../../static/image/flower.png'></image>
@@ -86,7 +86,7 @@
             <text>{{ item.userRead.playAmount || 0 }}</text>
           </view>
           <view class="wareCardLikes">
-            <image class="wareCardLikesImg" lazy-load="true" src="../../../static/image/flower_small.png" />
+            <image class="wareCardLikesImg" lazy-load="true" src="../../../static/image/flower_small_pink.png" />
             <text>{{ item.userRead.likeAmount || 0 }}</text>
           </view>
         </view>

pages/user/myworks/myworks.wxss

@@ -237,6 +237,7 @@ image {
 .hotWares {
   display: flex;
   flex-wrap: wrap;
+  width: 100%;
   /* background: #e8e8e8; */
 }
 
@@ -326,7 +327,7 @@ image {
   flex-direction: row-reverse;
   align-items: center;
   padding-right: 35rpx;
-
+  margin-bottom: 7rpx;
 }
 
 .worksCard .topData .authorAvatar {
@@ -377,6 +378,7 @@ image {
   height: 26rpx;
   margin-left: 7rpx;
   float: right;
+  margin-right: -3rpx;
 }
 
 .worksCard .wareCardPlays text {

utils/APIClient.js

@@ -20,15 +20,15 @@ module.exports = {
     }).url(url).send();
   },
   // 获取首页人气推荐
-  // getHotRecommend(uid, pageNo, pageSize) {
-  //   let url = getBaseUrl('wx/userRead/recommend');
-  //   return request.getInstance().header({
-  //     uid
-  //   }).data({
-  //     pageNo,
-  //     pageSize,
-  //   }).url(url).send();
-  // },
+  getHotRecommendSecond(uid, pageNo, pageSize) {
+    let url = getBaseUrl('wx/userRead/recommend');
+    return request.getInstance().header({
+      uid
+    }).data({
+      pageNo,
+      pageSize,
+    }).url(url).send();
+  },
   // 获取首页人气推荐2.0 
   getHotRecommend(uid) {
     let url = getBaseUrl('wx/discovery');