|
@@ -14,7 +14,7 @@
|
|
|
<view style="opacity:0;"> {{item.class_hour}}学时 </view>
|
|
|
<text>{{item.class_hour}}学时</text>
|
|
|
<!-- <text>{{item.finished_time}}/{{item.total_time}}</text> -->
|
|
|
- <view class="check" style="color:#FF5E4E;" wx:if='{{item.status != 1}}'>未完成</view>
|
|
|
+ <view class="check" style="color:#FF5E4E;" wx:if='{{item.mark_status != 1}}'>未完成</view>
|
|
|
<view class="check" wx:else><image src="../../images/gou.png" mode="widthFix"></image>已完成</view>
|
|
|
</view>
|
|
|
</navigator>
|
|
@@ -28,14 +28,17 @@
|
|
|
</view>
|
|
|
</picker>
|
|
|
</view> -->
|
|
|
- <navigator class="test" wx:for="{{papers}}" wx:key="*this" url="../subject/subject?id={{item.id}}&status={{item.status}}&class_id={{class_id}}&order_id={{order_id}}">
|
|
|
+ <navigator class="test" wx:for="{{papers}}" wx:key="*this" url="../subject/subject?id={{item.id}}&status={{item.mark_status}}&class_id={{class_id}}&order_id={{order_id}}">
|
|
|
<view class="title">{{item.title}}</view>
|
|
|
<text>{{item.class_hour}}学时/{{item.full_mark}}分/{{item.time_limit}}分钟</text>
|
|
|
- <view class="score" wx:if='{{item.status == 1}}'>
|
|
|
+ <view class="score" wx:if='{{item.mark_status == 1}}'>
|
|
|
<image src="../../images/score.png" mode="widthFix"></image> <text> {{item.mark}}分</text>
|
|
|
<image src="../../images/gou.png" mode="widthFix"></image> 已完成
|
|
|
</view>
|
|
|
- <navigator wx:else >开始练习</navigator>
|
|
|
+ <view class="score" wx:else>
|
|
|
+ <image wx:if="{{item.mark_count>0}}" src="../../images/score.png" mode="widthFix"></image> <text wx:if="{{item.mark_count>0}}"> {{item.mark}}分</text>
|
|
|
+ <navigator>开始练习</navigator>
|
|
|
+ </view>
|
|
|
</navigator>
|
|
|
</view>
|
|
|
<navigator url="../clocklist/clocklist?id={{signup_id}}" style="position:fixed;bottom:100rpx;background-color: rgba(53,139,255,1);" wx:if="{{show&&signup_id}}"
|