1.1.9

pages/main/index.wxml

@@ -122,9 +122,9 @@
           <view class="ReviewCount">{{ReviewCount}}</view>
         </view>
       </view>
-      <!-- <view class="btn8 btn6 btn" wx:if="{{FinishedCount>0}}" bindtap="gotoTest">
+      <view class="btn8 btn6 btn" wx:if="{{FinishedCount>0}}" bindtap="gotoTest">
         <view class="btn7 btn1">测试</view>
-      </view> -->
+      </view>
 
       <button class="Circle FlexColumn" open-type="share">
         <image src='../../images/02015.png' class="Share" />

pages/main/test.js

@@ -3,44 +3,11 @@ import server from '../../utils/main';
 import pinyin from '../../utils/pinyin';
 
 const app = getApp();
-var currentIndex=0;
-var isRight=false;
+var currentIndex = 0;
+var isRight = false;
 
 Page({
   data: {
-    List:[
-      {
-        Name:"程",
-        Pinyin:"cheng2",
-        AnswerList: [
-          {
-            pinyin: "cen2",
-          }, {
-            pinyin: "chen2",
-          }, {
-            pinyin: "ceng2",
-          }, {
-            pinyin: "cheng2",
-          },
-        ]
-      },
-      {
-        Name: "杰",
-        Pinyin: "jie2",
-        AnswerList: [
-          {
-            pinyin: "ji2",
-          }, {
-            pinyin: "jie2",
-          }, {
-            pinyin: "xie2",
-          }, {
-            pinyin: "qie2",
-          },
-        ]
-      }
-    ]
-    
   },
   onLoad: function (options) {
     this.setData({
@@ -51,74 +18,87 @@ Page({
 
   },
   getList: function () {
-    isRight=false;
-    var pinyinList = pinyin.getPinyinArray();
-    var item = this.data.List[currentIndex];
-    var list = item.AnswerList;
-    for (var i = 0; i < list.length; i++) {
-      for (var j = 0; j < pinyinList.length; j++) {
-        if (list[i].pinyin == pinyinList[j][0]) {
-          list[i].Pinyin = pinyinList[j][1];
-          list[i].Name = pinyinList[j][2][0];
-          break;
+    var that = this;
+    server.getData('GetHanziTestList', function (data) {
+      if (data) {
+        var list = data;
+        var item = list[currentIndex];
+        var pinyinList = pinyin.getPinyinArray();
+
+        for (var i = 0; i < list.length; i++) {
+          for (var k = 0; k < list[i].PinyinTest.length; k++) {
+            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;
+              }
+            }
+          }
         }
+
+        that.setData({
+          List: data,
+          CurrentItem: item,
+        });
       }
-      if (item.Pinyin==list[i].pinyin)
-        list[i].IsResult=true;
-      else
-        list[i].IsResult=false;
-    }
-    this.setData({
-      CurrentItem: item,
     });
   },
   selectedHanzi: function (e) {
     var id = e.currentTarget.dataset.id;
-    var list = this.data.CurrentItem.AnswerList;
+    var list = this.data.CurrentItem.PinyinTest;
     for (var i = 0; i < list.length; i++) {
       list[i].IsSelected = false;
     }
     list[id].IsSelected = true;
-    if (list[id].IsResult)
-      isRight=true;
-    this.data.CurrentItem.AnswerList=list;
-    this.playAudio(list[id].Pinyin, list[id].Name);
+    if (list[id].IsAnswer)
+      isRight = true;
+    this.data.CurrentItem.PinyinTest = list;
+    this.playAudio(list[id].options, list[id].name);
 
     this.setData({
       CurrentItem: this.data.CurrentItem,
     });
   },
-  playAudio: function (pinyin,name) {
-
-    var url = app.globalData.audioUrlBaidu;
-    url = url.replace("[token]", app.globalData.BaiduToken);
-    url = url.replace("[word]", name+"("+pinyin+")");
+  playAudio: function (pinyin, name) {
+    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 + ")");
 
-    url = encodeURI(url);
-    this.audioCtx.setSrc(url);
-    this.audioCtx.play();
+      url = encodeURI(url);
+      this.audioCtx.setSrc(url);
+      this.audioCtx.play();
+    }
   },
-  gotoOK:function(){
-    var that=this;
+  gotoOK: function () {
+    var that = this;
 
-    var title="错误";
-    var icon="none";
-    if (isRight){
-      title="正确";
-      icon ="success";
+    var title = "错误";
+    var icon = "none";
+    if (isRight) {
+      title = "正确";
+      icon = "success";
     }
+
     wx.showToast({
       title: title,
       icon: icon,
-      duration:1000,
-      complete:function(){
+      duration: 1000,
+      complete: function () {
+        isRight=false;
         currentIndex++;
         if (currentIndex >= that.data.List.length)
           currentIndex = 0;
-        that.getList();
+        that.setData({
+          CurrentItem: that.data.List[currentIndex],
+        });
       }
     })
-    
+
   },
   onShareAppMessage: function () {
     return {

pages/main/test.wxml

@@ -4,12 +4,12 @@
   <view class="panelTop FlexRow">
     <view class="title">选择正确的汉字发音</view>
   </view>
-  <view class="panel FlexRow" wx:for="{{CurrentItem.AnswerList}}" wx:key="index" bindtap='selectedHanzi' data-id="{{index}}">
+  <view class="panel FlexRow" wx:for="{{CurrentItem.PinyinTest}}" wx:key="index" bindtap='selectedHanzi' data-id="{{index}}">
     <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.Pinyin}}</view>
+    <view class="Name">{{item.options}}</view>
   </view>
   <view class="bottom" bindtap='gotoOK' data-id="0">确认</view>
 

pages/main/test.wxss

@@ -36,7 +36,10 @@
 }
 .Name{
   margin-left: 30rpx;
-  font-size:28rpx;
+  font-size:36rpx;
+  font-family: "GB Pinyinok-C";
+  font-weight: 300;
+  font-style: normal;
 }
 
 .universalpic_select_on_black{