2.1.11

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.10",
+    Version: "2.1.11",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/test/item.js

@@ -206,7 +206,7 @@ Page({
       }
     }
     
-    main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&TestType='+options.testtype+'&Words=' + wordStr, function (data) {
+    main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&BookID='+options.bookid+'&LessonID='+options.unitsid+'&TestType='+options.testtype+'&Words=' + wordStr, function (data) {
       if (data) {
         TaskList = [];
         var words = data;

pages/test/list.js

@@ -39,7 +39,11 @@ Page({
     });
     var arr = [];
     var listType="hanzi";
-    if (that.data.BookID > 100){
+    if (that.data.BookID > 120){
+      arr = wx.getStorageSync("NewConceptEngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 100){
       arr = wx.getStorageSync("EnglishAll");
       listType="english";
     }

pages/test/list.wxml

@@ -20,7 +20,7 @@
 						<image wx:if="{{ListType!='english' && item.TestTypeWrite==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
 						<image wx:if="{{ListType!='english' && !item.TestTypeWrite}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
 					</view>
-					<view class="right2">{{item.Words.length}}个字</view>
+					<view class="right2">{{item.Words.length}}个<block wx:if="{{ListType=='english'}}">单词</block><block wx:if="{{ListType=='hanzi'}}">字</block></view>
 				</view>
 			</view>
 			<view class="lineWidthAll FlexRow" wx:if="{{ListType!='english'}}">
@@ -78,7 +78,7 @@
 		</block>
 
 		<block wx:if="{{ListType=='english'}}">
-			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
+			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&bookid={{BookID}}&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
 				<image src="../images/universalpic_words_blue_30x30.png" class="universalpic_word_blue_30x30" />
 				<view class="SelectContainer1Text4">查看词表</view>
 			</view>

pages/test/wordlist.js

@@ -19,9 +19,13 @@ Page({
     var arr =[];
     if (options.type=="CHN")
       arr= wx.getStorageSync("HanziAll");
-    else
-      arr= wx.getStorageSync("EnglishAll");
-    
+    else{
+      var bookid=Number(options.bookid);
+      if (bookid<120)
+        arr= wx.getStorageSync("EnglishAll");
+      else if (bookid>120 && bookid<130)
+        arr= wx.getStorageSync("NewConceptEngList");
+    }
     arr = JSON.parse(arr);
     var unitsid = Number(options.unitsid);
     var id = Number(options.id);

pages/test/wordlist.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow">
     <view class="text1">{{UnitsName}}</view>
-    <view class="text2">{{Words.length}}个字</view>
+    <view class="text2">{{Words.length}}个<block wx:if="{{ShowType=='CHN'}}">字</block><block wx:if="{{ShowType=='ENG'}}">单词</block></view>
   </view>
   <view class="panelMain FlexColumn">
     <view class="panelMain1 FlexRow" wx:if="{{ShowType=='CHN'}}">

utils/constant.js

@@ -654,6 +654,48 @@ module.exports = {
         Image: "../images/examine_subject_b005.png"
       },
     ]
+  },{
+    Name: "新概念英语单词",
+    Name2: "新概念英语单词",
+    Select: "",
+    List: [
+      {
+        ID: 121,
+        Type: "Word",
+        Name: "第一册",
+        Name2: "词汇906",
+        Finish: 0,
+        Total: 115,
+        Image: "../images/examine_subject_c001.png"
+      },
+      {
+        ID: 122,
+        Type: "Word",
+        Name: "第二册",
+        Name2: "词汇861",
+        Finish: 0,
+        Total: 96,
+        Image: "../images/examine_subject_c002.png"
+      },
+      {
+        ID: 123,
+        Type: "Word",
+        Name: "第三册",
+        Name2: "词汇1054",
+        Finish: 0,
+        Total: 60,
+        Image: "../images/examine_subject_c003.png"
+      },
+      {
+        ID: 124,
+        Type: "Word",
+        Name: "第四册",
+        Name2: "词汇777",
+        Finish: 0,
+        Total: 46,
+        Image: "../images/examine_subject_c004.png"
+      }
+    ]
   }],
   arrPinyin: [
     ['a1', 'ā', ['阿']],

utils/main.js

@@ -880,7 +880,7 @@ function GetTestReportInfo(reportid, callback) {
           arrEnglist = [];
         
         var userTestReportInfo = UserTestReport[n];
-        var bookid = Number(name1[1].substr(4)) + 12;
+        var bookid = userTestReportInfo.BookID;
 
         var wordStr = "";
         if (name1[1]=="英文字母"){
@@ -905,7 +905,13 @@ function GetTestReportInfo(reportid, callback) {
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
-        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&Words=' + wordStr+"&TestType="+userTestReportInfo.TestType, function (data) {
+
+        var unitsid="";
+        if (bookid>120 && bookid<=124){
+          unitsid=Number(name2.replace("Lesson ",""));
+        }
+
+        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID+'&BookID='+bookid+'&LessonID='+unitsid+ '&Words=' + wordStr+"&TestType="+userTestReportInfo.TestType, function (data) {
           if (data) {
             var result = {};
             result.ID = userTestReportInfo.ID;
@@ -1111,7 +1117,9 @@ function getHanzi(callback) {
         wx.setStorageSync("HanziAll", arr);
 
         var arrEng = common.Decrypt(data.EngList);
+        var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
         wx.setStorageSync("EnglishAll", arrEng);
+        wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
       } else {
         arr = wx.getStorageSync("HanziAll");