2.3.38

pages/main/addInfomationDetail.wxml

@@ -298,7 +298,7 @@
       </view>
     </view>
     <view class="{{CSS.CHN_Author.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
-      data-content="{{ Result.CHN.Dynasty+' '+Result.CHN.Author}}" data-css="CHN_Author" data-tag="">
+      data-content="{{ Result.CHN.Dynasty+' '+Result.CHN.Author}}" data-css="CHN_Author" data-tag="作者">
       <view class="FlexRow">
         <view class="{{CSS.CHN_Author.Css2}} panelSelect0">{{CSS.CHN_Author.Number}}</view>
         <view class="panelItemText">{{Result.CHN.Dynasty}} {{Result.CHN.Author}}</view>

pages/main/cardmain.js

@@ -2,14 +2,15 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var canPress=true;//按钮按下有反应
 
 Page({
   data: {
     ImagePath: app.globalData.uploadImageUrl,
     IsIPhoneX: app.globalData.IsIPhoneX,
-    IsYearReport:false,
-    IsShowOrder:false,
-    IsIPad:app.globalData.IsIPad,
+    IsYearReport: false,
+    IsShowOrder: false,
+    IsIPad: app.globalData.IsIPad,
   },
   onLoad: function () {
     var that = this;
@@ -20,22 +21,24 @@ Page({
       IsShow: app.globalData.userInfo.IsShow,
     });
 
-    var year=new Date(app.globalData.userInfo.CreateTime).getFullYear();
+    var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
     //console.log(year);
     // if (new Date().getFullYear()>=2021 && year<2020){
     //   that.setData({
     //     IsYearReport: true,
     //   });
     // }
-   
+
+    canPress=true;
+
   },
   onPullDownRefresh: function () {
-    var that=this;
-    app.globalData.FolderList=[];
+    var that = this;
+    app.globalData.FolderList = [];
     that.getFolderList();
     wx.stopPullDownRefresh();
   },
-  onShow:function(){
+  onShow: function () {
     this.init();
     if (wx.getStorageSync("TempCardNoSaved")) {
       wx.navigateTo({
@@ -43,74 +46,82 @@ Page({
       });
     }
   },
-  init:function(){
-    var that=this;
-    main.getData("GetUserCardCount?HasHardworking=1&UserID="+app.globalData.userInfo.UserID, function (data) {
+  init: function () {
+    var that = this;
+    main.getData("GetUserCardCount?HasHardworking=1&UserID=" + app.globalData.userInfo.UserID, function (data) {
       if (data) {
         that.setData({
           CardNumber: data.CardNumber,
-          NormalNumber:data.NormalNumber,
-          UrgentNumber:data.UrgentNumber,
-          Hardworking:data.Hardworking,
+          NormalNumber: data.NormalNumber,
+          UrgentNumber: data.UrgentNumber,
+          Hardworking: data.Hardworking,
         });
 
-        if (data.UrgentNumber){
-          app.globalData.TaskToday.CardNumberUrgent=data.UrgentNumber;
+        if (data.UrgentNumber) {
+          app.globalData.TaskToday.CardNumberUrgent = data.UrgentNumber;
         }
 
         that.getFolderList();
       }
     });
 
-    app.globalData.TempStr2=null;
+    app.globalData.TempStr2 = null;
   },
-  getFolderList:function(e){
-    var that=this;
-    var list=app.globalData.FolderList;
-    common.getStorageValue(that, "FolderOrder", ["","","","","","","",""], function () {
-      if (list.length==0 || e){
-        var order=that.data.FolderOrder;
-        var url="GetUserFolderList?UserID="+app.globalData.userInfo.UserID;
-        if (e){
+  getFolderList: function (e) {
+    var that = this;
+    var list = app.globalData.FolderList;
+    common.getStorageValue(that, "FolderOrder", ["", "", "", "", "", "", "", ""], function () {
+      if (list.length == 0 || e) {
+        var order = that.data.FolderOrder;
+        var url = "GetUserFolderList?UserID=" + app.globalData.userInfo.UserID;
+        if (e) {
           //url+="&OrderType="+e.currentTarget.dataset.order;
-          order=["","","","","","","",""];
-          order[e.currentTarget.dataset.index]="PanelBtnSelect";
+          order = ["", "", "", "", "", "", "", ""];
+          order[e.currentTarget.dataset.index] = "PanelBtnSelect";
 
           wx.setStorageSync('FolderOrderStr', e.currentTarget.dataset.order);
           main.UploadUserConfig();
         }
-        
+
         main.getData(url, function (data) {
           if (data) {
-            var arr=data;
+            var arr = data;
             var item;
-            for(var i=0;i<arr.length;i++){
-              item=arr[i];
-              item.Width=item.IconName.substring(item.IconName.lastIndexOf("_")+1,item.IconName.lastIndexOf("x"));
-              item.Height=item.IconName.substring(item.IconName.lastIndexOf("x")+1);
+            for (var i = 0; i < arr.length; i++) {
+              item = arr[i];
+              item.Width = item.IconName.substring(item.IconName.lastIndexOf("_") + 1, item.IconName.lastIndexOf("x"));
+              item.Height = item.IconName.substring(item.IconName.lastIndexOf("x") + 1);
             }
             that.setData({
-              FolderArr:data,
-              IsShowOrder:false,
-              FolderOrder:order,
+              FolderArr: data,
+              IsShowOrder: false,
+              FolderOrder: order,
             });
-            app.globalData.FolderList=data;
+            app.globalData.FolderList = data;
             wx.setStorageSync('FolderOrder', order);
           }
         });
-      }
-      else{
+      } else {
         that.setData({
-          FolderArr:app.globalData.FolderList,
+          FolderArr: app.globalData.FolderList,
         });
       }
     });
   },
   goto: function (e) {
-    var url = e.currentTarget.dataset.url;
-    wx.navigateTo({
-      url: './' + url,
-    })
+    //console.log("canPress:"+canPress);
+    if (canPress) {
+      var url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: './' + url,
+      });
+      canPress = false;
+      //console.log("canPress:"+canPress);
+      setTimeout(function () {
+        canPress = true;
+        //console.log("canPress:"+canPress);
+      }, 2000);
+    }
   },
   getList: function (e) {
     wx.showLoading({
@@ -119,12 +130,12 @@ Page({
     setTimeout(function () {
       wx.hideLoading();
     }, 5000);
-    
-    var IsToday=e.currentTarget.dataset.id;
+
+    var IsToday = e.currentTarget.dataset.id;
     var that = this;
 
-    if (IsToday==1){
-      main.getTaskTodayList(function(task){
+    if (IsToday == 1) {
+      main.getTaskTodayList(function (task) {
         var list = [];
         for (var i = 0; i < task.ListNew.length; i++) {
           list.push(task.ListNew[i]);
@@ -135,65 +146,62 @@ Page({
         for (var i = 0; i < task.ListReview.length; i++) {
           list.push(task.ListReview[i]);
         }
-        app.globalData.CardList=list;
-        
-    
+        app.globalData.CardList = list;
+
+
         wx.navigateTo({
           url: './mainlist?type=1&Count=' + list.length,
         });
       });
-    }
-    else{
+    } else {
 
-      if (e.currentTarget.dataset.datatype=="delete"){
-        var url = 'GetMiaoguoCardDeleteList?UserID=' + app.globalData.userInfo.UserID+"&Type=app";
+      if (e.currentTarget.dataset.datatype == "delete") {
+        var url = 'GetMiaoguoCardDeleteList?UserID=' + app.globalData.userInfo.UserID + "&Type=app";
         main.getData(url, function (data) {
           wx.hideLoading();
           if (data) {
-            app.globalData.CardList= data.List;
-    
+            app.globalData.CardList = data.List;
+
             wx.navigateTo({
-              url: './mainlist?type=0&CardType=-2&Count='+data.List.length,
+              url: './mainlist?type=0&CardType=-2&Count=' + data.List.length,
             });
           }
         });
-      }
-      else{
+      } else {
         var url = 'GetMiaoguoCardList2?UserID=' + app.globalData.userInfo.UserID;
-        var url2="";
+        var url2 = "";
 
         var folderid = e.currentTarget.dataset.folderid;
-        if (!folderid){
+        if (!folderid) {
           var isCollect = e.currentTarget.dataset.iscollect;
           if (!isCollect)
             isCollect = 0;
           url += "&IsCollect=" + isCollect;
-    
+
           var cardType = 2;
-          if (e.currentTarget.dataset.cardtype){
+          if (e.currentTarget.dataset.cardtype) {
             cardType = e.currentTarget.dataset.cardtype;
             url += "&CardType=" + cardType;
           }
 
-        }
-        else{
+        } else {
           url += "&FolderID=" + folderid;
         }
-  
+
         main.getData(url, function (data) {
           wx.hideLoading();
           if (data) {
-            app.globalData.CardList= data.List;
-            url2='./mainlist?type=0&Count=' + data.Count+'&IsCollect='+isCollect+'&CardType='+cardType;
-            if (folderid){
-              var name=e.currentTarget.dataset.name;
-              if (name.indexOf("????")>=0){
-                name=name.replace("????","");
+            app.globalData.CardList = data.List;
+            url2 = './mainlist?type=0&Count=' + data.Count + '&IsCollect=' + isCollect + '&CardType=' + cardType;
+            if (folderid) {
+              var name = e.currentTarget.dataset.name;
+              if (name.indexOf("????") >= 0) {
+                name = name.replace("????", "");
               }
-              url2='./mainlist?type=0&Count=' + data.Count+'&FolderID='+folderid;
-              url2+='&ColorName='+e.currentTarget.dataset.color;
-              url2+='&IconName='+e.currentTarget.dataset.icon;
-              url2+='&Name='+name;
+              url2 = './mainlist?type=0&Count=' + data.Count + '&FolderID=' + folderid;
+              url2 += '&ColorName=' + e.currentTarget.dataset.color;
+              url2 += '&IconName=' + e.currentTarget.dataset.icon;
+              url2 += '&Name=' + name;
             }
             wx.navigateTo({
               url: url2,
@@ -203,24 +211,24 @@ Page({
       }
     }
   },
-  gotoAccredit:function(){
+  gotoAccredit: function () {
     wx.navigateTo({
       url: '../index/accredit',
     });
   },
-  openOrder:function(){
+  openOrder: function () {
     this.setData({
-      IsShowOrder:true,
+      IsShowOrder: true,
     });
   },
-  closeHelp:function(){
+  closeHelp: function () {
     this.setData({
-      IsShowOrder:false,
+      IsShowOrder: false,
     });
   },
 
   gotoReLaunch: function (e) {
-    var url=e.currentTarget.dataset.url;
+    var url = e.currentTarget.dataset.url;
     wx.reLaunch({
       url: url,
     });
@@ -232,4 +240,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/main/detail.wxss

@@ -283,6 +283,10 @@ page{
   color:#fff;
 }
 
+.panelItem .textBigword{
+  font-size:108rpx;
+}
+
 .panelItem .textNormal2 {
   font-size: 36rpx;
 }

pages/main/mainlist.js

@@ -5,6 +5,7 @@ import constant1 from '../../utils/constant';
 const app = getApp();
 var intervalRefresh = 0;
 var isCollecting = false;
+var canPress = true; //按钮按下有反应
 
 var arrOrder = [{},
   {
@@ -222,6 +223,8 @@ Page({
       PageType: options.type, //列表类型，1 今天未练完 2 今天已经练完
       IsNew: options.IsNew, //
     });
+
+    canPress = true;
   },
   onShow: function () {
     var that = this;
@@ -661,20 +664,30 @@ Page({
     }
   },
   addCard: function () {
-    var url='./add?type=add&id=0';
-    if (this.data.FolderID){
-      url+="&FolderID="+this.data.FolderID+"&FolderName="+this.data.FolderName;
-    }
-    else{
-      var cardtype=this.data.CardType;
-      if (cardtype==1 || cardtype==-1){
-        url+="&CardType="+cardtype;
+    //console.log("canPress:"+canPress);
+    if (canPress) {
+      var url='./add?type=add&id=0';
+      if (this.data.FolderID){
+        url+="&FolderID="+this.data.FolderID+"&FolderName="+this.data.FolderName;
       }
+      else{
+        var cardtype=this.data.CardType;
+        if (cardtype==1 || cardtype==-1){
+          url+="&CardType="+cardtype;
+        }
+      }
+      
+      wx.redirectTo({
+        url: url,
+      });
+
+      canPress = false;
+      //console.log("canPress:"+canPress);
+      setTimeout(function () {
+        canPress = true;
+        //console.log("canPress:"+canPress);
+      }, 2000);
     }
-    
-    wx.redirectTo({
-      url: url,
-    });
   },
   onSearch: function (e) {
     var id=1;

pages/main/preview.wxss

@@ -303,6 +303,10 @@
   min-height: 50rpx;
 }
 
+.panelItem .textBigword{
+  font-size:108rpx;
+}
+
 .panelItem .textNormal2 {
   font-size: 36rpx;
 }

pages/share/shareitem.js

@@ -8,6 +8,9 @@ Page({
   data: {
     IPhoneX: "",
     IsPlay: false,
+    Info:{
+      ButtonString:"查看详细信息"
+    },
   },
   onReady: function () {
     var that = this;
@@ -56,7 +59,7 @@ Page({
     wx.showLoading({
       title: '读取中',
     });
-    var url = 'GetShareItemInfo?IsHistory=' + isHistory + '&UserID=' + app.globalData.userInfo.UserID + "&TaskID=" + taskid;
+    var url = 'GetShareItemInfo?IsShow='+app.globalData.userInfo.IsShow+'&IsHistory=' + isHistory + '&UserID=' + app.globalData.userInfo.UserID + "&TaskID=" + taskid;
     main.getData(url, function (data) {
       wx.hideLoading();
       if (!data.MilestoneDayNumber && !that.data.IsHistory && data.Remark)
@@ -102,12 +105,17 @@ Page({
       IsPlay: that.data.IsPlay,
     });
     if (that.data.IsPlay) {
-      var str = "古往今来肺腑之言，常用名句收入囊中。\n";
-      str += "小朋友，你好。\n";
+      var str = "练习之后小歇片刻，名言美景沁人心脾。\n";
+      str += "小朋友，你好。今天是你第"+that.data.Info.DayNumber+"天练习，第"+that.data.Info.HardworkingNumber+"次接力。\n";
+      str += "练习辛苦了。\n";
       str += "今天来给你打气的是【" + that.data.Info.AuthorCn + "】\n";
       str += "他要对你说：\n";
       str += that.data.Info.Content + "\n";
 
+      if (that.data.Info.Paraphrase){
+        str += "这句古文的意思是【"+that.data.Info.Paraphrase + "】";
+      }
+
       str += that.data.Info.AuthorCn + "是谁？";
       str += "他是" + that.data.Info.Country + "的" + that.data.Info.Title + "。\n";
       str += "有兴趣的小朋友，可以了解一下他的故事。我们下次接力再见。";

pages/share/shareitem.wxml

@@ -22,6 +22,12 @@
     <image class="icon_punctuation_1" lazy-load="true" src="../images/icon_punctuation_1.png"></image>
     <text user-select="true" class="text8">{{Info.Content}}</text>
     <image class="icon_punctuation_2" lazy-load="true" src="../images/icon_punctuation_2.png"></image>
+    
+    <block wx:if="{{Info.Paraphrase}}">
+      <view class="text9">这句古文的意思是</view>
+      <text class="text101">{{Info.Paraphrase}}</text>
+    </block>
+
     <view class="text9">Ta是谁？</view>
     <view class="text10">{{Info.Country}}</view>
     <view class="text11">{{Info.Title}}</view>
@@ -40,7 +46,7 @@
       </view>
       <view class="panelFooter2 FlexRow" bindtap="buildShareImage">
         <image class="icon_player_1" src="../images/icon_flag_1.png"></image>
-        <view class="text15">生成群接力图片</view>
+        <view class="text15">{{Info.ButtonString}}</view>
       </view>
     </view>
   </block>

pages/share/shareitem.wxss

@@ -109,6 +109,13 @@
   align-self: flex-start;
 }
 
+.text101 {
+  font-size: 28rpx;
+  margin: 30rpx 0 60rpx 50rpx;
+  align-self: flex-start;
+  width: 650rpx;
+}
+
 .text11 {
   font-size: 28rpx;
   margin: 0 0 0 50rpx;

pages/template/cardShow.wxml

@@ -18,7 +18,7 @@
       </block>
       </text>
 
-      <text class="textNormal" wx:if="{{item.Type=='bigword'}}" style='font-size: 108rpx;'>{{item.Content}}</text>
+      <view class="textBigword" wx:if="{{item.Type=='bigword'}}">{{item.Content}}</view>
       
       <view class="panelSound FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">
         <image class="universalpic_read_mark_black_20x20" src='../../pages/images/universalpic_read_mark_black_20x20.png' />
@@ -81,7 +81,7 @@
           </view>
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
-          <text class="textNormal" wx:if="{{item.Type=='bigword'}}" style='font-size: 108rpx;'>{{item.Content}}</text>
+          <view class="textBigword" wx:if="{{item.Type=='bigword'}}">{{item.Content}}</view>
       
           <view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
             <view class="panelRecorder0 FlexRow" hover-class='panelSoundHover' hover-stay-time="1000" catchtap="playSound" data-content="recorder" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">

pages_test/test/index.js

@@ -3,7 +3,7 @@ import main from '../../utils/main';
 import constant from '../../utils/constant';
 
 const app = getApp();
-
+var canPress = true; //按钮按下有反应
 
 Page({
   data: {
@@ -27,9 +27,12 @@ Page({
 
     main.getHanzi(function () {
       main.getEnglish(function () {
-      
+
       });
     });
+
+
+    canPress = true;
   },
   onShow: function () {
     this.getTestReportList();
@@ -42,36 +45,43 @@ Page({
     });
   },
   goto: function (e) {
-    var url = e.currentTarget.dataset.url;
-    if (url == "../other/userbook") {
+    //console.log("canPress:"+canPress);
+    if (canPress) {
+      var url = e.currentTarget.dataset.url;
+      if (url == "../other/userbook") {
+
+      } else if (e.currentTarget.dataset.type == "Shici") {
+        var name1 = e.currentTarget.dataset.name1;
+        name1 = name1.replace("语文古诗文", "语文");
+        url = "./item?testtype=recite&name1=" + name1 + "&bookid=" + e.currentTarget.dataset.bookid;
+      } else if (e.currentTarget.dataset.type == "Word" && e.currentTarget.dataset.bookid == 100) {
+        var name1 = e.currentTarget.dataset.name1;
+        url = "./item?testtype=read&name1=" + name1 + "&name2=英文字母&bookid=100";
+      } else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid) {
+        url = "./list?name1=" + e.currentTarget.dataset.name1 + "&id=" + e.currentTarget.dataset.bookid;
+      }
+      wx.navigateTo({
+        url: url,
+      });
+      canPress = false;
+      //console.log("canPress:"+canPress);
+      setTimeout(function () {
+        canPress = true;
+        //console.log("canPress:"+canPress);
+      }, 2000);
+    }
 
-    } 
-    else if (e.currentTarget.dataset.type == "Shici") {
-      var name1 = e.currentTarget.dataset.name1;
-      name1 = name1.replace("语文古诗文", "语文");
-      url = "./item?testtype=recite&name1=" + name1 + "&bookid=" + e.currentTarget.dataset.bookid;
-    } 
-    else if (e.currentTarget.dataset.type == "Word" && e.currentTarget.dataset.bookid == 100) {
-      var name1 = e.currentTarget.dataset.name1;
-      url = "./item?testtype=read&name1=" + name1 + "&name2=英文字母&bookid=100";
-    } 
-    else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid) {
-      url = "./list?name1=" + e.currentTarget.dataset.name1 + "&id=" + e.currentTarget.dataset.bookid;
-    } 
-    wx.navigateTo({
-      url: url,
-    });
   },
   getTestReportList: function () {
     var that = this;
-    
+
     var userid = app.globalData.userInfo.UserID;
-    main.GetTestReportList(userid,function (data,GradeArrResult) {
+    main.GetTestReportList(userid, function (data, GradeArrResult) {
       that.setData({
         TestReport: data,
         GradeArr: GradeArrResult,
       });
-      
+
 
       common.getStorageValue(that, "TestSelectGrade", 0, function () {
         that.onSelectGrade({

pages_test/test/index.wxml

@@ -54,8 +54,11 @@
         <view class="Item1 FlexColumn">
           <view class="ItemTitle FlexRow">
             <view>{{item.Name[1]}}</view>
-            <view class="ItemTitle11" wx:if="{{item.TestType=='read'}}">会念</view>
-            <view class="ItemTitle11" wx:if="{{item.TestType=='write'}}">会写</view>
+            <view class="ItemTitle11" wx:if="{{item.BookID==86 && item.TestType=='read'}}">接下句</view>
+            <view class="ItemTitle11" wx:if="{{item.BookID==86 && item.TestType=='write'}}">说古文</view>
+            <view class="ItemTitle11" wx:if="{{item.BookID!=86 && item.TestType=='read'}}">会念</view>
+            <view class="ItemTitle11" wx:if="{{item.BookID!=86 && item.TestType=='write'}}">会写</view>
+            <view class="ItemTitle11" wx:if="{{item.TestType=='recite'}}">会背</view>
           </view>
           <view class="ItemTitle2">{{item.Name[0]}}</view>
         </view>

pages_test/test/item.wxml

@@ -19,15 +19,15 @@
       </view>
     </view>
     <view class="right FlexRow">
-      <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="1" wx:if="{{TestAutioPlay==0}}">
-        <image src="../../pages/images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
-      </view>
-
       <view class="btnTop FlexRow" catchtap='onExport'>
         <image src="../images/universalpic_import_gray.png" class="universalpic_import_gray" />
       </view>
       <view class="panelTopText2 panelTopText" catchtap='onExport'>导入</view>
       
+      <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="1" wx:if="{{TestAutioPlay==0}}">
+        <image src="../../pages/images/universalpic_broadcast_default_gray_34x25.png" class="universalpic_broadcast_default_gray_34x25" />
+      </view>
+      
       <block wx:if="{{!(BookID>=25 && BookID<=36)}}">
         <view class="btnTop FlexRow" catchtap='onAutoPlay' data-id="0"  wx:if="{{TestAutioPlay==1}}">
           <image src="../../pages/images/universalpic_broadcast_enable_tc0{{Color.ID}}_34x25.png" class="universalpic_broadcast_default_gray_34x25" />

pages_test/test/item.wxss

@@ -265,6 +265,10 @@ page{
   min-height: 50rpx;
 }
 
+.panelItem .textBigword{
+  font-size:108rpx;
+}
+
 .panelItem .textNormal2 {
   font-size: 36rpx;
 }

pages_test/test/list.js

@@ -87,13 +87,18 @@ Page({
     }
     else{
       arr = wx.getStorageSync("HanziAll");
-      fieldName="字";
+      fieldName="汉字";
+      fieldName2="";
       if (that.data.BookID == 73){
-        fieldName="释义";
-        listType="wenyanwen";
+        fieldName="含义";
+        listType="Wenyanwen";
+      }
+      else if (that.data.BookID == 86){
+        fieldName="句子";
+        listType="Guwen";
       }
-      else if (that.data.BookID > 24){
-        fieldName="词";
+      else if (that.data.BookID >= 45 && that.data.BookID <= 60){
+        fieldName="词语";
       }
     }
     

pages_test/test/list.wxml

@@ -1,159 +1,201 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-	<view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73}}">请对照课本选择字组或词组</view>
-	<view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
-	<view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
-	<view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<170) || (BookID>100 && BookID<110)) || (BookID==73)}}"></view>
-
-	<block wx:for="{{List}}" wx:key="index">
-		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
-			<view class="PanelItem1 FlexRow">
-				<view class="left FlexRow">
-					<!-- <view class="Word FlexRow" wx:if="{{ListType!='english' && (BookID<=24)}}">
+  <view class="text1" wx:if="{{ListType!='english' && BookID!=43 && BookID!=44 && BookID!=73 && BookID!=86}}">请对照课本选择字组或词组</view>
+  <view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
+  <view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
+  <view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<170) || (BookID>100 && BookID<110)) || (BookID==73) || (BookID==86)}}"></view>
+
+  <block wx:for="{{List}}" wx:key="index">
+    <view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
+      <view class="PanelItem1 FlexRow">
+        <view class="left FlexRow">
+          <!-- <view class="Word FlexRow" wx:if="{{ListType!='english' && (BookID<=24)}}">
 						<image class="img" src="{{ImagePath}}web/test/{{item.Words[0]}}.png" />
 					</view> -->
-					<view class="Title FlexRow" wx:if="{{BookID!=44}}">
-						{{item.Name}}
-					</view>
-					<view class="TitlePinyin FlexRow" wx:if="{{BookID==44}}">
-						{{item.Name}}
-					</view>
-					
-				</view>
-				<view class="right FlexColumn">
-					<view class="right1 FlexRow">
-						<image wx:if="{{item.TestTypeRead==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
-						<image wx:if="{{!item.TestTypeRead}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
-						<image wx:if="{{item.TestTypeWrite==1 && BookID!=73 && (BookID<=100 || BookID>110) && BookID!=43 && BookID!=44}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
-						<image wx:if="{{!item.TestTypeWrite && BookID!=73 && (BookID<=100 || BookID>110) && BookID!=43 && BookID!=44}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
-					</view>
-					<view class="right2"><block wx:if="{{BookID==44}}">{{item.Length}}</block><block wx:if="{{BookID!=44}}">{{item.Words.length}}</block>个{{FieldName}}</view>
-				</view>
-			</view>
-			<view class="lineWidthAll FlexRow" wx:if="{{ListType!='english' && BookID!=44}}">
-				<view class="lineWidth720"></view>
-			</view>
-			<text class="PanelItem2" wx:if="{{ListType!='english' && BookID!=44}}">
-			{{item.WordList}}
-			</text>
-		</view>
-	</block>
-	<view style="height:50rpx;"></view>
+          <view class="Title FlexRow" wx:if="{{BookID!=44}}">
+            {{item.Name}}
+          </view>
+          <view class="TitlePinyin FlexRow" wx:if="{{BookID==44}}">
+            {{item.Name}}
+          </view>
+
+        </view>
+        <view class="right FlexColumn">
+          <view class="right1 FlexRow">
+            <image wx:if="{{item.TestTypeRead==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
+            <image wx:if="{{!item.TestTypeRead}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
+            <image wx:if="{{item.TestTypeWrite==1 && BookID!=73 && (BookID<=100 || BookID>110) && BookID!=43 && BookID!=44}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+            <image wx:if="{{!item.TestTypeWrite && BookID!=73 && (BookID<=100 || BookID>110) && BookID!=43 && BookID!=44}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
+          </view>
+          <view class="right2">
+            <block wx:if="{{BookID==44}}">{{item.Length}}</block>
+            <block wx:if="{{BookID!=44}}">{{item.Words.length}}</block>个{{FieldName}}
+          </view>
+        </view>
+      </view>
+      <block wx:if="{{ListType!='english' && BookID!=44 && BookID!=86}}">
+        <view class="lineWidthAll FlexRow">
+          <view class="lineWidth720"></view>
+        </view>
+        <text class="PanelItem2">
+          {{item.WordList}}
+        </text>
+      </block>
+
+    </view>
+  </block>
+  <view style="height:50rpx;"></view>
 </view>
 
 
 <!-- 跳出 -->
 <view wx:if="{{IsSelect}}" class="SelectContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
-	<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>
-
-		<block wx:if="{{ListType!='english' && ListType!='wenyanwen'}}">
-			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}&name={{SelectItem.Name}}">
-				<image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
-				<view class="SelectContainer1Text4">查看字表</view>
-			</view>
-			<view class="btnPanel FlexColumn">
-				
-				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="read" 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="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
-					重新开始
-				</view>
-
-				<block wx:if="{{BookID!=44}}">
-				
-				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="write" 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>
-				</view>
-
-				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
-					<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
-					<view class="SelectContainer1Text3">会写 继续检验</view>
-				</view>
-
-				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
-					重新开始
-				</view>
-
-				</block>
-			</view>
-		</block>
-
-    <block wx:if="{{ListType=='wenyanwen'}}">
-			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}&name={{SelectItem.Name}}">
-				<image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
-				<view class="SelectContainer1Text4">查看释义表</view>
-			</view>
-			<view class="btnPanel FlexColumn">
-				
-				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="read" 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="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
-					重新开始
-				</view>
-			</view>
-		</block>
-
-		<block wx:if="{{ListType=='english'}}">
-			<view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&bookid={{BookID}}&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="btnPanel0 btnPanel FlexColumn">
-				<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-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-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
-					重新开始
-				</view>
-
-				<block wx:if="{{BookID<=100 || BookID>110}}">
-					<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" 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>
-					</view>
-					<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
-						<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
-						<view class="SelectContainer1Text3">默写 继续检验</view>
-					</view>
-					<view class="btnPanel1">根据发音和含义默写单词</view>
-				
-					<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
-						重新开始
-					</view>
-				</block>
-				
-
-			</view>
-		</block>
-
-
-		<view style="width:100%;height:30rpx;"></view>
-		<view class="close FlexRow" bindtap="onClose">
-			<image src="../../pages/images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
-		</view>
-	</view>
+  <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>
+
+    <block wx:if="{{ListType!='english' && ListType!='Wenyanwen' && ListType!='Guwen'}}">
+      <view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}&name={{SelectItem.Name}}">
+        <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
+        <view class="SelectContainer1Text4">查看字表</view>
+      </view>
+      <view class="btnPanel FlexColumn">
+
+        <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="read" 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">
+          <image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
+          <view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}} 继续检验</view>
+        </view>
+
+        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+          重新开始
+        </view>
+
+        <block wx:if="{{BookID!=44}}">
+
+          <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="write" 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">写{{FieldName}}{{FieldName2}}<block wx:if="{{BookID>=61 && BookID<=72}}">（新课标不要求）</block>
+            </view>
+          </view>
+
+          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
+            <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+            <view class="SelectContainer1Text3">写{{FieldName}}{{FieldName2}}<block wx:if="{{BookID>=61 && BookID<=72}}">（新课标不要求）</block> 继续检验</view>
+          </view>
+
+          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+            重新开始
+          </view>
+
+        </block>
+      </view>
+    </block>
+
+    <block wx:if="{{ListType=='Wenyanwen'}}">
+      <view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}&name={{SelectItem.Name}}">
+        <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
+        <view class="SelectContainer1Text4">查看释义表</view>
+      </view>
+      <view class="btnPanel FlexColumn">
+
+        <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="read" 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="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+          重新开始
+        </view>
+      </view>
+    </block>
+
+    <block wx:if="{{ListType=='Guwen'}}">
+      <view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=CHN&unitsid={{UnitsID}}&id={{SelectItem.ID}}&name={{SelectItem.Name}}">
+        <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
+        <view class="SelectContainer1Text4">查看句子表</view>
+      </view>
+      <view class="btnPanel FlexColumn">
+
+        <view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="read" 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="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+          重新开始
+        </view>
+
+        <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" 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>
+          </view>
+          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
+            <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+            <view class="SelectContainer1Text3">看含义说古文 继续检验</view>
+          </view>
+
+          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+            重新开始
+          </view>
+      </view>
+    </block>
+
+    <block wx:if="{{ListType=='english'}}">
+      <view class="btnPanel0 FlexRow" bindtap="goto" data-url="./wordlist?type=ENG&bookid={{BookID}}&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="btnPanel0 btnPanel FlexColumn">
+        <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-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-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+          重新开始
+        </view>
+
+        <block wx:if="{{BookID<=100 || BookID>110}}">
+          <view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" 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>
+          </view>
+          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
+            <image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+            <view class="SelectContainer1Text3">默写 继续检验</view>
+          </view>
+          <view class="btnPanel1">根据发音和含义默写单词</view>
+
+          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+            重新开始
+          </view>
+        </block>
+
+
+      </view>
+    </block>
+
+
+    <view style="width:100%;height:30rpx;"></view>
+    <view class="close FlexRow" bindtap="onClose">
+      <image src="../../pages/images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
+    </view>
+  </view>
 </view>

pages_test/test/wordlist.js

@@ -35,12 +35,29 @@ Page({
         }
       });
     }
+    else if (bookid==86){
+      main.getData('GetHanziUnitWords?UserID='+app.globalData.userInfo.UserID+'&TestType=read&UnitID='+options.id, function (data) {
+        if (data) {
+          var arr=data;
+          for (var i = 0; i < arr.length; i++) {
+              words.push(arr[i].Word);
+          }
+          that.setData({
+            UnitsName: options.name,
+            Words: words,
+            FieldName:"句子",
+          });
+        }
+      });
+    }
     else{
       if (options.type=="CHN"){
         arr= wx.getStorageSync("HanziAll");
         fieldName="字";
         
-        if (bookid>24 && bookid<100)
+        if (bookid==73)
+          fieldName="释义";
+        else if (bookid>24 && bookid<100)
           fieldName="词";
       }
       else{

utils/main.js

@@ -783,6 +783,7 @@ function getMemoryLevel(index, number, time) {
     return result;
   }
 }
+
 //得到要检验的汉字列表
 function GetHanziUnitWords(unitsID, testType, callback) {
   var url = 'GetHanziUnitWords?UnitID=' + unitsID;
@@ -862,7 +863,8 @@ function GetHanziUnitWords(unitsID, testType, callback) {
           TaskList.push(taskInfo);
         }
 
-      } else { //若是词语
+      } 
+      else { //若是词语
         for (var k = 0; k < words.length; k++) {
           var taskInfo = words[k];
           taskInfo.TagWidth=136;
@@ -951,7 +953,7 @@ function GetTestReportInfo(reportid, callback) {
 
               if (userTestReportInfo.TestType == "read") {
                 taskInfo.TagWidth = 212;
-                if (name1[0].indexOf("1000")<0) 
+                if ((name1[0].indexOf("1000")<0) && (name1[0].indexOf("4000")<0)) 
                   taskInfo.FontSize = 108;
               } else if (userTestReportInfo.TestType == "write") {
                 taskInfo.TagWidth = 186;
@@ -1146,6 +1148,8 @@ function GetTestReportInfo(reportid, callback) {
           name1 = name1[0] + "生词" + name1[2].substr(0, 1);
         else if (obj.BookID == 73)
           name1 = name1[0] + name1[1].substr(2, 3) + name1[2];
+        else if (obj.BookID == 86)
+          name1 = name1[1] + name1[2];
         else
           name1 = name1[0] + name1[1].substr(2, 2) + "能力" + name1[2].substr(0, 1);
         var HanziAll = wx.getStorageSync('HanziAll');
@@ -1639,7 +1643,8 @@ function GetTestReportList(userID, callback) {
           || data[i].Name[0].indexOf("识字 上学期") >= 0 
           || data[i].Name[0].indexOf("拼音") >= 0 
           || data[i].Name[1].indexOf("古诗文") >= 0 
-          || data[i].Name[0].indexOf("文言文") >= 0) {
+          || data[i].Name[0].indexOf("文言文") >= 0 
+          || data[i].Name[0].indexOf("小古文") >= 0) {
             if (data[i].TestRightStr) {
               data[i].TestRightStr = data[i].TestRightStr.split(",");
             }