0

app.js

@@ -1,7 +1,7 @@
 App({
   globalData: {
     Version: "1.5.16",
-    IsProduction: false,
+    IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/test/index.js

@@ -216,27 +216,28 @@ Page({
           }
           dataTemp.push(data[i]);
 
-          if (data[i].TestRightStr && data[i].TestRightStr.indexOf("_")>=0){
-            data[i].TestRightStr=data[i].TestRightStr.split(",");
+          if (data[i].Name[0].indexOf("英语")>=0){
+            if (data[i].TestRightStr){
+              data[i].TestRightStr=data[i].TestRightStr.split(",");
+            }
+            if (data[i].TestWrongStr){
+              data[i].TestWrongStr=data[i].TestWrongStr.split(",");
+            }          
+            if (data[i].TestSkipStr){
+              data[i].TestSkipStr=data[i].TestSkipStr.split(",");
+            }
+            if (data[i].TestExistStr){
+              data[i].TestExistStr=data[i].TestExistStr.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="";
                 

pages/test/report.js

@@ -34,10 +34,10 @@ Page({
 
     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 (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);
@@ -179,6 +179,7 @@ Page({
           obj.FontSize = item.FontSize;
           arr.push(obj);
           TestExistStr.push(item.Word);
+          
         } else if (that.data.List[i].List[j].Css === "Select2") {
           var item = that.data.List[i].List[j];
           TestExistStr.push(item.Word);

pages/test/report.wxml

@@ -15,15 +15,9 @@
         <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>
+      
+        <text class="text4">{{itemChild.Word}}</text>
         
-        <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>

utils/main.js

@@ -932,14 +932,14 @@ function GetTestReportInfo(reportid, callback) {
 
               taskInfo.TagWidth = 364;
               taskInfo.ContentNew = changeStringToView(taskInfo.Content);
-              if (tempRight.indexOf("," + taskInfo.ID + ",") >= 0)
+              if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
                 taskInfo.Result = 1;
-              if (tempWrong.indexOf("," + taskInfo.ID + ",") >= 0)
+              if (tempWrong.indexOf("," + taskInfo.Word + ",") >= 0)
                 taskInfo.Result = -1;
-              if (tempSkip.indexOf("," + taskInfo.ID + ",") >= 0)
+              if (tempSkip.indexOf("," + taskInfo.Word + ",") >= 0)
                 taskInfo.Result = 0;
 
-              if (tempExist.indexOf("," + taskInfo.ID + ",") >= 0)
+              if (tempExist.indexOf("," + taskInfo.Word + ",") >= 0)
                 taskInfo.Css = "Select2";
 
               TaskList.push(taskInfo);
@@ -949,13 +949,13 @@ function GetTestReportInfo(reportid, callback) {
             result.TestSkipStr = "";
             result.TestExistStr = "";
             if (userTestReportInfo.TestRightStr)
-              result.TestRightStr = userTestReportInfo.TestRightStr.join(",");
+              result.TestRightStr = userTestReportInfo.TestRightStr;
             if (userTestReportInfo.TestWrongStr)
-              result.TestWrongStr = userTestReportInfo.TestWrongStr.join(",");
+              result.TestWrongStr = userTestReportInfo.TestWrongStr;
             if (userTestReportInfo.TestSkipStr)
-              result.TestSkipStr = userTestReportInfo.TestSkipStr.join(",");
+              result.TestSkipStr = userTestReportInfo.TestSkipStr;
             if (userTestReportInfo.TestExistStr)
-              result.TestExistStr = userTestReportInfo.TestExistStr.join(",");
+              result.TestExistStr = userTestReportInfo.TestExistStr;
 
             result.List = TaskList;
             callback(result);