chengjie 4 years ago
parent
commit
32a78a3517

+ 1 - 1
app.js

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

BIN
pages/images/examine_subject_c001.png


BIN
pages/images/examine_subject_c002.png


BIN
pages/images/examine_subject_c003.png


BIN
pages/images/examine_subject_c004.png


+ 1 - 1
pages/test/item.js

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

+ 5 - 1
pages/test/list.js

@@ -39,7 +39,11 @@ Page({
39
     });
39
     });
40
     var arr = [];
40
     var arr = [];
41
     var listType="hanzi";
41
     var listType="hanzi";
42
-    if (that.data.BookID > 100){
42
+    if (that.data.BookID > 120){
43
+      arr = wx.getStorageSync("NewConceptEngList");
44
+      listType="english";
45
+    }
46
+    else if (that.data.BookID > 100){
43
       arr = wx.getStorageSync("EnglishAll");
47
       arr = wx.getStorageSync("EnglishAll");
44
       listType="english";
48
       listType="english";
45
     }
49
     }

+ 2 - 2
pages/test/list.wxml

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

+ 7 - 3
pages/test/wordlist.js

@@ -19,9 +19,13 @@ Page({
19
     var arr =[];
19
     var arr =[];
20
     if (options.type=="CHN")
20
     if (options.type=="CHN")
21
       arr= wx.getStorageSync("HanziAll");
21
       arr= wx.getStorageSync("HanziAll");
22
-    else
23
-      arr= wx.getStorageSync("EnglishAll");
24
-    
22
+    else{
23
+      var bookid=Number(options.bookid);
24
+      if (bookid<120)
25
+        arr= wx.getStorageSync("EnglishAll");
26
+      else if (bookid>120 && bookid<130)
27
+        arr= wx.getStorageSync("NewConceptEngList");
28
+    }
25
     arr = JSON.parse(arr);
29
     arr = JSON.parse(arr);
26
     var unitsid = Number(options.unitsid);
30
     var unitsid = Number(options.unitsid);
27
     var id = Number(options.id);
31
     var id = Number(options.id);

+ 1 - 1
pages/test/wordlist.wxml

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

+ 42 - 0
utils/constant.js

@@ -654,6 +654,48 @@ module.exports = {
654
         Image: "../images/examine_subject_b005.png"
654
         Image: "../images/examine_subject_b005.png"
655
       },
655
       },
656
     ]
656
     ]
657
+  },{
658
+    Name: "新概念英语单词",
659
+    Name2: "新概念英语单词",
660
+    Select: "",
661
+    List: [
662
+      {
663
+        ID: 121,
664
+        Type: "Word",
665
+        Name: "第一册",
666
+        Name2: "词汇906",
667
+        Finish: 0,
668
+        Total: 115,
669
+        Image: "../images/examine_subject_c001.png"
670
+      },
671
+      {
672
+        ID: 122,
673
+        Type: "Word",
674
+        Name: "第二册",
675
+        Name2: "词汇861",
676
+        Finish: 0,
677
+        Total: 96,
678
+        Image: "../images/examine_subject_c002.png"
679
+      },
680
+      {
681
+        ID: 123,
682
+        Type: "Word",
683
+        Name: "第三册",
684
+        Name2: "词汇1054",
685
+        Finish: 0,
686
+        Total: 60,
687
+        Image: "../images/examine_subject_c003.png"
688
+      },
689
+      {
690
+        ID: 124,
691
+        Type: "Word",
692
+        Name: "第四册",
693
+        Name2: "词汇777",
694
+        Finish: 0,
695
+        Total: 46,
696
+        Image: "../images/examine_subject_c004.png"
697
+      }
698
+    ]
657
   }],
699
   }],
658
   arrPinyin: [
700
   arrPinyin: [
659
     ['a1', 'ā', ['阿']],
701
     ['a1', 'ā', ['阿']],

+ 10 - 2
utils/main.js

@@ -880,7 +880,7 @@ function GetTestReportInfo(reportid, callback) {
880
           arrEnglist = [];
880
           arrEnglist = [];
881
         
881
         
882
         var userTestReportInfo = UserTestReport[n];
882
         var userTestReportInfo = UserTestReport[n];
883
-        var bookid = Number(name1[1].substr(4)) + 12;
883
+        var bookid = userTestReportInfo.BookID;
884
 
884
 
885
         var wordStr = "";
885
         var wordStr = "";
886
         if (name1[1]=="英文字母"){
886
         if (name1[1]=="英文字母"){
@@ -905,7 +905,13 @@ function GetTestReportInfo(reportid, callback) {
905
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
905
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
906
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
906
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
907
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
907
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
908
-        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&Words=' + wordStr+"&TestType="+userTestReportInfo.TestType, function (data) {
908
+
909
+        var unitsid="";
910
+        if (bookid>120 && bookid<=124){
911
+          unitsid=Number(name2.replace("Lesson ",""));
912
+        }
913
+
914
+        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID+'&BookID='+bookid+'&LessonID='+unitsid+ '&Words=' + wordStr+"&TestType="+userTestReportInfo.TestType, function (data) {
909
           if (data) {
915
           if (data) {
910
             var result = {};
916
             var result = {};
911
             result.ID = userTestReportInfo.ID;
917
             result.ID = userTestReportInfo.ID;
@@ -1111,7 +1117,9 @@ function getHanzi(callback) {
1111
         wx.setStorageSync("HanziAll", arr);
1117
         wx.setStorageSync("HanziAll", arr);
1112
 
1118
 
1113
         var arrEng = common.Decrypt(data.EngList);
1119
         var arrEng = common.Decrypt(data.EngList);
1120
+        var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
1114
         wx.setStorageSync("EnglishAll", arrEng);
1121
         wx.setStorageSync("EnglishAll", arrEng);
1122
+        wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
1115
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
1123
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
1116
       } else {
1124
       } else {
1117
         arr = wx.getStorageSync("HanziAll");
1125
         arr = wx.getStorageSync("HanziAll");