1.4.13

app.json

@@ -5,7 +5,10 @@
     "pages/index/openSetting",
 
     "pages/test/index",
+    "pages/test/list",
     "pages/test/item",
+    "pages/test/wordlist",
+    "pages/test/report",
 
     "pages/main/default",
     "pages/main/cardInfo",

pages/main/add.js

@@ -34,6 +34,7 @@ var recorderManager;
 var tempRecorderFile = "";
 var innerAudioContext;
 var isViolate = false; //是否是违禁词
+var isFirstAdd=true;//是第一个填加
 
 Page({
   data: {
@@ -44,7 +45,8 @@ Page({
     HighlighterSign: "[光]",
     IsPracticeTime: false,
     IsRecorder: false,
-    PracticeTimeArr: PracticeTimeArr
+    PracticeTimeArr: PracticeTimeArr,
+    IsIPhoneX: app.globalData.IsIPhoneX,
   },
   onReady: function() {
     recorderManager = wx.getRecorderManager();
@@ -93,6 +95,7 @@ Page({
     app.globalData.TempMiaoguoCardID = that.data.MiaoguoCardID;
 
     isViolate = false;
+    isFirstAdd = true;
   },
   onShow: function() {
     var that = this;
@@ -145,7 +148,7 @@ Page({
   },
   onHide: function() {
     //用于恢复未保存的新题卡
-    console.log("onHide");
+    //console.log("onHide");
     var that = this;
     if (!that.data.HiddenFieldEdit) {
       that.updateField();
@@ -307,6 +310,7 @@ Page({
                   });
 
                   if (that.data.UpdateType == "add2") {
+                    isFirstAdd = false;
                     that.initAddCard();
                   }
 
@@ -439,7 +443,7 @@ Page({
       //console.log(arrResult.length);
       if (arrResult.length >= arrSource.length) {
         wx.hideLoading();
-        console.log("arrResult:" + JSON.stringify(arrResult));
+        //console.log("arrResult:" + JSON.stringify(arrResult));
 
         clearInterval(interval);
         var success = true;
@@ -584,10 +588,18 @@ Page({
   },
   onGotoList: function() {
     var that = this;
-    if (that.data.Field[1] != "" && that.data.Field[2] != "" && that.data.Field[2] != "") {
+    if (isFirstAdd == true || !that.data.Field) {
+      wx.showModal({
+        title: '无法查看上一张',
+        content: '本功能是在批量添加题卡时快速回看上一张题卡。现在是本批的第一张，没有上一张。',
+        confirmText: '知道了',
+        showCancel: false,
+      });
+    }
+    else if (that.data.Field[1].length > 0 || that.data.Field[2].length > 0 || that.data.Field[2].length > 0) {
       wx.showModal({
         title: '尚未保存',
-        content: '即将前往“全部题卡”，但当前题卡尚未保存，按继续将放弃保存。',
+        content: '即将“查看上一张题卡”，但当前题卡尚未保存，按继续将放弃保存。',
         confirmText: '继续',
         success(res) {
           if (res.confirm) {
@@ -595,7 +607,8 @@ Page({
           }
         }
       });
-    } else {
+    } 
+    else {
       goto();
     }
 
@@ -611,8 +624,11 @@ Page({
         wx.hideLoading();
         if (data) {
           app.globalData.CardList = data.List;
-          wx.redirectTo({
-            url: './searchCardList?type=0&Count=' + data.Count,
+          that.setData({
+            UpdateType: "add",
+          });
+          wx.navigateTo({
+            url: './searchCardList?type=2&Count=' + data.Count,
           })
         }
       });
@@ -632,10 +648,10 @@ Page({
     else if (that.data.PracticeTimeStr == PracticeTimeArr[4].Name)
       LimitTime = common.formatTime(common.addDate("m", 3, new Date(that.data.LimitTime)));
 
-    console.log(that.data.LimitTime);
-    console.log(new Date(that.data.LimitTime));
-    console.log(common.addDate("w", 1, new Date(that.data.LimitTime)));
-    console.log(LimitTime);
+    //console.log(that.data.LimitTime);
+    //console.log(new Date(that.data.LimitTime));
+    //console.log(common.addDate("w", 1, new Date(that.data.LimitTime)));
+    //console.log(LimitTime);
     return LimitTime
   },
 
@@ -658,7 +674,7 @@ Page({
   },
   //加符号
   addSymbol: function(e) {
-    console.log("addSymbol");
+    //console.log("addSymbol");
     isEdit = true;
     var that = this;
 
@@ -693,13 +709,13 @@ Page({
       btnName ="(     )";
     else if (btnName == "_")
       btnName = "_____";
-    console.log("addSymbol_btnName:" + btnName);
+    //console.log("addSymbol_btnName:" + btnName);
 
     if (!this.data.Focus) {
       var obj = { detail: {cursor:tempCursor}};
       this.onBindblur(obj);
     }
-    console.log("addSymbol:" + this.data.FieldContent);
+    //console.log("addSymbol:" + this.data.FieldContent);
 
     setTimeout(function() {
       that.setData({
@@ -722,7 +738,7 @@ Page({
     if (app.globalData.IsAndroid && !isEdit) {
       setTimeout(function() {
         isEdit = true;
-        console.log("onBindblur2:" + isEdit);
+        //console.log("onBindblur2:" + isEdit);
       }, 500);
       return;
     }
@@ -730,7 +746,7 @@ Page({
     if (app.globalData.IsAndroid && !isEdit) {
       setTimeout(function() {
         isEdit = true;
-        console.log("onBindblur2:" + isEdit);
+        //console.log("onBindblur2:" + isEdit);
       }, 500);
     }
     //console.log("onBindblur:"+isEdit);
@@ -738,7 +754,7 @@ Page({
     this.updateField();
     tempCursor = e.detail.cursor;
     
-    console.log("tempCursor:" + tempCursor);
+    //console.log("tempCursor:" + tempCursor);
     if (tempCursor == undefined)
       tempCursor = this.data["FieldContent"].length;
     var str1 = "",
@@ -747,9 +763,9 @@ Page({
       str1 = this.data.FieldContent.substr(0, tempCursor);
       str2 = this.data.FieldContent.substring(tempCursor, this.data.FieldContent.length);
     }
-    console.log("str1:" + str1);
-    console.log("btnName:" + btnName);
-    console.log("str2:" + str2);
+    //console.log("str1:" + str1);
+    //console.log("btnName:" + btnName);
+    //console.log("str2:" + str2);
     var cur = 0;
     if (btnName){
       cur = 1;
@@ -932,8 +948,8 @@ Page({
           wx.getImageInfo({
             src: res.tempFilePaths[0],
             success(res) {
-              console.log(res.width)
-              console.log(res.height)
+              //console.log(res.width)
+              //console.log(res.height)
               if (tempCursor == undefined)
                 tempCursor = that.data.FieldContent.length;
               var str1 = "",

pages/main/add.wxml

@@ -3,8 +3,7 @@
     <view class="panelTopLeft FlexRow" catchtap="onSearch">
       <view class="add">+</view> 资料
     </view>
-    <view class='panelTopRight FlexRow' catchtap='onGotoList' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
-      <image src='../images/universalpic_card_gray_26x26.png' class="universalpic_card_gray_26x26" />
+    <view class='panelTopRight FlexRow'>
     </view>
   </view>
   <view style='height:120rpx'></view>
@@ -17,7 +16,8 @@
     </view>
     <view class="panelItem FlexRow" bindtap='gotoAddItem' data-fieldid="{{itemParent}}">
       <view class="panelItem11 FlexColumn">
-        <view class="number">{{itemParent}}</view>
+        <view class="number2 number" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">{{itemParent}}</view>
+        <view class="number" wx:if="{{Field[itemParent] && Field[itemParent].length>0}}">{{itemParent}}</view>
       </view>
       <view class="panelItem21 FlexRow">
         <text class="textNull" wx:if="{{!Field[itemParent] || Field[itemParent].length==0}}">
@@ -79,7 +79,7 @@
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  
+
   <view class="panelTimePlan0 panelTimePlan FlexRow" bindtap="showPracticeTime" wx:if="{{!IsShowPracticeTimeStart}}">
     <view class="panelItem1 FlexRow">
       <image src='../images/universalpic_clock_white_24x24.png' class="universalpic_clock_gray_24x24" />
@@ -92,13 +92,23 @@
   </view>
   <view style='height:300rpx;'></view>
 
-  <view class='panelSave FlexRow'>
-    <view class="panelSave1" bindtap="onPreview">
-      预览
-    </view>
-    <view class='panelSave2' bindtap="saveCard">
-      保存
+  <view class='panelSave FlexColumn'>
+    <view class="panelSave00 FlexRow">
+      <view class="panelSave1" catchtap='onGotoList' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
+        复查
+      </view>
+      <view class="panelSave1" catchtap='onClose' wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
+        复查
+      </view>
+      <view class='panelSave2' bindtap="saveCard">
+        保存
+      </view>
+      <view class="panelSave1" bindtap="onPreview">
+        预览
+      </view>
     </view>
+
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
 </view>
 

pages/main/add.wxss

@@ -113,6 +113,12 @@
   font-weight: 400;
 }
 
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
+}
+
 .panelItem0 {
   height: 133rpx;
 }
@@ -132,12 +138,21 @@
   font-family: 'Roboto-Black';
   font-size: 24rpx;
   width: 40rpx;
+  height: 40rpx;
   background-color: #0071ef;
   border-radius: 50%;
   text-align: center;
   line-height: 40rpx;
   color: #fff;
 }
+.panelItem .number2 {
+  background-color: #fff;
+  border:1rpx solid #0071EF;
+  width: 38rpx;
+  height:38rpx;
+  line-height: 38rpx;
+  color: #0071ef;
+}
 
 .panelItem2 {
   margin-right: 30rpx;
@@ -252,19 +267,27 @@
   margin: 0 30rpx 0 20rpx;
 }
 
-
-
 .panelSave {
   width: 100%;
   background-color: #fff;
   position: fixed;
   bottom: 0;
-  height: 120rpx;
   z-index: 10;
-  justify-content: space-between;
   border-top: 1rpx solid #d2d2d2;
 }
 
+.panelSave .panelSave00 {
+  width: 100%;
+  height: 120rpx;
+  justify-content: space-between;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
+}
+
 .panelSave .panelSave1 {
   width: 128rpx;
   line-height: 120rpx;
@@ -274,7 +297,7 @@
 }
 
 .panelSave .panelSave2 {
-  width: 602rpx;
+  width: 494rpx;
   background-color: #fff;
   border:1rpx solid #9B9B9B;
   color:#0071EF;
@@ -283,7 +306,7 @@
   height:80rpx;
   border-radius: 10rpx;
   font-size:32rpx;
-  margin:0 20rpx 0 0;
+  margin:0 10rpx 0 10rpx;
 }
 
 .universalpic_card_gray_26x26{

pages/main/default.js

@@ -12,6 +12,7 @@ Page({
     IsStart: 0,
     IsShowMarketing: 1,
     IsMaintain:0,
+    IsIPhoneX: app.globalData.IsIPhoneX,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({

pages/main/default.wxml

@@ -35,8 +35,8 @@
         <image class="program_tabbar_study_default" src='../images/program_tabbar_note_default.png' />
         <view>题卡</view>
       </view>
-
     </view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
 </view>
 <view wx:if="{{IsTempCardNoSaved}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>

pages/main/default.wxss

@@ -53,7 +53,7 @@
 
 .panelBottom {
   position: fixed;
-  bottom: 0;
+  bottom:0;
   width: 100%;
 }
 
@@ -85,6 +85,12 @@
   background-color: #fff;
 }
 
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
+}
+
 .panelBottom11 {
   flex:1;
   font-size:20rpx;

pages/main/detail.js

@@ -150,6 +150,10 @@ Page({
       innerAudioContext1.stop();
     }
   },
+  onHide:function(e){
+    console.log("Hide:"+e);
+    this.onClose();
+  },
   onPullDownRefresh: function () {
     this.onShowAnswer({
       currentTarget: {

pages/main/preview.js

@@ -143,9 +143,7 @@ Page({
   onPullDownRefresh: function () {
     var that = this;
     if (that.data.ShowType == "play") {
-      that.setData({
-        IsShowAnswer: [0, 0],
-      });
+      that.onHideAnswer();
     }
     wx.stopPullDownRefresh();
   },
@@ -217,7 +215,11 @@ Page({
     }
 
     var IsShowAnswer = [1, 1];
-    if (that.data.ShowType == "play") {
+    if (that.data.ShowType == "show"){
+      if (that.data.IsShowAnswer)
+        IsShowAnswer = that.data.IsShowAnswer;
+    }
+    else if (that.data.ShowType == "play") {
       IsShowAnswer = [0, 0];
       if (this.data.CurrentIndex <= 0) {
         prevId = 0;
@@ -556,6 +558,11 @@ Page({
     }
 
   },
+  onHideAnswer: function () {
+    this.setData({
+      IsShowAnswer: [0, 0]
+    });
+  },
   onShowAnswer: function () {
     this.setData({
       IsShowAnswer: [1, 1]

pages/main/preview.wxml

@@ -63,9 +63,13 @@
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
       </view>
-      <view class='btn2 FlexRow'>
-        <button class="btn21" open-type='share'>分享给大家</button>
+      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==1}}" catchtouchstart='onHideAnswer'>
+        隐藏答案
+      </view>
+      <view class='btn22 FlexRow' wx:if="{{IsShowAnswer[0]==0}}" catchtouchstart='onShowAnswer'>
+        显示答案
       </view>
+      <button class="btn21" open-type='share'>分享给大家</button>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{NextID}}" wx:if="{{NextID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />
       </view>
@@ -77,7 +81,7 @@
         <image class="universalpic_home_gray_36x36" src='../images/universalpic_home_gray_36x36.png' />
       </view>
       <view class='btn2 FlexRow'>
-        <button class="btn21" catchtap="copyCard">另存为我的题卡</button>
+        <button class="btn23 btn21" catchtap="copyCard">另存为我的题卡</button>
       </view>
       
       <view class='btn1'></view>

pages/main/preview.wxss

@@ -393,16 +393,30 @@
 .btn21 {
   font-size: 48rpx;
   color: #D2D2D2;
-  text-align: center;
+  text-align: right;
   padding-left: 0;
   padding-right: 0;
   background-color: #181a21;
+  width: 294rpx;
+  line-height: 120rpx;
 }
 
 .btn21::after {
   border: 0px;
 }
 
+
+.btn22 {
+  width: 160rpx;
+  line-height: 120rpx;
+  text-align: center;
+  font-size:36rpx;
+}
+
+.btn23 {
+  width: 400rpx;
+}
+
 .panelSaveShare{
   justify-content: space-between;
 }

pages/main/searchCard.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    IsIPhoneX: app.globalData.IsIPhoneX,
   },
   onLoad: function () {
     var that = this;

pages/main/searchCard.wxml

@@ -85,5 +85,7 @@
         <view class='text5'>题卡</view>
       </view>
     </view>
+
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
 </view>

pages/main/searchCard.wxss

@@ -110,4 +110,10 @@
 .text6{
   font-size:28rpx;
   margin-left: 20rpx;
+}
+
+.iphone10plus{
+  width:100%;
+  height:30rpx;
+  background-color: #fff;
 }

pages/main/searchCardList.js

@@ -51,6 +51,7 @@ Page({
       IsToday: IsToday,
       Count: count,
       Containnerheight: main.getWindowHeight(),
+      PageType:options.type,
     });
   },
   onShow: function () {
@@ -131,6 +132,12 @@ Page({
             List: list,
             HasPage: hasPage,
           });
+
+          if (that.data.PageType === "2") {
+            wx.redirectTo({
+              url: './preview?type=show&id=' + list[0].MiaoguoCardID,
+            })
+          }
         }
       });
     }
@@ -153,7 +160,6 @@ Page({
         List: list,
         HasPage: hasPage,
       });
-
     }
 
     wx.hideLoading();

pages/main/searchWeb2.js

@@ -180,8 +180,21 @@ Page({
                 str = item.Content;
             }
 
-            if (list[i].Content[item.Number].Content)
-              str = "\n\n" + str;
+            if (this.data.Result && this.data.Result.CHN && this.data.Result.CHN.PinYin && this.data.Result.CHN.PinYin.length == 1){
+              if (item.Tag=="释义"){
+                str=str.substr(str.indexOf("[/读]")+4);
+              }
+            }
+
+            if (list[i].Content[item.Number].Content){
+              if (item.Tag == "组词" || item.Tag == "近义词" || item.Tag == "反义词"){
+                str = " " + str;
+              }
+              else{
+                str = "\n\n" + str;
+              }
+            }
+              
             list[i].Content[item.Number].Content += str;
 
           }

pages/main/searchWeb2.wxml

@@ -131,7 +131,7 @@
       <view class="panelTitle1">中文释义</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="normal" data-content="{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
+      <view class="{{CSS['CHN_PinYin_explain_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.PinYin}}" wx:key="pinyin" bindtap='getInputData' data-type="normal" data-content="[读]{{item.pinyin}}[/读]\n{{item.explain}}" data-css="CHN_PinYin_explain_{{index}}" data-tag="释义">
         <view class="{{CSS['CHN_PinYin_explain_'+index].Css2}} panelSelect0">{{CSS['CHN_PinYin_explain_'+index].Number}}</view>
         <text class="text1"><block wx:if="{{Result.CHN.PinYin.length>1}}">
         [{{item.pinyin}}]\n 

pages/other/activity.js

@@ -71,25 +71,6 @@ Page({
         });
       }
     }
-    else if (activityID == 3) {
-
-      var EndTime1 = common.formatDateENG(EndTime,"/");
-      EndTime1 = new Date(EndTime1 + " 00:00:00");
-      var dayNumber = common.diffDate("d", new Date(common.formatTime(new Date(), "/", true) + " 00:00:00"), EndTime1)+1;
-      if (dayNumber < 0) {
-        that.setData({
-          ShowNone: true,
-        });
-      }
-      else {
-        if (dayNumber == 1)
-          dayNumber = "今";
-        that.setData({
-          DayNumber: dayNumber,
-        });
-      }
-
-    }
 
     that.setData({
       Containnerheight: main.getWindowHeight(),

pages/other/activity.wxml

@@ -15,17 +15,6 @@
     <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。</text>
     <text class="text3">续费次日起7天内可退款。</text>
   </block>
-  <block wx:if="{{ActivityID=='3'}}">
-    <text class="EndTime">截止日期\n{{EndTime}}</text>
-
-    <view class="btn" wx:if="{{BtnShow==0}}" bindtap="getCoupon" data-coupontype="133" data-limittime="{{EndTime}}">领券</view>
-    <view class="panel1 FlexRow" wx:if="{{BtnShow==1}}">
-      <view class="panel11">已领取，{{DayNumber}}天内有效，</view>
-      <view class="panel12" bindtap="gotoPay" data-paytype="3" data-enddate="{{EndTime}}">去续费</view>
-    </view>
-    <text class="text1">条款：领取后请在活动时间内完成续费，逾期无效。</text>
-    <text class="text3">续费次日起7天内可退款。</text>
-  </block>
   <view style="height:100rpx"></view>
 </view>
 

pages/other/binding.js

@@ -83,12 +83,14 @@ Page({
     }
   },
   shareFinished: function () {
-    wx.showModal({
-      title: '等待对方接受邀请',
-      content: '请尽快与对方联系确认邀请',
-      showCancel: false,
-      confirmText: "知道了",
-    });
+    setTimeout(function(){
+      wx.showModal({
+        title: '等待对方接受邀请',
+        content: '请尽快与对方联系确认邀请',
+        showCancel: false,
+        confirmText: "知道了",
+      });
+    },3000);
   },
   gotoBinding: function () {
     var that = this;

pages/test/index.js

@@ -5,87 +5,9 @@ const app = getApp();
 
 Page({
   data: {
-    MainList: [
-      {
-        Category: "数学口算",
-        List: [
-          {
-            ID: 1,
-            Name: "加减口算",
-          }, {
-            ID: 2,
-            Name: "乘除口算",
-          },
-        ]
-      },
-      {
-        Category: "语文识字",
-        List: [
-          {
-            ID: 1,
-            Name: "一年级上学期",
-          }, {
-            ID: 2,
-            Name: "一年级下学期",
-          }, {
-            ID: 3,
-            Name: "二年级上学期",
-          }, {
-            ID: 4,
-            Name: "二年级下学期",
-          }, {
-            ID: 5,
-            Name: "三年级上学期",
-          }, {
-            ID: 6,
-            Name: "三年级下学期",
-          },
-        ]
-      }, {
-        Category: "语文写字",
-        List: [
-          {
-            ID: 1,
-            Name: "一年级上学期",
-          }, {
-            ID: 2,
-            Name: "一年级下学期",
-          }, {
-            ID: 3,
-            Name: "二年级上学期",
-          }, {
-            ID: 4,
-            Name: "二年级下学期",
-          }, {
-            ID: 5,
-            Name: "三年级上学期",
-          }, {
-            ID: 6,
-            Name: "三年级下学期",
-          },
-        ]
-      }, {
-        Category: "英语单词",
-        List: [
-          {
-            ID: 1,
-            Name: "动物",
-          }, {
-            ID: 1,
-            Name: "食物",
-          }, {
-            ID: 1,
-            Name: "人体",
-          }, {
-            ID: 1,
-            Name: "交通工具",
-          }, {
-            ID: 1,
-            Name: "家具",
-          },
-        ]
-      },
-    ]
+    List:[1],
+    IsSelectGrade:false,
+    GradeArr: [{ Name: "一年级" }, { Name: "二年级" }, { Name: "三年级"}],
   },
   onLoad: function (options) {
     var that = this;
@@ -93,6 +15,18 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
   },
+  showSelectGrade: function () {
+    var that = this;
+    that.setData({
+      IsSelectGrade: true,
+    });
+  },
+  closeSelectGrade:function(){
+    var that = this;
+    that.setData({
+      IsSelectGrade: false,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/test/index.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "测一测"
+  "navigationBarTitleText": "知识检验"
 }

pages/test/index.wxml

@@ -1,21 +1,80 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <block wx:for="{{MainList}}" wx:key="index">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">{{item.Category}}</view>
-      <view class="panelTitle2"></view>
+  <view class="panelTop FlexRow" bindtap="showSelectGrade">
+    <view class="panelTop1">一年级</view>
+    <view class="panelTop2 FlexRow">
+      <image class="universalpic_menu_blue_26x26" src="../images/universalpic_menu_blue_26x26.png"></image>
+      <view>首选年级</view>
     </view>
-    <block wx:for="{{item.List}}" wx:key="indexChild" wx:for-item="itemChild">
+  </view>
+  <view style="height:106rpx;"></view>
+  <scroll-view scroll-x="true" class="panelCard FlexRow">
+    <view class="Card">
+      <image class="examine_subject_a001" src="../images/examine_subject_a001.png"></image>
+      <view class="Card1">语文识字</view>
+      <view class="Card2">上学期</view>
+      <view class="Card3">已检验</view>
+      <view class="Card4 FlexRow">
+        <view class="Progress FlexRow"><view class="Progress1"></view></view>
+        <view class="Number">12%</view>
+      </view>
+    </view>
+    <view class="Card FlexColumn">
+    </view>
+    <view class="Card FlexColumn">
+    </view>
+    <view class="Card0"></view>
+  </scroll-view>
+  <view class="panelList FlexColumn">
+    <view class="panelListTitle FlexRow">
+      <view>检验报告</view>
+    </view>
+    <block wx:if="{{List.length==0}}">
+      <image class="examine_clipboard_80x80" src="../images/examine_clipboard_80x80.png"></image>
+      <text class="panelListContent">您还没有做过知识检验，选择科目开始检验吧，\n检验后的报告将显示在这里。</text>
+    </block>
+
+    <block wx:if="{{List.length>0}}" wx:for="{{[1,2,3,2,3,2,3,2,3]}}">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
       </view>
-      <view class="panelItem FlexRow" bindtap='goto' data-url="./item?id=">
-        <view class="panelItem1">{{itemChild.Name}}</view>
-        <view class="panelItem2 FlexRow">
-          <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+      <view class="Item FlexRow">
+        <view class="Item1 FlexColumn">
+          <view class="ItemTitle">汉语拼音 9-13</view>
+          <view class="ItemTitle2">语文识字 上学期</view>
+        </view>        
+        <view class="Item2 FlexColumn">
+          <view class="ItemDate">12月12日</view>
+          <view class="ItemNumber FlexRow">
+            <image class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
+            <image class="universalpic_checked_gray_14x12" src="../images/universalpic_checked_gray_14x12.png"></image>
+            <view class="Number2">10</view>
+            <image class="universalpic_wrong_gray_12x12" src="../images/universalpic_wrong_gray_12x12.png"></image>
+            <view class="Number3">5</view>
+          </view>
         </view>
       </view>
     </block>
+
+  </view>
+</view>
+
+<!-- 更多功能 -->
+<view wx:if="{{IsSelectGrade}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="numberContainerFooter1 FlexColumn">
     <view class='lineFooter'></view>
-  </block>
-  <view style='width:100%;height:100rpx;'></view>
+    <view class='numberContainerFooter101 FlexRow'>
+      <image class="universalpic_people_black_30x30" src='../images/universalpic_people_black_30x30.png' />
+      <view class='numberContainerFooter11 FlexColumn'>
+        <view class='numberContainerFooter111'>选择年级</view>
+        <view class='numberContainerFooter113'>目前仅小学阶段如下年级开放试用</view>
+        <view class='numberContainerFooter112 FlexRow'>
+          <view class='numberContainerFooter1121' wx:for="{{GradeArr}}" wx:key="index" catchtap='onPracticeTime' data-value='{{item.Name}}'>{{item.Name}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="numberContaineFooter FlexRow" catchtap='closeSelectGrade'>
+    <view>关闭</view>
+  </view>
 </view>

pages/test/index.wxss

@@ -1,61 +1,311 @@
-.panelTitle{
+.container{
+  background-color: #fff;
+}
+.panelTop{
   width:100%;
-  margin-top: 50rpx;
   justify-content: space-between;
+  height:106rpx;
+  background-color: #fff;
+  position: fixed;
+  z-index: 10;
+  top:0;
 }
-.panelTitle .panelTitle1{
+
+.panelTop1{
   font-size:32rpx;
   margin-left: 30rpx;
-  margin-bottom: 30rpx;
 }
-.panelTitle .panelTitle2{
-  font-size:28rpx;
+
+.panelTop2{
+  font-size:24rpx;
+  color:#0071EF;
   margin-right: 30rpx;
-  background-color: #1e1e1e;
-  color:#fff;
-  border-radius: 22rpx;
-  text-align: center;
-  padding: 0 20rpx;
-  margin-bottom: 32rpx;
 }
 
-.panelItem{
+.universalpic_menu_blue_26x26{
+  width:26rpx;
+  height:26rpx;
+  margin-right: 10rpx;
+}
+
+.panelCard{
   width:100%;
-  justify-content: space-between;
-  font-size:28rpx;
-  height:100rpx;
+  height:443rpx;
+  background-color: #F0F0F0;
+  display: flex;
+  white-space: nowrap;
+}
+
+.Card{
+  width:308rpx;
+  height:343rpx;
+  border-radius: 10rpx;
   background-color: #fff;
+  display: inline-block;
+  margin: 50rpx 0 0 30rpx;
+  position: relative;
 }
-.panelItem0{
-  height:133rpx;
+.Card0{
+  width:30rpx;
+  height:343rpx;
+  display: inline-block;
+}
+
+.examine_subject_a001{
+  width:80rpx;
+  height:80rpx;
+  position: absolute;
+  top:40rpx;
+  left:30rpx;
+}
+
+.Card1{
+  font-size:32rpx;
+  position: absolute;
+  top:150rpx;
+  left:30rpx;
 }
-.panelItem00{
-  margin-top: 50rpx;
-  line-height: 100rpx;
+.Card2{
   font-size:28rpx;
+  position: absolute;
+  top:195rpx;
+  left:30rpx;
+  font-weight: 400;
+}
+.Card3{
+  font-size:20rpx;
+  position: absolute;
+  top:249rpx;
+  left:30rpx;
+  font-weight: 400;
+}
+.Card4{
+  width:248rpx;
+  position: absolute;
+  top:275rpx;
+  left:30rpx;
+  justify-content: space-between;
+}
+.Progress{
+  width:160rpx;
+  height:10rpx;
+  border-radius: 5rpx;
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+}
+.Progress1{
+  width:100rpx;
+  height:10rpx;
+  border-radius: 5rpx;
+  background-color: #34BD88;
+}
+.Number{
+  font-family: 'Roboto-Black';
+  font-size:32rpx;
+}
+
+.panelList{
+  width:100%;
+  background-color: #fff;
+  align-items: flex-start;
+}
+
+.panelListTitle{
+  font-size:32rpx;
+  margin: 0 0 0 30rpx;
+  width:100%;
+  height:115rpx;
+  justify-content: flex-start;
+}
+
+.examine_clipboard_80x80{
+  width:80rpx;
+  height:80rpx;
+  margin: 10rpx 0 0 30rpx;
+}
+
+.panelListContent{
+  width:100%;
+  margin: 30rpx 0 0 30rpx;
+  font-size:24rpx;
   font-weight: 400;
-  justify-content: center;
 }
 
-.panelItem .panelItem1{
-  margin-left: 30rpx;
+.Item{
+  width:100%;
+  height:136rpx;
+  justify-content: space-between;
+}
+.Item1{
+  margin: 0 0 0 30rpx;
+  align-items: flex-start;
+}
+
+.ItemTitle{
+  font-size:30rpx;
   font-weight: 400;
 }
-.panelItem .panelItem2{
-  margin-right: 30rpx;
-  color:#787878;
+.ItemTitle2{
+  font-size:24rpx;
   font-weight: 400;
+  color:#787878;
 }
 
-.Arrow{
-  width:16rpx;
-  height:26rpx;
-  margin-left: 30rpx;
+.Item2{
+  margin: 0 30rpx 0 0;
+  align-items: flex-end;
+  color:#787878;
+}
+
+.ItemDate{
+  font-size:24rpx;
+  margin-bottom: 10rpx;
+}
+.examine_willread_gray_22x22{
+  width:22rpx;
+  height:22rpx;
+  margin-right: 30rpx;
+}
+.examine_willwrite_gray_22x22{
+  width:22rpx;
+  height:22rpx;
+  margin-right: 30rpx;
+}
+.universalpic_checked_gray_14x12{
+  width:14rpx; 
+  height:12rpx;
+}
+.Number2{
+  margin: 0 30rpx 0 10rpx;
+  font-family: 'Roboto-Black';
+  font-size:24rpx;
+}
+.universalpic_wrong_gray_12x12{
+  width:12rpx;
+  height:12rpx;
+}
+.Number3{
+  margin: 0 0 0 10rpx;
+  font-family: 'Roboto-Black';
+  font-size:24rpx;
+}
+
+
+.numberContainer {
+  width: 100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: fixed;
+  top: 0;
+  background-color: #fff;
+  color:#1e1e1e;
+  z-index: 20;
+  border-top: 1 solid #fff;
+}
+
+.universalpic_people_black_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 50rpx 20rpx 0 30rpx;
+}
+.numberContainer .numberContaineFooter{
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  align-items: flex-start;
+  font-size: 36rpx;
+  border-top: 1rpx solid rgba(0, 0, 0, 0.2);
+  text-align: center;
+  line-height: 131rpx;
+}
+.numberContainer .numberContaineFooter2{
+  color:#B3443B;
+  font-weight: 500;
+}
+
+.universalpic_sequence_black_30x30_2{
+  margin: 50rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter1{
+  width:100%;
+  position: fixed;
+  bottom:131rpx;
 }
 
+.numberContainerFooter102{
+  width:100%;
+  height: 132rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter103{
+  width:100%;
+  height: 111rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter104{
+  width:100%;
+  height: 100rpx;
+  justify-content: flex-start;
+}
+.numberContainerFooter101{
+  width:100%;
+  height: 276rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.universalpic_edit_gray_25x25{
+  width: 25rpx; 
+  height: 25rpx;
+  margin: 0 30rpx 0 30rpx;
+}
+
+.universalpic_bell_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 40rpx 20rpx 0 30rpx;
+}
+.universalpic_typesize_gray_30x18{
+  width: 30rpx; 
+  height: 18rpx;
+  margin: 57rpx 20rpx 0 30rpx;
+}
+
+.numberContainerFooter11{
+  align-items: flex-start;
+  margin-top: 40rpx;
+}
 
-.text1{
+.numberContainerFooter111{
+  font-size:36rpx;
+  font-weight: 400;
+}
+.numberContainerFooter1111{
+  margin-top: 40rpx;
+}
+.numberContainerFooter113{
   font-size:24rpx;
+  font-weight: 400;
+}
+
+.numberContainerFooter112{
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
+
+.numberContainerFooter1121{
+  line-height:73rpx;
+  border:3rpx solid #D2D2D2;
+  border-radius: 10rpx;
   text-align: center;
-  color:#787878;
+  margin: 30rpx 30rpx 0 0;
+  font-size:24rpx;
+  padding: 0 30rpx;
+}
+
+.numberContainerFooter1121Select{
+  border:3rpx solid #0071EF;
+  color:#fff;
+  background-color: #0071EF;
 }

pages/test/list.js

@@ -0,0 +1,33 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsSelect:true,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShow: function () {
+    this.setData({
+      IsSelect: true,
+    });
+  },
+  onClose: function () {
+    this.setData({
+      IsSelect: false,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/test/list.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "语文识字 上学期"
+}

pages/test/list.wxml

@@ -0,0 +1,59 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="text1">请对照课本选择字组</view>
+  <block wx:for="{{[1,2,3,4]}}" wx:key="index">
+    <view class="PanelItem FlexColumn" bindtap="onShow" data-id="{{index}}">
+      <view class="PanelItem1 FlexRow">
+        <view class="left FlexRow">
+          <view class="Word FlexRow">
+            天
+          </view>
+          <view class="Title FlexRow">
+            识字 1-5
+          </view>
+        </view>
+        <view class="right FlexColumn">
+          <view class="right1 FlexRow">
+            <image class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
+            <image class="examine_willwrite_green_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+          </view>
+          <view class="right2">38个字</view>
+        </view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <text class="PanelItem2 FlexRow">
+      统、根、据、这、一、结、果、计、算、题、卡、今、后、的、练、习、时、间、每、次、打、分、务、求、准、确、这、会…
+      </text>
+    </view>
+  </block>
+  <view style="height:50rpx;"></view>
+</view>
+
+
+<!-- 跳出 -->
+<view wx:if="{{IsSelect}}" class="SelectContainer FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <view class="SelectContainer1 FlexColumn">
+    <image src="../images/examine_subjecticon_01.png" class="examine_subjecticon_01" />
+    <view class="SelectContainer1Text1">识字 1-4</view>
+    <view class="SelectContainer1Text2">检验哪个方面</view>
+    <view class="btnPanel FlexRow">
+      <view class="btn FlexRow">
+        <image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
+        <view class="SelectContainer1Text3">会念</view>
+      </view>
+      <view class="btn FlexRow">
+        <image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
+        <view class="SelectContainer1Text3">会写</view>
+      </view>
+    </view>
+    <view class="btnPanel FlexRow">
+      <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
+      <view class="SelectContainer1Text4">查看字表</view>
+    </view>
+
+    <view class="close FlexRow" bindtap="onClose">
+      <image src="../images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
+    </view>
+  </view>
+</view>

pages/test/list.wxss

@@ -0,0 +1,158 @@
+.container{
+  background-color: #F0F0F0;
+}
+
+.text1{
+  margin: 50rpx 0 30rpx 0;
+  font-size:24rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.PanelItem{
+  width:100%;
+  height:263rpx;
+  background-color: #fff;
+  justify-content: flex-start;
+  border-bottom: 1rpx solid #D2D2D2;
+  margin-bottom: 50rpx;
+}
+.PanelItem1{
+  width:100%;
+  justify-content: space-between;
+  margin-top: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.left{
+  margin-left: 30rpx;
+}
+
+.Word{
+  width:75rpx;
+  background-color: #F0F0F0;
+  color:#787878;
+  text-align: center;
+  line-height: 75rpx;
+  font-size: 46rpx;
+}
+
+.Title{
+  margin-left: 30rpx;
+  font-size:30rpx;
+  color:#1e1e1e;
+}
+.right{
+  margin-right: 30rpx;
+}
+
+.right1{
+  margin-bottom: 15rpx;
+}
+
+.examine_willread_gray_22x22{
+  width:22rpx;
+  height:22rpx;
+  margin-right: 20rpx;
+}
+
+.examine_willwrite_green_22x22{
+  width:22rpx;
+  height:22rpx;
+}
+
+.right2{
+  font-size: 20rpx;
+  color:#787878;
+}
+
+.PanelItem2{
+  width: 690rpx;
+  height:86rpx;
+  text-align: left;
+  font-size:24rpx;
+  font-weight: 400;
+  color:#787878;
+}
+
+.SelectContainer{
+  background-color: rgba(0,0,0,0.7);
+  position: fixed;
+  width:100%;
+  top:0;
+}
+
+.SelectContainer .SelectContainer1{
+  width:710rpx;
+  height:613rpx;
+  border-radius: 10rpx;
+  background-color: #F8F8F8;
+  position: relative;
+}
+
+.examine_subjecticon_01{
+  width:80rpx;
+  height:80rpx;
+}
+
+.SelectContainer1Text1{
+  font-size:36rpx;
+  margin-top: 20rpx;
+}
+
+.SelectContainer1Text2{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.SelectContainer1Text3{
+  font-size:36rpx;
+  margin-left: 10rpx;
+  color:#787878;
+}
+
+.btnPanel{
+  margin-top: 60rpx;
+}
+
+.btn{
+  width:315rpx;
+  height:110rpx;
+  border-radius: 10rpx;
+  background-color: #fff;
+  border:1rpx solid #9B9B9B;
+  margin: 0 10rpx;
+}
+
+
+.examine_willread_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+}
+.examine_willwrite_gray_27x27{
+  width:27rpx;
+  height:27rpx;
+}
+
+.universalpic_word_blue_30x30{
+  width:30rpx;
+  height:30rpx;
+}
+
+.SelectContainer1Text4{
+  font-size:24rpx;
+  margin-left: 10rpx;
+  color:#0071EF;
+}
+
+.close{
+  width:100rpx;
+  height:100rpx;
+  position: absolute;
+  top:0;
+  right:0;
+}
+.universalpic_close_black_24x24{
+  width:24rpx;
+  height:24rpx;
+}

pages/test/report.js

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

pages/test/report.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "报告"
+}

pages/test/report.wxml

@@ -0,0 +1,64 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexColumn">
+    <view class="text1">答错3个 跳过1个</view>
+    <view class="text2">选择题目可一键生成题卡</view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1 FlexRow">
+      <view class="text3">答错的题目</view>
+      <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn FlexRow">
+      <view class="circle"></view>
+      <view class="text4">五彩缤纷</view>
+    </view>
+    <view class="btn2 btn FlexRow">
+      <image src="../images/universalpic_checked_white_22x17.png" class="universalpic_checked_white_22x17" />
+      <view class="text4">秒过</view>
+    </view>
+  </view>
+
+  <view class="panelItem FlexRow">
+    <view class="panelItem1 FlexRow">
+      <view class="text3">跳过的题目</view>
+      <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray2" />
+    </view>
+  </view>
+
+  <view class="panelFooter FlexRow">
+    <view class="btn3 btn FlexRow">
+      生成题卡
+    </view>
+    <view class="btn4 btn3 btn FlexRow">
+      关闭
+    </view>
+  </view>
+</view>

pages/test/report.wxss

@@ -0,0 +1,110 @@
+.panelTop{
+  width:100%;
+  align-items: flex-start;
+}
+.text1{
+  margin-top: 50rpx;
+  margin-left: 30rpx;
+  font-size:32rpx;
+}
+.text2{
+  margin-bottom: 30rpx;
+  margin-left: 30rpx;
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  background-color: #fff;
+  flex-wrap: wrap;
+  margin-bottom: 50rpx;
+  padding-bottom: 40rpx;
+}
+
+.panelItem1{
+  width:100%;
+  justify-content: space-between;
+}
+
+.text3{
+  margin-top: 40rpx;
+  margin-left: 30rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  transform:rotate(-90deg);
+  margin-top: 40rpx;
+  margin-right: 30rpx;
+}
+
+.universalpic_indicator_right_gray2{
+  width:16rpx;
+  height:26rpx;
+  transform:rotate(90deg);
+  margin-top: 40rpx;
+  margin-right: 30rpx;
+}
+
+.btn{
+  border:1rpx solid #9B9B9B;
+  height:100rpx;
+  border-radius: 10rpx;
+  margin: 30rpx 0 0 30rpx;
+  padding: 0 30rpx;
+  color:#1e1e1e;
+}
+
+.btn2{
+  border:1rpx solid #0071EF;
+  background-color: #0071EF;
+  color:#fff;
+}
+
+.circle{
+  width:34rpx;
+  height:34rpx;
+  border-radius: 50%;
+  background-color: #F8F8F8;
+  border:3rpx solid #d2d2d2;
+}
+
+.universalpic_checked_white_22x17{
+  width:22rpx;
+  height:17rpx;
+}
+
+.text4{
+  margin-left: 20rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.panelFooter{
+  width:100%;
+  height:120rpx;
+  background-color: #fff;
+  position: fixed;
+  z-index: 10;
+  bottom:0;
+}
+
+.btn3{
+  width:270rpx;
+  height:80rpx;
+  color:#0071EF;
+  font-size:32rpx;
+  text-align: center;
+  line-height: 80rpx;
+  margin: 0 15rpx;
+}
+
+.btn4{
+  color:#1e1e1e;
+}

pages/test/wordlist.js

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

pages/test/wordlist.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "字表"
+}

pages/test/wordlist.wxml

@@ -0,0 +1,13 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view class="text1">识字 1-5</view>
+    <view class="text2">38个字</view>
+  </view>
+  <view class="panelMain FlexColumn">
+    <view class="panelMain1 FlexRow">
+      <view class="item" wx:for="{{[1,1,1,1,1,1,1,1,1,1,11,1,1,1,1,1,1,1,1,11,1,1,1,1,1,1,1,1,11,1,1,1,1,1,1,1,1,1]}}" >
+      天
+      </view>
+    </view>
+  </view>
+</view>

pages/test/wordlist.wxss

@@ -0,0 +1,38 @@
+.panelTop{
+  width:100%;
+  height:106rpx;
+  justify-content: space-between;
+  background-color: #fff;
+}
+.text1{
+  margin-left: 30rpx;
+  font-size:32rpx;
+}
+.text2{
+  margin-right: 30rpx;
+  font-size:24rpx;
+  color:#787878;
+}
+
+.panelMain{
+  width:100%;
+  justify-content: flex-start;
+}
+.panelMain1{
+  width:720rpx;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+  margin-top: 50rpx;
+  margin-left: 30rpx;
+}
+.item{
+  width:110rpx;
+  height:110rpx;
+  background-color: #fff;
+  margin: 0 6rpx 6rpx 0;
+  text-align: center;
+  line-height: 110rpx;
+  font-size:48rpx;
+  font-weight: 400;
+}

project.config.json

@@ -48,8 +48,12 @@
 			"currentL": -1,
 			"list": []
 		},
+		"gamePlugin": {
+			"current": -1,
+			"list": []
+		},
 		"miniprogram": {
-			"current": 9,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,
@@ -102,24 +106,17 @@
 				},
 				{
 					"id": 7,
-					"name": "pages/main/symbolsetting",
-					"pathName": "pages/main/symbolsetting",
+					"name": "pages/test/report",
+					"pathName": "pages/test/report",
 					"query": "",
 					"scene": null
 				},
 				{
-					"id": 9,
-					"name": "pages/index/index",
+					"id": 8,
+					"name": "/pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "",
-					"scene": 1047
-				},
-				{
-					"id": -1,
-					"name": "pages/test/index",
-					"pathName": "pages/test/index",
-					"query": "",
-					"scene": null
+					"query": "type=bebound&ParentUserID=2&NickName=一二",
+					"scene": 1007
 				}
 			]
 		}