1.4.14

pages/test/item.js

@@ -5,19 +5,58 @@ const app = getApp();
 
 Page({
   data: {
+    IsSelect: true,
+
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      Color: {
-        ID: 0,
-        Name: "黑白",
-        BackColor: "#fff",
-        BackColor2: "#eee",
-        LineColor: "#eee",
-        FieldColor: "#ddd",
-      },
+      IsShowAnswer: [0, 0],
+      Color: main.getDetailColor(1),
+    });
+
+    var words = [];
+    var unitsName = "";
+    var arr = wx.getStorageSync("HanziAll");
+    arr = JSON.parse(arr);
+    var unitsid = Number(options.unitsid);
+    var id = Number(options.id);
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i].ID == unitsid) {
+        var list = arr[i].Units;
+        for (var j = 0; j < list.length; j++) {
+          if (list[j].ID == id) {
+            unitsName = list[j].Name;
+            words = list[j].Words;
+          }
+        }
+
+        var tags=["怎么写"];
+        if (options.category=="read")
+          tags = ["怎么念"];
+
+
+        that.setData({
+          UnitsName: unitsName,
+          Words: words,
+          Tags:tags,
+        });
+        break;
+      }
+    }
+  },
+  onPullDownRefresh: function () {
+    var that = this;
+    that.setData({
+      IsShowAnswer: [0, 0],
+    });
+    wx.stopPullDownRefresh();
+  },
+  onShowAnswer: function (e) {
+    var that=this;
+    that.setData({
+      IsShowAnswer: [1,1],
     });
   },
   onShareAppMessage: function () {

pages/test/item.json

@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "navigationBarTitleText": "检验中",
+  "navigationBarBackgroundColor": "#1F3C88",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#1F3C88",
+  "enablePullDownRefresh": true
 }

pages/test/item.wxml

@@ -1,6 +1,51 @@
 <import src="../template/cardShow.wxml" />
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTop FlexRow">
+    <view class="left FlexRow">
+      <view class="Number2 Number1 FlexColumn">
+        <view>1</view>
+        <view class="line2 line1"></view>
+      </view>
+      <view class="Number1 FlexColumn">
+        <view>88</view>
+        <view class="line1"></view>
+      </view>
+    </view>
+    <view class="right FlexRow">
+      <view class="btnTop FlexRow">
+        <image src="../images/universalpic_shelve_gray_26x26.png" class="universalpic_shelve_gray_26x26" />
+      </view>
+      <view class="btnTop FlexRow">
+        <image src="../images/universalpic_undo_gray_26x20.png" class="universalpic_undo_gray_26x20" />
+      </view>
+    </view>
+  </view>
+  <view style='width:100%;height:110rpx;'></view>
   <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,LimitTimeStr:LimitTimeStr,ShowType:ShowType}}" />
-  
   <view style='width:100%;height:100rpx;'></view>
+
+  <!-- 下方按钮 -->
+  <image class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
+  <view class='footer FlexColumn'>
+    <image class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
+    <view class="panelFooter FlexColumn" hover-class='AnswerHover' wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtouchstart="onShowAnswer">
+      看答案
+    </view>
+    <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
+      <view class='panelBottomAnswer panelBottom FlexRow'>
+        <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
+          <view class="btnTime">
+            答错
+          </view>
+          <view class="Answer0 btnColor"></view>
+        </view>
+        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
+          <view class="btnTime">
+            答对
+          </view>
+          <view class="Answer2 btnColor"></view>
+        </view>
+      </view>
+    </view>
+  </view>
 </view>

pages/test/item.wxss

@@ -1,3 +1,61 @@
+.container {
+  background-color: #1F3C88;
+}
+
+.panelTop{
+  width:100%;
+  height:110rpx;
+  justify-content: space-between;
+  color:#fff;
+  position: fixed;
+  top:0;
+  z-index: 10;
+}
+
+.left{
+  margin-left: 50rpx;
+}
+
+.Number1{
+  width:50rpx;
+  height:50rpx;
+  justify-content: flex-end;
+  font-size:20rpx;
+  font-weight: 400;
+  font-family: 'Roboto-Black';
+  margin-bottom: 10rpx;
+}
+.Number2{
+  color:rgba(255,255,255,0.5);
+}
+.line1{
+  width:26rpx;
+  height:6rpx;
+  margin-top: 5rpx;
+}
+.line2{
+  background-color: #F1AB1E;
+}
+
+.right{
+  margin-right: 40rpx;
+}
+.btnTop{
+  width:70rpx;
+  height:70rpx;
+  border-radius: 50%;
+  background-color: rgba(0,0,0,0.1);
+  margin-left: 30rpx;
+}
+
+.universalpic_shelve_gray_26x26{
+  width:26rpx;
+  height:26rpx;
+}
+.universalpic_undo_gray_26x20{
+  width:26rpx;
+  height:20rpx;
+}
 
 /* 段落显示************************ */
 
@@ -228,3 +286,128 @@
 }
 
 /* ******************************** */
+
+
+.footerShade{
+  width: 100%;
+  position: fixed;
+  height:480rpx;
+  bottom: 0;
+  z-index: 1;
+}
+/* 底部记忆选择 */
+
+.footer{
+  width: 710rpx;
+  position: fixed;
+  bottom: 0;
+  z-index: 10;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+
+.footerImage{
+  width:710rpx;
+  position: absolute;
+  bottom:0;
+  height:80rpx;
+  z-index: 10;
+}
+
+.panelFooter {
+  width: 710rpx;
+  margin-bottom: 20rpx;
+  background-color: #181a21;
+  border-radius: 20rpx;
+  color: #d2d2d2;
+  font-size: 48rpx;
+  text-align: center;
+  line-height: 140rpx;
+  z-index: 15;
+}
+
+.panelFooter0 {
+  line-height: 40rpx;
+}
+
+.panelBottomAnswer0 {
+  width: 100%;
+  height: 20rpx;
+  z-index: 10;
+}
+
+.panelBottomAnswer {
+  width: 100%;
+  font-size: 28rpx;
+  justify-content: space-between;
+  z-index: 10;
+  height: 140rpx;
+}
+
+.iphoneX {
+  width: 100%;
+  height: 60rpx;
+  z-index: 10;
+}
+
+.Answer {
+  flex: 1;
+  font-size: 28rpx;
+  justify-content: flex-start;
+  height: 140rpx;
+}
+
+.AnswerLeft{
+  border-top-left-radius: 20rpx;
+  border-bottom-left-radius: 20rpx;
+}
+
+.AnswerRight{
+  border-top-right-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+}
+
+.AnswerHover{
+  background-color: #262935;
+}
+
+.Answer .btnColor {
+  height: 14rpx;
+  width: 75%;
+  border-radius: 4rpx;
+  margin-top: 16rpx;
+}
+
+.Answer .btnTime {
+  margin-top: 34rpx;
+}
+
+.Answer .Answer0 {
+  background-color: #fe6659;
+}
+
+.Answer .Answer1 {
+  background-color: #ffbc00;
+}
+
+.Answer .Answer1Recommend {
+  height: 50rpx;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  margin-top: 16rpx;
+}
+
+.Answer .Answer2 {
+  background-color: #329468;
+}
+
+.Answer .Answer3 {
+  background-color: #0a60be;
+}
+
+.footer0 {
+  height: 180rpx;
+  width: 100%;
+  z-index: 1;
+}
+

pages/test/list.js

@@ -35,14 +35,25 @@ Page({
         }
         that.setData({
           List:list,
+          UnitsID:id,
         });
       }
     }
 
   },
-  onShowFrame: function () {
+  onShowFrame: function (e) {
+    var selectID,selectName;
+    var id=e.currentTarget.dataset.id;
+    for(var i=0;i<this.data.List.length;i++){
+      if (id==this.data.List[i].ID){
+        selectID=id;
+        selectName = this.data.List[i].Name;
+      }
+    }
     this.setData({
       IsSelect: true,
+      SelectID:selectID,
+      SelectName:selectName,
     });
   },
   onClose: function () {
@@ -50,6 +61,12 @@ Page({
       IsSelect: false,
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/test/list.wxml

@@ -35,19 +35,19 @@
 <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="SelectContainer1Text1">{{SelectName}}</view>
     <view class="SelectContainer1Text2">检验哪个方面</view>
     <view class="btnPanel FlexRow">
-      <view class="btn FlexRow">
+      <view class="btn FlexRow" bindtap="goto" data-url="./item?category=read&unitsid={{UnitsID}}&id={{SelectID}}">
         <image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
         <view class="SelectContainer1Text3">会念</view>
       </view>
-      <view class="btn FlexRow">
+      <view class="btn FlexRow" bindtap="goto" data-url="./item?category=write&unitsid={{UnitsID}}&id={{SelectID}}">
         <image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
         <view class="SelectContainer1Text3">会写</view>
       </view>
     </view>
-    <view class="btnPanel FlexRow">
+    <view class="btnPanel FlexRow" bindtap="goto" data-url="./wordlist?unitsid={{UnitsID}}&id={{SelectID}}">
       <image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
       <view class="SelectContainer1Text4">查看字表</view>
     </view>

pages/test/wordlist.js

@@ -12,6 +12,28 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+
+    var words=[];
+    var unitsName="";
+    var arr = wx.getStorageSync("HanziAll");
+    arr = JSON.parse(arr);
+    var unitsid = Number(options.unitsid);
+    var id = Number(options.id);
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i].ID == unitsid) {
+        var list = arr[i].Units;
+        for (var j = 0; j < list.length; j++) {
+          if (list[j].ID==id){
+            unitsName = list[j].Name;
+            words = list[j].Words;
+          }
+        }
+        that.setData({
+          UnitsName: unitsName,
+          Words: words,
+        });
+      }
+    }
   },
   onShareAppMessage: function () {
     return {

pages/test/wordlist.wxml

@@ -1,13 +1,14 @@
 <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 class="text1">{{UnitsName}}</view>
+    <view class="text2">{{Words.length}}个字</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 class="item" wx:for="{{Words}}" wx:key="index" >
+      {{item.Name}}
       </view>
     </view>
   </view>
+  <view style="height:100rpx;"></view>
 </view>

project.config.json

@@ -53,7 +53,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 7,
 			"list": [
 				{
 					"id": 0,
@@ -108,7 +108,7 @@
 					"id": 7,
 					"name": "pages/test/index",
 					"pathName": "pages/test/index",
-					"query": "",
+					"query": "id=1",
 					"scene": null
 				},
 				{