2.3.24

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.23",
+    Version: "2.3.24",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

pages_test/test/index.js

@@ -55,12 +55,6 @@ Page({
       var name1 = e.currentTarget.dataset.name1;
       url = "./item?testtype=read&name1=" + name1 + "&name2=英文字母&bookid=100";
     } 
-    else if (e.currentTarget.dataset.bookid>=141 && e.currentTarget.dataset.bookid<=149) {
-      var name1 = e.currentTarget.dataset.name1;
-      name1 = name1.replace("4000EEW ", "");
-      name1 = name1.replace(" 词汇600", "");
-      url = "./list?name1=" + name1 + "&id=" + e.currentTarget.dataset.bookid;
-    } 
     else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid) {
       url = "./list?name1=" + e.currentTarget.dataset.name1 + "&id=" + e.currentTarget.dataset.bookid;
     } 

pages_test/test/list.js

@@ -45,12 +45,18 @@ Page({
         title: name
       });
     }
-    else if (that.data.BookID>="160" && that.data.BookID<="169"){
+    else if (that.data.BookID>="160" && that.data.BookID<="164"){
       name=name.replace("BASIC ENGLISH WORDS","1000 BEW");
       wx.setNavigationBarTitle({
         title: name
       });
     }
+    else if (that.data.BookID>="165" && that.data.BookID<="168"){
+      name=name.replace("CORE ENGLISH WORDS","1000 CEW");
+      wx.setNavigationBarTitle({
+        title: name
+      });
+    }
     else{
       wx.setNavigationBarTitle({
         title: name
@@ -60,7 +66,11 @@ Page({
     
     var arr = [];
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
-    if (that.data.BookID > 160){
+    if (that.data.BookID > 164){
+      arr = wx.getStorageSync("CEWEngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 160){
       arr = wx.getStorageSync("BEWEngList");
       listType="english";
     }

pages_test/test/wordlist.js

@@ -61,8 +61,10 @@ Page({
           arr= wx.getStorageSync("EEWEngList");
         else if (bookid>=150 && bookid<160)
           arr= wx.getStorageSync("MiddleSchoolTestWords");
-        else if (bookid>=160 && bookid<170)
+        else if (bookid>=160 && bookid<165)
           arr= wx.getStorageSync("BEWEngList");
+        else if (bookid>=165 && bookid<170)
+          arr= wx.getStorageSync("CEWEngList");
         
       }
       arr = JSON.parse(arr);

utils/main.js

@@ -879,7 +879,7 @@ function GetTestReportInfo(reportid, callback) {
       var name1 = UserTestReport[n].Name[0].split(" ");
       var name2 = UserTestReport[n].Name[1];
 
-      if (name1[0].indexOf("英语") >= 0 ||name1[0].indexOf("单词") >= 0 || name1[0].indexOf("1000") >= 0 || name1[0].indexOf("4000") >= 0) {
+      if (name1[0].indexOf("英语") >= 0 ||name1[0].indexOf("单词") >= 0 || name1[0].indexOf("1000") >= 0 || name1[0].indexOf("2000") >= 0 || name1[0].indexOf("4000") >= 0) {
         //console.log("英语");
         var wordStr = "";
         var userTestReportInfo = UserTestReport[n];
@@ -1255,6 +1255,7 @@ function getEnglish(callback) {
       var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
       var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
       var arrEEWEngList = common.Decrypt(data.EEWEngList);
+      var arrCEWEngList = common.Decrypt(data.CEWEngList);
       var arrBEWEngList = common.Decrypt(data.BEWEngList);
       var arrMiddleSchoolTestWords = common.Decrypt(data.MiddleSchoolTestWords);
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
@@ -1262,6 +1263,7 @@ function getEnglish(callback) {
       wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
       wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
       wx.setStorageSync("EEWEngList", arrEEWEngList);
+      wx.setStorageSync("CEWEngList", arrCEWEngList);
       wx.setStorageSync("BEWEngList", arrBEWEngList);
       wx.setStorageSync("MiddleSchoolTestWords", arrMiddleSchoolTestWords);
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);