chengjie 4 vuotta sitten
vanhempi
commit
2b32dea49e

+ 0 - 6
pages/main/default.js

@@ -34,12 +34,6 @@ Page({
34
       that.setData({
34
       that.setData({
35
         IsIPad: "_iPad",
35
         IsIPad: "_iPad",
36
       });
36
       });
37
-
38
-      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
39
-        that.setData({
40
-          IsExit: true,
41
-        });
42
-      }
43
     }
37
     }
44
 
38
 
45
     wx.showShareMenu({
39
     wx.showShareMenu({

+ 0 - 5
pages/main/default.wxml

@@ -49,11 +49,6 @@
49
   <view class='btn1' catchtap="goto" data-url="../index/index">重启小程序</view>
49
   <view class='btn1' catchtap="goto" data-url="../index/index">重启小程序</view>
50
 </view>
50
 </view>
51
 
51
 
52
-<view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
53
-  <view class='IsExitText'>点击关闭小程序。然后把屏幕竖起来,在竖屏情况下重开小程序。</view>
54
-  <navigator class='isExit' open-type="exit" target="miniProgram">关闭小程序</navigator>
55
-</view>
56
-
57
 <view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
52
 <view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
58
     <view class="panel2 FlexRow">
53
     <view class="panel2 FlexRow">
59
     <input class='input2 input' type="number"  always-embed="true"  value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
54
     <input class='input2 input' type="number"  always-embed="true"  value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />

+ 4 - 0
pages/test/index.js

@@ -53,6 +53,10 @@ Page({
53
       name1=name1.replace("语文古诗文","语文");
53
       name1=name1.replace("语文古诗文","语文");
54
       url="./item?testtype=recite&name1="+name1+"&bookid="+e.currentTarget.dataset.bookid;
54
       url="./item?testtype=recite&name1="+name1+"&bookid="+e.currentTarget.dataset.bookid;
55
     }
55
     }
56
+    else if (e.currentTarget.dataset.type=="Word" && e.currentTarget.dataset.bookid==100){
57
+      var name1=e.currentTarget.dataset.name1;
58
+      url="./item?testtype=read&name1="+name1+"&name2=英文字母&bookid=100";
59
+    }
56
     else{
60
     else{
57
       url="./list?name1="+e.currentTarget.dataset.name1+"&id="+e.currentTarget.dataset.bookid;
61
       url="./list?name1="+e.currentTarget.dataset.name1+"&id="+e.currentTarget.dataset.bookid;
58
     }
62
     }

+ 20 - 12
pages/test/item.js

@@ -46,7 +46,7 @@ Page({
46
     if (options.type)
46
     if (options.type)
47
       that.init2(options);
47
       that.init2(options);
48
     else{
48
     else{
49
-      if (options.bookid<=100){
49
+      if (options.bookid<100){
50
         if (options.bookid>=25 && options.bookid<=36)
50
         if (options.bookid>=25 && options.bookid<=36)
51
           that.initAncientPoetry(options);
51
           that.initAncientPoetry(options);
52
         else
52
         else
@@ -182,22 +182,30 @@ Page({
182
       TestName1: options.name1,
182
       TestName1: options.name1,
183
       TestName2: options.name2,
183
       TestName2: options.name2,
184
     });
184
     });
185
-    var arrEnglist=wx.getStorageSync("EnglishAll");
186
-    if (arrEnglist)
187
-      arrEnglist=JSON.parse(arrEnglist);
188
-    else
189
-      arrEnglist=[];
185
+
190
     var wordStr="";
186
     var wordStr="";
191
-    for(var i=0;i<arrEnglist.length;i++){
192
-      if (arrEnglist[i].ID==Number(options.bookid)){
193
-        for(var j=0;j<arrEnglist[i].Units.length;j++){
194
-          if (arrEnglist[i].Units[j].ID==options.unitsid){
195
-            wordStr=arrEnglist[i].Units[j].Words.join(",");
196
-            break;
187
+    if (options.bookid==100){
188
+      wordStr="A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
189
+    }
190
+    else{
191
+      var arrEnglist=wx.getStorageSync("EnglishAll");
192
+      if (arrEnglist)
193
+        arrEnglist=JSON.parse(arrEnglist);
194
+      else
195
+        arrEnglist=[];
196
+  
197
+      for(var i=0;i<arrEnglist.length;i++){
198
+        if (arrEnglist[i].ID==Number(options.bookid)){
199
+          for(var j=0;j<arrEnglist[i].Units.length;j++){
200
+            if (arrEnglist[i].Units[j].ID==options.unitsid){
201
+              wordStr=arrEnglist[i].Units[j].Words.join(",");
202
+              break;
203
+            }
197
           }
204
           }
198
         }
205
         }
199
       }
206
       }
200
     }
207
     }
208
+    
201
     main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&TestType='+options.testtype+'&Words=' + wordStr, function (data) {
209
     main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&TestType='+options.testtype+'&Words=' + wordStr, function (data) {
202
       if (data) {
210
       if (data) {
203
         TaskList = [];
211
         TaskList = [];

+ 7 - 4
pages/test/item.wxml

@@ -22,11 +22,14 @@
22
       <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="1" wx:if="{{TestAutioPlay==0}}">
22
       <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="1" wx:if="{{TestAutioPlay==0}}">
23
         <image src="../images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
23
         <image src="../images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
24
       </view>
24
       </view>
25
-      <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
26
-        <image src="../images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
27
-      </view>
25
+
26
+      <block wx:if="{{BookID<25 || BookID>36}}">
27
+        <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
28
+          <image src="../images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
29
+        </view>
30
+        <view class="panelTopText">自动播报</view>
31
+      </block>
28
       
32
       
29
-      <view class="panelTopText">自动播报</view>
30
       <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="1">
33
       <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="1">
31
         <image src="../images/universalpic_shelve_gray_26x26.png" class="universalpic_shelve_gray_26x26" />
34
         <image src="../images/universalpic_shelve_gray_26x26.png" class="universalpic_shelve_gray_26x26" />
32
       </view>
35
       </view>

+ 4 - 0
pages/test/report.js

@@ -234,6 +234,10 @@ Page({
234
     var delta = 2;
234
     var delta = 2;
235
     if (this.data.ReportType == "edit")
235
     if (this.data.ReportType == "edit")
236
       delta = 1;
236
       delta = 1;
237
+    
238
+    if (this.data.BookID==100 || (this.data.BookID>=25 && this.data.BookID<=36))
239
+      delta = 1;
240
+
237
     wx.navigateBack({
241
     wx.navigateBack({
238
       delta: delta,
242
       delta: delta,
239
     });
243
     });

+ 8 - 0
utils/constant.js

@@ -529,6 +529,14 @@ module.exports = {
529
     Select: "",
529
     Select: "",
530
     List: [
530
     List: [
531
       {
531
       {
532
+        ID: 100,
533
+        Type: "Word",
534
+        Name: "英文字母",
535
+        Name2: "A~Z,a~z",
536
+        Finish: 0,
537
+        Total: 26,
538
+        Image: "../images/examine_subject_b005.png"
539
+      },{
532
         ID: 101,
540
         ID: 101,
533
         Type: "Word",
541
         Type: "Word",
534
         Name: "常用单词1",
542
         Name: "常用单词1",

+ 18 - 9
utils/main.js

@@ -878,20 +878,29 @@ function GetTestReportInfo(reportid, callback) {
878
           arrEnglist = JSON.parse(arrEnglist);
878
           arrEnglist = JSON.parse(arrEnglist);
879
         else
879
         else
880
           arrEnglist = [];
880
           arrEnglist = [];
881
+        
882
+        var userTestReportInfo = UserTestReport[n];
883
+        var bookid = Number(name1[1].substr(4)) + 12;
884
+
881
         var wordStr = "";
885
         var wordStr = "";
882
-        for (var i = 0; i < arrEnglist.length; i++) {
883
-          if (arrEnglist[i].Name == name1[1]) {
884
-            for (var j = 0; j < arrEnglist[i].Units.length; j++) {
885
-              if (arrEnglist[i].Units[j].Name == name2) {
886
-                wordStr = arrEnglist[i].Units[j].Words.join(",");
887
-                break;
886
+        if (name1[1]=="英文字母"){
887
+          bookid=100;
888
+          wordStr="A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
889
+        }
890
+        else{
891
+          for (var i = 0; i < arrEnglist.length; i++) {
892
+            if (arrEnglist[i].Name == name1[1]) {
893
+              for (var j = 0; j < arrEnglist[i].Units.length; j++) {
894
+                if (arrEnglist[i].Units[j].Name == name2) {
895
+                  wordStr = arrEnglist[i].Units[j].Words.join(",");
896
+                  break;
897
+                }
888
               }
898
               }
889
             }
899
             }
890
           }
900
           }
891
         }
901
         }
892
-        var userTestReportInfo = UserTestReport[n];
893
-        var bookid = Number(name1[1].substr(4)) + 12;
894
-
902
+        
903
+        
895
         var tempRight = "," + userTestReportInfo.TestRightStr + ",";
904
         var tempRight = "," + userTestReportInfo.TestRightStr + ",";
896
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
905
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
897
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
906
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";