chengjie лет назад: 6
Родитель
Сommit
cc6842c3e8
3 измененных файлов с 10 добавлено и 16 удалено
  1. 7 7
      pages/other/homework.wxml
  2. 1 7
      pages/other/homework.wxss
  3. 2 2
      utils/util.js

+ 7 - 7
pages/other/homework.wxml

@@ -8,8 +8,8 @@
8
   </view>
8
   </view>
9
   <view class='panelItem0 panelItem FlexRow'>
9
   <view class='panelItem0 panelItem FlexRow'>
10
     <view class='panelItem1 FlexColumn'>
10
     <view class='panelItem1 FlexColumn'>
11
-      <view class="panelItem01">总进度</view>
12
-      <view class="panelItem02">由以下10个项目组成(下拉刷新结果</view>
11
+      <view class="panelItem01">【待修改】</view>
12
+      <view class="panelItem02">下拉刷新结果</view>
13
     </view>
13
     </view>
14
     <view class='panelItem2'>{{FinishedCount}}%</view>
14
     <view class='panelItem2'>{{FinishedCount}}%</view>
15
   </view>
15
   </view>
@@ -18,7 +18,7 @@
18
   <view class="panelTitle FlexRow">
18
   <view class="panelTitle FlexRow">
19
     <view class="panelTitle1 FlexColumn">
19
     <view class="panelTitle1 FlexColumn">
20
       <view class="">热身准备</view>
20
       <view class="">热身准备</view>
21
-      <view class="panelTitle11">有2个项目,由您自行检查是否做到。</view>
21
+      <view class="panelTitle11">完成后请主动点右侧按钮确认。</view>
22
     </view>
22
     </view>
23
     <view></view>
23
     <view></view>
24
   </view>
24
   </view>
@@ -47,9 +47,9 @@
47
 
47
 
48
   <view class="panelTitle FlexRow">
48
   <view class="panelTitle FlexRow">
49
     <view class="panelTitle1 FlexColumn">
49
     <view class="panelTitle1 FlexColumn">
50
-      <view class="">课程自学</view>
51
-      <view class="panelTitle11">有4节课,自动检查。建议先收看课程再开始操作。</view>
52
-      <view class="panelTitle12" bindtap="gotoLessonList">去收看</view>
50
+      <view class="">课程</view>
51
+      <view class="panelTitle11">先上课后操作,遇到问题请到班群讨论。看完后系统自动打勾。</view>
52
+      <view class="panelTitle12" bindtap="gotoLessonList">查看课程</view>
53
     </view>
53
     </view>
54
     <view></view>
54
     <view></view>
55
   </view>
55
   </view>
@@ -86,7 +86,7 @@
86
   <view class="panelTitle FlexRow">
86
   <view class="panelTitle FlexRow">
87
     <view class="panelTitle1 FlexColumn">
87
     <view class="panelTitle1 FlexColumn">
88
       <view class="">实践操作</view>
88
       <view class="">实践操作</view>
89
-      <view class="panelTitle11">有2个项目,自动检查。</view>
89
+      <view class="panelTitle11">做到后系统自动打勾。</view>
90
     </view>
90
     </view>
91
     <view></view>
91
     <view></view>
92
   </view>
92
   </view>

+ 1 - 7
pages/other/homework.wxss

@@ -47,13 +47,7 @@
47
 .panelTitle12{
47
 .panelTitle12{
48
   font-size:24rpx;
48
   font-size:24rpx;
49
   margin-top: 10rpx;
49
   margin-top: 10rpx;
50
-  background-color: #03AF69;
51
-  border-radius: 6rpx;
52
-  color:#fff;
53
-  text-align: center;
54
-  line-height: 50rpx;
55
-  width:108rpx;
56
-  font-weight: 400;
50
+  color:#0071EF;
57
 }
51
 }
58
 
52
 
59
 .panelItem{
53
 .panelItem{

+ 2 - 2
utils/util.js

@@ -56,8 +56,8 @@ function addZero(str, length) {
56
 function getMinuteSecond(second, chs) {
56
 function getMinuteSecond(second, chs) {
57
   if (!second)
57
   if (!second)
58
     second = 0;
58
     second = 0;
59
-  var secondUnit = "\"";
60
-  var minuteUnit = "'";
59
+  var secondUnit = "";
60
+  var minuteUnit = "";
61
   var hourUnit = ":";
61
   var hourUnit = ":";
62
   if (chs) {
62
   if (chs) {
63
     secondUnit = "秒";
63
     secondUnit = "秒";