1.1.10

app.js

@@ -11,7 +11,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.9",
+    Version: "1.1.10",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",

pages/main/detail.js

@@ -130,14 +130,9 @@ Page({
       wx.setStorageSync('IsHelpPosition1', 2);
     }
 
-    wx.getSetting({
-      success(res) {
-        if (!res.authSetting['scope.userInfo']) {
-          wx.setStorageSync('IsRemindAccredit', 1);
-        }
-      }
-    })
-
+    var IsRemindTest = wx.getStorageSync("IsRemindTest");
+    if (!IsRemindTest)
+      wx.setStorageSync('IsRemindTest', 1);
   },
   submitData: function (content) {
     if (app.globalData.userInfo && app.globalData.userInfo.UserID) {

pages/main/index.js

@@ -42,12 +42,9 @@ Page({
           });
         }
         else {
-          //付费用户请去授权
-          if (app.globalData.userInfo.IsMember == 1) {
-            wx.navigateTo({
-              url: '../about/payfinished?type=accredit',
-            });
-          }
+          wx.navigateTo({
+            url: '../about/payfinished?type=accredit',
+          });
         }
       }
     })
@@ -60,15 +57,6 @@ Page({
   onShow: function () {
     this.getData();
 
-    //进入详情出来后，让用户授权
-    if (!this.data.IsAccredit) {
-      var IsRemindAccredit = wx.getStorageSync("IsRemindAccredit");
-      if (IsRemindAccredit == 1) {
-        this.getAccredit();
-        wx.removeStorageSync('IsRemindAccredit');
-      }
-    }
-
     if (wx.getStorageSync("indexNav")) {
       var obj = {
         currentTarget: {
@@ -87,6 +75,15 @@ Page({
         url: '../about/paylist',
       });
     }
+    else{
+      var IsRemindTest = wx.getStorageSync("IsRemindTest");
+      if (IsRemindTest == 1) {
+        wx.setStorageSync('IsRemindTest', 2);
+        wx.navigateTo({
+          url: '../main/test',
+        });
+      }
+    }
   },
   getAccredit: function () {
     if (!this.data.IsAccredit) {

pages/main/test.js

@@ -5,9 +5,14 @@ import pinyin from '../../utils/pinyin';
 const app = getApp();
 var currentIndex = 0;
 var isRight = false;
+var arrTrue = [];
 
 Page({
   data: {
+    CurrentIndex: 1,
+    AnswerTrue: 0,
+    AnswerError: 0,
+    AnswerErrorMax: 3,
   },
   onLoad: function (options) {
     this.setData({
@@ -30,13 +35,13 @@ Page({
             for (var j = 0; j < pinyinList.length; j++) {
               if (list[i].PinyinTest[k].options == pinyinList[j][1]) {
                 list[i].PinyinTest[k].name = pinyinList[j][2][0];
-                
+
                 break;
               }
             }
           }
         }
-
+        arrTrue = [];
         that.setData({
           List: data,
           CurrentItem: item,
@@ -61,10 +66,10 @@ Page({
     });
   },
   playAudio: function (pinyin, name) {
-    if (name != undefined){
-      if (pinyin==undefined)
-        pinyin="";
-      
+    if (name != undefined) {
+      if (pinyin == undefined)
+        pinyin = "";
+
       var url = app.globalData.audioUrlBaidu;
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", name + "(" + pinyin + ")");
@@ -82,6 +87,17 @@ Page({
     if (isRight) {
       title = "正确";
       icon = "success";
+      that.data.AnswerTrue++;
+      for (var i = 0; i < arrTrue.length; i++) {
+        if (arrTrue[i] == that.data.CurrentItem.HanziUnitID) {
+          arrTrue.splice(i, 1);
+          break;
+        }
+      }
+      arrTrue.push(that.data.CurrentItem.HanziUnitID);
+    }
+    else {
+      that.data.AnswerError++;
     }
 
     wx.showToast({
@@ -89,17 +105,61 @@ Page({
       icon: icon,
       duration: 1000,
       complete: function () {
-        isRight=false;
+        isRight = false;
         currentIndex++;
-        if (currentIndex >= that.data.List.length)
+        if (currentIndex >= that.data.List.length) {
           currentIndex = 0;
-        that.setData({
-          CurrentItem: that.data.List[currentIndex],
-        });
+          that.getResult(1);
+        } 
+        else if (that.data.AnswerError > 3) {
+          currentIndex = 0;
+          that.getResult(0);
+        }
+        else {
+          that.setData({
+            CurrentItem: that.data.List[currentIndex],
+            CurrentIndex: currentIndex + 1,
+            AnswerTrue: that.data.AnswerTrue,
+            AnswerError: that.data.AnswerError,
+          });
+        }
       }
     })
 
   },
+  getResult: function (isFinished) {
+    var content = "";
+    var arr = JSON.parse(wx.getStorageSync("HanziAll"));
+    var count = 0;
+    var book = arr[0].Name;
+    for (var i = 0; i < arr.length; i++) {
+      for (var j = 0; j < arr[i].Units.length; j++) {
+        for (var k = 0; k < arrTrue.length; k++) {
+          if (arrTrue[k] == arr[i].Units[j].ID) {
+            count += arr[i].Units[j].Words.length;
+            book=arr[i].Name;
+          }
+        }
+      }
+    }
+    content = '您孩子的识字数大约是' + count + '个，建议从《' + book+'》学习起。';
+    if (count == 0) {
+      content = '您孩子的识字数未知，建议从《' + book +'》学习起。';
+    }
+    if (isFinished == 1) {
+      content = '您孩子的识字数大约是' + count + '个，实在太优秀了！建议自行搜索文字学习。';
+    }
+    wx.showModal({
+      title: '测试结果',
+      content: content,
+      showCancel: false,
+      success: function () {
+        wx.navigateBack({
+          delta: 1
+        })
+      },
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/test.wxml

@@ -1,6 +1,11 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
   <image src='https://hanzi-1253256735.file.myqcloud.com/images/hanzi{{CurrentItem.Name}}.jpg' class="wordImage" />
 
+  <view class="panelTop0 FlexRow">
+    <view class='left'>得分：{{AnswerTrue}} / {{List.length}}</view>
+    <view class='right'>错误：{{AnswerError}} / {{AnswerErrorMax}}</view>
+  </view>
+
   <view class="panelTop FlexRow">
     <view class="title">选择正确的汉字发音</view>
   </view>
@@ -8,10 +13,13 @@
     <view wx:if="{{!item.IsSelected}}" class="universalpic_select_on_black"></view>
     <image src='../../images/SelectYes.png' wx:if="{{item.IsSelected}}" class="universalpic_select_on_black" />
     <view class="Number">{{index+1}}.</view>
-    
+
     <view class="Name">{{item.options}}</view>
   </view>
-  <view class="bottom" bindtap='gotoOK' data-id="0">确认</view>
+  <view class="bottom FlexRow" >
+    <text class="bottom1" bindtap='getResult'>退出\n测试</text>
+    <view class="bottom2" bindtap='gotoOK' data-id="0">确认</view>
+  </view>
 
 </view>
 <audio hidden='true' id="myAudio"></audio>

pages/main/test.wxss

@@ -11,12 +11,30 @@
 }
 
 
+.panelTop0{
+  width:100%;
+  justify-content:space-between;
+  height:100rpx;
+  position: absolute;
+  top:-10rpx;
+  font-size: 24rpx;
+}
+
+.panelTop0 .left{
+  margin-left: 30rpx;
+}
+
+.panelTop0 .right{
+  margin-right: 30rpx;
+}
+
 .panelTop{
   width:100%;
   justify-content: flex-start;
   height:100rpx;
 }
 
+
 .title{
   margin: 50rpx 0 30rpx 30rpx;
   font-size:24rpx;
@@ -51,10 +69,22 @@
 .bottom{
   position: fixed;
   bottom:0;
+  width: 100%;
+  background-color: #4A4A4A;
+}
+
+.bottom1{
+  font-size:28rpx;
+  color:#fff;
+  text-align: center;
+  width: 20%;
+}
+
+.bottom2{
   font-size:48rpx;
   color:#fff;
   background-color: #FF7245;
   text-align: center;
   line-height: 120rpx;
-  width: 100%;
+  width: 80%;
 }

utils/pinyin.js

@@ -24,7 +24,7 @@ const getPinyinArray = function () {
     ['ba2', 'bá', ['拔']],
     ['ba3', 'bǎ', ['把']],
     ['ba4', 'bà', ['爸']],
-    ['ba5', 'ba', ['']],
+    ['ba5', 'ba', ['吧']],
     ['bai1', 'bāi', ['掰']],
     ['bai2', 'bái', ['白']],
     ['bai3', 'bǎi', ['百']],
@@ -718,7 +718,7 @@ const getPinyinArray = function () {
     ['men2', 'mén', ['门', '们']],
     ['men3', 'měn', ['']],
     ['men4', 'mèn', ['闷']],
-    ['men5', 'men', ['']],
+    ['men5', 'men', ['们']],
     ['meng1', 'mēng', ['蒙']],
     ['meng2', 'méng', ['蒙', '盟', '萌']],
     ['meng3', 'měng', ['猛', '']],
@@ -1404,7 +1404,7 @@ const getPinyinArray = function () {
     ['zhe2', 'zhé', ['折']],
     ['zhe3', 'zhě', ['者']],
     ['zhe4', 'zhè', ['这']],
-    ['zhe5', 'zhe', ['']],
+    ['zhe5', 'zhe', ['着']],
     ['zhei4', 'zhèi', ['这']],
     ['zhen1', 'zhēn', ['真', '针', '珍']],
     ['zhen3', 'zhěn', ['枕', '诊', '疹']],