2.4.2

app.js

@@ -1,10 +1,10 @@
 App({
   globalData: {
-    Version: "2.4.0",
-    //IsProduction: true,
+    Version: "2.4.2",
+    IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
-    ShareImage: '../images/program_screenshot_main.png',
+    ShareImage: '../images/program_share-a01.png',
     ProgramID: 166,
     ProgramName: "秒过学习",
     AppID: "wx84b3feac6069eec3",
@@ -44,7 +44,8 @@ App({
     TempStr:"",//临时字符串。用于不能传递的一些参数
     TempStr2:"",//临时字符串。用于不能传递的一些参数
     FolderList:[],//卡单列表
-
+    TestGradeList:[],//知识检验列表
+    TestTask:[],//知识检验结果
     MemoryLevel: 0,//记忆水平
     ColorIndex: 0,//色彩方案
     ClickType: 0,//点击方案

app.json

@@ -105,6 +105,9 @@
         "knowledge/library",
         "knowledge/package",
         "knowledge/unit",
+        "knowledge/report",
+        "knowledge/build",
+        "knowledge/examine",
         "knowledge/index"
       ]
     }

pages/main/cardmain.js

@@ -27,7 +27,7 @@ Page({
     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){
+    if (new Date().getFullYear()>=2025 && year<2025 && month<3){
       that.setData({
         IsYearReport: true,
       });

pages/main/cardmain.wxml

@@ -52,7 +52,7 @@
   </view>
   <!-- 年度报告 -->
   <block wx:if="{{IsYearReport}}">
-    <image class="report_2024-banner" src='{{ImagePath}}web/report_2023-banner.png' bindtap="goto" data-url="../other/annualreport" />
+    <image class="report_2024-banner" src='{{ImagePath}}web/report_2024-banner.png' bindtap="goto" data-url="../other/annualreport" />
   </block>
 
   <view class="panelItem3 FlexRow">

pages/main/cardmain.wxss

@@ -168,7 +168,7 @@
 
 .report_2024-banner {
   width: 710rpx;
-  height: 280rpx;
+  height: 180rpx;
   margin: 30rpx 0 0 0;
 }
 

pages/main/default.wxml

@@ -34,7 +34,8 @@
     <image class="study_index_footer" src='../images/practise_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>
-      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/test/index">
+      <!-- <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/test/index"> -->
+      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/knowledge/index">
         <view>检验</view>
       </view>
       <view class='panelBottom11 FlexColumn'>

pages/other/annualreport.wxml

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

pages/other/annualreport.wxss

@@ -8,7 +8,7 @@ page{
 
 .panelTop{
   width:670rpx;
-  height:322rpx;
+  height:320rpx;
   margin-top: 40rpx;
 }
 

pages_test/knowledge/build.js

@@ -0,0 +1,29 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    BuildFinished:1,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_test/knowledge/build.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },
+  "navigationStyle": "custom",
+  "backgroundColor": "#fff"
+}

pages_test/knowledge/build.wxml

@@ -0,0 +1,31 @@
+<!--卡单生成中 -->
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn">
+    <block wx:if="{{!BuildFinished}}">
+      <view class="panel11">生成中</view>
+      <view class="panel12">请稍等</view>
+    </block>
+    <block wx:if="{{BuildFinished}}">
+      <view class="panel11">已完成</view>
+      <view class="panel12">生成7张题卡</view>
+    </block>
+  </view>
+  <view class="panel2 FlexRow">
+    <view wx:if="{{!BuildFinished}}" class="panel21">69%</view>
+    <block wx:if="{{BuildFinished}}">
+      <view class="panel22 FlexColumn">
+        <image src="../images/sysIcon_b06.png" class="sysIcon_b06"></image>
+        <view class="panel221">关闭</view>
+      </view>
+      <view class="panel22 panel23 FlexColumn">
+        <image src="../images/sysIcon_a04.png" class="sysIcon_b06"></image>
+        <view class="panel221">题卡管理</view>
+      </view>
+    </block>
+  </view>
+  <view class="panel3">
+  </view>
+  <view class="panel4 FlexColumn">
+    <image src="" class="panel41"></image>
+  </view>
+</view>

pages_test/knowledge/build.wxss

@@ -0,0 +1,77 @@
+.container {
+  background-color: #AAA8A5;
+}
+
+.panel1 {
+  width: 100%;
+  background-color: #fff;
+}
+
+.panel11 {
+  font-weight: 400;
+  font-size: 36rpx;
+  color: #2E2E2E;
+  margin-top: 248rpx;
+}
+
+.panel12 {
+  font-size: 48rpx;
+  color: #2E2E2E;
+  margin-bottom: 86rpx;
+}
+
+.panel2 {
+  width: 100%;
+  height: 283rpx;
+  background-color: #D0CFCD;
+}
+
+.panel21 {
+  font-family: Teko-Bold;
+  font-size: 96rpx;
+  color: #4D4D4D;
+}
+
+.panel22 {
+  width: 380rpx;
+  height: 140rpx;
+  background: #FFFFFF;
+  box-shadow: 0 6rpx 0 0 rgba(0, 0, 0, 0.10);
+  border-radius: 20rpx;
+  font-family: PingFangSC-Semibold;
+  font-size: 24rpx;
+  color: #2E2E2E;
+  align-items: flex-start;
+}
+
+.panel23 {
+  width:220rpx;
+  margin-left: 30rpx;
+}
+
+.sysIcon_b06 {
+  width: 20rpx;
+  height: 20rpx;
+  margin: 0 0 26rpx 34rpx;
+}
+.panel221{
+  margin: 0 0 0 30rpx;
+}
+
+.panel3 {
+  width: 100%;
+  height: 90rpx;
+  background-image: linear-gradient(180deg, #63615F 0%, #989692 100%);
+}
+
+.panel4 {
+  width: 100%;
+}
+
+.panel41 {
+  width: 260rpx;
+  height: 260rpx;
+  margin-top: 120rpx;
+  background-color: #fff;
+  border-radius: 50%;
+}

pages_test/knowledge/examine.js

@@ -0,0 +1,366 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var TaskList = [];
+
+var isPlaying = false;
+
+var innerAudioContext1;
+var timeoutPlayAudio;
+var tempPlayUrl = "";
+var tempPlayUrlLocal = "";
+var timeoutEveryCard = 0;
+var isFinished=0;
+
+Page({
+  data: {
+    IsSelect: true,
+    Color: { ID: 1 },
+  },
+  onReady: function () {
+    var that = this;
+    innerAudioContext1 = wx.createInnerAudioContext();
+    innerAudioContext1.onPlay(() => {
+      console.log('开始播放')
+    });
+    innerAudioContext1.onError((res) => {
+      console.log("innerAudioContext1.errMsg:" + res.errMsg);
+      console.log("innerAudioContext1.errCode:" + res.errCode);
+      that.audioCtx.setSrc(tempPlayUrl);
+      that.audioCtx.play();
+    });
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Category:options.category1,
+      BookID:options.bookid,
+      LibraryID:options.libraryid,
+      UnitID:options.unitsid,
+      LibraryName:options.LibraryName,
+      BookName:options.BookName,
+      UnitName:options.UnitName,
+      TestTypeName:options.TestTypeName,
+      IsShowAnswer: [0, 0],
+      Color: main.getDetailColor(app.globalData.ColorIndex),
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init(options);
+    that.getColor();
+    
+    this.audioCtx = wx.createAudioContext('myAudio');
+
+    isFinished = 0;
+
+    if (app.globalData.BaiduToken === "")
+      main.getBaiduToken();
+  },
+  init:function(options){
+    var that = this;
+    that.setData({
+      TaskInfo: {},
+      TestType: options.testtype,
+    });
+    main.getData('GetMiaoguoTestExamine?UserID='+app.globalData.userInfo.UserID+'&Category1='+options.category1+'&BookID='+options.bookid+'&Name='+options.UnitName+'&UnitID='+options.unitsid+'&TestType='+options.testtype, function (data) {
+      if (data) {
+        TaskList=data;
+        TaskList = common.randomArray(TaskList);
+        that.setData({
+          TaskInfo: TaskList[0],
+          TaskLength: TaskList.length,
+          CurrentIndex: 0,
+        });
+        //debugger;
+        common.getStorageValue(that, "TestAutioPlay", 1, function () { 
+          if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+            that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+          }
+        });
+      }
+    });
+  },
+  //进入下一张题卡
+  gotoNext: function (e) {
+    var that = this;
+    that.setData({
+      IsShowAnswer: [0, 0],
+    });
+
+    var btnnumber = e.currentTarget.dataset.btnnumber;
+    
+    if (btnnumber>="0"){
+      that.setSoundFile(0);
+      if (TaskList[that.data.CurrentIndex]){
+        if (btnnumber==="4")
+          TaskList[that.data.CurrentIndex].Result = 1;
+        else if (btnnumber === "0")
+          TaskList[that.data.CurrentIndex].Result = -1;
+        else if (btnnumber === "1")
+          TaskList[that.data.CurrentIndex].Result = 0;
+      }
+      
+      that.data.CurrentIndex++;
+    }
+    else{
+      that.setSoundFile(2);
+      if (TaskList[that.data.CurrentIndex] && TaskList[that.data.CurrentIndex].Result)
+        TaskList[that.data.CurrentIndex].Result=null;
+      that.data.CurrentIndex--;
+    }
+    //结束
+    if (that.data.CurrentIndex>=TaskList.length){
+      isFinished = 1;
+      that.onFinished();
+    }
+    else if (that.data.CurrentIndex <0) {
+      wx.showToast({
+        title: '到开始了',
+      });
+      that.setSoundFile(-1);
+    }
+    else{
+      
+      that.setData({
+        TaskInfo: TaskList[that.data.CurrentIndex],
+        CurrentIndex: that.data.CurrentIndex,
+      });
+      if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+        that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+      }
+    }
+
+    //console.log(that.data.TestType);
+    //console.log(JSON.stringify(that.data.TaskInfo));
+  },
+  onPullDownRefresh: function () {
+    var that = this;
+    that.setData({
+      IsShowAnswer: [0, 0],
+    });
+    wx.stopPullDownRefresh();
+  },
+  onShowAnswer: function (e) {
+    var that = this;
+    var clicktype = e.currentTarget.dataset.type;
+    if (!(clicktype && clicktype == "all" && app.globalData.ClickType == 0)) {
+      that.setData({
+        IsShowAnswer: [1, 1],
+      });
+
+      if (that.data.TestAutioPlay == 1 && that.data.TestType == "read") {
+        if (TaskList[that.data.CurrentIndex] && TaskList[that.data.CurrentIndex].ReadString)
+          that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+      }
+    }
+  },
+  getColor: function () {
+    var that = this;
+    if (wx.setBackgroundColor) {
+      wx.setBackgroundColor({
+        backgroundColor: that.data.Color.BackColor,
+        backgroundColorTop: that.data.Color.BackColor,
+        backgroundColorBottom: that.data.Color.BackColor,
+      })
+    }
+    if (wx.setNavigationBarColor) {
+      wx.setNavigationBarColor({
+        frontColor: "#ffffff",
+        backgroundColor: that.data.Color.BackColor,
+      })
+    }
+  },
+  playSound: function (e) {
+    clearTimeout(timeoutPlayAudio);
+
+    var that = this;
+    var str = e.currentTarget.dataset.content;
+    if (str){
+      var url;
+      if (str == "recorder") {
+        url = e.currentTarget.dataset.soundmark;
+      }
+      else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0 || str.indexOf("baidu.com")>0 || str.indexOf("iciba.com")>0 || str.indexOf("myqcloud.com")>0) {
+        str = str.replace("英 [", "[");
+        str = str.replace("美 [", "[");
+        url = e.currentTarget.dataset.soundmark;
+        if (!url)
+          url=str;
+      }
+      else if (str.indexOf("pinyin")>0){
+          url=str;
+      }
+      else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+        var soundmark = e.currentTarget.dataset.soundmark;
+        if (soundmark && soundmark.indexOf("http") < 0) {
+          url = app.globalData.audioUrlBaidu;
+          url = url.replace("[token]", app.globalData.BaiduToken);
+          url = url.replace("[word]", soundmark);
+        }
+        else {
+          url = soundmark;
+        }
+      }
+      else {
+        url = app.globalData.audioUrlBaidu;
+        url = url.replace("[token]", app.globalData.BaiduToken);
+        url = url.replace("[word]", str);
+      }
+  
+  
+      if (url.indexOf("http") > 0)
+        url = url.substr(url.indexOf("http"));
+      if (url.indexOf("'") > 0)
+        url = common.ReplaceAllString(url, "'", "");
+      url = url.replace("http://", "https://");
+  
+      url = encodeURI(url);
+      if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
+        isPlaying = true;
+        timeoutPlayAudio = setTimeout(function () {
+          isPlaying = false;
+        }, 60000);
+  
+        wx.showLoading({
+          title: '音频下载中',
+          mask: true,
+        });
+        setTimeout(function () {
+          wx.hideLoading();
+        }, 30000);
+  
+        wx.downloadFile({
+          url: url,
+          success(res) {
+            wx.hideLoading();
+            tempPlayUrlLocal = res.tempFilePath;
+            innerAudioContext1.src = res.tempFilePath;
+            innerAudioContext1.play();
+            
+            tempPlayUrl = url;
+            
+          },
+          fail(err) {
+            wx.hideLoading();
+            if (url.indexOf("sp0.baidu.com")>0){
+              var soundmark=url.substring(url.indexOf("text=")+5,url.indexOf("&spd"));
+              url = app.globalData.audioUrlYoudao;
+              url = url.replace("[word]", soundmark);
+              tempPlayUrlLocal = url;
+              that.audioCtx.setSrc(url);
+              that.audioCtx.play();
+              tempPlayUrl = url;
+            }
+          }
+        });
+      }
+      else {
+        if (this.audioCtx)
+          this.audioCtx.pause();
+        if (innerAudioContext1)
+          innerAudioContext1.stop();
+        isPlaying = false;
+      }
+    }
+  },
+  audioBindEnded: function () {
+    isPlaying = false;
+  },
+  audioBindError: function (err) {
+    console.log(err);
+    innerAudioContext1.src = tempPlayUrlLocal;
+    innerAudioContext1.play();
+
+    main.getBaiduToken();
+  },
+  setSoundFile: function (isFinish) { //isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
+    var that = this;
+    var url = "/pages/sounds/";
+    if (isFinish == 1) {
+      url += "end.mp3";
+    } else if (isFinish == 2) {
+      url += "short3.mp3";
+    } else if (isFinish == 3) {
+      url += "short1.mp3";
+    } else {
+      url += "short2.mp3";
+    }
+    if (isFinish >= 0) {
+      innerAudioContext1.src = url;
+      innerAudioContext1.play();
+    }
+
+    wx.pageScrollTo({
+      scrollTop: 0,
+    });
+  },
+  onAutoPlay:function(e){
+    var id=e.currentTarget.dataset.id;
+    this.setData({
+      TestAutioPlay:id,
+    });
+    wx.setStorageSync("TestAutioPlay",id);
+  },
+  onExport:function(){
+    var that=this;
+    that.setSoundFile(0);
+    while (that.data.CurrentIndex<TaskList.length) {
+      TaskList[that.data.CurrentIndex].Result = 0;
+      that.data.CurrentIndex++;
+    }    
+    isFinished = 1;
+    that.onFinished();
+  },
+  onFinished:function(){
+    if (TaskList.length > 0 && this.data.CurrentIndex > 0) {
+      var TestTask = {};
+      TestTask.Category = this.data.Category;
+      TestTask.TestType = this.data.TestType;
+      TestTask.IsFinished = isFinished;
+      TestTask.LibraryName = this.data.LibraryName;
+      TestTask.BookName = this.data.BookName;
+      TestTask.UnitName = this.data.UnitName;
+      TestTask.TestTypeName = this.data.TestTypeName;
+      TestTask.LibraryID=this.data.LibraryID;
+      TestTask.BookID=this.data.BookID;
+      TestTask.UnitID+=this.data.UnitID;
+      TestTask.List = TaskList;
+      app.globalData.TestTask=TestTask;
+      wx.redirectTo({
+        url: './report?type=new',
+      });
+    }
+    else{
+      wx.navigateBack({
+        delta: 1,
+      });
+    }
+  },
+  onUnload:function(){
+    wx.removeStorageSync("TestTask2");
+    if (innerAudioContext1) {
+      innerAudioContext1.stop();
+    }
+  },
+  showBishunOrKaiti:function(e){
+    var that=this;
+    main.downloadBishunKaitiImage(
+      e.currentTarget.dataset.url,
+      e.currentTarget.dataset.serverurl,
+      e.currentTarget.dataset.type,
+      that.data.TaskInfo.ContentNew.Field,function(fields){
+        that.data.TaskInfo.ContentNew.Field=fields;
+        that.setData({
+          TaskInfo: that.data.TaskInfo,
+        });
+      });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_test/knowledge/examine.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "检验中",
+  "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },
+  "navigationStyle": "custom"
+}

pages_test/knowledge/examine.wxml

@@ -0,0 +1,83 @@
+<import src="../../pages/template/cardShow.wxml" />
+<navigation-bar title="检验中" show="true" left="true" background="{{Color.BackColor}}" color="#fff">
+    <view slot="left" bindtap="onFinished">
+      <view class="square">提前退出</view>
+    </view>
+</navigation-bar>
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};' bindtap='onShowAnswer' data-type="all">
+  <view class="panelTop FlexColumn" style="background-color:{{Color.BackColor}};">
+    <view class="panelTop2 FlexRow">
+    <view class="left FlexRow">
+      <view class="Number2 Number1 FlexColumn">
+        <view>{{CurrentIndex+1}}</view>
+        <view class="line2 line1"></view>
+      </view>
+      <view class="Number1 FlexColumn">
+        <view>{{TaskLength}}</view>
+        <view class="line1"></view>
+      </view>
+    </view>
+    <view class="right FlexRow">
+      <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" />
+        </view>
+        <view class="panelTopText">自动播报</view>
+      </block>
+      
+      <!-- <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="1">
+        <image src="../../pages/images/universalpic_shelve_gray_26x26.png" class="universalpic_shelve_gray_26x26" />
+      </view> -->
+      <view class="btnTop2 btnTop FlexRow" catchtap='gotoNext' data-btnnumber="-1" >
+        <image src="../../pages/images/universalpic_undo_gray_26x20.png" class="universalpic_undo_gray_26x20" />
+      </view>
+    </view>
+    </view>
+  </view>
+  <view style='width:100%;height:140rpx;'></view>
+  <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize}}" />
+  <view style='width:100%;height:180rpx;'></view>
+
+  <!-- 下方按钮 -->
+  <image class="footerShade" src="../../pages/images/study_learning_bgimage_tc0{{Color.ID}}.png" />
+  <view class='footer FlexColumn'>
+    <image class="footerImage" src="../../pages/images/study_learning_maskimage_tc0{{Color.ID}}.png" />
+    <view class="panelFooter FlexColumn" hover-class='AnswerHover' wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
+      看答案
+    </view>
+    <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
+      <view class='panelBottomAnswer panelBottom FlexRow'>
+        <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="0">
+          <view class="btnTime">
+            答错
+          </view>
+          <view class="Answer0 btnColor"></view>
+        </view>
+        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="1">
+          <view class="btnTime">
+            没学过
+          </view>
+          <view class="Answer4 btnColor"></view>
+        </view>
+        <view class="AnswerRight Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="4">
+          <view class="btnTime">
+            答对
+          </view>
+          <view class="Answer2 btnColor"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+
+<audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages_test/knowledge/examine.wxss

@@ -0,0 +1,469 @@
+page{
+  background-color: #D2D2D2;
+}
+
+.square{
+  background-color: #181A21;
+  width:136rpx;
+  line-height:53rpx;
+  text-align: center;
+  color: #fff;
+  border-radius:10rpx;
+  font-size:24rpx;
+  font-weight: 700;
+}
+
+.panelTop{
+  width:100%;
+  height:140rpx;
+  justify-content: flex-end;
+  position: fixed;
+  z-index: 100;
+}
+
+.panelTop2{
+  width:100%;
+  height:120rpx;
+  justify-content: space-between;
+  color:#fff;
+}
+
+.left{
+  margin-left: 50rpx;
+}
+
+.Number1{
+  width:50rpx;
+  height:50rpx;
+  justify-content: flex-end;
+  font-size:20rpx;
+  font-weight: 400;
+  font-family: 'Roboto-Black';
+  margin-bottom: 10rpx;
+}
+.Number2{
+  color:rgba(255,255,255,0.5);
+}
+.line1{
+  width:26rpx;
+  height:6rpx;
+  margin-top: 5rpx;
+}
+.line2{
+  background-color: #F1AB1E;
+}
+
+.right{
+  margin-right: 40rpx;
+}
+.btnTop{
+  width:70rpx;
+  height:70rpx;
+  border-radius: 50%;
+  background-color: rgba(0,0,0,0.1);
+  margin-left: 30rpx;
+}
+.btnTop2{
+  margin-left: 60rpx;
+}
+.universalpic_broadcast_default_gray_34x25{
+  width:34rpx;
+  height:25rpx;
+}
+.panelTopText{
+  font-size: 20rpx;
+  color:#D2D2D2;
+  margin-left: 14rpx;
+}
+.panelTopText2{
+  margin-right: 30rpx;
+}
+.universalpic_shelve_gray_26x26{
+  width:26rpx;
+  height:26rpx;
+}
+.universalpic_undo_gray_26x20{
+  width:26rpx;
+  height:20rpx;
+}
+
+/* 段落显示************************ */
+
+.editFieldNull{
+  height:50rpx;
+}
+.editFieldNull1{
+  height:40rpx;
+}
+.editFieldNull2{
+  height:60rpx;
+}
+.editFieldNull3{
+  height:30rpx;
+}
+
+.panelItem {
+  width: 650rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
+}
+
+.panelField1 {
+  width: 100%;
+  justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
+}
+
+.panelField11 {
+  font-size: 48rpx;
+  justify-content: flex-start;
+  color: #fff;
+}
+
+.panelTag {
+  width: 100%;
+  min-height: 95rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin-top: 60rpx;
+  z-index: 5;
+}
+
+.panelTag .panelTagLine {
+  margin: 0 0 0 50rpx;
+  max-width: 650rpx;
+  height: 10rpx;
+}
+
+.panelTag .panelTag1 {
+  margin: 0 0 0 50rpx;
+  width: 650rpx;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.panelTag .tag {
+  font-size: 46rpx;
+  margin: 0 30rpx 20rpx 0;
+  font-weight: 400;
+  color: #F1AB1E;
+}
+
+.right2 {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 134rpx;
+  height: 150rpx;
+  align-items: flex-start;
+}
+
+.universalpic_show_white_30x30 {
+  width: 36rpx;
+  height: 36rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.universalpic_hide_white_34x34 {
+  width: 36rpx;
+  height: 20rpx;
+  margin: 68rpx 50rpx 0 50rpx;
+}
+
+.panelField20 {
+  width: 100%;
+  justify-content: flex-start;
+  z-index: 5; 
+  position: relative;
+  min-height:240rpx;
+}
+
+.panelField2 {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  border-radius: 20rpx;
+  min-height:240rpx;
+}
+
+.panelField21 {
+  width: 650rpx;
+  font-size: 36rpx;
+  margin: 40rpx;
+  line-height: 66rpx;
+}
+
+.panelItem .panelSound {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 10rpx 0 0;
+  background-color: #fff;
+  border-radius: 50%;
+}
+
+.panelItem .panelSoundHover {
+  background-color: #d2d2d2;
+}
+.panelItem .panelSoundHover1 {
+  color: #d2d2d2;
+}
+
+.panelItem .universalpic_starting_tc01_26x26{
+  width: 26rpx;
+  height: 26rpx;
+  margin: 10rpx 20rpx 10rpx 0;
+}
+
+.panelItem .universalpic_read_mark_black_20x20 {
+  width: 21rpx;
+  height: 20rpx;
+}
+
+.panelItem .panelRecorder {
+  width:100%;
+  justify-content: flex-start;
+}
+.panelItem .panelRecorder0 {
+  width: 168rpx;
+  height: 70rpx;
+  background-color: #fff;
+  border-radius: 10rpx;
+}
+
+.panelItem .textProblem{
+  padding: 3rpx 20rpx;
+  background-color: #F1AB1E;
+  border-radius: 22rpx;
+  text-align: center;
+  font-size:28rpx;
+  line-height: 45rpx;
+  font-weight: 700;
+  color:#1e1e1e;
+  margin: 0 0 10rpx 0;
+}
+
+.panelItem .textDot{
+  color: #F1AB1E;
+  font-size:36rpx;
+  margin-right: 20rpx;
+}
+
+.panelItem .textLine {
+  text-decoration: underline;
+}
+
+
+.panelItem .textHighlighter {
+  color:#1E1E1E;
+}
+
+.panelItem .textNormal {
+  min-height: 50rpx;
+}
+
+.panelItem .textBigword{
+  font-size:108rpx;
+  line-height: 108rpx;
+}
+
+.panelItem .textNormal2 {
+  font-size: 36rpx;
+}
+
+.panelItem .textPinyin {
+  text-decoration: underline;
+  margin-right: 10rpx;
+}
+
+
+.panelItem .imageContainer {
+  width: 650rpx;
+  margin: 6rpx 0;
+  border-radius: 20rpx;
+  background-color: rgba(0,0,0,0.1);
+  position: relative;
+}
+
+.panelItem .imageFree {
+  width: 650rpx;
+  border-radius: 6rpx;
+}
+
+
+.panelItem .imageContainer2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+  background-color: rgba(0,0,0,0.1);
+  position: relative;
+}
+.panelItem .imageFree2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+}
+.panelItem .BishunPlay{
+  width:80rpx;
+  height:80rpx;
+  background-color: #9B9B9B;
+  color:#fff;
+  position: absolute;
+  bottom:0;
+  right:0;
+  z-index: 10;
+  font-size:28rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+.panelItem .textBr {
+  width: 100%;
+  height: 24rpx;
+}
+
+.panelItem .textReturn {
+  width: 100%;
+}
+
+.panelItem .textReturn2 {
+  width: 100%;
+  height: 30rpx;
+}
+
+/* ******************************** */
+
+
+.footerShade{
+  width: 100%;
+  position: fixed;
+  height:480rpx;
+  bottom: 0;
+  z-index: 1;
+}
+/* 底部记忆选择 */
+
+.footer{
+  width: 710rpx;
+  position: fixed;
+  bottom: 0;
+  z-index: 10;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+
+.footerImage{
+  width:710rpx;
+  position: absolute;
+  bottom:0;
+  height:80rpx;
+  z-index: 10;
+}
+
+.panelFooter {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  background-color: #181a21;
+  border-radius: 20rpx;
+  color: #d2d2d2;
+  font-size: 48rpx;
+  text-align: center;
+  line-height: 140rpx;
+  z-index: 15;
+}
+
+.panelFooter0 {
+  line-height: 40rpx;
+}
+
+.panelBottomAnswer0 {
+  width: 100%;
+  height: 20rpx;
+  z-index: 10;
+}
+
+.panelBottomAnswer {
+  width: 100%;
+  font-size: 28rpx;
+  justify-content: space-between;
+  z-index: 10;
+  height: 140rpx;
+}
+
+.iphoneX {
+  width: 100%;
+  height: 60rpx;
+  z-index: 10;
+}
+
+.Answer {
+  font-size: 28rpx;
+  justify-content: flex-start;
+  height: 140rpx;
+  width:180rpx;
+}
+
+.AnswerLeft{
+  border-top-left-radius: 20rpx;
+  border-bottom-left-radius: 20rpx;
+  width:265rpx;
+}
+
+.AnswerRight{
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  width:265rpx;
+}
+
+.AnswerHover{
+  background-color: #262935;
+}
+
+.Answer .btnColor {
+  height: 14rpx;
+  width: 75%;
+  border-radius: 4rpx;
+  margin-top: 16rpx;
+}
+
+.Answer .btnTime {
+  margin-top: 34rpx;
+}
+
+.Answer .Answer0 {
+  background-color: #fe6659;
+}
+
+.Answer .Answer1 {
+  background-color: #ffbc00;
+}
+
+.Answer .Answer4 {
+  background-color: #787878;
+}
+
+.Answer .Answer1Recommend {
+  height: 50rpx;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  margin-top: 16rpx;
+}
+
+.Answer .Answer2 {
+  background-color: #329468;
+}
+
+.Answer .Answer3 {
+  background-color: #0a60be;
+}
+
+.footer0 {
+  height: 180rpx;
+  width: 100%;
+  z-index: 1;
+}
+
+.universalpic_import_gray{
+  width:24rpx;
+  height:24rpx;
+}

pages_test/knowledge/index.js

@@ -19,10 +19,19 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    that.init();
   },
   onShow:function(){
     var that = this;
   },
+  init:function(){
+    var that = this;
+    main.getData('GetMiaoguoTestLibrary', function (data) {
+      if (data) {
+        app.globalData.TestGradeList=data;
+      }
+    });
+  },
   setMenu:function(e){
     var that=this;
     var index=e.currentTarget.dataset.index;

pages_test/knowledge/index.wxml

@@ -7,8 +7,8 @@
     <text class="panel14">Practice makes perfect. </text>
     <text class="panel15">知识库</text>
     <view class="panel16 FlexRow">
-      <image src='../images/pic_01.png' class="pic_01" />
-      <image src='../images/pic_02.png' class="pic_02" />
+      <image src='../images/pic_01.png' class="pic_01" bind:tap="goto" data-url="./library?Category=CHN" />
+      <image src='../images/pic_02.png' class="pic_02" bind:tap="goto" data-url="./library?Category=ENG" />
     </view>
     <view class="panel17"></view>
     <view class="panel18"></view>

pages_test/knowledge/index.wxss

@@ -414,4 +414,5 @@
   margin-top: 10rpx;
   color:#FFCF7E;
   font-size:24rpx;
+  font-weight: 400;
 }

pages_test/knowledge/library.js

@@ -7,7 +7,7 @@ Page({
   data: {
     Menu1:0,
     Menu2:0,
-    Menu2Array:[{ID:0,Name:"全部",CSS:"Selected"},{ID:1,Name:"小学",CSS:""},{ID:2,Name:"初中",CSS:""},{ID:3,Name:"课外拓展",CSS:""}],
+    Menu2Array:[],
   },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
@@ -16,26 +16,68 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      ImagePath: app.globalData.uploadImageUrl,
     });
+    that.init(options);
   },
-  onShow:function(){
-    var that = this;
+  init:function(options){
+    var that=this;
+    that.changeTab(options.Category);
+    that.setData({
+      List:app.globalData.TestGradeList[options.Category],
+      Menu2Array:that.data.Menu2Array,
+    });
+  },
+  changeTab:function(category){
+    var that=this;
+    var menu1=0;
+    if (category=="CHN")
+      that.data.Menu2Array=[{ID:0,Name:"全部",CSS:"Selected"},{ID:1,Name:"小学",CSS:""},{ID:2,Name:"初中",CSS:""},{ID:3,Name:"课外拓展",CSS:""}];
+    else{
+      that.data.Menu2Array=[{ID:0,Name:"全部",CSS:"Selected"},{ID:1,Name:"小学",CSS:""},{ID:2,Name:"初中",CSS:""},{ID:3,Name:"高中",CSS:""},{ID:4,Name:"大学",CSS:""}];
+      menu1=1;
+    }
+    that.setData({
+      List:app.globalData.TestGradeList[category],
+      Menu2Array:that.data.Menu2Array,
+      Menu1:menu1,
+    });
   },
   setMenu1:function(e){
     var that=this;
     var index=e.currentTarget.dataset.index;
+    if (index==0)
+      that.changeTab("CHN");
+    else
+      that.changeTab("ENG");
     that.setData({
       Menu1:index,
     });
   },
   setMenu2:function(e){
     var that=this;
+    that.setMenu1({currentTarget:{dataset:{index:that.data.Menu1}}});
+    
     var index=e.currentTarget.dataset.index;
     var list=that.data.Menu2Array;
     for(var i=0;i<list.length;i++){
       list[i].CSS="";
       if (index==list[i].ID){
         list[i].CSS="Selected";
+        if (index>0){
+          var menu=that.data.Menu2Array[index].Name;
+          console.log(menu);
+          var arr=[];
+          for(var j=0;j<that.data.List.length;j++){
+            if (that.data.List[j].Grade.indexOf(menu)>=0){
+              arr.push(that.data.List[j]);
+            }
+          }
+          that.setData({
+            List:arr,
+          });
+        }
+        break;
       }
     }
     that.setData({

pages_test/knowledge/library.wxml

@@ -11,20 +11,23 @@
   </view>
 
   <view class="panel2 FlexColumn">
-    <view class="panel21 FlexRow">
+    <scroll-view scroll-x class="panel21 FlexRow">
+      <view class="Tab0"></view>
       <view class="panel211 panel211{{item.ID}} panel211{{item.CSS}}" wx:for="{{Menu2Array}}" wx:key="*this" bind:tap="setMenu2" data-index="{{item.ID}}">{{item.Name}}</view>
-    </view>
+    </scroll-view>
     <view class="panel22 FlexRow">
-      <view class="panel221 FlexColumn" wx:for="{{[0,1,2,3,4,5,6]}}">
+      <view class="panel221 FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="goto" data-url="./package?Category1={{Menu1}}&Category2={{item.Category2}}&Category3={{item.Category3}}&LibraryID={{item.ID}}&BookImageName={{item.BookImageName}}&LibraryName={{item.Category2}}{{item.Category3}}">
         <view class="panel2211">
+          <image class="panel2211Logo" src='{{ImagePath}}web/_knowledge/{{item.BookImageName}}_b.png' />
         </view>
-        <view class="panel2212">一年级</view>
-        <view class="panel2213">上学期</view>
+        <view class="panel2212">{{item.Category2}}</view>
+        <view class="panel2213">{{item.Category3}}</view>
         <view class="panel2214 FlexRow">
           <view>知识包</view>
-          <view class="panel22141">7</view>
+          <view class="panel22141">{{item.Num}}</view>
         </view>
       </view>
     </view>
   </view>
+  <view style="height:150rpx;"></view>
 </view>

pages_test/knowledge/library.wxss

@@ -42,7 +42,14 @@
 
 .panel21{
   margin: 40rpx 0 60rpx 0;
-  justify-content: center;
+  display: flex;
+  white-space: nowrap;
+}
+
+.Tab0 {
+  width: 30rpx;
+  height: 10rpx;
+  display: inline-block;
 }
 
 .panel211{
@@ -54,6 +61,7 @@
   margin: 0 10rpx;
   line-height: 60rpx;
   text-align: center;
+  display: inline-block;
 }
 
 .panel2110{
@@ -71,6 +79,7 @@
   width:700rpx;
 }
 .panel221{
+  position: relative;
   width: 320rpx;
   height:353rpx;
   margin: 0 15rpx 60rpx 15rpx;
@@ -87,6 +96,15 @@
   background-color: #f2f2f2;
   margin-top: 10rpx;
 }
+
+.panel2211Logo{
+  width: 320rpx;
+  height:120rpx;
+  position: absolute;
+  top:0rpx;
+  left:0;
+}
+
 .panel2212{
   font-size: 36rpx;
   color: #2E2E2E;
@@ -95,6 +113,7 @@
 }
 .panel2213{
   font-size: 36rpx;
+  height:50rpx;
   font-weight: 400;
   color: #2E2E2E;
   align-self: start;

pages_test/knowledge/package.js

@@ -5,18 +5,38 @@ const app = getApp();
 
 Page({
   data: {
+    List:[],
   },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
   },
   onLoad: function (options) {
     var that = this;
+    var Category1="语文";
+    if (options.Category1==1)
+      Category1="English";
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      Category1:Category1,
+      Category2:options.Category2,
+      Category3:options.Category3,
+      LibraryID:options.LibraryID,
+      LibraryName:options.LibraryName,
+      BookImageName:options.BookImageName,
+      ImagePath: app.globalData.uploadImageUrl,
     });
+
+    that.init(options);
   },
-  onShow:function(){
+  init:function(options){
     var that = this;
+    main.getData('GetMiaoguoTestPackage?Category1='+that.data.Category1+'&Category2='+options.Category2+'&Category3='+options.Category3+'&UserID='+app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          List:data,
+        });
+      }
+    });
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;

pages_test/knowledge/package.wxml

@@ -1,34 +1,36 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexColumn">
-    <view class="panel11">语文</view>
-    <view class="panel12">一年级</view>
-    <view class="panel12">上学期</view>
+    <view class="panel11">{{Category1}}</view>
+    <view class="panel12">{{Category2}}</view>
+    <view class="panel12">{{Category3}}</view>
     <view class="panel13"></view>
     <view class="panel14"></view>
+    <image class="panel1Logo" src='{{ImagePath}}web/_knowledge/{{BookImageName}}_a.png' />
   </view>
 
   <view class="panel2 FlexColumn">
-    <view class="panel21 FlexColumn" wx:for="{{[1,2,3,4]}}">
+    <view class="panel21 FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="goto" data-url="./unit?Category1={{Category1}}&Category2={{Category2}}&Category3={{Category3}}&Name1={{item.Name1}}&WordType={{item.WordType}}&LibraryID={{LibraryID}}&BookID={{item.ID}}&WordNum={{item.WordNum}}&LibraryName={{LibraryName}}&BookName={{item.Name1}}&KnowledegImageName={{item.KnowledegImageName}}">
+      <image class="panel211Logo" src='{{ImagePath}}web/_knowledge/{{item.KnowledegImageName}}_a.png' />
       <view class="panel211 FlexColumn">
-        <text class="panel2111">Personal Feelings, Opinions and Experiences (adjectives) </text>
+        <text class="panel2111">{{item.Name1}}</text>
         <view class="panel2112 FlexRow">
-          <view>汉字</view>
-          <view class="panel21121">225</view>
+          <view>{{item.WordType}}</view>
+          <view class="panel21121">{{item.WordNum}}</view>
         </view>
       </view>      
-      <view class="panel212 FlexColumn">
-        <view class="panel2121">与识字表的课号对应，主要帮助学生认识汉字，包括了解每个汉字的基本信息，如读音、笔画顺序、部首等，确保学生能够逐步积累汉字量，为后续提高阅读水平打下基础。</view>
+      <view class="panel212 FlexColumn" wx:if="{{item.Remark}}">
+        <view class="panel2121">{{item.Remark}}</view>
       </view>
-      <view class="panel213 FlexRow">
+      <view class="panel213 FlexRow" wx:for="{{item.ShowRate}}" wx:key="*this" wx:for-item="itemChild">
         <view class="panel2131 FlexRow">
-          <view class="panel21311" style="width:30%;"></view>
+          <view class="panel21311" style="width:{{itemChild.C}}%;"></view>
         </view>
         <view class="panel2132 FlexRow">
-          <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
-          <view class="panel21321">45%</view>
+          <image src="../images/sysIcon_d0{{itemChild.ID}}.png" class="sysIcon_d01"></image>
+          <view class="panel21321">{{itemChild.C}}%</view>
         </view>
       </view>
-      <view class="panel213 FlexRow">
+      <!-- <view class="panel213 FlexRow">
         <view class="panel2131 FlexRow">
           <view class="panel21311" style="width:100%;"></view>
         </view>
@@ -36,7 +38,7 @@
           <image src="../images/sysIcon_d02.png" class="sysIcon_d01"></image>
           <view class="panel21321">100%</view>
         </view>
-      </view>
+      </view> -->
       <view style="height:40rpx;"></view>
     </view>
   </view>

pages_test/knowledge/package.wxss

@@ -8,6 +8,7 @@
   background-color: #fff;
   color: #2E2E2E;
   align-items: flex-start;
+  position: relative;
 }
 
 .panel11 {
@@ -15,11 +16,14 @@
   font-size: 28rpx;
   color: #2E2E2E;
   font-weight: 400;
+  z-index: 10;
 }
 .panel12 {
   margin: 0 0 0 50rpx;
   font-size: 36rpx;
   color: #1F2C3B;
+  z-index: 10;
+  height:50rpx;
 }
 
 .panel13 {
@@ -33,6 +37,13 @@
   height:90rpx;
   background-image: linear-gradient(180deg, #63615F 0%, #989692 100%);
 }
+.panel1Logo{
+  width:750rpx;
+  height:460rpx;
+  position: absolute;
+  bottom:0;
+  z-index: 5;
+}
 
 .panel2{
   width:100%;
@@ -45,6 +56,7 @@
   width: 670rpx;
   margin-top: 60rpx;
   justify-content: flex-start;
+  position: relative;
 }
 
 .panel211{
@@ -71,6 +83,14 @@
   margin: 8rpx 0 0 10rpx;
 }
 
+.panel211Logo{
+  width:200rpx;
+  height:190rpx;
+  position: absolute;
+  right:0;
+  top:0;
+}
+
 .panel212{
   width:550rpx;
   font-size: 24rpx;

pages_test/knowledge/report.js

@@ -0,0 +1,155 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    Count:0,
+    TestTypeNumber:1,
+    MenuList:[{Name:"不分配（默认）",IsSelected:0},{Name:"分配到新卡单",IsSelected:1},{Name:"选择卡单",IsSelected:0,HasArrow:1}],
+    List:[
+      {Name:"答错的",List:[],BColor:"#F26D5F"},
+      {Name:"不会的",List:[],BColor:"#787878"},
+      {Name:"答对的",List:[],BColor:"#51BE3D"}
+    ]
+  },
+  onLoad: function (options) {
+    var that = this;
+    var testtask=app.globalData.TestTask;
+    that.setData({
+      ReportType: options.type,
+      LibraryName:testtask.LibraryName,
+      BookName:testtask.BookName,
+      UnitName:testtask.UnitName,
+      TestTypeName:testtask.TestTypeName,
+      TestTime:common.formatDateCHS(common.formatTime(new Date()),1),
+      Containnerheight: main.getWindowHeight(),
+      ImagePath: app.globalData.uploadImageUrl,
+    });
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    var TestTask = app.globalData.TestTask;
+    if (!TestTask)
+      TestTask={};
+
+    var TestTypeNumber=1;
+    if (TestTask.TestType=="read")
+      TestTypeNumber=2;
+      
+    var list = TestTask.List;
+    //debugger;
+    if (list) {
+      for (var i = 0; i < list.length; i++) {
+        var item={};
+        item.IsSelected=0;
+        item.Word=list[i].Word; 
+        if (list[i].Result == -1) {
+          that.data.List[0].List.push(item);
+        } else if (list[i].Result == 0) {
+          that.data.List[1].List.push(item);
+        } else if (list[i].Result == 1) {
+          that.data.List[2].List.push(item);
+        }
+      }
+      that.setData({
+        List:that.data.List,
+        TestTypeNumber:TestTypeNumber,
+      });
+
+      if (that.data.ReportType == "new")
+        that.saveInfo(TestTask);
+    }
+
+  },
+  saveInfo:function(e){
+    var that=this;
+    var userid=app.globalData.userInfo.UserID;
+    var param1={};
+    param1.Category=e.Category;
+    param1.LibraryName=that.data.LibraryName;
+    param1.BookName=that.data.BookName;
+    param1.UnitName=that.data.UnitName;
+    param1.TestTypeName=that.data.TestTypeName;
+    if (e.TestType=="read")
+      param1.IsTestRead=1;
+    else
+      param1.IsTestWrite=1;
+    //debugger;
+    param1.JSONData=JSON.stringify(that.data.List);
+    main.postData('InsertTestReport2?UserID=' + userid, param1, function (data) {
+      if (data){
+        
+      }
+    });
+  },
+  selectItem:function(e){
+    var that=this;
+    var index=e.currentTarget.dataset.index;
+    var index2=e.currentTarget.dataset.index2;
+    var list=that.data.List,count=0;
+    for(var i=0;i<list.length;i++){
+      if (index==i){
+        for(var j=0;j<list[i].List.length;j++){
+          if (index2==j){
+            list[i].List[j].IsSelected=!list[i].List[j].IsSelected?1:0;
+          }
+          else if (index2=="all"){
+            list[i].List[j].IsSelected=1;
+          }
+          else if (index2=="none"){
+            list[i].List[j].IsSelected=0;
+          }
+        }
+      }
+      for(var j=0;j<list[i].List.length;j++){
+        if (list[i].List[j].IsSelected==1)
+          count++;
+      }
+    }
+    that.setData({
+      List:that.data.List,
+      Count:count,
+    });
+  },
+  setMenu:function(e){
+    var that=this;
+    var index=e.currentTarget.dataset.index;
+    that.setData({
+      Menu:index,
+    });
+  },
+  setMenu2:function(e){
+    var that=this;
+    var index=e.currentTarget.dataset.index;
+    var list=that.data.MenuList,count=0;
+    for(var i=0;i<list.length;i++){
+      list[i].IsSelected=0;
+      if (index==i)
+        list[i].IsSelected=1;
+    }
+    that.setData({
+      MenuList:that.data.MenuList,
+    });
+  },
+  buildCard:function(e){
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  closePanel:function(){
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_test/knowledge/report.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#E3E3E3",
+  "navigationBarTitleText": "检验报告",
+  "backgroundColorBottom": "#E3E3E3",
+  "backgroundColor": "#E3E3E3"
+}

pages_test/knowledge/report.wxml

@@ -0,0 +1,87 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn">
+    <view class="panel11">{{LibraryName}}</view>
+    <view class="panel12">{{BookName}}</view>
+    <view class="panel13">{{UnitName}}</view>
+    <view class="panel14">{{TestTypeName}}</view>
+    <view class="panel15">{{TestTime}}</view>
+    <view class="panelLine1"></view>
+    <view class="panel16">从以下检验结果中选择需要练习的知识点生成题卡，生成后即可前往首页开展日常练习。</view>
+    <image src="../images/sysIcon_e0{{TestTypeNumber}}.png" class="sysIcon_e01"></image>
+  </view>
+
+  <view class="panel2 FlexColumn" wx:for="{{List}}" wx:key="*this">
+    <view class="panel21" style="background-color:{{item.BColor}};"></view>
+    <view class="panel22 FlexColumn">
+      <view class="panel221 FlexRow">
+        <view class="panel2211 FlexRow">
+          <view>{{item.Name}}</view>
+          <view class="panel22111">{{item.List.length}}</view>
+        </view>
+        <view class="panel2212 FlexRow">
+          <view class="panel22121" bind:tap="selectItem" data-index="{{index}}" data-index2="all">全选本组</view>
+          <view class="panel22121" bind:tap="selectItem" data-index="{{index}}" data-index2="none">取消组选</view>
+        </view>
+      </view>
+      <view class="panel222 FlexColumn" wx:for="{{item.List}}" wx:key="*this" wx:for-item="itemChild" wx:for-index="indexChild" bind:tap="selectItem" data-index="{{index}}" data-index2="{{indexChild}}">
+        <view class="panel2221 FlexRow">
+          <view wx:if="{{!itemChild.IsSelected}}" class="panel22211"></view>
+          <view wx:if="{{itemChild.IsSelected}}" class="panel22211 panel22210 FlexRow">
+            <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
+          </view>
+          <text class="panel22212 panel22212{{itemChild.IsSelected}}">{{itemChild.Word}}</text>
+        </view>
+        <view class="panelLine2"></view>
+      </view>
+    </view>
+  </view>
+  <text class="panel3">
+    <text class="panel31">提醒：</text><text>已生成题卡的知识点不会重复生成题卡，遇您要求再次生成时会将生成过的老题卡变更为新题卡从新开始练习。</text>
+  </text>
+  <view style="height:260rpx;"></view>
+
+  <view class="panelFooter FlexRow">
+    <view class="panelFooter1 FlexColumn" bind:tap="setMenu" data-index="1">
+      <view class="panelFooter10 FlexColumn">
+        <view class="panelFooter11">{{Count}}</view>
+        <view class="panelFooter12">生成题卡</view>
+      </view>
+    </view>
+    <view class="panelFooter2 FlexColumn" bind:tap="closePanel">
+      <view class="panelFooter20 FlexColumn">
+        <image src="../images/sysIcon_b05.png" class="sysIcon_b05"></image>
+        <view class="panelFooter12 panelFooter120">关闭</view>
+      </view>
+    </view>
+  </view>
+</view>
+
+<!--分配卡单 -->
+<view wx:if="{{Menu==1}}" class="menuContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelMenu FlexColumn">
+    <view class="panelMenu1 FlexRow">
+      <view class="panelMenu11">分配到卡单吗？</view>
+      <view class="panelMenu12 FlexRow" bind:tap="setMenu" data-index="0">
+        <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
+      </view>
+    </view>
+    <view class="panelMenu2">
+      卡单就是文件夹，方便日后处理
+    </view>
+    <view class="panelMenu3 FlexColumn" wx:for="{{MenuList}}" wx:key="*this" bind:tap="setMenu2" data-index="{{index}}">
+      <view class="panelMenu31 FlexRow">
+        <image src="../images/sysIcon_b04.png" class="sysIcon_b04" wx:if="{{item.IsSelected}}"></image>
+        <view class="sysIcon_b04" wx:if="{{!item.IsSelected}}"></view>
+        <view class="panelMenu311 FlexRow">
+          <view class="panelMenu3111 panelMenu3111{{item.IsSelected}}">{{item.Name}}</view>
+          <image src="../images/sysIcon_a01.png" class="sysIcon_a01" wx:if="{{item.HasArrow}}"></image>
+        </view>
+      </view>
+      <view class="panelLine3"></view>
+    </view>
+    <view class="panelMenu4 FlexRow" bind:tap="buildCard" data-url="./build">生成题卡</view>
+  </view>
+</view>
+
+
+

pages_test/knowledge/report.wxss

@@ -0,0 +1,341 @@
+.container {
+  background-color: #E3E3E3;
+  font-weight: 600;
+}
+
+.panel1 {
+  width: 630rpx;
+  margin: 40rpx 0 0 0;
+  align-items: flex-start;
+  position: relative;
+}
+
+.panel11 {
+  font-size: 24rpx;
+  color: #787878;
+}
+
+.panel12 {
+  font-size: 24rpx;
+  color: #787878;
+  margin-top: 7rpx;
+}
+
+.panel13 {
+  font-size: 48rpx;
+  color: #2E2E2E;
+  margin-top: 20rpx;
+}
+
+.panel14 {
+  margin-top: 30rpx;
+  font-size: 28rpx;
+  color: #2E2E2E;
+}
+
+.panel15 {
+  font-size: 28rpx;
+  color: #4d4d4d;
+  font-weight: 400;
+}
+
+.panel16 {
+  margin-top: 60rpx;
+  font-size: 24rpx;
+  color: #1E1E1E;
+  font-weight: 400;
+}
+
+.sysIcon_e01 {
+  width: 220rpx;
+  height: 220rpx;
+  position: absolute;
+  right: 0;
+  top: 70rpx;
+}
+
+.panelLine1 {
+  width: 100%;
+  height: 1rpx;
+  background-color: #BCBCBC;
+  margin-top: 30rpx;
+}
+
+.panel2 {
+  width: 690rpx;
+  margin-top: 60rpx;
+  background-color: #fff;
+  border-radius: 0 0 20rpx 20rpx;
+}
+
+.panel21 {
+  width: 100%;
+  height: 10rpx;
+}
+
+.panel22 {
+  width: 100%;
+}
+
+.panel221 {
+  width: 100%;
+  height: 120rpx;
+  justify-content: space-between;
+}
+
+.panel2211 {
+  margin-left: 30rpx;
+}
+
+.panel22111 {
+  font-family: Teko-SemiBold;
+  font-size: 48rpx;
+  color: #2E2E2E;
+  margin: 8rpx 0 0 10rpx;
+}
+
+.panel2212 {
+  margin-right: 30rpx;
+}
+
+.panel22121 {
+  background: #F8F8F8;
+  border: 3rpx solid #4D4D4D;
+  border-radius: 10rpx;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  width: 136rpx;
+  line-height: 50rpx;
+  text-align: center;
+  margin-left: 20rpx;
+}
+
+.sysIcon_c06 {
+  width: 20rpx;
+  height: 20rpx;
+  margin: 0 30rpx;
+}
+
+.panel222 {
+  width: 100%;
+  justify-content: flex-end;
+  align-items: flex-end;
+  margin-bottom: 40rpx;
+  border-radius: 0 0 20rpx 20rpx;
+}
+
+.panelLine2 {
+  width: 580rpx;
+  height: 1rpx;
+  background-color: #e3e3e3;
+}
+
+.panel2221 {
+  justify-content: space-between;
+  width: 100%;
+}
+
+.panel22211 {
+  width: 40rpx;
+  height: 40rpx;
+  background-color: #f8f8f8;
+  border-radius: 50%;
+  margin: 0 30rpx 0 40rpx;
+  border: 3rpx solid #D2D2D2;
+}
+
+.panel22210 {
+  background-color: #FF8451;
+}
+
+.sysIcon_b07 {
+  width: 20rpx;
+  height: 20rpx;
+}
+
+.panel22212 {
+  margin: 30rpx 0;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #2E2E2E;
+  width: 580rpx;
+}
+
+.panel222121 {
+  font-weight: 600;
+}
+
+.panel3 {
+  width: 630rpx;
+  margin-top: 60rpx;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  font-weight: 400;
+}
+
+.panel31 {
+  font-weight: 600;
+}
+
+.panelFooter {
+  background: #E3E3E3;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  height: 260rpx;
+  color: #F2F2F2;
+  font-size: 24rpx;
+}
+
+.panelFooter1 {
+  width: 570rpx;
+  height: 140rpx;
+  background: #1E1E1E;
+  border-radius: 10rpx 0 0 60rpx;
+  box-shadow: 0 30rpx 0 0 #0C0C0C, 0 50rpx 0 0 rgba(0, 0, 0, 0.60);
+}
+
+.panelFooter10 {
+  width: 560rpx;
+  height: 120rpx;
+  background: rgba(255, 255, 255, 0.08);
+  border-radius: 5rpx 10rpx 10rpx 50rpx;
+}
+
+.panelFooter2 {
+  width: 160rpx;
+  height: 140rpx;
+  background: #1E1E1E;
+  border-radius: 0 10rpx 60rpx 0;
+  box-shadow: 0 30rpx 0 0 #0C0C0C, 0 50rpx 0 0 rgba(0, 0, 0, 0.60);
+}
+
+.panelFooter20 {
+  width: 140rpx;
+  height: 120rpx;
+  background: rgba(255, 255, 255, 0.08);
+  border-radius: 10rpx 5rpx 50rpx 10rpx;
+}
+
+.panelFooter11 {
+  font-family: Teko-SemiBold;
+  font-size: 36rpx;
+  text-align: center;
+}
+
+.sysIcon_b05 {
+  width: 20rpx;
+  height: 20rpx;
+}
+
+.panelFooter120 {
+  margin-top: 17rpx;
+}
+
+.menuContainer {
+  width: 100%;
+  position: fixed;
+  top: 0;
+  background: rgba(0, 0, 0, 0.50);
+  z-index: 10;
+  justify-content: flex-start;
+}
+
+.panelMenu {
+  position: fixed;
+  bottom: 70rpx;
+  width: 690rpx;
+  min-height: 726rpx;
+  border-radius: 60rpx;
+  justify-content: flex-start;
+  background: #FFFFFF;
+  box-shadow: 0 20rpx 0 0 #9B9B9B, 0 50rpx 0 0 rgba(0, 0, 0, 0.50);
+}
+
+.panelMenu1 {
+  width: 100%;
+  margin-top: 40rpx;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+
+.panelMenu11 {
+  font-size: 36rpx;
+  color: #2E2E2E;
+  width: 580rpx;
+  margin-left: 60rpx;
+}
+
+.panelMenu12 {
+  width: 60rpx;
+  height: 60rpx;
+  margin-right: 40rpx;
+  border-radius: 50%;
+  background-color: #f0f0f0;
+}
+
+.sysIcon_b03 {
+  width: 20rpx;
+  height: 20rpx;
+}
+
+.panelMenu2 {
+  font-size: 24rpx;
+  color: #787878;
+  margin: 70rpx 0 20rpx 60rpx;
+  align-self: start;
+}
+
+.panelMenu3 {
+  width: 100%;
+  align-items: flex-start;
+}
+
+.panelMenu31 {
+  width: 100%;
+  height: 100rpx;
+  justify-content: flex-start;
+}
+
+.sysIcon_b04 {
+  width: 40rpx;
+  height: 34rpx;
+  margin: 0 30rpx 0 70rpx;
+}
+
+.panelMenu311 {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #2E2E2E;
+  justify-content: flex-start;
+}
+
+.panelMenu3111 {
+  width: 444rpx;
+}
+
+.panelMenu31111 {
+  font-weight: 600;
+}
+
+.sysIcon_a01 {
+  width: 16rpx;
+  height: 26rpx;
+}
+
+.panelLine3 {
+  width: 490rpx;
+  height: 1rpx;
+  background-color: #e3e3e3;
+  margin-left: 140rpx;
+}
+
+.panelMenu4 {
+  width: 590rpx;
+  height: 90rpx;
+  background-color: #f0f0f0;
+  border-radius: 20rpx;
+  margin-top: 60rpx;
+  font-size: 36rpx;
+  font-weight: 600;
+}

pages_test/knowledge/unit.js

@@ -6,26 +6,116 @@ const app = getApp();
 Page({
   data: {
     Menu:0,
-  },
-  onPullDownRefresh: function () {
-    wx.stopPullDownRefresh();
+    TestArr:[],
+    TestItemArr:[{
+      ID:1,
+      Icon:"sysIcon_d01",
+      Time:"2024年9月19日 20:21",
+      Right:10,
+      Wrong:3,
+    }, {
+      ID:2,
+      Icon:"sysIcon_d02",
+      Time:"未检验",
+      Right:0,
+      Wrong:0,
+    }],
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      ImagePath: app.globalData.uploadImageUrl,
+      Category1:options.Category1,
+      Category2:options.Category2,
+      Category3:options.Category3,
+      Name1:options.Name1,
+      WordType:options.WordType,
+      WordNum:options.WordNum,
+      BookID:options.BookID,
+      LibraryID:options.LibraryID,
+      LibraryName:options.LibraryName,
+      BookName:options.BookName,
+      KnowledegImageName:options.KnowledegImageName,
     });
+    that.init(options);
   },
-  onShow:function(){
+  init:function(options){
     var that = this;
+    main.getData('GetMiaoguoTestUnit?Category1='+options.Category1+'&Name1='+options.Name1+'&BookID='+options.BookID+'&UserID='+app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        var readNum=0,writeNum=0,readRate=0,writeRate=0;
+        var list1=data.List1;
+        for(var i=0;i<list1.length;i++){
+          if (list1[i].IsTestRead || list1[i].IsBuildRead)
+            readNum++;
+          if (list1[i].IsTestWrite || list1[i].IsBuildWrite)
+            writeNum++;
+            
+          if (!list1[i].List)
+          list1[i].List=list1[i].ListStr.split("、");
+        }
+        that.setData({
+          List:list1,
+          TestArr:data.List2,
+          ReadNum:readNum,
+          ReadRate:Math.round(100*readNum/list1.length),
+          WriteNum:writeNum,
+          WriteRate:Math.round(100*writeNum/list1.length),
+        });
+      }
+    });
+
+    if (options.Name1=="写字" || options.Name1=="识字" || options.Name1=="词语"){
+      var date=new Date();
+      var today=common.formatDateCHS(common.formatTime(date,"-",true));
+      var date0=(date.getFullYear()-1).toString()+"年09月";
+      var date1=date.getFullYear()+"年03月";
+      var date2=date.getFullYear()+"年09月";
+      var updateTime=date0;
+      if (today>=date1)
+        updateTime=date1;
+      if (today>=date2)
+        updateTime=date2;
+      that.setData({
+        UpdateTime:updateTime,
+      });
+    }
   },
   setMenu:function(e){
     var that=this;
-    var index=e.currentTarget.dataset.index;
+    var menu=e.currentTarget.dataset.menu;
     that.setData({
-      Menu:index,
+      Menu:menu,
     });
   },
+  setMenu2:function(e){
+    var that=this;
+    var menu=e.currentTarget.dataset.menu;
+    var index=e.currentTarget.dataset.index;
+    var item=that.data.List[index];
+
+    if (item && (!item.List || item.ListStr=="")){
+      main.getData('GetMiaoguoTestExamine?UserID='+app.globalData.userInfo.UserID+'&Category1='+that.data.Category1+'&BookID='+that.data.BookID+'&Name='+that.data.Name2+'&UnitID='+item.ID+'&TestType=read', function (data) {
+        if (data) {
+          item.List=[];
+          for(var i=0;i<data.length;i++){
+            item.List.push(data[i].Word);
+          }
+          that.setData({
+            Menu2:menu,
+            SelectedItem:item,
+          });
+        }
+      });
+    }
+    else{
+      that.setData({
+        Menu2:menu,
+        SelectedItem:item,
+      });
+    }
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages_test/knowledge/unit.json

@@ -1,5 +1,6 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTitleText": "单元",
+  "backgroundColorBottom": "#e3e3e3",
   "backgroundColor": "#fff"
 }

pages_test/knowledge/unit.wxml

@@ -1,9 +1,11 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexColumn">
     <view class="panel11 FlexColumn">
-      <view class="panel111">一年级上学期</view>
-      <view class="panel112">词语</view>
+      <view class="panel111">{{Category2}}{{Category3}}</view>
+      <view class="panel112">{{Name1}}</view>
       <view class="panel113"></view>
+      <image class="panel1Logo" src='{{ImagePath}}web/_knowledge/{{KnowledegImageName}}_b.png' />
+    
     </view>
     <view class="panel12 FlexColumn">
       <view class="panel121 FlexRow">
@@ -12,16 +14,16 @@
           <view class="panel12112">内容</view>
         </view>
         <view class="panel1212 FlexRow">
-          30个单元 ｜ 128个汉字
+          {{List.length}}个单元 ｜ {{WordNum}}个{{WordType}}
         </view>
       </view>
-      <view class="panel121 FlexRow">
+      <view class="panel121 FlexRow" wx:if="{{UpdateTime}}">
         <view class="panel1211 FlexRow">
           <view class="panel12111"></view>
           <view class="panel12112">更新</view>
         </view>
         <view class="panel1212 FlexRow">
-          2024年9月
+          {{UpdateTime}}
         </view>
       </view>
     </view>
@@ -29,78 +31,232 @@
     <view class="panel13">
       检验情况
     </view>
-    <view class="panel14 FlexColumn">
+    <view class="panel14 FlexColumn" wx:if="{{List[0].ButtonString[0]}}">
       <view class="panel141 FlexRow">
         <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
-        <view>念汉字</view>
+        <view>{{List[0].ButtonString[0]}}</view>
       </view>
       <view class="panel142 FlexRow">
-        <view class="panel1421 FlexRow">
+        <view class="panel1421 FlexRow" >
+          <view class="panel14211" style="width:{{ReadRate}}%;"></view>
         </view>
-        <view class="panel1422">0 / 6</view>
+        <view class="panel1422">{{ReadNum}} / {{List.length}}</view>
       </view>
     </view>
-    <view class="panel14 FlexColumn">
+    <view class="panel14 FlexColumn" wx:if="{{List[0].ButtonString[1]}}">
       <view class="panel141 FlexRow">
         <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
-        <view>写汉字</view>
+        <view>{{List[0].ButtonString[1]}}</view>
       </view>
       <view class="panel142 FlexRow">
-        <view class="panel1421 FlexRow">
+        <view class="panel1421 FlexRow" >
+          <view class="panel14211" style="width:{{WriteRate}}%;"></view>
         </view>
-        <view class="panel1422">0 / 6</view>
+        <view class="panel1422">{{WriteNum}} / {{List.length}}</view>
       </view>
     </view>
+    <view style="width: 100%;height:100rpx;"></view>
   </view>
 
   <view class="panel2 FlexColumn">
     <view class="panel21 FlexRow">
-      <view class="panel211 panel2110{{Menu}} FlexRow" bind:tap="setMenu" data-index="0">单元</view>
-      <view class="panel211 panel2111{{Menu}} FlexRow" bind:tap="setMenu" data-index="1">检验记录</view>
+      <view class="panel211 panel2110{{Menu}} FlexRow" bind:tap="setMenu" data-menu="0">单元</view>
+      <view class="panel211 panel2111{{Menu}} FlexRow" bind:tap="setMenu" data-menu="1">检验记录</view>
     </view>
 
-    <view wx:if="{{Menu==0}}" class="panel22 FlexColumn" wx:for="{{[1,2,3,4,5]}}" wx:key="*this">
+    <view wx:if="{{Menu==0}}" class="panel22 FlexColumn" wx:for="{{List}}" wx:key="*this" bind:tap="setMenu2" data-menu="1" data-index="{{index}}">
       <view class="panel221 FlexRow">
-        <view class="panel2211">课文3</view>
-        <view class="panel2212">14</view>
+        <view class="panel2211">{{item.LessonName}}</view>
+        <view class="panel2212">{{item.Length}}</view>
       </view>
-      <view class="panel222">
-        天空、人民、冬天、喜欢、夏天、江河、湖海、田地、工作
+      <view class="panel222" wx:if="{{item.ListStr}}">
+        {{item.ListStr}}
       </view>
       <view class="panel223 FlexRow">
         <view class="panel2231 FlexRow">
           <image src="../images/sysIcon_c02.png" class="sysIcon"></image>
-          <view class="panel22311"></view>
-          <view class="panel22311 panel223110"></view>
+          <view class="panel22311" wx:if="{{!item.IsBuildRead}}"></view>
+          <view class="panel22311 panel223110" wx:if="{{item.IsBuildRead}}"></view>
+          <view class="panel22311" wx:if="{{!item.IsBuildWrite}}"></view>
+          <view class="panel22311 panel223110" wx:if="{{item.IsBuildWrite}}"></view>
         </view>
         <view class="panel2232 FlexRow">
-          <image src="../images/sysIcon_d01.png" class="sysIcon sysIcon_50"></image>
-          <image src="../images/sysIcon_d02.png" class="sysIcon"></image>
+          <image wx:if="{{item.IsTestRead}}" src="../images/sysIcon_d01.png" class="sysIcon sysIcon_50"></image>
+          <image wx:if="{{!item.IsTestRead}}" src="../images/sysIcon_d03.png" class="sysIcon sysIcon_50"></image>
+          <image wx:if="{{item.IsTestWrite}}" src="../images/sysIcon_d02.png" class="sysIcon"></image>
+          <image wx:if="{{!item.IsTestWrite}}" src="../images/sysIcon_d04.png" class="sysIcon"></image>
         </view>
       </view>
     </view>
 
-    <view wx:if="{{Menu==1}}" class="panel22 FlexColumn" wx:for="{{[1]}}" wx:key="*this">
-      <view class="panel223 panel2230 FlexRow">
-        <view class="panel2231 FlexRow">
-          2024年9月19日 20:21
+    <block wx:if="{{Menu==1 && TestArr.length>0}}">
+      <view class="panel22 FlexColumn" wx:for="{{TestArr}}" wx:key="*this">
+        <view class="panel223 panel2230 FlexRow">
+          <view class="panel2231 FlexRow">
+            {{item.TestTime}}
+          </view>
+          <view class="panel2232 FlexRow">
+            <image src="../images/sysIcon_d01.png" class="sysIcon" wx:if="{{item.IsTestRead}}"></image>
+            <image src="../images/sysIcon_d02.png" class="sysIcon" wx:if="{{item.IsTestWrite}}"></image>
+            <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
+            <view class="panel22321">{{item.RightNum}}</view>
+            <image src="../images/sysIcon_b02.png" class="sysIcon_b01"></image>
+            <view class="panel22321">{{item.WrongNum}}</view>
+          </view>
         </view>
-        <view class="panel2232 FlexRow">
-          <image src="../images/sysIcon_d01.png" class="sysIcon"></image>
+        <view class="panel221 panel220 FlexRow">
+          <view class="panel2211">{{item.UnitName}}</view>
+        </view>
+        <view class="panel222">
+          {{item.Category}} \ {{item.LibraryName}} \ {{item.BookName}}
+        </view>
+      </view>
+    </block>
+
+    <block wx:if="{{Menu==1 && TestArr.length==0}}">
+      <view class="panelNull FlexColumn">
+        <view class="panelNull1 FlexRow">
+          <view class="panelNull11 FlexRow"></view>
+          <view class="panelNull12 FlexRow"></view>
+          <view class="panelNull12 FlexRow"></view>
+          <view class="panelNull12 FlexRow"></view>
+        </view>
+        <view class="panelNull11 panelNull2"></view>
+        <view class="panelNull3">暂无记录</view>
+        <text class="panelNull4">请在知识包中选择单元检验一次。\n检验必须做完才有记录，中途退出后下次是无法继续的。</text>
+      </view>
+    </block>
+    
+    <view style="width: 100%;height:100rpx;"></view>
+  </view>
+
+</view>
+
+<!-- 单元菜单 -->
+<view wx:if="{{Menu2==1}}" class="menuContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelMenu FlexColumn">
+    <view class="panelMenu1 FlexRow">
+      <view class="panelMenu11">{{SelectedItem.LessonName}}</view>
+      <view class="panelMenu12 FlexRow" bind:tap="setMenu2" data-menu="0">
+        <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
+      </view>
+    </view>
+    <view class="panelMenu2">检验方式</view>
+    <view class="panelMenu3 FlexRow">
+      <block wx:if="{{!SelectedItem.ButtonString[0] || !SelectedItem.ButtonString[1]}}">
+        <view class="panelMenu310 FlexColumn" bind:tap="goto" data-url="./examine?testtype=read&category1={{Category1}}&libraryid={{LibraryID}}&bookid={{BookID}}&unitsid={{SelectedItem.ID}}&LibraryName={{LibraryName}}&BookName={{BookName}}&UnitName={{SelectedItem.LessonName}}&TestTypeName={{SelectedItem.ButtonString[0]}}{{SelectedItem.ButtonString[1]}}">
+          <view class="panelMenu311 panelMenu3110 FlexColumn">
+            <image wx:if="{{SelectedItem.ButtonString[0]}}" src="../images/sysIcon_d05.png" class="sysIcon_d05"></image>
+            <image wx:if="{{SelectedItem.ButtonString[1]}}" src="../images/sysIcon_d06.png" class="sysIcon_d05"></image>
+          </view>
+          <view class="panelMenu312">
+            {{SelectedItem.ButtonString[0]}}{{SelectedItem.ButtonString[1]}}
+          </view>
+        </view>
+      </block>
+      <block wx:if="{{SelectedItem.ButtonString[0] && SelectedItem.ButtonString[1]}}">
+        <view class="panelMenu31 FlexColumn" bind:tap="goto" data-url="./examine?testtype=read&category1={{Category1}}&libraryid={{LibraryID}}&bookid={{BookID}}&unitsid={{SelectedItem.ID}}&LibraryName={{LibraryName}}&BookName={{BookName}}&UnitName={{SelectedItem.LessonName}}&TestTypeName={{SelectedItem.ButtonString[0]}}">
+          <view class="panelMenu311 FlexColumn">
+            <image src="../images/sysIcon_d05.png" class="sysIcon_d05"></image>
+          </view>
+          <view class="panelMenu312">{{SelectedItem.ButtonString[0]}}</view>
+        </view>
+        <view class="panelMenu31 FlexColumn" bind:tap="goto" data-url="./examine?testtype=write&category1={{Category1}}&libraryid={{LibraryID}}&bookid={{BookID}}&unitsid={{SelectedItem.ID}}&LibraryName={{LibraryName}}&BookName={{BookName}}&UnitName={{SelectedItem.LessonName}}&TestTypeName={{SelectedItem.ButtonString[1]}}">
+          <view class="panelMenu311 FlexColumn">
+            <image src="../images/sysIcon_d06.png" class="sysIcon_d05"></image>
+          </view>
+          <view class="panelMenu312">{{SelectedItem.ButtonString[1]}}</view>
+        </view>
+      </block>
+      
+    </view>
+    <view class="panelMenu4 FlexRow">
+      <view class="panelMenu41 FlexColumn" catch:tap="setMenu2" data-menu="2">
+        <image src="../images/sysIcon_c05.png" class="sysIcon_c05"></image>
+        <view class="panelMenu411">查看字表</view>
+      </view>
+      <view class="panelMenu41 FlexColumn" catch:tap="setMenu2" data-menu="3">
+        <image src="../images/sysIcon_c04.png" class="sysIcon_c05"></image>
+        <view class="panelMenu411">跳过检验直接生成题卡</view>
+      </view>
+    </view>
+
+    <view class="panelMenu2">检验记录</view>
+    <block wx:for="{{TestItemArr}}" wx:key="*this">
+      <view class="panelMenu5 FlexRow" >
+        <view class="panelMenu51 FlexRow">
+          <image src="../images/{{item.Icon}}.png" class="sysIcon_d01"></image>
+          <view class="panelMenu511">{{item.Time}}</view>
+        </view>
+        <view class="panelMenu52 FlexRow" wx:if="{{item.Right>0 && item.Wrong>0}}">
           <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
-          <view class="panel22321">10</view>
+          <view class="panel22321">{{item.Right}}</view>
           <image src="../images/sysIcon_b02.png" class="sysIcon_b01"></image>
-          <view class="panel22321">2</view>
+          <view class="panel22321">{{item.Wrong}}</view>
+          <image src="../images/sysIcon_a01.png" class="sysIcon_a01"></image>
         </view>
       </view>
-      <view class="panel221 panel220 FlexRow">
-        <view class="panel2211">课文3</view>
+      <view class="panelLine2"></view>
+    </block>
+    
+    <view style="width:100%;height:50rpx;"></view>
+   </view>
+</view>
+
+<!-- 生成题卡格式 -->
+<view wx:if="{{Menu2==3}}" class="menuContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelMenu6 FlexColumn">
+    <view class="panelMenu61 FlexRow">
+      <view class="panelMenu611">选择格式</view>
+      <view class="panelMenu612 panelMenu12 FlexRow" bind:tap="setMenu2" data-menu="1">
+        <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
       </view>
-      <view class="panel222">
-        英语 \ 1000词 \ 第一部分
+    </view>
+    <view class="panelMenu62"></view>
+    <view class="panelMenu63 FlexColumn">
+      <view class="panelMenu631 FlexRow">
+        <image src="../images/sysIcon_b04.png" class="sysIcon_b04"></image>
+        <view class="panelMenu6311 FlexColumn">
+          <view class="panelMenu63111 FlexRow">
+            <image src="../images/sysIcon_d01.png" class="sysIcon_d01"></image>
+            <view class="panelMenu631111">念单词说含义</view>
+          </view>
+          <view class="panelMenu63112">这里有一行和方式对应的说明</view>
+        </view>
       </view>
+      <view class="panelLine3"></view>
     </view>
-    <view style="height:100rpx"></view>
+    <view class="panelMenu63 panelMenu630 FlexColumn">
+      <view class="panelMenu631 FlexRow">
+        <view class="sysIcon_b04"></view>
+        <view class="panelMenu6311 FlexColumn">
+          <view class="panelMenu63111 FlexRow">
+            <image src="../images/sysIcon_d02.png" class="sysIcon_d01"></image>
+            <view class="panelMenu631111 panelMenu631110">听写单词</view>
+          </view>
+          <view class="panelMenu63112">这里有一行和方式对应的说明</view>
+        </view>
+      </view>
+      <view class="panelLine3"></view>
+    </view>
+    <view class="panelMenu64 FlexRow">生成题卡</view>
+  </view>
+</view>
+
+<!-- 字表 -->
+<view wx:if="{{Menu2==2}}" class="menuContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelMenu6 panelMenu7 FlexColumn">
+    <view class="panelMenu61 FlexRow">
+      <view class="panelMenu611 panelMenu711">{{SelectedItem.List.length}}</view>
+      <view class="panelMenu612 panelMenu12 FlexRow" bind:tap="setMenu2" data-menu="1">
+        <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
+      </view>
+    </view>
+    <scroll-view scroll-y="true" class="panelMenu72 FlexColumn">
+      <view class="panelMenu721 FlexColumn" wx:for="{{SelectedItem.List}}">
+        <text class="panelMenu7211">{{item}}</text>
+        <view class="panelLine4"></view>
+      </view>
+    </scroll-view>
   </view>
-  
 </view>

pages_test/knowledge/unit.wxss

@@ -1,10 +1,11 @@
 .container {
-  background-color: #fff;
+  background-color: #E3E3E3;
   font-weight: 600;
 }
 
 .panel1 {
   width: 100%;
+  background-color: #fff;
 }
 
 .panel11 {
@@ -12,8 +13,16 @@
   color: #2E2E2E;
   justify-content: flex-start;
   align-items: flex-start;
+  position: relative;
 }
 
+.panel1Logo{
+  width:250rpx;
+  height:190rpx;
+  position: absolute;
+  top:0;
+  right:0;
+}
 .panel111 {
   margin: 40rpx 0 0 50rpx;
   font-size: 24rpx;
@@ -110,6 +119,12 @@
   height: 16rpx;
   background-color: #F0F0F0;
   border-radius: 8rpx;
+  justify-content: flex-start;
+}
+.panel14211 {
+  height:16rpx;
+  background-color: #FF8451;
+  border-radius: 8rpx;
 }
 
 .panel1422 {
@@ -124,7 +139,7 @@
   border-radius: 40rpx 40rpx 0 0;
   background-color: #E3E3E3;
   width: 100%;
-  margin-top: 50rpx;
+  margin-top: -50rpx;
 }
 
 .panel21 {
@@ -201,6 +216,8 @@
   font-weight: 400;
   color:#787878;
   margin-top: 10rpx;
+  overflow-y: hidden;
+  height:33rpx;
 }
 
 .panel223{
@@ -260,4 +277,309 @@
   font-size: 28rpx;
   color: #4D4D4D;
   margin-top: 7rpx;
+}
+
+.menuContainer{
+  width:100%;
+  position: fixed;
+  top:0;
+  background: rgba(0,0,0,0.50);
+  z-index: 10;
+}
+
+.panelMenu{
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  border-radius: 60rpx 60rpx 0 0;
+  background-color: #fff;
+}
+
+.panelMenu1{
+  width: 100%;
+  margin-top: 50rpx;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+.panelMenu11{
+  font-size: 28rpx;
+  color: #2E2E2E;
+  width:580rpx;
+  margin-left: 40rpx;
+}
+.panelMenu12{
+  width:60rpx;
+  height:60rpx;
+  margin-right: 40rpx;
+  border-radius: 50%;
+  background-color: #f0f0f0;
+}
+.sysIcon_b03{
+  width:20rpx;
+  height:20rpx;
+}
+
+.panelMenu2{
+  margin: 40rpx 0 40rpx 40rpx;
+  font-size: 28rpx;
+  color: #2E2E2E;
+  align-self: start;
+}
+.panelMenu3{
+  background-color: #f0f0f0;
+  border-radius: 20rpx;
+}
+
+.panelMenu31{
+  width:345rpx;
+}
+
+.panelMenu310{
+  width:690rpx;
+}
+
+.panelMenu311{
+  margin-top: 30rpx;
+  width: 290rpx;
+  background: #FF8451;
+  border: 6rpx solid rgba(255,90,45,0.70);
+  box-shadow: 0 16rpx 0 0 #B73B3E, 0 34rpx 0 0 rgba(0,0,0,0.14);
+  border-radius: 30rpx;
+}
+
+.panelMenu3110{
+  width: 630rpx;
+}
+
+.sysIcon_d05{
+  width:50rpx;
+  height:50rpx;
+  margin: 35rpx 0;
+}
+
+.panelMenu312{
+  margin: 50rpx 0 30rpx 0;
+  font-size: 28rpx;
+  color:#2E2E2E;
+}
+
+.panelMenu4{
+  width:100%;
+  margin-top: 30rpx;
+}
+.panelMenu41{
+  width:330rpx;
+  background: #F8F8F8;
+  border: 1rpx solid #D2D2D2;
+  box-shadow: 0 6rpx 0 0 rgba(0,0,0,0.10);
+  border-radius: 20rpx;
+  font-size: 24rpx;
+  color: #2E2E2E;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin: 0 15rpx;
+}
+
+.sysIcon_c05{
+  width:30rpx;
+  height:30rpx;
+  margin: 30rpx 0 0 30rpx;
+}
+
+.panelMenu411{
+  font-size: 24rpx;
+  color: #2E2E2E;
+  margin: 20rpx 0 30rpx 30rpx;
+}
+
+.panelMenu5{
+  width: 100%;
+  height:100rpx;
+  justify-content: space-between;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #4D4D4D;
+}
+
+.panelLine2 {
+  width: 670rpx;
+  height: 1rpx;
+  background-color: #E3E3E3;
+}
+
+.panelMenu51{
+  margin-left: 50rpx;
+}
+.panelMenu511{
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #4D4D4D;
+  margin-left: 20rpx;
+}
+.panelMenu52{
+  margin-right: 70rpx;
+}
+.sysIcon_a01{
+  width:16rpx;
+  height:26rpx;
+  margin: 0 0 0 30rpx;
+}
+
+
+.panelNull{
+  width:650rpx;
+  justify-content: flex-start;
+}
+.panelNull1{
+  width:100%;
+  justify-content:space-between;
+}
+.panelNull11{
+  width:296rpx;
+  height:30rpx;
+  background: rgba(0,0,0,0.20);
+  border-radius: 15rpx;
+  margin-right: 204rpx;
+}
+.panelNull12{
+  width:30rpx;
+  height:30rpx;
+  background: rgba(0,0,0,0.20);
+  border-radius: 15rpx;
+}
+
+.panelNull2{
+  width:148rpx;
+  height:30rpx;
+  align-self: start;
+  margin-top: 12rpx;
+}
+.panelNull3{ 
+  align-self: start;
+  margin-top: 40rpx;
+  color:#4D4D4D;
+  font-size:28rpx;
+}
+.panelNull4{ 
+  align-self: start;
+  margin-top: 10rpx;
+  color:#4D4D4D;
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.panelMenu6{
+  background: #FFFFFF;
+  box-shadow: 0 20rpx 0 0 #9B9B9B, 0 50rpx 0 0 rgba(0,0,0,0.50);
+  border-radius: 60rpx;
+  position: fixed;
+  bottom:70rpx;
+  width:690rpx;
+  justify-content: flex-start;
+}
+.panelMenu61{
+  width: 100%;
+  height:120rpx;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+.panelMenu611{
+  margin:40rpx 0 0 60rpx;
+  font-size: 36rpx;
+  color:#1E1E1E;
+}
+.panelMenu612{
+  margin:30rpx 30rpx 0 0;
+}
+
+.panelMenu62{
+  width:590rpx;
+  height:280rpx;
+  background: #F8F8F8;
+  border: 1rpx solid #D2D2D2;
+  border-radius: 20rpx;
+  margin-top: 30rpx;
+}
+
+.panelMenu63{
+  width:100%;
+  height:140rpx;
+  margin-top: 30rpx;
+}
+.panelMenu630{
+  margin-top: 0rpx;
+}
+.panelMenu631{
+  width:100%;
+  justify-content: flex-start;
+}
+.sysIcon_b04{
+  width:40rpx;
+  height:34rpx;
+  margin: 0 30rpx 0 70rpx ;
+}
+.panelMenu6311{
+  align-items: flex-start;
+}
+.panelMenu631111{
+  font-size: 28rpx;
+  color: #2E2E2E;
+  margin-left: 10rpx;
+}
+.panelMenu631110{
+  font-weight: 400;
+}
+.panelMenu63112{
+  font-size: 24rpx;
+  color: #787878;
+}
+.panelLine3{
+  width:500rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin: 30rpx 50rpx 0 0;
+  align-self:flex-end;
+}
+
+.panelMenu64{
+  background: #F0F0F0;
+  border-radius: 20rpx;
+  width:590rpx;
+  height:90rpx;
+  margin:60rpx 0;
+  font-size: 36rpx;
+  color: #2E2E2E;
+  text-align: center;
+}
+
+
+.panelMenu7{
+  height:1100rpx;
+}
+
+.panelMenu711{
+  font-family: Teko-SemiBold;
+  font-size: 48rpx;
+  color: #2E2E2E;
+}
+.panelMenu72{
+  width:100%;
+  height:900rpx;
+}
+.panelMenu721{
+  width:570rpx;
+  margin-left: 60rpx;
+}
+.panelMenu7211{
+  width:100%;
+  margin: 30rpx 0;
+  font-size: 28rpx;
+  font-weight: 400;
+  columns: #2e2e2e;
+}
+
+.panelLine4{
+  width:570rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
 }

pages_test/test/item.js

@@ -76,6 +76,7 @@ Page({
       TestName2: options.name2,
     });
     main.GetHanziUnitWords(options.unitsid,that.data.TestType, function (data) {
+      //debugger;
       if (data) {
         TaskList=data;
         if (that.data.BookID==73){

project.private.config.json

@@ -7,8 +7,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages_test/knowledge/unit",
-          "pathName": "pages_test/knowledge/unit",
+          "name": "pages_test/knowledge/index",
+          "pathName": "pages_test/knowledge/index",
           "query": "",
           "launchMode": "default",
           "scene": null

utils/util.js

@@ -28,7 +28,7 @@ function checkIsArray(obj) {
   return Object.prototype.toString.call(obj) === '[object Array]';
 }
 
-function formatDateCHS(date) {
+function formatDateCHS(date,isLong) {
   if (date) {
     date = date.toString();
     var year = date.substr(0, 4);
@@ -37,6 +37,8 @@ function formatDateCHS(date) {
 
     if (year <= "1900")
       return "";
+    if (isLong)
+      return year + "年" + month + "月" + day + "日" +date.substr(10);
     else
       return year + "年" + month + "月" + day + "日";
   }