Commit 5738c936 authored by 吴颖's avatar 吴颖

'修改测试问题'

parent 61b1a1d2
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
</view> </view>
</view> </view>
<view class="status"> <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="leave" wx:else>已请假</view>
<view class="unread" wx:if="{{ !item.class_moment }}"></view> <view class="unread" wx:if="{{ !item.class_moment }}"></view>
</view> </view>
</view> </view>
<!-- <view class="line"></view> -->
</view> </view>
\ No newline at end of file
...@@ -35,6 +35,7 @@ Page({ ...@@ -35,6 +35,7 @@ Page({
lesson_id: this.data.lesson_id lesson_id: this.data.lesson_id
}, },
callback:(data)=>{ callback:(data)=>{
console.log(data.class_moment)
if (data.class_moment !=null) { if (data.class_moment !=null) {
let class_moment = JSON.parse(data.class_moment) let class_moment = JSON.parse(data.class_moment)
let arr1 = [], arr2 = [] let arr1 = [], arr2 = []
...@@ -163,13 +164,13 @@ Page({ ...@@ -163,13 +164,13 @@ Page({
url: 'coach/moment', url: 'coach/moment',
type: 'POST', type: 'POST',
data: { data: {
// coach_id: '5',
coach_id : app.globalData.coach_id, coach_id : app.globalData.coach_id,
lesson_id: this.data.lesson_id, lesson_id: this.data.lesson_id,
class_moment: JSON.stringify(arr) class_moment: JSON.stringify(arr)
}, },
callback:(data)=>{ callback:(data)=>{
base.toast('提交成功') base.toast('提交成功')
base.goBack(2)
} }
} }
base.newRequest(params) base.newRequest(params)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<text class='iconfont iconguanbi'></text> <text class='iconfont iconguanbi'></text>
</view> </view>
</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> <text class='iconfont iconshipin'></text>
</view> </view>
</view> </view>
......
...@@ -66,10 +66,6 @@ Page({ ...@@ -66,10 +66,6 @@ Page({
class_id: this.data.class_id, class_id: this.data.class_id,
lesson_id: this.data.lesson_id, lesson_id: this.data.lesson_id,
child_id: this.data.child_id, child_id: this.data.child_id,
// coach_id: 5,
// class_id: 16,
// lesson_id: 69,
// child_id: 303,
}, },
callback: (data) => { callback: (data) => {
this.setData({ this.setData({
...@@ -77,6 +73,7 @@ Page({ ...@@ -77,6 +73,7 @@ Page({
coachcomment: data, coachcomment: data,
scoreList: data.comment_score, scoreList: data.comment_score,
}) })
if (this.data.scoreList.length > 0) {
var arrs = []; var arrs = [];
var newArrs = []; var newArrs = [];
for (var i = 0; i < this.data.scoreList.length; i++) { for (var i = 0; i < this.data.scoreList.length; i++) {
...@@ -88,6 +85,8 @@ Page({ ...@@ -88,6 +85,8 @@ Page({
newArrs.push(this.data.scoreList[i].score) newArrs.push(this.data.scoreList[i].score)
} }
this.getOption(arrs, newArrs) this.getOption(arrs, newArrs)
}
}, },
} }
base.newRequest(params) base.newRequest(params)
...@@ -103,8 +102,8 @@ Page({ ...@@ -103,8 +102,8 @@ Page({
show: false show: false
}, },
radar: { radar: {
// radius: 100 radius: 90,
center: ['52%', '50%'], center: ['50%', '50%'],
shape: 'circle', shape: 'circle',
splitNumber: 4, // 分割段数 splitNumber: 4, // 分割段数
indicator: xData, // 数据 indicator: xData, // 数据
...@@ -185,7 +184,7 @@ Page({ ...@@ -185,7 +184,7 @@ Page({
}, },
callback: (data) => { callback: (data) => {
this.setData({ this.setData({
awardList: data awardList: data.has
}) })
} }
} }
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<view class="teacher_right">{{coachcomment.class_comment}}</view> <view class="teacher_right">{{coachcomment.class_comment}}</view>
</view> </view>
</view> </view>
<view class="line"></view> <view class="line" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}"></view>
<view class="parents"> <view class="parents" wx:if="{{coachcomment.comment_reply!='' && coachcomment.comment_reply!=null}}">
<view class="title">家长回复</view> <view class="title">家长回复</view>
<view class="flex-h"> <view class="flex-h">
<image src="/images/default_head.png" wx:if="{{coachcomment.child.wx_user.avatarurl == null}}"></image> <image src="/images/default_head.png" wx:if="{{coachcomment.child.wx_user.avatarurl == null}}"></image>
...@@ -27,12 +27,11 @@ ...@@ -27,12 +27,11 @@
<view class="comments">{{coachcomment.comment_reply}}</view> <view class="comments">{{coachcomment.comment_reply}}</view>
</view> </view>
</view> </view>
<view class="one"> <view class="one" wx:if="{{awardList.length > 0}}">
<view class="title">收获徽章</view> <view class="title">收获徽章</view>
<view class="flex-h flex-hw flex-vc"> <view class="flex-h flex-hw flex-vc">
<block wx:for='{{awardList}}' wx:key='index' wx:for-item="item"> <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_active}}"></image>
<image class="awardone" src="{{item.badges.icon}}" wx:else></image>
</block> </block>
</view> </view>
</view> </view>
\ No newline at end of file
...@@ -43,9 +43,7 @@ page { ...@@ -43,9 +43,7 @@ page {
color: #1A1A1A; color: #1A1A1A;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
/* .teacher {
padding-top: 44rpx;
} */
.line{ .line{
width: 634rpx; width: 634rpx;
height: 1px; height: 1px;
...@@ -57,6 +55,8 @@ page { ...@@ -57,6 +55,8 @@ page {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #1A1A1A; color: #1A1A1A;
width: 80rpx;
margin-right: 25rpx;
} }
.teacher_left image { .teacher_left image {
width: 80rpx; width: 80rpx;
...@@ -70,6 +70,7 @@ page { ...@@ -70,6 +70,7 @@ page {
margin-top: 8rpx; margin-top: 8rpx;
} }
.teacher_right { .teacher_right {
width: 500rpx;
padding: 20rpx; padding: 20rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
......
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
{ {
"name": "课程瞬间上传", "name": "课程瞬间上传",
"pathName": "pages/index/courseInstant/courseInstant", "pathName": "pages/index/courseInstant/courseInstant",
"query": "", "query": "type=check&lesson_id=93",
"scene": null "scene": null
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment