1

component/hot/hot.js

@@ -11,7 +11,6 @@ export const hotInit = (that) => {
           '../../static/image/timg.jpg',
           '../../static/image/timg.jpg'
         ],
-        indicatorDots: true,
         autoplay: true,
         interval: 5000,
         duration: 700,
@@ -24,6 +23,8 @@ export const hotInit = (that) => {
         hotWorks: [],
         winH: that.data.winH,
         searchIcon: true,
+        unReadMessageNum: 0,
+        myCourse: []
         // circular: true
       }
     }),
@@ -94,18 +95,7 @@ export const hotInit = (that) => {
     httpRequestApi.getIndex(
       uid
     ).success((res) => {
-
-      const banner = res.data.data.banner;
       const recommend = res.data.data.recommendLesson;
-      const bannerTemp = [];
-      banner.forEach(item => {
-        const temp = {};
-        temp.url = item.boothContent;
-        temp.type = item.operationType;
-        temp.id = item.operationContent;
-
-        bannerTemp.push(temp);
-      });
       const recommendTemp = [];
       recommend.forEach(item => {
         const oTemp = {};
@@ -115,24 +105,20 @@ export const hotInit = (that) => {
         oTemp.summary = item.summary;
         recommendTemp.push(oTemp);
       });
-      let bannerIndex = 'hotData.banner';
       let recommendIndex = 'hotData.recommend';
       that.setData({
-        [bannerIndex]: bannerTemp,
         [recommendIndex]: recommendTemp
       })
     })
   }
-  that.getHotRecommend = (uid, pageNo, pageSize) => {
+  that.getHotRecommend = (uid) => {
     httpRequestApi.getHotRecommend(
-      uid,
-      pageNo,
-      pageSize
+      uid
     ).success((res) => {
       console.log(res)
-      const recommendRes = res.data.data.list;
+      const recommendRes = res.data.data;
       // const recommendWorks = [];
-      recommendRes.forEach(item => {
+      recommendRes.hotReader.forEach(item => {
         const temp = {};
         temp.title = item.userRead.title;
         temp.summary = item.userRead.summary;
@@ -150,9 +136,12 @@ export const hotInit = (that) => {
         that.data.hotData.hotWorks.push(temp);
       });
       const hotStr = 'hotData.hotWorks'
+      const myCourseStr = 'hotData.myCourse'
+      const unReadMessageNum = 'hotData.unReadMessageNum'
       that.setData({
         [hotStr]: that.data.hotData.hotWorks,
-        recommendTotalNo: res.data.data.totalNo
+        [myCourseStr]: recommendRes.myCourse,
+        [unReadMessageNum]: recommendRes.unReadMessageNum
       })
     })
   }
@@ -184,5 +173,7 @@ export const hotInit = (that) => {
     console.log(e)
   }
   that.getIndex();
-  that.getHotRecommend(that.uid, 1, 3)
+  that.getHotRecommend(that.uid, 1, 3);
+  // 获取全部课本
+  that.getBookList();
 }

component/hot/hot.wxml

@@ -1,15 +1,15 @@
 <template name="hot">
-    <view class="messageSection">
-        <image class="messageIcon" src="../../static/image/message_icon.png" />
-        <text class="messageText">您有<text class="red-text">5</text>条未读消息【立即查看】</text>
+    <view class="messageSection" wx:if="{{hotData.unReadMessageNum > 0}}">
+        <image class="messageIcon" src="../../static/image/message_icon.png"  />
+        <text class="messageText">您有<text class="red-text">{{hotData.unReadMessageNum}}</text>条未读消息【立即查看】</text>
     </view>
     <view class="myCourseSection">
         <view class="title-regular">我的课程</view>
-        <view class="myCoursePlaceHolder" wx:if="{{!groupData.bookList}}">
+        <view class="myCoursePlaceHolder" wx:if="{{hotData.myCourse.length === 0}}" bindtap="goToBooks">
             <image src="../../static/image/add_class.png" />
         </view>
-        <view class="book-box">
-            <block wx:for="{{groupData.bookList}}" wx:key="{{index}}">
+        <view class="book-box" wx:if="{{hotData.myCourse.length !== 0}}">
+            <block wx:for="{{hotData.myCourse}}" wx:key="{{index}}">
                 <view class="book-item" data-id="{{item.id}}" data-title="{{item.title}}" bindtap="goToBook">
                     <image class="book-img" src="{{item.iconImg}}"></image>
                     <view class="book-title">{{item.subTitle}}</view>

pages/index/index.js

@@ -216,6 +216,20 @@ Page({
       wx.hideNavigationBarLoading() //完成停止加载
       wx.stopPullDownRefresh() //停止下拉刷新
     },1500);
+  },
+  // 获取全部课本
+  getBookList: function () {
+    httpRequestApi.getAllBooks(1, 10).success((res) => {
+      this.data.bookList = res.data.data.list;
+      res.data.data.list.forEach(element => {
+        this.data.selectFlag.push(true);
+      });
+      this.setData({
+        bookList: this.data.bookList
+      })
+    }).fail((error) => {
+      console.log('错误', error)
+    })
   }
-  
+
 })

utils/APIClient.js

@@ -12,7 +12,7 @@ function getBaseUrl(action) {
   return HOST_BASE + action;
 }
 module.exports = {
-  //获取推荐首页信息
+  //获取推荐首页信息(推荐课程)
   getIndex(uid) {
     let url = getProductUrl('wx/index');
     return request.getInstance().header({
@@ -20,13 +20,20 @@ module.exports = {
     }).url(url).send();
   },
   // 获取首页人气推荐
-  getHotRecommend(uid, pageNo, pageSize) {
-    let url = getBaseUrl('wx/userRead/recommend');
+  // getHotRecommend(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');
     return request.getInstance().header({
       uid
-    }).data({
-      pageNo,
-      pageSize,
     }).url(url).send();
   },
   // 获取用户朗读详细信息
@@ -187,7 +194,7 @@ module.exports = {
     }).url(url).data(data).method('POST').send();
   },
   // 获取推荐团购信息
-  getGroupList(pageNo,osType) {
+  getGroupList(pageNo, osType) {
     let url = getBaseUrl(`wx/groupPurchaseInfo/recommend`);
     return request.getInstance().header({
       uid: wx.getStorageSync('uid')
@@ -212,7 +219,7 @@ module.exports = {
     }).url(url).data(data).method('POST').send();
   },
   // 参加团购
-  JoinGroupPurchas(orderId,formId) {
+  JoinGroupPurchas(orderId, formId) {
     console.log(formId)
     console.log(orderId)
     let url = getBaseUrl(`wx/groupPurchase/join`);
@@ -343,12 +350,12 @@ module.exports = {
     }).send();
   },
   // 课程鉴权 包括助力团
-  areYouSuperSecond(os,productId) {
+  areYouSuperSecond(os, productId) {
     let url = getBaseUrl(`wx/groupPurchase/authAll`);
     return request.getInstance().header({
       uid: wx.getStorageSync('uid')
     }).url(url).data({
-      osType:os,
+      osType: os,
       productId
     }).send();
   },