update

learnOnline/apiService/MsgApi.js

@@ -12,7 +12,7 @@ const getMyMsg = (callback) => {
         return {
           isRead: false,
           id: _.id,
-          text: _.message,
+          text: _.message_body,
           time: _.created_time,
           isShow: false // 该字段用来做 每条信息的打开、关闭
         }

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

@@ -95,6 +95,10 @@ Page({
               case 3: str += 'D,'; break;
               case 4: str += 'E,'; break;
               case 5: str += 'F,'; break;
+              case 6: str += 'G,'; break;
+              case 7: str += 'H,'; break;
+              case 8: str += 'I,'; break;
+              case 9: str += 'J,'; break;
             }
           }
         })
@@ -228,6 +232,11 @@ Page({
       }
     })
   },
+  /* 重做试题 */
+  repeatExam: function (e) {
+    this.setData({ 'exam': this.updateData(wx.getStorageSync('_homework')) })
+    wx.pageScrollTo({ scrollTop: 0 })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

learnOnline/pages/learnSystem/courseContent/examDetail/examDetail.wxml

@@ -13,7 +13,7 @@
           <view class='q-num'>{{index+1}}.</view><rich-text class='q-title' nodes='{{item.title}}'></rich-text><view class='q-type'>(单选题)</view>
           <radio-group class='radio-group' bindchange='radioChange' data-index='{{index}}'>
             <block wx:for='{{item.arr}}' wx:key='{{index}}' wx:for-item='item1' wx:for-index='index1'>
-              <label class='radio {{item.cur && item1.checked && "success"}} {{item.cur && !item1.checked && item1.selected && "error"}}'><radio value='{{index1}}' disabled='{{item.cur}}' checked='{{item1.selected}}'/>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : "G"))))) }}. {{item1.option}}</label>
+              <label class='radio {{item.cur && item1.checked && "success"}} {{item.cur && !item1.checked && item1.selected && "error"}}'><radio value='{{index1}}' disabled='{{item.cur}}' checked='{{item1.selected}}'/>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : (index1 == 6 ? "G" : (index1 == 7 ? "H" : (index1 == 8 ? "I" : (index1 == 9 ? "J" : "K"))))))))) }}. {{item1.option}}</label>
             </block>
           </radio-group>
           <block wx:if='{{item.cur}}'><view class='result'>正确答案：{{item.cur}}</view></block>
@@ -24,7 +24,7 @@
           <view class='q-num'>{{index+1}}.</view><rich-text class='q-title' nodes='{{item.title}}'></rich-text><view class='q-type'>(多选题)</view>
           <checkbox-group class='checkbox-group' bindchange='checkboxChange' data-index='{{index}}'>
             <block wx:for='{{item.arr}}' wx:key='{{index}}' wx:for-item='item1' wx:for-index='index1'>
-              <label class='checkbox {{item.cur && item1.checked && "success"}} {{item.cur && !item1.checked && item1.selected && "error"}}'><checkbox value='{{index1}}' disabled='{{item.cur}}' checked='{{item1.selected}}'/>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : "G"))))) }}. {{item1.option}}</label>
+              <label class='checkbox {{item.cur && item1.checked && "success"}} {{item.cur && !item1.checked && item1.selected && "error"}}'><checkbox value='{{index1}}' disabled='{{item.cur}}' checked='{{item1.selected}}'/>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : (index1 == 6 ? "G" : (index1 == 7 ? "H" : (index1 == 8 ? "I" : (index1 == 9 ? "J" : "K"))))))))) }}. {{item1.option}}</label>
             </block>
           </checkbox-group>
           <block wx:if='{{item.cur}}'><view class='result'>正确答案：{{item.cur}}</view></block>
@@ -34,4 +34,7 @@
   </view>
   <view class='btn {{exam.work_contents && "on"}}' bindtap='submitExam' data-submit='{{!!exam.work_contents}}'>{{exam.work_contents ? "已提交" : "提交"}}</view>
   <view class='care'>(注意：测试只有一次提交机会)</view>
+  <!--<block wx:if='{{!!exam.work_contents}}'>
+    <view class='btn' bindtap='repeatExam'>重做</view>
+  </block>-->
 </view>

learnOnline/pages/learnSystem/myScore/myScore.wxml

@@ -3,24 +3,24 @@
   <view class='title'>总计学分<view class='score'>{{score.total}}</view></view>
   <view class='pro-line total'>
     <view class='active' style='width: {{score.myTotalStr}};'>
-      <view class='text {{score.myTotal/score.total>0.2 ? "" : "left"}}'>{{score.myTotal}} ({{score.myTotalStr}})</view>
+      <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+1}}</view></view>
+    <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}} ({{score.myMustStr}})</view>
+        <view class='text {{score.myMust/score.must>0.4 ? "" : "left"}}'>{{score.myMust}} (分)</view>
       </view>
     </view>
   </view>
-  <!-- <view class='col-5 right'>
+  <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}} ({{score.myUnmustStr}})</view>
+        <view class='text {{score.myUnmust/score.unmust>0.4 ? "" : "left"}}'>{{score.myUnmust}} (分)</view>
       </view>
     </view>
-  </view> -->
+  </view>
   <view></view>
 </view>