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

business/pages/classservice/classdetail.wxss

@@ -1110,7 +1110,7 @@ page{
     height:28rpx;
     background:rgba(0,0,0,1);
     opacity:0.1;
-    margin: 0 13rpx;
+    margin: 0 26rpx;
 }
 .line-10{
     width: 100%;
@@ -1228,6 +1228,9 @@ page{
     text-align: center;
     margin-bottom: 60rpx;
 }
+.select-student-dailog .dailog-content .student-list .student-item .avatar-box{
+    padding-bottom: 16rpx;
+}
 .select-student-dailog .dailog-content .student-list .student-item .avatar-box image{
     width:107rpx;
     height:107rpx;

business/pages/classservice/classreviewsingle.wxml

@@ -197,7 +197,7 @@
         </view>
     </view>
 
-    <form bindsubmit="save" report-submit="true">
+    <form bindsubmit="save" report-submit="true" class="submitform">
         <button class="submitbtn" form-type="submit">发布</button>
     </form>
     <sound-isrecording

business/pages/classservice/classreviewsingle.wxss

@@ -232,6 +232,10 @@ page{
     position: relative;
     margin-right: 27rpx;
 }
+.submitform{
+    display: block;
+    padding: 127rpx 0 86rpx;
+}
 .submitbtn{
     width: 365rpx;
     height: 80rpx;
@@ -242,7 +246,7 @@ page{
     justify-content: center;
     font-size: 30rpx;
     color: #fff;
-    margin: 127rpx auto 86rpx;
+    margin: 0 auto;
 }
 
 .common-dialog {

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}}" wx:if="{{item.students.length>0}}" 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}}" wx:if="{{item.students.length>0}}" 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>
                 </view>

business/pages/classservice/reviewdetail.wxss

@@ -63,6 +63,7 @@ page{
     font-family:PingFang SC;
     font-weight:bold;
     color:rgba(0,0,0,1);
+    line-height: 1;
 }
 .count-box .title-box .detail-btn{
     font-size:26rpx;
@@ -321,6 +322,7 @@ page{
     color:rgba(124,137,162,1);
     padding: 36rpx;
     border-bottom:1px solid rgba(0,0,0,.05);
+    padding-left: 24rpx;
 }
 .detail-likes-list .fingureupoicon{
     width: 27rpx;
@@ -413,20 +415,22 @@ page{
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(99,99,99,1);
-    padding-right: 7rpx;
+    min-width: 50rpx;
 }
 .response-detail .nickname{
     font-size:22rpx;
     font-family:PingFang SC;
     font-weight:bold;
     color:rgba(108,122,151,1);
-
+    max-width: 80rpx;
 }
 .response-detail .response-text{
     font-size:22rpx;
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(99,99,99,1); 
+    flex: 1;
+    word-break: break-all;
 }
 /* 老师标志 */
 .teacher-tag{
@@ -451,6 +455,8 @@ page{
     font-weight:400;
     color:rgba(124,137,162,1);
     padding: 24rpx 0 24rpx 24rpx;
+    display: flex;
+    align-items: center;
 }
 .detail-comment-content-title image{
     width: 27rpx;
@@ -522,4 +528,7 @@ page{
     color:rgba(67,67,67,1);
     line-height: 100rpx;
     text-align: center;
+}
+.commen-comment-box{
+    padding-top: 22rpx;
 }
\ No newline at end of file

business/pages/classservice/rewardpoints.wxss

@@ -22,7 +22,7 @@
     width: 124rpx;
     height: 124rpx;
     border-radius: 50%;
-    /* padding: 4rpx; */
+    padding: 4rpx;
     background: #1AE1EB;
     z-index: 1;
 }

business/pages/classservice/rollcalldetail.wxss

@@ -122,8 +122,8 @@
     display: flex;
     align-items: center;
     line-height: 1;
-    padding: 38rpx 0;
-    margin: 18rpx 0 30rpx 0;
+    padding-top: 38rpx;
+    /* margin: 18rpx 0 30rpx 0; */
 }
 .operate-right{
     flex: 1;
@@ -178,9 +178,10 @@
 .title-box{
     font-size:26rpx;
     line-height: 1;
-    padding: 50rpx 22rpx;
+    padding: 24rpx 22rpx;
     display: flex;
     justify-content: space-between;
+    padding-top: 60rpx;
 }
 .title-box>view{
     display: flex;
@@ -419,8 +420,9 @@
 
 
 /* 点评列表 */
-.content-box{
+.content-box{ 
     padding: 0 24rpx;
+    padding-top: 38rpx;
 }
 .content-box .content-item{
     padding: 38rpx 24rpx 38rpx 56rpx;

src/components/gallerycard/index.wxss

@@ -120,6 +120,7 @@
     line-height: 1;
 }
 .sign-item .sign-user-info .sign-user-name-box .sign-create-box .sign-count text{
+    font-size: 22rpx;
     color: #333;
     font-weight: bold;
 }

src/pages/papersquare/reviewdetail.js

@@ -93,10 +93,6 @@ Page({
     this.judgeIsSchoolStudent();
     this.classroomlikesGet();
     this.classroomcommentsGet();
-    if(type == 1){
-      // this.readListGet('init');
-      // this.unReadList('init');
-    }
   },
 
   /**

src/pages/papersquare/reviewdetail.wxss

@@ -2,7 +2,7 @@
 @import "../../../style/radio.wxss";
 .container{
     padding-top: 50rpx;
-    padding-bottom: 100rpx;
+    padding-bottom: 120rpx;
 }
 .teacher-box{
     display: flex;
@@ -232,6 +232,7 @@
     font-weight:400;
     color:rgba(124,137,162,1);
     padding: 36rpx;
+    padding-left: 24rpx;
     border-bottom:1px solid rgba(0,0,0,.05);
 }
 .detail-likes-list .fingureupoicon{
@@ -321,20 +322,23 @@
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(99,99,99,1);
-    padding-right: 7rpx;
+    /* padding-right: 7rpx; */
+    min-width: 50rpx
 }
 .response-detail .nickname{
     font-size:22rpx;
     font-family:PingFang SC;
     font-weight:bold;
     color:rgba(108,122,151,1);
-
+    min-width: 80rpx;
 }
 .response-detail .response-text{
     font-size:22rpx;
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(99,99,99,1); 
+    flex: 1;
+    word-break: break-all;
 }
 /* 老师标志 */
 .teacher-tag{
@@ -358,7 +362,7 @@
     font-family:PingFang SC;
     font-weight:400;
     color:rgba(124,137,162,1);
-    padding: 36rpx 0 24rpx 24rpx;
+    padding: 24rpx 0 24rpx 24rpx;
 }
 .detail-comment-content-title image{
     width: 27rpx;
@@ -377,4 +381,7 @@
     font-weight:400;
     color:rgba(144,144,144,1);
     line-height:65rpx;
+}
+.commen-comment-box{
+    padding-top: 22rpx;
 }
\ No newline at end of file