dd

business/pages/classservice/reviewclass.wxml

@@ -36,7 +36,7 @@
                         <view class="img-status fail"      wx:if="{{item.status == 'fail'}}">上传失败</view>
                     </view>
                     <view class="link-student">
-                        <view class="student-list" bindtap="goSelectstudentlist" data-item="{{item}}" data-index="{{index}}">@{{item.students.length>0 ? (item.students.length>2 ? item.students[0].name+ '等' +item.students.length+'名学员': item.students[0].name+','+(item.students[1] ? item.students[1].name : '') ) : '关联学员'}} <image class="" src="{{imageRoot}}2b/common/close_icon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" data-flag="{{1}}" data-item="{{item}}" data-index="{{index}}" bindtap="closeLinkStudent" /></view>
+                        <view class="student-list" bindtap="goSelectstudentlist" data-item="{{item}}" data-index="{{index}}">@{{item.students.length>0 ? (item.students.length>2 ? item.students[0].name+ '等' +item.students.length+'名学员': item.students[0].name+(item.students[1] ? ','+item.students[1].name : '') ) : '关联学员'}} <image class="" src="{{imageRoot}}2b/common/close_icon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" data-flag="{{1}}" data-item="{{item}}" data-index="{{index}}" bindtap="closeLinkStudent" /></view>
                         <textarea wx:if="{{item.students.length>0}}" name="" id="" class="link-text" cols="30" rows="4" value="{{item.text}}" data-index="{{index}}" placeholder="说点什么吧..." bindinput="getLinkText"></textarea>
                     </view>
                       

business/pages/classservice/reviewdetail.js

@@ -147,7 +147,10 @@ Page({
           data.works = data.works ? JSON.parse(data.works) :'';
         } catch (error) { 
         }
-        console.log(data,'')
+        data.read = Number(data.read);
+        data.unread = Number(data.unread);
+        data.read_remind = Number(data.read_remind);
+        data.unread_remind = Number(data.unread_remind);
         this.setData({
           reviewDetail: data
         })

business/pages/classservice/reviewdetail.wxml

@@ -19,8 +19,8 @@
             </view>
        </view>  
        <view class="count-info">
-           <view class="item"> <text class="" selectable="false" space="false" decode="false">全班</text>已读{{reviewDetail.read}}/{{reviewDetail.unread}}</view>
-           <view class="item"> <text class="" selectable="false" space="false" decode="false">关联人</text>已读{{reviewDetail.read_remind}}/{{reviewDetail.unread_remind}}</view> 
+           <view class="item"> <text class="" selectable="false" space="false" decode="false">全班</text>已读{{reviewDetail.read}}/{{reviewDetail.unread+reviewDetail.read}}</view>
+           <view class="item"> <text class="" selectable="false" space="false" decode="false">关联人</text>已读{{reviewDetail.read_remind}}/{{reviewDetail.unread_remind+reviewDetail.read_remind}}</view> 
        </view>
     </view>
     <view class="line-20"></view>

components/calendar/index.wxml

@@ -27,8 +27,7 @@
           <view wx:else class="dot-day-height b tb ac pc">
             <view class="day border-radius {{(item.week === 0 || item.week === 6) ? 'pink-color' : ''}} {{item.showTodoLabel ? 'day-circle' : '' }} {{item.choosed&&chooseColor ? 'day-choosed-color day-choosed-bg' : ''}} {{item.choosed&&!chooseColor ? 'day-choosed-color day-choosed-bg-c' : ''}} {{ item.disable ? 'disable-day-color disable-day-bg' : '' }} b ac pc">{{item.day}}</view>
           </view> -->
-          <image class="done-icon" src="{{imageRoot}}2c/themeindex/yes-icon.png"
-          mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" wx:if="{{item.todoText.isdone}}"></image>
+          <image class="done-icon" src="{{imageRoot}}2c/themeindex/yes-icon.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" wx:if="{{item.todoText.isdone}}"></image>
           <view class="day border-radius {{item.choosed&&chooseColor ? 'day-choosed-color day-choosed-bg' : ''}} {{item.choosed&&!chooseColor ? 'day-choosed-color day-choosed-bg-c' : ''}} {{ item.disable ? 'disable-day-color disable-day-bg' : '' }} b ac pc" wx:if="{{item.day==today.d&&item.month==today.m&&item.year==today.y}}">今</view>
           <view class="day border-radius {{item.todoText.isrest?'rest-color':''}} {{item.choosed&&!chooseColor ? 'day-choosed-color day-choosed-bg-c' : ''}} {{ item.disable ? 'disable-day-color disable-day-bg' : '' }} b ac pc" wx:else>{{item.todoText.isrest?'休':item.day}}</view>
         </view>

components/calendar/main.js

@@ -165,6 +165,7 @@ const conf = {
     conf.calculateDays(curYear, curMonth, curDate);
     const { todoLabels } = getData('calendar') || {};
     const { afterCalendarRender } = getCalendarConfig();
+    
     if (todoLabels && todoLabels instanceof Array) {
       conf.setTodoLabels({days:todoLabels});
     }

src/pages/calendarthemeindex/index.js

@@ -240,6 +240,7 @@ Page({
   onReady: function () { // Do something when page ready.
   },
   onShow: function (options) { // Do something when page show.
+    const that = this;
     initCalendar({ // 
       multi: false,
       noDefault: false,
@@ -247,20 +248,18 @@ Page({
       afterCalendarRender(ctx) {
       }
     });
-    
-    if(this.data.fixdate) {
-      const fixdate = this.data.fixdate;
+    if(that.data.fixdate) {
+      console.log(that.data.fixdate, 'that.data.fixdate')
+      const fixdate = that.data.fixdate;
       jump(fixdate.split('-')[0], Number(fixdate.split('-')[1]), Number(fixdate.split('-')[2]));
     }
-    if(this.data.setTodoLabelsResult){
-      const result = this.data.setTodoLabelsResult;
-      setTimeout(()=>{
-        setTodoLabels({
-          days: result
-        })
-      }, 1000)
- 
+    if(that.data.setTodoLabelsResult){
+      const result = that.data.setTodoLabelsResult;
+      setTodoLabels({
+        days: result
+      })
     }
+
     this.userShow()
     this.getClockRead(); // 这次注释
     if (this.data.integral !== undefined && Number(this.data.integral) > 0) {
@@ -274,6 +273,7 @@ Page({
       this.autoclosefeedback();
     }
     if (this.data.needREfresh || this.data.needRefresh) {
+      console.log(that.data.fixdate, 'that.data.fixdate2222222222')
       this.getmycalendar(); // 这次注释
       this.themeDetail(); // 这次注释
       this.data.clockPage = 1;
@@ -1929,6 +1929,7 @@ Page({
     const _weeksArr = this.data.weeksArr;
     const today = new Date(new Date().getFullYear() + '/' + (new Date().getMonth() + 1) + '/' + new Date().getDate());
     jump(item.year, item.month, item.day);
+    this.fixdate = `${item.year}-${item.month}-${item.day}`;
     for (let i = 0; i < _weeksArr.length; i++) {
       _weeksArr[i].isSelect = false;
     }

src/pages/papersquare/reviewdetail.js

@@ -137,7 +137,10 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-
+    return {
+      title: `课堂小评详情`,
+      path: `/src/pages/papersquare/reviewdetail?sid=${this.data.sid}&id=${this.data.id}&rid=${this.data.rid}&type=${this.data.type}`
+    }
   },
   judgeIsSchoolStudent () {
     studentidentity({