2.2版本 跑马灯功能（被注释

component/group/group.wxml

@@ -27,14 +27,14 @@
         </block>
         <view class="btn-area">
             <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" />
+              <!-- <image src="../../static/image/little_firends.png" /> -->
             </view>
             <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" />
+              <!-- <image src="../../static/image/little_firends.png" /> -->
             </view>
             <view class="btn-item" wx:if="{{groupData.totalSize >3}}" bindtap="change">换一批看看
-              <image src="../../static/image/refresh.png" />
+              <!-- <image src="../../static/image/refresh.png" /> -->
             </view>
             <!-- <view class="btn-item expect-margin"  wx:if="{{groupData.totalSize === 0}}" bindtap="more" data-type="course ">
                开个团试试

component/group/group.wxss

@@ -109,9 +109,9 @@ scroll-view {
 
 .btn-area {
     width: 100%;
-    color: #12c962;
+    color: #444;
     font-size: 30rpx;
-    font-weight: 800;
+    font-weight: 400;
     display: flex;
     flex-direction: row;
     justify-content: space-around;

component/hot/hot.js

@@ -27,7 +27,7 @@ export const hotInit = (that) => {
         // circular: true
       }
     })
-  } 
+  }
   // 搜索方法
   that.searchHandler = () => {
       if (that.data.hotInput.lenght !== 0) {
@@ -135,12 +135,15 @@ export const hotInit = (that) => {
       console.log(that.data.hotData.hotWorks.length)
       if (that.data.hotData.hotWorks.length > 0) {
         const myCourseStr = 'hotData.myCourse'
-        const unReadMessageNum = 'hotData.unReadMessageNum'
-        console.log(recommendRes)
+        const isMessageNormal = 'hotData.isMessageNormal'
+        const unReadMessageContent = 'hotData.unReadMessageContent'
+        // unread为true时显示 未读消息，unread为false时显示通知消息，并且通知消息不可读
         that.setData({
           [myCourseStr]: recommendRes.myCourse,
-          [unReadMessageNum]: recommendRes.unreadCount
+          [isMessageNormal]: recommendRes.unread,
+          [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.content : recommendRes.annunciateMsg.content,
         })
+
         return;
       }
       recommendRes.hotReader.forEach(item => {
@@ -153,31 +156,32 @@ export const hotInit = (that) => {
         temp.classId = item.userRead.id;
         temp.time = formatDate(item.userRead.gmtCreated, 3);
         temp.avatar = item.user ? item.user.avatar : '';
-        temp.profession =  item.user ?  item.user.profession : '';
-        temp.uid =  item.user ?  item.user.uid : '';
+        temp.profession = item.user ? item.user.profession : '';
+        temp.uid = item.user ? item.user.uid : '';
         // temp.avatar = item.user.avatar;
-        temp.nickName = item.user ?   item.user.wechatName : '';
+        temp.nickName = item.user ? item.user.wechatName : '';
         // recommendWorks.push(temp);
         that.data.hotData.hotWorks.push(temp);
       });
       const hotStr = 'hotData.hotWorks'
       const myCourseStr = 'hotData.myCourse'
-      const unReadMessageNum = 'hotData.unReadMessageNum'
-      console.log(recommendRes)
+      const isMessageNormal = 'hotData.isMessageNormal'
+      const unReadMessageContent = 'hotData.unReadMessageContent'
       that.setData({
         [hotStr]: that.data.hotData.hotWorks,
         [myCourseStr]: recommendRes.myCourse,
-        [unReadMessageNum]: recommendRes.unreadCount,
+        [isMessageNormal]: recommendRes.unread,
+        [unReadMessageContent]: recommendRes.unread ? recommendRes.unreadMsg.content : recommendRes.annunciateMsg.content,
         unfinishedCount: recommendRes.unfinishedCount
       })
     })
   }
 
-  that.getHotRecommendSecond = (uid,pageNo,pageSize) =>{
-    httpRequestApi.getHotRecommendSecond(uid,pageNo,pageSize).success(res => {
+  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;
+      if (recommendRes.length === 0) return;
       // const recommendWorks = [];
       recommendRes.forEach(item => {
         const temp = {};
@@ -231,7 +235,7 @@ export const hotInit = (that) => {
   }
   console.log(that.data.hotData.recommend)
 
-  if(wx.getStorageSync('uid')){
+  if (wx.getStorageSync('uid')) {
     that.getIndex();
     that.getHotRecommend(wx.getStorageSync('uid'));
   }

component/hot/hot.wxml

@@ -1,18 +1,40 @@
 <template name="hot">
-    <view class="messageSection" wx:if="{{hotData.unReadMessageNum > 0}}" bindtap="goToMessage">
+    <!-- <view class="messageSection" wx:if="{{hotData.unReadMessageNum > 0}}" bindtap="goToMessage"> -->
+    <!-- <view class="marquee">
+        <view class="content">
+            <text>【新春派兑】小红花兑换乐高玩具，6666朵小红花可兑换价值约500元的乐高积木玩具，2月26日兑换。</text>
+            <text style="display: inline-block; width: 5em;"></text>
+            <text>【新春派兑】小红花兑换乐高玩具，6666朵小红花可兑换价值约500元的乐高积木玩具，2月26日兑换。</text>
+            <text style="display: inline-block; width: 5em;"></text>
+            <text>【新春派兑】小红花兑换乐高玩具，6666朵小红花可兑换价值约500元的乐高积木玩具，2月26日兑换。</text>
+            <text style="display: inline-block; width: 5em;"></text>
+        </view>
+    </view> -->
+    <!-- <view class="messageSection" >
+        <image class="messageIcon" src="../../static/image/message_icon.png" />
+        <view class="marquee">
+            <view class="content">
+                <text>{{hotData.unReadMessageContent}}</text>
+                <text style="display: inline-block; width: 5em;"></text>
+                <text>{{hotData.unReadMessageContent}}</text>
+                <text style="display: inline-block; width: 5em;"></text>
+                <text>{{hotData.unReadMessageContent}}</text>
+                <text style="display: inline-block; width: 5em;"></text>
+            </view>
+        </view>
+    </view> -->
+    <view class="messageSection" bindtap="goToMessage" wx:if="{{hotData.isMessageNormal}}">
         <image class="messageIcon" src="../../static/image/message_icon.png" />
-        <text class="messageText">您有<text class="red-text">{{hotData.unReadMessageNum}}</text>条未读消息【立即查看】
-        </text>
+        <text class="messageText">{{hotData.unReadMessageContent}}</text>
     </view>
     <view class="myCourseSection">
         <view class="title">
-<view class="title-regular">我的课程</view>
-         <view class="right" bindtap="toMyCourse" wx:if="{{hotData.myCourse.length > 3}}">
-          更多
-          <image src="../../static/image/black_to.png" />
-        </view>
+            <view class="title-regular">我的课程</view>
+            <view class="right" bindtap="toMyCourse" wx:if="{{hotData.myCourse.length > 3}}">
+                更多
+                <image src="../../static/image/black_to.png" />
+            </view>
         </view>
-        
         <view class="myCoursePlaceHolder" wx:if="{{hotData.myCourse.length === 0}}" bindtap="goToBooks">
             <image src="../../static/image/add_class.png" />
         </view>

component/hot/hot.wxss

@@ -1,6 +1,5 @@
 .messageSection {
     width: 720rpx;
-    
     height: 80rpx;
     background: #fff;
     border-radius: 40rpx;
@@ -10,21 +9,72 @@
     padding: 10rpx;
     box-sizing: border-box;
     margin: 15rpx auto 0;
+    overflow: hidden;
 }
 
 .messageIcon {
     width: 60rpx;
     height: 60rpx;
     border-radius: 50%;
+    /* flex-shrink:0; */
+
+}
+
+/* 跑马灯 */
+@keyframes marque-animation {
+    from {
+        transform: translateX(0);
+    }
+
+    to {
+        transform: translateX(-33.33%);
+    }
+}
+
+
+.marquee {
+    width: 90%;
+    height: 44rpx;
+    line-height: 44rpx;
+    /* background: #fff; */
+    border: none;
+    display: block;
+    margin: 0 auto;
+    overflow: hidden;
+    white-space: nowrap;
+    /* text-overflow: clip; */
+    /* position: relative; */
+    /* font-size: 28rpx; */
+    border-radius: 40rpx;
+}
+
+.marquee .content {
+    width: auto;
+    display: inline-block;
+    /* position: absolute; */
+    /* padding-right: 0px; */
+    animation-name: marque-animation;
+    animation-duration: 9s;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+    /* white-space: nowrap; */
+
+    /* height: 30rpx; */
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #4f4f50;
 }
 
 .messageText {
-    /* width: 349rpx; */
-    height: 30rpx;
+    width: 86%;
+    height: 36rpx;
     font-size: 30rpx;
     font-weight: 500;
     color: #4f4f50;
-    margin-left: 115rpx;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    margin-left: 15rpx;
 }
 
 swiper {
@@ -317,12 +367,14 @@ swiper {
     font-weight: 800;
     margin-right: 5rpx;
 }
-.swiper-dots text{
+
+.swiper-dots text {
     width: 100%;
     height: 100%;
     line-height: 100%;
     text-align: center;
 }
+
 .dot-active {
     background: #12c962;
 }
@@ -346,7 +398,7 @@ swiper {
     overflow-x: hidden;
     /* justify-content: space-around; */
     align-items: center;
-  overflow: hidden;
+    overflow: hidden;
     /* padding: 0 20rpx; */
     box-sizing: border-box;
     position: absolute;

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

@@ -68,9 +68,10 @@
             <view class="line2"></view>
             <view class="line3"></view>
         </view>
-        <view class="invitation-btn" bindtap="jionGroup" wx:if="{{!stillGoing || !ifGroupSuccessed}}">
+        <form class="invitation-btn" report-submit="{{formIsANAsshole}}" bindsubmit="jionGroup" wx:if="{{!stillGoing || !ifGroupSuccessed}}">
             <text>我要{{groupOsType === 'IOS' ? '助力' : '参团'}}</text>
-        </view>
+            <button class="formBtn" form-type="submit"></button>
+        </form>
     </view>
     <view scroll-y="{{true}}" wx:if="{{!isLoading}}">
         <view class="catalog">

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

@@ -551,6 +551,8 @@ scroll-view {
     width: 434rpx;
     height: 80rpx;
     margin: 0 auto 20rpx;
+    display: block;
+    position: relative;
 }
 
 

pages/social/littleFlower/littleFlower.js

@@ -36,184 +36,192 @@ Page({
             this.getSignInData();
         });
     },
-    getSignInData: function () {
-        httpRequestApi.getSignInData().success(res => {
-            console.log(res)
-            let today = res.data.data.currentTime;
-            let continuousDay = res.data.data.continuousDay;
-            let dateList = [];
-            let myIndex = 0
-            for (let index = 0; index < 7; index++) {
-                let temp = {};
-                temp.index = index;
-                if (continuousDay <= 7) {
-                    if (continuousDay - 1 === index) {
-                        temp.isToday = true
-                        myIndex = index;
-                    } else {
-                        temp.isToday = false
-                    }
-                } else {
-                    if (6 === index) {
-                        temp.isToday = true
-                        myIndex = index;
-                    } else {
-                        temp.isToday = false
-                    }
-                }
+    // getSignInData: function () {
+    //     httpRequestApi.getSignInData().success(res => {
+    //         console.log(res)
+    //         let today = res.data.data.currentTime;
+    //         let continuousDay = res.data.data.continuousDay;
+    //         let dateList = [];
+    //         let myIndex = 0
+    //         for (let index = 0; index < 7; index++) {
+    //             let temp = {};
+    //             temp.index = index;
+    //             if (continuousDay <= 7) {
+    //                 if (continuousDay - 1 === index) {
+    //                     temp.isToday = true
+    //                     myIndex = index;
+    //                 } else {
+    //                     temp.isToday = false
+    //                 }
+    //             } else {
+    //                 if (6 === index) {
+    //                     temp.isToday = true
+    //                     myIndex = index;
+    //                 } else {
+    //                     temp.isToday = false
+    //                 }
+    //             }
 
-                dateList.push(temp);
-            }
-            dateList.forEach((item, index) => {
-                let pointNum = myIndex - index;
-                switch (continuousDay) {
-                    case 1:
-                        if (pointNum >= 0 && pointNum <= 5) {
-                            item.style = 'red';
-                            item.mark = '5';
-                        } else if (pointNum < 0 && pointNum >= -3) {
-                            item.style = 'white';
-                            item.mark = '5';
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 2:
-                        if (pointNum >= 0 && pointNum <= 2) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum < 0 && pointNum >= -2) {
-                            item.style = 'white';
-                            item.mark = '5';
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 3:
-                        if (pointNum >= 0 && pointNum <= 3) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum === -1) {
-                            item.style = 'white';
-                            item.mark = '5';
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 4:
-                        if (pointNum >= 0 && pointNum <= 4) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 5:
-                        if (pointNum > 0 && pointNum <= 4) {
-                            item.style = 'red';
-                            item.mark = '5';
-                        } else if(pointNum === 0){
-                            item.style = 'red';
-                            item.mark = '10';
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 6:
-                        if (pointNum > 1) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum <= 1 && pointNum >= 0) {
-                            item.style = 'red';
-                            item.mark = '10';
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 7:
-                        if (pointNum > 2) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum <= 2 && pointNum >= 0) {
-                            item.style = 'red';
-                            item.mark = '10';
-                        } else {
-                            item.style = 'white';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 8:
-                        if (pointNum > 3) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum <= 3 && pointNum >= 0) {
-                            item.style = 'red';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 9:
-                        if (pointNum > 4) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum <= 4 && pointNum >= 0) {
-                            item.style = 'red';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 10:
-                        if (pointNum > 5) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum <= 5 && pointNum >= 0) {
-                            item.style = 'red';
-                            item.mark = '10';
-                        }
-                        break;
-                    case 11:
-                        if (pointNum > 6) {
-                            item.style = 'red';
-                            item.mark = '5';
-                            // 超过今天五个圈圈
-                        } else if (pointNum <= 6 && pointNum >= 0) {
-                            item.style = 'red';
-                            item.mark = '10';
-                        }
-                        break;
-                    default:
-                        item.style = 'red';
-                        item.mark = '10';
-                        break;
-                }
-                // 生成日期
-                if (pointNum < 0) {
-                    item.time = formatDate(today + (pointNum * 86400000 * -1), 6);
-                }
-                if (pointNum === 0) {
-                    item.time = '今日';
-                }
-                if (pointNum > 0) {
-                    item.time = formatDate(today  - pointNum * 86400000, 6);
-                }
-            });
+    //             dateList.push(temp);
+    //         }
+    //         dateList.forEach((item, index) => {
+    //             let pointNum = myIndex - index;
+    //             switch (continuousDay) {
+    //                 case 1:
+    //                     if (pointNum >= 0 && pointNum <= 5) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                     } else if (pointNum < 0 && pointNum >= -3) {
+    //                         item.style = 'white';
+    //                         item.mark = '5';
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 2:
+    //                     if (pointNum >= 0 && pointNum <= 2) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum < 0 && pointNum >= -2) {
+    //                         item.style = 'white';
+    //                         item.mark = '5';
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 3:
+    //                     if (pointNum >= 0 && pointNum <= 3) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum === -1) {
+    //                         item.style = 'white';
+    //                         item.mark = '5';
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 4:
+    //                     if (pointNum >= 0 && pointNum <= 4) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 5:
+    //                     if (pointNum > 0 && pointNum <= 4) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                     } else if(pointNum === 0){
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 6:
+    //                     if (pointNum > 1) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum <= 1 && pointNum >= 0) {
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 7:
+    //                     if (pointNum > 2) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum <= 2 && pointNum >= 0) {
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     } else {
+    //                         item.style = 'white';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 8:
+    //                     if (pointNum > 3) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum <= 3 && pointNum >= 0) {
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 9:
+    //                     if (pointNum > 4) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum <= 4 && pointNum >= 0) {
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 10:
+    //                     if (pointNum > 5) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum <= 5 && pointNum >= 0) {
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 case 11:
+    //                     if (pointNum > 6) {
+    //                         item.style = 'red';
+    //                         item.mark = '5';
+    //                         // 超过今天五个圈圈
+    //                     } else if (pointNum <= 6 && pointNum >= 0) {
+    //                         item.style = 'red';
+    //                         item.mark = '10';
+    //                     }
+    //                     break;
+    //                 default:
+    //                     item.style = 'red';
+    //                     item.mark = '10';
+    //                     break;
+    //             }
+    //             // 生成日期
+    //             if (pointNum < 0) {
+    //                 item.time = formatDate(today + (pointNum * 86400000 * -1), 6);
+    //             }
+    //             if (pointNum === 0) {
+    //                 item.time = '今日';
+    //             }
+    //             if (pointNum > 0) {
+    //                 item.time = formatDate(today  - pointNum * 86400000, 6);
+    //             }
+    //         });
+    //         this.setData({
+    //             dateList,
+    //             continuousDay
+    //         })
+    //     });
+    // },
+    getSignInData:function(){
+        httpRequestApi.getSignInData().success((res)=>{
             this.setData({
-                dateList,
-                continuousDay
+                dateList: res.data.data.signInfo,
+                continuousDay: res.data.data.continuousDay
             })
-        });
+        })
     },
     countTheDay: function (item) {
 

pages/social/littleFlower/littleFlower.wxml

@@ -2,13 +2,22 @@
     <view class="green-placerholder"></view>
     <view class="sign-in-title">已连续签到{{continuousDay}}天</view>
     <view class="sign-in-box">
-        <view wx:for="{{dateList}}" wx:key="{{index}}" class="date-item">
+        <!-- <view wx:for="{{dateList}}" wx:key="{{index}}" class="date-item">
             <image wx:if="{{item.style === 'red'}}" class="date-complete" src="../../../static/image/sign_in_icon.png" />
             <view class="date-left">
                 <view class="date-circle" style="background: {{item.style === 'red' ? '#f75642' : '#fff'}}; color: {{item.style === 'red' ? '#fff' : '#f75642'}} ">{{item.mark}}</view>
                 <view class="date-time">{{item.time}}</view>
             </view>
             <view class="cross-red-line" wx:if="{{index !== 6}}"></view>
+        </view> -->
+
+         <view wx:for="{{dateList}}" wx:key="{{index}}" class="date-item">
+            <image wx:if="{{item.isSign}}" class="date-complete" src="../../../static/image/sign_in_icon.png" />
+            <view class="date-left">
+                <view class="date-circle" style="background: {{item.isSign ? '#f75642' : '#fff'}}; color: {{item.isSign ? '#fff' : '#f75642'}} ">{{item.count}}</view>
+                <view class="date-time">{{item.date}}</view>
+            </view>
+            <view class="cross-red-line" wx:if="{{index !== 6}}"></view>
         </view>
     </view>
     <view class="flower-title">天天做任务，领取小红花</view>

pages/social/prize/prize.wxss

@@ -2,7 +2,7 @@
     width: 100%;
     /* height: 100%; */
     /* overflow: hidden; */
-    background: rgb(247, 90, 9);
+    background: rgb(248, 130, 43);
     min-height:100%;
 }
 .prize-icon{

utils/APIClient.js

@@ -465,12 +465,12 @@ module.exports = {
       }).url(url).send();
   },
   // 获取用户连续签到日期
-  getSignInData(){
-    let url = getBaseUrl('wx/loginLog');
-    return request.getInstance().header({
-      uid: wx.getStorageSync('uid')
-    }).url(url).send();
-  },
+  // getSignInData(){
+  //   let url = getBaseUrl('wx/loginLog');
+  //   return request.getInstance().header({
+  //     uid: wx.getStorageSync('uid')
+  //   }).url(url).send();
+  // },
   // 保存formId
   postFormId(formId){
     let url = getBaseUrl('wx/form');
@@ -479,5 +479,12 @@ module.exports = {
     }).data({
       formId
     }).url(url).method('POST').send();
+  },
+  // 获取签到信息 
+  getSignInData(){
+    let url = getBaseUrl('wx/loginLog/signIn');
+    return request.getInstance().header({
+      uid: wx.getStorageSync('uid')
+    }).url(url).send();
   }
 }