1.4.13

app.js

@@ -33,7 +33,7 @@ App({
   },
   globalData: {
     Version: "1.4.13",
-    IsProduction: true,
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/main/detail.js

@@ -34,6 +34,7 @@ var arrImage = [],
 var intervalSound = 0,
   intervalRefresh = 0;
 var isCollecting = false;
+var isExit=true;
 
 var isPlaying = false;
 
@@ -151,8 +152,9 @@ Page({
     }
   },
   onHide:function(e){
-    console.log("Hide:"+e);
-    this.onClose();
+    if (isExit)
+      this.onClose();
+    isExit = true;
   },
   onPullDownRefresh: function () {
     this.onShowAnswer({
@@ -384,6 +386,7 @@ Page({
     wx.navigateTo({
       url: './add?type=edit&id=' + TaskList[0].MiaoguoCardID,
     });
+    isExit = false;
   },
   onFontSize: function (e) {
     var value = e.currentTarget.dataset.value;

pages/test/index.js

@@ -5,15 +5,80 @@ const app = getApp();
 
 Page({
   data: {
-    List:[1],
-    IsSelectGrade:false,
-    GradeArr: [{ Name: "一年级" }, { Name: "二年级" }, { Name: "三年级"}],
+    List: [],
+    IsSelectGrade: false,
+    SelectGrade:0,
+    GradeArr: [
+      {
+        Name: "一年级",
+        Select:"Select",
+        List: [
+          {
+            ID: 1,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Image: "../images/examine_subject_a001.png"
+          }, {
+            ID: 2,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Image: "../images/examine_subject_a002.png"
+          },
+        ]
+      },
+      {
+        Name: "二年级",
+        Select: "",
+        List: [
+          {
+            ID: 3,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Image: "../images/examine_subject_a003.png"
+          }, {
+            ID: 4,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Image: "../images/examine_subject_a004.png"
+          },
+        ]
+      },
+      {
+        Name: "三年级",
+        Select: "",
+        List: [
+          {
+            ID: 5,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Image: "../images/examine_subject_a005.png"
+          }, {
+            ID: 6,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Image: "../images/examine_subject_a006.png"
+          },
+        ]
+      }
+    ],
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+
+    that.getHanzi(function (arr) {
+      if (arr) {
+
+      }
+    });
   },
   showSelectGrade: function () {
     var that = this;
@@ -21,12 +86,48 @@ Page({
       IsSelectGrade: true,
     });
   },
-  closeSelectGrade:function(){
+  closeSelectGrade: function () {
     var that = this;
     that.setData({
       IsSelectGrade: false,
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  getHanzi: function (callback) {
+    var that = this;
+    var time = wx.getStorageSync("HanziUpdateTime");
+    main.getData('GetHanziAll?UpdateTime=' + time, function (data) {
+      if (data) {
+        var arr = [];
+        if (data.List) {
+          arr = common.Decrypt(data.List);
+          wx.setStorageSync("HanziAll", arr);
+          wx.setStorageSync("HanziUpdateTime", data.UpdateTime);
+        }
+        else {
+          arr = wx.getStorageSync("HanziAll");
+          arr=JSON.parse(arr);
+        }
+        callback(arr);
+      }
+    });
+  },
+  onSelectGrade:function(e){
+    var index=e.currentTarget.dataset.value;
+    for (var i = 0; i < this.data.GradeArr.length;i++)
+      this.data.GradeArr[i].Select = "";
+    this.data.GradeArr[index].Select="Select";
+    this.setData({
+      SelectGrade:index,
+      GradeArr: this.data.GradeArr,
+    });
+    this.closeSelectGrade();
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/test/index.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow" bindtap="showSelectGrade">
-    <view class="panelTop1">一年级</view>
+    <view class="panelTop1">{{GradeArr[SelectGrade].Name}}</view>
     <view class="panelTop2 FlexRow">
       <image class="universalpic_menu_blue_26x26" src="../images/universalpic_menu_blue_26x26.png"></image>
       <view>首选年级</view>
@@ -8,20 +8,16 @@
   </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="Card" wx:for="{{GradeArr[SelectGrade].List}}" wx:key="index" bindtap="goto" data-url="./list?id={{item.ID}}">
+      <image class="examine_subject_a001" src="{{item.Image}}"></image>
+      <view class="Card1">{{item.Name}}</view>
+      <view class="Card2">{{item.Name2}}</view>
       <view class="Card3">已检验</view>
       <view class="Card4 FlexRow">
         <view class="Progress FlexRow"><view class="Progress1"></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">
@@ -68,7 +64,7 @@
         <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 class='numberContainerFooter1121{{item.Select}}' wx:for="{{GradeArr}}" wx:key="index" catchtap='onSelectGrade' data-value='{{index}}'>{{item.Name}}</view>
         </view>
       </view>
     </view>

pages/test/index.wxss

@@ -308,4 +308,10 @@
   border:3rpx solid #0071EF;
   color:#fff;
   background-color: #0071EF;
+  line-height:73rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  margin: 30rpx 30rpx 0 0;
+  font-size:24rpx;
+  padding: 0 30rpx;
 }

pages/test/list.js

@@ -5,15 +5,42 @@ const app = getApp();
 
 Page({
   data: {
-    IsSelect:true,
+    IsSelect:false,
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    var arr = wx.getStorageSync("HanziAll");
+    arr = JSON.parse(arr);
+    var id=Number(options.id);
+    for(var i=0;i<arr.length;i++){
+      if (arr[i].ID==id){
+        var list = arr[i].Units;
+        for (var j = 0; j < list.length;j++){
+          var str="";
+          for(var k=0;k<list[j].Words.length;k++){
+            if (k < 27 && k < list[j].Words.length-1)
+              str += list[j].Words[k].Name+"、";
+            else if (k == list[j].Words.length-1)
+              str += list[j].Words[k].Name;
+            else{
+              str += list[j].Words[k].Name +"…";
+              break;
+            }
+          }
+
+          list[j].WordList=str;
+        }
+        that.setData({
+          List:list,
+        });
+      }
+    }
+
   },
-  onShow: function () {
+  onShowFrame: function () {
     this.setData({
       IsSelect: true,
     });

pages/test/list.wxml

@@ -1,14 +1,14 @@
 <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}}">
+  <block wx:for="{{List}}" wx:key="index">
+    <view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
       <view class="PanelItem1 FlexRow">
         <view class="left FlexRow">
           <view class="Word FlexRow">
-            天
+            {{item.Words[0].Name}}
           </view>
           <view class="Title FlexRow">
-            识字 1-5
+            {{item.Name}}
           </view>
         </view>
         <view class="right FlexColumn">
@@ -16,14 +16,14 @@
             <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 class="right2">{{item.Words.length}}个字</view>
         </view>
       </view>
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth720"></view>
       </view>
       <text class="PanelItem2 FlexRow">
-      统、根、据、这、一、结、果、计、算、题、卡、今、后、的、练、习、时、间、每、次、打、分、务、求、准、确、这、会…
+        {{item.WordList}}
       </text>
     </view>
   </block>

pages/test/report.wxml

@@ -8,6 +8,10 @@
       <view class="text3">答错的题目</view>
       <image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
     </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 class="btn FlexRow">
       <view class="circle"></view>
       <view class="text4">五彩缤纷</view>
@@ -40,10 +44,7 @@
       <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">

project.config.json

@@ -106,8 +106,8 @@
 				},
 				{
 					"id": 7,
-					"name": "pages/test/report",
-					"pathName": "pages/test/report",
+					"name": "pages/test/index",
+					"pathName": "pages/test/index",
 					"query": "",
 					"scene": null
 				},