Commit 7908326c authored by 石盼盼's avatar 石盼盼

Merge branch 'shipanpan' into 'master'

运动评价保存判断条件bug修改

See merge request !32
parents 14cb9b7e d6e4965d
...@@ -90,12 +90,16 @@ Page({ ...@@ -90,12 +90,16 @@ Page({
}, },
// 保存 // 保存
save: function () { save: function () {
let Score = true
this.data.scoreArr.map((e) => { this.data.scoreArr.map((e) => {
if(e.score == 0){ if(e.score == 0){
base.toast('运动表现分值不能为0') base.toast('运动表现分值不能为0')
Score = false;
return return
} }
}); });
if (!Score) return
if (this.data.value =='') { if (this.data.value =='') {
base.toast('教练评语不能为空') base.toast('教练评语不能为空')
return return
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</view> </view>
<view class="item" wx:for="{{lessonList}}" wx:key="index" data-id="{{item.id}}" wx:for-index="idx" > <view class="item" wx:for="{{lessonList}}" wx:key="index" data-id="{{item.id}}" wx:for-index="idx" >
<image src="/images/select_circle.png" wx:if="{{item.lesson_status == 1}}"></image> <image src="/images/select_circle.png" wx:if="{{item.lesson_status == 1}}"></image>
<image src="/images/circle.png" wx:else></image> <image src="/images/sex_unselect.png" wx:else></image>
<view class="line" wx:if="{{idx != lessonList.length - 1}}"></view> <view class="line" wx:if="{{idx != lessonList.length - 1}}"></view>
<view class="{{item.lesson_status == 1 ? 'lesson' : 'unlesson'}}">第{{item.class_index}}节课</view> <view class="{{item.lesson_status == 1 ? 'lesson' : 'unlesson'}}">第{{item.class_index}}节课</view>
<view class="date">日期:{{item.class_date}}</view> <view class="date">日期:{{item.class_date}}</view>
......
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