2.5.0

app.json

@@ -119,7 +119,7 @@
         "pages_agent"
       ]
     },
-    "pages_test/test/index": {
+    "pages_test/knowledge/index": {
       "network": "all",
       "packages": [
         "pages_test"

components/mp-weixin/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"node":"./node/node"}}

components/mp-weixin/index.wxml

@@ -0,0 +1 @@
+<view class="_root {{selectable?'_select':''}}" style="{{containerStyle}}"><slot wx:if="{{!nodes[0]}}"/><node id="_root" childs="{{nodes}}" opts="{{[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]}}" catchadd="_add"/></view>

components/mp-weixin/index.wxss

@@ -0,0 +1 @@
+._root{padding:1px 0;overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}._select{-webkit-user-select:text;user-select:text}

components/mp-weixin/node/node.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"node":"./node"}}

pages/index/index.js

@@ -17,7 +17,7 @@ Page({
     })
   },
   onLoad: function (options) {
-
+    var that = this;
     console.log("Time1:" + new Date().getTime());
     if (options) {
       if (options.UserID) {
@@ -187,15 +187,16 @@ Page({
     });
 
     this.updateProgram();
+
     this.getUserInfo();
     
-    var that = this;
     timeout1 = setTimeout(function () {
       that.setData({
         IsRefresh: true,
       })
     }, 15000);
   },
+  
   //得到用户信息
   getUserInfo: function (cb) {
     var that = this

pages/index/test.js

@@ -6,6 +6,7 @@ Page({
   data: {
     navbarInitTop: 0, //导航栏初始化距顶部的距离
     isFixedTop: false, //是否固定顶部
+    LaTeX: '$$x=\\frac{-b±\\sqrt{b^{2}-4ac}}{2a}$$'
   },
 
   /**

pages/index/test.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "mp-html": "../../components/mp-weixin"
+  }
 }

pages/index/test.wxml

@@ -2,6 +2,7 @@
 <view style="width: 90%; height: 300rpx; background: #f0f0f0; margin: 30rpx auto;">
   <canvas canvas-id="ringCanvas" class="canvas" bindtouchstart="touchHandler"></canvas>
 </view>
+<mp-html class="textLaTeX" content="{{LaTeX}}" />
 <view class="navbar-wrap">
  <view class="column {{isFixedTop?'fixed':''}}" id="navbar">
   <view class="block active">新品推荐</view>

pages/main/add.wxss

@@ -324,7 +324,7 @@ page{
 .panelItem .textBigWord {
   font-size: 42rpx;
   line-height: 42rpx;
-  font-weight: 600;
+  font-weight: 700;
 }
 .panelItem .textPinyin {
   text-decoration: underline;
@@ -495,7 +495,7 @@ page{
 
 .add {
   font-size: 42rpx;
-  font-weight: 600;
+  font-weight: 700;
   margin: 0 10rpx 10rpx 0;
 }
 

pages/main/cardmain.js

@@ -73,14 +73,22 @@ Page({
   },
   getFolderList: function (e) {
     var that = this;
+    var isnew =0;
+    if (e && e.currentTarget.dataset.isnew || app.globalData.FolderList.length==0)
+      isnew=1;
     var list = app.globalData.FolderList;
+    if (isnew)
+      list=[];
     common.getStorageValue(that, "FolderOrder", ["", "", "", "", "", "", "", ""], function () {
-      if (list.length == 0 || e) {
+      //debugger;
+      if (list.length == 0 || isnew) {
         var order = that.data.FolderOrder;
-        var url = "GetUserFolderList?UserID=" + app.globalData.userInfo.UserID;
+        var url = "GetUserFolderList?UserID=" + app.globalData.userInfo.UserID+"&IsNewData="+isnew;
+        if (e && e.currentTarget.dataset.order)
+          url+="&OrderType="+e.currentTarget.dataset.order;
         if (e) {
-          //url+="&OrderType="+e.currentTarget.dataset.order;
           order = ["", "", "", "", "", "", "", ""];
+          var index=0;
           order[e.currentTarget.dataset.index] = "PanelBtnSelect";
 
           wx.setStorageSync('FolderOrderStr', e.currentTarget.dataset.order);

pages/main/cardmain.wxml

@@ -140,7 +140,7 @@
 
   <view class='panelBottom FlexColumn' catchtap="">
     <view class='panelBottom1 FlexRow'>
-      <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages_test/test/index">
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../../pages_test/knowledge/index">
         <view>检验</view>
       </view>
       <view class='panelBottom11 FlexColumn' catchtap="gotoReLaunch" data-url="../../pages/main/default">
@@ -180,21 +180,20 @@
         <view class="PanelOrder32 PanelOrder31">按题卡清单更新时间</view>
       </view>
       <view class="PanelOrder2 FlexRow">
-        <view class="{{FolderOrder[1]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime asc" data-index='1'>最早</view>
-        <view class="{{FolderOrder[0]}} PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime desc" data-index='0'>最近</view>
-        <view class="{{FolderOrder[3]}} PanelOrderBtn" catchtap="getFolderList" data-order="Update asc" data-index='3'>最早</view>
-        <view class="{{FolderOrder[2]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="UpdateTime desc" data-index='2'>最近</view>
+        <view class="{{FolderOrder[1]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime asc" data-index='1' data-isnew="1">最早</view>
+        <view class="{{FolderOrder[0]}} PanelOrderBtn" catchtap="getFolderList" data-order="CreateTime desc" data-index='0' data-isnew="1">最近</view>
+        <view class="{{FolderOrder[3]}} PanelOrderBtn" catchtap="getFolderList" data-order="UpdateTime asc" data-index='3' data-isnew="1">最早</view>
+        <view class="{{FolderOrder[2]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="UpdateTime desc" data-index='2' data-isnew="1">最近</view>
       </view>
       <view class="PanelOrder1 FlexRow">
         <view class="PanelOrder31">按题卡数量</view>
         <view class="PanelOrder32 PanelOrder31">按卡单标题</view>
       </view>
       <view class="PanelOrder2 FlexRow">
-        <view class="{{FolderOrder[4]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="Total asc" data-index='4'>较少</view>
-        <view class="{{FolderOrder[5]}} PanelOrderBtn" catchtap="getFolderList" data-order="Total desc" data-index='5'>较多</view>
-        <view class="{{FolderOrder[6]}} PanelOrderBtn" catchtap="getFolderList" data-order="Name asc" data-index='6'>a-z</view>
-        <view class="{{FolderOrder[7]}} PanelOrderBtn3 PanelOrderBtn"  catchtap="getFolderList" data-order="Name desc" data-index='7'>z-a</view>
-        
+        <view class="{{FolderOrder[4]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="Total asc" data-index='4' data-isnew="1">较少</view>
+        <view class="{{FolderOrder[5]}} PanelOrderBtn" catchtap="getFolderList" data-order="Total desc" data-index='5' data-isnew="1">较多</view>
+        <view class="{{FolderOrder[6]}} PanelOrderBtn" catchtap="getFolderList" data-order="Name asc" data-index='6' data-isnew="1">a-z</view>
+        <view class="{{FolderOrder[7]}} PanelOrderBtn3 PanelOrderBtn"  catchtap="getFolderList" data-order="Name desc" data-index='7' data-isnew="1">z-a</view>
       </view>
       <view class="PanelOrderLine60"></view>
     </view>

pages/main/default.wxml

@@ -35,7 +35,7 @@
 
     <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/knowledge/index">
+      <view class='panelBottom11 FlexColumn' catchtap="goto" data-url="../../pages_test/knowledge/index">
         <view>检验</view>
       </view>
       <view class='panelBottom11 FlexColumn'>

pages/main/detail.wxml

@@ -224,9 +224,6 @@
         <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
       </view>
       <view class="panelLastTime3">点击左上角返回首页</view>
-      
-      
-
       <view class="panelLastFooter FlexColumn">
         <view class="panelLastFooter1 FlexRow">
           <view class="panelLastFooter11 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1">
@@ -238,11 +235,8 @@
             <view>详细报告</view>
           </view>
         </view>
-        <view class="panelLastFooter2 FlexColumn" bindtap="goto" data-url="../share/shareitem?TaskID=-1">
-          <image src="../images/icon_flag_3.png" class='icon_flag_3' />
-        </view>
+        <image src="../images/icon_flag_3.png" class='icon_flag_3' bindtap="goto" data-url="../share/shareitem?TaskID=-1"/>
       </view>
-      
     </view>
   </block>
   <!-- 今日任务量 -->

pages/main/detail.wxss

@@ -643,20 +643,13 @@ page{
   margin-bottom: 20rpx;
 }
 
-.panelLastFooter2{
-  background-image: linear-gradient(141deg, #746D6B 0%, #504846 100%);
+.icon_flag_3{
   border-radius: 10rpx;
-  width:80rpx;
-  height:100rpx;
+  width:120rpx;
+  height:150rpx;
   position: absolute;
-  bottom:90rpx;
-  left:150rpx;
-  justify-content: flex-end;
-}
-
-.icon_flag_3{
-  width:80rpx;
-  height:75rpx;
+  bottom:86rpx;
+  left:133rpx;
   border-radius: 0 0 10rpx 10rpx;
 }
 

pages/main/mainlist.js

@@ -128,8 +128,8 @@ Page({
         PrintID: options.PrintID,
       });
 
-      console.log("options.PrintUserID:"+options.PrintUserID);
-      console.log("app.globalData.userInfo.UserID:"+app.globalData.userInfo.UserID);
+      //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({
@@ -266,7 +266,7 @@ Page({
   getList: function () {
     var that = this;
     var list = app.globalData.CardList;
-    var len = 16;
+    var len = 100;
     for (var i = 0; i < list.length; i++) {
       var item = list[i];
       item.ScrollLeft = 0;
@@ -295,9 +295,11 @@ Page({
       if (imageUrl.length == 0 && item.Content[3].Content)
         imageUrl = getImage(item.Content[3].Content);
 
+      item.Width="650";
       if (imageUrl.length > 0) {
         item.ImageUrlTemp = main.getTempImage(imageUrl);
         item.ImageUrlServer = imageUrl;
+        item.Width="540";
       }
 
       if (item.FirstTime < "1900-01-02")
@@ -464,8 +466,9 @@ Page({
         else{
           var list=that.data.List;
           for(var i=0;i<list.length;i++){
-            if (list[i].MiaoguoCardID==id)
+            if (list[i].MiaoguoCardID==id){
               list[i].IsNullImage=true;
+            }
           }
 
           that.setData({
@@ -1332,8 +1335,9 @@ Page({
           that.saveMultipleData(mData,that.data.List);      
         }
         else{
-          if (id==0)
+          if (id==0){
             mData.Param.FolderID=0;
+          }
           else{
             var list=that.data.FolderList;
             for(var i=0;i<list.length;i++){
@@ -1366,6 +1370,7 @@ Page({
       var param=mData.Param;
       param[param.ListStr]=arr;
       //console.log(JSON.stringify(param));
+      //debugger;
       main.postData(sql, param, function (data) {
         
         list=that.updateSavedList(that.data.ShowMultiple,mData,list);

pages/main/mainlist.wxml

@@ -75,13 +75,14 @@
                 <image class="universalpic_errorpic_black_30x30" src='../images/universalpic_errorpic_black_30x30.png' />
               </view>
               
-              <view class="panelListItem11 FlexColumn">
+              <view class="panelListItem11 FlexColumn" style="width:{{item.Width}}rpx;">
                 <view class="panelListItem11Name1">
                   {{item.Content[1].ContentStr}}
                 </view>
                 <view class="panelListItem11Name2">
                   {{item.Content[2].ContentStr}}
                 </view>
+                <image src="../images/sysIcon_e05.png" class="sysIcon_e05"></image>
               </view>
             </view>
             <view class="panelListItem2 FlexRow">

pages/main/mainlist.wxss

@@ -372,20 +372,34 @@
 }
 
 .panelListItem11{
+  width:540rpx;
   max-width: 650rpx;
-  min-width:540rpx;
   height:80rpx;
   align-items: flex-start;
+  position: relative;
 }
 .panelListItem11Name1{
+  width: 100%;
   font-size: 30rpx;
   font-weight: 700;
-  overflow: hidden;
+  overflow-x: hidden;
+  white-space: nowrap;
 }
+
 .panelListItem11Name2{
+  width: 100%;
   font-size: 22rpx;
   font-weight: 400;
-  overflow: hidden;
+  overflow-x: hidden;
+  white-space: nowrap;
+}
+
+.sysIcon_e05{
+  position: absolute;
+  right:-30rpx;
+  top:0;
+  width:60rpx;
+  height:80rpx;
 }
 
 .panelListItem2{

pages/plan/taskBasic.wxml

@@ -155,7 +155,7 @@
     </view>
   </view>
 
-  <view class="panel3 panel1 FlexColumn" bindtap="gotoReLaunch" data-url="../../pages_test/test/index">
+  <view class="panel3 panel1 FlexColumn" bindtap="goto" data-url="../../pages_test/knowledge/index">
     <view class="panel21 FlexColumn">
       <view class="panel31 FlexRow">
         <text class="text1">去「检验」逛逛</text>

pages_agent/main/user_index.wxss

@@ -217,7 +217,7 @@
   background-color: #FE6659;
   text-align: center;
   font-size: 20rpx;
-  font-weight: 600;
+  font-weight: 700;
   color:#fff;
 }
 

pages_test/knowledge/build.js

@@ -2,16 +2,20 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
+var intervalBuild=0;
 
 Page({
   data: {
     BuildFinished:1,
+    BuildCardNumber:"0%",
+    Count:0,
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    that.buildCard(options.Count);
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
@@ -19,6 +23,61 @@ Page({
       url: url,
     });
   },
+  close: function (e) {
+    wx.navigateBack({
+      delta: 2,
+    });
+  },
+  gotoReLaunch: function (e) {
+    app.globalData.FolderList=[];
+    var url = e.currentTarget.dataset.url;
+    wx.reLaunch({
+      url: url,
+    });
+  },
+  buildCard: function (count) {
+    var that = this;
+    if (count > 0) {
+      that.setData({
+        BuildFinished: 0,
+        Count:count,
+      });
+      var buildCardNumber = 0;
+      if (intervalBuild!=null){
+        clearInterval(intervalBuild);
+        intervalBuild=null;
+      }
+      var timer=0;
+      intervalBuild = setInterval(function () {
+        if (count>0){
+          buildCardNumber++;
+          that.setData({
+            BuildCardNumber: Math.round(100 * buildCardNumber / count) + "%",
+          });
+          if (buildCardNumber >= count) {
+            clearInterval(intervalBuild);
+            buildCardNumber=0;
+            that.setData({
+              BuildFinished: 1,
+            });
+          }
+        }
+        else{
+          clearInterval(intervalBuild);
+        }
+
+        timer++;
+        if (timer>100)
+          clearInterval(intervalBuild);
+      }, 600);
+    }
+  },
+  addCard: function (card) {
+    var userid = app.globalData.userInfo.UserID;
+    main.postData('AddMiaoguoCard?Type='+cardType+'&UserID=' + userid, card, function (data) {
+
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_test/knowledge/build.json

@@ -5,5 +5,5 @@
     "navigation-bar": "/components/navigation-bar/navigation-bar"
   },
   "navigationStyle": "custom",
-  "backgroundColor": "#fff"
+  "backgroundColor": "#AAA8A5"
 }

pages_test/knowledge/build.wxml

@@ -7,17 +7,17 @@
     </block>
     <block wx:if="{{BuildFinished}}">
       <view class="panel11">已完成</view>
-      <view class="panel12">生成7张题卡</view>
+      <view class="panel12">生成{{Count}}张题卡</view>
     </block>
   </view>
   <view class="panel2 FlexRow">
-    <view wx:if="{{!BuildFinished}}" class="panel21">69%</view>
+    <view wx:if="{{!BuildFinished}}" class="panel21">{{BuildCardNumber}}</view>
     <block wx:if="{{BuildFinished}}">
-      <view class="panel22 FlexColumn">
+      <view class="panel22 FlexColumn" bind:tap="close">
         <image src="../images/sysIcon_b06.png" class="sysIcon_b06"></image>
         <view class="panel221">关闭</view>
       </view>
-      <view class="panel22 panel23 FlexColumn">
+      <view class="panel22 panel23 FlexColumn" bind:tap='gotoReLaunch' data-url="../../pages/main/cardmain">
         <image src="../images/sysIcon_a04.png" class="sysIcon_b06"></image>
         <view class="panel221">题卡管理</view>
       </view>
@@ -26,6 +26,8 @@
   <view class="panel3">
   </view>
   <view class="panel4 FlexColumn">
-    <image src="" class="panel41"></image>
+    <image src="../images/pic_04.gif" class="panel41" wx:if="{{!BuildFinished}}"></image>
+    <image src="../images/pic_04.png" class="panel41" wx:if="{{BuildFinished}}"></image>
+    <image src="../images/pic_05.png" class="panel42" wx:if="{{BuildFinished}}"></image>
   </view>
 </view>

pages_test/knowledge/build.wxss

@@ -1,3 +1,7 @@
+page{
+  background-color: #AAA8A5;
+}
+
 .container {
   background-color: #AAA8A5;
 }
@@ -66,6 +70,7 @@
 
 .panel4 {
   width: 100%;
+  position: relative;
 }
 
 .panel41 {
@@ -74,4 +79,12 @@
   margin-top: 120rpx;
   background-color: #fff;
   border-radius: 50%;
+}
+.panel42 {
+  width: 100rpx;
+  height: 108rpx;
+  border-radius: 50%;
+  position: absolute;
+  top:120rpx;
+  right:195rpx;
 }

pages_test/knowledge/examine.js

@@ -11,7 +11,6 @@ var timeoutPlayAudio;
 var tempPlayUrl = "";
 var tempPlayUrlLocal = "";
 var timeoutEveryCard = 0;
-var isFinished=0;
 
 Page({
   data: {
@@ -52,8 +51,6 @@ Page({
     
     this.audioCtx = wx.createAudioContext('myAudio');
 
-    isFinished = 0;
-
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
   },
@@ -111,7 +108,6 @@ Page({
     }
     //结束
     if (that.data.CurrentIndex>=TaskList.length){
-      isFinished = 1;
       that.onFinished();
     }
     else if (that.data.CurrentIndex <0) {
@@ -302,22 +298,11 @@ Page({
     });
     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.LibraryName1 = this.data.LibraryName1;
       TestTask.LibraryName2 = this.data.LibraryName2;
       TestTask.BookName = this.data.BookName;
@@ -326,9 +311,10 @@ Page({
       TestTask.BookID=this.data.BookID;
       TestTask.UnitID=this.data.UnitID;
       TestTask.List = TaskList;
+      TestTask.ReportType="new";
       app.globalData.TestTask=TestTask;
       wx.redirectTo({
-        url: './report?type=new',
+        url: './report',
       });
     }
     else{
@@ -356,6 +342,22 @@ Page({
         });
       });
   },
+  close: function (e) {
+    wx.showModal({
+      title: '提醒',
+      showCancel: true,
+      content: "中途退出将不保留检验进度，重新检验时需从头开始。若完成检验，系统将生成检验报告并创建相应的记忆卡。",
+      confirmText: "退出",
+      cancelText: "取消",
+      complete: (res) => {
+        if (res.confirm) {
+          wx.navigateBack({
+            delta: 1,
+          });
+        }
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_test/knowledge/examine.wxml

@@ -1,7 +1,7 @@
 <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 slot="left" bindtap="close">
+      <view class="square">退出</view>
     </view>
 </navigation-bar>
 
@@ -19,10 +19,6 @@
       </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" />
@@ -35,9 +31,6 @@
         <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>

pages_test/knowledge/index.js

@@ -10,10 +10,6 @@ Page({
     TestList:[],
     ImagePath: app.globalData.uploadImageUrl,
   },
-  onPullDownRefresh: function () {
-    wx.stopPullDownRefresh();
-    this.onShow();
-  },
   onLoad: function (options) {
     var that = this;
     that.setData({
@@ -22,7 +18,12 @@ Page({
   },
   onShow:function(){
     var that = this;
+    wx.showLoading({
+      title: '请稍候',
+      mask: true,
+    });
     main.getData('GetMiaoguoTestIndex?UserID='+app.globalData.userInfo.UserID, function (data) {
+      wx.hideLoading();
       if (data) {
         that.setData({
           List:data.List1,

pages_test/knowledge/index.json

@@ -2,6 +2,5 @@
   "navigationBarBackgroundColor": "#64C3F1",
   "navigationBarTitleText": "",
   "backgroundColor": "#C16C37",
-  "backgroundColorTop": "#64C3F1",
-  "enablePullDownRefresh": true
+  "backgroundColorTop": "#64C3F1"
 }

pages_test/knowledge/index.wxml

@@ -25,24 +25,20 @@
     <block wx:if="{{Menu==0}}">
       <view class="panel22" wx:if="{{List.List1.length>0 || List.List2.length>0}}">语文</view>
       <view class="panel23" wx:if="{{List.List1.length>0}}">上学期</view>
-      <scroll-view scroll-x class="panelTab" wx:if="{{List.List1.length>0}}">
-        <view class="Tab0"></view>
-        <view class="Tab FlexColumn" wx:for="{{List.List1}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
+      <view  class="panelTab_cn FlexRow" wx:if="{{List.List1.length>0}}">
+        <view class="Tab_cn FlexColumn" wx:for="{{List.List1}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
           <image class="Tab1" src="{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_c.png" ></image>
           <view class="Tab2">{{item.Name1}}</view>
         </view>
-        <view class="Tab00"></view>
-      </scroll-view>
+      </view>
 
       <view class="panel23 panel24" wx:if="{{List.List2.length>0}}">下学期</view>
-      <scroll-view scroll-x class="panelTab" wx:if="{{List.List2.length>0}}">
-        <view class="Tab0"></view>
-        <view class="Tab FlexColumn" wx:for="{{List.List2}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
+      <view class="panelTab_cn FlexRow" wx:if="{{List.List2.length>0}}">
+        <view class="Tab_cn FlexColumn" wx:for="{{List.List2}}" wx:key="index" bind:tap="goto" data-url="./unit?Category=语文&BookID={{item.ID}}&BookName={{item.Name1}}">
           <image class="Tab1" src="{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_c.png" ></image>
           <view class="Tab2">{{item.Name1}}</view>
         </view>
-        <view class="Tab00"></view>
-      </scroll-view>
+      </view>
 
       <view class="panel23 panel24" wx:if="{{List.List3 && List.List3!=''}}">课外拓展</view>
       <scroll-view scroll-x class="panelTab" wx:if="{{List.List3 && List.List3!=''}}">
@@ -51,6 +47,7 @@
           <view class="Tab30 FlexColumn">
             <view class="Tab31 FlexColumn">
               <view class="Tab311"><text>{{item.Name1}}\n{{item.Name2}}</text></view>
+              <image src="{{ImagePath}}web/_knowledge/picZs_cn_{{item.BookImageName}}_cov_c.png" class="picZs_en_book_cov_c"></image>
             </view>
             <view class="Tab32 FlexColumn">
               <view class="Tab321">{{item.Remark}}</view>
@@ -65,13 +62,14 @@
         <view class="Tab00"></view>
       </scroll-view>
 
-      <view class="panel23 panel24" wx:if="{{List.List4}}">英语</view>
+      <view class="panel22 panel24" wx:if="{{List.List4}}">英语</view>
       <scroll-view scroll-x class="panelTab" wx:if="{{List.List4}}">
         <view class="Tab0"></view>
         <view class="Tab3" wx:for="{{List.List4}}" wx:key="index" bind:tap="goto" data-url="./package?Category=English&LibraryName1={{item.Name1}}&LibraryName2={{item.Name2}}&BookImageName=picZs_en_{{item.BookImageName}}_cov">
           <view class="Tab30 FlexColumn">
             <view class="Tab31 FlexColumn">
               <view class="Tab311"><text>{{item.Name1}}\n{{item.Name2}}</text></view>
+              <image src="{{ImagePath}}web/_knowledge/picZs_en_{{item.BookImageName}}_cov_c.png" class="picZs_en_book_cov_c"></image>
             </view>
             <view class="Tab32 FlexColumn">
               <view class="Tab321">{{item.Remark}}</view>
@@ -89,7 +87,7 @@
       <view class="panel25 FlexColumn">要做好英语写作，光靠课本知识是不够的，这些知识包全面测试学生的听、说、读、写四个方面的英语能力水平，为写作的单词储备提供有力的支持。</view>
       <view class="panel26 FlexRow" bind:tap="goto" data-url="../../pages/other/grade"> 
         <image src="../images/sysIcon_c01.png" class="sysIcon_c01"></image>
-        <view class="panel261">更换推荐年级</view>
+        <view class="panel261">更换年级</view>
       </view>
     </block>
 
@@ -99,7 +97,7 @@
         <view wx:if="{{TestList.length>0}}" class="panel31 FlexColumn" wx:for="{{TestList}}" wx:key="index" bind:tap="goto" data-url="./report?ID={{item.ID}}">
           <view class="panel311 FlexRow">
             <view class="panel3111">{{item.TestTime}}</view>
-            <view class="panel3112 FlexRow">
+            <view class="panel3112 FlexRow" wx:if="{{item.RightNum || item.WrongNum}}">
               <image src="../images/sysIcon_d01.png" class="sysIcon_d01" wx:if="{{item.IsTestRead}}"></image>
               <image src="../images/sysIcon_d02.png" class="sysIcon_d01" wx:if="{{item.IsTestWrite}}"></image>
               <image src="../images/sysIcon_b01.png" class="sysIcon_b01"></image>
@@ -111,6 +109,9 @@
           <view class="panel312">{{item.UnitName}}</view>
           <view class="panel313">{{item.Category}} \ {{item.LibraryName1}}{{item.LibraryName2}} \ {{item.BookName}}</view>
           <view class="panel314"></view>
+
+          <view class="panel31 panel31masking" catch:tap="goto" data-url="" wx:if="{{!item.RightNum && !item.WrongNum}}"></view>
+     
         </view>
         <view class="panelNull FlexColumn" wx:if="{{TestList.length==0}}">
           <view class="panelNull1 FlexRow">

pages_test/knowledge/index.wxss

@@ -1,6 +1,7 @@
 .container {
   color: #1E1E1E;
-  font-weight: 600;
+  font-weight: 700;
+  background-color: #C16C37;
 }
 
 .pic_03 {
@@ -28,7 +29,6 @@
 
 .panel11 {
   font-size: 84rpx;
-
   z-index: 10;
   position: absolute;
   left: 50rpx;
@@ -55,6 +55,7 @@
   position: absolute;
   left: 50rpx;
   top: 349rpx;
+  font-weight: 700;
 }
 
 .panel16 {
@@ -155,6 +156,19 @@
   font-weight: 400;
 }
 
+.panelTab_cn {
+  width: 720rpx;
+  flex-wrap: wrap;
+  margin: 40rpx 0 0 0;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.Tab_cn {
+  margin: 0 10rpx 40rpx 10rpx;
+  width: 160rpx;
+}
+
 .panelTab {
   width: 100%;
   display: flex;
@@ -165,7 +179,7 @@
 .Tab {
   margin: 0 20rpx 0 0;
   display: inline-block;
-  width: 180rpx;
+  width: 160rpx;
 }
 
 .Tab0 {
@@ -181,12 +195,6 @@
 }
 
 .Tab1 {
-  /* width: 180rpx;
-  height: 140rpx;
-  background-image: linear-gradient(180deg, #FFF9F2 0%, #FEE2C1 100%);
-  box-shadow: 0 6rpx 0 0 rgba(0, 0, 0, 0.20);
-  box-shadow: 0 10rpx 0 0 rgba(0, 0, 0, 0.30);
-  border-radius: 20rpx; */
   width:155rpx;
   height:126rpx;
   margin-left: 10rpx;
@@ -200,7 +208,7 @@
 }
 
 .panel24 {
-  margin: 80rpx 0 0 50rpx;
+  margin: 20rpx 0 0 50rpx;
 }
 
 .Tab3 {
@@ -226,6 +234,7 @@
   background-color: #4D4D4D;
   justify-content: flex-start;
   align-items: flex-start;
+  position: relative;
 }
 
 .Tab311 {
@@ -234,6 +243,15 @@
   color: #F6F3F3;
 }
 
+.picZs_en_book_cov_c{
+  width:130rpx;
+  height:160rpx;
+  position: absolute;
+  bottom:0rpx;
+  right:0;
+  z-index: 10;
+}
+
 .Tab32 {
   margin-top: -10rpx;
   width: 380rpx;
@@ -262,7 +280,7 @@
 .Tab3221 {
   font-family: Teko-SemiBold;
   font-size: 36rpx;
-  margin: 7rpx 0 0 6rpx;
+  margin: 7rpx 0 0 10rpx;
 }
 
 .Tab33 {
@@ -282,7 +300,7 @@
 .panel26 {
   background: #6E3715;
   border-radius: 20rpx;
-  width: 234rpx;
+  width: 186rpx;
   height: 73rpx;
   color: #fff;
   font-size: 24rpx;
@@ -313,6 +331,15 @@
   position: relative;
 }
 
+.panel31masking{
+  position: absolute;
+  top:0;
+  left:0;
+  height:100%;
+  background: rgba(193,108,55,0.50);
+  z-index: 10;
+}
+
 .panel311 {
   margin: 10rpx 0 0 10rpx;
   width: 670rpx;

pages_test/knowledge/library.js

@@ -29,48 +29,42 @@ Page({
         that.setData({
           List:data,
         });
-        that.changeTab(options.Category);
+        that.setMenu1({currentTarget:{dataset:{category:options.Category}}});
       }
     });
   },
-  changeTab:function(category){
+  setMenu1:function(e){
     var that=this;
-    var menu1=0;
-    if (category=="语文")
+    var category=e.currentTarget.dataset.category;
+    var menu1;
+    if (category=="语文"){
       that.data.Menu2Array=[{ID:0,Name:"全部",CSS:"Selected"},{ID:1,Name:"小学",CSS:""},{ID:2,Name:"初中",CSS:""},{ID:3,Name:"课外拓展",CSS:""}];
+      menu1=0;
+    }
     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;
     }
+    for(var j=0;j<that.data.List.length;j++){
+        that.data.List[j].GradeSelected=1;
+    }
     that.setData({
       Menu2Array:that.data.Menu2Array,
       Menu1:menu1,
       MenuCategory:category,
-    });
-  },
-  setMenu1:function(e){
-    var that=this;
-    var index=e.currentTarget.dataset.index;
-    if (index==0)
-      that.changeTab("语文");
-    else
-      that.changeTab("English");
-    that.setData({
-      Menu1:index,
+      List:that.data.List,
     });
   },
   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;
+    //debugger;
     for(var i=0;i<list.length;i++){
       list[i].CSS="";
       if (index==list[i].ID){
         list[i].CSS="Selected";
         var menu=that.data.Menu2Array[index].Name;
-        //console.log(menu);
         for(var j=0;j<that.data.List.length;j++){
           if (index==0)
             that.data.List[j].GradeSelected=1;
@@ -81,15 +75,12 @@ Page({
             }
           }
         }
-        that.setData({
-          List:that.data.List,
-        });
-        break;
       }
     }
     that.setData({
       Menu2:index,
       Menu2Array:list,
+      List:that.data.List,
     });
   },
   goto: function (e) {

pages_test/knowledge/library.json

@@ -1,5 +1,6 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTitleText": "知识库",
+  "backgroundColorTop":"#AAA8A5",
   "backgroundColor": "#AAA8A5"
 }

pages_test/knowledge/library.wxml

@@ -1,16 +1,16 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexRow">
-    <view class="panel11 FlexColumn" bind:tap="setMenu1" data-index="0">
+    <view class="panel11 FlexColumn" bind:tap="setMenu1" data-category="语文">
       <view>语文</view>
       <view class="panel11Selected panel11Selected0{{Menu1}}"></view>
     </view>
-    <view class="panel12 FlexColumn" bind:tap="setMenu1" data-index="1">
+    <view class="panel12 FlexColumn" bind:tap="setMenu1" data-category="English">
       <view>English</view>
       <view class="panel11Selected panel11Selected1{{Menu1}}"></view>
     </view>
   </view>
-
   <view class="panel2 FlexColumn">
+    <view style="height:120rpx;"></view>
     <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="index" bind:tap="setMenu2" data-index="{{item.ID}}">{{item.Name}}</view>
@@ -30,5 +30,5 @@
       </view>
     </view>
   </view>
-  <view style="height:150rpx;"></view>
+  <view style="height:60rpx;"></view>
 </view>

pages_test/knowledge/library.wxss

@@ -1,6 +1,5 @@
 .container {
   background-color: #AAA8A5;
-  font-weight: 600;
 }
 
 .panel1 {
@@ -9,10 +8,12 @@
   background-color: #fff;
   color: #2E2E2E;
   align-items: flex-end;
+  position: fixed;
+  z-index: 100;
 }
 .panel11{
   font-size: 36rpx;
-  font-weight: 600;
+  font-weight: 700;
   margin: 0 50rpx;
   justify-content: flex-end;
 }
@@ -38,6 +39,7 @@
 
 .panel2{
   width:100%;
+  background-color: #AAA8A5;
 }
 
 .panel21{

pages_test/knowledge/package.js

@@ -7,6 +7,8 @@ var Options={};
 Page({
   data: {
     List:[],
+    BookImageName:"picZs_cn_g1F_cov",
+    ImagePath: app.globalData.uploadImageUrl,
   },
   onPullDownRefresh: function () {
     wx.stopPullDownRefresh();
@@ -20,7 +22,6 @@ Page({
       LibraryName1:options.LibraryName1,
       LibraryName2:options.LibraryName2,
       BookImageName:options.BookImageName,
-      ImagePath: app.globalData.uploadImageUrl,
     });
 
     Options=options;

pages_test/knowledge/package.json

@@ -1,5 +1,6 @@
 {
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTitleText": "知识包",
-  "backgroundColor": "#AAA8A5"
+  "backgroundColor": "#AAA8A5",
+  "backgroundColorTop":"#FFFFFF"
 }

pages_test/knowledge/package.wxml

@@ -10,15 +10,18 @@
 
   <view class="panel2 FlexColumn">
     <view class="panel21 FlexColumn" wx:for="{{List}}" wx:key="index" bind:tap="goto" data-url="./unit?Category={{Category}}&BookName={{item.BookName}}&BookID={{item.ID}}">
-      <image class="panel211Logo" src='{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_a.png' />
-      <view class="panel211 FlexColumn">
-        <text class="panel2111">{{item.BookName}}</text>
-        <view class="panel2112 FlexRow">
-          <view>{{item.WordType}}</view>
-          <view class="panel21121">{{item.WordNum}}</view>
+      <view class="panel211 FlexRow">
+        <view class="panel2110 FlexColumn">
+          <text class="panel2111">{{item.BookName}}</text>
+          <view class="panel2112 FlexRow">
+            <view>{{item.WordType}}</view>
+            <view class="panel21121">{{item.WordNum}}</view>
+          </view>
         </view>
-      </view>      
-      <view class="panel212 FlexColumn" wx:if="{{item.Remark}}">
+        <image class="panel211Logo" src='{{ImagePath}}web/_knowledge/{{item.KnowledgeImageName}}_a.png' />
+      </view>  
+      <view class="panelLine"></view>    
+      <view class="panel212 FlexColumn" wx:if="{{item.Remark && Category=='语文' && item.Grade!='课外拓展'}}">
         <view class="panel2121">{{item.Remark}}</view>
       </view>
       <view class="panel213 FlexRow" wx:for="{{item.TestFunction}}" wx:key="index" wx:for-item="itemChild">

pages_test/knowledge/package.wxss

@@ -1,6 +1,5 @@
 .container {
   background-color: #AAA8A5;
-  font-weight: 600;
 }
 
 .panel1 {
@@ -56,13 +55,16 @@
   width: 670rpx;
   margin-top: 60rpx;
   justify-content: flex-start;
-  position: relative;
 }
 
 .panel211{
   width: 550rpx;
-  margin: 60rpx 0 0 0;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+.panel2110{
   align-items: flex-start;
+  margin: 60rpx 0 0 0;
 }
 .panel2111{
   font-size: 48rpx;
@@ -73,7 +75,6 @@
   font-size: 24rpx;
   font-weight: 400;
   color:#4D4D4D;
-  margin-bottom: 30rpx;
 }
 
 .panel21121{
@@ -86,18 +87,18 @@
 .panel211Logo{
   width:200rpx;
   height:190rpx;
-  position: absolute;
-  right:0;
-  top:0;
 }
-
+.panelLine{
+  width:550rpx;
+  height:1rpx;
+  background-color: #e3e3e3;
+}
 .panel212{
   width:550rpx;
   font-size: 24rpx;
   font-weight: 400;
   color:#787878;
   margin-bottom: 20rpx;
-  border-top: 1rpx solid #E3E3E3;
 }
 
 .panel2121{
@@ -112,7 +113,7 @@
 .panel213{
   width:100%;
   height:66rpx;
-
+  justify-content: space-between;
 }
 
 .panel2131{
@@ -120,7 +121,7 @@
   height:16rpx;
   border-radius: 8rpx;
   background-color: #f0f0f0;
-  margin: 0 32rpx 0 0;
+  margin: 0 0 0 60rpx;
   justify-content: flex-start;
 }
 
@@ -129,7 +130,9 @@
   background-color: #FF8451;
   border-radius: 8rpx;
 }
-
+.panel2132{
+  margin-right: 60rpx;
+}
 .panel21321{
   font-family: Teko-SemiBold;
   font-size: 28rpx;

pages_test/knowledge/report.js

@@ -5,91 +5,167 @@ const app = getApp();
 
 Page({
   data: {
-    Count:0,
+    WordList:[],
     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"}
-    ]
+    FolderID:0,
+    MenuList:[{Name:"不分配（默认）",IsSelected:1},{Name:"分配到新卡单",IsSelected:0},{Name:"选择卡单",IsSelected:0,HasArrow:1}],
   },
   onLoad: function (options) {
     var that = this;
-    var testtask=app.globalData.TestTask;
     that.setData({
-      ReportType: options.type,
-      LibraryName1:testtask.LibraryName1,
-      LibraryName2:testtask.LibraryName2,
-      BookID:testtask.BookID,
-      BookName:testtask.BookName,
-      UnitName:testtask.UnitName,
-      TestTypeName:testtask.TestTypeName,
-      TestTime:common.formatDateCHS(common.formatTime(new Date()),1),
       Containnerheight: main.getWindowHeight(),
       ImagePath: app.globalData.uploadImageUrl,
+      List:[
+        {Name:"答错的",List:[],BColor:"#F26D5F",IsShow:1},
+        {Name:"不会的",List:[],BColor:"#787878",IsShow:1},
+        {Name:"答对的",List:[],BColor:"#51BE3D",IsShow:1},
+      ]
     });
-    that.init();
+
+    if (options.ID){
+      that.getReportID(options.ID,function(data){
+        app.globalData.TestTask=data;
+        that.init();
+      });
+    }
+    else{
+      that.init();
+    }
   },
   init: function () {
     var that = this;
     var TestTask = app.globalData.TestTask;
+    var date=common.formatDateCHS(common.formatTime(new Date()),1);
+    if (TestTask.ID)
+      date=TestTask.TestTime;
+
+    that.setData({
+      LibraryName1:TestTask.LibraryName1,
+      LibraryName2:TestTask.LibraryName2,
+      BookID:TestTask.BookID,
+      BookName:TestTask.BookName,
+      UnitID:TestTask.UnitID,
+      UnitName:TestTask.UnitName,
+      TestType:TestTask.TestType,
+      TestTypeName:TestTask.TestTypeName,
+      ReportType:TestTask.ReportType,
+      TestTime:date,
+    });
+
     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);
+      if (!TestTask.ID && TestTask.ReportType!="build"){
+        that.data.WordList=[];
+        for (var i = 0; i < list.length; i++) {
+          var item={};
+          
+          item.Word=list[i].Word; 
+          if (list[i].Result == -1) {
+            item.IsSelected=1;
+            that.data.List[0].List.push(item);
+            that.data.WordList.push(item.Word);
+          } else if (list[i].Result == 0) {
+            item.IsSelected=1;
+            that.data.List[1].List.push(item);
+            that.data.WordList.push(item.Word);
+          } else if (list[i].Result == 1) {
+            item.IsSelected=0;
+            that.data.List[2].List.push(item);
+          }
+        }
+
+        that.setData({
+          WordList: that.data.WordList,
+        });
+      }
+      else if (TestTask.ReportType=="build"){
+        for(var i=0;i<that.data.List.length;i++){
+          that.data.List[i].List=list[i];
+          if (i==0 || i==2)
+            that.data.List[i].IsShow=0;
+          else
+            that.data.List[i].Name="知识点";
         }
+
+        that.setData({
+          WordList:list[1],
+        });
       }
+      else
+        that.data.List=list;
+
       that.setData({
         List:that.data.List,
         TestTypeNumber:TestTypeNumber,
       });
 
-      if (that.data.ReportType == "new")
-        that.saveInfo(TestTask);
+      if (TestTask.ReportType == "new")
+        that.saveInfo();
     }
-
   },
-  saveInfo:function(e){
+  getReportID:function(id,callback){
+    var that=this;
+    main.getData('GetMiaoguoTestReportByID?ID='+id+'&UserID='+app.globalData.userInfo.UserID, function (data) {
+      for(var i=0;i<that.data.List.length;i++){
+        var arr=[];
+        for(var j=0;j<data.List[i].length;j++){
+          var obj={};
+          obj.IsSelected=0;
+          obj.Word=data.List[i][j];
+          arr.push(obj);
+        }
+        that.data.List[i].List=arr;
+      }
+      data.List=that.data.List;
+      callback(data);
+    });
+  },
+  saveInfo:function(){
     var that=this;
     var userid=app.globalData.userInfo.UserID;
     var param1={};
     param1.BookID=that.data.BookID;
+    param1.UnitID=that.data.UnitID;
     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){
-        
+    if (that.data.ReportType=="build"){
+      if (that.data.TestType=="read")
+        param1.IsBuildRead=1;
+      else
+        param1.IsBuildWrite=1;
+    }
+    else{
+      if (that.data.TestType=="read")
+        param1.IsTestRead=1;
+      else
+        param1.IsTestWrite=1;
+
+      var arrAll=[];
+      for(var i=0;i<that.data.List.length;i++){
+        var arr=[];
+        for(var j=0;j<that.data.List[i].List.length;j++){
+          arr.push(that.data.List[i].List[j].Word);
+        }
+        arrAll.push(arr);
       }
-    });
+      param1.JSONData=JSON.stringify(arrAll);
+    }
+    //debugger;
+    
+    main.postData('InsertTestReport2?UserID=' + userid, param1, function (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;
+    var list=that.data.List;
+    that.data.WordList=[];
     for(var i=0;i<list.length;i++){
       if (index==i){
         for(var j=0;j<list[i].List.length;j++){
@@ -106,39 +182,114 @@ Page({
       }
       for(var j=0;j<list[i].List.length;j++){
         if (list[i].List[j].IsSelected==1)
-          count++;
+          that.data.WordList.push(list[i].List[j]);
       }
     }
     that.setData({
       List:that.data.List,
-      Count:count,
+      WordList:that.data.WordList,
     });
   },
   setMenu:function(e){
     var that=this;
     var index=e.currentTarget.dataset.index;
-    that.setData({
-      Menu:index,
-    });
+    if (index==1 && that.data.WordList.length==0){
+      wx.showToast({
+        title: '请选择题卡',
+      });
+    }
+    else{
+      that.setData({
+        Menu:index,
+      });
+    }
   },
   setMenu2:function(e){
     var that=this;
     var index=e.currentTarget.dataset.index;
-    var list=that.data.MenuList,count=0;
+    var list=that.data.MenuList;
     for(var i=0;i<list.length;i++){
       list[i].IsSelected=0;
       if (index==i)
         list[i].IsSelected=1;
     }
+    if (index==0){
+      list[2].Name="选择卡单";
+      that.data.FolderID=0;
+    }
+    else if (index==1){
+      list[2].Name="选择卡单";
+      that.data.FolderID=-1;//-1表示要生成一个新卡单
+    }
     that.setData({
       MenuList:that.data.MenuList,
+      FolderID:that.data.FolderID,
+    });
+
+    if (index==2){
+      that.getFolder();
+    }
+  },
+  getFolder:function(){
+    var that=this;
+    main.getData('GetUserFolderList?UserID='+app.globalData.userInfo.UserID, function (data) {
+      that.setData({
+        FolderList:data,
+        Menu:2,
+      });
+    });
+  },
+  selectFolder:function(e){
+    var that=this;
+    var index=e.currentTarget.dataset.index;
+    var list=that.data.MenuList;
+    if (index==-1){
+      list[0].IsSelected=1;
+      list[2].IsSelected=0;
+      list[2].Name="选择卡单";
+      that.setData({
+        FolderID:0,
+      });
+    }
+    else{
+      list[2].IsSelected=1;
+      list[2].Name=that.data.FolderList[index].Name;
+      that.setData({
+        FolderID:that.data.FolderList[index].ID,
+      });
+    }
+    that.setData({
+      MenuList:that.data.MenuList,
+      Menu:1,
     });
   },
   buildCard:function(e){
-    var url = e.currentTarget.dataset.url;
+    var that=this;
+    that.setData({
+      Menu:0,
+    });
+    var param={};
+    param.BookID=app.globalData.TestTask.BookID;
+    param.UnitName=app.globalData.TestTask.UnitName;
+    param.UnitID=app.globalData.TestTask.UnitID;
+    param.TestType=app.globalData.TestTask.TestType;
+    if(that.data.ReportType=="build"){
+      param.WordList=[];
+      for(var i=0;i<that.data.WordList.length;i++)
+        param.WordList.push(that.data.WordList[i].Word);
+    }
+    else
+      param.WordList=that.data.WordList;
+    param.FolderID=that.data.FolderID;
+    main.postData('BuildMiaoguoTestCard?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
+      
+    });
     wx.navigateTo({
-      url: url,
+      url: "./build?Count="+that.data.WordList.length,
     });
+
+    if(that.data.ReportType=="build")
+      that.saveInfo();
   },
   closePanel:function(){
     wx.navigateBack({

pages_test/knowledge/report.wxml

@@ -4,13 +4,14 @@
     <view class="panel12">{{BookName}}</view>
     <view class="panel13">{{UnitName}}</view>
     <view class="panel14">{{TestTypeName}}</view>
-    <view class="panel15">{{TestTime}}</view>
+    <view class="panel15"><block wx:if="{{ReportType!='build'}}">{{TestTime}}</block></view>
     <view class="panelLine1"></view>
-    <view class="panel16">从以下检验结果中选择需要练习的知识点生成题卡，生成后即可前往首页开展日常练习。</view>
+    <view class="panel16" wx:if="{{ReportType!='build'}}">从以下检验结果中选择需要练习的知识点生成题卡，生成后即可前往首页开展日常练习。</view>
+    <view class="panel16" wx:if="{{ReportType=='build'}}">已跳过检验。本单元知识点如下，选择所需知识点可生成题卡。</view>
     <image src="../images/sysIcon_e0{{TestTypeNumber}}.png" class="sysIcon_e01"></image>
   </view>
 
-  <view class="panel2 FlexColumn" wx:for="{{List}}" wx:key="index">
+  <view class="panel2 FlexColumn" wx:for="{{List}}" wx:key="index" wx:if="{{item.IsShow}}">
     <view class="panel21" style="background-color:{{item.BColor}};"></view>
     <view class="panel22 FlexColumn">
       <view class="panel221 FlexRow">
@@ -26,7 +27,7 @@
       <view class="panel222 FlexColumn" wx:for="{{item.List}}" wx:key="index" 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">
+          <view wx:if="{{itemChild.IsSelected}}" class="panel22210 FlexRow">
             <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
           </view>
           <text class="panel22212 panel22212{{itemChild.IsSelected}}">{{itemChild.Word}}</text>
@@ -43,7 +44,7 @@
   <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="panelFooter11">{{WordList.length}}</view>
         <view class="panelFooter12">生成题卡</view>
       </view>
     </view>
@@ -79,7 +80,34 @@
       </view>
       <view class="panelLine3"></view>
     </view>
-    <view class="panelMenu4 FlexRow" bind:tap="buildCard" data-url="./build">生成题卡</view>
+    <view class="panelMenu4 FlexRow" bind:tap="buildCard">生成题卡</view>
+  </view>
+</view>
+
+
+<!--选择卡单 -->
+<view wx:if="{{Menu==2}}" class="menuContainer container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelMenu FlexColumn" style="height:1020rpx;">
+    <view class="panelMenu1 FlexRow">
+      <view class="panelMenu11">选择卡单</view>
+      <view class="panelMenu12 FlexRow" bind:tap="selectFolder" data-index="-1">
+        <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
+      </view>
+    </view>
+    <view class="panelMenu6 FlexColumn" wx:if="{{FolderList.length==0}}">
+      <image src="../images/sysIcon_e03.png" class="sysIcon_e03"></image>
+      <view class="panelMenu61">无卡单</view>
+      <view class="panelMenu62">请先前往题卡栏目创建卡单</view>
+    </view>
+    <scroll-view scroll-y class="panelMenu50" wx:if="{{FolderList.length>0}}">
+      <view class="panelMenu5 FlexColumn" wx:for="{{FolderList}}" wx:key="index" bind:tap="selectFolder" data-index="{{index}}">
+        <view class="panelMenu51">
+          {{item.Name}}
+        </view>
+        <view class="panelLine4"></view>
+      </view>
+      <view style="height:100rpx;"></view>
+    </scroll-view>
   </view>
 </view>
 

pages_test/knowledge/report.wxss

@@ -1,6 +1,5 @@
 .container {
   background-color: #E3E3E3;
-  font-weight: 600;
 }
 
 .panel1 {
@@ -37,6 +36,7 @@
   font-size: 28rpx;
   color: #4d4d4d;
   font-weight: 400;
+  height:40rpx;
 }
 
 .panel16 {
@@ -51,7 +51,7 @@
   height: 220rpx;
   position: absolute;
   right: 0;
-  top: 70rpx;
+  top: 60rpx;
 }
 
 .panelLine1 {
@@ -100,7 +100,7 @@
 
 .panel22121 {
   background: #F8F8F8;
-  border: 3rpx solid #4D4D4D;
+  border: 4rpx solid #4D4D4D;
   border-radius: 10rpx;
   font-size: 24rpx;
   color: #4D4D4D;
@@ -145,7 +145,12 @@
 }
 
 .panel22210 {
+  width: 40rpx;
+  height: 40rpx;
   background-color: #FF8451;
+  border-radius: 50%;
+  margin: 0 30rpx 0 40rpx;
+  border: 3rpx solid #FF8451;
 }
 
 .sysIcon_b07 {
@@ -162,7 +167,7 @@
 }
 
 .panel222121 {
-  font-weight: 600;
+  font-weight: 700;
 }
 
 .panel3 {
@@ -174,7 +179,7 @@
 }
 
 .panel31 {
-  font-weight: 600;
+  font-weight: 700;
 }
 
 .panelFooter {
@@ -182,9 +187,10 @@
   width: 100%;
   position: fixed;
   bottom: 0;
-  height: 260rpx;
+  height: 200rpx;
   color: #F2F2F2;
   font-size: 24rpx;
+  align-items: flex-start;
 }
 
 .panelFooter1 {
@@ -243,13 +249,11 @@
 
 .panelMenu {
   position: fixed;
-  bottom: 70rpx;
-  width: 690rpx;
-  min-height: 726rpx;
-  border-radius: 60rpx;
+  bottom: 0;
+  width: 100%;
+  border-radius: 60rpx 60rpx 0 0;
   justify-content: flex-start;
   background: #FFFFFF;
-  box-shadow: 0 20rpx 0 0 #9B9B9B, 0 50rpx 0 0 rgba(0, 0, 0, 0.50);
 }
 
 .panelMenu1 {
@@ -260,10 +264,10 @@
 }
 
 .panelMenu11 {
-  font-size: 36rpx;
+  font-size: 28rpx;
   color: #2E2E2E;
   width: 580rpx;
-  margin-left: 60rpx;
+  margin-left: 40rpx;
 }
 
 .panelMenu12 {
@@ -282,7 +286,7 @@
 .panelMenu2 {
   font-size: 24rpx;
   color: #787878;
-  margin: 70rpx 0 20rpx 60rpx;
+  margin: 30rpx 0 20rpx 40rpx;
   align-self: start;
 }
 
@@ -296,11 +300,10 @@
   height: 100rpx;
   justify-content: flex-start;
 }
-
 .sysIcon_b04 {
   width: 40rpx;
   height: 34rpx;
-  margin: 0 30rpx 0 70rpx;
+  margin: 0 30rpx 0 60rpx;
 }
 
 .panelMenu311 {
@@ -311,31 +314,69 @@
 }
 
 .panelMenu3111 {
-  width: 444rpx;
+  width: 494rpx;
 }
 
 .panelMenu31111 {
-  font-weight: 600;
+  font-weight: 700;
 }
 
 .sysIcon_a01 {
   width: 16rpx;
   height: 26rpx;
+  margin-left: 30rpx;
 }
 
 .panelLine3 {
-  width: 490rpx;
+  width: 570rpx;
   height: 1rpx;
   background-color: #e3e3e3;
-  margin-left: 140rpx;
+  margin-left: 110rpx;
 }
 
 .panelMenu4 {
-  width: 590rpx;
+  width: 650rpx;
   height: 90rpx;
   background-color: #f0f0f0;
   border-radius: 20rpx;
-  margin-top: 60rpx;
+  margin: 60rpx 0;
   font-size: 36rpx;
-  font-weight: 600;
+  font-weight: 700;
+}
+
+.panelMenu50{
+  width:100%;
+  height:900rpx;
+}
+.panelMenu5{
+  width:100%;
+}
+.panelMenu51 {
+  width: 670rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin: 30rpx 0;
 }
+
+.panelLine4 {
+  width: 670rpx;
+  height: 1rpx;
+  background-color: #e3e3e3;
+}
+
+.sysIcon_e03{
+  width:400rpx;
+  height:180rpx;
+  margin-top: 120rpx;
+}
+
+.panelMenu61 {
+  font-size:28rpx;
+  font-weight: 700;
+  margin: 40rpx 0 0 0;
+}
+.panelMenu62 {
+  font-size:24rpx;
+  font-weight: 400;
+  margin: 10rpx 0 0 0;
+}

pages_test/knowledge/unit.js

@@ -8,13 +8,14 @@ Page({
   data: {
     Menu:0,
     TestArr:[],
+    KnowledgeImageName:"picZs_cn_g1F_xz",
+    ImagePath: app.globalData.uploadImageUrl,
   },
   onLoad: function (options) {
     var that = this;
     bookID=options.BookID;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      ImagePath: app.globalData.uploadImageUrl,
       BookID:bookID,
     });
     //that.init();
@@ -55,24 +56,24 @@ Page({
           WriteNum:writeNum,
           WriteRate:Math.round(100*writeNum/list1.length),
         });
+
+        if (that.data.BookName=="写字" || that.data.BookName=="识字" || that.data.BookName=="词语"){
+          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,
+          });
+        }
       }
     });
-
-    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;
@@ -86,9 +87,8 @@ Page({
     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) {
+      main.getData('GetMiaoguoTestExamine?UserID='+app.globalData.userInfo.UserID+'&BookID='+that.data.BookID+'&UnitName='+item.UnitName+'&UnitID='+item.ID+'&TestType=read', function (data) {
         if (data) {
           item.List=[];
           for(var i=0;i<data.length;i++){
@@ -131,22 +131,87 @@ Page({
         }
         item.TestItemArr=TestItemArr;
       }
+      else
+        item=that.data.SelectedItem;
+
+      if (menu==3){
+        item.TestFunction[0].IsSelected=1;
+        if (item.TestFunction.length>1)
+          item.TestFunction[1].IsSelected=0;
+      }
+        
       that.setData({
         Menu2:menu,
         SelectedItem:item,
       });
     }
   },
-  goto: function (e) {
-    var url = e.currentTarget.dataset.url;
+  setMenu3:function(e){
+    var that=this;
+    var index=e.currentTarget.dataset.index;
+    var item=that.data.SelectedItem;
+    item.TestFunction[0].IsSelected=0;
+    item.TestFunction[1].IsSelected=0;
+    item.TestFunction[index].IsSelected=1;
+    that.setData({
+      SelectedItem:item,
+    });
+  },
+  buildCard:function(){
+    var TestTask = {};
+    TestTask.Category = this.data.Category;
+    TestTask.TestType = this.data.TestType;
+    TestTask.LibraryName1 = this.data.LibraryName1;
+    TestTask.LibraryName2 = this.data.LibraryName2;
+    TestTask.BookName = this.data.BookName;
+    TestTask.UnitName = this.data.SelectedItem.UnitName;
+    TestTask.TestType="read";
+    if (this.data.SelectedItem.TestFunction.length>1 && this.data.SelectedItem.TestFunction[1].IsSelected)
+      TestTask.TestType="write";
+    
+    if (this.data.SelectedItem.TestFunction.length>0 && this.data.SelectedItem.TestFunction[0].IsSelected)
+      TestTask.TestTypeName = this.data.SelectedItem.TestFunction[0].N2;
+    else if (this.data.SelectedItem.TestFunction.length>1 && this.data.SelectedItem.TestFunction[1].IsSelected)
+      TestTask.TestTypeName = this.data.SelectedItem.TestFunction[1].N2;
+    TestTask.BookID=this.data.BookID;
+    TestTask.UnitID=this.data.SelectedItem.ID;
+    var list=[[],[],[]];
+    var arr=this.data.SelectedItem.List;
+    
+    for(var j=0;j<arr.length;j++){
+      var obj={};
+      obj.IsSelected=1;
+      obj.Word=arr[j];
+      list[1].push(obj);
+    }
+    TestTask.List = list;
+    TestTask.ReportType="build";
+    app.globalData.TestTask=TestTask;
     wx.navigateTo({
-      url: url,
+      url: './report',
     });
 
     this.setData({
       Menu2:0,
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    var menunoclose = e.currentTarget.dataset.menunoclose;
+    //debugger;
+    if (url.indexOf("?RightNum=&WrongNum=&")>0 || url.indexOf("?RightNum=0&WrongNum=0&")>0)
+      return ;
+
+    wx.navigateTo({
+      url: url,
+    });
+
+    if (!menunoclose){
+      this.setData({
+        Menu2:0,
+      });
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages_test/knowledge/unit.wxml

@@ -1,12 +1,16 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panel1 FlexColumn">
-    <view class="panel11 FlexColumn">
-      <view class="panel111">{{LibraryName1}}{{LibraryName2}}</view>
-      <view class="panel112">{{BookName}}</view>
-      <view class="panel113"></view>
+    <view class="panel11 FlexRow">
+      <view class="panel110 FlexColumn">
+        <view class="panel111">{{LibraryName1}}{{LibraryName2}}</view>
+        <view class="panel112" wx:if="{{Category=='语文'}}">{{BookName}}</view>
+        <view class="panel112 panel1120" wx:if="{{Category=='English'}}">{{BookName}}</view>
+      </view>
       <image class="panel1Logo" src='{{ImagePath}}web/_knowledge/{{KnowledgeImageName}}_b.png' />
-    
     </view>
+
+    <view class="panelLine5"></view>
+
     <view class="panel12 FlexColumn">
       <view class="panel121 FlexRow">
         <view class="panel1211 FlexRow">
@@ -14,7 +18,7 @@
           <view class="panel12112">内容</view>
         </view>
         <view class="panel1212 FlexRow">
-          {{List.length}}个单元 ｜ {{WordNum}}个{{WordType}}
+          {{List.length}}个单元 <view class="panel12121"></view> {{WordNum}}个{{WordType}}
         </view>
       </view>
       <view class="panel121 FlexRow" wx:if="{{UpdateTime}}">
@@ -67,14 +71,16 @@
     <view wx:if="{{Menu==0}}" class="panel22 FlexColumn" wx:for="{{List}}" wx:key="index" bind:tap="setMenu2" data-menu="1" data-index="{{index}}">
       <view class="panel221 FlexRow">
         <view class="panel2211">{{item.UnitName}}</view>
-        <view class="panel2212">{{item.Length}}</view>
+        <view class="panel2212 FlexColumn"><view class="panel22121">{{item.Length}}</view></view>
       </view>
-      <view class="panel222" wx:if="{{item.ListStr}}">
+      <view class="panel222_1" wx:if="{{item.ListStr}}">
         {{item.ListStr}}
+        <image src="../images/sysIcon_e04.png" class="sysIcon_e04"></image>
       </view>
-      <view class="panel223 FlexRow">
+      <view class="panel223 panel223_0 FlexRow">
         <view class="panel2231 FlexRow">
-          <image src="../images/sysIcon_c02.png" class="sysIcon"></image>
+          <image src="../images/sysIcon_c02.png" class="sysIcon" wx:if="{{item.IsBuildRead || item.IsBuildWrite}}"></image>
+          <image src="../images/sysIcon_c03.png" class="sysIcon" wx:if="{{!item.IsBuildRead && !item.IsBuildWrite}}"></image>
           <view class="panel22311" wx:if="{{!item.IsBuildRead && item.TestFunction[0]}}"></view>
           <view class="panel22311 panel223110" wx:if="{{item.IsBuildRead && item.TestFunction[0]}}"></view>
           <view class="panel22311" wx:if="{{!item.IsBuildWrite && item.TestFunction[1]}}"></view>
@@ -90,12 +96,12 @@
     </view>
 
     <block wx:if="{{Menu==1 && TestArr.length>0}}">
-      <view class="panel22 FlexColumn" wx:for="{{TestArr}}" wx:key="index">
+      <view class="panel22 FlexColumn" wx:for="{{TestArr}}" wx:key="index" bind:tap="goto" data-url="./report?ID={{item.ID}}">
         <view class="panel223 panel2230 FlexRow">
           <view class="panel2231 FlexRow">
             {{item.TestTime}}
           </view>
-          <view class="panel22320 FlexRow">
+          <view class="panel22320 FlexRow" wx:if="{{item.RightNum || item.WrongNum}}">
             <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>
@@ -107,9 +113,11 @@
         <view class="panel221 panel220 FlexRow">
           <view class="panel2211">{{item.UnitName}}</view>
         </view>
-        <view class="panel222">
+        <view class="panel222 panel2220">
           {{item.Category}} \ {{item.LibraryName1}}{{item.LibraryName2}} \ {{item.BookName}}
         </view>
+
+        <view class="panel22 panel22masking" catch:tap="goto" data-url="" wx:if="{{!item.RightNum && !item.WrongNum}}"></view>
       </view>
     </block>
 
@@ -126,8 +134,7 @@
         <text class="panelNull4">请在知识包中选择单元检验一次。\n检验必须做完才有记录，中途退出后下次是无法继续的。</text>
       </view>
     </block>
-    
-    <view style="width: 100%;height:100rpx;"></view>
+    <view style="width: 100%;height:30rpx;"></view>
   </view>
 
 </view>
@@ -182,8 +189,8 @@
     </view>
 
     <view class="panelMenu2">检验记录</view>
-    <block wx:for="{{SelectedItem.TestItemArr}}" wx:key="index">
-      <view class="panelMenu5 FlexRow" >
+    <block wx:for="{{SelectedItem.TestItemArr}}" wx:key="index" >
+      <view class="panelMenu5 FlexRow" bind:tap="goto" data-url="./report?RightNum={{item.RightNum}}&WrongNum={{item.WrongNum}}&ID={{item.ID}}" data-menunoclose="1">
         <view class="panelMenu51 FlexRow">
           <image src="../images/{{item.Icon}}.png" class="sysIcon_d01"></image>
           <view class="panelMenu511">{{item.TestTime}}</view>
@@ -212,34 +219,27 @@
         <image src="../images/sysIcon_b03.png" class="sysIcon_b03"></image>
       </view>
     </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 class="panelMenu62">
+      <image src="../images/{{SelectedItem.TestFunction[0].Img}}.png" class="picJygs" wx:if="{{SelectedItem.TestFunction[0].IsSelected}}"></image>
+      <image src="../images/{{SelectedItem.TestFunction[1].Img}}.png" class="picJygs" wx:if="{{SelectedItem.TestFunction[1].IsSelected}}"></image>
     </view>
-    <view class="panelMenu63 panelMenu630 FlexColumn">
+    <block wx:for="{{SelectedItem.TestFunction}}" wx:key="index" >
+    <view class="panelMenu63 panelMenu63_{{index}} FlexColumn" catch:tap="setMenu3" data-index="{{index}}">
       <view class="panelMenu631 FlexRow">
-        <view class="sysIcon_b04"></view>
+        <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="panelMenu6311 FlexColumn">
           <view class="panelMenu63111 FlexRow">
-            <image src="../images/sysIcon_d02.png" class="sysIcon_d01"></image>
-            <view class="panelMenu631111 panelMenu631110">听写单词</view>
+            <image src="../images/sysIcon_d0{{index+1}}.png" class="sysIcon_d01"></image>
+            <view class="panelMenu631111 panelMenu631111{{item.IsSelected}}">{{item.N2}}</view>
           </view>
-          <view class="panelMenu63112">这里有一行和方式对应的说明</view>
+          <view class="panelMenu63112 panelMenu63112{{item.IsSelected}}">{{item.Remark}}</view>
         </view>
       </view>
       <view class="panelLine3"></view>
     </view>
-    <view class="panelMenu64 FlexRow">生成题卡</view>
+    </block>
+    <view class="panelMenu64 FlexRow" catch:tap="buildCard">生成题卡</view>
   </view>
 </view>
 

pages_test/knowledge/unit.wxss

@@ -1,6 +1,5 @@
 .container {
   background-color: #E3E3E3;
-  font-weight: 600;
 }
 
 .panel1 {
@@ -11,22 +10,26 @@
 .panel11 {
   width: 100%;
   color: #2E2E2E;
-  justify-content: flex-start;
+  justify-content: space-between;
   align-items: flex-start;
-  position: relative;
 }
 
-.panel1Logo{
-  width:250rpx;
-  height:190rpx;
-  position: absolute;
-  top:0;
-  right:0;
+.panelLine5 {
+  width: 650rpx;
+  height:5rpx;
+  background-color: #e3e3e3;
+}
+
+
+.panel110 {
+  align-items: flex-start;
 }
+
 .panel111 {
   margin: 40rpx 0 0 50rpx;
   font-size: 24rpx;
   color: #4D4D4D;
+  font-weight: 400;
 }
 
 .panel112 {
@@ -34,14 +37,17 @@
   font-size: 60rpx;
   color: #2E2E2E;
 }
-
-.panel113 {
-  margin: 33rpx 0 0 50rpx;
+.panel1120 {
   width: 650rpx;
-  height: 5rpx;
-  background-color: #E3E3E3;
 }
 
+.panel1Logo{
+  width:250rpx;
+  height:190rpx;
+  margin-right: 50rpx;
+}
+
+
 .panel12 {
   width: 100%;
 }
@@ -76,6 +82,12 @@
   color: #4D4D4D;
   margin-right: 50rpx;
 }
+.panel12121{
+  width:2rpx;
+  height:14rpx;
+  background-color: #d2d2d2;
+  margin: 0 10rpx;
+}
 
 .panelLine1 {
   width: 650rpx;
@@ -171,12 +183,21 @@
 
 .panel22 {
   width: 690rpx;
-  height: 253rpx;
   border-radius: 20rpx;
   background-color: #fff;
   margin-bottom: 30rpx;
   box-shadow: 0 6rpx 0 0 rgba(0, 0, 0, 0.20);
   justify-content: flex-start;
+  position: relative;
+}
+
+.panel22masking{
+  position: absolute;
+  top:0;
+  left:0;
+  height:100%;
+  background: rgba(255,255,255,0.60);
+  z-index: 10;
 }
 
 .panel221{
@@ -200,14 +221,16 @@
 .panel2212{
   width:40rpx;
   height:40rpx;
-  line-height: 40rpx;
   background-color: #4D4D4D;
   border-radius: 10rpx;
   margin-right: 30rpx;
+}
+
+.panel22121{
   font-family: Teko-Bold;
   font-size: 28rpx;
   color: #FFFFFF;
-  text-align: center;
+  margin-top: 4rpx;
 }
 
 .panel222{
@@ -215,11 +238,33 @@
   font-size: 24rpx;
   font-weight: 400;
   color:#787878;
-  margin-top: 10rpx;
-  overflow-y: hidden;
+  margin: 10rpx 0 0 0;
+  overflow: hidden;
+}
+
+.panel222_1{
+  width:630rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  color:#787878;
+  margin: 10rpx 0 0 0;
+  overflow-x: hidden;
+  white-space: nowrap;
+  position: relative;
+}
+
+.sysIcon_e04{
+  position: absolute;
+  right:-30rpx;
+  top:0;
+  width:60rpx;
   height:33rpx;
 }
 
+.panel2220{
+  margin: 10rpx 0 30rpx 0;
+}
+
 .panel223{
   width:670rpx;
   height:80rpx;
@@ -228,6 +273,9 @@
   margin-top: 30rpx;
   justify-content: space-between;
 }
+.panel223_0{
+  margin: 30rpx 0 10rpx 0;
+}
 
 .panel2230{
   margin-top: 10rpx;
@@ -504,17 +552,21 @@
   width:590rpx;
   height:280rpx;
   background: #F8F8F8;
-  border: 1rpx solid #D2D2D2;
   border-radius: 20rpx;
   margin-top: 30rpx;
 }
 
+.picJygs{
+  width:590rpx;
+  height:280rpx;
+}
+
 .panelMenu63{
   width:100%;
   height:140rpx;
   margin-top: 30rpx;
 }
-.panelMenu630{
+.panelMenu63_1{
   margin-top: 0rpx;
 }
 .panelMenu631{
@@ -533,6 +585,11 @@
   font-size: 28rpx;
   color: #2E2E2E;
   margin-left: 10rpx;
+  font-weight: 400;
+}
+
+.panelMenu6311111{
+  font-weight: 700;
 }
 .panelMenu631110{
   font-weight: 400;
@@ -540,6 +597,11 @@
 .panelMenu63112{
   font-size: 24rpx;
   color: #787878;
+  font-weight: 400;
+}
+
+.panelMenu631121{
+  font-weight: 700;
 }
 .panelLine3{
   width:500rpx;

pages_test/test/report.js

@@ -196,7 +196,6 @@ Page({
           obj.Type="add";
           if (that.data.List[i].List[j].Css === "Select3")
             obj.Type="IsExist";
-
           arr.push(obj);
           TestExistStr.push(item.Word);
           

project.config.json

@@ -109,8 +109,8 @@
         },
         {
           "id": 7,
-          "name": "pages_test/test/index",
-          "pathName": "pages_test/test/index",
+          "name": "pages_test/knowledge/index",
+          "pathName": "pages_test/knowledge/index",
           "query": "UserID=1",
           "scene": null
         },

utils/main.js

@@ -1406,54 +1406,41 @@ function getUserConfig() {
 
 function replaceCardInfoString(str) {
   var that = this;
-  //str = str.replace(/\[图]/g, "");
-  //str = str.replace(/\[\/图\]/g, "");
-  //console.log(str);
   if (str && str!=null) {
-    var str2 = "";
-    if (str.indexOf("[读 src=") >= 0) {
-      str2 = str.substr(str.indexOf("[读 src="));
-      str2 = str2.substring(0, str2.indexOf("]") + 1);
-    }
-    str = str.replace(str2, "");
-
-    if (str.indexOf("[/读") >= 0) {
-      str2 = str.substr(str.indexOf("[/读"));
-      str2 = str2.substring(0, 4);
-    }
-    str = str.replace(str2, "");
-
-
-    if (str.indexOf("[读 src=") >= 0) {
-      str2 = str.substr(str.indexOf("[读 src"));
-      str2 = str2.substring(0, str2.indexOf("/读]") + 3);
-    }
-    str = str.replace(str2, "");
+    for(var i=0;i<5;i++){
+      var str2 = "";
+    
+      if (str.indexOf("[读 src=") >= 0) {
+        str2 = str.substr(str.indexOf("[读 src="));
+        str2 = str2.substring(0, str2.indexOf("]") + 1);
+      }
+      str = str.replace(str2, "");
 
-    if (str.indexOf("[/读") >= 0) {
-      str2 = str.substr(str.indexOf("[/读"));
-      str2 = str2.substring(0, 4);
-    }
-    str = str.replace(str2, "");
+      if (str.indexOf("[/读") >= 0) {
+        str2 = str.substr(str.indexOf("[/读"));
+        str2 = str2.substring(0, 4);
+      }
+      str = str.replace(str2, "");
+      
+      str = str.replace(/\[读]/g, "");
+      str = str.replace(/\[\/读\]/g, "");
 
-    str = str.replace(/\[读]/g, "");
-    str = str.replace(/\[\/读\]/g, "");
+      var str3 = "";
+      if (str.indexOf("[图") >= 0) {
+        str3 = str.substr(str.indexOf("[图"));
+        str3 = str3.substring(0, str3.indexOf("/图]") + 3);
+      }
+      str = str.replace(str3, "");
+      if (str.indexOf("[图") >= 0) {
+        str3 = str.substr(str.indexOf("[图"));
+        str3 = str3.substring(0, str3.indexOf("/图]") + 3);
+      }
+      str = str.replace(str3, "");
 
-    var str3 = "";
-    if (str.indexOf("[图") >= 0) {
-      str3 = str.substr(str.indexOf("[图"));
-      str3 = str3.substring(0, str3.indexOf("/图]") + 3);
-    }
-    str = str.replace(str3, "");
-    if (str.indexOf("[图") >= 0) {
-      str3 = str.substr(str.indexOf("[图"));
-      str3 = str3.substring(0, str3.indexOf("/图]") + 3);
+      str = str.replace(/\[线]/g, "");
+      str = str.replace(/\[\/线\]/g, "");
+      str = that.encryptUrl(str);
     }
-    str = str.replace(str3, "");
-
-    str = str.replace(/\[线]/g, "");
-    str = str.replace(/\[\/线\]/g, "");
-    str = that.encryptUrl(str);
   }
   return str;
 }