提交 dfe381a4 authored 作者: hexi's avatar hexi

学分下面增加列表

上级 2b9dc081
......@@ -18,7 +18,8 @@ const getMyScore = (callback) => {
myMustStr: _data.required_credits && ((_data.my_required_credits * 1.0 / _data.required_credits * 100).toFixed(1) + '%') || '0%',
unmust: _data.optional_credits,
myUnmust: _data.my_optional_credits,
myUnmustStr: _data.optional_credits && ((_data.my_optional_credits * 1.0 / _data.optional_credits * 100).toFixed(1) + '%') || '0%'
myUnmustStr: _data.optional_credits && ((_data.my_optional_credits * 1.0 / _data.optional_credits * 100).toFixed(1) + '%') || '0%',
lists: _data.lists
}
callback(json)
}
......
......@@ -15,7 +15,8 @@ Page({
myMustStr: '0%',
unmust: 0,
myUnmust: 0,
myUnmustStr: '0%'
myUnmustStr: '0%',
lists: []
}
},
/**
......@@ -24,7 +25,7 @@ Page({
onLoad: function (options) {
wx.showLoading({ title: '页面加载中...', mask: true })
ScoreApi.getMyScore((json) => {
this.setData({ 'score': json })
this.setData({ 'score': json });
wx.hideLoading()
})
},
......
......@@ -6,6 +6,8 @@
<view class='text {{score.myTotal/score.total>0.2 ? "" : "left"}}'>{{score.myTotal}} (分)</view>
</view>
</view>
<view class="col">
<view class='col-5'>
<view class='title'>必修学分<view class='score'>{{score.must}}</view></view>
<view class='pro-line must'>
......@@ -22,5 +24,25 @@
</view>
</view>
</view>
<view></view>
</view>
<view class="list" hover-class="none" hover-stop-propagation="false" wx:if="{{score.lists.length}}">
<view class='list-title'>
<text class="col6-td1">序号</text>
<text class="col6-td2">学期</text>
<text class="col6-td3" style="text-align: center;">课程</text>
<text class="col6-td4">状态</text>
<text class="col6-td5">学分</text>
<text class="col6-td6">成绩</text>
</view>
<view class="list-title" hover-class="none" hover-stop-propagation="false" wx:for="{{score.lists}}" wx:for-index="idx" wx:for-item="itemName" wx:key="idx">
<text class="col6-td1">{{idx}}</text>
<text class="col6-td2">{{itemName.semester_name}}</text>
<text class="col6-td3">{{itemName.course_name}}</text>
<text class="col6-td4">{{itemName.passed ? '通过':'未通过'}}</text>
<text class="col6-td5">{{itemName.credit}}</text>
<text class="col6-td6">{{itemName.score}}</text>
</view>
</view>
</view>
......@@ -11,3 +11,47 @@
.my-score .pro-line.unmust .active { background: #66c6bd; }
.my-score .col-5 { float: left; width: 49%; }
.my-score .col-5.right { float: right; }
.my-score .col{
height:110rpx;
overflow: hidden;
}
.my-score .list{
width: 100%;
padding-top: 30rpx;
}
.my-score .list-title{
width: 100%;
box-sizing: border-box;
-webkit-box-sizing: border-box;
border: 1rpx solid rgb(96, 98, 102);
border-top: none;
line-height: 40rpx;
overflow: hidden;
}
.my-score .list .list-title:first-child{
border-top: 1rpx solid rgb(96, 98, 102);
}
.my-score .list-title text {
float: left;
font-size: 25rpx;
text-align: center;
}
.my-score .list-title .col6-td1 {
width: 60rpx;
}
.my-score .list-title .col6-td2{
width: 134rpx;
}
.my-score .list-title .col6-td3{
width: 300rpx;
text-align: left;
}
.my-score .list-title .col6-td4{
width: 80rpx;
}
.my-score .list-title .col6-td5{
width: 60rpx;
}
.my-score .list-title .col6-td6{
width: 60rpx;
}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论