2.1.18

app.js

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

pages/index/accredit.js

@@ -6,7 +6,7 @@ var urlRedirectTo = "";
 
 Page({
   data: {
-    ShowNotice:false,
+    ShowNotice: false,
   },
   onLoad: function (options) {
     urlRedirectTo = options.url;
@@ -18,10 +18,10 @@ Page({
     this.init();
 
     if (!app.globalData.userInfo)
-      app.globalData.userInfo={};
+      app.globalData.userInfo = {};
   },
   init: function () {
-    var that=this;
+    var that = this;
     main.getData("GetAccreditInfo?IsShow=" + app.globalData.userInfo.IsShow, function (data) {
       that.setData({
         Info: data,
@@ -39,8 +39,7 @@ Page({
               that.getUserInfo();
             },
           })
-        }
-        else {
+        } else {
           that.getUserInfo();
         }
       }
@@ -49,27 +48,37 @@ Page({
   //得到用户信息
   getUserInfo: function () {
     var that = this
-    //调用登录接口
-    wx.login({
-      success: function (res0) {
-        wx.getUserInfo({
-          withCredentials: true,
-          success: function (res) {
-            app.globalData.userInfo.Code = res0.code;
-            app.globalData.userInfo.iv = res.iv;
-            app.globalData.userInfo.encryptedData = res.encryptedData;
 
-            app.globalData.userInfo.NickName = res.userInfo.nickName;
-            app.globalData.userInfo.AvatarUrl = res.userInfo.avatarUrl;
+    wx.getUserProfile({
+      desc: "沟通需要",
+      success: function (res2) {
+        app.globalData.userInfo.NickName = res2.userInfo.nickName;
+        app.globalData.userInfo.AvatarUrl = res2.userInfo.avatarUrl;
+
+        //调用登录接口
+        wx.login({
+          success: function (res0) {
+            // wx.getUserInfo({
+            //   withCredentials: true,
+            //   success: function (res) {
+                 app.globalData.userInfo.Code = res0.code;
+            //     app.globalData.userInfo.iv = res.iv;
+            //     app.globalData.userInfo.encryptedData = res.encryptedData;
 
-            that.login(app.globalData.userInfo, res.userInfo);
-          },
-          fail: function (res) {
-            that.gotoReturn();
+            that.login(app.globalData.userInfo, res2.userInfo);
+            //   },
+            //   fail: function (res) {
+            //     that.gotoReturn();
+            //   }
+            // });
           }
         });
       },
+      fail: function (res) {
+        console.log(res);
+      }
     });
+
   },
   login: function (param, param2) {
     var that = this;
@@ -98,20 +107,20 @@ Page({
       app.globalData.userInfo.City = data.City;
       app.globalData.userInfo.Province = data.Province;
       app.globalData.userInfo.Country = data.Country;
-      
-      app.globalData.userInfo.IsMember=data.IsMember;
+
+      app.globalData.userInfo.IsMember = data.IsMember;
 
       if (app.globalData.userInfo.UserID)
-        main.buildInitData(function(){
+        main.buildInitData(function () {
           that.gotoReturn();
         });
-      else{
+      else {
         app.globalData.userInfo.UserID = data.UserID;
         that.gotoReturn();
       }
     });
   },
-  gotoReturn:function(){
+  gotoReturn: function () {
     wx.navigateBack({
       delta: 1
     });

pages/index/accredit.wxml

@@ -9,13 +9,18 @@
     <button bindtap="gotoReturn" class="btn2 btn FlexRow">
       <view>{{Info.Btn2}}</view>
     </button>
-    <button open-type="getUserInfo" bindgetuserinfo="goto" class="btn2 btn FlexRow">
+    <button catchtap="getUserInfo" class="btn2 btn FlexRow">
       <view>{{Info.Btn1}}</view>
     </button>
   </view>
-  <button wx:if="{{Info.Btn3}}" open-type="getUserInfo" bindgetuserinfo="goto" class="btn FlexRow">
+  <!-- <button wx:if="{{Info.Btn3}}" open-type="getUserInfo" bindgetuserinfo="goto" class="btn FlexRow">
     <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
     <view>{{Info.Btn3}}</view>
   </button>
-
+   -->
+   <button wx:if="{{Info.Btn3}}" catchtap="getUserInfo" class="btn FlexRow">
+    <image src="../images/universalpic_share_white_52x40.png" class="universalpic_share_white_52x40" />
+    <view>{{Info.Btn3}}</view>
+  </button>
+  
 </view>

pages/index/index.js

@@ -2,23 +2,6 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSentence = [
-  "荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣",
-  "为什么订正过的题目还会错？\n天天秒过，反复巩固，不再出错",
-  "子曰:\n学而时习之，不亦说乎。",
-  "秒过之前，错字连篇\n秒过之后，错字罕见",
-  "子曰:\n学而不思则罔\n思而不学则殆",
-  "记忆是思考的残留物\n唯有不断思考才能记住",
-  "荀子曰:\n青，取之于蓝，而青于蓝\n冰，水为之，而寒于水",
-  "舒适区练习不会带来改变\n只有刻意练习才能提高",
-  "荀子曰:\n不积跬步，无以至千里\n不积小流，无以成江海",
-  "死记硬背? No! \n测试可以知晓自己\n问题在哪里。",
-  "荀子曰:\n骐骥一跃，不能十步\n驽马十驾，功在不舍",
-  "同一时间反复练习？No! \n要间隔练习、穿插练习、换环境练习",
-  "荀子曰:\n锲而舍之，朽木不折\n锲而不舍，金石可镂",
-  "所谓的粗心\n只是对细节缺乏敏感\n秒过关注每个细节",
-  "孟子曰:\n故天将降大任于是人也\n必先苦其心志，劳其筋骨\n饿其体肤……",
-];
 
 var timeout1 = 0, timeout3=0;
 var timeoutRedirect=0;
@@ -77,7 +60,6 @@ Page({
         });
       }
       else if (options.type == "lesson" || options.type == "video") {
-        //console.log("Lesson:" + options.LessonID);
         app.globalData.LessonID = options.LessonID;
         if (options.LessonPage)
           app.globalData.LessonPage = options.LessonPage;
@@ -147,7 +129,7 @@ Page({
         var pid=options.PrintID;
         if (!pid)
           pid=options.P;
-        var puid=options.U;
+        var puid=options.PUserID;
         this.setData({
           gotoType: "other",
           gotoUrl: "../main/mainlist?PrintID="+pid+"&PrintUserID="+puid,
@@ -163,7 +145,6 @@ Page({
     this.setData({
       IsRefresh: false,
       Containnerheight: main.getWindowHeight(),
-      //Sentence: arrSentence[common.random(0, arrSentence.length - 1)],
       Sentence:common.random(1, 9),
     });
 
@@ -187,54 +168,21 @@ Page({
         app.globalData.userInfo = {};
         app.globalData.userInfo.Code = res0.code;
         console.log("Time2:" + new Date().getTime());
-        wx.getSetting({
-          scope: "scope.userInfo",
-          success(res) {
-            if (!res.authSetting['scope.userInfo']) {
-              app.globalData.userInfo.nickName = "陌生用户";
-              app.globalData.userInfo.language = "";
-              app.globalData.userInfo.gender = "0";
-              app.globalData.userInfo.city = "";
-              app.globalData.userInfo.province = "";
-              app.globalData.userInfo.country = "";
-              app.globalData.userInfo.avatarUrl = "../images/universalpic_face_default_blue_120x120.png";
-              that.login(app.globalData.userInfo);
-            }
-            else {
-              wx.getUserInfo({
-                withCredentials: false,
-                success: function (res) {
-                  console.log("Time3:" + new Date().getTime());
-                  app.globalData.userInfo = res.userInfo;
-
-                  app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
-                  app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
-
-                  app.globalData.userInfo.Code = res0.code;
-                  that.login(app.globalData.userInfo);
-
-                },
-                fail: function (res) {
-                  that.login(app.globalData.userInfo);
-                }
-              });
-
-            }
-          }
-        });
+        app.globalData.userInfo.nickName = "陌生用户";
+        app.globalData.userInfo.language = "";
+        app.globalData.userInfo.gender = "0";
+        app.globalData.userInfo.city = "";
+        app.globalData.userInfo.province = "";
+        app.globalData.userInfo.country = "";
+        app.globalData.userInfo.avatarUrl = "../images/universalpic_face_default_blue_120x120.png";
+        that.login(app.globalData.userInfo);        
       },
-      fail: function () {
-
-      }
+      fail: function () {}
     });
   },
 
   login: function (param) {
     var that = this;
-    //var userSource = wx.getLaunchOptionsSync();
-    //console.log("userSource1:" + userSource.scene);
-    //console.log("userSource2:" + app.globalData.userSource);
-
     main.getLocalHost(function () {
       main.postData('MiaoguoLogin', {
         Code: param.Code,
@@ -329,13 +277,10 @@ Page({
               }, 2000);
             }
             main.getUserConfig();
-
           }
           that.getBaiduToken();
-          
         }
       });
-
     });
   },
   getBaiduToken: function () {
@@ -347,7 +292,6 @@ Page({
 
     updateManager.onCheckForUpdate(function (res) {
       // 请求完新版本信息的回调
-      //console.log(res.hasUpdate)
     });
 
     updateManager.onUpdateReady(function () {
@@ -363,11 +307,9 @@ Page({
           wx.removeStorageSync("HanziUpdateTime");
           wx.removeStorageSync("HanziAll");
           wx.removeStorageSync("EnglishAll");
-          // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
           updateManager.applyUpdate();
         }
       });
-
     });
   },
   

pages/main/cardmain.js

@@ -29,9 +29,14 @@ Page({
     }
    
   },
+  onPullDownRefresh: function () {
+    var that=this;
+    app.globalData.FolderList=[];
+    that.getFolderList();
+    wx.stopPullDownRefresh();
+  },
   onShow:function(){
     this.init();
-
     if (wx.getStorageSync("TempCardNoSaved")) {
       wx.navigateTo({
         url: '../other/recover',
@@ -100,11 +105,6 @@ Page({
       }
     });
   },
-  gotoDefault:function(){
-    wx.reLaunch({
-      url: './default',
-    });
-  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
@@ -223,6 +223,13 @@ Page({
       IsShowOrder:false,
     });
   },
+
+  gotoReLaunch: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.reLaunch({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/cardmain.json

@@ -1,3 +1,4 @@
 {
-  "navigationBarTitleText": "题卡"
+  "navigationBarTitleText": "题卡",
+  "enablePullDownRefresh": true
 }

pages/main/cardmain.wxml

@@ -51,32 +51,24 @@
       <image class="richang_80x90" src='../images/jinji_80x90.png' />
     </view>
   </view>
-  <view class="panelItem3 FlexRow">
-    <view class="panelItem41 FlexRow" bindtap="goto" data-url="../test/index">
-      <view class="panelItem311 FlexColumn">
-        <view>知识检验</view>
-        <view class="panelItem4111">生字单词先检后练</view>
-      </view>
-      <image class="zhishijianyan_70x75" src='../images/zhishijianyan_70x75.png' />
-    </view>
-    <view class="panelItem41 FlexRow" bindtap="goto" data-url="../other/help?id=0&idchild=1">
-      <view class="panelItem311 FlexColumn">
-        <view>秒过官网</view>
-        <view class="panelItem4111">高效制作和管理题卡</view>
-      </view>
-      <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
+  <view class="panelItem5 FlexRow" bindtap="goto" data-url="../other/help?id=0&idchild=1">
+    <view class="panelItem51 FlexRow" >
+      <view>秒过官网</view>
+      <view class="panelItem511">高效制作和管理题卡</view>
     </view>
+    <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
+   
   </view>
 
 
-  <block wx:if="{{IsYearReport}}">
+  <!-- <block wx:if="{{IsYearReport}}">
     <view class="panelItem5 FlexRow" bindtap="goto" data-url="../other/annualreport">
       <view class="panelItem51 FlexColumn">
         2020年度秒过用户年报
       </view>
       <image class="report_20201231_04" src='{{ImagePath}}web/report_20201231_04.png' />
     </view>
-  </block>
+  </block> -->
 
   <view class="panelItem6 FlexRow" wx:if="{{FolderArr}}">
     <view class="panelItem61 FlexColumn">
@@ -104,8 +96,7 @@
     <view wx:for="{{FolderArr}}" wx:key="index" class="panelFolder0 panelFolder FlexColumn" 
     bindtap="getList" data-folderid="{{item.ID}}" data-name="{{item.Name}}" data-color="{{item.ColorName}}" data-icon="{{item.IconName}}">
       <view class="panelFolder1 FlexColumn" style="background-color: {{item.ColorName}};">
-        <image src='{{ImagePath}}web/{{item.IconName}}.png'
-          style="width:{{item.Width}}rpx;height:{{item.Height}}rpx;" />
+        <image src='{{ImagePath}}web/{{item.IconName}}.png?1' class="folderImage" />
       </view>
       <view class="panelItem72">
         {{item.Name}}
@@ -120,19 +111,22 @@
   <view class="panelHeight160" wx:if="{{FolderArr}}"></view>
   <view wx:if="{{IsIPad}}" style="width:100%;height:150rpx;"></view>
 
-  <view class='panelBottom FlexColumn'>
+  <view class='panelBottom FlexColumn' catchtap="">
     <view class='panelBottom1 FlexRow'>
-      <view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../test/index">
+        <view>检验</view>
+      </view>
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../main/default">
         <view>练习</view>
       </view>
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../main/add?type=add&id=0">
+        <image class="tabbar_add_red_70x70" src='../images/tabbar_add_red_70x70.png' />
+      </view>
       <view class='panelBottom11 FlexColumn'>
         <view class='text5'>题卡</view>
       </view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="./add?type=add&id=0">
-        <image class="tabbar_add_red_70x70" src='../images/tabbar_add_red_70x70.png' />
-      </view>
-      <view class='panelBottom12 FlexColumn' bindtap="goto" data-url="../other/userbook">
-        <view class='text51'>用户手册</view>
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../other/userbook">
+        <view>手册</view>
       </view>
     </view>
 

pages/main/cardmain.wxss

@@ -104,29 +104,9 @@
   margin-right: 30rpx;
 }
 
-.panelItem41{
-  width:345rpx;
-  height:180rpx;
-  background-color: #fff;
-  border-radius: 20rpx;
-  justify-content: space-between;
-  margin: 0 10rpx;
-}
-
-.panelItem4111{
-  font-size:20rpx;
-  color:#1e1e1e;
-}
-.zhishijianyan_70x75{
-  width:70rpx;
-  height:75rpx;
-  margin-right: 30rpx;
-}
-
-
 .panelItem5{
   width:710rpx;
-  height:145rpx;
+  height:105rpx;
   background-color: #fff;
   border-radius: 20rpx;
   justify-content: space-between;
@@ -138,6 +118,16 @@
   font-size:32rpx;
   margin-left: 40rpx;
 }
+.panelItem511{
+  color:#4d4d4d;
+  font-size:20rpx;
+  margin-left: 30rpx;
+}
+.zhishijianyan_70x75{
+  width:50rpx;
+  height:54rpx;
+  margin-right: 30rpx;
+}
 
 .report_20201231_04{
   width:139rpx;
@@ -431,4 +421,9 @@
   background-color: #5282FA;
   color:#fff;
   font-size:32rpx;
+}
+
+.folderImage{
+  width:150rpx;
+  height:150rpx;
 }

pages/main/default.js

@@ -49,7 +49,7 @@ Page({
     var that = this;
     if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser == 1 && app.globalData.userInfo.IsShow == 1) {
       if (app.globalData.userInfo.Subscribe == 0) {
-        wx.redirectTo({
+        wx.navigateTo({
           url: '../other/newuser',
         });
       }
@@ -57,7 +57,12 @@ Page({
     else {
       wx.getSetting({
         success(res) {
-          if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
+          if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsMember==1 && app.globalData.userInfo.IsShow == 1){
+            wx.navigateTo({
+              url: '../index/accredit',
+            });
+          }
+          else{
             if (!app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
               if (app.globalData.userInfo.Subscribe == 1) {
                 wx.navigateTo({
@@ -115,19 +120,15 @@ Page({
 
             that.isNoSavedCard();
 
-          }
-          else {
-            wx.navigateTo({
-              url: '../index/accredit',
-            });
-          }
+            if (res.authSetting['scope.record'] === true) {
+              app.globalData.IsRecorderAccredit = 1;
+            }
+            else if (res.authSetting['scope.record'] === false) {
+              app.globalData.IsRecorderAccredit = -1;
+            }
 
-          if (res.authSetting['scope.record'] === true) {
-            app.globalData.IsRecorderAccredit = 1;
-          }
-          else if (res.authSetting['scope.record'] === false) {
-            app.globalData.IsRecorderAccredit = -1;
           }
+          
         }
       });
     }
@@ -282,9 +283,10 @@ Page({
     }
   },
   
-  gotoCardmain: function () {
+  gotoReLaunch: function (e) {
+    var url=e.currentTarget.dataset.url;
     wx.reLaunch({
-      url: './cardmain',
+      url: url,
     });
   },
   showUserID:function(){

pages/main/default.wxml

@@ -17,22 +17,25 @@
 
   <view class="setting{{IsIPad}}" catchtap="goto" data-url="../plan/studyplan"></view>
   
-  <view class='panelBottom FlexColumn'>
+  <view class='panelBottom FlexColumn' catchtap="">
 
     <image class="study_index_footer" src='../images/practise_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../test/index">
+        <view>检验</view>
+      </view>
       <view class='panelBottom11 FlexColumn'>
         <view class='text5'>练习</view>
       </view>
-      <view class='panelBottom11 FlexColumn' bindtap='gotoCardmain'>
-        <view>题卡</view>
-      </view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="./add?type=add&id=0">
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../main/add?type=add&id=0">
         <image class="tabbar_add_red_70x70" src='../images/tabbar_add_red_70x70.png' />
       </view>
-      <view class='panelBottom12 FlexColumn' bindtap="goto" data-url="../other/userbook">
-        <view class='text51'>用户手册</view>
+      <view class='panelBottom11 FlexColumn' catchtap='gotoReLaunch' data-url="../main/cardmain">
+        <view>题卡</view>
+      </view>
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../other/userbook">
+        <view>手册</view>
       </view>
     </view>
     <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
@@ -83,7 +86,7 @@
     <view class="panel2 FlexRow">
       <input class='input2 input' type="number"  always-embed="true"  placeholder="版本号" value="{{VersionID}}" bindinput="onKeyInput" data-type="versionid"/>
       <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="1">开通</button>
-      <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="-1">关闭</button>
+      <!-- <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="-1">关闭</button> -->
     </view>
 </view>
 

pages/main/detail.js

@@ -270,12 +270,14 @@ Page({
       for (var j = 0; j < nMax[0]; j++) {
         if (indexNew < arrNew.length) {
           arrNew[indexNew].IsNew = true;
+          delete arrNew[indexNew].IsHistory;
           TaskList.push(arrNew[indexNew++]);
         }
       }
       for (var j = 0; j < nMax[1]; j++) {
         if (indexHistory < arrHistory.length) {
           arrHistory[indexHistory].IsHistory = true;
+          delete arrHistory[indexHistory].IsNew;
           TaskList.push(arrHistory[indexHistory++]);
         }
       }
@@ -284,7 +286,8 @@ Page({
     that.data.NumberReview = listTaskReview.length;
     for (var i = 0; i < listTaskReview.length; i++) {
       listTaskReview[i].IsReview = true;
-
+      delete listTaskReview[i].IsNew;
+      delete listTaskReview[i].IsHistory;
       TaskList.push(listTaskReview[i]);
     }
 
@@ -487,6 +490,7 @@ Page({
     this.setData({
       TaskInfo: TaskList[0],
       IsMore: false,
+      Title:"",
     });
   },
   //回到上一张题卡
@@ -509,7 +513,15 @@ Page({
       card.Card.Number3 = card.Number3Old;
       card.Card.Number3Str = card.Number3StrOld;
 
-      if (card.IsReviewOld)
+
+      delete card.Card.IsNew;
+      delete card.Card.IsHistory;
+      delete card.Card.IsReview;
+      if (card.IsNewOld)
+        card.Card.IsNew = card.IsNewOld;
+      else if (card.IsHistoryOld)
+        card.Card.IsHistory = card.IsHistoryOld;
+      else if (card.IsReviewOld)
         card.Card.IsReview = card.IsReviewOld;
 
       //去除重复
@@ -556,12 +568,18 @@ Page({
       card[0].IsFinally = true;
       card[0].LimitTime = common.formatTime(new Date(), "/", true) + " 23:59:59";
       TaskList.push(card[0]);
+
+      if (currentFolderID>=0){
+        that.setCurrentFolder({currentTarget:{dataset:{folderid:currentFolderID}}});
+      }
+      
       that.setData({
         IsShowAnswer: [0, 0],
         TaskInfo: TaskList[0],
         CanUndo: 1,
         Recommend: 0,
         IsShowOrder: false,
+        Title:"",
       });
     } else {
       //若是没有选择了卡单，或者刚刚选择卡单
@@ -584,6 +602,12 @@ Page({
         finishCard.Number2StrOld = TaskList[0].Number2Str;
         finishCard.Number3Old = TaskList[0].Number3;
         finishCard.Number3StrOld = TaskList[0].Number3Str;
+        if (TaskList[0].IsNew)
+          finishCard.IsNewOld = TaskList[0].IsNew;
+        if (TaskList[0].IsHistory)
+          finishCard.IsHistoryOld = TaskList[0].IsHistory;
+        if (TaskList[0].IsReview)
+          finishCard.IsReviewOld = TaskList[0].IsReview;
 
 
         //若是当前题卡更改学习计划
@@ -605,7 +629,7 @@ Page({
               var minute = Number(time.substr(0, time.indexOf("m")));
               TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
               //若是新建，则10m 1d 4d
-              if (TaskList[0].IsNew) {
+              if (TaskList[0].IsNew || TaskList[0].IsReview) {
                 if (minute == 1) {
                   TaskList[0].Number0 = "1m";
                   TaskList[0].Number2 = "10m";
@@ -641,9 +665,10 @@ Page({
                 delete TaskList[0].Number3Str;
               }
 
-              finishCard.IsReviewOld = TaskList[0].IsReview;
-
               TaskList[0].IsReview = true;
+              delete TaskList[0].IsNew;
+              delete TaskList[0].IsHistory;
+              
               TaskList.push(TaskList[0]);
             }
             //若是天月年
@@ -699,29 +724,30 @@ Page({
       that.data.NumberReview = 0;
       for (var i = 0; i < TaskList.length; i++) {
         if (TaskList[i].IsReview) {
-          if (TaskList[i].LimitTime < common.formatTime(new Date())) {
-            var card = TaskList.splice(i, 1);
-            TaskList.unshift(card[0]);
-          }
           that.data.NumberReview++;
         } else if (TaskList[i].IsNew) {
           that.data.NumberNew++;
         } else if (TaskList[i].IsHistory) {
           that.data.NumberHistory++;
         }
-        if (TaskList[i].IsFinally) {
-          var card = TaskList.splice(i, 1);
-          TaskList.push(card[0]);
-        }
+      }
+
+      //到时题卡马上显示
+      for (var i = 0; i < TaskList.length; i++) {
+        if (TaskList[i].IsReview) {
+          if (TaskList[i].LimitTime < common.formatTime(new Date())) {
+            var card = TaskList.splice(i, 1);
+            TaskList.unshift(card[0]);
+          }
+        } 
       }
 
       currentFolderStart = false;
       //若选择了卡单
       var bFolder=false;
       if (currentFolderID>=0){
-
         for(var i=0;i<TaskList.length;i++){
-          if (TaskList[i].FolderID==currentFolderID){
+          if (TaskList[i].FolderID==currentFolderID && !TaskList[i].IsFinally){
             var card = TaskList.splice(i, 1);
             TaskList.unshift(card[0]);
             bFolder=true;
@@ -730,6 +756,14 @@ Page({
         }
       }
 
+      //挪到最后题卡继续挪到最后
+      for (var i = 0; i < TaskList.length; i++) {
+        if (TaskList[i].IsFinally) {
+          var card = TaskList.splice(i, 1);
+          TaskList.push(card[0]);
+        }
+      }
+
       //console.log(JSON.stringify(TaskList[0]));
       //如果所有任务完成
       if (that.data.NumberNew == 0 &&
@@ -981,14 +1015,23 @@ Page({
     for (var j = 0; j < FolderList.length; j++) {
       FolderList[j].Total = 0;
       for (var i = 0; i < TaskList.length; i++) {
-        if (TaskList[i].FolderID == FolderList[j].FolderID) {
+        if (TaskList[i].FolderID == FolderList[j].FolderID 
+          && !TaskList[i].IsFinally) {
           FolderList[j].Total++;
         }
       }
     }
+    var FolderListLength=FolderList.length;
     for (var j = 0; j < FolderList.length; j++) {
       if (FolderList[j].Total == 0){
-        FolderList.splice(j--,1);
+        FolderListLength--;
+      }
+    }
+
+    var IsFinallyCount=0;
+    for (var j = 0; j < TaskList.length; j++) {
+      if (TaskList[j].IsFinally){
+        IsFinallyCount++;
       }
     }
 
@@ -998,6 +1041,8 @@ Page({
       IsMore: false,
       IsShowOrder: false,
       FolderList: FolderList,
+      FolderListLength:FolderListLength,
+      IsFinallyCount:IsFinallyCount,
       Title: " ",
     });
   },

pages/main/detail.wxml

@@ -7,15 +7,15 @@
       <block wx:if="{{!Title}}">
         <view class="FlexColumn">
           <view class='panelNumber1'>{{NumberNew}}</view>
-          <view hidden="{{!TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+          <view hidden="{{TaskInfo.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
         </view>
         <view class="FlexColumn">
           <view class='panelNumber1'>{{NumberHistory}}</view>
-          <view hidden="{{!TaskInfo.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+          <view hidden="{{TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
         </view>
         <view class="FlexColumn">
           <view class='panelNumber1'>{{NumberReview}}</view>
-          <view hidden="{{!TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+          <view hidden="{{TaskInfo.IsNew || TaskInfo.IsHistory}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
         </view>
         <view class="FlexColumn">
           <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
@@ -284,16 +284,22 @@
           <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			  </view>
       </view>
-      <view class="FolderTitle" wx:if="{{FolderList.length>1 || FolderList[0].FolderID>0}}">可优先出题的卡单</view>
-      <view class="FolderTitle" wx:if="{{FolderList.length==1 && FolderList[0].FolderID==0}}">任务量里没有卡单</view>
+      <view class="FolderTitle" wx:if="{{FolderListLength>1 || FolderList[0].FolderID>0}}">任务量里包含以下卡单可优先出题</view>
+      <view class="FolderTitle" wx:if="{{(FolderListLength==1 && FolderList[0].FolderID==0) || (FolderListLength==0)}}">当前任务量里没有可优先的卡单</view>
       <view class="FolderItem0 FolderItem FlexRow" wx:for="{{FolderList}}" catchtap="setCurrentFolder" data-folderid='{{item.FolderID}}'
-       wx:key="*this" wx:if="{{item.FolderID!=0}}">
+       wx:key="*this" wx:if="{{item.FolderID!=0 && item.Total!=0}}">
         <view class="FolderItem1">{{item.FolderName}}</view>
         <view class="MenuRight FlexRow">
           <view class="FolderItem2 FolderItem1">{{item.Total}}张</view>  
           <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			  </view>
       </view>
+      <block wx:if="{{IsFinallyCount && IsFinallyCount>0}}">
+        <view class="FolderTitle">提醒：有 {{IsFinallyCount}} 张题卡挪到最后练习</view>
+        <view class="FolderTitle2">中途退出练习，以上信息均会更新，「挪到最后」不会保留。</view>
+      </block>
+      <view class="FolderTitle" wx:if="{{IsFinallyCount && IsFinallyCount>0 && FolderList[0].FolderID==0 && FolderList[0].Total==0}}">点「关闭」练完它们</view>
+      
       <view style="height:60rpx"></view>
     </scroll-view>
     <view class='numberContainerFooter105 FlexRow' style="background-color:{{Color.BackColor}};">
@@ -304,7 +310,7 @@
       <switch class="switch" checked="{{IsFolderPractice}}" bindchange="saveIsFolderPractice"/>
     </view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'  style="background-color:{{Color.BackColor}};z-index:50;">
-      <view>取消</view>
+      <view>关闭</view>
     </view>
   </view>
 </view>

pages/main/detail.wxss

@@ -841,4 +841,10 @@ page{
 .numberContainerFooter10512{
   font-size:20rpx;
   color:rgba(255, 255, 255, 0.6);
+}
+
+.FolderTitle2{
+  margin: 4rpx 0 0 50rpx;
+  font-size:20rpx;
+  color:rgba(255, 255, 255, 0.6);
 }

pages/main/folderEdit.wxml

@@ -29,7 +29,7 @@
   </view>
   <view class="panel5 FlexRow" >
     <view class="panel51 FlexColumn" style="background-color:{{FolderColor}}" bindtap="changeIcon" data-color="{{FolderColor}}" data-icon="{{FolderIcon.ImageUrl}}">
-      <image class="{{FolderIcon.ImageUrl}}" src='{{ImagePath}}web/{{FolderIcon.ImageUrl}}.png' style="width:{{FolderIcon.Width}}rpx;height:{{FolderIcon.Height}}rpx;" />
+      <image class="{{FolderIcon.ImageUrl}}" src='{{ImagePath}}web/{{FolderIcon.ImageUrl}}.png?1' style="width:150rpx;height:150rpx;" />
       <view class="panel511" >
         更换
       </view>

pages/main/folderIcon.wxml

@@ -30,7 +30,7 @@
 
   <view class="panel3 FlexRow" style="background-color:{{BackColor}}">
     <view class="{{item.SelectIcon}} panel31 FlexRow" wx:for="{{IconArr}}" wx:key="index" bindtap="selectIcon" data-index="{{index}}">
-      <image src='{{ImagePath}}web/{{item.ImageUrl}}.png' style="width:{{item.Width}}rpx;height:{{item.Height}}rpx;"/>
+      <image src='{{ImagePath}}web/{{item.ImageUrl}}.png?1' style="width:150rpx;height:150rpx;"/>
     </view>
   </view>
 </view>

pages/main/mainlist.js

@@ -113,6 +113,9 @@ Page({
         PrintID: options.PrintID,
       });
 
+      console.log("options.PrintUserID:"+options.PrintUserID);
+      console.log("app.globalData.userInfo.UserID:"+app.globalData.userInfo.UserID);
+      
       if (options.PrintUserID!=app.globalData.userInfo.UserID){
         wx.showModal({
           title: '提醒',

pages/main/systemsetting.js

@@ -7,6 +7,7 @@ Page({
   data: {
     IsShow: 0,
     HasSound: true,
+    ShowUserID:"000000000"
   },
   onLoad: function (options) {
     var that = this;
@@ -16,6 +17,7 @@ Page({
       ProgramName: app.globalData.ProgramName,
       Version: app.globalData.Version,
       IsShow: app.globalData.userInfo.IsShow,
+      ShowUserID:app.globalData.userInfo.ShowUserID,
     });
 
     common.getStorageValue(this, "HasSound", true, function () {

pages/main/systemsetting.wxml

@@ -20,7 +20,7 @@
   <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
     重启小程序
   </view>
-  <view class='lineFooter'></view>
+  <view class="text2">{{ShowUserID}}</view>
   <view style='width:100%;height:50rpx;'></view>
   <text class='text1' bindtap="gotoPayCustom">©2019 秒过™学习\n唱意教育微信小程序 版本 {{Version}}</text>
   <view style='width:100%;height:100rpx;'></view>

pages/main/systemsetting.wxss

@@ -58,4 +58,11 @@
   font-size:24rpx;
   text-align: center;
   color:#787878;
+}
+
+.text2{
+  font-size:24rpx;
+  text-align: center;
+  color:#787878;
+  margin:50rpx 0 0 0;
 }

pages/other/newuser.js

@@ -16,23 +16,11 @@ Page({
   onLoad: function (options) {
     var that = this;
     backgroundAudioManager = wx.getBackgroundAudioManager();
-    wx.getSetting({
-      success(res) {
-        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
-          that.setData({
-            Containnerheight: main.getWindowHeight(),
-          });
-      
-          that.init(options.index);
-
-        }
-        else {
-          wx.navigateTo({
-            url: '../index/accredit',
-          });
-        }
-      }
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
     });
+      
+    that.init(options.index);
   },
   init: function (index) {
     var that = this;
@@ -127,6 +115,11 @@ Page({
         backgroundColorTop: "#ffffff",
         backgroundColor: "#ffffff",
       });
+      if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow == 1){
+        wx.navigateTo({
+          url: '../index/accredit',
+        });
+      }
     });
   },
   copyManager: function () {

pages/test/index.js

@@ -8,9 +8,10 @@ var testGradeArr=constant.testGradeArr;
 Page({
   data: {
     List: [],
-    IsSelectGrade: false,
     TestSelectGrade: 0,
-
+    IsIPhoneX: app.globalData.IsIPhoneX,
+    IsIPad:app.globalData.IsIPad,
+    ScrollLeft:0,
   },
   onLoad: function (options) {
     if (options.UserID){
@@ -21,6 +22,7 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      Subject:"CHN",
     });
 
     main.getHanzi(function (arr) {
@@ -34,21 +36,19 @@ Page({
   onShow: function () {
     this.getTestReportList();
   },
-  showSelectGrade: function () {
-    var that = this;
-    that.setData({
-      IsSelectGrade: true,
-    });
-  },
-  closeSelectGrade: function () {
+  selectSubject:function(e){
+    var subject=e.currentTarget.dataset.type;
     var that = this;
     that.setData({
-      IsSelectGrade: false,
+      Subject: subject,
     });
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
-    if (e.currentTarget.dataset.type=="Shici"){
+    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;
@@ -137,6 +137,7 @@ Page({
           var item = that.data.GradeArr[j];
           for (var k = 0; k < item.List.length; k++) {
             item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
+            item.List[k].NameStr=item.List[k].Name.replace("语文","");
           }
         }
 
@@ -154,6 +155,27 @@ Page({
               }
             }
           });
+
+          if (that.data.TestSelectGrade<9){
+            that.setData({
+              Subject:"CHN",
+            });
+            if (that.data.TestSelectGrade>4){
+              that.setData({
+                ScrollLeft:500,
+              });
+            }
+          }
+          else{
+            that.setData({
+              Subject:"ENG",
+            });
+            if (that.data.TestSelectGrade>11){
+              that.setData({
+                ScrollLeft:500,
+              });
+            }
+          }
         });
       }
     });
@@ -167,7 +189,6 @@ Page({
       TestSelectGrade: index,
       GradeArr: this.data.GradeArr,
     });
-    this.closeSelectGrade();
     wx.setStorageSync("TestSelectGrade", index);
   },
   gotoTestReportInfo: function (e) {
@@ -183,6 +204,12 @@ Page({
   onUnload: function () {
     wx.removeStorageSync("UserTestReport");
   },
+  gotoReLaunch: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.reLaunch({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/test/index.wxml

@@ -1,37 +1,61 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTop FlexRow" bindtap="showSelectGrade">
+  <!-- <view class="panelTop FlexRow" bindtap="showSelectGrade">
     <view class="panelTop1">{{GradeArr[TestSelectGrade].Name2}}</view>
     <view class="panelTop2 FlexRow">
       <image class="universalpic_menu_blue_26x26" src="../images/universalpic_menu_blue_26x26.png"></image>
       <view>更改年级科目</view>
     </view>
+  </view> -->
+  <view class="panelTop FlexRow">
+    <view class="panelTop1 FlexColumn" catchtap="selectSubject" data-type="CHN">
+      <view>语文</view>
+      <view class="panelTopLine" wx:if="{{Subject=='CHN'}}"></view>
+      <view class="panelTopLine0 panelTopLine" wx:if="{{Subject!='CHN'}}"></view>
+    </view>
+    <view class="panelTop1 FlexColumn" catchtap="selectSubject" data-type="ENG">
+      <view>英语</view>
+      <view class="panelTopLine" wx:if="{{Subject=='ENG'}}"></view>
+      <view class="panelTopLine0 panelTopLine" wx:if="{{Subject!='ENG'}}"></view>
+    </view>
   </view>
   <view class="panelLine"></view>
-  <scroll-view scroll-x class="panelCard FlexRow">
-    <view class="Card" wx:for="{{GradeArr[TestSelectGrade].List}}" wx:key="index" bindtap="goto" data-type="{{item.Type}}" data-bookid="{{item.ID}}" data-name1="{{GradeArr[TestSelectGrade].Name}} {{item.Name}} {{item.Name2}}">
-      <image class="examine_subject_a001" src="{{item.Image}}"></image>
-      <view class="Card1">{{item.Name}}</view>
-      <view class="Card2">{{item.Name2}}</view>
-      <view class="Card3">检验过</view>
-      <view class="Card4 FlexRow">
-        <view class="Progress FlexRow">
-          <view class="Progress1" style="width:{{item.Finished}}%;"></view>
+  <view class="panel FlexColumn">
+    <scroll-view scroll-x class="panelTab FlexRow" scroll-left="{{ScrollLeft}}">
+      <view class="Tab0"></view>
+      <view class="Tab{{item.Select}} Tab" wx:for="{{GradeArr}}" wx:key="index" wx:if="{{item.Type==Subject}}"
+       catchtap='onSelectGrade' data-value='{{index}}'>
+        {{item.Name}}
+      </view>
+    </scroll-view>
+    <scroll-view scroll-x class="panelCard FlexRow">
+      <view class="Card0"></view>
+      <view class="Card" wx:for="{{GradeArr[TestSelectGrade].List}}" wx:key="index" bindtap="goto"
+        data-type="{{item.Type}}" data-bookid="{{item.ID}}"
+        data-name1="{{GradeArr[TestSelectGrade].Name}} {{item.Name}} {{item.Name2}}">
+        <image class="examine_subject_a001" src="{{item.Image}}"></image>
+        <view class="Card1">{{item.NameStr}}</view>
+        <view class="Card2">{{item.Name2}}</view>
+        <view class="Card3">检验过</view>
+        <view class="Card4 FlexRow">
+          <view class="Progress FlexRow">
+            <view class="Progress1" style="width:{{item.Finished}}%;"></view>
+          </view>
+          <view class="Number">{{item.Finished}}%</view>
         </view>
-        <view class="Number">{{item.Finished}}%</view>
       </view>
-    </view>
-    <view class="Card0"></view>
-  </scroll-view>
+    </scroll-view>
+  </view>
+
   <view class="panelList FlexColumn">
     <view class="panelListTitle FlexRow">
-      <view>报告汇总</view>
+      <view>检验报告</view>
     </view>
     <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 && index<20}}" wx:for="{{TestReport}}" wx:key="index">
+    <block wx:if="{{TestReport.length>0 && index<10}}" wx:for="{{TestReport}}" wx:key="index">
 
       <view class="Item FlexRow" bindtap="gotoTestReportInfo" data-id="{{item.ID}}">
         <view class="Item1 FlexColumn">
@@ -45,10 +69,14 @@
         <view class="Item2 FlexColumn">
           <view class="ItemDate">{{item.CreateTime}}</view>
           <view class="ItemNumber FlexRow">
-            <image wx:if="{{item.TestType=='read' && item.IsFinished==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
-            <image wx:if="{{item.TestType=='read' && item.IsFinished==0}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
-            <image wx:if="{{item.TestType=='write' && item.IsFinished==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
-            <image wx:if="{{item.TestType=='write' && item.IsFinished==0}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
+            <image wx:if="{{item.TestType=='read' && item.IsFinished==1}}" class="examine_willread_gray_22x22"
+              src="../images/examine_willread_green_22x22.png"></image>
+            <image wx:if="{{item.TestType=='read' && item.IsFinished==0}}" class="examine_willread_gray_22x22"
+              src="../images/examine_willread_gray_22x22.png"></image>
+            <image wx:if="{{item.TestType=='write' && item.IsFinished==1}}" class="examine_willwrite_gray_22x22"
+              src="../images/examine_willwrite_green_22x22.png"></image>
+            <image wx:if="{{item.TestType=='write' && item.IsFinished==0}}" class="examine_willwrite_gray_22x22"
+              src="../images/examine_willwrite_gray_22x22.png"></image>
             <image class="universalpic_checked_gray_14x12" src="../images/universalpic_checked_gray_14x12.png"></image>
             <view class="Number2">{{item.TestRightStr.length}}</view>
             <image class="universalpic_wrong_gray_12x12" src="../images/universalpic_wrong_gray_12x12.png"></image>
@@ -63,30 +91,28 @@
     </block>
 
   </view>
+  <view style="width:100%;height:150rpx;"></view>
 
-</view>
-
-<!-- 更多功能 -->
-<view wx:if="{{IsSelectGrade}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="numberContainerFooter1 FlexColumn">
-    <view class='lineFooter'></view>
-    <view class='numberContainerFooter101 FlexRow'>
-      <view>
-        <image class="universalpic_people_black_30x30" src='../images/universalpic_people_black_30x30.png' />
+  <view class='panelBottom FlexColumn' catchtap="">
+    <view class='panelBottom1 FlexRow'>
+      <view class='panelBottom11 FlexColumn'>
+        <view class='text5'>检验</view>
       </view>
-      <view class='numberContainerFooter11 FlexColumn'>
-        <view class='numberContainerFooter111'>选择年级科目</view>
-        <view class='numberContainerFooter113'>目前仅小学初中阶段如下科目开放试用</view>
-        <view class='numberContainerFooter112 FlexRow'>
-          <view class='numberContainerFooter1121{{item.Select}}' wx:for="{{GradeArr}}" wx:key="index" catchtap='onSelectGrade' data-value='{{index}}'>{{item.Name2}}</view>
-        </view>
-        <view style="width:100%;height:40rpx;"></view>
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../main/default">
+        <view>练习</view>
+      </view>
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../main/add?type=add&id=0">
+        <image class="tabbar_add_red_70x70" src='../images/tabbar_add_red_70x70.png' />
+      </view>
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../main/cardmain">
+        <view>题卡</view>
+      </view>
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../other/userbook">
+        <view>手册</view>
       </view>
     </view>
+
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
-  
-  <view class='lineFooter'></view>
-  <view class="numberContaineFooter FlexRow" catchtap='closeSelectGrade'>
-    <view>关闭</view>
-  </view>
+
 </view>

pages/test/index.wxss

@@ -3,18 +3,27 @@
 }
 .panelTop{
   width:100%;
-  justify-content: space-between;
-  height:106rpx;
+  height:110rpx;
   background-color: #fff;
   position: fixed;
   z-index: 10;
   top:0;
   border-bottom:1rpx solid #d2d2d2; 
+  align-items: flex-end;
 }
 
 .panelTop1{
+  width:160rpx;
   font-size:32rpx;
-  margin-left: 30rpx;
+}
+.panelTopLine{
+  width:160rpx;
+  height:14rpx;
+  margin-top: 20rpx;
+  background-color: #1E1E1E;
+}
+.panelTopLine0{
+  background-color: #fff;
 }
 
 .panelTop2{
@@ -31,10 +40,43 @@
 
 .panelLine{
   width:100%;
-  height:106rpx;
+  height:110rpx;
+  background-color: #f0f0f0;
+}
+.panel{
+  width:100%;
+  height:533rpx;
   background-color: #f0f0f0;
 }
 
+.panelTab{
+  width:100%;
+  background-color: #F0F0F0;
+  display: flex;
+  white-space: nowrap;
+}
+
+.Tab{
+  height:60rpx;
+  line-height: 60rpx;
+  margin:30rpx 20rpx 0 0;
+  font-size:24rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+  display: inline-block;
+  text-align: center;
+  padding:0 20rpx;
+}
+.Tab0{
+  width:20rpx;
+  height:60rpx;
+  display: inline-block;
+}
+.TabSelect{
+  background-color: #5282FA;
+  color:#fff;
+}
+
 .panelCard{
   width:100%;
   height:443rpx;
@@ -49,11 +91,11 @@
   border-radius: 10rpx;
   background-color: #fff;
   display: inline-block;
-  margin: 50rpx 0 0 30rpx;
+  margin: 45rpx 30rpx 0 0;
   position: relative;
 }
 .Card0{
-  width:30rpx;
+  width:20rpx;
   height:343rpx;
   display: inline-block;
 }
@@ -324,4 +366,58 @@
   margin: 30rpx 30rpx 0 0;
   font-size:24rpx;
   padding: 0 30rpx;
-}
+}
+
+/* 底部导航************************* */
+.panelBottom {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+}
+.panelBottom1 {
+  width: 100%;
+  background-color: #fff;
+  border-top:1rpx solid #d2d2d2;
+}
+
+.panelBottom11 {
+  color:#9B9B9B;
+  height:98rpx;
+  width:150rpx;
+  font-size:36rpx;
+}
+
+.panelBottom12 {
+  color:#9B9B9B;
+  height:98rpx;
+  width:300rpx;
+  font-size:36rpx;
+}
+
+.text5{
+  color:#1e1e1e;
+}
+.text51{
+  width:220rpx;
+  text-align: right;
+}
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+  margin-right:30rpx;
+}
+.universalpic_fav_default_gray_26x24{
+  width:26rpx;
+  height:24rpx;
+  margin-right: 20rpx;
+}
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
+}
+.tabbar_add_red_70x70 {
+  width: 70rpx;
+  height: 70rpx;
+}

pages/test/item.js

@@ -181,6 +181,7 @@ Page({
       TestType: options.testtype,
       TestName1: options.name1,
       TestName2: options.name2,
+      UnitID:options.unitsid,
     });
 
     var wordStr="";
@@ -216,6 +217,10 @@ Page({
           if (options.testtype=="read"){
             taskInfo.TagWidth=212;
             taskInfo.FontSize=108;
+            if (taskInfo.Content[1].Content.length>=16)
+              taskInfo.FontSize=48;
+            else if (taskInfo.Content[1].Content.length>=12)
+              taskInfo.FontSize=64;
           }
           else{
             taskInfo.TagWidth=186;
@@ -455,6 +460,8 @@ Page({
       TestTask.TestType = this.data.TestType;
       TestTask.IsFinished = isFinished;
       TestTask.Name = this.data.TestName1 + "#" + this.data.TestName2;
+      if (this.data.UnitID)
+        TestTask.Name+="#"+this.data.UnitID
       TestTask.List = TaskList;
       TestTask.BookID=this.data.BookID;
       wx.setStorageSync("TestTask", TestTask);

pages/test/list.js

@@ -21,6 +21,8 @@ Page({
       if (!arr) {
         wx.removeStorageSync("HanziUpdateTime");
         wx.removeStorageSync("HanziAll");
+        wx.removeStorageSync("NewConceptEngList");
+        wx.removeStorageSync("CambridgeEngList");
         main.getHanzi(function (arr) {
           that.init(options);
         });
@@ -39,7 +41,11 @@ Page({
     });
     var arr = [];
     var listType="hanzi";
-    if (that.data.BookID > 120){
+    if (that.data.BookID > 130){
+      arr = wx.getStorageSync("CambridgeEngList");
+      listType="english";
+    }
+    else if (that.data.BookID > 120){
       arr = wx.getStorageSync("NewConceptEngList");
       listType="english";
     }

pages/test/list.wxml

@@ -1,6 +1,8 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 	<view class="text1" wx:if="{{ListType!='english'}}">请对照课本选择字组</view>
-	<view class="text1" wx:if="{{ListType=='english'}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
+	<view class="text1" wx:if="{{ListType=='english' && 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<140}}"></view>
 
 	<block wx:for="{{List}}" wx:key="index">
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">

pages/test/list.wxss

@@ -8,6 +8,9 @@
   color:#787878;
   font-weight: 400;
 }
+.textNull{
+  margin: 30rpx 0 0 0;
+}
 
 .PanelItem{
   width:100%;

pages/test/report.js

@@ -96,6 +96,8 @@ Page({
       if (TestTask.Name && TestTask.Name.indexOf("#") > 0) {
         name = TestTask.Name;
         name = name.substr(name.indexOf("#") + 1);
+        if (name.indexOf("#")>0)
+          name = name.substr(0,name.indexOf("#"));
         if (TestTask.TestType == "read")
           name += " 会念";
         else if (TestTask.TestType == "recite")

pages/test/wordlist.js

@@ -25,15 +25,17 @@ Page({
         arr= wx.getStorageSync("EnglishAll");
       else if (bookid>120 && bookid<130)
         arr= wx.getStorageSync("NewConceptEngList");
+      else if (bookid>=130 && bookid<140)
+        arr= wx.getStorageSync("CambridgeEngList");
     }
     arr = JSON.parse(arr);
     var unitsid = Number(options.unitsid);
-    var id = Number(options.id);
+    var id = options.id;
     for (var i = 0; i < arr.length; i++) {
       if (arr[i].ID == unitsid) {
         var list = arr[i].Units;
         for (var j = 0; j < list.length; j++) {
-          if (list[j].ID==id){
+          if (list[j].ID.toString()==id.toString()){
             unitsName = list[j].Name;
             words = list[j].Words;
           }

project.config.json

@@ -36,7 +36,7 @@
     "useApiHostProcess": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.11.3",
+  "libVersion": "2.15.0",
   "appid": "wx84b3feac6069eec3",
   "projectname": "miaoguo_master",
   "debugOptions": {

utils/constant.js

@@ -215,6 +215,7 @@ module.exports = {
   testGradeArr: [{
     Name: "一年级",
     Name2: "语文一年级",
+    Type:"CHN",
     Select: "Select",
     List: [{
       ID: 1,
@@ -235,7 +236,7 @@ module.exports = {
     }, {
       ID: 25,
       Type: "Shici",
-      Name: "语文古诗词",
+      Name: "语文古诗文",
       Name2: "上学期",
       Finish: 0,
       Total: 1,
@@ -269,6 +270,7 @@ module.exports = {
   {
     Name: "二年级",
     Name2: "语文二年级",
+    Type:"CHN",
     Select: "",
     List: [{
       ID: 3,
@@ -323,6 +325,7 @@ module.exports = {
   {
     Name: "三年级",
     Name2: "语文三年级",
+    Type:"CHN",
     Select: "",
     List: [{
       ID: 5,
@@ -377,6 +380,7 @@ module.exports = {
   {
     Name: "四年级",
     Name2: "语文四年级",
+    Type:"CHN",
     Select: "",
     List: [{
       ID: 7,
@@ -431,6 +435,7 @@ module.exports = {
   {
     Name: "五年级",
     Name2: "语文五年级",
+    Type:"CHN",
     Select: "",
     List: [{
       ID: 9,
@@ -486,6 +491,7 @@ module.exports = {
   {
     Name: "六年级",
     Name2: "语文六年级",
+    Type:"CHN",
     Select: "",
     List: [
       {
@@ -526,6 +532,7 @@ module.exports = {
   {
     Name: "七年级",
     Name2: "语文七年级",
+    Type:"CHN",
     Select: "",
     List: [
       {
@@ -550,6 +557,7 @@ module.exports = {
   {
     Name: "八年级",
     Name2: "语文八年级",
+    Type:"CHN",
     Select: "",
     List: [
       {
@@ -574,6 +582,7 @@ module.exports = {
   {
     Name: "九年级",
     Name2: "语文九年级",
+    Type:"CHN",
     Select: "",
     List: [
       {
@@ -596,8 +605,9 @@ module.exports = {
     ]
   },
   {
-    Name: "英语常用单词",
-    Name2: "英语常用单词",
+    Name: "英语基础",
+    Name2: "英语基础",
+    Type:"ENG",
     Select: "",
     List: [
       {
@@ -608,7 +618,16 @@ module.exports = {
         Finish: 0,
         Total: 26,
         Image: "../images/examine_subject_b005.png"
-      },{
+      },
+    ]
+  },
+  {
+    Name: "英语常用单词",
+    Name2: "英语常用单词",
+    Type:"ENG",
+    Select: "",
+    List: [
+      {
         ID: 101,
         Type: "Word",
         Name: "常用单词1",
@@ -657,6 +676,7 @@ module.exports = {
   },{
     Name: "新概念英语单词",
     Name2: "新概念英语单词",
+    Type:"ENG",
     Select: "",
     List: [
       {
@@ -696,6 +716,30 @@ module.exports = {
         Image: "../images/examine_subject_c004.png"
       }
     ]
+  },{
+    Name: "剑桥英语单词",
+    Name2: "剑桥英语单词",
+    Type:"ENG",
+    Select: "",
+    List: [
+      {
+        ID: 131,
+        Type: "Word",
+        Name: "KET分类单词",
+        Name2: "词汇528",
+        Finish: 0,
+        Total: 17,
+        Image: "../images/examine_subject_c001.png"
+      },{
+        ID: 132,
+        Type: "Word",
+        Name: "PET分类单词",
+        Name2: "词汇1374",
+        Finish: 0,
+        Total: 54,
+        Image: "../images/examine_subject_c002.png"
+      }
+    ]
   }],
   arrPinyin: [
     ['a1', 'ā', ['阿']],

utils/main.js

@@ -873,34 +873,33 @@ function GetTestReportInfo(reportid, callback) {
 
       if (name1[0].indexOf("英语") >= 0) {
         //console.log("英语");
-        var arrEnglist = wx.getStorageSync("EnglishAll");
-        if (arrEnglist)
-          arrEnglist = JSON.parse(arrEnglist);
-        else
-          arrEnglist = [];
-        
+        var wordStr = "";
         var userTestReportInfo = UserTestReport[n];
         var bookid = userTestReportInfo.BookID;
 
-        var wordStr = "";
-        if (name1[1]=="英文字母"){
-          bookid=100;
-          wordStr="A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
-        }
-        else{
-          for (var i = 0; i < arrEnglist.length; i++) {
-            if (arrEnglist[i].Name == name1[1]) {
-              for (var j = 0; j < arrEnglist[i].Units.length; j++) {
-                if (arrEnglist[i].Units[j].Name == name2) {
-                  wordStr = arrEnglist[i].Units[j].Words.join(",");
-                  break;
+        
+        var arrEnglist = [];
+        if (bookid<120){
+          arrEnglist = wx.getStorageSync("EnglishAll");
+          arrEnglist = JSON.parse(arrEnglist);
+          if (name1[1]=="英文字母"){
+            bookid=100;
+            wordStr="A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
+          }
+          else{
+            for (var i = 0; i < arrEnglist.length; i++) {
+              if (arrEnglist[i].Name == name1[1]) {
+                for (var j = 0; j < arrEnglist[i].Units.length; j++) {
+                  if (arrEnglist[i].Units[j].Name == name2) {
+                    wordStr = arrEnglist[i].Units[j].Words.join(",");
+                    break;
+                  }
                 }
               }
             }
           }
         }
-        
-        
+
         var tempRight = "," + userTestReportInfo.TestRightStr + ",";
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
@@ -910,6 +909,9 @@ function GetTestReportInfo(reportid, callback) {
         if (bookid>120 && bookid<=124){
           unitsid=Number(name2.replace("Lesson ",""));
         }
+        else if (bookid>130 && bookid<=140 && 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) {
@@ -1118,8 +1120,10 @@ function getHanzi(callback) {
 
         var arrEng = common.Decrypt(data.EngList);
         var arrNewConceptEngList = common.Decrypt(data.NewConceptEngList);
+        var arrCambridgeEngList = common.Decrypt(data.CambridgeEngList);
         wx.setStorageSync("EnglishAll", arrEng);
         wx.setStorageSync("NewConceptEngList", arrNewConceptEngList);
+        wx.setStorageSync("CambridgeEngList", arrCambridgeEngList);
         wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
       } else {
         arr = wx.getStorageSync("HanziAll");

utils/util.js

@@ -367,6 +367,10 @@ function Trim(str) { //删除左右两端的空格
   return str.replace(/(^\s*)|(\s*$)/g, "");
 }
 
+function IsNumber(value) {//判断是否是数字，true：是，false：不是
+  return !isNaN(value);
+}
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -388,6 +392,7 @@ module.exports = {
   addDate: addDate,
   diffDate: diffDate,
   Trim: Trim,
+  IsNumber:IsNumber,
   checkIsArray: checkIsArray,
   formatDateENG: formatDateENG,
 }