首页 探索 帮助
注册 登录
kylx365
/
miaoguo_master
关注 2
点赞 0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

2.4.2

chengjie 8 月之前
父节点
3889194cc7
当前提交
d3b52638b0
共有 17 个文件被更改，包括 242 次插入 和 190 次删除
分列视图 显示文件统计
  1. 6 4
      pages/other/grade.js
  2. 6 3
      pages/other/grade.wxml
  3. 14 1
      pages/other/grade.wxss
  4. 10 10
      pages_test/knowledge/examine.js
  5. 9 10
      pages_test/knowledge/index.js
  6. 34 35
      pages_test/knowledge/index.wxml
  7. 6 3
      pages_test/knowledge/index.wxss
  8. 24 17
      pages_test/knowledge/library.js
  9. 6 5
      pages_test/knowledge/library.wxml
  10. 12 11
      pages_test/knowledge/package.js
  11. 7 16
      pages_test/knowledge/package.wxml
  12. 4 4
      pages_test/knowledge/report.js
  13. 4 4
      pages_test/knowledge/report.wxml
  14. 53 28
      pages_test/knowledge/unit.js
  15. 37 37
      pages_test/knowledge/unit.wxml
  16. 9 1
      pages_test/knowledge/unit.wxss
  17. 1 1
      project.private.config.json

+ 6 - 4
pages/other/grade.js
查看文件 

@@ -6,7 +6,7 @@ const app = getApp();
6 6 
 Page({
7 7 
   data: {
8 8 
     IsIPad:"",
9 
-    AgeList:[{Name:"学龄前",Grade:0},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"初中及以上",Grade:100}],
9 
+    AgeList:[{Name:"学龄前",Grade:0},{},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"初一",Grade:7},{Name:"初二",Grade:8},{Name:"初三",Grade:9},{},{Name:"高中",Grade:10},{Name:"大学及成人",Grade:100}],
10 10 
   },
11 11 
   onLoad: function (options) {
12 12 
     this.setData({
 
@@ -19,9 +19,11 @@ Page({
19 19 
     console.log(grade);
20 20 
     var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade='+grade;
21 21 
     main.getData(url, function (data) {
22 
-      wx.navigateBack({
23 
-        delta: 1
24 
-      });
22 
+      setTimeout(function(){
23 
+        wx.navigateBack({
24 
+          delta: 1
25 
+        });
26 
+      },1000);
25 27 
     });
26 28 
   },
27 29 
   onShareAppMessage: function () {

+ 6 - 3
pages/other/grade.wxml
查看文件 

@@ -4,9 +4,12 @@
4 4 
 </navigation-bar>
5 5
6 6 
 <view class="container{{IsIPad}}  FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
7 
-  <image src="../images/universalpic_logo_200x200.png" class='img{{IsIPad}}' />
8 
-  <text class="textGrade{{IsIPad}}">选择孩子的年级</text>
7 
+  <text class="textGrade{{IsIPad}}">请选择孩子的年级</text>
8 
+  <text class="textGrade2">以后可在设置中修改。暑假建议选下一年级。</text>
9 9 
   <view class="panelGrade FlexRow">
10 
-    <view wx:for="{{AgeList}}" wx:key="*this" class="btnGrade" bindtap="setGrade" data-grade="{{item.Grade}}">{{item.Name}}</view>
10 
+  <block wx:for="{{AgeList}}" wx:key="*this">
11 
+    <view wx:if="{{item.Name}}" class="btnGrade" bindtap="setGrade" data-grade="{{item.Grade}}">{{item.Name}}</view>
12 
+    <view wx:if="{{!item.Name}}" class="btnGrade2" ></view>
13 
+  </block>
11 14 
   </view>
12 15 
 </view>

+ 14 - 1
pages/other/grade.wxss
查看文件 

@@ -34,10 +34,17 @@
34 34
35 35 
 .textGrade{
36 36 
   font-size:54rpx;
37 
-  margin-top: 170rpx;
37 
+  margin-top: 60rpx;
38 38 
   text-align: center;
39 39 
 }
40 40
41 
+.textGrade2{
42 
+  margin-top: 10rpx;
43 
+  text-align: center;
44 
+  font-size: 28rpx;
45 
+  color: #48FFBB;
46 
+}
47 
+
41 48 
 .textGrade_iPad{
42 49 
   font-size:54rpx;
43 50 
   margin-top: 20rpx;
 
@@ -60,3 +67,9 @@
60 67 
   line-height:90rpx;
61 68 
   margin: 15rpx;
62 69 
 }
70 
+
71 
+.btnGrade2{
72 
+  width:285rpx;
73 
+  line-height:90rpx;
74 
+  margin: 15rpx;
75 
+}

+ 10 - 10
pages_test/knowledge/examine.js
查看文件 

@@ -34,11 +34,11 @@ Page({
34 34 
   onLoad: function (options) {
35 35 
     var that = this;
36 36 
     that.setData({
37 
-      Category:options.category1,
38 
-      BookID:options.bookid,
39 
-      LibraryID:options.libraryid,
40 
-      UnitID:options.unitsid,
41 
-      LibraryName:options.LibraryName,
37 
+      Category:options.Category,
38 
+      BookID:options.BookID,
39 
+      UnitID:options.UnitID,
40 
+      LibraryName1:options.LibraryName1,
41 
+      LibraryName2:options.LibraryName2,
42 42 
       BookName:options.BookName,
43 43 
       UnitName:options.UnitName,
44 44 
       TestTypeName:options.TestTypeName,
 
@@ -61,9 +61,9 @@ Page({
61 61 
     var that = this;
62 62 
     that.setData({
63 63 
       TaskInfo: {},
64 
-      TestType: options.testtype,
64 
+      TestType: options.TestType,
65 65 
     });
66 
-    main.getData('GetMiaoguoTestExamine?UserID='+app.globalData.userInfo.UserID+'&Category1='+options.category1+'&BookID='+options.bookid+'&Name='+options.UnitName+'&UnitID='+options.unitsid+'&TestType='+options.testtype, function (data) {
66 
+    main.getData('GetMiaoguoTestExamine?UserID='+app.globalData.userInfo.UserID+'&BookID='+options.BookID+'&UnitName='+options.UnitName+'&UnitID='+options.UnitID+'&TestType='+options.TestType, function (data) {
67 67 
       if (data) {
68 68 
         TaskList=data;
69 69 
         TaskList = common.randomArray(TaskList);
 
@@ -318,13 +318,13 @@ Page({
318 318 
       TestTask.Category = this.data.Category;
319 319 
       TestTask.TestType = this.data.TestType;
320 320 
       TestTask.IsFinished = isFinished;
321 
-      TestTask.LibraryName = this.data.LibraryName;
321 
+      TestTask.LibraryName1 = this.data.LibraryName1;
322 
+      TestTask.LibraryName2 = this.data.LibraryName2;
322 323 
       TestTask.BookName = this.data.BookName;
323 324 
       TestTask.UnitName = this.data.UnitName;
324 325 
       TestTask.TestTypeName = this.data.TestTypeName;
325 
-      TestTask.LibraryID=this.data.LibraryID;
326 326 
       TestTask.BookID=this.data.BookID;
327 
-      TestTask.UnitID+=this.data.UnitID;
327 
+      TestTask.UnitID=this.data.UnitID;
328 328 
       TestTask.List = TaskList;
329 329 
       app.globalData.TestTask=TestTask;
330 330 
       wx.redirectTo({

文件差异内容过多而无法显示
+ 9 - 10
pages_test/knowledge/index.js


+ 34 - 35
pages_test/knowledge/index.wxml
查看文件 

@@ -7,8 +7,8 @@
7 7 
     <text class="panel14">Practice makes perfect. </text>
8 8 
     <text class="panel15">知识库</text>
9 9 
     <view class="panel16 FlexRow">
10 
-      <image src='../images/pic_01.png' class="pic_01" bind:tap="goto" data-url="./library?Category=CHN" />
11 
-      <image src='../images/pic_02.png' class="pic_02" bind:tap="goto" data-url="./library?Category=ENG" />
10 
+      <image src='../images/pic_01.png' class="pic_01" bind:tap="goto" data-url="./library?Category=语文" />
11 
+      <image src='../images/pic_02.png' class="pic_02" bind:tap="goto" data-url="./library?Category=English" />
12 12 
     </view>
13 13 
     <view class="panel17"></view>
14 14 
     <view class="panel18"></view>
 
@@ -17,48 +17,46 @@
17 17
18 18 
   <view class="panel2 FlexColumn">
19 19 
     <view class="panel21 FlexRow">
20 
-      <view class="panel211 panel2110L panel2110L{{Menu}} FlexRow" bind:tap="setMenu" data-index="0">三年级·知识包推荐</view>
20 
+      <view class="panel211 panel2110L panel2110L{{Menu}} FlexRow" bind:tap="setMenu" data-index="0">{{List.Grade}}·知识包推荐</view>
21 21 
       <view class="panel211 panel2110R panel2110R{{Menu}} FlexRow" bind:tap="setMenu" data-index="1">检验记录</view>
22 22 
     </view>
23 23
24 24 
     <!-- 知识包推荐 -->
25 25 
     <block wx:if="{{Menu==0}}">
26 
-      <view class="panel22">语文</view>
27 
-      <view class="panel23">上学期</view>
28 
-      <scroll-view scroll-x class="panelTab">
26 
+      <view class="panel22" wx:if="{{List.List1.length>0 || List.List2.length>0}}">语文</view>
27 
+      <view class="panel23" wx:if="{{List.List1.length>0}}">上学期</view>
28 
+      <scroll-view scroll-x class="panelTab" wx:if="{{List.List1.length>0}}">
29 29 
         <view class="Tab0"></view>
30 
-        <view class="Tab FlexColumn" wx:for="{{ArrList}}" wx:key="index" catchtap='' data-value='{{item.ID}}'>
31 
-          <view class="Tab1">
32 
-          </view>
33 
-          <view class="Tab2">{{item.Name}}</view>
30 
+        <view class="Tab FlexColumn" wx:for="{{List.List1}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
31 
+          <image class="Tab1" src="{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_c.png" ></image>
32 
+          <view class="Tab2">{{item.Name1}}</view>
34 33 
         </view>
35 34 
         <view class="Tab00"></view>
36 35 
       </scroll-view>
37 36
38 
-      <view class="panel23 panel24">下学期</view>
39 
-      <scroll-view scroll-x class="panelTab">
37 
+      <view class="panel23 panel24" wx:if="{{List.List2.length>0}}">下学期</view>
38 
+      <scroll-view scroll-x class="panelTab" wx:if="{{List.List2.length>0}}">
40 39 
         <view class="Tab0"></view>
41 
-        <view class="Tab FlexColumn" wx:for="{{ArrList}}" wx:key="index" catchtap='' data-value='{{item.ID}}'>
42 
-          <view class="Tab1">
43 
-          </view>
44 
-          <view class="Tab2">{{item.Name}}</view>
40 
+        <view class="Tab FlexColumn" wx:for="{{List.List2}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
41 
+          <image class="Tab1" src="{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_c.png" ></image>
42 
+          <view class="Tab2">{{item.Name1}}</view>
45 43 
         </view>
46 44 
         <view class="Tab00"></view>
47 45 
       </scroll-view>
48 46
49 
-      <view class="panel23 panel24">课外拓展</view>
50 
-      <scroll-view scroll-x class="panelTab">
47 
+      <view class="panel23 panel24" wx:if="{{List.List3 && List.List3!=''}}">课外拓展</view>
48 
+      <scroll-view scroll-x class="panelTab" wx:if="{{List.List3 && List.List3!=''}}">
51 49 
         <view class="Tab0"></view>
52 
-        <view class="Tab3" wx:for="{{ArrList2}}" wx:key="index" catchtap='' data-value='{{item.ID}}'>
50 
+        <view class="Tab3" wx:for="{{List.List3}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
53 51 
           <view class="Tab30 FlexColumn">
54 52 
             <view class="Tab31 FlexColumn">
55 
-              <view class="Tab311"><text>{{item.Name}}</text></view>
53 
+              <view class="Tab311"><text>{{item.Name1}}\n{{item.Name2}}</text></view>
56 54 
             </view>
57 55 
             <view class="Tab32 FlexColumn">
58 56 
               <view class="Tab321">{{item.Remark}}</view>
59 57 
               <view class="Tab322 FlexRow">
60 58 
                 <view>知识包</view>
61 
-                <view class="Tab3221">99</view>
59 
+                <view class="Tab3221">{{item.UnitNum}}</view>
62 60 
               </view>
63 61 
             </view>
64 62 
             <view class="Tab33 FlexRow">详情</view>
 
@@ -67,19 +65,19 @@
67 65 
         <view class="Tab00"></view>
68 66 
       </scroll-view>
69 67
70 
-      <view class="panel23 panel24">英语</view>
71 
-      <scroll-view scroll-x class="panelTab">
68 
+      <view class="panel23 panel24" wx:if="{{List.List4}}">英语</view>
69 
+      <scroll-view scroll-x class="panelTab" wx:if="{{List.List4}}">
72 70 
         <view class="Tab0"></view>
73 
-        <view class="Tab3" wx:for="{{ArrList3}}" wx:key="index" catchtap='' data-value='{{item.ID}}'>
71 
+        <view class="Tab3" wx:for="{{List.List4}}" wx:key="index" bind:tap="goto" data-url="./package?Category=English&LibraryName1={{item.Name1}}&LibraryName2={{item.Name2}}&BookImageName=picZs_en_{{item.BookImageName}}_cov">
74 72 
           <view class="Tab30 FlexColumn">
75 73 
             <view class="Tab31 FlexColumn">
76 
-              <view class="Tab311"><text>{{item.Name}}</text></view>
74 
+              <view class="Tab311"><text>{{item.Name1}}\n{{item.Name2}}</text></view>
77 75 
             </view>
78 76 
             <view class="Tab32 FlexColumn">
79 77 
               <view class="Tab321">{{item.Remark}}</view>
80 78 
               <view class="Tab322 FlexRow">
81 79 
                 <view>知识包</view>
82 
-                <view class="Tab3221">99</view>
80 
+                <view class="Tab3221">{{item.UnitNum}}</view>
83 81 
               </view>
84 82 
             </view>
85 83 
             <view class="Tab33 FlexRow">详情</view>
 
@@ -89,7 +87,7 @@
89 87 
       </scroll-view>
90 88
91 89 
       <view class="panel25 FlexColumn">要做好英语写作，光靠课本知识是不够的，这些知识包全面测试学生的听、说、读、写四个方面的英语能力水平，为写作的单词储备提供有力的支持。</view>
92 
-      <view class="panel26 FlexRow">
90 
+      <view class="panel26 FlexRow" bind:tap="goto" data-url="../../pages/other/grade">
93 91 
         <image src="../images/sysIcon_c01.png" class="sysIcon_c01"></image>
94 92 
         <view class="panel261">更换推荐年级</view>
95 93 
       </view>
 
@@ -98,22 +96,23 @@
98 96 
     <!-- 检验记录 -->
99 97 
     <block wx:if="{{Menu==1}}">
100 98 
       <view class="panel3 FlexColumn">
101 
-        <view wx:if="{{Sheets.length>0}}" class="panel31 FlexColumn" wx:for="{{[1,2,3]}}" wx:key="*this">
99 
+        <view wx:if="{{TestList.length>0}}" class="panel31 FlexColumn" wx:for="{{TestList}}" wx:key="index" bind:tap="goto" data-url="./report?ID={{item.ID}}">
102 100 
           <view class="panel311 FlexRow">
103 
-            <view class="panel3111">2024年9月19日 20:21</view>
101 
+            <view class="panel3111">{{item.TestTime}}</view>
104 102 
             <view class="panel3112 FlexRow">
105 
-              <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
103 
+              <image src="../images/sysIcon_d01.png" class="sysIcon_d01" wx:if="{{item.IsTestRead}}"></image>
104 
+              <image src="../images/sysIcon_d02.png" class="sysIcon_d01" wx:if="{{item.IsTestWrite}}"></image>
106 105 
               <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
107 
-              <view class="panel31121">10</view>
106 
+              <view class="panel31121">{{item.RightNum}}</view>
108 107 
               <image src="../images/sysIcon_b02.png" class="sysIcon_b01"></image>
109 
-              <view class="panel31121">5</view>
108 
+              <view class="panel31121">{{item.WrongNum}}</view>
110 109 
             </view>
111 110 
           </view>
112 
-          <view class="panel312">Lesson 1</view>
113 
-          <view class="panel313">英语 \ KET分类词汇 \ Personal Feelings,OpinionsandseOpinionsandseOpinionsandse </view>
111 
+          <view class="panel312">{{item.UnitName}}</view>
112 
+          <view class="panel313">{{item.Category}} \ {{item.LibraryName1}}{{item.LibraryName2}} \ {{item.BookName}}</view>
114 113 
           <view class="panel314"></view>
115 114 
         </view>
116 
-        <view class="panelNull FlexColumn" wx:if="{{Sheets.length==0}}">
115 
+        <view class="panelNull FlexColumn" wx:if="{{TestList.length==0}}">
117 116 
           <view class="panelNull1 FlexRow">
118 117 
             <view class="panelNull11 FlexRow"></view>
119 118 
             <view class="panelNull12 FlexRow"></view>

+ 6 - 3
pages_test/knowledge/index.wxss
查看文件 

@@ -181,17 +181,20 @@
181 181 
 }
182 182
183 183 
 .Tab1 {
184 
-  width: 180rpx;
184 
+  /* width: 180rpx;
185 185 
   height: 140rpx;
186 186 
   background-image: linear-gradient(180deg, #FFF9F2 0%, #FEE2C1 100%);
187 187 
   box-shadow: 0 6rpx 0 0 rgba(0, 0, 0, 0.20);
188 188 
   box-shadow: 0 10rpx 0 0 rgba(0, 0, 0, 0.30);
189 
-  border-radius: 20rpx;
189 
+  border-radius: 20rpx; */
190 
+  width:155rpx;
191 
+  height:126rpx;
192 
+  margin-left: 10rpx;
190 193 
 }
191 194
192 195 
 .Tab2 {
193 196 
   margin-top: 20rpx;
194 
-  font-size: 36rpx;
197 
+  font-size: 28rpx;
195 198 
   color: #F7F7F7;
196 199 
   text-align: center;
197 200 
 }

+ 24 - 17
pages_test/knowledge/library.js
查看文件 

@@ -22,34 +22,39 @@ Page({
22 22 
   },
23 23 
   init:function(options){
24 24 
     var that=this;
25 
-    that.changeTab(options.Category);
26 
-    that.setData({
27 
-      List:app.globalData.TestGradeList[options.Category],
28 
-      Menu2Array:that.data.Menu2Array,
25 
+    main.getData('GetMiaoguoTestLibrary', function (data) {
26 
+      if (data) {
27 
+        for(var i=0;i<data.length;i++)
28 
+          data[i].GradeSelected=1;
29 
+        that.setData({
30 
+          List:data,
31 
+        });
32 
+        that.changeTab(options.Category);
33 
+      }
29 34 
     });
30 35 
   },
31 36 
   changeTab:function(category){
32 37 
     var that=this;
33 38 
     var menu1=0;
34 
-    if (category=="CHN")
39 
+    if (category=="语文")
35 40 
       that.data.Menu2Array=[{ID:0,Name:"全部",CSS:"Selected"},{ID:1,Name:"小学",CSS:""},{ID:2,Name:"初中",CSS:""},{ID:3,Name:"课外拓展",CSS:""}];
36 41 
     else{
37 42 
       that.data.Menu2Array=[{ID:0,Name:"全部",CSS:"Selected"},{ID:1,Name:"小学",CSS:""},{ID:2,Name:"初中",CSS:""},{ID:3,Name:"高中",CSS:""},{ID:4,Name:"大学",CSS:""}];
38 43 
       menu1=1;
39 44 
     }
40 45 
     that.setData({
41 
-      List:app.globalData.TestGradeList[category],
42 46 
       Menu2Array:that.data.Menu2Array,
43 47 
       Menu1:menu1,
48 
+      MenuCategory:category,
44 49 
     });
45 50 
   },
46 51 
   setMenu1:function(e){
47 52 
     var that=this;
48 53 
     var index=e.currentTarget.dataset.index;
49 54 
     if (index==0)
50 
-      that.changeTab("CHN");
55 
+      that.changeTab("语文");
51 56 
     else
52 
-      that.changeTab("ENG");
57 
+      that.changeTab("English");
53 58 
     that.setData({
54 59 
       Menu1:index,
55 60 
     });
 
@@ -64,19 +69,21 @@ Page({
64 69 
       list[i].CSS="";
65 70 
       if (index==list[i].ID){
66 71 
         list[i].CSS="Selected";
67 
-        if (index>0){
68 
-          var menu=that.data.Menu2Array[index].Name;
69 
-          console.log(menu);
70 
-          var arr=[];
71 
-          for(var j=0;j<that.data.List.length;j++){
72 
+        var menu=that.data.Menu2Array[index].Name;
73 
+        //console.log(menu);
74 
+        for(var j=0;j<that.data.List.length;j++){
75 
+          if (index==0)
76 
+            that.data.List[j].GradeSelected=1;
77 
+          else{
78 
+            that.data.List[j].GradeSelected=0;
72 79 
             if (that.data.List[j].Grade.indexOf(menu)>=0){
73 
-              arr.push(that.data.List[j]);
80 
+              that.data.List[j].GradeSelected=1;
74 81 
             }
75 82 
           }
76 
-          that.setData({
77 
-            List:arr,
78 
-          });
79 83 
         }
84 
+        that.setData({
85 
+          List:that.data.List,
86 
+        });
80 87 
         break;
81 88 
       }
82 89 
     }

+ 6 - 5
pages_test/knowledge/library.wxml
查看文件 

@@ -13,18 +13,19 @@
13 13 
   <view class="panel2 FlexColumn">
14 14 
     <scroll-view scroll-x class="panel21 FlexRow">
15 15 
       <view class="Tab0"></view>
16 
-      <view class="panel211 panel211{{item.ID}} panel211{{item.CSS}}" wx:for="{{Menu2Array}}" wx:key="*this" bind:tap="setMenu2" data-index="{{item.ID}}">{{item.Name}}</view>
16 
+      <view class="panel211 panel211{{item.ID}} panel211{{item.CSS}}" wx:for="{{Menu2Array}}" wx:key="index" bind:tap="setMenu2" data-index="{{item.ID}}">{{item.Name}}</view>
17 
+      <view class="Tab0"></view>
17 18 
     </scroll-view>
18 19 
     <view class="panel22 FlexRow">
19 
-      <view class="panel221 FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="goto" data-url="./package?Category1={{Menu1}}&Category2={{item.Category2}}&Category3={{item.Category3}}&LibraryID={{item.ID}}&BookImageName={{item.BookImageName}}&LibraryName={{item.Category2}}{{item.Category3}}">
20 
+      <view class="panel221 FlexColumn" wx:for="{{List}}" wx:if="{{item.Category==MenuCategory && item.GradeSelected}}" wx:key="index" bind:tap="goto" data-url="./package?Category={{MenuCategory}}&LibraryName1={{item.LibraryName1}}&LibraryName2={{item.LibraryName2}}&BookImageName={{item.BookImageName}}&LibraryName={{item.LibraryName1}}{{item.LibraryName2}}">
20 21 
         <view class="panel2211">
21 22 
           <image class="panel2211Logo" src='{{ImagePath}}web/_knowledge/{{item.BookImageName}}_b.png' />
22 23 
         </view>
23 
-        <view class="panel2212">{{item.Category2}}</view>
24 
-        <view class="panel2213">{{item.Category3}}</view>
24 
+        <view class="panel2212">{{item.LibraryName1}}</view>
25 
+        <view class="panel2213">{{item.LibraryName2}}</view>
25 26 
         <view class="panel2214 FlexRow">
26 27 
           <view>知识包</view>
27 
-          <view class="panel22141">{{item.Num}}</view>
28 
+          <view class="panel22141">{{item.PackageNum}}</view>
28 29 
         </view>
29 30 
       </view>
30 31 
     </view>

+ 12 - 11
pages_test/knowledge/package.js
查看文件 

@@ -2,6 +2,7 @@ import common from '../../utils/util';
2 2 
 import main from '../../utils/main';
3 3
4 4 
 const app = getApp();
5 
+var Options={};
5 6
6 7 
 Page({
7 8 
   data: {
 
@@ -12,25 +13,25 @@ Page({
12 13 
   },
13 14 
   onLoad: function (options) {
14 15 
     var that = this;
15 
-    var Category1="语文";
16 
-    if (options.Category1==1)
17 
-      Category1="English";
16 
+
18 17 
     that.setData({
19 18 
       Containnerheight: main.getWindowHeight(),
20 
-      Category1:Category1,
21 
-      Category2:options.Category2,
22 
-      Category3:options.Category3,
23 
-      LibraryID:options.LibraryID,
24 
-      LibraryName:options.LibraryName,
19 
+      Category:options.Category,
20 
+      LibraryName1:options.LibraryName1,
21 
+      LibraryName2:options.LibraryName2,
25 22 
       BookImageName:options.BookImageName,
26 23 
       ImagePath: app.globalData.uploadImageUrl,
27 24 
     });
28 25
29 
-    that.init(options);
26 
+    Options=options;
27 
+
30 28 
   },
31 
-  init:function(options){
29 
+  onShow:function(){
30 
+    this.init();
31 
+  },
32 
+  init:function(){
32 33 
     var that = this;
33 
-    main.getData('GetMiaoguoTestPackage?Category1='+that.data.Category1+'&Category2='+options.Category2+'&Category3='+options.Category3+'&UserID='+app.globalData.userInfo.UserID, function (data) {
34 
+    main.getData('GetMiaoguoTestPackage?Category='+Options.Category+'&LibraryName1='+Options.LibraryName1+'&LibraryName2='+Options.LibraryName2+'&UserID='+app.globalData.userInfo.UserID, function (data) {
34 35 
       if (data) {
35 36 
         that.setData({
36 37 
           List:data,

+ 7 - 16
pages_test/knowledge/package.wxml
查看文件 

@@ -1,18 +1,18 @@
1 1 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2 2 
   <view class="panel1 FlexColumn">
3 
-    <view class="panel11">{{Category1}}</view>
4 
-    <view class="panel12">{{Category2}}</view>
5 
-    <view class="panel12">{{Category3}}</view>
3 
+    <view class="panel11">{{Category}}</view>
4 
+    <view class="panel12">{{LibraryName1}}</view>
5 
+    <view class="panel12">{{LibraryName2}}</view>
6 6 
     <view class="panel13"></view>
7 7 
     <view class="panel14"></view>
8 8 
     <image class="panel1Logo" src='{{ImagePath}}web/_knowledge/{{BookImageName}}_a.png' />
9 9 
   </view>
10 10
11 11 
   <view class="panel2 FlexColumn">
12 
-    <view class="panel21 FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="goto" data-url="./unit?Category1={{Category1}}&Category2={{Category2}}&Category3={{Category3}}&Name1={{item.Name1}}&WordType={{item.WordType}}&LibraryID={{LibraryID}}&BookID={{item.ID}}&WordNum={{item.WordNum}}&LibraryName={{LibraryName}}&BookName={{item.Name1}}&KnowledegImageName={{item.KnowledegImageName}}">
13 
-      <image class="panel211Logo" src='{{ImagePath}}web/_knowledge/{{item.KnowledegImageName}}_a.png' />
12 
+    <view class="panel21 FlexColumn" wx:for="{{List}}" wx:key="index" bind:tap="goto" data-url="./unit?Category={{Category}}&BookName={{item.BookName}}&BookID={{item.ID}}">
13 
+      <image class="panel211Logo" src='{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_a.png' />
14 14 
       <view class="panel211 FlexColumn">
15 
-        <text class="panel2111">{{item.Name1}}</text>
15 
+        <text class="panel2111">{{item.BookName}}</text>
16 16 
         <view class="panel2112 FlexRow">
17 17 
           <view>{{item.WordType}}</view>
18 18 
           <view class="panel21121">{{item.WordNum}}</view>
 
@@ -21,7 +21,7 @@
21 21 
       <view class="panel212 FlexColumn" wx:if="{{item.Remark}}">
22 22 
         <view class="panel2121">{{item.Remark}}</view>
23 23 
       </view>
24 
-      <view class="panel213 FlexRow" wx:for="{{item.ShowRate}}" wx:key="*this" wx:for-item="itemChild">
24 
+      <view class="panel213 FlexRow" wx:for="{{item.TestFunction}}" wx:key="index" wx:for-item="itemChild">
25 25 
         <view class="panel2131 FlexRow">
26 26 
           <view class="panel21311" style="width:{{itemChild.C}}%;"></view>
27 27 
         </view>
 
@@ -30,15 +30,6 @@
30 30 
           <view class="panel21321">{{itemChild.C}}%</view>
31 31 
         </view>
32 32 
       </view>
33 
-      <!-- <view class="panel213 FlexRow">
34 
-        <view class="panel2131 FlexRow">
35 
-          <view class="panel21311" style="width:100%;"></view>
36 
-        </view>
37 
-        <view class="panel2132 FlexRow">
38 
-          <image src="../images/sysIcon_d02.png" class="sysIcon_d01"></image>
39 
-          <view class="panel21321">100%</view>
40 
-        </view>
41 
-      </view> -->
42 33 
       <view style="height:40rpx;"></view>
43 34 
     </view>
44 35 
   </view>

+ 4 - 4
pages_test/knowledge/report.js
查看文件 

@@ -19,7 +19,9 @@ Page({
19 19 
     var testtask=app.globalData.TestTask;
20 20 
     that.setData({
21 21 
       ReportType: options.type,
22 
-      LibraryName:testtask.LibraryName,
22 
+      LibraryName1:testtask.LibraryName1,
23 
+      LibraryName2:testtask.LibraryName2,
24 
+      BookID:testtask.BookID,
23 25 
       BookName:testtask.BookName,
24 26 
       UnitName:testtask.UnitName,
25 27 
       TestTypeName:testtask.TestTypeName,
 
@@ -68,9 +70,7 @@ Page({
68 70 
     var that=this;
69 71 
     var userid=app.globalData.userInfo.UserID;
70 72 
     var param1={};
71 
-    param1.Category=e.Category;
72 
-    param1.LibraryName=that.data.LibraryName;
73 
-    param1.BookName=that.data.BookName;
73 
+    param1.BookID=that.data.BookID;
74 74 
     param1.UnitName=that.data.UnitName;
75 75 
     param1.TestTypeName=that.data.TestTypeName;
76 76 
     if (e.TestType=="read")

+ 4 - 4
pages_test/knowledge/report.wxml
查看文件 

@@ -1,6 +1,6 @@
1 1 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2 2 
   <view class="panel1 FlexColumn">
3 
-    <view class="panel11">{{LibraryName}}</view>
3 
+    <view class="panel11">{{LibraryName1}}{{LibraryName2}}</view>
4 4 
     <view class="panel12">{{BookName}}</view>
5 5 
     <view class="panel13">{{UnitName}}</view>
6 6 
     <view class="panel14">{{TestTypeName}}</view>
 
@@ -10,7 +10,7 @@
10 10 
     <image src="../images/sysIcon_e0{{TestTypeNumber}}.png" class="sysIcon_e01"></image>
11 11 
   </view>
12 12
13 
-  <view class="panel2 FlexColumn" wx:for="{{List}}" wx:key="*this">
13 
+  <view class="panel2 FlexColumn" wx:for="{{List}}" wx:key="index">
14 14 
     <view class="panel21" style="background-color:{{item.BColor}};"></view>
15 15 
     <view class="panel22 FlexColumn">
16 16 
       <view class="panel221 FlexRow">
 
@@ -23,7 +23,7 @@
23 23 
           <view class="panel22121" bind:tap="selectItem" data-index="{{index}}" data-index2="none">取消组选</view>
24 24 
         </view>
25 25 
       </view>
26 
-      <view class="panel222 FlexColumn" wx:for="{{item.List}}" wx:key="*this" wx:for-item="itemChild" wx:for-index="indexChild" bind:tap="selectItem" data-index="{{index}}" data-index2="{{indexChild}}">
26 
+      <view class="panel222 FlexColumn" wx:for="{{item.List}}" wx:key="index" wx:for-item="itemChild" wx:for-index="indexChild" bind:tap="selectItem" data-index="{{index}}" data-index2="{{indexChild}}">
27 27 
         <view class="panel2221 FlexRow">
28 28 
           <view wx:if="{{!itemChild.IsSelected}}" class="panel22211"></view>
29 29 
           <view wx:if="{{itemChild.IsSelected}}" class="panel22211 panel22210 FlexRow">
 
@@ -68,7 +68,7 @@
68 68 
     <view class="panelMenu2">
69 69 
       卡单就是文件夹，方便日后处理
70 70 
     </view>
71 
-    <view class="panelMenu3 FlexColumn" wx:for="{{MenuList}}" wx:key="*this" bind:tap="setMenu2" data-index="{{index}}">
71 
+    <view class="panelMenu3 FlexColumn" wx:for="{{MenuList}}" wx:key="index" bind:tap="setMenu2" data-index="{{index}}">
72 72 
       <view class="panelMenu31 FlexRow">
73 73 
         <image src="../images/sysIcon_b04.png" class="sysIcon_b04" wx:if="{{item.IsSelected}}"></image>
74 74 
         <view class="sysIcon_b04" wx:if="{{!item.IsSelected}}"></view>

+ 53 - 28
pages_test/knowledge/unit.js
查看文件 

@@ -2,48 +2,40 @@ import common from '../../utils/util';
2 2 
 import main from '../../utils/main';
3 3
4 4 
 const app = getApp();
5 
+var bookID=0;
5 6
6 7 
 Page({
7 8 
   data: {
8 9 
     Menu:0,
9 10 
     TestArr:[],
10 
-    TestItemArr:[{
11 
-      ID:1,
12 
-      Icon:"sysIcon_d01",
13 
-      Time:"2024年9月19日 20:21",
14 
-      Right:10,
15 
-      Wrong:3,
16 
-    }, {
17 
-      ID:2,
18 
-      Icon:"sysIcon_d02",
19 
-      Time:"未检验",
20 
-      Right:0,
21 
-      Wrong:0,
22 
-    }],
23 11 
   },
24 12 
   onLoad: function (options) {
25 13 
     var that = this;
14 
+    bookID=options.BookID;
26 15 
     that.setData({
27 16 
       Containnerheight: main.getWindowHeight(),
28 17 
       ImagePath: app.globalData.uploadImageUrl,
29 
-      Category1:options.Category1,
30 
-      Category2:options.Category2,
31 
-      Category3:options.Category3,
32 
-      Name1:options.Name1,
33 
-      WordType:options.WordType,
34 
-      WordNum:options.WordNum,
35 
-      BookID:options.BookID,
36 
-      LibraryID:options.LibraryID,
37 
-      LibraryName:options.LibraryName,
38 
-      BookName:options.BookName,
39 
-      KnowledegImageName:options.KnowledegImageName,
18 
+      BookID:bookID,
40 19 
     });
41 
-    that.init(options);
20 
+    //that.init();
42 21 
   },
43 
-  init:function(options){
22 
+  onShow:function(){
44 23 
     var that = this;
45 
-    main.getData('GetMiaoguoTestUnit?Category1='+options.Category1+'&Name1='+options.Name1+'&BookID='+options.BookID+'&UserID='+app.globalData.userInfo.UserID, function (data) {
24 
+    that.init();
25 
+  },
26 
+  init:function(){
27 
+    var that = this;
28 
+    main.getData('GetMiaoguoTestUnit?BookID='+bookID+'&UserID='+app.globalData.userInfo.UserID, function (data) {
46 29 
       if (data) {
30 
+        that.setData({
31 
+          Category:data.BookInfo.Category,
32 
+          LibraryName1:data.BookInfo.LibraryName1,
33 
+          LibraryName2:data.BookInfo.LibraryName2,
34 
+          WordType:data.BookInfo.WordType,
35 
+          WordNum:data.BookInfo.WordNum,
36 
+          BookName:data.BookInfo.BookName,
37 
+          KnowledgeImageName:data.BookInfo.KnowledgeImageName,
38 
+        });
47 39 
         var readNum=0,writeNum=0,readRate=0,writeRate=0;
48 40 
         var list1=data.List1;
49 41 
         for(var i=0;i<list1.length;i++){
 
@@ -94,7 +86,7 @@ Page({
94 86 
     var menu=e.currentTarget.dataset.menu;
95 87 
     var index=e.currentTarget.dataset.index;
96 88 
     var item=that.data.List[index];
97 
-
89 
+
98 90 
     if (item && (!item.List || item.ListStr=="")){
99 91 
       main.getData('GetMiaoguoTestExamine?UserID='+app.globalData.userInfo.UserID+'&Category1='+that.data.Category1+'&BookID='+that.data.BookID+'&Name='+that.data.Name2+'&UnitID='+item.ID+'&TestType=read', function (data) {
100 92 
         if (data) {
 
@@ -110,6 +102,35 @@ Page({
110 102 
       });
111 103 
     }
112 104 
     else{
105 
+      if (item){
106 
+        var TestItemArr=[{
107 
+          ID:0,
108 
+          Icon:"sysIcon_d01",
109 
+          TestTime:"未检验",
110 
+          RightNum:0,
111 
+          WrongNum:0,
112 
+        }, {
113 
+          ID:0,
114 
+          Icon:"sysIcon_d02",
115 
+          TestTime:"未检验",
116 
+          RightNum:0,
117 
+          WrongNum:0,
118 
+        }];
119 
+        var list=that.data.TestArr;
120 
+        for(var i=0;i<list.length;i++){
121 
+          if (list[i].UnitName==item.UnitName){
122 
+            var id=0;
123 
+            if (list[i].IsTestWrite){
124 
+              id=1;
125 
+            }
126 
+            TestItemArr[id].ID=list[i].ID;
127 
+            TestItemArr[id].RightNum=list[i].RightNum;
128 
+            TestItemArr[id].WrongNum=list[i].WrongNum;
129 
+            TestItemArr[id].TestTime=list[i].TestTime;
130 
+          }
131 
+        }
132 
+        item.TestItemArr=TestItemArr;
133 
+      }
113 134 
       that.setData({
114 135 
         Menu2:menu,
115 136 
         SelectedItem:item,
 
@@ -121,6 +142,10 @@ Page({
121 142 
     wx.navigateTo({
122 143 
       url: url,
123 144 
     });
145 
+
146 
+    this.setData({
147 
+      Menu2:0,
148 
+    });
124 149 
   },
125 150 
   onShareAppMessage: function () {
126 151 
     return {

+ 37 - 37
pages_test/knowledge/unit.wxml
查看文件 

@@ -1,10 +1,10 @@
1 1 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
2 2 
   <view class="panel1 FlexColumn">
3 3 
     <view class="panel11 FlexColumn">
4 
-      <view class="panel111">{{Category2}}{{Category3}}</view>
5 
-      <view class="panel112">{{Name1}}</view>
4 
+      <view class="panel111">{{LibraryName1}}{{LibraryName2}}</view>
5 
+      <view class="panel112">{{BookName}}</view>
6 6 
       <view class="panel113"></view>
7 
-      <image class="panel1Logo" src='{{ImagePath}}web/_knowledge/{{KnowledegImageName}}_b.png' />
7 
+      <image class="panel1Logo" src='{{ImagePath}}web/_knowledge/{{KnowledgeImageName}}_b.png' />
8 8
9 9 
     </view>
10 10 
     <view class="panel12 FlexColumn">
 
@@ -31,10 +31,10 @@
31 31 
     <view class="panel13">
32 32 
       检验情况
33 33 
     </view>
34 
-    <view class="panel14 FlexColumn" wx:if="{{List[0].ButtonString[0]}}">
34 
+    <view class="panel14 FlexColumn" wx:if="{{List[0].TestFunction[0]}}">
35 35 
       <view class="panel141 FlexRow">
36 36 
         <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
37 
-        <view>{{List[0].ButtonString[0]}}</view>
37 
+        <view>{{List[0].TestFunction[0].N2}}</view>
38 38 
       </view>
39 39 
       <view class="panel142 FlexRow">
40 40 
         <view class="panel1421 FlexRow" >
 
@@ -43,10 +43,10 @@
43 43 
         <view class="panel1422">{{ReadNum}} / {{List.length}}</view>
44 44 
       </view>
45 45 
     </view>
46 
-    <view class="panel14 FlexColumn" wx:if="{{List[0].ButtonString[1]}}">
46 
+    <view class="panel14 FlexColumn" wx:if="{{List[0].TestFunction[1]}}">
47 47 
       <view class="panel141 FlexRow">
48 
-        <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
49 
-        <view>{{List[0].ButtonString[1]}}</view>
48 
+        <image src="../images/sysIcon_d02.png" class="sysIcon_d01"></image>
49 
+        <view>{{List[0].TestFunction[1].N2}}</view>
50 50 
       </view>
51 51 
       <view class="panel142 FlexRow">
52 52 
         <view class="panel1421 FlexRow" >
 
@@ -64,9 +64,9 @@
64 64 
       <view class="panel211 panel2111{{Menu}} FlexRow" bind:tap="setMenu" data-menu="1">检验记录</view>
65 65 
     </view>
66 66
67 
-    <view wx:if="{{Menu==0}}" class="panel22 FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="setMenu2" data-menu="1" data-index="{{index}}">
67 
+    <view wx:if="{{Menu==0}}" class="panel22 FlexColumn" wx:for="{{List}}" wx:key="index" bind:tap="setMenu2" data-menu="1" data-index="{{index}}">
68 68 
       <view class="panel221 FlexRow">
69 
-        <view class="panel2211">{{item.LessonName}}</view>
69 
+        <view class="panel2211">{{item.UnitName}}</view>
70 70 
         <view class="panel2212">{{item.Length}}</view>
71 71 
       </view>
72 72 
       <view class="panel222" wx:if="{{item.ListStr}}">
 
@@ -75,27 +75,27 @@
75 75 
       <view class="panel223 FlexRow">
76 76 
         <view class="panel2231 FlexRow">
77 77 
           <image src="../images/sysIcon_c02.png" class="sysIcon"></image>
78 
-          <view class="panel22311" wx:if="{{!item.IsBuildRead}}"></view>
79 
-          <view class="panel22311 panel223110" wx:if="{{item.IsBuildRead}}"></view>
80 
-          <view class="panel22311" wx:if="{{!item.IsBuildWrite}}"></view>
81 
-          <view class="panel22311 panel223110" wx:if="{{item.IsBuildWrite}}"></view>
78 
+          <view class="panel22311" wx:if="{{!item.IsBuildRead && item.TestFunction[0]}}"></view>
79 
+          <view class="panel22311 panel223110" wx:if="{{item.IsBuildRead && item.TestFunction[0]}}"></view>
80 
+          <view class="panel22311" wx:if="{{!item.IsBuildWrite && item.TestFunction[1]}}"></view>
81 
+          <view class="panel22311 panel223110" wx:if="{{item.IsBuildWrite && item.TestFunction[1]}}"></view>
82 82 
         </view>
83 83 
         <view class="panel2232 FlexRow">
84 
-          <image wx:if="{{item.IsTestRead}}" src="../images/sysIcon_d01.png" class="sysIcon sysIcon_50"></image>
85 
-          <image wx:if="{{!item.IsTestRead}}" src="../images/sysIcon_d03.png" class="sysIcon sysIcon_50"></image>
86 
-          <image wx:if="{{item.IsTestWrite}}" src="../images/sysIcon_d02.png" class="sysIcon"></image>
87 
-          <image wx:if="{{!item.IsTestWrite}}" src="../images/sysIcon_d04.png" class="sysIcon"></image>
84 
+          <image wx:if="{{item.IsTestRead && item.TestFunction[0]}}" src="../images/sysIcon_d01.png" class="sysIcon sysIcon_50"></image>
85 
+          <image wx:if="{{!item.IsTestRead && item.TestFunction[0]}}" src="../images/sysIcon_d03.png" class="sysIcon sysIcon_50"></image>
86 
+          <image wx:if="{{item.IsTestWrite && item.TestFunction[1]}}" src="../images/sysIcon_d02.png" class="sysIcon sysIcon_40"></image>
87 
+          <image wx:if="{{!item.IsTestWrite && item.TestFunction[1]}}" src="../images/sysIcon_d04.png" class="sysIcon sysIcon_40"></image>
88 88 
         </view>
89 89 
       </view>
90 90 
     </view>
91 91
92 92 
     <block wx:if="{{Menu==1 && TestArr.length>0}}">
93 
-      <view class="panel22 FlexColumn" wx:for="{{TestArr}}" wx:key="*this">
93 
+      <view class="panel22 FlexColumn" wx:for="{{TestArr}}" wx:key="index">
94 94 
         <view class="panel223 panel2230 FlexRow">
95 95 
           <view class="panel2231 FlexRow">
96 96 
             {{item.TestTime}}
97 97 
           </view>
98 
-          <view class="panel2232 FlexRow">
98 
+          <view class="panel22320 FlexRow">
99 99 
             <image src="../images/sysIcon_d01.png" class="sysIcon" wx:if="{{item.IsTestRead}}"></image>
100 100 
             <image src="../images/sysIcon_d02.png" class="sysIcon" wx:if="{{item.IsTestWrite}}"></image>
101 101 
             <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
 
@@ -108,7 +108,7 @@
108 108 
           <view class="panel2211">{{item.UnitName}}</view>
109 109 
         </view>
110 110 
         <view class="panel222">
111 
-          {{item.Category}} \ {{item.LibraryName}} \ {{item.BookName}}
111 
+          {{item.Category}} \ {{item.LibraryName1}}{{item.LibraryName2}} \ {{item.BookName}}
112 112 
         </view>
113 113 
       </view>
114 114 
     </block>
 
@@ -136,36 +136,36 @@
136 136 
 <view wx:if="{{Menu2==1}}" class="menuContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
137 137 
   <view class="panelMenu FlexColumn">
138 138 
     <view class="panelMenu1 FlexRow">
139 
-      <view class="panelMenu11">{{SelectedItem.LessonName}}</view>
139 
+      <view class="panelMenu11">{{SelectedItem.UnitName}}</view>
140 140 
       <view class="panelMenu12 FlexRow" bind:tap="setMenu2" data-menu="0">
141 141 
         <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
142 142 
       </view>
143 143 
     </view>
144 144 
     <view class="panelMenu2">检验方式</view>
145 145 
     <view class="panelMenu3 FlexRow">
146 
-      <block wx:if="{{!SelectedItem.ButtonString[0] || !SelectedItem.ButtonString[1]}}">
147 
-        <view class="panelMenu310 FlexColumn" bind:tap="goto" data-url="./examine?testtype=read&category1={{Category1}}&libraryid={{LibraryID}}&bookid={{BookID}}&unitsid={{SelectedItem.ID}}&LibraryName={{LibraryName}}&BookName={{BookName}}&UnitName={{SelectedItem.LessonName}}&TestTypeName={{SelectedItem.ButtonString[0]}}{{SelectedItem.ButtonString[1]}}">
146 
+      <block wx:if="{{!SelectedItem.TestFunction[0].N2 || !SelectedItem.TestFunction[1].N2}}">
147 
+        <view class="panelMenu310 FlexColumn" bind:tap="goto" data-url="./examine?TestType={{SelectedItem.TestFunction[0].N}}{{SelectedItem.TestFunction[1].N}}&Category={{Category}}&BookID={{BookID}}&UnitID={{SelectedItem.ID}}&LibraryName1={{LibraryName1}}&LibraryName2={{LibraryName2}}&BookName={{BookName}}&UnitName={{SelectedItem.UnitName}}&TestTypeName={{SelectedItem.TestFunction[0].N2}}{{SelectedItem.TestFunction[1].N2}}">
148 148 
           <view class="panelMenu311 panelMenu3110 FlexColumn">
149 
-            <image wx:if="{{SelectedItem.ButtonString[0]}}" src="../images/sysIcon_d05.png" class="sysIcon_d05"></image>
150 
-            <image wx:if="{{SelectedItem.ButtonString[1]}}" src="../images/sysIcon_d06.png" class="sysIcon_d05"></image>
149 
+            <image wx:if="{{SelectedItem.TestFunction[0].N2}}" src="../images/sysIcon_d05.png" class="sysIcon_d05"></image>
150 
+            <image wx:if="{{SelectedItem.TestFunction[1].N2}}" src="../images/sysIcon_d06.png" class="sysIcon_d05"></image>
151 151 
           </view>
152 152 
           <view class="panelMenu312">
153 
-            {{SelectedItem.ButtonString[0]}}{{SelectedItem.ButtonString[1]}}
153 
+            {{SelectedItem.TestFunction[0].N2}}{{SelectedItem.TestFunction[1].N2}}
154 154 
           </view>
155 155 
         </view>
156 156 
       </block>
157 
-      <block wx:if="{{SelectedItem.ButtonString[0] && SelectedItem.ButtonString[1]}}">
158 
-        <view class="panelMenu31 FlexColumn" bind:tap="goto" data-url="./examine?testtype=read&category1={{Category1}}&libraryid={{LibraryID}}&bookid={{BookID}}&unitsid={{SelectedItem.ID}}&LibraryName={{LibraryName}}&BookName={{BookName}}&UnitName={{SelectedItem.LessonName}}&TestTypeName={{SelectedItem.ButtonString[0]}}">
157 
+      <block wx:if="{{SelectedItem.TestFunction[0].N && SelectedItem.TestFunction[1].N}}">
158 
+        <view class="panelMenu31 FlexColumn" bind:tap="goto" data-url="./examine?TestType={{SelectedItem.TestFunction[0].N}}&Category={{Category}}&BookID={{BookID}}&UnitID={{SelectedItem.ID}}&LibraryName1={{LibraryName1}}&LibraryName2={{LibraryName2}}&BookName={{BookName}}&UnitName={{SelectedItem.UnitName}}&TestTypeName={{SelectedItem.TestFunction[0].N2}}">
159 159 
           <view class="panelMenu311 FlexColumn">
160 160 
             <image src="../images/sysIcon_d05.png" class="sysIcon_d05"></image>
161 161 
           </view>
162 
-          <view class="panelMenu312">{{SelectedItem.ButtonString[0]}}</view>
162 
+          <view class="panelMenu312">{{SelectedItem.TestFunction[0].N2}}</view>
163 163 
         </view>
164 
-        <view class="panelMenu31 FlexColumn" bind:tap="goto" data-url="./examine?testtype=write&category1={{Category1}}&libraryid={{LibraryID}}&bookid={{BookID}}&unitsid={{SelectedItem.ID}}&LibraryName={{LibraryName}}&BookName={{BookName}}&UnitName={{SelectedItem.LessonName}}&TestTypeName={{SelectedItem.ButtonString[1]}}">
164 
+        <view class="panelMenu31 FlexColumn" bind:tap="goto" data-url="./examine?TestType={{SelectedItem.TestFunction[1].N}}&Category={{Category}}&BookID={{BookID}}&UnitID={{SelectedItem.ID}}&LibraryName1={{LibraryName1}}&LibraryName2={{LibraryName2}}&BookName={{BookName}}&UnitName={{SelectedItem.UnitName}}&TestTypeName={{SelectedItem.TestFunction[1].N2}}">
165 165 
           <view class="panelMenu311 FlexColumn">
166 166 
             <image src="../images/sysIcon_d06.png" class="sysIcon_d05"></image>
167 167 
           </view>
168 
-          <view class="panelMenu312">{{SelectedItem.ButtonString[1]}}</view>
168 
+          <view class="panelMenu312">{{SelectedItem.TestFunction[1].N2}}</view>
169 169 
         </view>
170 170 
       </block>
171 171 
       
@@ -182,17 +182,17 @@
182 182 
     </view>
183 183
184 184 
     <view class="panelMenu2">检验记录</view>
185 
-    <block wx:for="{{TestItemArr}}" wx:key="*this">
185 
+    <block wx:for="{{SelectedItem.TestItemArr}}" wx:key="index">
186 186 
       <view class="panelMenu5 FlexRow" >
187 187 
         <view class="panelMenu51 FlexRow">
188 188 
           <image src="../images/{{item.Icon}}.png" class="sysIcon_d01"></image>
189 
-          <view class="panelMenu511">{{item.Time}}</view>
189 
+          <view class="panelMenu511">{{item.TestTime}}</view>
190 190 
         </view>
191 
-        <view class="panelMenu52 FlexRow" wx:if="{{item.Right>0 && item.Wrong>0}}">
191 
+        <view class="panelMenu52 FlexRow" wx:if="{{item.RightNum>0 || item.WrongNum>0}}">
192 192 
           <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
193 
-          <view class="panel22321">{{item.Right}}</view>
193 
+          <view class="panel22321">{{item.RightNum}}</view>
194 194 
           <image src="../images/sysIcon_b02.png" class="sysIcon_b01"></image>
195 
-          <view class="panel22321">{{item.Wrong}}</view>
195 
+          <view class="panel22321">{{item.WrongNum}}</view>
196 196 
           <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
197 197 
         </view>
198 198 
       </view>

+ 9 - 1
pages_test/knowledge/unit.wxss
查看文件 

@@ -241,7 +241,10 @@
241 241 
   color: #2E2E2E;
242 242 
 }
243 243 
 .panel2232{
244 
-  margin-right: 40rpx;
244 
+  margin-right: 0rpx;
245 
+}
246 
+.panel22320{
247 
+  margin-right: 30rpx;
245 248 
 }
246 249
247 250 
 .panel22311{
 
@@ -266,6 +269,11 @@
266 269 
   height:20rpx;
267 270 
   margin-right: 50rpx;
268 271 
 }
272 
+.sysIcon_40{
273 
+  width:20rpx;
274 
+  height:20rpx;
275 
+  margin-right: 40rpx;
276 
+}
269 277 
 .sysIcon_b01{
270 278 
   width:14rpx;
271 279 
   height:14rpx;

+ 1 - 1
project.private.config.json
查看文件 

@@ -51,6 +51,6 @@
51 51 
     }
52 52 
   },
53 53 
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
54 
-  "libVersion": "2.28.1",
54 
+  "libVersion": "3.1.5",
55 55 
   "projectname": "%E7%A7%92%E8%BF%87"
56 56 
 }