2.1.8

pages/main/default.js

@@ -34,12 +34,6 @@ Page({
       that.setData({
         IsIPad: "_iPad",
       });
-
-      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
-        that.setData({
-          IsExit: true,
-        });
-      }
     }
 
     wx.showShareMenu({

pages/main/default.wxml

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

pages/test/index.js

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

pages/test/item.js

@@ -46,7 +46,7 @@ Page({
     if (options.type)
       that.init2(options);
     else{
-      if (options.bookid<=100){
+      if (options.bookid<100){
         if (options.bookid>=25 && options.bookid<=36)
           that.initAncientPoetry(options);
         else
@@ -182,22 +182,30 @@ Page({
       TestName1: options.name1,
       TestName2: options.name2,
     });
-    var arrEnglist=wx.getStorageSync("EnglishAll");
-    if (arrEnglist)
-      arrEnglist=JSON.parse(arrEnglist);
-    else
-      arrEnglist=[];
+
     var wordStr="";
-    for(var i=0;i<arrEnglist.length;i++){
-      if (arrEnglist[i].ID==Number(options.bookid)){
-        for(var j=0;j<arrEnglist[i].Units.length;j++){
-          if (arrEnglist[i].Units[j].ID==options.unitsid){
-            wordStr=arrEnglist[i].Units[j].Words.join(",");
-            break;
+    if (options.bookid==100){
+      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";
+    }
+    else{
+      var arrEnglist=wx.getStorageSync("EnglishAll");
+      if (arrEnglist)
+        arrEnglist=JSON.parse(arrEnglist);
+      else
+        arrEnglist=[];
+  
+      for(var i=0;i<arrEnglist.length;i++){
+        if (arrEnglist[i].ID==Number(options.bookid)){
+          for(var j=0;j<arrEnglist[i].Units.length;j++){
+            if (arrEnglist[i].Units[j].ID==options.unitsid){
+              wordStr=arrEnglist[i].Units[j].Words.join(",");
+              break;
+            }
           }
         }
       }
     }
+    
     main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&TestType='+options.testtype+'&Words=' + wordStr, function (data) {
       if (data) {
         TaskList = [];

pages/test/item.wxml

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

pages/test/report.js

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

utils/constant.js

@@ -529,6 +529,14 @@ module.exports = {
     Select: "",
     List: [
       {
+        ID: 100,
+        Type: "Word",
+        Name: "英文字母",
+        Name2: "A~Z,a~z",
+        Finish: 0,
+        Total: 26,
+        Image: "../images/examine_subject_b005.png"
+      },{
         ID: 101,
         Type: "Word",
         Name: "常用单词1",

utils/main.js

@@ -878,20 +878,29 @@ function GetTestReportInfo(reportid, callback) {
           arrEnglist = JSON.parse(arrEnglist);
         else
           arrEnglist = [];
+        
+        var userTestReportInfo = UserTestReport[n];
+        var bookid = Number(name1[1].substr(4)) + 12;
+
         var wordStr = "";
-        for (var i = 0; i < arrEnglist.length; i++) {
-          if (arrEnglist[i].Name == name1[1]) {
-            for (var j = 0; j < arrEnglist[i].Units.length; j++) {
-              if (arrEnglist[i].Units[j].Name == name2) {
-                wordStr = arrEnglist[i].Units[j].Words.join(",");
-                break;
+        if (name1[1]=="英文字母"){
+          bookid=100;
+          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";
+        }
+        else{
+          for (var i = 0; i < arrEnglist.length; i++) {
+            if (arrEnglist[i].Name == name1[1]) {
+              for (var j = 0; j < arrEnglist[i].Units.length; j++) {
+                if (arrEnglist[i].Units[j].Name == name2) {
+                  wordStr = arrEnglist[i].Units[j].Words.join(",");
+                  break;
+                }
               }
             }
           }
         }
-        var userTestReportInfo = UserTestReport[n];
-        var bookid = Number(name1[1].substr(4)) + 12;
-
+        
+        
         var tempRight = "," + userTestReportInfo.TestRightStr + ",";
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";