2.3.70

app.js

@@ -1,8 +1,8 @@
 App({
   globalData: {
-    Version: "2.3.70",
-    IsProduction: true,
-    //IsProduction: false,
+    Version: "2.3.79",
+    //IsProduction: true,
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
@@ -14,7 +14,7 @@ App({
     serverUrlLocalhost: "http://localhost:3020/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
-    uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
+    uploadImageUrl: "https://miaoguo-1253256735.file.myqcloud.com/",
     officialAccounts:"https://mp.weixin.qq.com/s/gO9S4PrPl1Uu1iksyRuBgw",
     BaiduToken: "",//百度开发平台token
     IsIOS: true,

app.wxss

@@ -23,7 +23,7 @@
   width:100%;
   color: #1e1e1e;
   justify-content: flex-start;
-  font-weight: 500;
+  font-weight: 700;
   background-color: #F2F2F2;
 } 
 .footerHeight{

components/navigation-bar/navigation-bar.wxss

@@ -27,7 +27,7 @@ page{--height:44px;--right:190rpx;}
   font-size:17px;text-align:center;position:relative;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;
   align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;overflow: hidden;
 }
-.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 500;}
+.weui-navigation-bar__center text{ overflow: hidden;text-overflow:ellipsis;white-space: nowrap;margin-top:-2px; font-weight: 700;}
 
 
 .weui-navigation-bar__inner .weui-navigation-bar__loading {

pages/main/add.wxss

@@ -34,7 +34,7 @@ page{
 }
 .panelTopBtn {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
   width:110rpx;
   height:80rpx;
   text-align: center;
@@ -108,7 +108,7 @@ page{
 }
 .panelItemCircle1110{
   color:#4D4D4D;
-  font-weight: 500;
+  font-weight: 700;
   margin-top: 10rpx;
 }
 
@@ -412,7 +412,7 @@ page{
 /* 字段编辑 */
 .addItem {
   justify-content: flex-start;
-  font-weight: 500;
+  font-weight: 700;
   color: #1e1e1e;
   background-color: #f0f0f0;
   position: fixed;
@@ -659,7 +659,7 @@ page{
 }
 .numberContainer .numberContaineFooter2{
   color:#B3443B;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .universalpic_sequence_black_30x30_2{
@@ -784,7 +784,7 @@ page{
   border:2rpx solid #E3E3E3;
   text-align: center;
   font-size:28rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#1E1E1E;
   margin-top: 40rpx;
   border-radius: 10rpx;
@@ -897,7 +897,7 @@ page{
 }
 .panelMenu11{
   color:#FE6659;
-  font-weight: 500;
+  font-weight: 700;
   margin-bottom: 20rpx;
 }
 .panelMenu12{

pages/main/addInfomation.wxss

@@ -86,7 +86,7 @@
 }
 .panelTop3 {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 
@@ -396,7 +396,7 @@
 }
 .panelListItem11Name1{
   font-size: 30rpx;
-  font-weight: 500;
+  font-weight: 700;
   overflow: hidden;
 }
 .panelListItem11Name2{

pages/main/addInfomationDetail.wxss

@@ -26,7 +26,7 @@
 }
 .panelTop3 {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .universalpic_light_black_22x30{

pages/main/cardmain.js

@@ -24,13 +24,14 @@ Page({
       IsShow: isshow,
     });
 
-    // var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
-    // //console.log(year);
-    // if (new Date().getFullYear()>=2023 && year<2023){
-    //   that.setData({
-    //     IsYearReport: true,
-    //   });
-    // }
+    var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
+    var month = new Date().getMonth();
+    //console.log(year);
+    if (new Date().getFullYear()>=2024 && year<2024 && month<3){
+      that.setData({
+        IsYearReport: true,
+      });
+    }
 
     canPress=true;
 

pages/main/cardmain.wxml

@@ -52,7 +52,7 @@
   </view>
   <!-- 年度报告 -->
   <block wx:if="{{IsYearReport}}">
-    <image class="report_2021-banner" src='{{ImagePath}}web/report_2022-banner.png' bindtap="goto" data-url="../other/annualreport" />
+    <image class="report_2024-banner" src='{{ImagePath}}web/report_2023-banner.png' bindtap="goto" data-url="../other/annualreport" />
   </block>
 
   <view class="panelItem3 FlexRow">
@@ -78,7 +78,7 @@
       <view class="text1">勤勉接力</view>
       <view class="text2">激励自己见证成长</view>
     </view>
-    <image class="directory_main_pic_9" src='../images/directory_main_pic_9.png' bindtap="goto" data-url="../../pages/share/shareindex" />
+    <image class="directory_main_pic_9" src='../images/directory_main_pic_9.png' />
   </view>
   <!-- 有勤勉接力 -->
   <view class="panelShare FlexRow" wx:if="{{Hardworking}}" bindtap="goto" data-url="../../pages/share/shareindex"

pages/main/cardmain.wxss

@@ -166,9 +166,9 @@
   margin-right: 30rpx;
 }
 
-.report_2021-banner {
+.report_2024-banner {
   width: 710rpx;
-  height: 180rpx;
+  height: 280rpx;
   margin: 30rpx 0 0 0;
 }
 

pages/main/detail.js

@@ -53,6 +53,7 @@ Page({
     IsAutoSound: false, //是否设置了自动播放
     IsAutoSoundStart: false, //是否开始自动播放
     Title: "",
+    TextSpace:"ensp",
     FontSizeArray: constant.arrFontSize,
   },
   onReady: function () {
@@ -115,11 +116,11 @@ Page({
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
 
-    if (app.globalData.IsOppo) {
-      that.setData({
-        TextSpace: "nbsp",
-      });
-    }
+    // if (app.globalData.IsOppo) {
+    //   that.setData({
+    //     TextSpace: "nbsp",
+    //   });
+    // }
 
   },
   onShow: function () {
@@ -986,7 +987,17 @@ Page({
           PracticeCount:data.PracticeCount,
         });
 
-        if (data.CardCount==0 && duration.toString() == "1") {
+        if (app.globalData.TaskToday.ListNew.length==0 
+          && app.globalData.TaskToday.ListReview.length==0 
+          && app.globalData.TaskToday.ListHistory.length==0){
+            wx.showModal({
+              title: '提醒',
+              showCancel: false,
+              confirmText: '知道了',
+              content: "您今天已经没有可练习的题卡了。可能是任务量已经完成（可以提高任务量上限），也可能是没有新题卡了（请去制作或检验生成一些新题卡）。"
+            }); 
+        }
+        else if (data.CardCount==0 && duration.toString() == "1") {
           wx.showModal({
             title: '提醒',
             showCancel: false,

pages/main/detail.wxss

@@ -10,7 +10,7 @@ page{
   color: #fff;
   border-radius:10rpx;
   font-size:24rpx;
-  font-weight: 500;
+  font-weight: 700;
   z-index: 101;
   position: relative;
 }
@@ -258,7 +258,7 @@ page{
   text-align: center;
   font-size:28rpx;
   line-height: 45rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#1e1e1e;
   margin: 0 0 10rpx 0;
 }
@@ -701,7 +701,7 @@ page{
 
 .numberContainer .right3 {
   margin-right: 30rpx;
-  font-weight: 500;
+  font-weight: 700;
   font-size:28rpx;
 }
 
@@ -769,7 +769,7 @@ page{
 .text3 {
   margin-top: 40rpx;
   font-size: 20rpx;
-  font-weight: 500;
+  font-weight: 700;
   text-align: center;
 }
 
@@ -928,7 +928,7 @@ page{
 }
 .FolderItem2{
   color:rgba(255, 255, 255, 0.4);
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .FolderTitle{

pages/main/folderEdit.wxss

@@ -25,7 +25,7 @@
 }
 .panelTopBtn {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
   background-color: #5282FA;
   width:110rpx;
   height:70rpx;

pages/main/mainlist.wxss

@@ -78,12 +78,12 @@
 
 .panelTop21 {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panelTop3 {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panelTop5 {
@@ -183,7 +183,7 @@
 .panelHelpText{
   width:620rpx;
   font-size: 20rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#4D4D4D;
   margin: 30rpx 0 30rpx 30rpx;
 }
@@ -251,7 +251,7 @@
 
 .panelListCategoryText{
   font-size: 32rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin: 60rpx 0 30rpx 0;
 }
 
@@ -323,7 +323,7 @@
 }
 .panelListItem11Name1{
   font-size: 30rpx;
-  font-weight: 500;
+  font-weight: 700;
   overflow: hidden;
 }
 .panelListItem11Name2{
@@ -351,7 +351,7 @@
   left:32rpx;
   top:0;
   font-size:20rpx;
-  font-weight: 500;
+  font-weight: 700;
   width:164rpx;
   overflow: hidden;
   color:#787878;
@@ -407,7 +407,7 @@
   text-align: center;
   line-height: 110rpx;
   font-size:36rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin-top: 20rpx;
 }
 

pages/main/preview.js

@@ -121,11 +121,11 @@ Page({
     if (app.globalData.BaiduToken==="")
       main.getBaiduToken();
     
-    if (app.globalData.IsOppo){
-      that.setData({
-        TextSpace:"nbsp",
-      });
-    }
+    // if (app.globalData.IsOppo){
+    //   that.setData({
+    //     TextSpace:"nbsp",
+    //   });
+    // }
     
     if (options.PrintID){
       that.setData({

pages/main/preview.wxss

@@ -279,7 +279,7 @@
   text-align: center;
   font-size:28rpx;
   line-height: 45rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#1e1e1e;
   margin: 0 0 10rpx 0;
 }
@@ -495,7 +495,7 @@
 }
 .panelMenu11{
   color:#FE6659;
-  font-weight: 500;
+  font-weight: 700;
   margin-bottom: 20rpx;
 }
 .panelMenu12{

pages/main/searchCard.wxss

@@ -88,7 +88,7 @@
 }
 .panelTop3 {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panel1{

pages/main/systemsetting.wxss

@@ -38,7 +38,7 @@
 }
 .panelItem01{
   color:#FE6659;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panelItem .panelItem1{

pages/other/annualreport.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-	<image src="{{ImagePath}}web/report_2022-header.png" class="panelTop" />
+	<image src="{{ImagePath}}web/report_2023-header.png" class="panelTop" />
 	<view class="panelMain FlexColumn">
 		<view class="text1">自{{Data.StartDate}}以来</view>
 		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>

pages/other/annualreport.wxss

@@ -41,7 +41,7 @@ page{
   width:590rpx;
   text-align: right;
   font-size: 20rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#787878;
 }
 .panelMain .line1{
@@ -63,19 +63,19 @@ page{
 }
 .panelMain .text4{
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#FE6659;
 }
 .panelMain .text5{
   width:590rpx;
   font-size: 20rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#787878;
 }
 .panelMain .text6{
   width:590rpx;
   font-size: 32rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#F2905D;
   margin-top: 50rpx;
   justify-content: flex-start;

pages/other/coupon.wxss

@@ -20,7 +20,7 @@
 .text1{
   font-size:32rpx;
   margin-left: 30rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .text2{

pages/other/pay.wxss

@@ -96,7 +96,7 @@
 }
 .text5{
   font-size:28rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin-top: 60rpx;
   text-align: center;
 }

pages/other/userbook.wxss

@@ -20,7 +20,7 @@
   font-size: 28rpx;
   text-align: center;
   color:#1E1E1E;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .btn00 {
@@ -138,7 +138,7 @@
 }
 
 .panel12 {
-  font-weight: 500;
+  font-weight: 700;
   font-size: 24rpx;
 }
 
@@ -250,12 +250,12 @@
 .text11 {
   color: #B3443B;
   font-size:24rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .btn {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
   width: 480rpx;
   height: 90rpx;
   border-radius: 10rpx;
@@ -341,7 +341,7 @@
   width: 690rpx;
   text-align: left;
   font-size: 32rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin: 10rpx 0 10rpx 0;
 }
 

pages/plan/studyplan.wxss

@@ -442,7 +442,7 @@
 
 .panel2121{
   margin-left: 30rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panel22{
@@ -698,7 +698,7 @@
   font-size: 28rpx;
   margin-right: 20rpx;
   line-height: 80rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 .HelpContainer .HelpPanel113{
   margin-right:0;
@@ -806,7 +806,7 @@
 
 .HelpBtnDisabled2{
   width: 330rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 .universalpic_stop_black_20x20{
   width: 20rpx;

pages/plan/taskFull.wxss

@@ -404,7 +404,7 @@ page {
   z-index: 100;
   width: 100%;
   justify-content: flex-start;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panelHigh0{
@@ -671,7 +671,7 @@ page {
 
 .color3{
   color:#eb5c28;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .mg4_iconTools_3{

pages/share/shareindex.wxml

@@ -32,7 +32,7 @@
       </scroll-view>
     </view>
 
-    <view class="panel2 FlexColumn" wx:if="{{ShowActivity}}">
+    <!-- <view class="panel2 FlexColumn" wx:if="{{ShowActivity}}">
       <view class="panel21 FlexRow">
         <view class="text2">秒过学习小组活动</view>
       </view>
@@ -76,7 +76,7 @@
         <text class="panel2201text7">新年快乐，一年来您辛苦了</text>  
        
       </view>
-    </view>
+    </view> -->
 
     <view class="panel2 FlexColumn">
       <view class="panel21 FlexRow">
@@ -104,6 +104,7 @@
         <view class="panel2Line"></view>
         <view class="panel23">今天是{{Info.Today}}。</view>
         <view class="panel23">本月：练习{{Info.CurrentMonth.length}}天，接力{{Info.ShareNumberMonth}}次，有{{Info.CurrentMonth.length-Info.ShareNumberMonth}}天没接力。</view>
+        <view class="panel23">今年：接力{{Info.ShareNumberYear}}次。</view>
         <view class="panel2Line2"></view>
         <view class="panel25 FlexRow">
           <text class="text13">自{{Info.ShareFirstDay}}首次接力以来共接力</text>

pages_agent/main/enter.wxss

@@ -23,7 +23,7 @@
 }
 .panelBottom12{
   font-size:24rpx;
-  font-weight: 500;
+  font-weight: 700;
   text-decoration:underline;
 }
 

pages_agent/main/search_user.wxss

@@ -86,7 +86,7 @@
 }
 .panelTop3 {
   font-size: 28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panel1{

pages_agent/marketing/award.wxss

@@ -27,13 +27,13 @@
 
 .panelItem12{
   font-size:48rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panelItem2{
   width:690rpx;
   font-size:20rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin:10rpx 0 30rpx 0;
   color: #787878;
 }
@@ -41,7 +41,7 @@
 .panelItem3{
   width:690rpx;
   font-size:20rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin:30rpx 0 0 0;
   color: #787878;
   justify-content: space-between;
@@ -81,7 +81,7 @@
 .text3{
   width:690rpx;
   font-size:20rpx;
-  font-weight: 500;
+  font-weight: 700;
   color: #787878;
 }
 
@@ -92,7 +92,7 @@
 .text1{
   width:690rpx;
   font-size:28rpx;
-  font-weight: 500;
+  font-weight: 700;
   margin-top: 30rpx;
 }
 

pages_agent/marketing/extenduser.wxss

@@ -20,7 +20,7 @@
 .panelTop110{
   font-size:28rpx;
   color:#0071EF;
-  font-weight: 500;
+  font-weight: 700;
   margin-bottom: 20rpx;
 }
 .panelTop111{

pages_test/test/index.js

@@ -104,7 +104,7 @@ Page({
           that.setData({
             Subject: "ENG",
           });
-          if (that.data.TestSelectGrade > 11) {
+          if (that.data.TestSelectGrade > 13) {
             that.setData({
               ScrollLeft: 500,
             });

pages_test/test/index.wxss

@@ -278,7 +278,7 @@
 }
 .numberContainer .numberContaineFooter2{
   color:#B3443B;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .universalpic_sequence_black_30x30_2{

pages_test/test/item.wxss

@@ -10,7 +10,7 @@ page{
   color: #fff;
   border-radius:10rpx;
   font-size:24rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .panelTop{
@@ -241,7 +241,7 @@ page{
   text-align: center;
   font-size:28rpx;
   line-height: 45rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#1e1e1e;
   margin: 0 0 10rpx 0;
 }

pages_test/test/list.js

@@ -45,7 +45,15 @@ Page({
     
     var arr = [];
     var listType="hanzi",fieldName="单词",fieldName2="说含义";
-    if (that.data.BookID > 164){
+    if (that.data.BookID > 172){
+      arr = wx.getStorageSync("CET4EngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 168){
+      arr = wx.getStorageSync("NCEEEngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 164){
       arr = wx.getStorageSync("CEWEngList");
       listType="english";
     }
@@ -168,7 +176,6 @@ Page({
                 }
               }
 
-
               if (testReportList[k].TestType == "read") {
                 if (testReportList[k].IsFinished == 1)
                   list[j].TestTypeRead = 1;
@@ -238,6 +245,7 @@ Page({
 
       if (id) {
         var reporttype = e.currentTarget.dataset.type;
+        var testtype=e.currentTarget.dataset.testtype;
         if (reporttype=="restart"){
           var testReportList = wx.getStorageSync("UserTestReport");
           for(var i=0;i<testReportList.length;i++){
@@ -246,24 +254,51 @@ Page({
               testReportList[i].TestWrongStr="";
               testReportList[i].TestSkipStr="";
               testReportList[i].TestExistStr="";
+              testReportList[i].IsFinished=0;
+              wx.setStorageSync("UserTestReport", testReportList);
+
+              var param1 ={};
+              param1.ID=id;
+              param1.UserID=app.globalData.userInfo.UserID;
+              param1.IsFinished=0;
+              param1.TestRightStr="";
+              param1.TestWrongStr="";
+              param1.TestSkipStr="";
+              param1.TestExistStr="";
+              main.postData('InsertTestReport?UserID=' + param1.UserID, param1, function () {
+                main.GetTestReportInfo(id, function (data) {
+                  data.BookID=that.data.BookID;
+                  wx.setStorageSync("TestTask2", data); 
+                  that.onClose();
+                  var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
+                  if (testtype)
+                    url+="&testtype="+testtype;
+                  wx.navigateTo({
+                    url: url,
+                  });
+                });
+              });
               break;
             }
           }
-          wx.setStorageSync("UserTestReport", testReportList);
+          
+          
         }
-
-        main.GetTestReportInfo(id, function (data) {
-          data.BookID=that.data.BookID;
-          wx.setStorageSync("TestTask2", data); 
-          that.onClose();
-          var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
-          var testtype=e.currentTarget.dataset.testtype;
-          if (testtype)
-            url+="&testtype="+testtype;
-          wx.navigateTo({
-            url: url,
+        else{
+          main.GetTestReportInfo(id, function (data) {
+            data.BookID=that.data.BookID;
+            wx.setStorageSync("TestTask2", data); 
+            that.onClose();
+            var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
+            if (testtype)
+              url+="&testtype="+testtype;
+            wx.navigateTo({
+              url: url,
+            });
           });
-        });
+        }
+
+        
       } else {
         that.onClose();
         var url = e.currentTarget.dataset.url+"&bookid="+that.data.BookID;

pages_test/test/list.wxml

@@ -2,7 +2,7 @@
   <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>
+  <view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<=177) || (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}}">
@@ -70,7 +70,7 @@
           <view class="SelectContainer1Text3">念{{FieldName}}{{FieldName2}} 继续检验</view>
         </view>
 
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
           重新开始
         </view>
 
@@ -87,7 +87,7 @@
             <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 wx:if="{{SelectItem.TestTypeWrite}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
             重新开始
           </view>
 
@@ -111,7 +111,7 @@
           <view class="SelectContainer1Text3">说含义 继续检验</view>
         </view>
 
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
           重新开始
         </view>
       </view>
@@ -133,7 +133,7 @@
           <view class="SelectContainer1Text3">看上文接下文 继续检验</view>
         </view>
 
-        <view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+        <view wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
           重新开始
         </view>
 
@@ -146,7 +146,7 @@
             <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 wx:if="{{SelectItem.TestTypeWrite}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
             重新开始
           </view>
       </view>
@@ -168,7 +168,7 @@
         </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 wx:if="{{SelectItem.TestTypeRead}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="read" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
           重新开始
         </view>
 
@@ -183,7 +183,7 @@
           </view>
           <view class="btnPanel1">根据发音和含义默写{{FieldName}}</view>
 
-          <view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+          <view wx:if="{{SelectItem.TestTypeWrite}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
             重新开始
           </view>
         </block>

pages_test/test/list.wxss

@@ -117,7 +117,7 @@
 .SelectContainer1Text1{
   font-size:36rpx;
   margin-top: 20rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .SelectContainer1Text2{
@@ -142,7 +142,7 @@
   margin-top:-10rpx;
   margin-bottom: 30rpx;
   font-size: 20rpx;
-  font-weight: 500;
+  font-weight: 700;
   color:#4D4D4D;
 }
 
@@ -175,7 +175,7 @@
   font-size:24rpx;
   margin-left: 10rpx;
   color:#0071EF;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 
@@ -188,7 +188,7 @@
   text-align: center;
   color:#0071EF;
   font-size:28rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 .close{

pages_test/test/report.wxss

@@ -12,7 +12,7 @@
   margin-top: 10rpx;
   margin-left: 30rpx;
   font-size:32rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 .text2{
   margin-bottom: 30rpx;
@@ -195,7 +195,7 @@
 .buildText1{
   font-size: 54rpx;
   margin-top: 100rpx;
-  font-weight: 500;
+  font-weight: 700;
 }
 .buildBtn{
   width:600rpx;
@@ -204,7 +204,7 @@
   line-height: 90rpx;
   font-size:36rpx;
   margin-top: 40rpx;
-  font-weight: 500;
+  font-weight: 700;
   border-radius: 14rpx;
 }
 

pages_test/test/wordlist.js

@@ -83,8 +83,12 @@ Page({
           arr= wx.getStorageSync("MiddleSchoolTestWords");
         else if (bookid>=160 && bookid<165)
           arr= wx.getStorageSync("BEWEngList");
-        else if (bookid>=165 && bookid<170)
+        else if (bookid>=165 && bookid<=168)
           arr= wx.getStorageSync("CEWEngList");
+        else if (bookid>=169 && bookid<=172)
+          arr= wx.getStorageSync("NCEEEngList");
+        else if (bookid>=173 && bookid<=177)
+          arr= wx.getStorageSync("CET4EngList");
         
       }
       arr = JSON.parse(arr);

utils/main.js

@@ -897,7 +897,8 @@ function GetTestReportInfo(reportid, callback) {
       ||name1[0].indexOf("单词") >= 0 
       || name1[0].indexOf("1000") >= 0 
       || name1[0].indexOf("2000") >= 0 
-      || name1[0].indexOf("4000") >= 0) {
+      || name1[0].indexOf("4000") >= 0 
+      || name1[0].indexOf("高考") >= 0) {
         //console.log("英语");
         var wordStr = "";
         var userTestReportInfo = UserTestReport[n];
@@ -935,12 +936,11 @@ function GetTestReportInfo(reportid, callback) {
         var unitsid = "";
         if (bookid > 100 && bookid < 110 && UserTestReport[n].Name[2]) {
           unitsid = Number(UserTestReport[n].Name[2]);
-        } else if (bookid > 120 && bookid <= 124) {
+        } else if ((bookid > 120 && bookid <= 124) || (bookid >= 169 && bookid <= 172)) {
           unitsid = Number(name2.replace("Lesson ", ""));
-        } else if (bookid > 130 && bookid <= 170 && UserTestReport[n].Name[2]) {
+        } else if (bookid > 130 && bookid <= 168 && UserTestReport[n].Name[2]) {
           unitsid = Number(UserTestReport[n].Name[2]);
         } 
-        
         getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + bookid + '&LessonID=' + unitsid + '&Words=' + wordStr + "&TestType=" + userTestReportInfo.TestType, function (data) {
           if (data) {
             var result = {};
@@ -1278,6 +1278,8 @@ function getEnglish(callback) {
       var arrEEWEngList = common.Decrypt(data.EEWEngList);
       var arrCEWEngList = common.Decrypt(data.CEWEngList);
       var arrBEWEngList = common.Decrypt(data.BEWEngList);
+      var arrNCEEEngList = common.Decrypt(data.NCEEEngList);
+      var arrCET4EngList = common.Decrypt(data.CET4EngList);
       var arrMiddleSchoolTestWords = common.Decrypt(data.MiddleSchoolTestWords);
       var arrPhoneticEngList = common.Decrypt(data.PhoneticEngList);
       wx.setStorageSync("EnglishAll", arrEng);
@@ -1286,6 +1288,9 @@ function getEnglish(callback) {
       wx.setStorageSync("EEWEngList", arrEEWEngList);
       wx.setStorageSync("CEWEngList", arrCEWEngList);
       wx.setStorageSync("BEWEngList", arrBEWEngList);
+      wx.setStorageSync("NCEEEngList", arrNCEEEngList);
+      wx.setStorageSync("CET4EngList", arrCET4EngList);
+      
       wx.setStorageSync("MiddleSchoolTestWords", arrMiddleSchoolTestWords);
       wx.setStorageSync("PhoneticEngList", arrPhoneticEngList);
       wx.setStorageSync("EnglishUpdateTime", data.UpdateTime);
@@ -1647,6 +1652,7 @@ function GetTestReportList(userID, callback) {
 
           if (data[i].Name[0].indexOf("英语") >= 0 
           || data[i].Name[0].indexOf("单词") >= 0 
+          || data[i].Name[0].indexOf("高考") >= 0 
           || data[i].Name[0].indexOf("KET") >= 0 
           || data[i].Name[0].indexOf("1000") >= 0 
           || data[i].Name[0].indexOf("2000") >= 0 
@@ -1845,7 +1851,7 @@ function downloadFile(url,isShowLoading,callback){
       wx.hideLoading();
     }, 5000);
   }
-  //console.log(url);
+  console.log(url);
   wx.downloadFile({
     url: url,
     success(resDownload) {