2.1.8

app.js

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

pages/index/index.js

@@ -291,7 +291,7 @@ Page({
           wx.removeStorageSync("UserName");
 
           // //测试****************
-          // var url = '../main/mainlist';
+          // var url = '../other/newuser';
           // wx.redirectTo({
           //   url: url,
           // });

pages/main/add.js

@@ -20,6 +20,7 @@ var innerAudioContext;
 var isViolate = false; //是否是违禁词
 var isFirstAdd = true;//是第一个填加
 var isAddFolder = false;//用于新增卡单时用
+var isCancel=false;//是否放弃题卡内容
 
 Page({
   data: {
@@ -58,8 +59,17 @@ Page({
   getBarInfo(e) {
     var h=e.detail.topBarHeight;
     h=h*2;
+
+    var h2=0;
+    var h3=0;
+    if (app.globalData.IsIPad){
+      h2=-68;
+      h3=-100;
+    }
     this.setData({ 
-       topBarHeight: h,
+      topBarHeight: h,
+      topBarHeightIPad: h2,
+      topBarHeightIPad2: h3,
     })
   },
   onLoad: function (options) {
@@ -241,7 +251,7 @@ Page({
     }
     if (!(that.data && that.data.Field && that.data.Field[1].length == 0 &&
       that.data.Field[2].length == 0 &&
-      that.data.Field[3].length == 0)) {
+      that.data.Field[3].length == 0) && !isCancel) {
       if (!isViolate && (that.data.UpdateType == "add" || that.data.UpdateType == "add2")) {
         var card = {};
         card.MiaoguoCardID = that.data.MiaoguoCardID;
@@ -262,6 +272,7 @@ Page({
         wx.setStorageSync("TempCardNoSaved", card);
       }
     }
+    isCancel=false;
 
   },
   onUnload: function () {
@@ -289,13 +300,13 @@ Page({
     if (wx.getStorageSync("IsRemindContinuousNew")==1){
       wx.removeStorageSync('IsRemindContinuousNew');
     }
-
   },
   onClose: function () {
     wx.navigateBack({
       delta: 1,
     });
-
+    isCancel=true;
+    wx.removeStorageSync('TempCardNoSaved');
     clearInterval(intervalRecorder);
   },
   gotoAddItem: function (e) {
@@ -1818,6 +1829,13 @@ Page({
   },
   setCardType:function(e){
     var that=this;
+    if (that.data.CardTypeTemp==1 || that.data.CardType==-1){
+      var limittime=common.formatTime(new Date(),"-",true);
+      that.setData({
+        LimitTime:limittime,
+        PracticeTimeStr:common.formatDateCHS(limittime),
+      });
+    }
     that.setData({
       CardType: Number(that.data.CardTypeTemp),
       PracticeCardType: constant1.arrStudyPattern[that.data.CardTypeTemp]+"题卡",

pages/main/add.wxml

@@ -2,7 +2,7 @@
 </navigation-bar>
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' hidden='{{!HiddenFieldEdit}}'>
-	<view class="panelTop FlexRow" style="top:{{topBarHeight}}rpx;">
+	<view class="panelTop FlexRow" style="top:{{topBarHeight+topBarHeightIPad}}rpx;">
 		<view class="panelLeft FlexRow">
 			<view class='panelTop1 FlexRow' catchtap='onClose'>
 				放弃
@@ -152,7 +152,7 @@
 			<view class="panelSave1" catchtap='onGotoList' wx:if="{{UpdateType=='add' || UpdateType=='add2'}}">
 				复查
 			</view>
-			<view class="panelSave1" catchtap='onClose' wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
+			<view class="panelSave1" wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
 				
 			</view>
 			<view class='{{BtnSaveSelectCss}} panelSave2' bindtap="saveCard">
@@ -206,7 +206,7 @@
 </view>
 
 <!-- 字段编辑 -->
-<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight}}rpx;'
+<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight+topBarHeightIPad}}rpx;'
 	hidden='{{HiddenFieldEdit || IsRecorder}}'>
 	<view class="panelItemTag FlexRow">
 
@@ -263,9 +263,9 @@
 	</view>
 	<view class='lineFooter'></view>
 	<view class='panelInput'>
-		<textarea class="input" style="height:{{InputHeight}}rpx;" maxlength='-1' show-confirm-bar="true"
-			value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur"
-			bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
+		<textarea class="input" style="height:{{InputHeight+topBarHeightIPad2}}rpx;" maxlength='-1' show-confirm-bar="true"
+			value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" 
+			bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
 		</view>
   <view class='lineFooter'></view>
   <view class='panelBtnItem FlexColumn'>
@@ -365,8 +365,8 @@
 	
 </view>
 
-<view wx:if="{{IsHelp}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn">
+<view wx:if="{{IsHelp}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
+  <view class="HelpPanel1 FlexColumn" style="bottom:{{topBarHeightIPad}}rpx;">
     <view class="HelpPanel11 FlexRow">
       <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
         <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
@@ -409,7 +409,7 @@
 </view>
 
 <view wx:if="{{IsFolder}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn">
+  <view class="HelpPanel1 FlexColumn"  style="bottom:{{topBarHeightIPad-38}}rpx;">
     <view class="HelpPanel11 FlexRow">
       <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
         <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />

pages/main/addInfomation.js

@@ -10,6 +10,7 @@ Page({
     Searching: false,
     SearchList: [],
     SearchInfo: "",
+    IsMore:true,
   },
   onLoad: function () {
     var that = this;
@@ -45,6 +46,7 @@ Page({
       }
       that.setData({
         SearchWord3: list,
+        IsMore:true,
       });
     });
 
@@ -96,9 +98,11 @@ Page({
       
       if (obj){
         main.updateSearchList(obj,function(){
+          updateData(that,search);
           wx.navigateTo({
             url: './addInfomationDetail',
           });
+          
         });
       }
       else{
@@ -109,146 +113,36 @@ Page({
         that.setData({
           SearchList: list,
           IsStart: true,
+          IsMore:true,
         });
 
         that.getCardList();
 
-        setTimeout(function () {
-          var arr = that.data.SearchTextList;
-          for (var i = 0; i < arr.length; i++) {
-            if (arr[i] == search) {
-              arr.splice(i, 1);
-              break;
-            }
-          }
-          arr.unshift(search);
-  
-          while (arr.length > 10) {
-            arr.pop();
-          }
-  
-          wx.setStorageSync("SearchTextList", arr);
-          that.setData({
-            SearchTextList: arr,
-          });
-        }, 2000);
+        updateData(that,search);
       }
-
-      
     });
 
-    // wx.showLoading({
-    //   title: '查询中',
-    // });
-    // var timeout=setTimeout(function () {
-    //   wx.hideLoading();
-    // }, 5000);
-
-    // var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
-    // url += "&Word=" + search;
-    // if (e.currentTarget.dataset.searchtype)
-    //   url += "&SearchType=" + e.currentTarget.dataset.searchtype;
-    // if (e.currentTarget.dataset.author)
-    //   url += "&Author=" + e.currentTarget.dataset.author;
-    // if (e.currentTarget.dataset.shiciurl)
-    //   url += "&ShiciUrl=" + e.currentTarget.dataset.shiciurl;
-
-    // main.getData(url, function (data) {
-    //   wx.hideLoading();
-    //   clearTimeout(timeout);
-    //   wx.setNavigationBarTitle({
-    //     title: "搜索结果"
-    //   });
-    //   if (data) {
-    //     //console.log(data);
-
-    //     if (data.List) {
-    //       var len = WORD_LENGTH;
-    //       var list = data.List;
-    //       for (var i = 0; i < list.length; i++) {
-    //         var item = list[i];
-    //         if (item.TypeName == "字词") {
-    //           if (item.Key.length == 1)
-    //             item.TypeName = "Z";
-    //           else
-    //             item.TypeName = "C";
-    //         } else if (item.TypeName == "诗词") {
-    //           item.TypeName = "S";
-    //           item.Remark = item.Author + " " + item.Dynasty;
-    //         } else if (item.TypeName == "翻译") {
-    //           item.TypeName = "D";
-    //         }
-
-    //         if (item.Content && item.Content.length > len)
-    //           item.Content = item.Content.substr(0, len) + "...";
-
-    //       }
-    //       that.setData({
-    //         SearchList: list,
-    //         IsStart: true,
-    //       });
-    //     } else if (data.CHN || data.ENG) {
-    //       var obj = {};
-    //       obj.Key = search;
-    //       obj.Value = data;
-    //       if (data.CHN && data.CHN.Author)
-    //         obj.Author = data.CHN.Author;
-    //       if (data.CHN && data.CHN.Dynasty)
-    //         obj.Dynasty = data.CHN.Dynasty;
-    //       if (data.CHN && data.CHN.PeomContent) {
-    //         obj.Type = "shici";
-    //         obj.TypeName = "诗词";
-    //         obj.Content = data.CHN.PeomContent.join("").substr(0, WORD_LENGTH);
-    //         obj.ShiciUrl = e.currentTarget.dataset.shiciurl;
-    //       } else if (data.CHN) {
-    //         obj.Type = "zici";
-    //         if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
-    //           obj.Remark = data.CHN.PinYin[0].pinyin;
-    //         if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].explain) {
-    //           obj.Content = data.CHN.PinYin[0].explain.substr(0, WORD_LENGTH);
-    //           obj.Content = obj.Content.replace("<p>", "");
-    //           obj.Content = obj.Content.replace("</p>", "");
-    //           if (obj.Content.length >= WORD_LENGTH)
-    //             obj.Content += "..."
-    //         }
-    //       }
-    //       if (data.ENG && !data.CHN) {
-    //         obj.Type = "eng";
-    //         obj.TypeName = "D";
-    //         if (data.ENG.Soundmark && data.ENG.Soundmark.Eng)
-    //           obj.Remark = data.ENG.Soundmark.Eng;
-    //         if (data.ENG.Paraphrase.length > 0) {
-    //           if (common.checkIsArray(data.ENG.Paraphrase) && data.ENG.Paraphrase[0].ParaphraseList)
-    //             obj.Content = data.ENG.Paraphrase[0].ParaphraseList.join("; ").substr(0, WORD_LENGTH);
-    //           else
-    //             obj.Content = data.ENG.Paraphrase.substr(0, WORD_LENGTH) + "...";
-    //         }
-    //       }
-
-    //       main.updateSearchList(obj);
+    function updateData(obj,search) {
+      setTimeout(function () {
+        var arr = obj.data.SearchTextList;
+        for (var i = 0; i < arr.length; i++) {
+          if (arr[i] == search) {
+            arr.splice(i, 1);
+            break;
+          }
+        }
+        arr.unshift(search);
 
-    //       app.globalData.TempSearchBackNumber = 2;
-    //       //app.globalData.CardList=[];
-    //       app.globalData.CardList2=[];
-    //       wx.navigateTo({
-    //         url: './addInfomationDetail',
-    //       });
-    //     }
-    //     else{
-    //       that.setData({
-    //         SearchList: [],
-    //         IsStart: true,
-    //       });
-    //     }
-    //   } else {
-    //     that.setData({
-    //       SearchList: [],
-    //       IsStart: true,
-    //     });
-    //   }
+        while (arr.length > 10) {
+          arr.pop();
+        }
 
-      
-    // });
+        wx.setStorageSync("SearchTextList", arr);
+        obj.setData({
+          SearchTextList: arr,
+        });
+      }, 2000);
+    }
   },
   getCardList: function () {
     var that = this;
@@ -337,9 +231,12 @@ Page({
       SearchWord3: that.data.SearchWord3,
     });
     wx.setStorageSync("SearchWord3", that.data.SearchWord3);
-
   },
-
+  setMoreHide:function(){
+    this.setData({
+      IsMore:false,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/addInfomation.wxml

@@ -94,7 +94,7 @@
       <view class="panelSearchDataOther FlexColumn">
         <view class="panelSearchDataOther2 FlexRow"  wx:for="{{SearchList}}" wx:key="index"
           bindtap='searchResult' data-search="{{item.Key}}" data-type="SearchList" data-author="{{item.Author}}"
-          data-searchtype="{{item.Type}}" data-shiciurl="{{item.Url}}">
+          data-searchtype="{{item.Type}}" data-shiciurl="{{item.Url}}" wx:if="{{(IsMore && index<4) || (!IsMore)}}">
           <view class="panelSearchDataImage{{item.TypeName}} panelSearchDataImage FlexColumn">
             <image wx:if="{{item.TypeName=='Z'}}" class="universalpic_dictionary_hanzi_black_54x26"
               src='../images/universalpic_dictionary_hanzi_black_54x26.png' />
@@ -113,6 +113,9 @@
           <view>
           </view>
         </view>
+
+        <view class="panelSearchMore" wx:if="{{SearchList.length>4 && IsMore}}" bindtap="setMoreHide">更多</view>
+
       </view>
     </view>
 

pages/main/addInfomation.wxss

@@ -283,6 +283,16 @@
   margin-bottom: 30rpx;
 }
 
+.panelSearchMore{
+  width:710rpx;
+  height:110rpx;
+  background-color: #E3E3E3;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 110rpx;
+  font-size: 36rpx;
+  margin-top:20rpx;
+}
 
 .panelHeight60{
   width:100%;

pages/main/addInfomationDetail.wxml

@@ -62,6 +62,26 @@
     </view>
   </block>
 
+  <!-- 变调 -->
+  <block wx:if="{{Result.CHN.PinyinTone && Result.CHN.PinyinTone.length>0 && Result.CHN.PinYin[0].pinyin!=Result.CHN.PinyinTone}}">
+    <view class="panelTitle FlexColumn">
+      <view class="panelTitle1 FlexRow">
+        <image class="universalpic_soundwave_black_30x22" src='../images/universalpic_soundwave_black_30x22.png' />
+        <view class="panelTitle11">变调</view>
+      </view>
+      <view class="panelTitle2">口语中汉字的音节调值有变调现象，仅供参考。学习上请以教材为准。</view>
+    </view>
+
+    <view class="{{CSS.CHN_PinyinTone.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"  data-type="sound" 
+      data-content="{{Result.CHN.PinyinTone}}" data-css="CHN_PinyinTone" data-tag="拼音">
+      <view class="FlexRow">
+        <view class="{{CSS.CHN_PinyinTone.Css2}} panelSelect0">{{CSS.CHN_PinyinTone.Number}}</view>
+        <view class="panelItemText">{{Result.CHN.PinyinTone}}</view>
+      </view>
+      <view></view>
+    </view>
+  </block>
+
   <!-- 默写 -->
   <block wx:if="{{Result.CHN.TianKong && Result.CHN.TianKong.length>0}}">
     <view class="panelTitle FlexColumn">
@@ -278,7 +298,7 @@
       </view>
     </view>
     <view class="{{CSS.CHN_Author.Css1}} panelItem FlexRow" bindtap='getInputData' data-type="normal"
-      data-content="{{Result.CHN.Author}}" data-css="CHN_Author" data-tag="">
+      data-content="{{ Result.CHN.Dynasty+' '+Result.CHN.Author}}" data-css="CHN_Author" data-tag="">
       <view class="FlexRow">
         <view class="{{CSS.CHN_Author.Css2}} panelSelect0">{{CSS.CHN_Author.Number}}</view>
         <view class="panelItemText">{{Result.CHN.Dynasty}} {{Result.CHN.Author}}</view>
@@ -590,7 +610,7 @@
       </view>
       <view></view>
     </view>
-    <swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="5000" duration="2000">
+    <swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="10000" duration="500">
       <block wx:for="{{HelpArr}}" wx:key="*this">
         <swiper-item>
           <view class="HelpPanel12 FlexColumn">

pages/main/detail.js

@@ -27,7 +27,7 @@ var tempPlayUrlLocal = "";
 var timeoutEveryCard = 0;
 var timeoutHide = 0;
 
-var cardTypeName="";
+var arrAutoAudio=[];
 
 Page({
   data: {
@@ -41,6 +41,9 @@ Page({
     StudyPlanArray: arrStudyPlan,
     TaskInfo: {},
     Color: {ID: 1},
+    IsAutoSound:false,//是否设置了自动播放
+    IsAutoSoundStart:false,//是否开始自动播放
+    Title:"",
   },
   onReady: function () {
     var that = this;
@@ -54,6 +57,9 @@ Page({
       that.audioCtx.setSrc(tempPlayUrl);
       that.audioCtx.play();
     });
+    innerAudioContext1.onEnded((res) => {
+      that.audioBindEnded();
+    });
 
     common.getStorageValue(that, "HasSound", true, function () {
       wx.setStorageSync("HasSound", that.data.HasSound);
@@ -71,14 +77,6 @@ Page({
       });
     }
 
-    var cardType = options.CardType;
-    if (!cardType)
-      cardType = 0;
-    cardTypeName=constant.arrStudyPattern[cardType]+"练习";
-    this.setData({
-      CardTypeName: cardTypeName,
-    });
-
     that.setData({
       Containnerheight: height,
       Containnerheight2: height - height2,
@@ -97,8 +95,7 @@ Page({
     this.getColor();
 
     this.getMemoryLevel();
- 
-
+    
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
 
@@ -301,6 +298,8 @@ Page({
       CanUndo: 0,
     });
 
+    that.autoAudioPlayInit();
+
     listTaskFinished = [];
     that.timeCompute(); //起始时间
 
@@ -353,12 +352,15 @@ Page({
           that.data.IsShowAnswer[0] = 0;
           that.data.IsShowAnswer[1] = 0;
         } else {
-          if (!that.data.IsShowAnswer)
+          if (!that.data.IsShowAnswer){
             that.data.IsShowAnswer=[0,0];
+          }
           if (that.data.IsShowAnswer[0]==0 && that.data.IsShowAnswer[1]==0) {
             that.data.IsShowAnswer[0] = 1;
+            
             if (TaskList[0].ContentNew.Field[3].length == 0) {
               that.data.IsShowAnswer[1] = 1;
+              
               if (!that.data.TaskInfo.IsNew)
                 recommend = getRecommendTime();
               that.setData({
@@ -367,6 +369,7 @@ Page({
             }
           } else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
             that.data.IsShowAnswer[1] = 1;
+            
             if (!that.data.TaskInfo.IsNew)
               recommend = getRecommendTime();
             that.setData({
@@ -377,6 +380,7 @@ Page({
         that.setData({
           IsShowAnswer: that.data.IsShowAnswer,
         });
+        that.autoAudioPlayInit();
 
         if (that.data.IsShowAnswer[1]){
           var query = wx.createSelectorQuery().in(that)
@@ -476,6 +480,7 @@ Page({
         CanUndo: canUndo,
         Recommend: 0,
       });
+      that.autoAudioPlayInit();
 
       wx.showToast({
         title: '回到上一张',
@@ -692,6 +697,8 @@ Page({
           IsMore: false,
         });
 
+        that.autoAudioPlayInit();
+
         if (btnnumber == "1") {
           that.setSoundFile(3);
           if (time == "1d") {
@@ -759,85 +766,6 @@ Page({
       main.setCollect(TaskList[0].MiaoguoCardID, TaskList[0].IsCollect);
     }
   },
-  playSound: function (e) {
-    clearTimeout(timeoutPlayAudio);
-
-    var that = this;
-    var str = e.currentTarget.dataset.content;
-    var url;
-    if (str == "recorder") {
-      url = e.currentTarget.dataset.soundmark;
-    } else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
-      str = str.replace("英 [", "[");
-      str = str.replace("美 [", "[");
-      url = e.currentTarget.dataset.soundmark;
-    } else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
-      var soundmark = e.currentTarget.dataset.soundmark;
-      if (soundmark && soundmark.indexOf("http") < 0) {
-        url = app.globalData.audioUrlBaidu;
-        url = url.replace("[token]", app.globalData.BaiduToken);
-        url = url.replace("[word]", soundmark);
-      } else {
-        url = soundmark;
-      }
-    } else {
-      url = app.globalData.audioUrlBaidu;
-      url = url.replace("[token]", app.globalData.BaiduToken);
-      url = url.replace("[word]", str);
-    }
-
-
-    if (url.indexOf("http") > 0)
-      url = url.substr(url.indexOf("http"));
-    if (url.indexOf("'") > 0)
-      url = common.ReplaceAllString(url, "'", "");
-    url = url.replace("http://", "https://");
-
-    url = encodeURI(url);
-    if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
-      isPlaying = true;
-      timeoutPlayAudio = setTimeout(function () {
-        isPlaying = false;
-      }, 60000);
-
-      wx.showLoading({
-        title: '音频下载中',
-        mask: true,
-      });
-      setTimeout(function () {
-        wx.hideLoading();
-      }, 30000);
-
-      wx.downloadFile({
-        url: url,
-        success(res) {
-          wx.hideLoading();
-          if (res.statusCode === 200) {
-            tempPlayUrlLocal = res.tempFilePath;
-            that.audioCtx.setSrc(res.tempFilePath);
-            that.audioCtx.play();
-            tempPlayUrl = url;
-          }
-        },
-        fail(err) {
-          wx.hideLoading();
-        }
-      });
-    } else {
-      this.audioCtx.pause();
-      if (innerAudioContext1)
-        innerAudioContext1.stop();
-      isPlaying = false;
-    }
-  },
-  audioBindEnded: function () {
-    isPlaying = false;
-  },
-  audioBindError: function (err) {
-    console.log(err);
-    innerAudioContext1.src = tempPlayUrlLocal;
-    innerAudioContext1.play();
-  },
   getTaskTime: function () {
     var that = this;
     var url = "GetMiaoguoTaskTime?";
@@ -863,7 +791,7 @@ Page({
           TodayTime: duration,
           Speed1: speed1 + "张题卡",
           Speed2: speed2,
-          CardTypeName:"报告",
+          Title:"报告",
         });
 
       }
@@ -874,7 +802,7 @@ Page({
       IsShowNumberInfo: true,
     });
     this.setData({
-      CardTypeName:"进度",
+      Title:"进度",
     });
   },
   closeNumberContainner: function () {
@@ -883,7 +811,7 @@ Page({
       IsMore: false,
     });
     this.setData({
-      CardTypeName: cardTypeName,
+      Title: "",
     });
   },
   showImage: function (e) {
@@ -1076,6 +1004,174 @@ Page({
       that.closeNumberContainner();
     });
   },
+  switchSound:function(e){
+    var that=this;
+    var autoAudio=!that.data.IsAutoSound;
+    that.setData({
+      IsAutoSound:autoAudio,
+    });
+    if (autoAudio){
+      wx.setStorageSync('IsAutoSound', 1);
+      wx.showModal({
+        title: '提醒',
+        content: '如果题卡里有朗读和录音内容，开启后会按段落顺序逐个自动播放。界面右侧有停止按键。如不想被声音干扰，请关闭该功能。',
+        showCancel: false,
+        confirmText: "知道了",
+        success(res) {
+          
+        },
+      });
+    }
+    else{
+      wx.setStorageSync('IsAutoSound', 0);
+    }
+  },
+  autoAudioPlayInit:function(){
+    var that=this;
+    common.getStorageValue(that, "IsAutoSound", 0, function () {
+      if (that.data.IsAutoSound==1){
+        var taskInfo=that.data.TaskInfo;
+        var field={};
+        var fieldNumber=1;
+        if (that.data.IsShowAnswer[0]==1)
+          fieldNumber=2;
+        if (that.data.IsShowAnswer[1]==1 && taskInfo.ContentNew.Field[3].length>0)
+          fieldNumber=3;
+        field=taskInfo.ContentNew.Field[fieldNumber];
+        arrAutoAudio=[];
+        for(var i=0;i<field.length;i++){
+          if (field[i].Type=="sound" || field[i].Type=="recorder"){
+            field[i].FieldNumber=fieldNumber;
+            arrAutoAudio.push(field[i]);
+          }
+        }
+        
+        if (arrAutoAudio.length>0){
+          that.setData({
+            IsAutoSoundStart:true,
+          });
+          that.autoAudioPlayStart();  
+        }
+      }
+    });
+  },
+  autoAudioPlayStart:function(){
+    var that=this;
+    if (arrAutoAudio.length>0){
+      var item=arrAutoAudio[0];
+      if (item.Type=="recorder")
+        item.Content=item.Type;
+      that.playSound({currentTarget:{dataset:{
+        content:item.Content,
+        soundmark:item.SoundMark,
+        fieldid:item.FieldNumber,
+      }}});
+      arrAutoAudio.splice(0,1);
+      
+    }
+  },
+  autoAudioPlayEnd:function(){
+    var that=this;
+    arrAutoAudio=[];
+    if (innerAudioContext1) {
+      innerAudioContext1.stop();
+    }
+    that.audioCtx.pause();
+  
+    that.setData({
+      IsAutoSoundStart:false,
+    });
+  },
+  //音频播放结束
+  audioBindEnded: function () {
+    var that=this;
+    isPlaying = false;
+    if (arrAutoAudio.length>0){
+      that.autoAudioPlayStart();
+    }
+    else{
+      that.setData({
+        IsAutoSoundStart:false,
+      });
+    }
+  },
+  audioBindError: function (err) {
+    console.log(err);
+    innerAudioContext1.src = tempPlayUrlLocal;
+    innerAudioContext1.play();
+  },
+
+  playSound: function (e) {
+    clearTimeout(timeoutPlayAudio);
+
+    var that = this;
+    var str = e.currentTarget.dataset.content;
+    var url;
+    if (str == "recorder") {
+      url = e.currentTarget.dataset.soundmark;
+    } else if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
+      str = str.replace("英 [", "[");
+      str = str.replace("美 [", "[");
+      url = e.currentTarget.dataset.soundmark;
+    } else if (e.currentTarget.dataset.soundmark && e.currentTarget.dataset.soundmark != "undefined") {
+      var soundmark = e.currentTarget.dataset.soundmark;
+      if (soundmark && soundmark.indexOf("http") < 0) {
+        url = app.globalData.audioUrlBaidu;
+        url = url.replace("[token]", app.globalData.BaiduToken);
+        url = url.replace("[word]", soundmark);
+      } else {
+        url = soundmark;
+      }
+    } else {
+      url = app.globalData.audioUrlBaidu;
+      url = url.replace("[token]", app.globalData.BaiduToken);
+      url = url.replace("[word]", str);
+    }
+
+
+    if (url.indexOf("http") > 0)
+      url = url.substr(url.indexOf("http"));
+    if (url.indexOf("'") > 0)
+      url = common.ReplaceAllString(url, "'", "");
+    url = url.replace("http://", "https://");
+
+    url = encodeURI(url);
+    if (!isPlaying || tempPlayUrl == "" || url != tempPlayUrl) {
+      isPlaying = true;
+      timeoutPlayAudio = setTimeout(function () {
+        isPlaying = false;
+      }, 60000);
+
+      wx.showLoading({
+        title: '音频下载中',
+        mask: true,
+      });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 30000);
+
+      wx.downloadFile({
+        url: url,
+        success(res) {
+          wx.hideLoading();
+          if (res.statusCode === 200) {
+            tempPlayUrlLocal = res.tempFilePath;
+            that.audioCtx.setSrc(res.tempFilePath);
+            that.audioCtx.play();
+            tempPlayUrl = url;
+          }
+        },
+        fail(err) {
+          wx.hideLoading();
+        }
+      });
+    } else {
+      this.audioCtx.pause();
+      if (innerAudioContext1)
+        innerAudioContext1.stop();
+      isPlaying = false;
+    }
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages/main/detail.wxml

@@ -1,8 +1,28 @@
 <import src="../template/cardShow.wxml" />
-<navigation-bar title="{{CardTypeName}}" show="true" left="true" background="{{Color.BackColor}}" color="#fff">
+<navigation-bar show="true" center="true" left="true" background="{{Color.BackColor}}" color="#fff">
     <view slot="left" bindtap="onClose">
       <view class="square">退出练习</view>
     </view>
+    <view slot="center" bindtap="showNumberContainner" class='panelNumber FlexRow'>
+      <block wx:if="{{!Title}}">
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{NumberNew}}</view>
+          <view hidden="{{!TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{NumberHistory}}</view>
+          <view hidden="{{!TaskInfo.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
+        <view class="FlexColumn">
+          <view class='panelNumber1'>{{NumberReview}}</view>
+          <view hidden="{{!TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
+        </view>
+        <view class="FlexColumn">
+          <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
+        </view>
+      </block>
+      <block wx:if="{{Title}}">{{Title}}</block>
+    </view>
 </navigation-bar>
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}' bindtap='onShowAnswer' data-type="all">
@@ -17,36 +37,31 @@
           <image hidden='{{!TaskInfo.IsCollect}}' src="../images/universalpic_star_tc0{{Color.ID}}_34x34.png" class='universalpic_star_gray_34x34' />
         </view>
       </view>
+      <view class='panelCancel FlexRow' catchtap="gotoEdit">
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
+        </view>
+      </view>
       <view class='panelCancel FlexRow' catchtap='onMore'>
         <view class='panelCancel0 FlexRow'>
           <image src="../images/universalpic_more_gray_32x8.png" class='universalpic_more_gray_32x8' />
         </view>
       </view>
-      <view class='panelNumber FlexRow' catchtap='showNumberContainner'>
-        <view class="FlexColumn">
-          <view class='panelNumber1'>{{NumberNew}}</view>
-          <view hidden="{{!TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
-        </view>
-        <view class="FlexColumn">
-          <view class='panelNumber1'>{{NumberHistory}}</view>
-          <view hidden="{{!TaskInfo.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
-        </view>
-        <view class="FlexColumn">
-          <view class='panelNumber1'>{{NumberReview}}</view>
-          <view hidden="{{!TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
-        </view>
-        <view class="FlexColumn">
-          <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
+      
+      <view class='panelCancel FlexRow' wx:if="{{IsShowAnswer[0]==0}}">
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_han_fff20_28x25.png" class='universalpic_han_gray_28x25' />
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtap="gotoEdit">
+      <view class='panelCancel FlexRow' catchtap='onPullDownRefresh' wx:if="{{IsShowAnswer[0]==1}}">
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
+          <image src="../images/universalpic_han_gray_28x25.png" class='universalpic_han_gray_28x25' />
         </view>
       </view>
+      
       <view class='panelCancel FlexRow' wx:if="{{CanUndo==0}}">
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_white_30p_26x20' />
+          <image src="../images/universalpic_undo_white_30p_26x20.png" class='universalpic_undo_white_30p_26x20' />
         </view>
       </view>
       <view class='panelCancel FlexRow' catchtap='gotoPrev' wx:if="{{CanUndo==1}}">
@@ -61,6 +76,9 @@
 
     <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize,TextSpace}}" />
 
+    <view class="StopAudioPlay FlexRow" wx:if="{{IsAutoSound && IsAutoSoundStart}}" style="background-color:{{Color.BackColor3}};" catchtap="autoAudioPlayEnd">
+      ■ 停止播放
+    </view>
     <view class='footer0'></view>
 
     <!-- 下方按钮 -->
@@ -208,7 +226,16 @@
       <view class='numberContainerFooter102 FlexRow' catchtap='saveCardType'>
         <image src="../images/universalpic_practisemodel_gray_30x28.png" class='universalpic_practisemodel_gray_30x28' />
         <view class='numberContainerFooter111'>把这张题卡归档</view>
-      </view>      
+      </view>
+            
+      <view class='lineFooter'></view>
+      
+      <view class='numberContainerFooter102 FlexRow'>
+        <image src="../images/universalpic_autoread_gray_30x23.png" class='universalpic_autoread_gray_30x23' />
+        <view class='numberContainerFooter111'>自动播放题卡里的声音</view>
+        <switch class="switch" color="#4CD964" checked="{{IsAutoSound}}" bindchange="switchSound"/>
+      </view>
+            
       <view class='lineFooter'></view>
     </view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>

pages/main/detail.wxss

@@ -25,7 +25,7 @@ page{
 .panelCancel {
   width: 100rpx;
   height: 110rpx;
-  margin: 0 5rpx;
+  margin: 0 40rpx;
 }
 
 .panelCancel0 {
@@ -39,7 +39,10 @@ page{
   width: 26rpx;
   height: 19rpx;
 }
-
+.universalpic_han_gray_28x25{
+  width: 28rpx;
+  height: 25rpx;
+}
 .universalpic_more_gray_32x8 {
   width: 32rpx;
   height: 8rpx;
@@ -639,6 +642,7 @@ page{
   height: 132rpx;
   justify-content: flex-start;
 }
+
 .numberContainerFooter103{
   width:100%;
   height: 111rpx;
@@ -668,6 +672,12 @@ page{
   margin: 0 30rpx;
 }
 
+.universalpic_autoread_gray_30x23{
+  width:30rpx;
+  height:23rpx;
+  margin: 0 30rpx;
+}
+
 .universalpic_typesize_gray_30x18{
   width: 30rpx; 
   height: 18rpx;
@@ -710,3 +720,22 @@ page{
   border:3rpx solid #F1AB1E;
   color:#F1AB1E
 }
+
+.switch{
+  position: absolute;
+  right:30rpx;
+}
+
+.StopAudioPlay{
+  position: fixed;
+  top:278rpx;
+  right:0rpx;
+  width:170rpx;
+  height:70rpx;
+  border-top-left-radius: 35rpx;
+  border-bottom-left-radius: 35rpx;
+  z-index: 20;
+  font-size:20rpx;
+  color:#D2D2D2;
+  line-height: 70rpx;
+}

pages/main/mainlist.js

@@ -400,7 +400,7 @@ Page({
         CardTypeStr: str,
       })
     } else {
-      if (that.data.CardType)
+      if (that.data.CardType || that.data.CardType==0)
         url += "&CardType=" + that.data.CardType;
     }
 

pages/main/mainlist.wxml

@@ -2,7 +2,7 @@
   <view class="panelTopPanel FlexColumn">
     <view wx:if="{{Search}}" class="panelTop FlexRow">
       <view class="panelLeft FlexRow">
-        <view class="panelTopSearch FlexRow">
+        <view class="panelTopSearch FlexRow"  bindtap='onSearch'>
           <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
           <text class="panelTopSearchText">{{Search}}</text>
         </view>

pages/main/preview.js

@@ -186,7 +186,7 @@ Page({
     }
 
     var card = {};
-    var prevId = 0, nextId = 0;
+    var prevId = 0, nextId = 0,index=0;
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
         if (i > 0)
@@ -206,6 +206,7 @@ Page({
         card.CardType = list[i].CardType;
         card.FolderName=list[i].FolderName;
         card.Flag=list[i].Flag;
+        index=i+1;
         break;
       }
     }
@@ -274,6 +275,7 @@ Page({
       IsCollect: card.IsCollect,
       FolderName:card.FolderName,
       Flag:card.Flag,
+      CurrentIndex:index,
     });
 
     wx.pageScrollTo({
@@ -481,7 +483,7 @@ Page({
       var that = this;
       var strType="edit";
       if (e.currentTarget.dataset.type)
-        strType="edit1";
+        strType="edit2";
       var url='./add?type='+strType+'&id=' + that.data.MiaoguoCardID+"&opentype="+e.currentTarget.dataset.type;
       wx.navigateTo({
         url: url,
@@ -552,27 +554,6 @@ Page({
       duration: 500,
     });
   },
-  playNext: function (e) {
-    var that = this;
-    var div = e.currentTarget.dataset.div;
-    if (div == 1) {
-      this.data.CurrentIndex++;
-      if (this.data.CurrentIndex >= playList.length) {
-        this.data.CurrentIndex = playList.length - 1;
-      }
-    }
-    else {
-      this.data.CurrentIndex--;
-      if (this.data.CurrentIndex < 0)
-        this.data.CurrentIndex = 0;
-    }
-    that.setData({
-      CurrentIndex: this.data.CurrentIndex,
-      MiaoguoCardID: playList[this.data.CurrentIndex],
-      PlayListCount: playList.length,
-    });
-    that.init();
-  },
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
     if (name && name.length > 5) {

pages/main/preview.wxml

@@ -35,12 +35,12 @@
     </view>
     <view class="panelTop1" style='background-color:{{Color.BackColor}};'></view>
   </block>
-  <block wx:if="{{!IsCardInfoCloseMenu && !PrintID}}">
+  <block wx:if="{{!IsCardInfoCloseMenu && !PrintID && ShowType!='share'}}">
     <view class="panelTop2 FlexColumn">
       <view class="panelTop2Item FlexRow" catchtap='editField' data-type="cardtype">
         <view class="left FlexRow">
           <image class="universalpic_diagram_black_30x28" src='../images/universalpic_diagram_black_30x28.png' />
-          <view class="panelTop2Item1"><block wx:if="{{CardType==1}}">紧急</block><block wx:if="{{CardType==0}}">日常</block><block wx:if="{{CardType==-1}}">归档</block>练习</view>
+          <view class="panelTop2Item1"><block wx:if="{{CardType==1}}">紧急练习</block><block wx:if="{{CardType==0}}">日常练习</block><block wx:if="{{CardType==-1}}">归档</block></view>
         </view>
         <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
       </view>
@@ -88,12 +88,13 @@
       退出预览
     </view>
 
-    <view class="panelFooter FlexRow" wx:if="{{ShowType=='show' && !PrintID}}">
+    <view class="panelFooter FlexRow" wx:if="{{ShowType=='show'}}">
       <view class='btn1' wx:if="{{PrevID==0}}"></view>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
       </view>
-      <button class="btn21" open-type='share'>分享给大家</button>
+      <button class="btn21" open-type='share' wx:if="{{!PrintID}}">分享给大家</button>
+      <view class='btn21' wx:if="{{PrintID}}">{{CurrentIndex}}</view>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{NextID}}" wx:if="{{NextID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />
       </view>

pages/main/searchCard.js

@@ -26,6 +26,7 @@ Page({
     });
   },
   onKeyInput: function (e) {
+    console.log("onKeyInput");
     var search = e.detail.value;
     var that = this;
     that.setData({
@@ -33,12 +34,16 @@ Page({
     });
   },
   onFocus: function (e) {
+    console.log("onFocus");
     var that = this;
     that.setData({
       Searching:true,
       IsNull:false,
     });
   },
+  onBindblur: function (e) {
+    console.log("onBindblur");
+  },
   onSearch: function (e) {
     if (e.currentTarget.dataset.search){
       this.data.SearchInfo = e.currentTarget.dataset.search;
@@ -108,7 +113,11 @@ Page({
   },
   getSearchData:function(){
     var that=this;
-    main.searchInfomation(that.data.SearchInfo,null,null,null,function(list,isList){
+    main.searchInfomation(that.data.SearchInfo,null,null,null,function(list,obj){
+      if ((!list || list.length==0) && obj){
+        list=[];
+        list.push(obj);
+      }
       that.setData({
         SearchList:list,
         Searching:false,
@@ -142,6 +151,7 @@ Page({
     
   },
   clearInput:function(){
+    console.log("clearInput");
     this.setData({
       SearchInfo:"",
       IsNull:false,
@@ -161,6 +171,7 @@ Page({
     });
     wx.removeStorageSync("SearchTextList");
   },
+  
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/searchCard.wxml

@@ -3,7 +3,7 @@
     <view class="panelLeft FlexRow">
       <view class="panelTopSearch FlexRow">
         <image class="universalpic_magnifier_gray_30x30" src='../images/universalpic_magnifier_gray_30x30.png' />
-        <input class='input'  always-embed="true"  maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" value="{{SearchInfo}}"
+        <input class='input'  always-embed="true"  maxlength='50' focus='{{Focus}}' bindinput="onKeyInput" bindblur="onBindblur" value="{{SearchInfo}}"
           placeholder="搜索我的题卡" confirm-type="search" bindconfirm="onSearch" bindfocus="onFocus" />
         
         <view class="clearData FlexRow" catchtap="clearInput" wx:if="{{SearchInfo}}">

pages/other/lessonlist.js

@@ -39,7 +39,7 @@ Page({
     
     if (e.currentTarget.dataset.url){
       wx.navigateTo({
-        url: '../other/video?LessonID=' + id +idchild+"&imageurl="+e.currentTarget.dataset.imageurl+"&url="+e.currentTarget.dataset.url,
+        url: '../other/video?LessonID=' + id +idchild+"&imageurl="+e.currentTarget.dataset.imageurl+"&url="+e.currentTarget.dataset.url+"&title="+e.currentTarget.dataset.title,
       });
     }
     else{

pages/other/lessonlist.wxml

@@ -12,7 +12,7 @@
           <view class="lineWidth720"></view>
         </view>
 
-        <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}" data-idchild="{{indexChild+1}}" data-url="{{itemChild.VideoUrl}}" data-imageurl="{{itemChild.ImageUrl}}">
+        <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}" data-idchild="{{indexChild+1}}" data-url="{{itemChild.VideoUrl}}" data-imageurl="{{itemChild.ImageUrl}}" data-title="{{itemChild.Title}}">
           <view class='panelItem1 FlexColumn'>
             <view class="panelTitle10">{{itemChild.Title}}</view>
           </view>

pages/other/newuser.js

@@ -2,14 +2,20 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 var app = getApp();
+var backgroundAudioManager;
 
 Page({
   data: {
     PanelShow: 0,
+    IsShowPay:false,
+    IsShowBtn:false,
+    IsShowMore:false,
+    IsPlay:false,
     ImagePath: app.globalData.uploadImageUrl,
   },
   onLoad: function (options) {
     var that = this;
+    backgroundAudioManager = wx.getBackgroundAudioManager();
     wx.getSetting({
       success(res) {
         if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
@@ -17,11 +23,8 @@ Page({
             Containnerheight: main.getWindowHeight(),
           });
       
-          that.init();
-          wx.setNavigationBarColor({
-            frontColor: "#ffffff",
-            backgroundColor: "#9BD41C",
-          });
+          that.init(options.index);
+
         }
         else {
           wx.navigateTo({
@@ -31,16 +34,79 @@ Page({
       }
     });
   },
-  init: function () {
+  init: function (index) {
+    var that = this;
+    if (!index)
+      index=0;
+    main.getData("GetMiaoguoNewUserImageList", function (data) {
+      that.setData({
+        List: data[index].Images,
+        PageIndex:index,
+      });
+      wx.setNavigationBarTitle({
+        title: data[index].Name
+      });
+      wx.setNavigationBarColor({
+        frontColor: "#000000",
+        backgroundColor: data[index].BarColor,
+        backgroundColorTop: data[index].BarColor,
+      });
+
+      if (app.globalData.IsIPhoneX) {
+       that.setData({
+          IsIPad: "_IPhoneX",
+        });
+      }
+      
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  showMore:function(){
+    this.setData({
+      IsShowMore:true,
+    })
+  },
+  scroll:function(e){
+    var that=this;
+    if (that.data.PanelShow==0 && that.data.PageIndex==0){
+      var query = wx.createSelectorQuery().in(that)
+      query.select('#Image4').boundingClientRect(function(res){
+        console.log(res.top);
+        if (res && res.top && res.top<0 && !that.data.IsShowBtn){
+          that.setData({
+            IsShowBtn:true,
+          });
+        }
+        else if (res && res.top && res.top>0 && that.data.IsShowBtn){
+          that.setData({
+            IsShowBtn:false,
+          });
+        }
+      }).exec();
+    }
+  },
+  showPay:function(){
     var that = this;
     main.getData("GetClassList?Flag=0", function (data) {
       if (data && data.length>0) {
         that.setData({
+          IsShowPay:true,
           StartDate: common.formatDateCHS(data[0].StartDate),
         })
       }
     });
   },
+  hidePay:function(){
+    this.setData({
+      IsShowPay:false,
+    });
+  },
   payMoney: function () {
     var that = this;
     var money = 1;
@@ -58,6 +124,7 @@ Page({
       });
       wx.setNavigationBarColor({
         frontColor: "#000000",
+        backgroundColorTop: "#ffffff",
         backgroundColor: "#ffffff",
       });
     });
@@ -80,6 +147,23 @@ Page({
       url: '../index/index',
     })
   },
+  play:function(){
+    var that=this;
+    var isPlay=!that.data.IsPlay;
+    if (isPlay){
+      that.data.List[11].Image="bm_sy_12b";
+      backgroundAudioManager.title = "暖暖爸致辞";
+      backgroundAudioManager.src = app.globalData.uploadImageUrl+"web/_lesson/nuannuanbazhici.m4a";
+    }
+    else{
+      that.data.List[11].Image="bm_sy_12a";
+      backgroundAudioManager.pause();
+    }
+    that.setData({
+      List:that.data.List,
+      IsPlay:isPlay,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/newuser.json

@@ -1,4 +1,5 @@
 {
-  "navigationBarBackgroundColor": "#9BD41C",
-  "navigationBarTextStyle": "white"
+  "navigationBarBackgroundColor": "#C9400C",
+  "navigationBarTextStyle": "black",
+  "backgroundColorTop":"#C9400C"
 }

pages/other/newuser.wxml

@@ -1,24 +1,35 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
 
   <block wx:if="{{PanelShow==0}}">
-    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c01.png' />
-    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c02.png' />
-    <image class="img" lazy-load="true" mode="widthFix" src='{{ImagePath}}web/promotion_leaflet_c03.png' />
-    <view class="panelBottom FlexRow">
-      <view class="panelBottom1 FlexColumn" wx:if="{{!StartDate}}">
-        <view class='text7'>7天手把手</view>
-        <view class='text8'>还您上手新方法</view>
-      </view>
-      <view class="panelBottom1 FlexColumn" wx:if="{{StartDate}}">
-        <view class='text7'>预计开班时间</view>
-        <view class='text8'>{{StartDate}}</view>
-      </view>
-      <view class="btn2 FlexColumn" bindtap="payMoney">
-        报名
+    <image id="Image{{index}}" wx:for="{{List}}" wx:key="*this" class="img" lazy-load="true" mode="widthFix" 
+    src='{{ImagePath}}web/{{item.Image}}.png' bindtap="{{item.BindTap}}" data-url="{{item.Url}}"  
+    bindtouchmove="scroll" wx:if="{{ (!IsShowMore && index<24) || IsShowMore}}"/>
+    <view bindtap="showMore" class="btn3 FlexRow" wx:if="{{!IsShowMore && PageIndex==0}}">更多评语</view>
+    <view style="height:150rpx;"></view>
+    <view wx:if="{{IsShowPay}}" class="panelBottom FlexColumn" style='height:{{Containnerheight}}rpx;' catchtap="hidePay">
+      <view class="panelBottom0 FlexColumn">
+        <text class="text1">欢迎您\n报名秒过新手培训</text>
+        <text class="text2">新手包仅售1元</text>
+        <view class="btn FlexColumn" catchtap="payMoney">
+          <image class="bm_sy_banner-zf" src='{{ImagePath}}web/bm_sy_banner-zf.png' />
+        </view>
+
+        <view class="panelBottom1 FlexColumn" wx:if="{{!StartDate}}">
+          <view class='text3'>7天手把手</view>
+          <view class='text4'>教您上手新方法</view>
+        </view>
+        <view class="panelBottom1 FlexColumn" wx:if="{{StartDate}}">
+          <view class='text3'>预计开班时间</view>
+          <view class='text4'>{{StartDate}}</view>
+        </view>
+        <image class="bm_sy_bg" src='{{ImagePath}}web/bm_sy_bg.png' />
+    </view>
+    </view>
+    <view class="panelShowPay{{IsIPad}} FlexColumn" wx:if="{{IsShowBtn}}" >
+      <view class="btn2 FlexRow">
+        <image class="bm_sy_banner-zf" src='{{ImagePath}}web/bm_sy_banner-bm.png' />
       </view>
     </view>
-    
-    <view style="height:140rpx;"></view>
   </block>
   <block wx:if="{{PanelShow==1}}">
     <image src="{{ImagePath}}web/trial_registration_xcode2.png" class="trial_registration_xcode2"></image>

pages/other/newuser.wxss

@@ -1,93 +1,115 @@
 .container{
-  background-color: #ffffff;
+  background-color: #f8f8f8;
 }
 
 .img{
   width:100%;
 }
 
+.panelShowPay{
+  width:100%;
+  height:120rpx;
+  position: fixed;
+  bottom: 0;
+  z-index: 10;
+  background-color: #F8F8F8;
+  justify-content: flex-start;
+}
+.panelShowPay_IPhoneX{
+  width:100%;
+  height:140rpx;
+  position: fixed;
+  bottom: 0;
+  z-index: 10;
+  background-color: #F8F8F8;
+  justify-content: flex-start;
+}
+.btn2{
+  width:730rpx;
+  height:100rpx;
+  border-radius: 20rpx;
+  background-color: #FF970C;
+  margin-top:10rpx;
+}
 
 .panelBottom{
   width:100%;
-  height:140rpx;
+  position: fixed;
+  top: -1rpx;
+  background-color: rgba(0,0,0,0.5);
+  z-index: 20;
+}
+
+.panelBottom0{
+  width:100%;
+  height:700rpx;
   position: fixed;
   bottom: 0;
-  background-color: #329468;
+  background-color: #29365C;
   z-index: 10;
-  justify-content: space-between;
+  justify-content: flex-start;
+  color:#fff;
 }
 
 .panelBottom1{
-  margin-left: 30rpx;
+  position: absolute;
+  top: 515rpx;
+  left:119rpx;
   color:#fff;
   align-items: flex-start;
 }
 
-.text7{
-  font-size:24rpx;
-}
-
-.text8{
-  font-size:36rpx;
+.bm_sy_bg{
+  width:100%;
+  height:198rpx;
+  position: absolute;
+  bottom: 0;
 }
 
-
 .text1{
-  margin: 200rpx 0 0 0;
-  font-size:64rpx;
-  color:#329468;
+  margin: 75rpx 0 0 0;
+  font-size:36rpx;
+  text-align: center;
 }
 .text2{
-  margin: 10rpx 0 0 0;
-  font-size:36rpx;
+  margin: 30rpx 0 0 0;
+  font-size:64rpx;
 }
 .text3{
-  font-size:28rpx;
-  font-weight: 400;
-}
-
-.btn{
-  font-size:36rpx;
-  width:500rpx;
-  height:90rpx;
-  border-radius: 10rpx;
-  text-align: center;
-  line-height: 90rpx;
-  color:#fff;
-  background-color: #0071EF;
-  margin-top: 40rpx;
-}
-
-.btn2{
-  font-size:48rpx;
-  width:380rpx;
-  height:100rpx;
-  border-radius: 10rpx;
-  text-align: center;
-  line-height: 100rpx;
-  color:#1E1E1E;
-  background-color: #FFDD0C;
-  margin-right: 30rpx;
+  font-size:24rpx;
 }
-
 .text4{
-  margin: 60rpx 0 0 0;
   font-size:36rpx;
 }
 
-.text6{
-  margin: 100rpx 0 0 0;
+.btn{
   font-size:36rpx;
-  color:#329468;
+  width:580rpx;
+  height:130rpx;
+  border-radius: 20rpx;
   text-align: center;
+  line-height: 130rpx;
+  background-color: #FF970C;
+  margin-top: 30rpx;
 }
 
-.officialaccount{
-  width:700rpx;
-  margin: 50rpx;
+.bm_sy_banner-zf{
+  width:105rpx;
+  height:60rpx;
 }
 
 .trial_registration_xcode2{
   width:100%;
   height:910rpx;
+}
+
+.btn3{
+  font-size:36rpx;
+  width:650rpx;
+  height:110rpx;
+  border-radius: 20rpx;
+  text-align: center;
+  line-height: 110rpx;
+  border:2rpx solid #D2D2D2;
+  background-color: #fff;
 }

pages/other/video.js

@@ -17,7 +17,7 @@ Page({
     });
     wx.setNavigationBarColor({
       frontColor: "#ffffff",
-      backgroundColor: "#000000",
+      backgroundColor: "#000000"
     });
 
     var LessonID = 2;
@@ -39,7 +39,7 @@ Page({
         ImageUrl:options.imageurl,
       });
       wx.setNavigationBarTitle({
-        title: options.Title,
+        title: options.title
       });
     }
     else{
@@ -53,7 +53,7 @@ Page({
             ImageUrl:data[LessonID-1].List[LessonPage-1].ImageUrl,
           });
           wx.setNavigationBarTitle({
-            title: data[LessonID-1].List[LessonPage-1].Title,
+            title: data[LessonID-1].List[LessonPage-1].Title
           });
         }
       });
@@ -83,7 +83,7 @@ Page({
     return {
       title: title,
       path: app.globalData.SharePath + '?type=video&LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: imageUrl,
+      imageUrl: imageUrl
     }
   },
 })

pages/test/index.js

@@ -1,7 +1,9 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import constant from '../../utils/constant';
 
 const app = getApp();
+var testGradeArr=constant.testGradeArr;
 
 Page({
   data: {
@@ -46,282 +48,28 @@ Page({
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
+    if (e.currentTarget.dataset.type=="Shici"){
+      var name1=e.currentTarget.dataset.name1;
+      name1=name1.replace("语文古诗文","语文");
+      url="./item?testtype=recite&name1="+name1+"&bookid="+e.currentTarget.dataset.bookid;
+    }
+    else{
+      url="./list?name1="+e.currentTarget.dataset.name1+"&id="+e.currentTarget.dataset.bookid;
+    }
     wx.navigateTo({
       url: url,
     });
   },
   getTestReportList: function () {
     var that = this;
+    for(var i=0;i<testGradeArr.length;i++){
+      for(var j=0;j<testGradeArr[i].List.length;j++){
+        testGradeArr[i].List[j].Finish=0;
+      }
+    }
     that.setData({
-      GradeArr: [{
-          Name: "一年级",
-          Name2: "语文一年级",
-          Select: "Select",
-          List: [{
-            ID: 1,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 12,
-            Image: "../images/examine_subject_a001.png"
-          }, {
-            ID: 13,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 26,
-            Image: "../images/examine_subject_a001.png"
-          }, {
-            ID: 2,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 14,
-            Image: "../images/examine_subject_a002.png"
-          }, {
-            ID: 14,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 28,
-            Image: "../images/examine_subject_a002.png"
-          }]
-        },
-        {
-          Name: "二年级",
-          Name2: "语文二年级",
-          Select: "",
-          List: [{
-            ID: 3,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a003.png"
-          }, {
-            ID: 15,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 28,
-            Image: "../images/examine_subject_a003.png"
-          }, {
-            ID: 4,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a004.png"
-          }, {
-            ID: 16,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 29,
-            Image: "../images/examine_subject_a004.png"
-          }]
-        },
-        {
-          Name: "三年级",
-          Name2: "语文三年级",
-          Select: "",
-          List: [{
-            ID: 5,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a005.png"
-          }, {
-            ID: 17,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 28,
-            Image: "../images/examine_subject_a005.png"
-          }, {
-            ID: 6,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a006.png"
-          }, {
-            ID: 18,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 21,
-            Image: "../images/examine_subject_a006.png"
-          }]
-        },
-        {
-          Name: "四年级",
-          Name2: "语文四年级",
-          Select: "",
-          List: [{
-            ID: 7,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a007.png"
-          },  {
-            ID: 19,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 20,
-            Image: "../images/examine_subject_a007.png"
-          }, {
-            ID: 8,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a008.png"
-          },  {
-            ID: 20,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 20,
-            Image: "../images/examine_subject_a008.png"
-          }]
-        },
-        {
-          Name: "五年级",
-          Name2: "语文五年级",
-          Select: "",
-          List: [{
-            ID: 9,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a009.png"
-          }, {
-            ID: 21,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "上学期",
-            Finish: 0,
-            Total: 21,
-            Image: "../images/examine_subject_a009.png"
-          }, {
-            ID: 10,
-            Type: "Shizi",
-            Name: "语文识字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a010.png"
-          }, {
-            ID: 22,
-            Type: "Shizi",
-            Name: "语文写字",
-            Name2: "下学期",
-            Finish: 0,
-            Total: 16,
-            Image: "../images/examine_subject_a010.png"
-          }
-        ]
-        },
-        {
-          Name: "六年级",
-          Name2: "语文六年级",
-          Select: "",
-          List: [
-            {
-              ID: 23,
-              Type: "Shizi",
-              Name: "语文写字",
-              Name2: "上学期",
-              Finish: 0,
-              Total: 18,
-              Image: "../images/examine_subject_a011.png"
-            }, {
-              ID: 24,
-              Type: "Shizi",
-              Name: "语文写字",
-              Name2: "下学期",
-              Finish: 0,
-              Total: 12,
-              Image: "../images/examine_subject_a012.png"
-            }, 
-          ]
-        },
-        {
-          Name: "英语常用单词",
-          Name2: "英语常用单词",
-          Select: "",
-          List: [
-            {
-              ID: 101,
-              Type: "Word",
-              Name: "常用单词1",
-              Name2: "词汇1~220",
-              Finish: 0,
-              Total: 22,
-              Image: "../images/examine_subject_b001.png"
-            },
-            {
-              ID: 102,
-              Type: "Word",
-              Name: "常用单词2",
-              Name2: "词汇221~500",
-              Finish: 0,
-              Total: 28,
-              Image: "../images/examine_subject_b002.png"
-            },
-            {
-              ID: 103,
-              Type: "Word",
-              Name: "常用单词3",
-              Name2: "词汇500~1000",
-              Finish: 0,
-              Total: 50,
-              Image: "../images/examine_subject_b003.png"
-            },
-            {
-              ID: 104,
-              Type: "Word",
-              Name: "常用单词4",
-              Name2: "词汇1001~1500",
-              Finish: 0,
-              Total: 50,
-              Image: "../images/examine_subject_b004.png"
-            },
-            {
-              ID: 105,
-              Type: "Word",
-              Name: "常用单词5",
-              Name2: "词汇1501~2000",
-              Finish: 0,
-              Total: 50,
-              Image: "../images/examine_subject_b005.png"
-            },
-          ]
-        },
-      ],
-    })
+      GradeArr: testGradeArr,
+    });
     var userid = app.globalData.userInfo.UserID;
     main.getData('GetTestReportList?UserID=' + userid, function (data) {
       if (data) {
@@ -339,7 +87,7 @@ Page({
           }
           dataTemp.push(data[i]);
 
-          if (data[i].Name[0].indexOf("英语")>=0){
+          if (data[i].Name[0].indexOf("英语")>=0 || data[i].Name[1].indexOf("古诗文")>=0){
             if (data[i].TestRightStr){
               data[i].TestRightStr=data[i].TestRightStr.split(",");
             }

pages/test/index.wxml

@@ -8,7 +8,7 @@
   </view>
   <view class="panelLine"></view>
   <scroll-view scroll-x class="panelCard FlexRow">
-    <view class="Card" wx:for="{{GradeArr[TestSelectGrade].List}}" wx:key="index" bindtap="goto" data-url="./list?id={{item.ID}}&name1={{GradeArr[TestSelectGrade].Name}} {{item.Name}} {{item.Name2}}">
+    <view class="Card" wx:for="{{GradeArr[TestSelectGrade].List}}" wx:key="index" bindtap="goto" data-type="{{item.Type}}" data-bookid="{{item.ID}}" data-name1="{{GradeArr[TestSelectGrade].Name}} {{item.Name}} {{item.Name2}}">
       <image class="examine_subject_a001" src="{{item.Image}}"></image>
       <view class="Card1">{{item.Name}}</view>
       <view class="Card2">{{item.Name2}}</view>

pages/test/item.js

@@ -46,8 +46,12 @@ Page({
     if (options.type)
       that.init2(options);
     else{
-      if (options.bookid<=100)
-        that.init(options);
+      if (options.bookid<=100){
+        if (options.bookid>=25 && options.bookid<=36)
+          that.initAncientPoetry(options);
+        else
+          that.init(options);
+      }
       else
         that.initEng(options);
     }
@@ -135,6 +139,41 @@ Page({
     });
 
   },
+  initAncientPoetry:function(options){
+    var that=this;
+    that.setData({
+      TaskInfo: {},
+      TestType: options.testtype,
+      TestName1: options.name1,
+      TestName2: "古诗文",
+    });
+    main.getData('GetTestAncientPoetryList?UserID='+app.globalData.userInfo.UserID+'&BookID='+options.bookid, function (data) {
+      if (data) {
+        TaskList = [];
+        var list = data;
+        for (var k = 0; k < list.length; k++) {
+          var taskInfo = list[k];
+          
+          taskInfo.TagWidth=336;
+          if (taskInfo.Word.length>9)
+            taskInfo.FontSize=48;
+          else
+            taskInfo.FontSize=64;
+
+          taskInfo.ContentNew = main.changeStringToView(taskInfo.Content);
+          TaskList.push(taskInfo);
+        }
+
+        //TaskList = common.randomArray(TaskList);
+
+        that.setData({
+          TaskInfo: TaskList[0],
+          TaskLength: TaskList.length,
+          CurrentIndex: 0,
+        });
+      }
+    });
+  },
   initEng: function (options) {
     var that = this;
     that.setData({
@@ -159,14 +198,21 @@ Page({
         }
       }
     }
-    main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&Words=' + wordStr, function (data) {
+    main.getData('GetTestEnglishWords?UserID='+app.globalData.userInfo.UserID+'&TestType='+options.testtype+'&Words=' + wordStr, function (data) {
       if (data) {
         TaskList = [];
         var words = data;
         for (var k = 0; k < words.length; k++) {
           var taskInfo = words[k];
 
-          taskInfo.TagWidth=364;
+          if (options.testtype=="read"){
+            taskInfo.TagWidth=212;
+            taskInfo.FontSize=108;
+          }
+          else{
+            taskInfo.TagWidth=186;
+            taskInfo.FontSize=36;
+          }
           taskInfo.ContentNew = main.changeStringToView(taskInfo.Content);
           TaskList.push(taskInfo);
         }
@@ -336,8 +382,10 @@ Page({
           wx.hideLoading();
           if (res.statusCode === 200) {
             tempPlayUrlLocal = res.tempFilePath;
-            that.audioCtx.setSrc(res.tempFilePath);
-            that.audioCtx.play();
+            if (that.audioCtx){
+              that.audioCtx.setSrc(res.tempFilePath);
+              that.audioCtx.play();
+            }
             tempPlayUrl = url;
           }
         },

pages/test/list.js

@@ -177,8 +177,12 @@ Page({
           data.BookID=that.data.BookID;
           wx.setStorageSync("TestTask2", data); 
           that.onClose();
+          var url="./item?type=" + reporttype+"&bookid="+that.data.BookID;
+          var testtype=e.currentTarget.dataset.testtype;
+          if (testtype)
+            url+="&testtype="+testtype;
           wx.navigateTo({
-            url: "./item?type=" + reporttype+"&bookid="+that.data.BookID,
+            url: url,
           });
         });
       } else {

pages/test/list.wxml

@@ -47,18 +47,20 @@
 				<image src="../images/universalpic_word_blue_30x30.png" class="universalpic_word_blue_30x30" />
 				<view class="SelectContainer1Text4">查看字表</view>
 			</view>
-			<view class="btnPanel FlexRow">
+			<view class="btnPanel FlexColumn">
+				
 				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
 					<view class="SelectContainer1Text3">会念</view>
 				</view>
-
 				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
 					<image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
 					<view class="SelectContainer1Text3">会念 继续检验</view>
 				</view>
 
-
+				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
+					重新开始
+				</view>
 				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
 					<view class="SelectContainer1Text3">会写</view>
@@ -68,15 +70,7 @@
 					<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
 					<view class="SelectContainer1Text3">会写 继续检验</view>
 				</view>
-			</view>
-
-			<view class="btnPanel2 FlexRow">
-				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
-				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
-					重新开始
-				</view>
 
-				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btnPanel21"></view>
 				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
 					重新开始
 				</view>
@@ -88,26 +82,42 @@
 				<image src="../images/universalpic_words_blue_30x30.png" class="universalpic_word_blue_30x30" />
 				<view class="SelectContainer1Text4">查看词表</view>
 			</view>
-			<view class="btnPanel1">念出单词的发音并说出含义</view>
-			<view class="btnPanel0 btnPanel FlexRow">
+			<view class="btnPanel0 btnPanel FlexColumn">
 				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
-					<view class="SelectContainer1Text3">开始检验</view>
+					<image src="../images/examine_willread_gray_30x30.png" class="examine_willread_gray_30x30" />
+					<view class="SelectContainer1Text3">念单词说含义</view>
 				</view>
 				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="continue">
-					<view class="SelectContainer1Text3">继续检验</view>
+					<image src="../images/examine_willread_green_30x30.png" class="examine_willread_gray_30x30" />
+					<view class="SelectContainer1Text3">念单词说含义 继续检验</view>
 				</view>
-			</view>
-
-			<view class="btnPanel2 FlexRow">
-				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btnPanel21"></view>
+				<view class="btnPanel1">根据单词念出读音说出含义</view>
+			
 				<view wx:if="{{!SelectItem.TestTypeReadFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="restart">
 					重新开始
 				</view>
+
+
+				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
+					<image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
+					<view class="SelectContainer1Text3">默写</view>
+				</view>
+				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="continue">
+					<image src="../images/examine_willwrite_green_27x27.png" class="examine_willwrite_gray_27x27" />
+					<view class="SelectContainer1Text3">默写 继续检验</view>
+				</view>
+				<view class="btnPanel1">根据发音和含义默写单词</view>
+			
+				<view wx:if="{{!SelectItem.TestTypeWriteFinished}}" class="btnPanel21" bindtap="gotoTestReportInfo" data-testtype="write" data-id="{{SelectItem.WriteReportID}}" data-type="restart">
+					重新开始
+				</view>
+
+
 			</view>
 		</block>
 
 
-		<view style="width:100%;height:50rpx;"></view>
+		<view style="width:100%;height:30rpx;"></view>
 		<view class="close FlexRow" bindtap="onClose">
 			<image src="../images/universalpic_close_black_24x24.png" class="universalpic_close_black_24x24" />
 		</view>

pages/test/list.wxss

@@ -83,12 +83,13 @@
   background-color: rgba(0,0,0,0.7);
   position: fixed;
   width:100%;
+  justify-content: flex-start;
   top:0;
 }
 
 .SelectContainer .SelectContainer1{
+  margin-top:20rpx;
   width:710rpx;
-  /* height:613rpx; */
   border-radius: 10rpx;
   background-color: #F8F8F8;
   position: relative;
@@ -113,14 +114,12 @@
 }
 
 .SelectContainer1Text3{
-  font-size:36rpx;
-  margin-left: 10rpx;
-  color:#787878;
-  font-weight: 500;
+  font-size:28rpx;
+  margin-left: 20rpx;
 }
 
 .btnPanel{
-  margin-top: 60rpx;
+  margin-top: 30rpx;
 }
 
 .btnPanel0{
@@ -128,19 +127,21 @@
 }
 
 .btnPanel1{
-  margin-top: 60rpx;
-  font-size: 28rpx;
+  margin-top:-10rpx;
+  margin-bottom: 30rpx;
+  font-size: 20rpx;
   font-weight: 500;
+  color:#4D4D4D;
 }
 
 
 .btn{
-  width:315rpx;
-  height:110rpx;
+  width:500rpx;
+  height:90rpx;
   border-radius: 10rpx;
   background-color: #fff;
   border:1rpx solid #9B9B9B;
-  margin: 0 10rpx;
+  margin: 0 0 30rpx 0;
 }
 
 
@@ -171,7 +172,7 @@
 }
 .btnPanel21{
   width:315rpx;
-  margin: 0 10rpx;
+  margin:0 0 30rpx 0;
   text-align: center;
   color:#0071EF;
   font-size:28rpx;

pages/test/report.js

@@ -98,6 +98,8 @@ Page({
         name = name.substr(name.indexOf("#") + 1);
         if (TestTask.TestType == "read")
           name += " 会念";
+        else if (TestTask.TestType == "recite")
+          name += " 会背";
         else
           name += " 会写";
       }
@@ -169,10 +171,14 @@ Page({
           var obj = {};
           obj.Field1 = item.Content[1].Content;
           obj.Field2 = item.Content[2].Content;
-          obj.Field3 = "";
+          if (item.Content[3].Content)
+            obj.Field3 = item.Content[3].Content;
+          else
+            obj.Field3="";
           obj.Tags = item.Content[0].Content;
           if (!common.checkIsArray(obj.Tags))
             obj.Tags = obj.Tags.split(",");
+          
           obj.ID = 0;
           obj.LimitTime = common.formatTime(new Date());
           obj.FontSize = item.FontSize;
@@ -246,13 +252,25 @@ Page({
     }
     if (TestTask.TestRightStr)
       param1.TestRightStr = TestTask.TestRightStr.join(symbol);
+    if (common.checkIsArray(param1.TestWrongStr))
+      param1.TestRightStr=param1.TestRightStr.join(symbol);
+
     if (TestTask.TestWrongStr)
       param1.TestWrongStr = TestTask.TestWrongStr.join(symbol);
+    if (common.checkIsArray(param1.TestWrongStr))
+      param1.TestWrongStr=param1.TestWrongStr.join(symbol);
+    
     if (TestTask.TestSkipStr)
       param1.TestSkipStr = TestTask.TestSkipStr.join(symbol);
+    if (common.checkIsArray(param1.TestSkipStr))
+      param1.TestSkipStr=param1.TestSkipStr.join(symbol);
+    
+      
     if (TestTask.TestExistStr)
       param1.TestExistStr = TestTask.TestExistStr.join(symbol);
-
+    if (common.checkIsArray(param1.TestExistStr))
+      param1.TestExistStr=param1.TestExistStr.join(symbol);
+    
     if (TestReportID)
       param1.ID = TestReportID;
 
@@ -260,7 +278,6 @@ Page({
     wx.setStorageSync('TestTask', param1);
     
     delete param1.List;
-    delete param1.BookID;
 
     main.postData('InsertTestReport?UserID=' + userid, param1, function (data) {
       if (data){

project.config.json

@@ -120,9 +120,8 @@
           "scene": 1047
         },
         {
-          "id": 9,
-          "name": "pages/marketing/award",
-          "pathName": "pages/marketing/award",
+          "name": "pages/other/newuser",
+          "pathName": "pages/other/newuser",
           "query": "",
           "scene": null
         }

utils/constant.js

@@ -182,6 +182,7 @@ module.exports = {
       BackColor2: "#19306C",
       LineColor: "#F1AB1E",
       FieldColor: "#ACC3DC",
+      BackColor3: "#18306C",
     },
     {
       ID: 2,
@@ -190,6 +191,7 @@ module.exports = {
       BackColor2: "#4D3571",
       LineColor: "#FCA0BE",
       FieldColor: "#C6BFD1",
+      BackColor3: "#402D5E",
     },
     {
       ID: 3,
@@ -198,6 +200,7 @@ module.exports = {
       BackColor2: "#532938",
       LineColor: "#F19E84",
       FieldColor: "#D3A9B8",
+      BackColor3: "#492532",
     },
     {
       ID: 4,
@@ -206,8 +209,372 @@ module.exports = {
       BackColor2: "#27420B",
       LineColor: "#ADD303",
       FieldColor: "#ADC493",
+      BackColor3: "#253C0B",
     },
   ],
+  testGradeArr: [{
+    Name: "一年级",
+    Name2: "语文一年级",
+    Select: "Select",
+    List: [{
+      ID: 1,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 12,
+      Image: "../images/examine_subject_a001.png"
+    }, {
+      ID: 13,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 26,
+      Image: "../images/examine_subject_a001.png"
+    }, {
+      ID: 25,
+      Type: "Shici",
+      Name: "语文古诗词",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a001.png"
+    }, {
+      ID: 2,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 14,
+      Image: "../images/examine_subject_a002.png"
+    }, {
+      ID: 14,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 28,
+      Image: "../images/examine_subject_a002.png"
+    }, {
+      ID: 26,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a002.png"
+    }]
+  },
+  {
+    Name: "二年级",
+    Name2: "语文二年级",
+    Select: "",
+    List: [{
+      ID: 3,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a003.png"
+    }, {
+      ID: 15,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 28,
+      Image: "../images/examine_subject_a003.png"
+    },{
+      ID: 27,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a003.png"
+    }, {
+      ID: 4,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a004.png"
+    }, {
+      ID: 16,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 29,
+      Image: "../images/examine_subject_a004.png"
+    }, {
+      ID: 28,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a004.png"
+    }]
+  },
+  {
+    Name: "三年级",
+    Name2: "语文三年级",
+    Select: "",
+    List: [{
+      ID: 5,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a005.png"
+    }, {
+      ID: 17,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 28,
+      Image: "../images/examine_subject_a005.png"
+    }, {
+      ID: 29,
+      Type: "Shizi",
+      Name: "语文古诗文",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a005.png"
+    }, {
+      ID: 6,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a006.png"
+    }, {
+      ID: 18,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 21,
+      Image: "../images/examine_subject_a006.png"
+    }, {
+      ID: 30,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a006.png"
+    }]
+  },
+  {
+    Name: "四年级",
+    Name2: "语文四年级",
+    Select: "",
+    List: [{
+      ID: 7,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a007.png"
+    },  {
+      ID: 19,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 20,
+      Image: "../images/examine_subject_a007.png"
+    },  {
+      ID: 31,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a007.png"
+    }, {
+      ID: 8,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a008.png"
+    }, {
+      ID: 20,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 20,
+      Image: "../images/examine_subject_a008.png"
+    }, {
+      ID: 32,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a008.png"
+    }]
+  },
+  {
+    Name: "五年级",
+    Name2: "语文五年级",
+    Select: "",
+    List: [{
+      ID: 9,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a009.png"
+    }, {
+      ID: 21,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 21,
+      Image: "../images/examine_subject_a009.png"
+    }, {
+      ID: 33,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a009.png"
+    }, {
+      ID: 10,
+      Type: "Shizi",
+      Name: "语文识字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a010.png"
+    }, {
+      ID: 22,
+      Type: "Shizi",
+      Name: "语文写字",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a010.png"
+    }, {
+      ID: 34,
+      Type: "Shici",
+      Name: "语文古诗文",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 1,
+      Image: "../images/examine_subject_a010.png"
+    }
+  ]
+  },
+  {
+    Name: "六年级",
+    Name2: "语文六年级",
+    Select: "",
+    List: [
+      {
+        ID: 23,
+        Type: "Shizi",
+        Name: "语文写字",
+        Name2: "上学期",
+        Finish: 0,
+        Total: 18,
+        Image: "../images/examine_subject_a011.png"
+      }, {
+        ID: 35,
+        Type: "Shici",
+        Name: "语文古诗文",
+        Name2: "上学期",
+        Finish: 0,
+        Total: 1,
+        Image: "../images/examine_subject_a011.png"
+      }, {
+        ID: 24,
+        Type: "Shizi",
+        Name: "语文写字",
+        Name2: "下学期",
+        Finish: 0,
+        Total: 12,
+        Image: "../images/examine_subject_a012.png"
+      }, {
+        ID: 36,
+        Type: "Shici",
+        Name: "语文古诗文",
+        Name2: "下学期",
+        Finish: 0,
+        Total: 1,
+        Image: "../images/examine_subject_a012.png"
+      }, 
+    ]
+  },
+  {
+    Name: "英语常用单词",
+    Name2: "英语常用单词",
+    Select: "",
+    List: [
+      {
+        ID: 101,
+        Type: "Word",
+        Name: "常用单词1",
+        Name2: "词汇1~220",
+        Finish: 0,
+        Total: 22,
+        Image: "../images/examine_subject_b001.png"
+      },
+      {
+        ID: 102,
+        Type: "Word",
+        Name: "常用单词2",
+        Name2: "词汇221~500",
+        Finish: 0,
+        Total: 28,
+        Image: "../images/examine_subject_b002.png"
+      },
+      {
+        ID: 103,
+        Type: "Word",
+        Name: "常用单词3",
+        Name2: "词汇500~1000",
+        Finish: 0,
+        Total: 50,
+        Image: "../images/examine_subject_b003.png"
+      },
+      {
+        ID: 104,
+        Type: "Word",
+        Name: "常用单词4",
+        Name2: "词汇1001~1500",
+        Finish: 0,
+        Total: 50,
+        Image: "../images/examine_subject_b004.png"
+      },
+      {
+        ID: 105,
+        Type: "Word",
+        Name: "常用单词5",
+        Name2: "词汇1501~2000",
+        Finish: 0,
+        Total: 50,
+        Image: "../images/examine_subject_b005.png"
+      },
+    ]
+  }],
   arrPinyin: [
     ['a1', 'ā', ['阿']],
     ['a2', 'á', ['啊']],

utils/main.js

@@ -872,7 +872,6 @@ function GetTestReportInfo(reportid, callback) {
       var name2 = UserTestReport[n].Name[1];
 
       if (name1[0].indexOf("英语") >= 0) {
-        //todo
         //console.log("英语");
         var arrEnglist = wx.getStorageSync("EnglishAll");
         if (arrEnglist)
@@ -897,7 +896,7 @@ function GetTestReportInfo(reportid, callback) {
         var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
         var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
         var tempExist = "," + userTestReportInfo.TestExistStr + ",";
-        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&Words=' + wordStr, function (data) {
+        getData('GetTestEnglishWords?UserID=' + app.globalData.userInfo.UserID + '&Words=' + wordStr+"&TestType="+userTestReportInfo.TestType, function (data) {
           if (data) {
             var result = {};
             result.ID = userTestReportInfo.ID;
@@ -911,7 +910,14 @@ function GetTestReportInfo(reportid, callback) {
             for (var k = 0; k < words.length; k++) {
               var taskInfo = words[k];
 
-              taskInfo.TagWidth = 364;
+              if (userTestReportInfo.TestType=="read"){
+                taskInfo.TagWidth=212;
+                taskInfo.FontSize=108;
+              }
+              else{
+                taskInfo.TagWidth=186;
+                taskInfo.FontSize=36;
+              }
               taskInfo.ContentNew = changeStringToView(taskInfo.Content);
               if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
                 taskInfo.Result = 1;
@@ -944,8 +950,70 @@ function GetTestReportInfo(reportid, callback) {
             callback({});
           }
         });
+      } 
+      else if (name2=="古诗文") {
+        //todo
+        //console.log("古诗文");
+        var userTestReportInfo = UserTestReport[n];
+        var tempRight = "," + userTestReportInfo.TestRightStr + ",";
+        var tempWrong = "," + userTestReportInfo.TestWrongStr + ",";
+        var tempSkip = "," + userTestReportInfo.TestSkipStr + ",";
+        var tempExist = "," + userTestReportInfo.TestExistStr + ",";
+        
+        getData('GetTestAncientPoetryList?UserID=' + app.globalData.userInfo.UserID + '&BookID=' + userTestReportInfo.BookID, function (data) {
+          
+          if (data) {
+            var result = {};
+            result.ID = userTestReportInfo.ID;
+            result.IsFinished = userTestReportInfo.IsFinished;
+            result.Name = userTestReportInfo.Name.join("#");
+            result.TestType = userTestReportInfo.TestType;
+            result.BookID = userTestReportInfo.BookID;
 
-      } else {
+            var TaskList = [];
+            for (var k = 0; k < data.length; k++) {
+              var taskInfo = data[k];              
+              taskInfo.TagWidth=336;
+              if (taskInfo.Word.length>9)
+                taskInfo.FontSize=48;
+              else
+                taskInfo.FontSize=64;
+
+              taskInfo.ContentNew = changeStringToView(taskInfo.Content);
+              if (tempRight.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Result = 1;
+              if (tempWrong.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Result = -1;
+              if (tempSkip.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Result = 0;
+
+              if (tempExist.indexOf("," + taskInfo.Word + ",") >= 0)
+                taskInfo.Css = "Select2";
+
+              TaskList.push(taskInfo);
+            }
+            result.TestRightStr = "";
+            result.TestWrongStr = "";
+            result.TestSkipStr = "";
+            result.TestExistStr = "";
+            if (userTestReportInfo.TestRightStr)
+              result.TestRightStr = userTestReportInfo.TestRightStr;
+            if (userTestReportInfo.TestWrongStr)
+              result.TestWrongStr = userTestReportInfo.TestWrongStr;
+            if (userTestReportInfo.TestSkipStr)
+              result.TestSkipStr = userTestReportInfo.TestSkipStr;
+            if (userTestReportInfo.TestExistStr)
+              result.TestExistStr = userTestReportInfo.TestExistStr;
+
+            result.List = TaskList;
+            callback(result);
+          } else {
+            callback({});
+          }
+        });
+        
+      } 
+      else {
         name1 = name1[0] + name1[1].substr(2, 2) + "能力" + name1[2].substr(0, 1);
         var HanziAll = wx.getStorageSync('HanziAll');
         HanziAll = JSON.parse(HanziAll);
@@ -1172,14 +1240,15 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
   }, 5000);
 
   var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
-  url += "&Word=" + search;
+  url += "&Word=" + encodeURI(search);
   if (searchtype)
     url += "&SearchType=" + searchtype;
   if (author)
-    url += "&Author=" + author;
+    url += "&Author=" + encodeURI(author);
   if (shiciurl)
     url += "&ShiciUrl=" + shiciurl;
 
+  
   getData(url, function (data) {
     wx.hideLoading();
     clearTimeout(timeout);
@@ -1223,6 +1292,7 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
           obj.TypeName = "诗词";
           obj.Content = data.CHN.PeomContent.join("").substr(0, WORD_LENGTH);
           obj.ShiciUrl = shiciurl;
+          obj.TypeName="S";
         } else if (data.CHN) {
           obj.Type = "zici";
           if (data.CHN.PinYin && data.CHN.PinYin[0] && data.CHN.PinYin[0].pinyin)
@@ -1234,6 +1304,11 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
             if (obj.Content.length >= WORD_LENGTH)
               obj.Content += "..."
           }
+
+          if (obj.Key.length == 1)
+              obj.TypeName = "Z";
+            else
+              obj.TypeName = "C";
         }
         if (data.ENG && !data.CHN) {
           obj.Type = "eng";