Merge branch 'master' into bluestar

learnOnline/apiService/CourseApi.js

@@ -186,9 +186,9 @@ const getCourseAssess = (cid, sid, callback) => {
   })
 }
 /* 获取试题信息 */
-const getExamDetail = (eid, sid, callback) => {
+const getExamDetail = (eid, sid, courseid, callback) => {
   util.requestApi({
-    url: util.config.URL_PATH1 + '/v2/education/homeworks/' + sid + '/' + eid,
+    url: util.config.URL_PATH1 + '/v2/education/homeworks/' + sid + '/' + courseid + '/' + eid,
     callback: function (res) {
       callback(res)
     }

learnOnline/apiService/ScoreApi.js

@@ -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)
     }

learnOnline/pages/learnSystem/courseContent/courseContent.js

@@ -114,16 +114,20 @@ Page({
     
     this.cid = options.id
     this.sid = options.sid
-    CourseApi.getCourseDetail(this.cid, this.sid, (json) => {
-      this.setData({ 'headerInfo': json.headerInfo })
-      this.setData({ 'tabs[0].content': json.tabs0Content })
-      this.setData({ 'tabs[1].chapterList': json.tabs1ChapterList })
-      json.tabs3richTest && this.setData({ 'tabs[3].richText': json.tabs3richTest.replace(/<img.*?(src=["|'].*?["|']).*?>/gi, '<img width="100%" $1>') })
-      CourseApi.getCourseAssess(this.cid, this.sid, (json1) => {
-        this.setData({ 'tabs[3].assess': json1 })
-        wx.hideLoading()
+    if (this.cid != '' && this.sid != '') {
+      CourseApi.getCourseDetail(this.cid, this.sid, (json) => {
+        this.setData({ 'headerInfo': json.headerInfo })
+        this.setData({ 'tabs[0].content': json.tabs0Content })
+        this.setData({ 'tabs[1].chapterList': json.tabs1ChapterList })
+        json.tabs3richTest && this.setData({ 'tabs[3].richText': json.tabs3richTest.replace(/<img.*?(src=["|'].*?["|']).*?>/gi, '<img width="100%" $1>') })
+        CourseApi.getCourseAssess(this.cid, this.sid, (json1) => {
+          this.setData({ 'tabs[3].assess': json1 })
+          wx.hideLoading()
+        })
       })
-    })
+    } else {
+      wx.showLoading({ title: '页面数据异常，请联系管理员！', mask: true })
+    }
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

learnOnline/pages/learnSystem/courseContent/examDetail/examDetail.js

@@ -131,7 +131,7 @@ Page({
     if (wx.getStorageSync('_homework')) {
       this.setData({ 'exam': this.updateData(wx.getStorageSync('_homework')) })
     }
-    CourseApi.getExamDetail(this.data.exam.id, this.data.exam.semester_id, (res) => {
+    CourseApi.getExamDetail(this.data.exam.id, this.data.exam.semester_id, this.param.course_id, (res) => {
       let _data = res.data
       let json = _data.homework
       if (json) {
@@ -214,11 +214,11 @@ Page({
     }
     // this.unArrRandomSort(arr)
     this.param.work_contents = JSON.stringify(arr)
-    this.param.score = (score/total*100).toFixed(1)
+    this.param.score = (score/total*100).toFixed(1);
     wx.showLoading({ title: '提交中...', mask: true })
     CourseApi.submitExamDetail(this.param, (res) => {
       if (res.data.status) {
-        CourseApi.getExamDetail(this.data.exam.id, this.data.exam.semester_id, (res) => {
+        CourseApi.getExamDetail(this.data.exam.id, this.data.exam.semester_id, this.param.course_id, (res) => {
           let _data = res.data
           let json = _data.homework
           if (json) {

learnOnline/pages/learnSystem/myScore/myScore.js

@@ -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()
     })
   },

learnOnline/pages/learnSystem/myScore/myScore.wxml

@@ -6,21 +6,43 @@
       <view class='text {{score.myTotal/score.total>0.2 ? "" : "left"}}'>{{score.myTotal}} (分)</view>
     </view>
   </view>
-  <view class='col-5'>
-    <view class='title'>必修学分<view class='score'>{{score.must}}</view></view>
-    <view class='pro-line must'>
-      <view class='active' style='width: {{score.myMustStr}};'>
-        <view class='text {{score.myMust/score.must>0.4 ? "" : "left"}}'>{{score.myMust}} (分)</view>
+
+  <view class="col">
+    <view class='col-5'>
+      <view class='title'>必修学分<view class='score'>{{score.must}}</view></view>
+      <view class='pro-line must'>
+        <view class='active' style='width: {{score.myMustStr}};'>
+          <view class='text {{score.myMust/score.must>0.4 ? "" : "left"}}'>{{score.myMust}} (分)</view>
+        </view>
       </view>
     </view>
-  </view>
-  <view class='col-5 right'>
-    <view class='title'>选修学分<view class='score'>{{score.unmust}}</view></view>
-    <view class='pro-line unmust'>
-      <view class='active' style='width: {{score.myUnmustStr}};'>
-        <view class='text {{score.myUnmust/score.unmust>0.4 ? "" : "left"}}'>{{score.myUnmust}} (分)</view>
+    <view class='col-5 right'>
+      <view class='title'>选修学分<view class='score'>{{score.unmust}}</view></view>
+      <view class='pro-line unmust'>
+        <view class='active' style='width: {{score.myUnmustStr}};'>
+          <view class='text {{score.myUnmust/score.unmust>0.4 ? "" : "left"}}'>{{score.myUnmust}} (分)</view>
+        </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>

learnOnline/pages/learnSystem/myScore/myScore.wxss

@@ -10,4 +10,48 @@
 .my-score .pro-line.must .active { background: #8ca4cf; }
 .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-5.right { float: right; }
\ No newline at end of file
+.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