1.5.15

pages/main/add.wxss

@@ -187,9 +187,6 @@
   height:20rpx;
 }
 
-.panelItem .textLine {
-  text-decoration: underline;
-}
 .panelItem .textHighlighter {
   color:#fff;
   background-color: #1E1E1E;

pages/main/searchCard.js

@@ -17,7 +17,9 @@ Page({
       IsShow: app.globalData.userInfo.IsShow,
     });
 
-    if (new Date().getFullYear()>=2020){
+    var year=new Date(app.globalData.userInfo.CreateTime).getFullYear();
+    //console.log(year);
+    if (new Date().getFullYear()>=2020 && year<2020){
       that.setData({
         IsYearReport: true,
       });

pages/test/index.js

@@ -11,6 +11,11 @@ Page({
 
   },
   onLoad: function (options) {
+    if (options.UserID){
+      app.globalData.userInfo={};
+      app.globalData.userInfo.UserID=options.UserID;
+    }
+
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
@@ -158,40 +163,40 @@ Page({
             },
           ]
         },
-        // {
-        //   Name: "英语常用词",
-        //   Name2: "英语常用词",
-        //   Select: "",
-        //   List: [
-        //     {
-        //       ID: 13,
-        //       Type: "Word",
-        //       Name: "常用词1",
-        //       Name2: "词汇1~220",
-        //       Finish: 0,
-        //       Total: 22,
-        //       Image: "../images/examine_subject_b001.png"
-        //     },
-        //     {
-        //       ID: 14,
-        //       Type: "Word",
-        //       Name: "常用词2",
-        //       Name2: "词汇221~500",
-        //       Finish: 0,
-        //       Total: 28,
-        //       Image: "../images/examine_subject_b002.png"
-        //     },
-        //     {
-        //       ID: 15,
-        //       Type: "Word",
-        //       Name: "常用词3",
-        //       Name2: "词汇500~1000",
-        //       Finish: 0,
-        //       Total: 25,
-        //       Image: "../images/examine_subject_b003.png"
-        //     },
-        //   ]
-        // },
+        {
+          Name: "英语常用单词",
+          Name2: "英语常用单词",
+          Select: "",
+          List: [
+            {
+              ID: 13,
+              Type: "Word",
+              Name: "常用单词1",
+              Name2: "词汇1~220",
+              Finish: 0,
+              Total: 22,
+              Image: "../images/examine_subject_b001.png"
+            },
+            {
+              ID: 14,
+              Type: "Word",
+              Name: "常用单词2",
+              Name2: "词汇221~500",
+              Finish: 0,
+              Total: 28,
+              Image: "../images/examine_subject_b002.png"
+            },
+            {
+              ID: 15,
+              Type: "Word",
+              Name: "常用单词3",
+              Name2: "词汇500~1000",
+              Finish: 0,
+              Total: 50,
+              Image: "../images/examine_subject_b003.png"
+            },
+          ]
+        },
       ],
     })
     var userid = app.globalData.userInfo.UserID;
@@ -210,6 +215,31 @@ Page({
             }
           }
           dataTemp.push(data[i]);
+
+          if (data[i].TestRightStr && data[i].TestRightStr.indexOf("_")>=0){
+            data[i].TestRightStr=data[i].TestRightStr.split(",");
+          }
+          if (!data[i].TestRightStr)
+            data[i].TestRightStr="";
+
+          if (data[i].TestWrongStr && data[i].TestWrongStr.indexOf("_")>=0){
+            data[i].TestWrongStr=data[i].TestWrongStr.split(",");
+          }
+          if (!data[i].TestWrongStr)
+            data[i].TestWrongStr="";
+
+          if (data[i].TestSkipStr && data[i].TestSkipStr.indexOf("_")>=0){
+            data[i].TestSkipStr=data[i].TestSkipStr.split(",");
+          }
+          if (!data[i].TestSkipStr)
+            data[i].TestSkipStr="";
+
+          if (data[i].TestExistStr && data[i].TestExistStr.indexOf("_")>=0){
+            data[i].TestExistStr=data[i].TestExistStr.split(",");
+          }
+          if (!data[i].TestExistStr)
+            data[i].TestExistStr="";
+                
         }
 
         for (var i = 0; i < dataTemp.length; i++) {
@@ -267,16 +297,6 @@ Page({
   gotoTestReportInfo: function (e) {
     var id = e.currentTarget.dataset.id;
     var userid = app.globalData.userInfo.UserID;
-    //todo
-    // main.getData('GetTestReportInfo?UserID=' + userid+'&ID='+id, function (data) {
-    //   if (data) {
-    //     wx.setStorageSync("TestTask", data);
-    //     wx.navigateTo({
-    //       url: "./report?type=edit",
-    //     });
-    //   }
-    // });
-
     main.GetTestReportInfo(id,function(data){
         wx.setStorageSync("TestTask", data);
         wx.navigateTo({

pages/test/index.wxml

@@ -3,7 +3,7 @@
     <view class="panelTop1">{{GradeArr[TestSelectGrade].Name2}}</view>
     <view class="panelTop2 FlexRow">
       <image class="universalpic_menu_blue_26x26" src="../images/universalpic_menu_blue_26x26.png"></image>
-      <view>首选年级</view>
+      <view>更改科目</view>
     </view>
   </view>
   <view class="panelLine"></view>
@@ -79,9 +79,11 @@
         <view class='numberContainerFooter112 FlexRow'>
           <view class='numberContainerFooter1121{{item.Select}}' wx:for="{{GradeArr}}" wx:key="index" catchtap='onSelectGrade' data-value='{{index}}'>{{item.Name2}}</view>
         </view>
+        <view style="width:100%;height:40rpx;"></view>
       </view>
     </view>
   </view>
+  
   <view class='lineFooter'></view>
   <view class="numberContaineFooter FlexRow" catchtap='closeSelectGrade'>
     <view>关闭</view>

pages/test/index.wxss

@@ -265,7 +265,6 @@
 }
 .numberContainerFooter101{
   width:100%;
-  height: 376rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }

pages/test/item.js

@@ -37,6 +37,7 @@ Page({
   onLoad: function (options) {
     var that = this;
     that.setData({
+      BookID:options.bookid,
       IsShowAnswer: [0, 0],
       Color: main.getDetailColor(app.globalData.ColorIndex),
       Containnerheight: main.getWindowHeight(),
@@ -51,6 +52,7 @@ Page({
       that.initEng(options);
     }
     that.getColor();
+    
 
     isFinished = 0;
 
@@ -92,9 +94,11 @@ Page({
       TestType: TestTask2.TestType,
       TestName1: name[0],
       TestName2: name[1],
+      BookID:TestTask2.BookID,
     });
 
-    TestTask2.List = common.randomArray(TestTask2.List);
+    if (that.data.BookID<=12)
+      TestTask2.List = common.randomArray(TestTask2.List);
 
     var list = [];
     var i = 0;
@@ -162,12 +166,12 @@ Page({
         for (var k = 0; k < words.length; k++) {
           var taskInfo = words[k];
 
-          taskInfo.TagWidth=216;
+          taskInfo.TagWidth=364;
           taskInfo.ContentNew = main.changeStringToView(taskInfo.Content);
           TaskList.push(taskInfo);
         }
 
-        TaskList = common.randomArray(TaskList);
+        //TaskList = common.randomArray(TaskList);
 
         that.setData({
           TaskInfo: TaskList[0],
@@ -279,10 +283,12 @@ Page({
     if (str == "recorder") {
       url = e.currentTarget.dataset.soundmark;
     }
-    else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+    else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0 || str.indexOf("baidu.com")>0 || str.indexOf("iciba.com")>0) {
       str = str.replace("英 [", "[");
       str = str.replace("美 [", "[");
       url = e.currentTarget.dataset.soundmark;
+      if (!url)
+        url=str;
     }
     else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
       var soundmark = e.currentTarget.dataset.soundmark;
@@ -397,6 +403,7 @@ Page({
       TestTask.IsFinished = isFinished;
       TestTask.Name = this.data.TestName1 + "#" + this.data.TestName2;
       TestTask.List = TaskList;
+      TestTask.BookID=this.data.BookID;
       wx.setStorageSync("TestTask", TestTask);
       wx.redirectTo({
         url: './report?type=new',

pages/test/list.js

@@ -9,19 +9,19 @@ Page({
     IsSelect: false,
     ImagePath: app.globalData.uploadImageUrl,
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     var that = this;
     that.setData({
-      BookID:options.id,
+      BookID: options.id,
       Containnerheight: main.getWindowHeight(),
       Name1: options.name1,
     });
     isClick = true;
-    main.getHanzi(function(arr) {
+    main.getHanzi(function (arr) {
       if (!arr) {
         wx.removeStorageSync("HanziUpdateTime");
         wx.removeStorageSync("HanziAll");
-        main.getHanzi(function(arr) {
+        main.getHanzi(function (arr) {
           that.init(options);
         });
       } else {
@@ -29,7 +29,7 @@ Page({
       }
     });
   },
-  init: function(options) {
+  init: function (options) {
     var that = this;
     var name = options.name1;
     if (name.indexOf(" ") > 0)
@@ -38,9 +38,9 @@ Page({
       title: name
     });
     var arr = [];
-    if (that.data.BookID==13 || that.data.BookID==14 || that.data.BookID==15)
+    if (that.data.BookID == 13 || that.data.BookID == 14 || that.data.BookID == 15)
       arr = wx.getStorageSync("EnglishAll");
-    else if (that.data.BookID<=12)
+    else if (that.data.BookID <= 12)
       arr = wx.getStorageSync("HanziAll");
     var testReportList = wx.getStorageSync("UserTestReport");
     arr = JSON.parse(arr);
@@ -69,12 +69,22 @@ Page({
             if (testReportList[k].Name[0] == options.name1 &&
               testReportList[k].Name[1] == list[j].Name) {
 
+              var testRightCount = 0;
+              if (testReportList[k].TestRightStr)
+                testRightCount = testReportList[k].TestRightStr.length;
+              var testWrongCount = 0;
+              if (testReportList[k].testWrongStr)
+                testWrongCount = testReportList[k].testWrongStr.length;
+              var testSkipCount = 0;
+              if (testReportList[k].TestSkipStr)
+                testSkipCount = testReportList[k].TestSkipStr.length;
+
 
               if (testReportList[k].TestType == "read") {
                 if (testReportList[k].IsFinished == 1)
                   list[j].TestTypeRead = 1;
 
-                if ((testReportList[k].TestRight + testReportList[k].TestWrong + testReportList[k].TestSkip) < testReportList[k].TestTotal) {
+                if ((testRightCount + testWrongCount + testSkipCount) < testReportList[k].TestTotal) {
                   list[j].TestTypeReadFinished = false;
                 }
 
@@ -84,7 +94,7 @@ Page({
                 if (testReportList[k].IsFinished == 1)
                   list[j].TestTypeWrite = 1;
 
-                if ((testReportList[k].TestRight + testReportList[k].TestWrong + testReportList[k].TestSkip) < testReportList[k].TestTotal) {
+                if ((testRightCount + testWrongCount + testSkipCount) < testReportList[k].TestTotal) {
                   list[j].TestTypeWriteFinished = false;
                 }
 
@@ -100,7 +110,7 @@ Page({
       }
     }
   },
-  onShowFrame: function(e) {
+  onShowFrame: function (e) {
     var selectItem;
     var id = e.currentTarget.dataset.id;
     for (var i = 0; i < this.data.List.length; i++) {
@@ -113,57 +123,49 @@ Page({
       SelectItem: selectItem,
     });
   },
-  onClose: function() {
+  onClose: function () {
     this.setData({
       IsSelect: false,
     });
   },
-  goto: function(e) {
+  goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
       url: url,
     });
     this.onClose();
   },
-  gotoTestReportInfo: function(e) {
-    var that=this;
+  gotoTestReportInfo: function (e) {
+    var that = this;
     if (isClick) {
-      isClick=false;
-      setTimeout(function(){
-        isClick=true;
-      },2000);
+      isClick = false;
+      setTimeout(function () {
+        isClick = true;
+      }, 2000);
 
       var id = e.currentTarget.dataset.id;
       var userid = app.globalData.userInfo.UserID;
 
       if (id) {
         var reporttype = e.currentTarget.dataset.type;
-        // main.getData('GetTestReportInfo?UserID=' + userid + '&ID=' + id, function(data) {
-        //   if (data) {
-        //     wx.setStorageSync("TestTask2", data);
-        //     that.onClose();
-        //     wx.navigateTo({
-        //       url: "./item?type=" + reporttype,
-        //     });
-        //   }
-        // });
-        main.GetTestReportInfo(id,function(data){
-          wx.setStorageSync("TestTask2", data);
-            that.onClose();
-            wx.navigateTo({
-              url: "./item?type=" + reporttype,
-            });
+        main.GetTestReportInfo(id, function (data) {
+          data.BookID=that.data.BookID;
+          wx.setStorageSync("TestTask2", data); 
+          that.onClose();
+          wx.navigateTo({
+            url: "./item?type=" + reporttype+"&bookid="+that.data.BookID,
+          });
         });
       } else {
         that.onClose();
-        var url = e.currentTarget.dataset.url;
+        var url = e.currentTarget.dataset.url+"&bookid="+that.data.BookID;
         wx.navigateTo({
           url: url,
         });
       }
     }
   },
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,

pages/test/list.wxml

@@ -40,33 +40,25 @@
 	<view class="SelectContainer1 FlexColumn">
 		<image src="../images/examine_subjecticon_01.png" class="examine_subjecticon_01" />
 		<view class="SelectContainer1Text1">{{SelectItem.Name}}</view>
-		<view class="SelectContainer1Text2">检验哪个方面</view>
+		<view class="SelectContainer1Text2">选择检验方式</view>
 
 		<block wx:if="{{BookID<=12}}">
 			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
 				<image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
 				<view class="SelectContainer1Text4">查看字表</view>
 			</view>
-		</block>
-		<block wx:if="{{BookID>12}}">
-			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
-				<image src="../images/universalpic_words_blue_30x30.png" class="universalpic_word_blue_30x30" />
-				<view class="SelectContainer1Text4">查看词表</view>
-			</view>
-		</block>
-		<view class="btnPanel FlexRow">
-			
-			<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
-				<image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
-				<view class="SelectContainer1Text3">会念</view>
-			</view>
+			<view class="btnPanel FlexRow">
+				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
+					<image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
+					<view class="SelectContainer1Text3">会念</view>
+				</view>
+
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
+					<image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
+					<view class="SelectContainer1Text3">会念 继续检验</view>
+				</view>
 
-			<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
-				<image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
-				<view class="SelectContainer1Text3">会念 继续检验</view>
-			</view>
 
-			<block wx:if="{{BookID<=12}}">
 				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
 					<view class="SelectContainer1Text3">会写</view>
@@ -76,23 +68,46 @@
 					<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
 					<view class="SelectContainer1Text3">会写 继续检验</view>
 				</view>
-			</block>
+			</view>
 
+			<view class="btnPanel2 FlexRow">
+				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+					重新开始
+				</view>
 
-		</view>
+				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btnPanel21"></view>
+				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+					重新开始
+				</view>
+			</view>
+		</block>
 
-		<view class="btnPanel2 FlexRow">
-			<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
-			<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
-				重新开始
+		<block wx:if="{{BookID>12}}">
+			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&unitsid={{UnitsID}}&id={{SelectItem.ID}}">
+				<image src="../images/universalpic_words_blue_30x30.png" class="universalpic_word_blue_30x30" />
+				<view class="SelectContainer1Text4">查看词表</view>
+			</view>
+			<view class="btnPanel1">说出单词在句子中的含义</view>
+			<view class="btnPanel0 btnPanel FlexRow">
+				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
+					<view class="SelectContainer1Text3">开始检验</view>
+				</view>
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
+					<view class="SelectContainer1Text3">继续检验</view>
+				</view>
 			</view>
 
-			<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btnPanel21"></view>
-			<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
-				重新开始
+			<view class="btnPanel2 FlexRow">
+				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+					重新开始
+				</view>
 			</view>
-		</view>
+		</block>
+
 
+		<view style="width:100%;height:50rpx;"></view>
 		<view class="close FlexRow" bindtap="onClose">
 			<image src="../images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
 		</view>

pages/test/list.wxss

@@ -88,7 +88,7 @@
 
 .SelectContainer .SelectContainer1{
   width:710rpx;
-  height:613rpx;
+  /* height:613rpx; */
   border-radius: 10rpx;
   background-color: #F8F8F8;
   position: relative;
@@ -127,6 +127,12 @@
   margin-top: 20rpx;
 }
 
+.btnPanel1{
+  margin-top: 60rpx;
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
 
 .btn{
   width:315rpx;

pages/test/report.js

@@ -14,7 +14,7 @@ Page({
   onLoad: function (options) {
     var that = this;
     that.setData({
-      ReportType:options.type,
+      ReportType: options.type,
       Containnerheight: main.getWindowHeight(),
     });
 
@@ -22,26 +22,29 @@ Page({
   },
   init: function () {
     var that = this;
+    TestReportID = 0;
     var TestTask = wx.getStorageSync("TestTask");
     var list = TestTask.List;
     var listRight = [];
     var listSkip = [];
     var listWrong = [];
-    TestTask.TestRightStr=[];
-    TestTask.TestWrongStr=[];
-    TestTask.TestSkipStr=[];
+    TestTask.TestRightStr = [];
+    TestTask.TestWrongStr = [];
+    TestTask.TestSkipStr = [];
 
     if (list) {
       for (var i = 0; i < list.length; i++) {
+        if (TestTask.BookID > 12) {
+          list[i].Field1 = list[i].ContentNew.Field[1][0].Content;
+          list[i].Word = list[i].ID;
+        }
         if (list[i].Result == 1) {
           listRight.push(list[i]);
           TestTask.TestRightStr.push(list[i].Word);
-        }
-        else if (list[i].Result == -1) {
+        } else if (list[i].Result == -1) {
           listWrong.push(list[i]);
           TestTask.TestWrongStr.push(list[i].Word);
-        }
-        else if (list[i].Result == 0) {
+        } else if (list[i].Result == 0) {
           listSkip.push(list[i]);
           TestTask.TestSkipStr.push(list[i].Word);
         }
@@ -49,44 +52,67 @@ Page({
 
       var result = [];
       if (listWrong.length > 0) {
-        result.push({ Name: "答错的题目", Expand: 1, List: listWrong });
+        result.push({
+          Name: "答错的题目",
+          Expand: 1,
+          List: listWrong
+        });
         if (listSkip.length > 0)
-          result.push({ Name: "跳过的题目", Expand: 1, List: listSkip });
+          result.push({
+            Name: "跳过的题目",
+            Expand: 1,
+            List: listSkip
+          });
         if (listRight.length > 0)
-          result.push({ Name: "答对的题目", Expand: 1, List: listRight });
-      }
-      else {
+          result.push({
+            Name: "答对的题目",
+            Expand: 1,
+            List: listRight
+          });
+      } else {
         if (listSkip.length > 0) {
-          result.push({ Name: "跳过的题目", Expand: 1, List: listSkip });
+          result.push({
+            Name: "跳过的题目",
+            Expand: 1,
+            List: listSkip
+          });
           if (listRight.length > 0)
-            result.push({ Name: "答对的题目", Expand: 1, List: listRight });
-        }
-        else {
+            result.push({
+              Name: "答对的题目",
+              Expand: 1,
+              List: listRight
+            });
+        } else {
           if (listRight.length > 0)
-            result.push({ Name: "答对的题目", Expand: 1, List: listRight });
+            result.push({
+              Name: "答对的题目",
+              Expand: 1,
+              List: listRight
+            });
         }
       }
 
       var name = "";
-      if (TestTask.Name && TestTask.Name.indexOf("#")>0){
-        name=TestTask.Name;
-        name=name.substr(name.indexOf("#")+1);
-        if (TestTask.TestType=="read")
-          name+=" 会念";
+      if (TestTask.Name && TestTask.Name.indexOf("#") > 0) {
+        name = TestTask.Name;
+        name = name.substr(name.indexOf("#") + 1);
+        if (TestTask.TestType == "read")
+          name += " 会念";
         else
-          name+=" 会写";
+          name += " 会写";
       }
 
       that.setData({
         NumberWrong: listWrong.length,
         NumberSkip: listSkip.length,
         NumberRight: listRight.length,
+        BookID: Number(TestTask.BookID),
         Name: name,
         List: result,
         NumberTotal: list.length,
       });
-      
-      if (that.data.ReportType=="new")
+
+      if (that.data.ReportType == "new")
         that.saveInfo(TestTask);
 
       wx.setNavigationBarTitle({
@@ -117,14 +143,12 @@ Page({
           that.setData({
             List: that.data.List,
           });
-        }
-        else if (that.data.List[index].List[i].Css == "Select2") {
+        } else if (that.data.List[index].List[i].Css == "Select2") {
           wx.showToast({
             title: '已经生成过了',
             image: "../images/universalpic_ribbon_white_96x120.png",
           });
-        }
-        else {
+        } else {
           that.data.List[index].List[i].Css = "Select";
           that.setData({
             List: that.data.List,
@@ -133,11 +157,11 @@ Page({
         break;
       }
     }
-
   },
   buildCard: function () {
     var that = this;
-    var arr = [],TestExistStr=[];
+    var arr = [],
+      TestExistStr = [];
     for (var i = 0; i < that.data.List.length; i++) {
       for (var j = 0; j < that.data.List[i].List.length; j++) {
         if (that.data.List[i].List[j].Css === "Select") {
@@ -147,14 +171,15 @@ Page({
           obj.Field2 = item.Content[2].Content;
           obj.Field3 = "";
           obj.Tags = item.Content[0].Content;
+          if (!common.checkIsArray(obj.Tags))
+            obj.Tags = obj.Tags.split(",");
           obj.IsTodayStudy = 0;
           obj.ID = 0;
           obj.LimitTime = common.formatTime(new Date());
           obj.FontSize = item.FontSize;
           arr.push(obj);
           TestExistStr.push(item.Word);
-        }
-        else if (that.data.List[i].List[j].Css === "Select2") {
+        } else if (that.data.List[i].List[j].Css === "Select2") {
           var item = that.data.List[i].List[j];
           TestExistStr.push(item.Word);
         }
@@ -175,16 +200,16 @@ Page({
         });
         if (buildCardNumber >= arr.length) {
           clearInterval(intervalBuild);
-          var TestTask={};
-          TestTask.TestExistStr=TestExistStr;
+          var TestTask = {};
+          TestTask.TestExistStr = TestExistStr;
+          
           that.saveInfo(TestTask);
           that.setData({
             IsBuild: 2,
           });
         }
       }, 500);
-    }
-    else {
+    } else {
       wx.showToast({
         title: '先选题目',
         image: "../images/universalpic_wrong_white_120x120.png",
@@ -200,9 +225,9 @@ Page({
   },
   close: function (e) {
     wx.removeStorageSync("TestTask");
-    var delta=2;
-    if (this.data.ReportType=="edit")
-      delta=1;
+    var delta = 2;
+    if (this.data.ReportType == "edit")
+      delta = 1;
     wx.navigateBack({
       delta: delta,
     });
@@ -212,20 +237,37 @@ Page({
     clearInterval(intervalBuild);
     var userid = app.globalData.userInfo.UserID;
     var param1 = wx.getStorageSync("TestTask");
-    param1.TestTotal = param1.List.length;
+    if (param1.List)
+      param1.TestTotal = param1.List.length;
+
+    var symbol="";
+    if (that.data.BookID > 12) {
+      symbol=","
+    }
     if (TestTask.TestRightStr)
-      param1.TestRightStr=TestTask.TestRightStr.join("");
+      param1.TestRightStr = TestTask.TestRightStr.join(symbol);
     if (TestTask.TestWrongStr)
-      param1.TestWrongStr=TestTask.TestWrongStr.join("");
+      param1.TestWrongStr = TestTask.TestWrongStr.join(symbol);
     if (TestTask.TestSkipStr)
-      param1.TestSkipStr=TestTask.TestSkipStr.join("");
+      param1.TestSkipStr = TestTask.TestSkipStr.join(symbol);
     if (TestTask.TestExistStr)
-      param1.TestExistStr=TestTask.TestExistStr.join("");
-    //param1.List = JSON.stringify(param1.List);
+      param1.TestExistStr = TestTask.TestExistStr.join(symbol);
+
+    
+
+    if (TestReportID)
+      param1.ID = TestReportID;
+
+    param1.BookID=that.data.BookID;
+    wx.setStorageSync('TestTask', param1);
+    
     delete param1.List;
+    delete param1.BookID;
+
     main.postData('InsertTestReport?UserID=' + userid, param1, function (data) {
-      if (data)
+      if (data){
         TestReportID = data;
+      }
     });
   },
   gotoReport: function (e) {
@@ -234,11 +276,10 @@ Page({
         title: '已经完成！',
         image: "../images/universalpic_wrong_white_120x120.png",
       });
-    }
-    else {
+    } else {
       var testTask = wx.getStorageSync("TestTask");
       if (TestReportID)
-        testTask.ID = TestReportID;
+        testTask.ID=TestReportID;
       wx.setStorageSync("TestTask2", testTask);
       var url = "./item?type=edit";
       wx.redirectTo({
@@ -256,4 +297,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/test/report.wxml

@@ -15,7 +15,15 @@
         <image wx:if="{{itemChild.Css=='Select'}}" src="../images/universalpic_checked_white_22x17.png" class="universalpic_checked_white_22x17" />
         <image wx:if="{{itemChild.Css=='Select2'}}" src="../images/universalpic_bookmark_blue_40x40.png" class="universalpic_bookmark_blue_40x40" />
         <view wx:if="{{!itemChild.Css}}" class="circle"></view>
-        <view class="text4">{{itemChild.Word}}</view>
+        
+        <text class="text4" wx:if="{{BookID<=12}}">{{itemChild.Word}}</text>
+
+        <text class="text4 FlexRow" wx:if="{{BookID>12}}">
+          <block wx:for="{{itemChild.Field1}}" wx:key="contentIndex" wx:for-item="contentItem">
+            <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+            <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+          </block>
+        </text>
       </view>
     </block>
   </view>

pages/test/report.wxss

@@ -63,19 +63,17 @@
 .btn{
   min-width: 88rpx;
   border:1rpx solid #9B9B9B;
-  height:100rpx;
   border-radius: 10rpx;
   margin: 30rpx 0 0 30rpx;
-  padding: 0 30rpx;
+  padding: 30rpx;
   color:#1e1e1e;
 }
 
 .btnSelect{
   min-width: 88rpx;
-  height:100rpx;
   border-radius: 10rpx;
   margin: 30rpx 0 0 30rpx;
-  padding: 0 30rpx;
+  padding: 30rpx;
 
   border:1rpx solid #0071EF;
   background-color: #0071EF;
@@ -85,10 +83,9 @@
 .btnSelect2{
   min-width: 88rpx;
   border:1rpx solid #9B9B9B;
-  height:100rpx;
   border-radius: 10rpx;
   margin: 30rpx 0 0 30rpx;
-  padding: 0 30rpx;
+  padding: 30rpx;
   color:#1e1e1e;
 }
 
@@ -111,9 +108,15 @@
 }
 
 .text4{
-  margin-left: 20rpx;
   font-size:28rpx;
   font-weight: 400;
+  max-width: 570rpx;
+  margin: 0 0 0 20rpx;
+}
+
+
+.panelItem .textLine {
+  text-decoration: underline;
 }
 
 .panelFooter{

project.config.json

@@ -110,7 +110,7 @@
 					"id": 7,
 					"name": "pages/test/index",
 					"pathName": "pages/test/index",
-					"query": "",
+					"query": "UserID=1",
 					"scene": null
 				},
 				{

utils/main.js

@@ -62,8 +62,7 @@ function getLocalHost(callback) {
         callback();
       },
     });
-  }
-  else {
+  } else {
     app.globalData.serverUrl = app.globalData.serverUrlServer;
     callback();
   }
@@ -88,7 +87,7 @@ function payMoney(payType, remark, money, detail, callback) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('ProductPayLogin500?code=' + res.code + '&payType=7&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID+'&Remark='+remark, function (data) {
+        getData('ProductPayLogin500?code=' + res.code + '&payType=7&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID + '&Remark=' + remark, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({
@@ -104,8 +103,7 @@ function payMoney(payType, remark, money, detail, callback) {
               'fail': function (err) {
                 if (err && err.errMsg && err.errMsg.indexOf("fail cancel")) {
 
-                }
-                else {
+                } else {
                   wx.showToast({
                     title: '服务器忙，请稍候再试！',
                     duration: 3000
@@ -135,8 +133,7 @@ function getTimeFormat(duration) {
   if (duration.indexOf(".") > 0) {
     arr[1] = duration.substring(duration.indexOf("'") + 1, duration.indexOf(".") + 1);
     arr[2] = duration.substring(duration.indexOf(".") + 1, duration.indexOf('"'));
-  }
-  else {
+  } else {
     arr[1] = duration.substring(duration.indexOf("'") + 1, duration.indexOf('"'));
   }
   return arr;
@@ -148,15 +145,14 @@ function getWindowHeight() {
   //console.log("app.globalData.systemInfo.windowHeight:" + app.globalData.systemInfo.windowHeight * 2);
   if (app.globalData.systemInfo.model) {
     if (height == 504 && (
-      app.globalData.systemInfo.model.indexOf("iPhone 6<") >= 0
-      || app.globalData.systemInfo.model.indexOf("iPhone 7<") >= 0
-      || app.globalData.systemInfo.model.indexOf("iPhone 6s<") >= 0
-      || app.globalData.systemInfo.model.indexOf("iPhone 5") >= 0
-      || app.globalData.systemInfo.model.indexOf("iPhone SE") >= 0
-    )) {
+        app.globalData.systemInfo.model.indexOf("iPhone 6<") >= 0 ||
+        app.globalData.systemInfo.model.indexOf("iPhone 7<") >= 0 ||
+        app.globalData.systemInfo.model.indexOf("iPhone 6s<") >= 0 ||
+        app.globalData.systemInfo.model.indexOf("iPhone 5") >= 0 ||
+        app.globalData.systemInfo.model.indexOf("iPhone SE") >= 0
+      )) {
       height = 596;
-    }
-    else if (app.globalData.systemInfo.model.indexOf("iPad") >= 0) {
+    } else if (app.globalData.systemInfo.model.indexOf("iPad") >= 0) {
       height = 470;
     }
   }
@@ -164,8 +160,7 @@ function getWindowHeight() {
   height = height * 2;
   if (app.globalData.systemInfo.system && app.globalData.systemInfo.system.indexOf("Android") >= 0) {
     height = height + 168;
-  }
-  else {
+  } else {
     height = height + 50;
   }
   //console.log("height:" + height);
@@ -192,8 +187,7 @@ function getStorageValue(obj, name, defaultStatus, callback) {
 }
 
 function getProgramList() {
-  return [
-    {
+  return [{
       id: 89,
       appId: 'wx46a7b4c420e6d38f',
       path: 'pages/index/start?SourceID=' + app.globalData.ProgramID,
@@ -222,13 +216,13 @@ function gotoFeedback() {
   wx.navigateToMiniProgram({
     appId: "wx80059777521b897c",
     path: "pages/index/feedback",
-    extraData: {
-    },
+    extraData: {},
     success(res) {
       // 打开成功
     }
   });
 }
+
 function changeViewToString(content) {
   var str = content;
   if (str.constructor == Array) {
@@ -289,22 +283,23 @@ function DecryptUrl(str) {
 
 function changeStringToView(field) {
   var result = {};
-  result.Field = [[]];
+  result.Field = [
+    []
+  ];
   result.Images = [];
 
   for (var j = 0; j < field.length; j++) {
     if (j == 0) {
       if (field[j].ContentType == 0 && field[j].Content && field[j].Content.length > 0) {
         result.Tags = field[j].Content.toString().split(",");
-      }
-      else {
+      } else {
         result.Tags = [];
       }
-    }
-    else {
+    } else {
       if (field[j].ContentType == j && field[j].Content && field[j].Content.length > 0) {
 
-        var arrResult = [], arrSoundMark = [];
+        var arrResult = [],
+          arrSoundMark = [];
         var str = field[j].Content.toString();
 
         str = DecryptUrl(str);
@@ -333,8 +328,7 @@ function changeStringToView(field) {
                 obj.Height = Math.round((w * Number(obj.Height)) / Number(obj.Width));
                 obj.Width = w;
 
-              }
-              else {
+              } else {
                 obj.Width = "";
                 obj.Height = "";
               }
@@ -345,10 +339,10 @@ function changeStringToView(field) {
             }
             arrResult.push(obj);
 
-          }
-          else if ((arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) || (arr[k].indexOf("[光]") >= 0 && arr[k].indexOf("[/光]") > 0)) {
+          } else if ((arr[k].indexOf("[线]") >= 0 && arr[k].indexOf("[/线]") > 0) || (arr[k].indexOf("[光]") >= 0 && arr[k].indexOf("[/光]") > 0)) {
             var obj;
-            var content = [], temp = arr[k];
+            var content = [],
+              temp = arr[k];
             do {
               var num1 = temp.indexOf("[线]");
               var num2 = temp.indexOf("[光]");
@@ -360,16 +354,14 @@ function changeStringToView(field) {
                       key: "normal",
                       value: temp1,
                     });
-                  }
-                  else {
+                  } else {
                     if (arr[k].indexOf("[线]") > 0) {
                       content.push({
                         key: "normal",
                         value: temp,
                       });
                       temp = "";
-                    }
-                    else {
+                    } else {
                       if (temp && temp.indexOf("[线]") < 0) {
                         content.push({
                           key: "normal",
@@ -379,24 +371,21 @@ function changeStringToView(field) {
                       }
                     }
                   }
-                }
-                else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
+                } else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
                   var temp1 = temp.substring(0, temp.indexOf("[光]"));
                   if (temp1) {
                     content.push({
                       key: "normal",
                       value: temp1,
                     });
-                  }
-                  else {
+                  } else {
                     if (arr[k].indexOf("[光]") > 0) {
                       content.push({
                         key: "normal",
                         value: temp,
                       });
                       temp = "";
-                    }
-                    else {
+                    } else {
                       if (temp && temp.indexOf("[光]") < 0) {
                         content.push({
                           key: "normal",
@@ -406,16 +395,14 @@ function changeStringToView(field) {
                       }
                     }
                   }
-                }
-                else {
+                } else {
                   content.push({
                     key: "normal",
                     value: temp,
                   });
                   temp = "";
                 }
-              }
-              else {
+              } else {
                 content.push({
                   key: "normal",
                   value: temp,
@@ -436,8 +423,7 @@ function changeStringToView(field) {
                   }
 
                   temp = temp.substr(temp.indexOf("[/线]") + 4);
-                }
-                else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
+                } else if ((num1 > num2 && num1 >= 0 && num2 >= 0) || (num1 < 0 && num2 >= 0)) {
                   temp = temp.substr(temp.indexOf("[光]") + 3);
 
                   temp1 = temp.substring(0, temp.indexOf("[/光]"));
@@ -449,11 +435,9 @@ function changeStringToView(field) {
                   }
 
                   temp = temp.substr(temp.indexOf("[/光]") + 4);
-                }
-                else
+                } else
                   temp = "";
-              }
-              else
+              } else
                 temp = "";
 
             }
@@ -464,21 +448,18 @@ function changeStringToView(field) {
             obj.Type = "line";
             obj.Content = content;
             arrResult.push(obj);
-          }
-          else if (arr[k].indexOf("[读") >= 0 && arr[k].indexOf("[/读]") > 0) {
+          } else if (arr[k].indexOf("[读") >= 0 && arr[k].indexOf("[/读]") > 0) {
             var obj = {};
             obj.Type = "sound";
             if (arr[k].indexOf("[读]") >= 0) {
               obj.Content = arr[k].substring(arr[k].indexOf("[读]") + 3, arr[k].indexOf("[/读]"));
-            }
-            else {
+            } else {
               var tempIndex = arr[k].indexOf("\']") + 2;
               obj.Content = arr[k].substring(tempIndex, arr[k].indexOf("[/读]"));
               obj.SoundMark = arr[k].substring(arr[k].indexOf("src='") + 5, arr[k].indexOf("']"));;
             }
             arrResult.push(obj);
-          }
-          else if (arr[k].indexOf("[音") >= 0 && arr[k].indexOf("[/音]") > 0) {
+          } else if (arr[k].indexOf("[音") >= 0 && arr[k].indexOf("[/音]") > 0) {
             var obj = {};
             obj.Type = "recorder";
 
@@ -487,14 +468,12 @@ function changeStringToView(field) {
             obj.SoundMark = arr[k].substring(arr[k].indexOf("url='") + 5, arr[k].indexOf("']"));;
 
             arrResult.push(obj);
-          }
-          else if (arr[k] != "") {
+          } else if (arr[k] != "") {
             var obj = {};
             obj.Type = "normal";
             obj.Content = arr[k];
             arrResult.push(obj);
-          }
-          else if (k > 0 && arr[k] == "") {
+          } else if (k > 0 && arr[k] == "") {
             var obj = {};
             obj.Type = "br";
             obj.Content = "";
@@ -506,16 +485,16 @@ function changeStringToView(field) {
         }
 
         //去掉前回车换行
-        while (arrResult[0].Type == "return"
-          || arrResult[0].Type == "br") {
+        while (arrResult[0].Type == "return" ||
+          arrResult[0].Type == "br") {
           arrResult.shift();
           if (arrResult.length == 0)
             break;
         }
         //去掉后回车换行
         for (var i = arrResult.length - 1; i >= 0; i--) {
-          if (arrResult[i].Type == "return"
-            || arrResult[i].Type == "br")
+          if (arrResult[i].Type == "return" ||
+            arrResult[i].Type == "br")
             arrResult.pop();
           else {
             break;
@@ -523,8 +502,7 @@ function changeStringToView(field) {
         }
         result.Field.push(arrResult);
 
-      }
-      else {
+      } else {
         result.Field.push([]);
       }
     }
@@ -625,7 +603,10 @@ function saveTempImage(serverUrl, tempUrl) {
       }
     }
     if (!b) {
-      list.push({ "ServerUrl": serverUrl, "TempUrl": tempUrl });
+      list.push({
+        "ServerUrl": serverUrl,
+        "TempUrl": tempUrl
+      });
     }
 
     if (list.length > 200) {
@@ -647,8 +628,7 @@ function UploadUserConfig() {
   param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray");
   param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr");
 
-  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
-  });
+  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {});
 }
 
 function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
@@ -694,8 +674,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
         callback();
       }
     });
-  }
-  else {
+  } else {
     wx.hideLoading();
     clearTimeout(dataSendTimeout);
     if (callback) {
@@ -714,9 +693,9 @@ function updateSearchList(obj) {
       obj.Key = obj.Key.substring(1, obj.Key.length - 1);
   }
   for (var i = 0; i < arr.length; i++) {
-    if (arr[i].Key == obj.Key
-      && arr[i].Type == obj.Type
-      && arr[i].Author == obj.Author
+    if (arr[i].Key == obj.Key &&
+      arr[i].Type == obj.Type &&
+      arr[i].Author == obj.Author
     ) {
       if (obj.Type == "shici") {
         if (arr[i].ShiciUrl == obj.ShiciUrl) {
@@ -724,8 +703,7 @@ function updateSearchList(obj) {
           arr.splice(i, 1);
           break;
         }
-      }
-      else {
+      } else {
         obj.Value = arr[i].Value;
         arr.splice(i, 1);
         break;
@@ -746,8 +724,8 @@ function updateSearchList(obj) {
 
 function checkIsIPhoneX() {
   var isIphoneX = false;
-  if (app.globalData.systemInfo.model.indexOf("iPhone X") >= 0
-    || app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
+  if (app.globalData.systemInfo.model.indexOf("iPhone X") >= 0 ||
+    app.globalData.systemInfo.model.indexOf("iPhone X") >= 0) {
     isIphoneX = true;
   }
   return isIphoneX;
@@ -762,8 +740,7 @@ function setCollect(id, collect, callback) {
       duration: 2000,
       image: "../images/universalpic_fav_white_120x110.png",
     });
-  }
-  else {
+  } else {
     wx.showToast({
       title: '取消收藏',
       duration: 2000,
@@ -828,7 +805,7 @@ function getMemoryLevel(index, number, time) {
   }
 }
 //得到要检验的汉字列表
-function GetHanziUnitWords(unitsID,testType,callback){
+function GetHanziUnitWords(unitsID, testType, callback) {
   getData('GetHanziUnitWords?UnitID=' + unitsID, function (data) {
     if (data) {
       var TaskList = [];
@@ -836,15 +813,23 @@ function GetHanziUnitWords(unitsID,testType,callback){
       for (var k = 0; k < words.length; k++) {
         var taskInfo = {
           FontSize: 144,
-          TagWidth:136,
-          Content: [
-            { ContentType: 0, Content: [] },
-            { ContentType: 1, Content: [] },
-            { ContentType: 2, Content: [] },
+          TagWidth: 136,
+          Content: [{
+              ContentType: 0,
+              Content: []
+            },
+            {
+              ContentType: 1,
+              Content: []
+            },
+            {
+              ContentType: 2,
+              Content: []
+            },
           ]
         };
-        taskInfo.Word=words[k].Name;
-        
+        taskInfo.Word = words[k].Name;
+
         var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
         taskInfo.ReadString = words[k].Name + pinyinNormal + "," + words[k].CombineWords + "的" + words[k].Name + pinyinNormal;
 
@@ -853,8 +838,8 @@ function GetHanziUnitWords(unitsID,testType,callback){
           var question = words[k].CombineWords;
           question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
           taskInfo.Content[1].Content = question;
-          
-          
+
+
           var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
           taskInfo.Content[2].Content = answer;
 
@@ -864,13 +849,12 @@ function GetHanziUnitWords(unitsID,testType,callback){
               taskInfo.FontSize = 68;
             }
           }
-        }
-        else if (testType == "write") {
+        } else if (testType == "write") {
           taskInfo.Content[0].Content = ["怎么写"];
 
           var question = words[k].CombineWords;
           var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
-          
+
           question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
           taskInfo.Content[1].Content = question;
           var answer = words[k].Name;
@@ -892,56 +876,132 @@ function GetHanziUnitWords(unitsID,testType,callback){
       }
 
       callback(TaskList);
-    }
-    else{
+    } else {
       callback([]);
     }
   });
 }
 
-function GetTestReportInfo(reportid,callback){
-  var UserTestReport=wx.getStorageSync('UserTestReport');
-  var HanziAll=wx.getStorageSync('HanziAll');
-  HanziAll = JSON.parse(HanziAll);
-  for(var n=0;n<UserTestReport.length;n++){
-    if (UserTestReport[n].ID==reportid){
-      var name1=UserTestReport[n].Name[0].split(" ");
-      name1=name1[0]+"识字能力"+name1[2].substr(0,1);
-      var name2=UserTestReport[n].Name[1];
-      for(var i=0;i<HanziAll.length;i++){
-        if (name1==HanziAll[i].Name){
-          for(var j=0;j<HanziAll[i].Units.length;j++){
-            if (name2==HanziAll[i].Units[j].Name){
-              var obj=UserTestReport[n];
-              GetHanziUnitWords(HanziAll[i].Units[j].ID,obj.TestType,function(list){
-                if (list){
-                  for(var k=0;k<list.length;k++){
-                    if (obj.TestRightStr && obj.TestRightStr.indexOf(list[k].Word)>=0)
-                      list[k].Result=1;
-                    else if (obj.TestWrongStr && obj.TestWrongStr.indexOf(list[k].Word)>=0)
-                      list[k].Result=-1;  
-                    else if (obj.TestSkipStr && obj.TestSkipStr.indexOf(list[k].Word)>=0)
-                      list[k].Result=0;  
-
-                    if (obj.TestExistStr && obj.TestExistStr.indexOf(list[k].Word)>=0)
-                      list[k].Css="Select2";
-                    
-                  }
-                  var result={};
-                  result.ID=reportid;
-                  result.TestType=obj.TestType;
-                  result.Name=obj.Name.join("#");
-                  result.IsFinished=obj.IsFinished;
-                  result.TestRightStr=obj.TestRightStr;
-                  result.TestWrongStr=obj.TestWrongStr;
-                  result.TestSkipStr=obj.TestSkipStr;
-                  result.TestExistStr=obj.TestExistStr;
-                  result.List=list;
-                  callback(result);
-                }
-                else
-                  callback({});
-              });
+function GetTestReportInfo(reportid, callback) {
+  var UserTestReport = wx.getStorageSync('UserTestReport');
+
+  for (var n = 0; n < UserTestReport.length; n++) {
+    if (UserTestReport[n].ID == reportid) {
+      var name1 = UserTestReport[n].Name[0].split(" ");
+      var name2 = UserTestReport[n].Name[1];
+
+      if (name1[0].indexOf("英语") >= 0) {
+        //todo
+        //console.log("英语");
+        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].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 + ",";
+        var tempExist = "," + userTestReportInfo.TestExistStr + ",";
+        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&Words=' + wordStr, function (data) {
+          if (data) {
+            var result = {};
+            result.ID = userTestReportInfo.ID;
+            result.IsFinished = userTestReportInfo.IsFinished;
+            result.Name = userTestReportInfo.Name.join("#");
+            result.TestType = userTestReportInfo.TestType;
+            result.BookID = bookid;
+
+            var TaskList = [];
+            var words = data;
+            for (var k = 0; k < words.length; k++) {
+              var taskInfo = words[k];
+
+              taskInfo.TagWidth = 364;
+              taskInfo.ContentNew = changeStringToView(taskInfo.Content);
+              if (tempRight.indexOf("," + taskInfo.ID + ",") >= 0)
+                taskInfo.Result = 1;
+              if (tempWrong.indexOf("," + taskInfo.ID + ",") >= 0)
+                taskInfo.Result = -1;
+              if (tempSkip.indexOf("," + taskInfo.ID + ",") >= 0)
+                taskInfo.Result = 0;
+
+              if (tempExist.indexOf("," + taskInfo.ID + ",") >= 0)
+                taskInfo.Css = "Select2";
+
+              TaskList.push(taskInfo);
+            }
+            result.TestRightStr = "";
+            result.TestWrongStr = "";
+            result.TestSkipStr = "";
+            result.TestExistStr = "";
+            if (userTestReportInfo.TestRightStr)
+              result.TestRightStr = userTestReportInfo.TestRightStr.join(",");
+            if (userTestReportInfo.TestWrongStr)
+              result.TestWrongStr = userTestReportInfo.TestWrongStr.join(",");
+            if (userTestReportInfo.TestSkipStr)
+              result.TestSkipStr = userTestReportInfo.TestSkipStr.join(",");
+            if (userTestReportInfo.TestExistStr)
+              result.TestExistStr = userTestReportInfo.TestExistStr.join(",");
+
+            result.List = TaskList;
+            callback(result);
+          } else {
+            callback({});
+          }
+        });
+
+      } else {
+        name1 = name1[0] + "识字能力" + name1[2].substr(0, 1);
+        var HanziAll = wx.getStorageSync('HanziAll');
+        HanziAll = JSON.parse(HanziAll);
+        for (var i = 0; i < HanziAll.length; i++) {
+          if (name1 == HanziAll[i].Name) {
+            for (var j = 0; j < HanziAll[i].Units.length; j++) {
+              if (name2 == HanziAll[i].Units[j].Name) {
+                var obj = UserTestReport[n];
+                GetHanziUnitWords(HanziAll[i].Units[j].ID, obj.TestType, function (list) {
+                  if (list) {
+                    for (var k = 0; k < list.length; k++) {
+                      if (obj.TestRightStr && obj.TestRightStr.indexOf(list[k].Word) >= 0)
+                        list[k].Result = 1;
+                      else if (obj.TestWrongStr && obj.TestWrongStr.indexOf(list[k].Word) >= 0)
+                        list[k].Result = -1;
+                      else if (obj.TestSkipStr && obj.TestSkipStr.indexOf(list[k].Word) >= 0)
+                        list[k].Result = 0;
+
+                      if (obj.TestExistStr && obj.TestExistStr.indexOf(list[k].Word) >= 0)
+                        list[k].Css = "Select2";
+
+                    }
+                    var result = {};
+                    result.ID = reportid;
+                    result.TestType = obj.TestType;
+                    result.Name = obj.Name.join("#");
+                    result.IsFinished = obj.IsFinished;
+                    result.TestRightStr = obj.TestRightStr;
+                    result.TestWrongStr = obj.TestWrongStr;
+                    result.TestSkipStr = obj.TestSkipStr;
+                    result.TestExistStr = obj.TestExistStr;
+                    result.List = list;
+                    callback(result);
+                  } else
+                    callback({});
+                });
+              }
             }
           }
         }
@@ -1012,8 +1072,7 @@ function getHanzi(callback) {
         var arrEng = common.Decrypt(data.EngList);
         wx.setStorageSync("EnglishAll", arrEng);
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
-      }
-      else {
+      } else {
         arr = wx.getStorageSync("HanziAll");
         if (arr)
           arr = JSON.parse(arr);
@@ -1056,6 +1115,6 @@ module.exports = {
   buildInitData: buildInitData,
   getPinyinNormal: getPinyinNormal,
   getHanzi: getHanzi,
-  GetHanziUnitWords:GetHanziUnitWords,
-  GetTestReportInfo:GetTestReportInfo
+  GetHanziUnitWords: GetHanziUnitWords,
+  GetTestReportInfo: GetTestReportInfo
 }