2.1.45

app.js

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

pages/main/add.js

@@ -1513,7 +1513,7 @@ Page({
   gotoAddInfomationDetail:function(param){
     main.searchInfomation(param.Word,param.SearchType,param.Author,app.globalData.TempStr,function(list,obj){
       main.updateSearchList(obj,function(){
-        app.globalData.TempSearchBackNumber=1;
+        app.globalData.TempSearchBackNumber=0;
 
         wx.navigateTo({
           url: './addInfomationDetail',

pages/main/addInfomationDetail.js

@@ -367,6 +367,7 @@ Page({
             obj.Content = obj.Content.substr(0, len) + "...";
 
         main.updateSearchList(obj);
+        
         if (app.globalData.TempSearchBackNumber==0)
           app.globalData.TempSearchBackNumber=1;
         else if (app.globalData.TempSearchBackNumber>=1)

pages/main/addInfomationDetail.wxml

@@ -123,7 +123,7 @@
     <!-- 楷书数组 -->
     <view class="panelItem0 FlexRow" wx:if="{{ShowKaiti==0}}">
       <view class="{{CSS['CHN_KaitiArr_'+index].Css1}} {{Result.CHN.KaitiWidth}}  panelItem1 panelItem FlexRow"
-        wx:for="{{Result.CHN.KaitiArr}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}"
+        wx:for="{{Result.CHN.KaitiArr}}" wx:if="{{item}}" wx:key="*this" bindtap='getInputData' data-type="image" data-content="{{item}}"
         data-css="CHN_KaitiArr_{{index}}" data-tag="书写">
         <view class="FlexRow">
           <view class="{{CSS['CHN_KaitiArr_'+index].Css2}} panelSelect0">{{CSS['CHN_KaitiArr_'+index].Number}}</view>
@@ -135,7 +135,7 @@
     <!-- 笔顺数组 -->
     <view class="panelItem0 FlexRow" wx:if="{{ShowKaiti==1}}">
       <view class="{{CSS['CHN_BiShunArr2_'+index].Css1}} {{Result.CHN.BiShunWidth}}  panelItem1 panelItem FlexRow"
-        wx:for="{{Result.CHN.BiShunArr2}}" wx:key="*this" bindtap='getInputData' data-type="image"
+        wx:for="{{Result.CHN.BiShunArr2}}" wx:if="{{item}}" wx:key="*this" bindtap='getInputData' data-type="image"
         data-content="{{item}}" data-css="CHN_BiShunArr2_{{index}}" data-tag="书写">
         <view class="FlexRow">
           <view class="{{CSS['CHN_BiShunArr2_'+index].Css2}} panelSelect0">{{CSS['CHN_BiShunArr2_'+index].Number}}

pages/test/index.js

@@ -91,7 +91,7 @@ Page({
           }
           dataTemp.push(data[i]);
 
-          if (data[i].Name[0].indexOf("英语")>=0 || data[i].Name[1].indexOf("古诗文")>=0){
+          if (data[i].Name[0].indexOf("英语")>=0 || data[i].Name[0].indexOf("语文词语")>=0 || data[i].Name[0].indexOf("识字 上学期")>=0 || data[i].Name[0].indexOf("拼音")>=0 || data[i].Name[1].indexOf("古诗文")>=0){
             if (data[i].TestRightStr){
               data[i].TestRightStr=data[i].TestRightStr.split(",");
             }
@@ -106,7 +106,6 @@ Page({
             }
           }
           
-          
           if (!data[i].TestRightStr)
             data[i].TestRightStr="";
           if (!data[i].TestWrongStr)

pages/test/list.wxml

@@ -94,17 +94,17 @@
 				<view class="SelectContainer1Text4">查看词表</view>
 			</view>
 			<view class="btnPanel0 btnPanel FlexColumn">
-				<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 wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="read" 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">念{{FieldName}}{{FieldName2}}</view>
 				</view>
-				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
 					<image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
 					<view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}} 继续检验</view>
 				</view>
 				<view class="btnPanel1">根据{{FieldName}}念读音{{FieldName2}}</view>
 			
-				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
 					重新开始
 				</view>
 

pages/test/report.js

@@ -261,7 +261,7 @@ Page({
     }
     if (TestTask.TestRightStr)
       param1.TestRightStr = TestTask.TestRightStr.join(symbol);
-    if (common.checkIsArray(param1.TestWrongStr))
+    if (common.checkIsArray(param1.TestRightStr))
       param1.TestRightStr=param1.TestRightStr.join(symbol);
 
     if (TestTask.TestWrongStr)
@@ -311,6 +311,21 @@ Page({
       });
     }
   },
+  btnSelectAll:function(e){
+    var name=e.currentTarget.dataset.name;
+    var list=this.data.List;
+    for(var i=0;i<list.length;i++){
+      if (list[i].Name==name){
+        for(var j=0;j<list[i].List.length;j++){
+          if (!list[i].List[j].Css || list[i].List[j].Css=="")
+            list[i].List[j].Css="Select";
+        }
+      }
+    }
+    this.setData({
+      List: this.data.List,
+    });
+  },
   onUnload: function () {
     wx.removeStorageSync("TestTask");
   },

pages/test/report.wxml

@@ -10,14 +10,15 @@
       <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" wx:if="{{item.Expand=='1'}}" />
       <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray2" wx:if="{{item.Expand=='0'}}" />
     </view>
+    <view class="panelItem1 FlexRow" bindtap="btnSelectAll" data-name="{{item.Name}}">
+      <view class="text5">全选本组内容</view>
+    </view>
     <block wx:if="{{item.Expand==1}}">
       <view class="btn{{itemChild.Css}} FlexRow" wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild" wx:for-index="intexChild" bindtap="onSelectItem" data-index="{{index}}" data-word="{{itemChild.Word}}">
         <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>
-        
       </view>
     </block>
   </view>

pages/test/report.wxss

@@ -189,4 +189,10 @@
   margin-top: 40rpx;
   font-weight: 500;
   border-radius: 14rpx;
+}
+
+.text5{
+  color:#0071EF;
+  font-size: 28rpx;
+  margin: 30rpx 0 0 30rpx;
 }

utils/constant.js

@@ -194,7 +194,7 @@ module.exports = {
         ID:439,
         Name:"b",
         Words:[],
-        Length:55,
+        Length:54,
       },{
         ID:440,
         Name:"p",
@@ -204,7 +204,7 @@ module.exports = {
         ID:441,
         Name:"m",
         Words:[],
-        Length:58,
+        Length:56,
       },{
         ID:442,
         Name:"f",
@@ -214,7 +214,7 @@ module.exports = {
         ID:443,
         Name:"d",
         Words:[],
-        Length:62,
+        Length:61,
       },{
         ID:444,
         Name:"t",
@@ -224,12 +224,12 @@ module.exports = {
         ID:445,
         Name:"n",
         Words:[],
-        Length:37,
+        Length:36,
       },{
         ID:446,
         Name:"l",
         Words:[],
-        Length:81,
+        Length:79,
       },{
         ID:447,
         Name:"g",
@@ -259,7 +259,7 @@ module.exports = {
         ID:452,
         Name:"x",
         Words:[],
-        Length:53,
+        Length:52,
       },{
         ID:453,
         Name:"zh",
@@ -284,7 +284,7 @@ module.exports = {
         ID:457,
         Name:"z",
         Words:[],
-        Length:48,
+        Length:47,
       },{
         ID:458,
         Name:"c",
@@ -304,22 +304,22 @@ module.exports = {
         ID:461,
         Name:"w",
         Words:[],
-        Length:34,
+        Length:33,
       },{
         ID:462,
         Name:"a",
         Words:[],
-        Length:71,
+        Length:69,
       },{
         ID:463,
         Name:"o",
         Words:[],
-        Length:21,
+        Length:19,
       },{
         ID:464,
         Name:"e",
         Words:[],
-        Length:46,
+        Length:42,
       },{
         ID:465,
         Name:"i",
@@ -329,7 +329,7 @@ module.exports = {
         ID:466,
         Name:"u",
         Words:[],
-        Length:70,
+        Length:69,
       },{
         ID:467,
         Name:"ü",
@@ -364,7 +364,7 @@ module.exports = {
         ID:473,
         Name:"iu",
         Words:[],
-        Length:20,
+        Length:19,
       },{
         ID:474,
         Name:"ie",
@@ -449,7 +449,7 @@ module.exports = {
         ID:490,
         Name:"iong",
         Words:[],
-        Length:7,
+        Length:6,
       },{
         ID:491,
         Name:"ua",
@@ -459,7 +459,7 @@ module.exports = {
         ID:492,
         Name:"uo",
         Words:[],
-        Length:41,
+        Length:40,
       },{
         ID:493,
         Name:"uai",
@@ -580,12 +580,12 @@ module.exports = {
       Total: 65,
       Image: "../images/examine_subject_a001.png"
     },{
-      ID: 1,
+      ID: 61,
       Type: "Shizi",
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 12,
+      Total: 41,
       Image: "../images/examine_subject_a001.png"
     }, {
       ID: 13,
@@ -635,12 +635,12 @@ module.exports = {
     Type:"CHN",
     Select: "",
     List: [{
-      ID: 3,
+      ID: 63,
       Type: "Shizi",
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 16,
+      Total: 36,
       Image: "../images/examine_subject_a003.png"
     }, {
       ID: 15,
@@ -706,12 +706,12 @@ module.exports = {
     Type:"CHN",
     Select: "",
     List: [{
-      ID: 5,
+      ID: 65,
       Type: "Shizi",
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 16,
+      Total: 31,
       Image: "../images/examine_subject_a005.png"
     }, {
       ID: 17,
@@ -777,12 +777,12 @@ module.exports = {
     Type:"CHN",
     Select: "",
     List: [{
-      ID: 7,
+      ID: 67,
       Type: "Shizi",
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 16,
+      Total: 31,
       Image: "../images/examine_subject_a007.png"
     },  {
       ID: 19,
@@ -848,12 +848,12 @@ module.exports = {
     Type:"CHN",
     Select: "",
     List: [{
-      ID: 9,
+      ID: 69,
       Type: "Shizi",
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 16,
+      Total: 27,
       Image: "../images/examine_subject_a009.png"
     }, {
       ID: 21,

utils/main.js

@@ -1175,6 +1175,7 @@ function GetTestReportInfo(reportid, callback) {
                     }
                     var result = {};
                     result.ID = reportid;
+                    result.BookID=obj.BookID;
                     result.TestType = obj.TestType;
                     result.Name = obj.Name.join("#");
                     result.IsFinished = obj.IsFinished;