1.5.19

app.js

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

pages/main/searchWeb2.wxml

@@ -156,6 +156,20 @@
     <view class='lineFooter'></view>
   </block>
 
+  <!-- 诗词标题 -->
+  <block wx:if="{{Result.CHN.ShiciTitle && Result.CHN.ShiciTitle.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">标题</view>
+    </view>
+    <view class="panelItem FlexRow">
+      <view class="{{CSS.CHN_ShiciTitle.Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{Result.CHN.ShiciTitle}}" data-css="CHN_ShiciTitle" data-tag="">
+        <view class="{{CSS.CHN_ShiciTitle.Css2}} panelSelect0">{{CSS.CHN_ShiciTitle.Number}}</view>
+        <view class="text1">{{Result.CHN.ShiciTitle}}</view>
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
   <!-- 作者与朝代 -->
   <block wx:if="{{Result.CHN.Author && Result.CHN.Author.length>0}}">
     <view class="panelTitle FlexRow">

pages/test/index.js

@@ -131,7 +131,15 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a007.png"
-          }, ]
+          }, {
+            ID: 8,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a008.png"
+          },  ]
         },
         {
           Name: "五年级",
@@ -145,7 +153,17 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a009.png"
-          }, ]
+          }, 
+          // {
+          //   ID: 10,
+          //   Type: "Shizi",
+          //   Name: "语文识字",
+          //   Name2: "下学期",
+          //   Finish: 0,
+          //   Total: 16,
+          //   Image: "../images/examine_subject_a010.png"
+          // }, 
+        ]
         },
         {
           Name: "六年级",
@@ -160,7 +178,15 @@ Page({
               Finish: 0,
               Total: 16,
               Image: "../images/examine_subject_a011.png"
-            },
+            }, {
+              ID: 12,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "下学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a012.png"
+            }, 
           ]
         },
         {
@@ -195,6 +221,24 @@ Page({
               Total: 50,
               Image: "../images/examine_subject_b003.png"
             },
+            {
+              ID: 16,
+              Type: "Word",
+              Name: "常用单词4",
+              Name2: "词汇1001~1500",
+              Finish: 0,
+              Total: 50,
+              Image: "../images/examine_subject_b004.png"
+            },
+            {
+              ID: 17,
+              Type: "Word",
+              Name: "常用单词5",
+              Name2: "词汇1501~2000",
+              Finish: 0,
+              Total: 50,
+              Image: "../images/examine_subject_b005.png"
+            },
           ]
         },
       ],

pages/test/index.wxml

@@ -29,10 +29,9 @@
     <block wx:if="{{TestReport.length==0}}">
       <image class="examine_clipboard_80x80" src="../images/examine_clipboard_80x80.png"></image>
       <text class="panelListContent">您还没有做过知识检验，选择科目开始检验吧，\n检验后的报告将显示在这里。\n</text>
-
     </block>
 
-    <block wx:if="{{TestReport.length>0}}" wx:for="{{TestReport}}" wx:key="index">
+    <block wx:if="{{TestReport.length>0 && index<20}}" wx:for="{{TestReport}}" wx:key="index">
 
       <view class="Item FlexRow" bindtap="gotoTestReportInfo" data-id="{{item.ID}}">
         <view class="Item1 FlexColumn">

pages/test/list.js

@@ -38,7 +38,7 @@ 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 || that.data.BookID == 16 || that.data.BookID == 17)
       arr = wx.getStorageSync("EnglishAll");
     else if (that.data.BookID <= 12)
       arr = wx.getStorageSync("HanziAll");

utils/main.js

@@ -689,6 +689,7 @@ function updateSearchList(obj) {
     arr = [];
 
   if (obj.Type == "shici") {
+    obj.Key=obj.Value.CHN.ShiciTitle;
     if (obj.Key.indexOf("《") == 0)
       obj.Key = obj.Key.substring(1, obj.Key.length - 1);
   }