Merge branch 'wuying' into 'master'

Wuying

See merge request !46

pages/index/classDetail/classDetail.wxml

@@ -24,10 +24,9 @@
 			</view>
 		</view>
 		<view class="status">
-			<view class="evaluation" data-id="{{item.child_id}}" data-class_single_id="{{item.class_single_id}}"  catchtap="goperformance" wx:if="{{item.is_leave == 0}}">运动评价</view>
+			<view class="evaluation" data-id="{{item.child_id}}" data-class_single_id="{{item.class_single_id}}"  catchtap="goperformance" wx:if="{{item.is_leave == 0 && item.sign_status == 1}}">运动评价</view>
 			<view class="leave" wx:else>已请假</view>
 			<view class="unread" wx:if="{{ !item.class_moment }}"></view>
 		</view>
 	</view>
-	<!-- <view class="line"></view>	 -->
 </view>
\ No newline at end of file

pages/index/courseInstant/courseInstant.js

@@ -35,6 +35,7 @@ Page({
 				lesson_id: this.data.lesson_id
 			},
 			callback:(data)=>{
+				console.log(data.class_moment)
 				if (data.class_moment !=null) {
 					let class_moment = JSON.parse(data.class_moment)
 					let arr1 = [], arr2 = []
@@ -163,13 +164,13 @@ Page({
 			url: 'coach/moment',
 			type: 'POST',
 			data: {
-				// coach_id: '5',
 				coach_id : app.globalData.coach_id,
 				lesson_id: this.data.lesson_id,
 				class_moment: JSON.stringify(arr)
 			},
 			callback:(data)=>{
 				base.toast('提交成功')
+				base.goBack(2)
 			}
 		}
 		base.newRequest(params)

pages/index/courseInstant/courseInstant.wxml

@@ -10,7 +10,7 @@
 				<text class='iconfont iconguanbi'></text>
 			</view>
 		</view>
-		<view class='addBox flex-h flex-vc flex-hc' bindtap="chooseVideo" wx:if="{{imgBox.length < 1}}">
+		<view class='addBox flex-h flex-vc flex-hc' bindtap="chooseVideo" wx:if="{{videoBox.length < 1}}">
 			<text class='iconfont iconshipin'></text>
 		</view>
 	</view>

pages/index/performance/performance.js

@@ -66,10 +66,6 @@ Page({
                 class_id: this.data.class_id,
                 lesson_id: this.data.lesson_id,
                 child_id: this.data.child_id,
-                // coach_id: 5,
-                // class_id: 16,
-                // lesson_id: 69,
-                // child_id: 303,
             },
             callback: (data) => {
                 this.setData({
@@ -77,17 +73,20 @@ Page({
                     coachcomment: data,
                     scoreList: data.comment_score,
                 })
-                var arrs = [];
-                var newArrs = [];
-                for (var i = 0; i < this.data.scoreList.length; i++) {
-                    let option = {
-                        name: this.data.scoreList[i].comment_norm.name + ' ' + this.data.scoreList[i].score,
-                        max: 100
+                if (this.data.scoreList.length > 0) {
+                    var arrs = [];
+                    var newArrs = [];
+                    for (var i = 0; i < this.data.scoreList.length; i++) {
+                        let option = {
+                            name: this.data.scoreList[i].comment_norm.name + ' ' + this.data.scoreList[i].score,
+                            max: 100
+                        }
+                        arrs.push(option)
+                        newArrs.push(this.data.scoreList[i].score)
                     }
-                    arrs.push(option)
-                    newArrs.push(this.data.scoreList[i].score)
+                    this.getOption(arrs, newArrs)
                 }
-                this.getOption(arrs, newArrs)
+                
             },
         }
         base.newRequest(params)
@@ -103,8 +102,8 @@ Page({
                 show: false
             },
             radar: {
-                // radius: 100
-                center: ['52%', '50%'],
+                radius: 90,
+                center: ['50%', '50%'],
                 shape: 'circle',
                 splitNumber: 4, // 分割段数
                 indicator: xData, // 数据
@@ -185,7 +184,7 @@ Page({
             },
             callback: (data) => {
                 this.setData({
-                    awardList: data
+                    awardList: data.has
                 })
             }
         }

pages/index/performance/performance.wxml

@@ -16,8 +16,8 @@
 			<view class="teacher_right">{{coachcomment.class_comment}}</view>
 		</view>
 	</view>
-	<view class="line"></view>
-	<view class="parents">
+	<view class="line" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}"></view>
+	<view class="parents" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}">
 		<view class="title">家长回复</view>
 		<view class="flex-h">
 			<image src="/images/default_head.png" wx:if="{{coachcomment.child.wx_user.avatarurl == null}}"></image>
@@ -27,12 +27,11 @@
 		<view class="comments">{{coachcomment.comment_reply}}</view>
 	</view>
 </view>
-<view class="one">
+<view class="one" wx:if="{{awardList.length > 0}}">
 	<view class="title">收获徽章</view>
 	<view class="flex-h flex-hw flex-vc">
 		<block wx:for='{{awardList}}' wx:key='index' wx:for-item="item">
-			<image class="awardone" src="/images/my/per_pic_02.png" wx:if="{{item.badges.icon == null}}"></image>
-			<image class="awardone" src="{{item.badges.icon}}" wx:else></image>
+			<image class="awardone" src="{{item.badges.icon_active}}"></image>
 		</block>
 	</view>
 </view>
\ No newline at end of file

pages/index/performance/performance.wxss

@@ -43,9 +43,7 @@ page {
   color: #1A1A1A;
   margin-bottom: 20rpx;
 }
-/* .teacher {
-  padding-top: 44rpx;
-} */
+
 .line{
   width: 634rpx;
   height: 1px;
@@ -57,6 +55,8 @@ page {
   font-family: PingFang SC;
   font-weight: 500;
   color: #1A1A1A;
+  width: 80rpx;
+  margin-right: 25rpx;
 }
 .teacher_left image {
   width: 80rpx;
@@ -70,6 +70,7 @@ page {
   margin-top: 8rpx;
 }
 .teacher_right {
+  width: 500rpx;
   padding: 20rpx;
   font-size: 24rpx;
   font-family: PingFang SC;

project.config.json

@@ -178,7 +178,7 @@
                 {
                     "name": "课程瞬间上传",
                     "pathName": "pages/index/courseInstant/courseInstant",
-                    "query": "",
+                    "query": "type=check&lesson_id=93",
                     "scene": null
                 },
                 {