Merge branch 'class_lvtz' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-v9

business/pages/classservice/reviewdetail.wxml

 <!--business/pages/classservice/reviewdetail.wxml-->
 <wxs src="../../../filter/index.wxs" module="filter" />
-<view class="container">
+<view class="container {{countDailogShow ? 'containerDisabledScroll' : ''}}">
     <view class="teacher-box">
         <view class="avatar-box"><image class="" src="{{filter.imagify(reviewDetail.school_teacher.avatar, 'image/resize,w_160/format,jpg')}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" /></view>
         <view class="info-box">
@@ -155,14 +155,14 @@
     </view>
     <view class="footer-box">
         <button class="btn" bindtap="toShareCard">分享卡片</button>
-        <button open-type="share" class="btn">转发给给学员</button> 
+        <button open-type="share" class="btn">转发给学员</button> 
     </view>
 </view>
 <view class="count-dailog" wx:if="{{countDailogShow}}">
     <view class="content-box">
         <view class="title">已读统计 
             <view class="close-icon" bindtap="hideCountDailog">
-                <image class=""  src="{{imageRoot}}2c/websiteindex/close.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+                <image class="" src="{{imageRoot}}2c/websiteindex/close.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
             </view>
         </view>
         <view class="tab-box">
@@ -170,11 +170,12 @@
             <view bindtap="tabChange" data-status="{{2}}" class="tab-item {{tabStatus==2 ? 'act-tab-item' : ''}}">未读（{{unReadTotal}}人）<view class="act-line" wx:if="{{tabStatus==2}}"></view></view>   
         </view>
         <view class="remind-box" wx:if="{{tabStatus==2}}" bindtap="remindStudent" >提醒查看</view>
-        <scroll-view class="list-box" scroll-y="true" bindscrolltolower="studentScrolltolower">
+        <view class="list-box" scroll-y="true" bindscrolltolower="studentScrolltolower">
             <block wx:if="{{tabStatus==1}}">
                 <view class="list-item" wx:for="{{readList}}" wx:key="{{index}}">
                         <view class="info">
-                            <image class="" src="{{filter.imagify(item.school_student.avatar, 'image/resize,w_160/format,jpg')}}"  mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+                            <image class="" wx:if="{{item.school_student.avatar}}" src="{{filter.imagify(item.school_student.avatar, 'image/resize,w_160/format,jpg')}}"/>
+                            <image class="" wx:else src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}"/>
                             {{item.school_student.name}} 
                         </view>
                         <view class="time">{{item.created_at}}</view>
@@ -184,14 +185,15 @@
             <block wx:if="{{tabStatus==2}}">
                 <view class="list-item" wx:for="{{unReadList}}" wx:key="{{index}}">
                     <view class="info">
-                        <image class="" src="{{filter.imagify(item.school_student.avatar, 'image/resize,w_160/format,jpg')}}"  mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+                        <image class="" wx:if="{{item.school_student.avatar}}" src="{{filter.imagify(item.school_student.avatar, 'image/resize,w_160/format,jpg')}}" />
+                        <image class="" wx:else src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}"/>
                         {{item.school_student.name}} 
                     </view>
                     <view class="time">{{item.created_at}}</view>
                     <view class="line"></view>
                 </view>
             </block> 
-        </scroll-view>
+        </view>
     </view>
 </view>
 <view class="videodialog"  wx:if="{{videostatus.videoShow}}">

business/pages/classservice/reviewdetail.wxss

 /* business/pages/classservice/reviewdetail.wxss */
 @import "../../../style/radio.wxss";
+page{
+    height: 100%;
+}
 .container{
     padding-top: 50rpx;
-    padding-bottom: 100rpx;
+    padding-bottom: 120rpx;
 }
 .teacher-box{
     display: flex;
@@ -177,7 +180,9 @@
     margin: 36rpx auto;
 }
 .list-box{
-   
+    max-height:600rpx;
+    overflow-y:auto;
+    height: 600rpx;
 }
 .list-box .list-item{
     padding: 25rpx;

business/pages/classservice/rollcalldetail.js

@@ -3,13 +3,6 @@ import {
   schedulesDetailGet,
   callsListGet,
   classroomreviewlistGet,
-
-
-  // classroomdetailGet,
-  readreviewcountGet,
-  // classroomlikesGet,
-  classroomcommentsGet,
-  // memberclassroomcommentDELETE,
   remindpushPOST
 } from '../../../service/business/classservice.js'
 import {
@@ -36,11 +29,6 @@ Page({
     readHasmore: true,
     readEmptyPage: false,
     readTotal:0,
-    unReadList:[],
-    unReadTotal:0,
-    unReadPage:1,
-    unReadHasmore: true,
-    unReadEmptyPage: false,
     listLoading: false,
     remindTips:{
       show: false,
@@ -318,17 +306,19 @@ Page({
       })
     })
   },
+  // 提醒针对学员点评
   remindStudent(){
     remindpushPOST({
       class_id: this.data.classId,
-      schedule_id: this.data.id
+      schedule_id: this.data.id,
+      review_type: 2
     }).then((res)=>{
       const {code, data} = res;
       if(code == 200){
         this.setData({
           remindTips:{
             show: true,
-            text:data.unread_count || 0
+            text: data.unread_count || 0
           }
         })
       }else{

business/pages/classservice/rollcalldetail.wxml

@@ -67,9 +67,9 @@
 
     <view class="title-box">
         <view class="title-l">到课详情（{{schedulesDetail.class_student_sign_count}}/{{schedulesDetail.class_student_count_calls}}）</view>
-        <view class="title-r" wx:if="{{callsListStatics.callsListStatics>0}}">
+        <view class="title-r" wx:if="{{callsListStatics.unread_count>0}}">
             <view class="label">点评</view>
-            <view class="num">已读{{callsListStatics.unread_count}}/{{callsListStatics.read_count}}</view>
+            <view class="num">已读{{callsListStatics.read_count}}/{{callsListStatics.read_count+callsListStatics.unread_count}}</view>
             <view class="warn" bindtap="remindStudent">提醒查看</view>
         </view>
     </view>

constants/api.js

@@ -26,7 +26,6 @@ const apis = {
 			activeReviewGet: `${api}common/active/review/flags`,
 			generatePiiic: `${api}common/clock/piiic`,
 			generateClassReviewPiiic: `${api}common/clock/class_review_piiic`,
-
 			consumerSession: `${api}common/login`,
 			bTokenExchange: `${api}common/business_login`,//B端登录 换取获取token
 			isClock: `${api}consumer/clock/subject/is_clock`,

src/pages/papersquare/classreviewshare.js

@@ -78,7 +78,7 @@ Page({
       ],
     })
     this.reviewDetailGet();
-    this.initPost(`s=${sid}&c=${id}&r=${rid}&t=${type}`, 'src/pages/clockdetail/newindex')
+    this.initPost(`s=${sid}&c=${id}&r=${rid}&t=${type}`, 'src/pages/papersquare/classreviewshare')
   },
   onShow: function () {
   },

src/pages/papersquare/reviewdetail.js

@@ -71,13 +71,25 @@ Page({
    */
   onLoad: function (options) {
     this.innerAudioContext = wx.createInnerAudioContext(); // 当前页面唯一的一个音频容器
-    const {sid, id, rid, type} = options;
-    this.setData({
-      sid,
-      id,
-      rid,
-      type
-    })
+    if (options.scene) {
+      let sceneQuery = scenQueryGet(options.scene);
+      const {s,c, r, t} = sceneQuery;
+      this.setData({
+        sid: s,
+        id: c,
+        rid: r,
+        type: t
+      })
+    }else{
+      const {sid, id, rid, type} = options;
+      this.setData({
+        sid,
+        id,
+        rid,
+        type
+      })
+    }
+    
     this.judgeIsSchoolStudent();
     this.classroomlikesGet();
     this.classroomcommentsGet();