1.0.0

pages/main/detail.js

@@ -27,6 +27,7 @@ Page({
     var bookID = options.bookid || 0;
     var unitID = options.unitid || 0;
     var wordID = options.wordid || 0;
+
     this.audioCtx = wx.createAudioContext('myAudio');
     hanziNumber = 0;
     isClickFinished = true;
@@ -54,7 +55,7 @@ Page({
       ShowMenu: "sort",
       UnitID: unitID,
       BookID: bookID,
-      selectedRandom: false,
+      SelectedRandom: false,
       SpeakerTitle: this.data.SpeakerArray[0].name,
       SpeakerMan: 0,
       ShowPinyin: true,
@@ -65,14 +66,14 @@ Page({
     var that = this;
     common.getStorageValue(that, "IsAutoPlay", true, function () {
       common.getStorageValue(that, "IsAutoPage", false, function () {
-        common.getStorageValue(that, "selectedRandom", false, function () {
+        common.getStorageValue(that, "SelectedRandom", false, function () {
           common.getStorageValue(that, "ShowPinyin", true, function () {
             common.getStorageValue(that, "IntervalSecondIndex", 2, function () {
               common.getStorageValue(that, "IsAudioLengthChecked", true, function () {
                 common.getStorageValue(that, "SpeakerMan", 0, function () {
                   that.settingPlay(null, that.data.IsAutoPlay);
                   that.settingPage(null, that.data.IsAutoPage);
-                  that.settingSort(null, that.data.selectedRandom.toString());
+                  that.settingSort(null, that.data.SelectedRandom.toString());
                   that.settingShowPinyin(null, that.data.ShowPinyin);
                   that.settingAudioLength(null, that.data.IsAudioLengthChecked);
                   that.settingSpeaker(null, that.data.SpeakerMan);
@@ -127,7 +128,7 @@ Page({
               item.Words[k].PinyinAll = item.Words[k].Pinyin;
               if (item.Words[k].Pinyin.indexOf(",") > 0)
                 item.Words[k].Pinyin = item.Words[k].Pinyin.substr(0, item.Words[k].Pinyin.indexOf(","));
-              
+
               item.Words[k].WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Words[k].Name + ".jpg";
 
               item.Words[k].IsReview = false;
@@ -146,7 +147,7 @@ Page({
       }
     }
 
-    if (this.data.selectedRandom) {
+    if (this.data.SelectedRandom) {
       result.Words = common.randomArray(result.Words);
     }
 
@@ -171,7 +172,7 @@ Page({
     for (var l = 0; l < arrReview.length; l++) {
       var item = arrReview[l];
       item.PinyinAll = item.Pinyin;
-      if (item.Pinyin.indexOf(",")>0)
+      if (item.Pinyin.indexOf(",") > 0)
         item.Pinyin = item.Pinyin.substr(0, item.Pinyin.indexOf(","));
 
       item.WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Name + ".jpg";
@@ -179,7 +180,7 @@ Page({
     }
     var result = arrReview;
 
-    if (this.data.selectedRandom) {
+    if (this.data.SelectedRandom) {
       result = common.randomArray(result);
     }
 
@@ -206,7 +207,7 @@ Page({
     var result = wx.getStorageSync("CurrentSearchWord");
     result.WordUrl += "?" + new Date().getTime();
     result.PinyinAll = result.Pinyin;
-    if (result.Pinyin && result.Pinyin.indexOf(",")>0)
+    if (result.Pinyin && result.Pinyin.indexOf(",") > 0)
       result.Pinyin = result.Pinyin.substr(0, result.Pinyin.indexOf(","));
 
 
@@ -244,7 +245,7 @@ Page({
     wx.setNavigationBarTitle({
       title: title
     });
-    
+
     if (result.IsNew) {
       wx.showLoading({
         title: '加载中',
@@ -255,9 +256,9 @@ Page({
           List: resultArr,
         });
         that.restart(that.data.CurrentIndex);
-      }, 5000)
+      }, 1000);
     }
-    else{
+    else {
       that.setData({
         List: resultArr,
       });
@@ -286,15 +287,15 @@ Page({
       else {
 
         var pinyinItem = this.data.List[this.data.CurrentIndex].PinyinAll;
-        
+
         if (pinyinItem) {
           var pinyinStr = "";
-          if (pinyinItem.indexOf(",")>0){
-            pinyinItem=pinyinItem.substr(0,pinyinItem.indexOf(","));
+          if (pinyinItem.indexOf(",") > 0) {
+            pinyinItem = pinyinItem.substr(0, pinyinItem.indexOf(","));
             if (e && e.currentTarget.dataset.pinyin)
               pinyinItem = e.currentTarget.dataset.pinyin;
-              
-            pinyinStr = "(" + pinyin.getPinyinName(pinyinItem)+")";
+
+            pinyinStr = "(" + pinyin.getPinyinName(pinyinItem) + ")";
           }
 
           var Name = this.data.List[this.data.CurrentIndex].Name;
@@ -305,13 +306,13 @@ Page({
           else {
             var CombineWords = this.data.List[this.data.CurrentIndex].CombineWords;
             if (CombineWords)
-              CombineWords = "，"+CombineWords.replace(Name, Name + pinyinStr)+"的"+Name;
+              CombineWords = "，" + CombineWords.replace(Name, Name + pinyinStr) + "的" + Name;
 
             url = url.replace("[word]", Name + pinyinStr + CombineWords + pinyinStr);
           }
         }
       }
-      url=encodeURI(url);
+      url = encodeURI(url);
       this.audioCtx.setSrc(url);
       this.audioCtx.play();
     }
@@ -393,32 +394,31 @@ Page({
     }, second);
   },
   setCurrentWord: function (index, isShowPrev, isShowNext) {
-    var that=this;
+    var that = this;
     that.setData({
       CurrentIndex: index,
       IsShowPrev: isShowPrev,
       IsShowNext: isShowNext,
       IsShowWordDetail: false,
     });
-    
+
   },
   getImageError: function () {
     var that = this;
+    that.data.List[that.data.CurrentIndex].WordUrl = "";
+
     that.setData({
+      List: that.data.List,
       IsImageError: true,
     });
-    if (that.data.WordType == "normal")
-      that.init();
-    else if (that.data.WordType == "review")
-      that.initReview();
-    else if (that.data.WordType == "search")
-      that.initSearch();
+
   },
   getImageDownload: function () {
-    this.data.List[this.data.CurrentIndex].WordUrl += "?"+common.random(0, 9);
-    this.setData({
-      List: this.data.List,
-      IsImageError: false,
+    var that = this;
+    server.getData('SearchHanzi?Word=' + that.data.List[that.data.CurrentIndex].Name, function (data) {
+      wx.redirectTo({
+        url: "./detail?Type=" + that.data.WordType + "&bookid=" + that.data.BookID + "&unitid=" + that.data.UnitID + "&wordid=" + that.data.CurrentIndex + "&isfinished=" + that.data.IsFinished,
+      });
     });
   },
   showWordDetailHandler: function (e) {
@@ -428,7 +428,7 @@ Page({
       this.setData({
         IsShowWordDetail: this.data.IsShowWordDetail,
       });
-      if (!this.data.IsShowWordDetail){
+      if (!this.data.IsShowWordDetail) {
         this.setData({
           Detail: null,
         });
@@ -531,10 +531,10 @@ Page({
       result = e.currentTarget.dataset.id;
 
     var title = "";
-    var selectedRandom = true;
+    var SelectedRandom = true;
     if (result == "false") {
       title = "课本一致";
-      selectedRandom = false;
+      SelectedRandom = false;
     }
     else {
       title = "随机";
@@ -542,9 +542,9 @@ Page({
     this.setData({
       isShowSettingMenu: false,
       SortTitle: title,
-      selectedRandom: selectedRandom,
+      SelectedRandom: SelectedRandom,
     });
-    wx.setStorageSync('selectedRandom', selectedRandom);
+    wx.setStorageSync('SelectedRandom', SelectedRandom);
   },
   settingSpeaker: function (e, b) {
     isEditSetting.push("speaker");
@@ -685,7 +685,7 @@ Page({
 
     //this.animation = animation;
     animation.opacity(opacity).step();
-    if (obj =="animationData"){
+    if (obj == "animationData") {
       this.setData({
         animationData: animation.export(),
       });

pages/main/detail.wxml

@@ -6,7 +6,7 @@
           {{List[CurrentIndex].Pinyin}}
         </block>
       </view>
-      <image binderror='getImageError' wx:if="{{!IsImageError}}" src='{{List[CurrentIndex].WordUrl}}' class="wordImage" animation="{{animationDataWord}}"/>
+      <image binderror='getImageError' wx:if="{{!IsImageError}}" src='{{List[CurrentIndex].WordUrl}}' class="wordImage" />
       <image catchtap='getImageDownload' wx:if="{{IsImageError}}" src='../../images/05014.png' class="wordImage" />
     </block>
     <block wx:if="{{CurrentIndex==List.length-1}}">
@@ -249,12 +249,12 @@
       </view>
       <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="false">
         <view class="word">课本一致</view>
-        <image class="SelectLogo" src="../../images/012.png" hidden="{{selectedRandom}}" />
+        <image class="SelectLogo" src="../../images/012.png" hidden="{{SelectedRandom}}" />
       </view>
       <view style='height:2rpx'></view>
       <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="true">
         <view class="word">随机</view>
-        <image class="SelectLogo" src="../../images/012.png" hidden="{{!selectedRandom}}" />
+        <image class="SelectLogo" src="../../images/012.png" hidden="{{!SelectedRandom}}" />
       </view>
     </block>
 

pages/main/index.wxml

@@ -141,7 +141,7 @@
       </view>
     </view>
 
-    <view class="index9 FlexRow" wx:if="{{IsMember==1 && NewUserNumber>=NewUserNumberMax}}">
+    <view class="index9 FlexRow" wx:if="{{IsMember==0 || (IsMember==1 && NewUserNumber>=NewUserNumberMax)}}">
       <image src='../../images/02016.png' class="imgWave" />
     </view>
   </block>

pages/main/list.js

@@ -103,7 +103,7 @@ Page({
       if (!wordid)
         wordid = 0
       else {
-        wx.setStorageSync('selectedRandom', false);
+        wx.setStorageSync('SelectedRandom', false);
       }
       wx.navigateTo({
         url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,

pages/main/search.js

@@ -38,12 +38,19 @@ Page({
   },
   researchWord: function (e) {
     var that = this;
+    that.setData({
+      IsSearchResult: false,
+    });
     var result = false;
     var word = e.detail.value;
     if (common.IsChinese(word)) {
       server.getData('SearchHanzi?Word=' + word, function (data) {
         if (data) {
           wx.setStorageSync("CurrentSearchWord", data);
+
+          wx.setStorageSync('SelectedRandom', false);
+          wx.setStorageSync('IsAutoPage', false);
+
           wx.navigateTo({
             url: "./detail?Type=search",
           });
@@ -68,10 +75,10 @@ Page({
     var isfinished = e.currentTarget.dataset.isfinished;
     if (!wordid)
       wordid = 0
-    else {
-      wx.setStorageSync('selectedRandom', false);
-      wx.setStorageSync('IsAutoPage', false);
-    }
+   
+    wx.setStorageSync('SelectedRandom', false);
+    wx.setStorageSync('IsAutoPage', false);
+    
     wx.navigateTo({
       url: "./detail?Type=search&bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
     });