Merge remote-tracking branch 'origin/class_lvtz' into wxl-develop

business/pages/classservice/classdetail.wxss

@@ -1182,12 +1182,14 @@ page{
 }
 .select-student-dailog .dailog-content{
     width: 100%;
-    height: 80vh;
+    height: 80%;
     position: absolute;
     left: 0;
     bottom: 0;
     background:rgba(255,255,255,1);
     border-radius:20rpx 20rpx 0px 0px;
+    display: flex;
+    flex-direction: column;
 }
 .select-student-dailog .dailog-content .search-box{
     width:525rpx;
@@ -1219,8 +1221,10 @@ page{
     text-align: center;
 }
 .select-student-dailog .dailog-content .student-list{
+    flex: 1;
     display: flex;
     flex-wrap: wrap;
+    /* height: calc(80vh - 30px); */
 }
 .select-student-dailog .dailog-content .student-list .student-item{
     display: inline-block;

business/pages/classservice/reviewdetail.js

@@ -511,11 +511,12 @@ Page({
   prevImg (e) {
     const {dataset} = e.currentTarget;
     const current = dataset.src;
-    const comment = dataset.comment || '';
     const images = this.data.reviewDetail.content.img;
+    const works = this.data.reviewDetail.works;
     let _images = images.filter((ele) => ele.type == 'image').map(ele => ele.src);
+    let _works =  works.filter((ele) => ele.type == 'image').map(ele => ele.src);
     wxPreviewImage({
-      urls: _images,
+      urls: _images.concat(_works),
       current: current,
       type: 'clockitem'
     })

business/pages/classservice/reviewdetail.wxml

@@ -73,7 +73,7 @@
          </view>
          <view class="img-box" wx:if="{{(reviewDetail.content.img && reviewDetail.content.img.length>0) || (reviewDetail.works && reviewDetail.works.length>0)}}">
              <view class="bigimgbox" wx:for="{{reviewDetail.works}}" wx:for-item="video" wx:key="index"  style="{{reviewDetail.content.img.length>0 ? 'margin-bottom: 20rpx' :''}}">
-                <view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
+                <view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" bindtap="prevImg" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
                     <image class="img" src="{{filter.imagify(video.src, 'image/resize,w_640/format,jpg/quality,q_80')}}" mode="widthFix" lazy-load="true" binderror="" bindload="" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}"></image>
                 </view>
              </view>

src/pages/papersquare/classreviewshare.js

@@ -52,7 +52,7 @@ Page({
 
     selectCardLong: false,
     imgSrc: '',
-    sharePage: 'src/pages/papersquare/classsharereview',    // TODO 换路径 src/pages/papersquare/classsharereview 事例src/pages/clockdetail/newindex
+    sharePage: 'src/pages/papersquare/reviewdetail',    // TODO 换路径 src/pages/papersquare/classsharereview 事例src/pages/clockdetail/newindex
   },
   onLoad: function (options) {
     const {sid,rid,type,id} = options;

src/pages/papersquare/reviewdetail.js

@@ -5,7 +5,8 @@ import {
   getRandomFilename,
   audioorigin,
   matchBlacklist,
-  LocalStorage
+  LocalStorage,
+  scenQueryGet
 } from '../../../utilities/index.js';
 import {
   classroomdetailGet,
@@ -77,6 +78,7 @@ Page({
     if (options.scene) {
       let sceneQuery = scenQueryGet(options.scene);
       const {s,c, r, t} = sceneQuery;
+      console.log(sceneQuery)
       this.setData({
         sid: s,
         id: c,
@@ -360,11 +362,12 @@ Page({
   prevImg (e) {
     const {dataset} = e.currentTarget;
     const current = dataset.src;
-    const comment = dataset.comment || '';
     const images = this.data.reviewDetail.content.img;
+    const works = this.data.reviewDetail.works;
     let _images = images.filter((ele) => ele.type == 'image').map(ele => ele.src);
+    let _works =  works.filter((ele) => ele.type == 'image').map(ele => ele.src);
     wxPreviewImage({
-      urls: _images,
+      urls: _images.concat(_works),
       current: current,
       type: 'clockitem'
     })
@@ -548,7 +551,7 @@ Page({
   generatelongimg(){
     const {sid,id,rid,type} = this.data;
       wx.navigateTo({
-        url: `/src/pages/papersquare/classreviewshare?sid=${sid}&cid=${id}&rid=${rid}&type=${type}`
+        url: `/src/pages/papersquare/classreviewshare?sid=${sid}&id=${id}&rid=${rid}&type=${type}`
       })
   }
 })
\ No newline at end of file

src/pages/papersquare/reviewdetail.wxml

@@ -63,7 +63,7 @@
          </view>
          <view class="img-box" wx:if="{{(reviewDetail.content.img && reviewDetail.content.img.length>0) || (reviewDetail.works && reviewDetail.works.length>0)}}">
             <view class="bigimgbox" wx:for="{{reviewDetail.works}}" wx:for-item="video" wx:key="index"  style="{{reviewDetail.content.img.length>0 ? 'margin-bottom: 20rpx' :''}}">
-                <view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
+                <view class="imgbox" wx:if="{{video.type == 'image'}}" data-src="{{video.src}}" bindtap="prevImg"  style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}">
                     <image class="img" src="{{filter.imagify(video.src, 'image/resize,w_640/format,jpg/quality,q_80')}}" mode="widthFix" lazy-load="true" binderror="" bindload="" style="{{video.students && video.students.length>0 ? 'border-radius: 8rpx 8rpx 0 0;' :''}}"></image>
                 </view>
             </view>