2.1.31

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.20",
+    Version: "2.1.31",
     IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

app.json

@@ -1,8 +1,9 @@
 {
   "pages": [
-   
+    
     "pages/index/index",
-
+    "pages/main/health",
+    
     
     "pages/main/folderEdit",
     "pages/main/folderIcon",
@@ -50,6 +51,7 @@
     "pages/other/video",
     "pages/other/menu",
     "pages/other/lessonlist",
+    "pages/other/lessonlistselect",
     "pages/other/userlist",
     "pages/other/binding",
     "pages/other/homework",

app.wxss

@@ -92,6 +92,11 @@
   height: 1rpx;
   background-color: #E3E3E3; 
 }
+.lineWidth580{
+  width: 580rpx;
+  height: 1rpx;
+  background-color: #E3E3E3; 
+}
 
 .PanelBorderTop{
   border-top-left-radius: 20rpx;

pages/index/index.js

@@ -72,7 +72,7 @@ Page({
         }
         else{
           if (app.globalData.LessonID === "all") {
-            url = '../other/lessonlist';
+            url = '../other/lessonlist?listtype='+options.ListType;
           }
           else if (app.globalData.LessonID > 0) {
             url = '../other/lesson?LessonID=' + app.globalData.LessonID + '&LessonPage=' + app.globalData.LessonPage

pages/main/add.js

@@ -585,9 +585,9 @@ Page({
         }
       }
     }
-    if (count > 3) {
+    if (count > 4) {
       wx.showToast({
-        title: '只能上传三张图片',
+        title: '只能上传四张图片',
         image: "../images/universalpic_exclamation_white_120x120.png",
       });
       return false;
@@ -1064,7 +1064,7 @@ Page({
 
   setBtnSaveCss:function(){
     var that=this;
-    if (that.data.Field[1] != ""){
+    if (that.data.Field && that.data.Field[1] && that.data.Field[1] != ""){
       that.setData({
         BtnSaveSelectCss:"MenuBtnSelect",
       });

pages/main/addInfomationDetail.js

@@ -186,13 +186,19 @@ Page({
               }
               else if (item.Tag == "拼音" || item.Tag == "默写") {
                 if (item.SoundMark){
-                  if (this.data.Result.CHN.HanZi)
-                    str = "[读 src='" + this.data.Result.CHN.HanZi + "']" + item.Content + "[/读]";
+                  if (this.data.Result.CHN.HanZi){
+                    var sound=this.data.Result.CHN.HanZi;
+                    sound=main.GetSoundError(sound);
+                    str = "[读 src='" + sound + "']" + item.Content + "[/读]";
+                  }
                   else
                     str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
                 }
-                else
-                  str = "[读 src='"+this.data.Result.CHN.HanZi+"("+ main.getPinyinNormal(item.Content) +")"+"']" + item.Content + "[/读]";
+                else{
+                  var sound=this.data.Result.CHN.HanZi+"("+ main.getPinyinNormal(item.Content) +")";
+                  sound=main.GetSoundError(sound);
+                  str = "[读 src='"+sound+"']" + item.Content + "[/读]";
+                }
               }
             }
             else {

pages/main/addInfomationDetail.wxml

@@ -234,7 +234,7 @@
     <view class="panelItem0 FlexRow">
       <view class="{{CSS['CHN_Antonym_'+index].Css1}} panelItemSmall panelItem FlexRow" wx:for="{{Result.CHN.Antonym}}"
         wx:key="*this" bindtap='getInputData' data-type="normal" data-content="{{item}}"
-        data-css="CHN_Antonym_{{index}}" data-tag="近义词">
+        data-css="CHN_Antonym_{{index}}" data-tag="反义词">
         <view class="FlexRow">
           <view class="{{CSS['CHN_Antonym_'+index].Css2}} panelSelect0">{{CSS['CHN_Antonym_'+index].Number}}</view>
           <view class="panelItemText">{{item}}</view>

pages/main/cardmain.wxml

@@ -51,16 +51,23 @@
       <image class="richang_80x90" src='../images/jinji_80x90.png' />
     </view>
   </view>
-  <view class="panelItem5 FlexRow" bindtap="goto" data-url="../other/help?id=0&idchild=1">
-    <view class="panelItem51 FlexRow" >
-      <view>秒过官网</view>
-      <view class="panelItem511">高效制作和管理题卡</view>
+
+  <view class="panelItem3 FlexRow">
+    <view class="panelItem41 FlexRow" bindtap="goto" data-url="../main/health">
+      <view class="panelItem311 FlexColumn">
+        <view>题卡健康</view>
+        <view class="panelItem411">练习状况好与坏</view>
+      </view>
+      <image class="zhishijianyan_70x75" src='../images/card_index_jiankang_70x76.png' />
+    </view>
+    <view class="panelItem41 FlexRow" bindtap="goto" data-url="../other/help?id=2&idchild=0">
+      <view class="panelItem311 FlexColumn">
+        <view>秒过官网</view>
+        <view class="panelItem411">高效制作和管理题卡</view>
+      </view>
+      <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
     </view>
-    <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
-   
   </view>
-
-
   <!-- <block wx:if="{{IsYearReport}}">
     <view class="panelItem5 FlexRow" bindtap="goto" data-url="../other/annualreport">
       <view class="panelItem51 FlexColumn">

pages/main/cardmain.wxss

@@ -104,6 +104,20 @@
   margin-right: 30rpx;
 }
 
+.panelItem41{
+  width:345rpx;
+  height:180rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin:0 10rpx;
+  justify-content: space-between;
+}
+.panelItem411{
+  font-size:20rpx;
+  color:#4D4D4D;
+  margin-top:4rpx;
+}
+
 .panelItem5{
   width:710rpx;
   height:105rpx;
@@ -124,8 +138,8 @@
   margin-left: 30rpx;
 }
 .zhishijianyan_70x75{
-  width:50rpx;
-  height:54rpx;
+  width:70rpx;
+  height:76rpx;
   margin-right: 30rpx;
 }
 

pages/main/detail.js

@@ -41,9 +41,7 @@ Page({
     NumberHistory: 30,
     IsShowNumberInfo: false,
     IsMore: false,
-    IsShowOrder: false,
     IsShowFolder: false,
-    FontSizeArray: constant.arrFontSize,
     StudyPlanArray: arrStudyPlan,
     TaskInfo: {},
     Color: {
@@ -52,6 +50,7 @@ Page({
     IsAutoSound: false, //是否设置了自动播放
     IsAutoSoundStart: false, //是否开始自动播放
     Title: "",
+    FontSizeArray: constant.arrFontSize, 
   },
   onReady: function () {
     var that = this;
@@ -94,6 +93,8 @@ Page({
       ClickType: app.globalData.ClickType,
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
+    if (that.data.IsShowOtherButton)
+      that.closeOtherButton();
 
     this.audioCtx = wx.createAudioContext('myAudio');
 
@@ -241,9 +242,10 @@ Page({
     var task = app.globalData.TaskToday;
     FolderList = task.FolderName;
     var that = this;
-    var arrNew = task.ListNew;
-    var arrHistory = task.ListHistory;
-    var listTaskReview = task.ListReview;
+    var arrNew = task.ListNew || [];
+    var arrHistory = task.ListHistory || [];
+    var listTaskReview = task.ListReview || [];
+
 
     var nMax = [1, 1];
     if (arrNew.length == 0 || arrHistory.length == 0) {
@@ -357,15 +359,19 @@ Page({
   },
 
   onShowAnswer: function (e) {
+    var that = this;
+
     var clicktype = e.currentTarget.dataset.type;
     if (!(clicktype && clicktype == "all" && app.globalData.ClickType == 0)) {
 
       var start = e.currentTarget.dataset.start;
-      var that = this;
+      
       if (!(that.data.NumberNew == 0 &&
           that.data.NumberReview == 0 &&
           that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
 
+        if (!that.data.IsShowAnswer)
+          that.data.IsShowAnswer=[0,0];
         var recommend = 0;
         if (start) {
           that.data.IsShowAnswer[0] = 0;
@@ -377,15 +383,18 @@ Page({
           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({
-                Recommend: recommend,
-              });
+            if (TaskList[0].ContentNew && TaskList[0].ContentNew.Field && TaskList[0].ContentNew.Field.length>0){
+              if (TaskList[0].ContentNew.Field[3].length == 0) {
+                that.data.IsShowAnswer[1] = 1;
+  
+                if (!that.data.TaskInfo.IsNew)
+                  recommend = getRecommendTime();
+                that.setData({
+                  Recommend: recommend,
+                });
+              }
             }
+            
           } else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
             that.data.IsShowAnswer[1] = 1;
 
@@ -421,7 +430,7 @@ Page({
           setHeight("#ViewFieldTag",function(hTag){
             if (hTag>0)
               num+=hTag+60;
-            console.log("hTag:"+(hTag));
+            //console.log("hTag:"+(hTag));
             
             setHeight("#ViewField2",function(h2){
               if (t==2){
@@ -441,7 +450,7 @@ Page({
         var query = wx.createSelectorQuery().in(that);
         query.select(obj).boundingClientRect(function (res) {
           if (res && res.height){
-            console.log(obj+".height:"+res.height);
+            //console.log(obj+".height:"+res.height);
             callback(res.height);
           }
           else{
@@ -484,15 +493,6 @@ Page({
     isExit = false;
     clearTimeout(timeoutEveryCard);
   },
-  onFontSize: function (e) {
-    var value = e.currentTarget.dataset.value;
-    TaskList[0].FontSize = value;
-    this.setData({
-      TaskInfo: TaskList[0],
-      IsMore: false,
-      Title:"",
-    });
-  },
   //回到上一张题卡
   gotoPrev: function () {
     var that = this;
@@ -548,6 +548,8 @@ Page({
         CanUndo: canUndo,
         Recommend: 0,
       });
+      if (that.data.IsShowOtherButton)
+        that.closeOtherButton();
       that.autoAudioPlayInit();
 
       wx.showToast({
@@ -564,23 +566,36 @@ Page({
     var btnnumber = e.currentTarget.dataset.btnnumber;
     //若是“挪到最后”
     if (btnnumber == 2) {
-      var card = TaskList.splice(0, 1);
-      card[0].IsFinally = true;
-      card[0].LimitTime = common.formatTime(new Date(), "/", true) + " 23:59:59";
-      TaskList.push(card[0]);
-
-      if (currentFolderID>=0){
-        that.setCurrentFolder({currentTarget:{dataset:{folderid:currentFolderID}}});
+      if (TaskList.length>0){
+        var card = TaskList.splice(0, 1);
+        card[0].IsFinally = true;
+        card[0].LimitTime = common.formatTime(new Date(), "/", true) + " 23:59:59";
+        TaskList.push(card[0]);
+  
+        if (currentFolderID>=0){
+          that.setCurrentFolder({currentTarget:{dataset:{folderid:currentFolderID}}});
+        }
+        
+        that.setData({
+          IsShowAnswer: [0, 0],
+          TaskInfo: TaskList[0],
+          CanUndo: 1,
+          Recommend: 0,
+          Title:"",
+        });
+        if (that.data.IsShowOtherButton)
+            that.closeOtherButton();
+  
+        wx.showToast({
+          title: '挪到最后',
+          mask: true,
+          image: "../images/universalpic_movetoend_white_120x120.png",
+        });
+        that.setSoundFile(3);
+      }
+      else{
+        that.setFinallyResult();
       }
-      
-      that.setData({
-        IsShowAnswer: [0, 0],
-        TaskInfo: TaskList[0],
-        CanUndo: 1,
-        Recommend: 0,
-        IsShowOrder: false,
-        Title:"",
-      });
     } else {
       //若是没有选择了卡单，或者刚刚选择卡单
       if (currentFolderID == -1 || !currentFolderStart) {
@@ -769,22 +784,8 @@ Page({
       if (that.data.NumberNew == 0 &&
         that.data.NumberReview == 0 &&
         that.data.NumberHistory == 0) {
-        that.setData({
-          IsShowAnswer: [0, 0],
-          NumberNew: 0,
-          NumberReview: 0,
-          NumberHistory: 0,
-          CanUndo: 1,
-          Recommend: 0,
-          IsMore: false,
-        });
-        clearTimeout(timeoutEveryCard);
-        that.setSoundFile(1);
-        main.UpdateMiaoguoCardTodayAll(true, function () {
-          listTaskFinished = [];
-          that.getTaskTime();
-        });
-
+        
+          that.setFinallyResult();
       }
       //没有完成任务
       else {
@@ -810,8 +811,11 @@ Page({
           IsMore: false,
         });
 
-        console.log("MiaoguoCardID:"+TaskList[0].MiaoguoCardID);
-        console.log("FolderID:"+TaskList[0].FolderID);
+        if (that.data.IsShowOtherButton)
+          that.closeOtherButton();
+
+        //console.log("MiaoguoCardID:"+TaskList[0].MiaoguoCardID);
+        //console.log("FolderID:"+TaskList[0].FolderID);
 
         that.autoAudioPlayInit();
 
@@ -821,12 +825,6 @@ Page({
             wx.showToast({
               title: '搁置一天',
               mask: true,
-              image: "../images/universalpic_shelve_white_120x120.png",
-            });
-          } else {
-            wx.showToast({
-              title: '已推迟',
-              mask: true,
               image: "../images/universalpic_bell_white_120x120.png",
             });
           }
@@ -863,6 +861,24 @@ Page({
 
     }, app.globalData.CardWaitTimeMax * 60 * 1000);
   },
+  setFinallyResult:function(){
+    var that = this;
+    that.setData({
+      IsShowAnswer: [0, 0],
+      NumberNew: 0,
+      NumberReview: 0,
+      NumberHistory: 0,
+      CanUndo: 1,
+      Recommend: 0,
+      IsMore: false,
+    });
+    clearTimeout(timeoutEveryCard);
+    that.setSoundFile(1);
+    main.UpdateMiaoguoCardTodayAll(true, function () {
+      listTaskFinished = [];
+      that.getTaskTime();
+    });
+  },
   gotoCollect: function () {
     var that = this;
     if (!isCollecting) {
@@ -918,7 +934,6 @@ Page({
       this.setData({
         IsShowNumberInfo: true,
         IsMore: false,
-        IsShowOrder: false,
         IsShowFolder: false,
       });
       this.setData({
@@ -931,7 +946,6 @@ Page({
     this.setData({
       IsShowNumberInfo: false,
       IsMore: false,
-      IsShowOrder: false,
       IsShowFolder: false,
     });
     this.setData({
@@ -942,12 +956,29 @@ Page({
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
     if (name && name.length > 5) {
-      wx.previewImage({
-        current: name,
-        urls: arrImage
-      });
+      if (name.indexOf("tmp")>=0){
+        wx.previewImage({
+          current: name,
+          urls: [name],
+        });
+      }
+      else{
+        wx.previewImage({
+          current: name,
+          urls: arrImage
+        });
+      }
     }
   },
+  onFontSize: function (e) { 
+    var value = e.currentTarget.dataset.value; 
+    TaskList[0].FontSize = value; 
+    this.setData({ 
+      TaskInfo: TaskList[0], 
+      IsMore: false, 
+      Title:"", 
+    }); 
+  }, 
   onBindError: function (e) {
     var that = this;
     var serverUrl = e.currentTarget.dataset.serverurl;
@@ -972,10 +1003,12 @@ Page({
 
     clearTimeout(intervalRefresh);
     intervalRefresh = setTimeout(function () {
-      TaskList[0].ContentNew = main.changeStringToView(TaskList[0].Content);
-      that.setData({
-        TaskInfo: TaskList[0],
-      });
+      if (TaskList && TaskList[0]){
+        TaskList[0].ContentNew = main.changeStringToView(TaskList[0].Content);
+        that.setData({
+          TaskInfo: TaskList[0],
+        });
+      }
     }, 1000);
 
     for (var i = 1; i < this.data.TaskInfo.ContentNew.Field.length; i++) {
@@ -990,26 +1023,42 @@ Page({
     });
   },
   onMore: function () {
-    for (var i = 0; i < this.data.FontSizeArray.length; i++) {
-      if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize)
-        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor + ";border:3rpx solid " + this.data.Color.LineColor + ";";
-      else
-        this.data.FontSizeArray[i].CSS = "";
-    }
-    this.setData({
-      IsMore: true,
-      FontSizeArray: this.data.FontSizeArray,
-      Title: "更多功能",
+    for (var i = 0; i < this.data.FontSizeArray.length; i++) { 
+      if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize) 
+        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor + ";border:3rpx solid " + this.data.Color.LineColor + ";"; 
+      else 
+        this.data.FontSizeArray[i].CSS = ""; 
+    } 
+    this.setData({ 
+      IsMore: true, 
+      FontSizeArray: this.data.FontSizeArray, 
+      Title: "调节", 
     });
     clearTimeout(timeoutEveryCard);
   },
+  showOtherButton:function(){
+    var animation = wx.createAnimation();
+
+    this.animation = animation;
+
+    animation.translate(-710+'rpx', 0).step({ duration: 200 });
 
-  onShowOrder: function () {
     this.setData({
-      IsShowOrder: true,
-      Title: "出题顺序",
+      animationData:animation.export(),
+      IsShowOtherButton:true,
+    });
+  },
+  closeOtherButton:function(){
+    var animation = wx.createAnimation();
+
+    this.animation = animation;
+
+    animation.translate(0, 0).step({ duration: 200 });
+
+    this.setData({
+      animationData:animation.export(),
+      IsShowOtherButton:false,
     });
-    clearTimeout(timeoutEveryCard);
   },
   onShowFolder: function () {
     for (var j = 0; j < FolderList.length; j++) {
@@ -1039,7 +1088,6 @@ Page({
       IsShowFolder: true,
       IsShowNumberInfo: false,
       IsMore: false,
-      IsShowOrder: false,
       FolderList: FolderList,
       FolderListLength:FolderListLength,
       IsFinallyCount:IsFinallyCount,
@@ -1173,18 +1221,45 @@ Page({
       }
     });
   },
-  saveCardType: function () {
+  saveCardType: function (event) {
     var that = this;
+    var foldertype=event.currentTarget.dataset.foldertype;
     var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
     url += "&CardType=-1";
+    url += "&FolderType="+foldertype;
     url += "&ID=" + TaskList[0].MiaoguoCardID;
     main.getData(url, function (data) {
       TaskList.splice(0, 1);
-      that.setData({
-        TaskInfo: TaskList[0],
-        IsShowAnswer: [0, 0],
-      });
-      that.closeNumberContainner();
+      if (TaskList.length>0){
+        that.setData({
+          TaskInfo: TaskList[0],
+          IsShowAnswer: [0, 0],
+        });
+        if (that.data.IsShowOtherButton)
+          that.closeOtherButton();
+        that.closeNumberContainner();
+        if (foldertype==1){
+          wx.showToast({
+            title: '不练习',
+            mask: true,
+            image: "../images/universalpic_exclamation_white_120x120.png",
+          });
+          app.globalData.FolderList=[];
+        }
+        else{
+          wx.showToast({
+            title: '归档成功',
+            mask: true,
+            image: "../images/universalpic_cupboard_white_120x120.png",
+          });
+        }
+        
+        that.setSoundFile(3);
+      }
+      else{
+        that.setFinallyResult();
+      }
+      
     });
   },
   saveIsFolderPractice:function(e){
@@ -1223,13 +1298,14 @@ Page({
     common.getStorageValue(that, "IsAutoSound", 1, function () {
       if (that.data.IsAutoSound == 1) {
         var taskInfo = that.data.TaskInfo;
-        var field = {};
+        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];
+        if (taskInfo.ContentNew && taskInfo.ContentNew.Field && taskInfo.ContentNew.Field.length>0)
+          field = taskInfo.ContentNew.Field[fieldNumber];
         arrAutoAudio = [];
         for (var i = 0; i < field.length; i++) {
           if (field[i].Type == "sound" || field[i].Type == "recorder") {
@@ -1367,6 +1443,19 @@ Page({
       isPlaying = false;
     }
   },
+  showBishunOrKaiti:function(e){
+    var that=this;
+    main.downloadBishunKaitiImage(
+      e.currentTarget.dataset.url,
+      e.currentTarget.dataset.serverurl,
+      e.currentTarget.dataset.type,
+      that.data.TaskInfo.ContentNew.Field,function(fields){
+        that.data.TaskInfo.ContentNew.Field=fields;
+        that.setData({
+          TaskInfo: that.data.TaskInfo,
+        });
+      });
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages/main/detail.wxml

@@ -1,45 +1,47 @@
 <import src="../template/cardShow.wxml" />
-<navigation-bar show="true" center="true" bindgetBarInfo="getBarInfo" left="true" background="{{Color.BackColor}}" color="#fff">
-    <view slot="left" bindtap="onClose" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
-      <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.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
-        </view>
-        <view class="FlexColumn">
-          <view class='panelNumber1'>{{NumberHistory}}</view>
-          <view hidden="{{TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line' style='background-color:{{Color.LineColor}};'></view>
-        </view>
-        <view class="FlexColumn">
-          <view class='panelNumber1'>{{NumberReview}}</view>
-          <view hidden="{{TaskInfo.IsNew || TaskInfo.IsHistory}}" 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 show="true" center="true" bindgetBarInfo="getBarInfo" left="true" background="{{Color.BackColor}}"
+  color="#fff">
+  <view slot="left" bindtap="onClose" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
+    <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.IsHistory || TaskInfo.IsReview}}" class='panelNumber2Line'
+          style='background-color:{{Color.LineColor}};'></view>
+      </view>
+      <view class="FlexColumn">
+        <view class='panelNumber1'>{{NumberHistory}}</view>
+        <view hidden="{{TaskInfo.IsNew || TaskInfo.IsReview}}" class='panelNumber2Line'
+          style='background-color:{{Color.LineColor}};'></view>
+      </view>
+      <view class="FlexColumn">
+        <view class='panelNumber1'>{{NumberReview}}</view>
+        <view hidden="{{TaskInfo.IsNew || TaskInfo.IsHistory}}" 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">
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}'
+  bindtap='onShowAnswer' data-type="all">
   <!-- 练习中 -->
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
     <!-- 工具栏 -->
     <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
-      <view class='panelCancel FlexRow' catchtap='onShowOrder'>
-        <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_4blocks_gray_28x28.png" class='universalpic_4blocks_gray_28x28' />
-        </view>
-      </view>
       <view class='panelCancel FlexRow' catchtap='gotoCollect'>
         <view class='panelCancel0 FlexRow'>
-          <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_star_gray_34x34.png" class='universalpic_star_gray_34x34' />
-          <image hidden='{{!TaskInfo.IsCollect}}' src="../images/universalpic_star_tc0{{Color.ID}}_34x34.png" class='universalpic_star_gray_34x34' />
+          <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_star_gray_34x34.png"
+            class='universalpic_star_gray_34x34' />
+          <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">
@@ -47,23 +49,31 @@
           <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtap='onMore'>
+      <view class='panelCancel FlexRow' catchtap='onPullDownRefresh' wx:if="{{IsShowAnswer[0]==1}}">
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_more_gray_32x8.png" class='universalpic_more_gray_32x8' />
+          <image src="../images/universalpic_han_gray_28x25.png" class='universalpic_han_gray_28x25' />
         </view>
       </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='onPullDownRefresh' wx:if="{{IsShowAnswer[0]==1}}">
+
+
+      <view class='panelCancel FlexRow' catchtap='goto' data-url="../other/help?id=1&idchild=12">
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_han_gray_28x25.png" class='universalpic_han_gray_28x25' />
+          <image src="../images/universalpic_light_gray_20x28.png" class='universalpic_light_gray_20x28' />
         </view>
       </view>
-      
+
+      <view class='panelCancel FlexRow' catchtap='onMore'>
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_wrench_gray_26x26.png" class='universalpic_wrench_gray_26x26' />
+        </view>
+      </view>
+
+
       <view class='panelCancel FlexRow' wx:if="{{CanUndo==0}}">
         <view class='panelCancel0 FlexRow'>
           <image src="../images/universalpic_undo_white_30p_26x20.png" class='universalpic_undo_white_30p_26x20' />
@@ -79,70 +89,98 @@
 
     <view class="panelField10" style='background-color:{{Color.BackColor}};'></view>
 
-    <template is="CardShow" data="{{Color:Color,Field:TaskInfo.ContentNew.Field,Tags:TaskInfo.ContentNew.Tags,IsShowAnswer:IsShowAnswer,TagWidth:TaskInfo.TagWidth,FontSize:TaskInfo.FontSize,TextSpace}}" />
+    <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 class="StopAudioPlay FlexRow" wx:if="{{IsAutoSound && IsAutoSoundStart}}"
+      style="background-color:{{Color.BackColor3}};" catchtap="autoAudioPlayEnd">
       ■ 停止播放
     </view>
     <view class='footer0'></view>
 
     <!-- 下方按钮 -->
     <image wx:if="{{!IsIPad}}" class="footerShade" src="../images/study_learning_bgimage_tc0{{Color.ID}}.png" />
-    <view class='footer FlexColumn'>
+    <view class='footer'>
       <image wx:if="{{!IsIPad}}" class="footerImage" src="../images/study_learning_maskimage_tc0{{Color.ID}}.png" />
       <view wx:if="{{IsIPad}}" class="footerImage" style="background-color:{{Color.BackColor}}"></view>
-      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
+      <view class="panelFooter FlexColumn" wx:if="{{!IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}"
+        catchtap="onShowAnswer">
         看答案
       </view>
-      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}" catchtap="onShowAnswer">
+      <view class="panelFooter FlexColumn" wx:if="{{IsShowAnswer[0] && !IsShowAnswer[1] && ClickType!=1}}"
+        catchtap="onShowAnswer">
         下一段
       </view>
       <view class="panelFooter0 panelFooter FlexColumn" wx:if="{{IsShowAnswer[1]}}">
-        <view class='panelBottomAnswer panelBottom FlexRow'>
-          <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
-            <view class="btnTime">
-              {{TaskInfo.Number0Str}}
-            </view>
-            <view class="Answer0 btnColor"></view>
-          </view>
-          <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
-            <view class="btnTime">
-              {{TaskInfo.Number1Str}}
+        <view class='panelBottomAnswer panelBottom FlexRow' animation="{{animationData}}">
+          <view class="panelBottomAnswer0 FlexRow">
+            <view class="AnswerLeft Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
+              data-time="{{TaskInfo.Number0}}" data-btnnumber="0">
+              <view class="btnTime">
+                {{TaskInfo.Number0Str}}
+              </view>
+              <view class="Answer0 btnColor"></view>
             </view>
-            <view wx:if='{{Recommend!=1}}' class="Answer1 btnColor"></view>
-            <view wx:if='{{Recommend==1 && MemoryLevel==1}}' class="Answer1Recommend Answer1 btnColor"></view>
-          </view>
-          <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
-            <view class="btnTime">
-              {{TaskInfo.Number2Str}}
+            <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
+              data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
+              <view class="btnTime">
+                {{TaskInfo.Number1Str}}
+              </view>
+              <view wx:if='{{Recommend!=1}}' class="Answer1 btnColor"></view>
+              <view wx:if='{{Recommend==1 && MemoryLevel==1}}' class="Answer1Recommend Answer1 btnColor"></view>
             </view>
-            <view wx:if='{{Recommend!=2}}' class="Answer2 btnColor"></view>
-            <view wx:if='{{Recommend==2 && MemoryLevel==1}}' class="Answer1Recommend Answer2 btnColor"></view>
+            <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
+              data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
+              <view class="btnTime">
+                {{TaskInfo.Number2Str}}
+              </view>
+              <view wx:if='{{Recommend!=2}}' class="Answer2 btnColor"></view>
+              <view wx:if='{{Recommend==2 && MemoryLevel==1}}' class="Answer1Recommend Answer2 btnColor"></view>
 
-          </view>
-          <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3 && MemoryLevel==1}}">
-            <view class="btnTime">
-              {{TaskInfo.Number3Str}}
             </view>
-            <view wx:if='{{Recommend!=3}}' class="Answer3 btnColor"></view>
-            <view wx:if='{{Recommend==3 && MemoryLevel==1}}' class="Answer1Recommend Answer3 btnColor"></view>
+            <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
+              data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3 && MemoryLevel==1}}">
+              <view class="btnTime">
+                {{TaskInfo.Number3Str}}
+              </view>
+              <view wx:if='{{Recommend!=3}}' class="Answer3 btnColor"></view>
+              <view wx:if='{{Recommend==3 && MemoryLevel==1}}' class="Answer1Recommend Answer3 btnColor"></view>
+            </view>
+            <view class="line2"></view>
+            <view class="AnswerRight FlexColumn" hover-class='AnswerHover' catchtap='showOtherButton'>
+              <image src="../images/universalpic_4blocks_gray_28x28.png" class='universalpic_4blocks_gray_28x28' />
+            </view>
           </view>
-          <view class="line2"></view>
-          <view class="AnswerRight FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="1d" data-btnnumber="1">
-            <view class="btnTime">
+          <view class="panelBottomAnswer0 FlexRow">
+            <view class="AnswerLeft Answer00 FlexColumn" hover-class='AnswerHover' catchtap='saveCardType' data-foldertype="0">
+              归档
+            </view>
+            <view class="line3"></view>
+            <view class="Answer00 FlexColumn" hover-class='AnswerHover' catchtap='saveCardType' data-foldertype="1">
+              不会
+            </view>
+            <view class="line3"></view>
+            <view class="Answer00 FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="2">
+              挪到最后
+            </view>
+            <view class="line3"></view>
+            <view class="Answer00 FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="1d"
+              data-btnnumber="1">
               搁置
             </view>
-            <view class="Answer4 btnColor"></view>
+            <view class="line2"></view>
+            <view class="AnswerRight FlexColumn" hover-class='AnswerHover' catchtap='closeOtherButton'>
+              <image src="../images/universalpic_close_gray_24x24.png" class='universalpic_close_gray_24x24' />
+            </view>
           </view>
-          
         </view>
       </view>
-
     </view>
   </block>
   <!-- 最后一页 -->
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
-    <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+    <view class='panelLast FlexColumn'
+      style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
       <view class='text1{{IsIPad}}'>做完了</view>
       <view class="panelLastTime FlexColumn">
         <view style='color:{{Color.FrontColor1}};'>今日练习总共用时</view>
@@ -171,7 +209,8 @@
     </view>
   </block>
   <!-- 今日任务量 -->
-  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn"
+    style='height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
       <view class="numberContainer12 FlexRow">
@@ -200,7 +239,7 @@
         <view class='right3' style='color:{{Color.LineColor}};'>{{NumberNew+NumberReview+NumberHistory}}张</view>
       </view>
       <view class='lineFooter'></view>
-    
+
     </view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
       <view>关闭</view>
@@ -208,32 +247,34 @@
   </view>
 
   <!-- 更多功能 -->
-  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" catchtap="getNull" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" catchtap="getNull"
+    style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
     <view class="numberContainerFooter1 FlexColumn">
-           
-      <view class='lineFooter'></view>
 
-      <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 class='numberContainerFooter101 FlexRow'> 
+        <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_gray_30x18' /> 
+        <view class='numberContainerFooter11 FlexColumn'> 
+          <view class='numberContainerFooter111'>调整题目字号</view> 
+          <view class='numberContainerFooter112 FlexRow'> 
+            <view class='numberContainerFooter1121' wx:for="{{FontSizeArray}}" wx:key="index" catchtap='onFontSize' data-value='{{item.Value}}' style='{{item.CSS}}'>{{item.Name}}</view> 
+          </view> 
+        </view> 
+      </view> 
       <view class='lineFooter'></view>
-
-      <view class='numberContainerFooter101 FlexRow'>
-        <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_gray_30x18' />
-        <view class='numberContainerFooter11 FlexColumn'>
-          <view class='numberContainerFooter111'>调整题目字号</view>
-          <view class='numberContainerFooter112 FlexRow'>
-            <view class='numberContainerFooter1121' wx:for="{{FontSizeArray}}" wx:key="index" catchtap='onFontSize' data-value='{{item.Value}}' style='{{item.CSS}}'>{{item.Name}}</view>
-          </view>
+      <view class='numberContainerFooter107 FlexRow' catchtap='onShowFolder'>
+        <view class="MenuLeft FlexRow">
+          <image src="../images/universalpic_cardlist_gray_30x28.png" class='universalpic_cardlist_gray_30x28' />
+          <view class='numberContainerFooter111'>卡单优先</view>
+        </view>
+        <view class="MenuRight">
+          <image src='../images/universalpic_indicator_right_white.png' class="Arrow" />
         </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"/>
+        <switch class="switch" color="#4CD964" checked="{{IsAutoSound}}" bindchange="switchSound" />
       </view>
       <view class='lineFooter'></view>
     </view>
@@ -242,64 +283,42 @@
     </view>
   </view>
 
-  <!-- 出题顺序 -->
-  <view wx:if="{{IsShowOrder}}" class="numberContainer FlexColumn" catchtap="getNull" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
-    <view class="numberContainerFooter1 FlexColumn">
-      <view class='lineFooter'></view>
-      <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">
-        <image src="../images/universalpic_sendtoback_gray_30x26.png" class='universalpic_sendtoback_gray_30x26' />
-        <view class='numberContainerFooter111'>挪到最后</view>
-      </view>      
-      <view class='lineFooter'></view>
-      
-      
-      <view class='numberContainerFooter107 FlexRow' catchtap='onShowFolder'>
-        <view class="MenuLeft FlexRow">
-        <image src="../images/universalpic_cardlist_gray_30x28.png" class='universalpic_cardlist_gray_30x28' />
-        <view class='numberContainerFooter111'>卡单优先</view>
-        </view>
-        <view class="MenuRight">
-        <image src='../images/universalpic_indicator_right_white.png' class="Arrow" />
-        </view>
-			</view>
-      <view class='lineFooter'></view>
-    </view>
-    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
-      <view>关闭</view>
-    </view>
-  </view>
-
   <!-- 卡单 -->
   <view wx:if="{{IsShowFolder}}" class="numberContainer FlexColumn" catchtap="getNull"
-  style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+    style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
     <view class='numberContainerFooter106 FlexColumn'>
       <view class="numberContainerFooter1061">按卡单优先出题</view>
-      <view class="numberContainerFooter1062">如果想改变任务量的出题顺序（如，早上练诗词，晚上练识字，睡前练单词，计算题集中在作业后等），首先利用卡单给题卡做分类，然后在这里选择优先出题的卡单。</view>
+      <view class="numberContainerFooter1062">如果想改变任务量的出题顺序（如，早上练诗词，晚上练识字，睡前练单词，计算题集中在作业后等），首先利用卡单给题卡做分类，然后在这里选择优先出题的卡单。
+      </view>
     </view>
     <scroll-view scroll-y="true" class="FolderList FlexColumn" style="height:{{Containnerheight-450}}rpx;">
-      <view class="FolderItem FlexRow" catchtap="setCurrentFolder" data-folderid='0' wx:if="{{FolderList[0].FolderID==0 && FolderList[0].Total>0}}">
+      <view class="FolderItem FlexRow" catchtap="setCurrentFolder" data-folderid='0'
+        wx:if="{{FolderList[0].FolderID==0 && FolderList[0].Total>0}}">
         <view class="FolderItem1">没有卡单的题卡</view>
         <view class="MenuRight FlexRow">
-          <view class="FolderItem2 FolderItem1">{{FolderList[0].Total}}张</view>  
+          <view class="FolderItem2 FolderItem1">{{FolderList[0].Total}}张</view>
           <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-			  </view>
+        </view>
       </view>
       <view class="FolderTitle" wx:if="{{FolderListLength>1 || FolderList[0].FolderID>0}}">任务量里包含以下卡单可优先出题</view>
-      <view class="FolderTitle" wx:if="{{(FolderListLength==1 && FolderList[0].FolderID==0) || (FolderListLength==0)}}">当前任务量里没有可优先的卡单</view>
-      <view class="FolderItem0 FolderItem FlexRow" wx:for="{{FolderList}}" catchtap="setCurrentFolder" data-folderid='{{item.FolderID}}'
-       wx:key="*this" wx:if="{{item.FolderID!=0 && item.Total!=0}}">
+      <view class="FolderTitle" wx:if="{{(FolderListLength==1 && FolderList[0].FolderID==0) || (FolderListLength==0)}}">
+        当前任务量里没有可优先的卡单</view>
+      <view class="FolderItem0 FolderItem FlexRow" wx:for="{{FolderList}}" catchtap="setCurrentFolder"
+        data-folderid='{{item.FolderID}}' wx:key="*this" wx:if="{{item.FolderID!=0 && item.Total!=0}}">
         <view class="FolderItem1">{{item.FolderName}}</view>
         <view class="MenuRight FlexRow">
-          <view class="FolderItem2 FolderItem1">{{item.Total}}张</view>  
+          <view class="FolderItem2 FolderItem1">{{item.Total}}张</view>
           <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-			  </view>
+        </view>
       </view>
       <block wx:if="{{IsFinallyCount && IsFinallyCount>0}}">
         <view class="FolderTitle">提醒：有 {{IsFinallyCount}} 张题卡挪到最后练习</view>
         <view class="FolderTitle2">中途退出练习，以上信息均会更新，「挪到最后」不会保留。</view>
       </block>
-      <view class="FolderTitle" wx:if="{{IsFinallyCount && IsFinallyCount>0 && FolderList[0].FolderID==0 && FolderList[0].Total==0}}">点「关闭」练完它们</view>
-      
+      <view class="FolderTitle"
+        wx:if="{{IsFinallyCount && IsFinallyCount>0 && FolderList[0].FolderID==0 && FolderList[0].Total==0}}">点「关闭」练完它们
+      </view>
+
       <view style="height:60rpx"></view>
     </scroll-view>
     <view class='numberContainerFooter105 FlexRow' style="background-color:{{Color.BackColor}};">
@@ -307,9 +326,10 @@
         <view class="numberContainerFooter10511">每次练习都要选</view>
         <view class="numberContainerFooter10512">开始练习时，只要任务量里有卡单就自动开启本功能</view>
       </view>
-      <switch class="switch" checked="{{IsFolderPractice}}" bindchange="saveIsFolderPractice"/>
+      <switch class="switch" checked="{{IsFolderPractice}}" bindchange="saveIsFolderPractice" />
     </view>
-    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'  style="background-color:{{Color.BackColor}};z-index:50;">
+    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'
+      style="background-color:{{Color.BackColor}};z-index:50;">
       <view>关闭</view>
     </view>
   </view>

pages/main/detail.wxss

@@ -35,8 +35,8 @@ page{
   border-radius: 50%;
 }
 
-.universalpic_4blocks_gray_28x28{
-  width: 28rpx;
+.universalpic_light_gray_20x28{
+  width: 20rpx;
   height: 28rpx;
 }
 .universalpic_undo_white_30p_26x20 {
@@ -47,9 +47,9 @@ page{
   width: 28rpx;
   height: 25rpx;
 }
-.universalpic_more_gray_32x8 {
-  width: 32rpx;
-  height: 8rpx;
+.universalpic_wrench_gray_26x26 {
+  width: 26rpx;
+  height: 26rpx;
 }
 
 .universalpic_edit_gray_25x25 {
@@ -185,6 +185,10 @@ page{
   height: 20rpx;
   margin: 68rpx 50rpx 0 50rpx;
 }
+.universalpic_4blocks_gray_28x28{
+  width: 28rpx;
+  height: 28rpx;
+}
 
 .panelField20 {
   width: 100%;
@@ -291,6 +295,7 @@ page{
   margin: 6rpx 0;
   border-radius: 20rpx;
   background-color: rgba(0,0,0,0.1);
+  position: relative;
 }
 
 .panelItem .imageFree {
@@ -298,17 +303,32 @@ page{
   border-radius: 6rpx;
 }
 
-
 .panelItem .imageContainer2 {
   width: 650rpx;
   border-radius: 10rpx;
   background-color: rgba(0,0,0,0.1);
+  position: relative;
 }
 .panelItem .imageFree2 {
   width: 650rpx;
   border-radius: 10rpx;
 }
 
+
+.panelItem .BishunPlay{
+  width:80rpx;
+  height:80rpx;
+  background-color: #9B9B9B;
+  color:#fff;
+  position: absolute;
+  bottom:0;
+  right:0;
+  z-index: 10;
+  font-size:28rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+
 .panelItem .textBr {
   width: 100%;
   height: 24rpx;
@@ -353,20 +373,25 @@ page{
   text-align: center;
   line-height: 140rpx;
   z-index: 15;
+  position: relative;
+  top:0;
+  left:0;
+  overflow: hidden;
 }
 
 .panelFooter0 {
   line-height: 40rpx;
 }
 
-.panelBottomAnswer0 {
-  width: 100%;
-  height: 20rpx;
-  z-index: 10;
+.panelBottomAnswer {
+  width: 1420rpx;
+  position: relative;
+  top:0;
+  left:355rpx;
 }
 
-.panelBottomAnswer {
-  width: 100%;
+.panelBottomAnswer0{
+  width: 710rpx;
   font-size: 28rpx;
   justify-content: space-between;
   z-index: 10;
@@ -385,6 +410,12 @@ page{
   justify-content: flex-start;
   height: 140rpx;
 }
+.Answer00 {
+  flex: 1;
+  font-size: 24rpx;
+  height: 140rpx;
+  color:#D2D2D2;
+}
 
 .AnswerLeft{
   border-top-left-radius: 20rpx;
@@ -396,7 +427,6 @@ page{
   border-bottom-right-radius: 20rpx;
   width:110rpx;
   font-size: 24rpx;
-  justify-content: flex-start;
   height: 140rpx;
 }
 
@@ -405,6 +435,11 @@ page{
   height:70rpx;
   background-color: #2D313E;
 }
+.line3{
+  width:2rpx;
+  height:30rpx;
+  background-color: #2D313E;
+}
 
 .AnswerHover{
   background-color: #262935;
@@ -532,6 +567,11 @@ page{
   margin: 0 20rpx 0 30rpx;
 }
 
+ .universalpic_close_gray_24x24{
+  width: 24rpx;
+  height: 24rpx;
+ }
+
 .numberContainer {
   width: 100%;
   justify-content: flex-start;
@@ -682,12 +722,6 @@ page{
   margin: 0 30rpx;
 }
 
-.universalpic_typesize_gray_30x18{
-  width: 30rpx; 
-  height: 18rpx;
-  margin: 57rpx 20rpx 0 30rpx;
-}
-
 .numberContainerFooter11{
   align-items: flex-start;
   margin-top: 40rpx;
@@ -710,21 +744,6 @@ page{
   justify-content: flex-start;
 }
 
-.numberContainerFooter1121{
-  width:108rpx;
-  line-height:73rpx;
-  border:3rpx solid #D2D2D2;
-  border-radius: 10rpx;
-  text-align: center;
-  margin: 30rpx 30rpx 0 0;
-  font-size:24rpx;
-}
-
-.numberContainerFooter1121Select{
-  border:3rpx solid #F1AB1E;
-  color:#F1AB1E
-}
-
 .switch{
   position: absolute;
   right:30rpx;
@@ -847,4 +866,25 @@ page{
   margin: 4rpx 0 0 50rpx;
   font-size:20rpx;
   color:rgba(255, 255, 255, 0.6);
-}
+}
+
+.universalpic_typesize_gray_30x18{ 
+  width: 30rpx;  
+  height: 18rpx; 
+  margin: 57rpx 20rpx 0 30rpx; 
+} 
+ 
+.numberContainerFooter1121{ 
+  width:108rpx; 
+  line-height:73rpx; 
+  border:3rpx solid #D2D2D2; 
+  border-radius: 10rpx; 
+  text-align: center; 
+  margin: 30rpx 30rpx 0 0; 
+  font-size:24rpx; 
+} 
+ 
+.numberContainerFooter1121Select{ 
+  border:3rpx solid #F1AB1E; 
+  color:#F1AB1E 
+} 

pages/main/health.js

@@ -0,0 +1,35 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  goto: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  getList:function(e){
+    var dataType=e.currentTarget.dataset.datatype;
+    wx.navigateTo({
+      url: '../main/mainlist?source=health&dataType='+dataType,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/health.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "题卡健康",
+  "backgroundColor": "#F2F2F2"
+}

pages/main/health.wxss

@@ -0,0 +1,132 @@
+.container{
+  background-color: #F2F2F2;
+}
+
+.panelTop{
+  width:100%;
+  background-color: #F2F9DF;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.text1{
+  font-size:32rpx;
+  color:#1E1E1E;
+  margin:60rpx 0 0 30rpx;
+}
+
+.text2{
+  font-size:20rpx;
+  color:#4D4D4D;
+  width:690rpx;
+  margin:20rpx 0 60rpx 30rpx;
+  line-height: 24rpx;
+}
+
+.panelTitle{
+  background-color: inherit;
+}
+
+.panelTitle1{
+  margin:60rpx 0 0 30rpx;
+  font-size:32rpx;
+}
+
+.panelItem{
+  width:710rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin-top:30rpx;
+  justify-content: flex-start;
+}
+.panelItem1{
+  width:100%;
+  height:102rpx;
+  background-color: #AAED89;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  justify-content: space-between;
+}
+.panelItem11{
+  margin: 0 30rpx;
+  font-size:30rpx;
+}
+
+.panelItem2{
+  font-size: 20rpx;
+  color:#4D4D4D;
+  width:650rpx;
+  margin-top:30rpx;
+}
+.btn{
+  font-size: 28rpx;
+  text-align: center;
+  background-color: #fff;
+  width:650rpx;
+  line-height: 80rpx;
+  border-radius: 10rpx;
+  border:2rpx solid #D2D2D2;
+  margin:40rpx 0 50rpx 0;
+}
+.btn2{
+  margin:30rpx 0 30rpx 0;
+}
+
+.help1{
+  width:100%;
+  justify-content: space-between;
+  height: 131rpx;
+}
+
+.help11{
+  align-items: flex-start;
+  margin-left: 30rpx;
+}
+.universalpic_light_blue_70x70{
+  width:70rpx;
+  height:70rpx;
+  margin: 0 0 0 30rpx;
+}
+
+.help111{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.help112{
+  font-size:20rpx;
+  color:#787878;
+  margin-top:4rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+.panelItem3{
+  width:100%;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  height:20rpx;
+}
+
+.panelFooter{
+  width:100%;
+  background-color: #fff;
+  margin-top: 60rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.card_index_laboratory_70x76{
+  width:70rpx;
+  height:76rpx;
+  margin:60rpx 0 30rpx 30rpx;
+}
+
+.panelFooter1{
+  width: 690rpx;
+  font-size:20rpx;
+  margin:0 0 60rpx 30rpx;
+}

pages/main/mainlist.js

@@ -76,8 +76,48 @@ Page({
     if (options.Count)
       count = options.Count;
 
+    if (options.source=="health"){
+      that.setData({
+        Source:options.source,
+      });
+      wx.setNavigationBarTitle({
+        title: options.dataType
+      });
+      if (options.dataType == "最近练完") {
+        that.gotoList({currentTarget:{dataset:{type:"today"}}});
+        IsToday = 2;
+      }
+      else if (options.dataType == "已到期") {
+        that.gotoList({currentTarget:{dataset:{type:"limit0"}}});
+        IsToday = 4;
+        that.setData({
+          CardShowDetail: 2,
+        });
+      }
+      else if (options.dataType == "答题时间极短") {
+        that.gotoList({currentTarget:{dataset:{type:"TimeShort7"}}});
+        IsToday = 5;
+        that.setData({
+          CardShowDetail: 3,
+        });
+      }
+      else if (options.dataType == "多次点蓝") {
+        that.gotoList({currentTarget:{dataset:{type:"ClickBlue7"}}});
+        IsToday = 6;
+        that.setData({
+          CardShowDetail: 3,
+        });
+      }
+      else if (options.dataType == "多次搁置") {
+        that.gotoList({currentTarget:{dataset:{type:"ClickShelve7"}}});
+        IsToday = 7;
+        that.setData({
+          CardShowDetail: 3,
+        });
+      }
+    }
     //如果是搜索
-    if (options.search) {
+    else if (options.search) {
       Search = options.search;
       wx.setNavigationBarTitle({
         title: "搜索结果"
@@ -293,7 +333,7 @@ Page({
       item.CardTypeStr = constant1.arrStudyPattern[item.CardType];
     }
 
-    if (!that.data.IsToday && !that.data.PrintID && !that.data.Search && that.data.CardType != "-2" && !that.data.FolderID) {
+    if (!that.data.IsToday && !that.data.PrintID && !that.data.Search && that.data.CardType != "-2" && !that.data.FolderID && !that.data.Source) {
       main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID + "&CardType=" + that.data.CardType + "&IsCollect=" + that.data.IsCollect+"&OrderType="+that.data.OrderType, function (data) {
         if (data) {
           that.setData({
@@ -315,7 +355,7 @@ Page({
           }
         }
       });
-    } else if (that.data.Search || that.data.FolderID > 0) {
+    } else if (that.data.Search || that.data.FolderID > 0 || that.data.Source) {
       var hasPage = false;
       if (list.length < that.data.Count)
         hasPage = true;
@@ -323,7 +363,7 @@ Page({
         List: list,
         HasPage: hasPage,
       });
-    } else if (that.data.CardType != -2) {
+    } else if (that.data.CardType != -2 && !that.data.Source) {
       that.setData({
         Count: list.length,
       });
@@ -353,7 +393,7 @@ Page({
     that.setData({
       CardShowDetailStr: strCardShowDetail,
     });
-
+    
     wx.hideLoading();
 
     function getImage(str) {
@@ -438,6 +478,9 @@ Page({
     if (e.currentTarget.dataset.folderid)
       url += "&FolderID="+e.currentTarget.dataset.folderid;
     
+    if (e.currentTarget.dataset.dayNumber)
+      url += "&DayNumber="+e.currentTarget.dataset.dayNumber;
+    
     
 
     main.getData(url, function (data) {
@@ -466,6 +509,12 @@ Page({
         }
 
         that.getFilter();
+
+        if (that.data.Source=="health"){
+          setTimeout(function(){
+            that.setBtnInfo(e.currentTarget.dataset.datatype,data.Count);
+          },500);
+        }
       }
     });
 
@@ -641,6 +690,201 @@ Page({
       });
     }
   },
+  gotoList:function(e){
+    var that=this;
+    var datatype=e.currentTarget.dataset.type;
+    var isToday=0,cardType=2,isCollect=0,folderID=0,dayNumber=7;
+    
+    if (datatype=="today"){
+      isToday=2;
+    }
+    else if (datatype=="yesterday"){
+      isToday=3;
+    }
+    else if (datatype=="limit0"){
+      cardType=0;
+      isToday=4;
+      that.setData({
+        OrderType:5,
+      });
+    }
+    else if (datatype=="limit1"){
+      cardType=1;
+      isToday=4;
+      that.setData({
+        OrderType:5,
+      });
+    }
+    else{
+      if (datatype.indexOf("7")>0)
+        dayNumber=7;
+      else if (datatype.indexOf("30")>0)
+        dayNumber=30;
+      
+      if (datatype.indexOf("TimeShort")>=0)
+        isToday=5;
+      else if (datatype.indexOf("ClickBlue")>=0)
+        isToday=6;
+      else if (datatype.indexOf("ClickShelve")>=0)
+        isToday=7;
+        
+      cardType=2;
+      that.setData({
+        OrderType:0,
+      });
+    }
+    
+    app.globalData.CardList = [];
+
+    that.gotoNextPage({
+      currentTarget: {
+        dataset: {
+          id: 0,
+          IsToday:isToday,
+          cardtype: cardType,
+          iscollect: isCollect,
+          folderid: folderID,
+          datatype:datatype,
+          dayNumber:dayNumber,
+        }
+      }
+    });
+  },
+  setBtnInfo:function(datatype,count){
+    var that=this;
+    if (datatype=="today"){
+      that.setData({
+        Btn1Name:"今日",
+        Btn1Type:"today",
+        Btn2Name:"上次",
+        Btn2Type:"yesterday",
+        Btn1Count: count,
+        Btn2Count: "",
+        Btn1Class: "btn2",
+        Btn2Class: "",
+        CardShowDetail: 3,
+        HasPage: false,
+      });
+    }
+    else if (datatype=="yesterday"){
+      that.setData({
+        Btn1Name:"今日",
+        Btn1Type:"today",
+        Btn2Name:"上次",
+        Btn2Type:"yesterday",
+        Btn1Count: "",
+        Btn2Count: count,
+        Btn1Class: "",
+        Btn2Class: "btn2",
+        CardShowDetail: 3,
+        HasPage: false,
+      });
+    }
+    else if (datatype=="limit0"){
+      that.setData({
+        Btn1Name:"日常",
+        Btn1Type:"limit0",
+        Btn2Name:"紧急",
+        Btn2Type:"limit1",
+        Btn1Count: count,
+        Btn2Count: "",
+        Btn1Class: "btn2",
+        Btn2Class: "",
+        CardShowDetail: 2,
+      });
+    }
+    else if (datatype=="limit1"){
+      that.setData({
+        Btn1Name:"日常",
+        Btn1Type:"limit0",
+        Btn2Name:"紧急",
+        Btn2Type:"limit1",
+        Btn1Count: "",
+        Btn2Count: count,
+        Btn1Class: "",
+        Btn2Class: "btn2",
+        CardShowDetail: 2,
+      });
+    }
+    else if (datatype=="TimeShort7"){
+      that.setData({
+        Btn1Name:"近7天",
+        Btn1Type:"TimeShort7",
+        Btn2Name:"近30天",
+        Btn2Type:"TimeShort30",
+        Btn1Count: count,
+        Btn2Count: "",
+        Btn1Class: "btn2",
+        Btn2Class: "",
+        CardShowDetail: 3,
+      });
+    }
+    else if (datatype=="TimeShort30"){
+      that.setData({
+        Btn1Name:"近7天",
+        Btn1Type:"TimeShort7",
+        Btn2Name:"近30天",
+        Btn2Type:"TimeShort30",
+        Btn1Count: "",
+        Btn2Count: count,
+        Btn1Class: "",
+        Btn2Class: "btn2",
+        CardShowDetail: 3,
+      });
+    }
+    else if (datatype=="ClickBlue7"){
+      that.setData({
+        Btn1Name:"近7天",
+        Btn1Type:"ClickBlue7",
+        Btn2Name:"近30天",
+        Btn2Type:"ClickBlue30",
+        Btn1Count: count,
+        Btn2Count: "",
+        Btn1Class: "btn2",
+        Btn2Class: "",
+        CardShowDetail: 3,
+      });
+    }
+    else if (datatype=="ClickBlue30"){
+      that.setData({
+        Btn1Name:"近7天",
+        Btn1Type:"ClickBlue7",
+        Btn2Name:"近30天",
+        Btn2Type:"ClickBlue30",
+        Btn1Count: "",
+        Btn2Count: count,
+        Btn1Class: "",
+        Btn2Class: "btn2",
+        CardShowDetail: 3,
+      });
+    }
+    else if (datatype=="ClickShelve7"){
+      that.setData({
+        Btn1Name:"近7天",
+        Btn1Type:"ClickShelve7",
+        Btn2Name:"近30天",
+        Btn2Type:"ClickShelve30",
+        Btn1Count: count,
+        Btn2Count: "",
+        Btn1Class: "btn2",
+        Btn2Class: "",
+        CardShowDetail: 3,
+      });
+    }
+    else if (datatype=="ClickShelve30"){
+      that.setData({
+        Btn1Name:"近7天",
+        Btn1Type:"ClickShelve7",
+        Btn2Name:"近30天",
+        Btn2Type:"ClickShelve30",
+        Btn1Count: "",
+        Btn2Count: count,
+        Btn1Class: "",
+        Btn2Class: "btn2",
+        CardShowDetail: 3,
+      });
+    }
+  },
   showOrder: function () {
     this.setData({
       IsOrder: true,

pages/main/mainlist.wxml

@@ -14,7 +14,17 @@
         </view>
       </view>
     </view>
-    <view class="panelTop FlexRow">
+
+    <view class="panelTop FlexRow" wx:if="{{Source=='health'}}">
+      <view class="panelLeft FlexRow">
+        <view class="{{Btn1Class}} btn" bindtap="gotoList" data-type="{{Btn1Type}}">{{Btn1Name}} {{Btn1Count}}</view>
+        <view class="{{Btn2Class}} btn" bindtap="gotoList" data-type="{{Btn2Type}}">{{Btn2Name}} {{Btn2Count}}</view>
+      </view>
+      <view></view>
+    </view>
+        
+
+    <view class="panelTop FlexRow" wx:if="{{Source!='health'}}">
       <view class="panelLeft FlexRow">
         <view wx:if="{{!IsFilter && !PrintID && (CardType==2 || CardType==0 || CardType==1 || CardType==-1 || IsCollect==1) && !Search && IsToday!=1 && IsToday!=2}}"
           class='panelTop1 FlexRow' bindtap='redirect' data-url="searchCard?">
@@ -66,12 +76,12 @@
     </view>
   </block>
 
-  <view class="panelHelp FlexRow" wx:if="{{(OrderType==5 || OrderType==6) && PageType!=1 && PageType!=2 }}">
+  <view class="panelHelp FlexRow" wx:if="{{(OrderType==5 || OrderType==6) && PageType!=1 && PageType!=2 && !Source }}">
     <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
     <text
       class="panelHelpText">在本清单中用「到期时间」排序时，您的题卡数量可能变少。由于题卡归档后不被练习没有到期时间概念，所以不能以到期时间排序，去除归档题卡总数就减少了。日常和紧急题卡不受影响，可以正常排序。</text>
   </view>
-  <view class="panelHelp1 panelHelp FlexRow" wx:if="{{CardType==1}}">
+  <view class="panelHelp1 panelHelp FlexRow" wx:if="{{CardType==1 && !IsToday}}">
     <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_infor_green_40x40.png' />
     <text class="panelHelpText">紧急练习最多容纳200张题卡，属于临时强化措施不能取代日常练习，一般练习1个月建议停用或者更换一批题卡。经常使用请常换常新。</text>
   </view>
@@ -160,20 +170,26 @@
 
     </block>
     <view class="panelMore" wx:if="{{HasPage}}" bindtap='gotoNextPage' data-id="{{List[List.length-1].MiaoguoCardID}}"
-      data-iscollect="{{IsCollect}}" data-folderid="{{FolderID}}">更多</view>
+      data-iscollect="{{IsCollect}}" data-folderid="{{FolderID}}" data-istoday="{{IsToday}}">更多</view>
     <view class="panelEnd" wx:if="{{!HasPage && List.length>0}}">到底了</view>
   </view>
 
   <view wx:if="{{List.length==0}}" class="panelNull FlexColumn">
     <image class="universalpic_card_none_gray_90x84" src='../images/universalpic_card_none_gray_90x84.png' />
-    <text wx:if="{{IsCollect==0 && CardType==2 && IsToday==0}}" class="panelNullText">没有题卡\n创建一张新题卡吧</text>
     <text wx:if="{{IsCollect==0 && CardType==0 && IsToday==0}}" class="panelNullText">没有题卡\n新建一张日常题卡吧</text>
     <text wx:if="{{IsCollect==0 && CardType==1 && IsToday==0}}" class="panelNullText">没有题卡\n新建一张紧急题卡吧</text>
     <text wx:if="{{IsCollect==1 && IsToday==0}}" class="panelNullText">没有题卡\n试试给题卡加注星标吧</text>
     <text wx:if="{{IsCollect==0 && CardType==-1 && IsToday==0}}" class="panelNullText">没有题卡\n把不需要练习的题卡归档吧</text>
     <text wx:if="{{CardType==-2}}" class="panelNullText">没有题卡\n不再需要的知识就删除吧</text>
     <text wx:if="{{IsToday==1}}" class="panelNullText">没有题卡\n很棒啊！今天的任务量已经完成了</text>
+    <text wx:if="{{IsCollect==0 && CardType==2 && IsToday==0 && !Source}}" class="panelNullText">没有题卡\n创建一张新题卡吧</text>
     <text wx:if="{{IsToday==2}}" class="panelNullText">没有题卡\n今天的练习还没开始呢</text>
+    <text wx:if="{{IsToday==3}}" class="panelNullText">没有题卡\n上次的练习数据没有</text>
+    <text wx:if="{{IsToday==4}}" class="panelNullText"><block wx-if="{{Btn1Class}}">{{Btn1Name}}</block><block wx-if="{{Btn2Class}}">{{Btn2Name}}</block>\n没有已到期的题卡</text>
+    <text wx:if="{{IsToday==5}}" class="panelNullText"><block wx-if="{{Btn1Class}}">{{Btn1Name}}</block><block wx-if="{{Btn2Class}}">{{Btn2Name}}</block>\n没有练习时间极短的题卡</text>
+    <text wx:if="{{IsToday==6}}" class="panelNullText"><block wx-if="{{Btn1Class}}">{{Btn1Name}}</block><block wx-if="{{Btn2Class}}">{{Btn2Name}}</block>\n没有记忆评价多次点蓝的题卡</text>
+    <text wx:if="{{IsToday==7}}" class="panelNullText"><block wx-if="{{Btn1Class}}">{{Btn1Name}}</block><block wx-if="{{Btn2Class}}">{{Btn2Name}}</block>\n没有练习中多次搁置的题卡</text>
+    
   </view>
 </view>
 

pages/main/mainlist.wxss

@@ -26,6 +26,24 @@
   justify-content: flex-end;
 }
 
+.btn{
+  min-width:100rpx;
+  height:60rpx;
+  text-align: center;
+  line-height: 60rpx;
+  border-radius: 10rpx;
+  font-size:24rpx;
+  border:2rpx solid #E3E3E3;
+  margin-right: 20rpx;
+  padding:0 20rpx;
+}
+
+.btn2{
+  border:2rpx solid #5282FA;
+  color:#fff;
+  background-color: #5282FA;
+}
+
 .panelTopSearch{
   width:600rpx;
   height:70rpx;

pages/main/preview.js

@@ -206,6 +206,7 @@ Page({
         card.CardType = list[i].CardType;
         card.FolderName=list[i].FolderName;
         card.Flag=list[i].Flag;
+        card.LearnNumber=list[i].LearnNumber;
         index=i+1;
         break;
       }
@@ -276,6 +277,7 @@ Page({
       FolderName:card.FolderName,
       Flag:card.Flag,
       CurrentIndex:index,
+      LearnNumber:card.LearnNumber,
     });
 
     wx.pageScrollTo({
@@ -557,10 +559,18 @@ Page({
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
     if (name && name.length > 5) {
-      wx.previewImage({
-        current: name,
-        urls: arrImage
-      });
+      if (name.indexOf("http://tmp")>=0){
+        wx.previewImage({
+          current: name,
+          urls: [name],
+        });
+      }
+      else{
+        wx.previewImage({
+          current: name,
+          urls: arrImage
+        });
+      }
     }
   },
   onBindError: function (e) {
@@ -590,6 +600,19 @@ Page({
       that.init();
     }, 1000);
   },
+  showBishunOrKaiti:function(e){
+    var that=this;
+    main.downloadBishunKaitiImage(
+      e.currentTarget.dataset.url,
+      e.currentTarget.dataset.serverurl,
+      e.currentTarget.dataset.type,
+      that.data.Field,function(fields){
+        that.data.Field=fields;
+        that.setData({
+          Field: that.data.Field,
+        });
+      });
+  },
   returnDefault: function () {
     wx.reLaunch({
       url: './default?IsStart=1',

pages/main/preview.wxml

@@ -4,27 +4,28 @@
   <!-- 顶端工具栏 -->
   <block wx:if="{{ShowType=='show' &&  Flag!=-1}}">
     <view class="panelTop FlexRow">
+      
       <view class='left FlexRow'>
         <view class="panelTopBtn FlexRow" catchtap='editField' data-type="{{PrintID}}">
           编辑
         </view>
-        <view class="panelTopBtn">
-        </view>
-      </view>
-      <block wx:if="{{!PrintID}}">
-        <view class="FlexRow" wx:if="{{IsCardInfoCloseMenu}}" catchtap="openIsCardInfoCloseMenu" >
-        <view>快捷操作</view>
-        <image class="universalpic_arrow_up_black_14x10" src='../images/universalpic_arrow_down_black_14x10.png' wx:if="{{true}}" />
-      </view>
-      <view class="FlexRow" wx:if="{{!IsCardInfoCloseMenu}}" catchtap="closeIsCardInfoCloseMenu">
-        <view>信息收起</view>
-        <image class="universalpic_arrow_up_black_14x10" src='../images/universalpic_arrow_up_black_14x10.png' wx:if="{{true}}" />
+        <block wx:if="{{!PrintID}}">
+          <view class="panelTopBtn4 panelTopBtn FlexRow" wx:if="{{IsCardInfoCloseMenu}}" catchtap="openIsCardInfoCloseMenu" >
+          <view>快捷设置</view>
+          <image class="universalpic_arrow_up_black_14x10" src='../images/universalpic_arrow_down_black_14x10.png' wx:if="{{true}}" />
+          </view>
+          <view class="panelTopBtn4 panelTopBtn FlexRow" wx:if="{{!IsCardInfoCloseMenu}}" catchtap="closeIsCardInfoCloseMenu">
+            <view>信息收起</view>
+            <image class="universalpic_arrow_up_black_14x10" src='../images/universalpic_arrow_up_black_14x10.png' wx:if="{{true}}" />
+          </view>
+        </block>
       </view>
-      </block>
-      
-      
       <view class='right FlexRow'>
-       <view class="panelTopBtn FlexRow" catchtap='gotoCollect'>
+        <view class="panelTopBtn3 FlexRow" catchtap='goto' data-url="./cardInfoDetail?id={{MiaoguoCardID}}">
+          <view class="panelTopBtn31">练习记录</view>
+          <view class="panelTopBtnNumber" wx:if="{{LearnNumber>0}}">{{LearnNumber}}</view>
+        </view>
+        <view class="panelTopBtn FlexRow" catchtap='gotoCollect'>
           <image class="universalpic_star_black_34x34" src='../images/universalpic_star_black_34x34.png' wx:if="{{!IsCollect}}" />
           <image class="universalpic_star_black_34x34" src='../images/universalpic_star_yellow_34x34.png' wx:if="{{IsCollect}}" />
         </view>
@@ -68,14 +69,6 @@
           <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
         </view>
       </block>
-      
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth720"></view>
-      </view>
-      <view class="panelTop2Item FlexRow" catchtap="goto" data-url="./cardInfo?id={{MiaoguoCardID}}">
-        <view class="panelTop2Item1">题卡详细信息</view>
-        <image class="Arrow" src='../images/universalpic_indicator_right_gray.png' />
-      </view>
     </view>
   </block>
   <view style="width:100%;min-height:{{Containnerheight-250}}rpx;" bindtap="onShowAnswer">
@@ -115,7 +108,7 @@
 
 <!-- 菜单 -->
 <view wx:if="{{IsShowMenu}}" class="panelMenu container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight}}rpx;'>
-	
+	<view class="panelMenu12 panelMenu1" catchtap="goto" data-url="./cardInfo?id={{MiaoguoCardID}}">题卡详细信息</view>
 	<view class="panelMenu12 panelMenu1" wx:if="{{!IsClickShowAnswer}}" catchtap="setClickShowAnswer">点击卡面显示段落2、3</view>
 	<view class="panelMenu12 panelMenu1" wx:if="{{IsClickShowAnswer}}" catchtap="setAlwaysShowAnswer">同时显示段落1、2、3</view>
 	<view class="panelMenu11 panelMenu1" catchtap="deleteCard">删除题卡</view>

pages/main/preview.wxss

@@ -33,7 +33,7 @@
 }
 
 .panelTopBtn{
-  width:90rpx;
+  width:80rpx;
   height:80rpx;
   font-size: 28rpx;
   margin:0 10rpx;
@@ -43,6 +43,34 @@
   margin-left:0;
 }
 
+.panelTopBtn3{
+  width:140rpx;
+  height:80rpx;
+  position: relative;
+}
+.panelTopBtn31{
+  font-size: 28rpx;
+}
+
+.panelTopBtnNumber{
+  text-align: center;
+  background-color: #e3e3e3;
+  border-radius: 12rpx;
+  font-size: 20rpx;
+  font-family: "Roboto-Black";
+  position: absolute;
+  right:0rpx;
+  top:0rpx;
+  padding: 0 10rpx;
+  height:24rpx;
+  line-height: 24rpx;
+}
+
+.panelTopBtn4{
+  width:160rpx;
+}
+
+
 .universalpic_del_black_20x28{
   width:20rpx;
   height:28rpx;
@@ -289,6 +317,7 @@
   margin: 6rpx 0;
   border-radius: 20rpx;
   background-color: rgba(0,0,0,0.1);
+  position: relative;
 }
 
 .panelItem .imageFree {
@@ -301,12 +330,27 @@
   width: 650rpx;
   border-radius: 10rpx;
   background-color: rgba(0,0,0,0.1);
+  position: relative;
 }
 .panelItem .imageFree2 {
   width: 650rpx;
   border-radius: 10rpx;
 }
 
+.panelItem .BishunPlay{
+  width:80rpx;
+  height:80rpx;
+  background-color: #9B9B9B;
+  color:#fff;
+  position: absolute;
+  bottom:0;
+  right:0;
+  z-index: 10;
+  font-size:28rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
+
 .panelItem .textBr {
   width: 100%;
   height: 24rpx;
@@ -465,4 +509,5 @@
 .iphone10plusMenu{
   width:100%;
   height:200rpx;
-}
+}
+

pages/other/help.js

@@ -15,7 +15,7 @@ Page({
     id=options.id;
     idchild=options.idchild;
 
-    that.init(function(list){
+    that.init(options,function(list){
       that.setData({
         Containnerheight: main.getWindowHeight(),
         Item: list[options.id].List[options.idchild],
@@ -28,9 +28,11 @@ Page({
       });
     });
   },
-  init: function (callback) {
+  init: function (options,callback) {
     var that = this;
     var list = wx.getStorageSync("MiaoguoTipsList");
+    if (!list[options.id] || !list[options.id].List[options.idchild])
+      list=undefined;
     if (!list){
       main.getData("GetMiaoguoTipsList", function (data) {
         callback(data);

pages/other/help.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow">
-    <view class="btn" bindtap="goto" data-url="./tips">返回目录</view>
+    <view class="btn" bindtap="goto" data-url="./tips">返回</view>
   </view>
   <view style="height:120rpx;"></view>
   <image class="img" lazy-load="true" mode="widthFix" wx:for="{{Item.Images}}" wx:key="index" src='{{ImagePath}}web/{{item}}' />

pages/other/lessonlist.js

@@ -5,14 +5,14 @@ const app = getApp();
 
 Page({
   data: {
-    ImagePath: app.globalData.uploadImageUrl,
   },
-  onLoad: function () {
+  onLoad: function (options) {
     var that = this;
     that.setData({
       CheckListUserID: app.globalData.userInfo.UserID,
       Containnerheight: main.getWindowHeight(),
       UserID: app.globalData.userInfo.UserID,
+      ListType:options.listtype,
     });
 
     var userid = app.globalData.userInfo.UserID;
@@ -20,9 +20,38 @@ Page({
       if (data) {
         
         var arr=[];
-        for(var i=0;i<4;i++)
-          arr.push(data[i]);
+        if (that.data.ListType=="simple"){
+          arr.push(data[0]);
+          arr.push(data[1]);
+          
+          arr[0].Text="前言";
+          arr[1].Text="基本操作";
+          arr[1].Time="时长约10分钟";
 
+          arr[1].List[4]=data[1].List[2];
+          arr[1].List[3]=data[1].List[1];
+          arr[1].List[2]=data[1].List[0];
+          arr[1].List[0]=data[2].List[0];
+          arr[1].List[1]=data[2].List[1];
+          arr[1].List[4].Title="通过【检验】生成字词、古诗词、英语题卡";
+          arr[1].List[3].Title="通过【加资料】制作字词、古诗词、英语题卡";
+          arr[1].List[2].Title="制作任何知识点的普通题卡";
+
+          arr[1].List.splice(6,1);
+          arr[1].List.splice(5,1);
+          
+          wx.setNavigationBarTitle({
+            title: '简要版',
+          });
+        }
+        else{
+          wx.setNavigationBarTitle({
+            title: '完整版',
+          });
+          for(var i=0;i<4;i++)
+            arr.push(data[i]);
+        }
+        
         that.setData({
           List: arr,
         });
@@ -51,9 +80,15 @@ Page({
     }
   },
   onShareAppMessage: function () {
+    var title="完整版教学课程";
+    if (this.data.ListType=="simple"){
+      title="简要版教学课程";
+    }
+    var url=app.globalData.SharePath + '?type=lesson&LessonID=all&ListType='+this.data.ListType+'&UserID=' + app.globalData.userInfo.UserID;
+    console.log(url);
     return {
-      title: "教学课程",
-      path: app.globalData.SharePath + '?type=lesson&LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      title: title,
+      path: url,
       imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_lesson_a00.png",
     }
   },

pages/other/lessonlist.wxml

@@ -1,6 +1,4 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image class="trial_lesson_header" src='{{ImagePath}}web/trial_lesson_header.png' />
-
   <view class="main FlexColumn">
     <block wx:for="{{List}}" wx:key="index">
       <view class="panelTitle FlexRow" bindtap="gotoLesson" data-id="{{index+1}}">

pages/other/lessonlistselect.js

@@ -0,0 +1,29 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+  },
+  onLoad: function () {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  goto: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/lessonlistselect.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "课程",
+  "navigationBarBackgroundColor": "#009942",
+  "navigationBarTextStyle": "white",
+  "backgroundColorTop": "#009942"
+}

pages/other/lessonlistselect.wxml

@@ -0,0 +1,29 @@
+<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="trial_lesson_header" src='{{ImagePath}}web/trial_lesson_header.png' />
+
+  <view class="main FlexColumn">
+    <view class="panelItem FlexRow" bindtap="goto" data-url="./lessonlist?listtype=simple">
+      <view class='panelItem1 FlexColumn'>
+        <view class="panelTitle10">简要版</view>
+        <view class="panelTitle11">方便新用户快速上手</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+      </view>
+    </view>
+
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+
+    <view class="panelItem FlexRow" bindtap="goto" data-url="./lessonlist?listtype=all">
+      <view class='panelItem1 FlexColumn'>
+        <view class="panelTitle10">完整版</view>
+        <view class="panelTitle11">四节课时完整介绍产品功能</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+      </view>
+    </view>
+  </view>
+</view>

pages/other/lessonlistselect.wxss

@@ -0,0 +1,49 @@
+
+.trial_lesson_header{
+  width: 100%;
+  height:130rpx;
+}
+
+.main{
+  width: 100%;
+  margin-top: 50rpx;
+}
+
+.panelItem {
+  width: 100%;
+  height: 133rpx;
+  justify-content: space-between;
+  font-size: 28rpx;
+  background-color: #fff;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  align-items: flex-start;
+  font-weight: 400;
+  font-size:28rpx;
+}
+
+.panelTitle10{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.panelTitle11{
+  font-size:20rpx;
+  color:#787878;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #787878;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+

pages/other/userbook.wxml

@@ -65,7 +65,7 @@
       <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/webview?PageID=8" wx:if="{{ClassDayNumber>=ClassTotalDayNumber}}">
         <view>小组须知</view>
       </view>
-      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/lessonlist">
+      <view class="panel31 FlexColumn" bindtap="goto" data-url="../other/lessonlistselect">
         <view>课程</view>
       </view>
       <view class="panel31 FlexColumn" bindtap="goto" data-url="./tips">
@@ -162,7 +162,7 @@
       <view class="text10">{{item.text3}}</view>
     </view>
 
-    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/lessonlist">
+    <view class="panelItem FlexColumn" wx:if="{{PanelShow===2 && ((ClassDayNumber>=0 && ClassDayNumber<ClassTotalDayNumber) || (IsPay==1 && !IsLoseEfficacy)) }}" bindtap="goto" data-url="../other/lessonlistselect">
       <image class="news_lesson_a01" src='{{ImagePath}}web/news_lesson_a01.png' />
       <view class="text7">课程</view>
       <view class="text8">4节课程告诉您，家长做什么可以迅速提高孩子的成绩</view>

pages/other/webview.js

@@ -16,6 +16,7 @@ Page({
     }
     else{
       that.setData({
+        PageID:options.PageID,
         Url:"https://www.kylx365.com/webpage?PageID="+options.PageID,
       });
     }
@@ -25,6 +26,7 @@ Page({
   onShareAppMessage: function () {
     
     var imageUrl = app.globalData.uploadImageUrl +"web/program_screenshot_lesson_c0"+this.data.PageID+".png";
+    console.log(imageUrl);
     var path = "/pages/index/index?type=webview&PageID="+this.data.PageID;
     var title ="课外课";
     if (this.data.PageID==="0"){

pages/plan/pattern.wxml

@@ -71,7 +71,7 @@
       <view class="line"></view>
     </block>
   </block>
-  <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=2&idchild=0">
+  <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=1&idchild=2">
     <view class="panelItem31">帮助：记忆评价的作用</view>
     <view class="panelItem32 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -80,7 +80,7 @@
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=2&idchild=1">
+  <view class="panelItem3 panelItem FlexRow" bindtap="goto" data-url="../other/help?id=1&idchild=3">
     <view class="panelItem31">帮助：时间指标的作用</view>
     <view class="panelItem32 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />

pages/plan/studyplan.js

@@ -86,9 +86,19 @@ Page({
       });
     });
     var studyPlan = app.globalData.TaskToday;
-    var newLength=studyPlan.ListNew.length || 0;
-    var reviewLength=studyPlan.ListReview.length || 0;
-    var historyLength=studyPlan.ListHistory.length || 0;
+    
+    var newLength=0;
+    if (studyPlan.ListNew && studyPlan.ListNew.length>0)
+      newLength=studyPlan.ListNew.length;
+
+    var reviewLength=0;
+    if (studyPlan.ListReview && studyPlan.ListReview.length>0)
+      reviewLength=studyPlan.ListReview.length;
+
+    var historyLength=0;
+    if (studyPlan.ListHistory && studyPlan.ListHistory.length>0)
+      historyLength=studyPlan.ListHistory.length;
+
     var taskNumber = newLength + reviewLength + historyLength;
     var progress = 0;
     if (studyPlan.AlreadyPracticeNumber + taskNumber > 0)

pages/template/cardShow.wxml

@@ -32,6 +32,8 @@
 
       <view class="imageContainer FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
         <image class="imageFree" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+        <view class="BishunPlay FlexColumn" wx:if="{{ item.IsShowBishun }}" catchtap="showBishunOrKaiti" data-url="{{item.Content}}" data-serverurl="{{item.ContentServer}}" data-type="bishun">▶︎</view>
+        <view class="BishunPlay FlexColumn" wx:if="{{ item.IsShowKaiti }}" catchtap="showBishunOrKaiti" data-url="{{item.Content}}" data-serverurl="{{item.ContentServer}}" data-type="kaiti">■</view>
       </view>
       </block>
     </view>
@@ -85,6 +87,8 @@
           </view>
           <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
             <image class="imageFree2" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+            <view class="BishunPlay FlexColumn" wx:if="{{ item.IsShowBishun }}" catchtap="showBishunOrKaiti" data-url="{{item.Content}}" data-serverurl="{{item.ContentServer}}" data-type="bishun">▶︎</view>
+            <view class="BishunPlay FlexColumn" wx:if="{{ item.IsShowKaiti }}" catchtap="showBishunOrKaiti" data-url="{{item.Content}}" data-serverurl="{{item.ContentServer}}" data-type="kaiti">■</view>
           </view>
         </block>
       </view>

pages/test/index.js

@@ -57,7 +57,7 @@ Page({
       var name1=e.currentTarget.dataset.name1;
       url="./item?testtype=read&name1="+name1+"&name2=英文字母&bookid=100";
     }
-    else{
+    else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid){
       url="./list?name1="+e.currentTarget.dataset.name1+"&id="+e.currentTarget.dataset.bookid;
     }
     wx.navigateTo({

pages/test/item.js

@@ -49,6 +49,8 @@ Page({
       if (options.bookid<100){
         if (options.bookid>=25 && options.bookid<=42)
           that.initAncientPoetry(options);
+        else if (options.bookid>=43 && options.bookid<=60)
+          that.initCi(options);
         else
           that.init(options);
       }
@@ -88,6 +90,44 @@ Page({
       }
     });
   },
+  initCi: function (options) {
+    var that = this;
+    that.setData({
+      TaskInfo: {},
+      TestType: options.testtype,
+      TestName1: options.name1,
+      TestName2: options.name2,
+    });
+    main.getData('GetHanziUnitWords?UserID='+app.globalData.userInfo.UserID+'&UnitID='+options.unitsid+'&TestType='+options.testtype, function (data) {
+      if (data) {
+        TaskList = [];
+        var list = data;
+        for (var k = 0; k < list.length; k++) {
+          var taskInfo = list[k];
+          
+          taskInfo.TagWidth=140;
+          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,
+        });
+
+        common.getStorageValue(that, "TestAutioPlay", 1, function () { 
+          if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
+            that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+          }
+        });
+      }
+    });
+  },
   init2: function (options) {
     var that = this;
     var TestTask2=wx.getStorageSync("TestTask2");
@@ -259,17 +299,20 @@ Page({
     
     if (btnnumber>="0"){
       that.setSoundFile(0);
-      if (btnnumber==="4")
-        TaskList[that.data.CurrentIndex].Result = 1;
-      else if (btnnumber === "0")
-        TaskList[that.data.CurrentIndex].Result = -1;
-      else if (btnnumber === "1")
-        TaskList[that.data.CurrentIndex].Result = 0;
+      if (TaskList[that.data.CurrentIndex]){
+        if (btnnumber==="4")
+          TaskList[that.data.CurrentIndex].Result = 1;
+        else if (btnnumber === "0")
+          TaskList[that.data.CurrentIndex].Result = -1;
+        else if (btnnumber === "1")
+          TaskList[that.data.CurrentIndex].Result = 0;
+      }
+      
       that.data.CurrentIndex++;
     }
     else{
       that.setSoundFile(2);
-      if (TaskList[that.data.CurrentIndex].Result)
+      if (TaskList[that.data.CurrentIndex] && TaskList[that.data.CurrentIndex].Result)
         TaskList[that.data.CurrentIndex].Result=null;
       that.data.CurrentIndex--;
     }
@@ -314,7 +357,8 @@ Page({
       });
 
       if (that.data.TestAutioPlay == 1 && that.data.TestType == "read") {
-        that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
+        if (TaskList[that.data.CurrentIndex] && TaskList[that.data.CurrentIndex].ReadString)
+          that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
       }
     }
   },
@@ -409,7 +453,8 @@ Page({
         });
       }
       else {
-        this.audioCtx.pause();
+        if (this.audioCtx)
+          this.audioCtx.pause();
         if (innerAudioContext1)
           innerAudioContext1.stop();
         isPlaying = false;
@@ -484,6 +529,19 @@ Page({
       innerAudioContext1.stop();
     }
   },
+  showBishunOrKaiti:function(e){
+    var that=this;
+    main.downloadBishunKaitiImage(
+      e.currentTarget.dataset.url,
+      e.currentTarget.dataset.serverurl,
+      e.currentTarget.dataset.type,
+      that.data.TaskInfo.ContentNew.Field,function(fields){
+        that.data.TaskInfo.ContentNew.Field=fields;
+        that.setData({
+          TaskInfo: that.data.TaskInfo,
+        });
+      });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/test/item.wxss

@@ -272,6 +272,7 @@ page{
   margin: 6rpx 0;
   border-radius: 20rpx;
   background-color: rgba(0,0,0,0.1);
+  position: relative;
 }
 
 .panelItem .imageFree {
@@ -284,12 +285,25 @@ page{
   width: 650rpx;
   border-radius: 10rpx;
   background-color: rgba(0,0,0,0.1);
+  position: relative;
 }
 .panelItem .imageFree2 {
   width: 650rpx;
   border-radius: 10rpx;
 }
-
+.panelItem .BishunPlay{
+  width:80rpx;
+  height:80rpx;
+  background-color: #9B9B9B;
+  color:#fff;
+  position: absolute;
+  bottom:0;
+  right:0;
+  z-index: 10;
+  font-size:28rpx;
+  text-align: center;
+  line-height: 80rpx;
+}
 .panelItem .textBr {
   width: 100%;
   height: 24rpx;

pages/test/list.js

@@ -60,8 +60,13 @@ Page({
       fieldName2="";
       listType="english";
     }
-    else
+    else{
       arr = wx.getStorageSync("HanziAll");
+      fieldName="字";
+      if (that.data.BookID > 24){
+        fieldName="词";
+      }
+    }
     
     that.setData({
       ListType: listType,

pages/test/list.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-	<view class="text1" wx:if="{{ListType!='english'}}">请对照课本选择字组</view>
+	<view class="text1" wx:if="{{ListType!='english'}}">请对照课本选择字组或词组</view>
 	<view class="text1" wx:if="{{ListType=='english' && BookID>110 && BookID<120}}">将词汇等分成若干单元以便分批检验，分割方法并无特殊含义</view>
 	<view class="text1" wx:if="{{ListType=='english' && BookID>120 && BookID<130}}">词汇根据Lesson分组</view>
 	<view class="textNull" wx:if="{{ListType=='english' && ((BookID>130 && BookID<140) || (BookID>100 && BookID<110))}}"></view>
@@ -8,7 +8,7 @@
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
 			<view class="PanelItem1 FlexRow">
 				<view class="left FlexRow">
-					<view class="Word FlexRow" wx:if="{{ListType!='english'}}">
+					<view class="Word FlexRow" wx:if="{{ListType!='english' && (BookID<=24)}}">
 						<image class="img" src="{{ImagePath}}web/test/{{item.Words[0]}}.png" />
 					</view>
 					<view class="Title FlexRow">
@@ -22,7 +22,7 @@
 						<image wx:if="{{item.TestTypeWrite==1 && (BookID<=100 || BookID>110)}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
 						<image wx:if="{{!item.TestTypeWrite && (BookID<=100 || BookID>110)}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
 					</view>
-					<view class="right2">{{item.Words.length}}个<block wx:if="{{ListType=='english'}}">{{FieldName}}</block><block wx:if="{{ListType=='hanzi'}}">字</block></view>
+					<view class="right2">{{item.Words.length}}个{{FieldName}}</view>
 				</view>
 			</view>
 			<view class="lineWidthAll FlexRow" wx:if="{{ListType!='english'}}">
@@ -51,7 +51,7 @@
 			</view>
 			<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}}">
+				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-type="read" 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>
@@ -63,7 +63,7 @@
 				<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}}">
+				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-type="write" 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>

pages/test/wordlist.js

@@ -14,6 +14,8 @@ Page({
       ShowType:options.type,
     });
 
+    
+       
     var words=[];
     var unitsName="";
     var fieldName="";
@@ -21,9 +23,14 @@ Page({
     if (options.type=="CHN"){
       arr= wx.getStorageSync("HanziAll");
       fieldName="字";
+      var bookid=Number(options.unitsid);
+      
+      if (bookid>24 && bookid<100)
+        fieldName="词";
     }
     else{
       var bookid=Number(options.bookid);
+
       fieldName="单词";
       if (bookid>100 && bookid<110){
         arr= wx.getStorageSync("PhoneticEngList");
@@ -35,6 +42,7 @@ Page({
         arr= wx.getStorageSync("NewConceptEngList");
       else if (bookid>=130 && bookid<140)
         arr= wx.getStorageSync("CambridgeEngList");
+      
     }
     arr = JSON.parse(arr);
     var unitsid = Number(options.unitsid);

pages/test/wordlist.wxml

@@ -5,7 +5,7 @@
   </view>
   <view class="panelMain FlexColumn">
     <view class="panelMain1 FlexRow" wx:if="{{ShowType=='CHN'}}">
-      <view class="item" wx:for="{{Words}}" wx:key="index" >
+      <view class="item2" wx:for="{{Words}}" wx:key="index" >
       {{item}}
       </view>
     </view>

project.private.config.json

@@ -0,0 +1,85 @@
+{
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "id": 0,
+          "name": "分享",
+          "pathName": "pages/index/index",
+          "query": "UserID=1&type=share&MiaoguoCardID=71228",
+          "scene": null
+        },
+        {
+          "id": 1,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "type=activity&ActivityID=2&EndTime=2019年10月07日&EarlyBirdTimeStart=2019年09月23日&EarlyBirdTimeEnd=2019年10月05日",
+          "scene": 1007
+        },
+        {
+          "id": 3,
+          "name": "webview",
+          "pathName": "pages/other/webview",
+          "query": "UserID=1",
+          "scene": 1001
+        },
+        {
+          "id": 4,
+          "name": "pages/other/activity",
+          "pathName": "pages/other/activity",
+          "query": "EndTime=2019-09-01",
+          "scene": 1001
+        },
+        {
+          "id": 4,
+          "name": "pages/other/paycustom",
+          "pathName": "pages/other/paycustom",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 6,
+          "name": "用户手册",
+          "pathName": "pages/index/index",
+          "query": "type=userbook",
+          "scene": null
+        },
+        {
+          "id": 6,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "type=paycontinue&EndDate=2020-09-15",
+          "scene": null
+        },
+        {
+          "id": 7,
+          "name": "pages/test/index",
+          "pathName": "pages/test/index",
+          "query": "UserID=1",
+          "scene": null
+        },
+        {
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "type=lesson&LessonID=all&ListType=simple&UserID=1",
+          "scene": 1047
+        },
+        {
+          "name": "pages/other/newuser",
+          "pathName": "pages/other/newuser",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
+}

utils/constant.js

@@ -1,4 +1,16 @@
 module.exports = {
+  arrSoundError:[
+    {
+        Word: "藤蔓",
+        Sound: "藤蔓(wan4)",
+    }, {
+        Word: "呲牙",
+        Sound: "呲(ci1)牙",
+    }, {
+        Word: "呢(ne)",
+        Sound: "呢",
+    },
+  ],
   arrMenuText: [{
       Text1: "更换练习模式吗？",
       Text2: "恭喜您，制作了第一张紧急练习题卡。\n要练习这张题卡必须更改当前练习模式，现在就更换吗？",
@@ -288,6 +300,14 @@ module.exports = {
       Finish: 0,
       Total: 28,
       Image: "../images/examine_subject_a003.png"
+    },{
+      ID: 45,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 22,
+      Image: "../images/examine_subject_a003.png"
     },{
       ID: 27,
       Type: "Shici",
@@ -312,6 +332,14 @@ module.exports = {
       Finish: 0,
       Total: 29,
       Image: "../images/examine_subject_a004.png"
+    }, {
+      ID: 46,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 23,
+      Image: "../images/examine_subject_a004.png"
     }, {
       ID: 28,
       Type: "Shici",
@@ -343,6 +371,14 @@ module.exports = {
       Finish: 0,
       Total: 28,
       Image: "../images/examine_subject_a005.png"
+    }, {
+      ID: 47,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 17,
+      Image: "../images/examine_subject_a005.png"
     }, {
       ID: 29,
       Type: "Shici",
@@ -367,6 +403,14 @@ module.exports = {
       Finish: 0,
       Total: 21,
       Image: "../images/examine_subject_a006.png"
+    }, {
+      ID: 48,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 18,
+      Image: "../images/examine_subject_a006.png"
     }, {
       ID: 30,
       Type: "Shici",
@@ -398,6 +442,14 @@ module.exports = {
       Finish: 0,
       Total: 20,
       Image: "../images/examine_subject_a007.png"
+    },  {
+      ID: 49,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a007.png"
     },  {
       ID: 31,
       Type: "Shici",
@@ -422,6 +474,14 @@ module.exports = {
       Finish: 0,
       Total: 20,
       Image: "../images/examine_subject_a008.png"
+    }, {
+      ID: 50,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a008.png"
     }, {
       ID: 32,
       Type: "Shici",
@@ -453,6 +513,14 @@ module.exports = {
       Finish: 0,
       Total: 21,
       Image: "../images/examine_subject_a009.png"
+    }, {
+      ID: 51,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "上学期",
+      Finish: 0,
+      Total: 16,
+      Image: "../images/examine_subject_a009.png"
     }, {
       ID: 33,
       Type: "Shici",
@@ -477,6 +545,14 @@ module.exports = {
       Finish: 0,
       Total: 16,
       Image: "../images/examine_subject_a010.png"
+    }, {
+      ID: 52,
+      Type: "Shizi",
+      Name: "语文词语",
+      Name2: "下学期",
+      Finish: 0,
+      Total: 12,
+      Image: "../images/examine_subject_a010.png"
     }, {
       ID: 34,
       Type: "Shici",
@@ -502,6 +578,14 @@ module.exports = {
         Finish: 0,
         Total: 18,
         Image: "../images/examine_subject_a011.png"
+      }, {
+        ID: 53,
+        Type: "Shizi",
+        Name: "语文词语",
+        Name2: "上学期",
+        Finish: 0,
+        Total: 14,
+        Image: "../images/examine_subject_a011.png"
       }, {
         ID: 35,
         Type: "Shici",
@@ -518,6 +602,14 @@ module.exports = {
         Finish: 0,
         Total: 12,
         Image: "../images/examine_subject_a012.png"
+      }, {
+        ID: 54,
+        Type: "Shizi",
+        Name: "语文词语",
+        Name2: "下学期",
+        Finish: 0,
+        Total: 7,
+        Image: "../images/examine_subject_a012.png"
       }, {
         ID: 36,
         Type: "Shici",

utils/main.js

@@ -249,21 +249,24 @@ function changeViewToString(content) {
 }
 
 function EncryptUrl(str) {
-  if (str.constructor == Array) {
+  if (str && str.constructor && str.constructor == Array) {
     if (str.length > 0)
       str = str.join(",");
     else
       str = "";
   }
+  
   if (str) {
     str = str.replace(/baidu.com/g, "#####1#####");
     str = str.replace(/iciba.com/g, "#####2#####");
     str = str.replace(/https:\/\/pinyin.kylx365.com\/sounds/g, "#####3#####");
     str = str.replace(/https:\/\/miaguo-1253256735.file.myqcloud.com/g, "#####4#####");
+    
+    if (str.substr(0, 1) == "\n")
+      str = str.substr(1);
   }
 
-  if (str.substr(0, 1) == "\n")
-    str = str.substr(1);
+  
   return str;
 }
 
@@ -339,6 +342,10 @@ function changeStringToView(field) {
 
               obj.ContentServer = obj.ContentServer.substring(obj.ContentServer.indexOf("]") + 1);
               obj.Content = getTempImage(obj.ContentServer);
+              if (obj.Content.lastIndexOf("fm=58")>=0)
+                obj.IsShowBishun=true;
+              else if (obj.Content.indexOf("hanyu-word-gif")>0)
+                obj.IsShowKaiti=true;
               result.Images.push(obj.Content);
             }
             arrResult.push(obj);
@@ -785,77 +792,92 @@ function getMemoryLevel(index, number, time) {
 }
 //得到要检验的汉字列表
 function GetHanziUnitWords(unitsID, testType, callback) {
-  getData('GetHanziUnitWords?UnitID=' + unitsID, function (data) {
+  var url='GetHanziUnitWords?UnitID=' + unitsID;
+  if (testType)
+    url+="&TestType="+testType;
+  getData(url, function (data) {
     if (data) {
       var TaskList = [];
       var words = data;
-      for (var k = 0; k < words.length; k++) {
-        var taskInfo = {
-          FontSize: 144,
-          TagWidth: 136,
-          Content: [{
-              ContentType: 0,
-              Content: []
-            },
-            {
-              ContentType: 1,
-              Content: []
-            },
-            {
-              ContentType: 2,
-              Content: []
-            },
-          ]
-        };
-        taskInfo.Word = words[k].Name;
-
-        var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
-        var combineWords = common.ReplaceAllString(words[k].CombineWords, words[k].Name, words[k].Name + pinyinNormal);
-
-        taskInfo.ReadString = words[k].Name + pinyinNormal + "," + combineWords + "的" + words[k].Name + pinyinNormal;
-
-        if (testType == "read") {
-          taskInfo.Content[0].Content = ["怎么念"];
-          var question = words[k].CombineWords;
-          question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
-          taskInfo.Content[1].Content = question;
-
-
-          var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
-          taskInfo.Content[2].Content = answer;
-
-          if (words[k].CombineWords.length > 6) {
-            taskInfo.FontSize = 108;
-            if (words[k].CombineWords.length > 10) {
-              taskInfo.FontSize = 68;
+
+      //若是单字
+      if (words[0].Pinyin){
+        for (var k = 0; k < words.length; k++) {
+          var taskInfo = {
+            FontSize: 144,
+            TagWidth: 136,
+            Content: [{
+                ContentType: 0,
+                Content: []
+              },
+              {
+                ContentType: 1,
+                Content: []
+              },
+              {
+                ContentType: 2,
+                Content: []
+              },
+            ]
+          };
+          taskInfo.Word = words[k].Name;
+  
+          var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
+          var combineWords = common.ReplaceAllString(words[k].CombineWords, words[k].Name, words[k].Name + pinyinNormal);
+  
+          taskInfo.ReadString = words[k].Name + pinyinNormal + "," + combineWords + "的" + words[k].Name + pinyinNormal;
+  
+          if (testType == "read") {
+            taskInfo.Content[0].Content = ["怎么念"];
+            var question = words[k].CombineWords;
+            question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
+            taskInfo.Content[1].Content = question;
+  
+  
+            var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
+            taskInfo.Content[2].Content = answer;
+  
+            if (words[k].CombineWords.length > 6) {
+              taskInfo.FontSize = 108;
+              if (words[k].CombineWords.length > 10) {
+                taskInfo.FontSize = 68;
+              }
             }
-          }
-        } else if (testType == "write") {
-          taskInfo.Content[0].Content = ["怎么写"];
-
-          var question = words[k].CombineWords;
-          var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
-
-          question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
-          taskInfo.Content[1].Content = question;
-          var answer = words[k].Name;
-          answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
-          taskInfo.Content[2].Content = answer;
-
-          if (question2.length > 6) {
-            taskInfo.FontSize = 108;
-            if (question2.length > 10) {
-              taskInfo.FontSize = 68;
-              if (question2.length > 14) {
-                taskInfo.FontSize = 48;
+          } else if (testType == "write") {
+            taskInfo.Content[0].Content = ["怎么写"];
+  
+            var question = words[k].CombineWords;
+            var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
+  
+            question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
+            taskInfo.Content[1].Content = question;
+            var answer = words[k].Name;
+            answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
+            taskInfo.Content[2].Content = answer;
+  
+            if (question2.length > 6) {
+              taskInfo.FontSize = 108;
+              if (question2.length > 10) {
+                taskInfo.FontSize = 68;
+                if (question2.length > 14) {
+                  taskInfo.FontSize = 48;
+                }
               }
             }
           }
+          taskInfo.ContentNew = changeStringToView(taskInfo.Content);
+          TaskList.push(taskInfo);
         }
-        taskInfo.ContentNew = changeStringToView(taskInfo.Content);
-        TaskList.push(taskInfo);
+  
       }
-
+      else{ //若是词语
+        for (var k = 0; k < words.length; k++) {
+          var taskInfo = words[k];          
+          taskInfo.ContentNew = changeStringToView(taskInfo.Content);
+          TaskList.push(taskInfo);
+        }
+      }
+      
       callback(TaskList);
     } else {
       callback([]);
@@ -1036,14 +1058,18 @@ function GetTestReportInfo(reportid, callback) {
         
       } 
       else {
-        name1 = name1[0] + name1[1].substr(2, 2) + "能力" + name1[2].substr(0, 1);
+        var obj = UserTestReport[n];
+                
+        if (obj.BookID>=43 && obj.BookID<=60)
+          name1 = name1[0] + "生词" + name1[2].substr(0, 1);
+        else
+          name1 = name1[0] + name1[1].substr(2, 2) + "能力" + name1[2].substr(0, 1);
         var HanziAll = wx.getStorageSync('HanziAll');
         HanziAll = JSON.parse(HanziAll);
         for (var i = 0; i < HanziAll.length; i++) {
           if (name1 == HanziAll[i].Name) {
             for (var j = 0; j < HanziAll[i].Units.length; j++) {
               if (name2 == HanziAll[i].Units[j].Name) {
-                var obj = UserTestReport[n];
                 GetHanziUnitWords(HanziAll[i].Units[j].ID, obj.TestType, function (list) {
                   if (list) {
                     for (var k = 0; k < list.length; k++) {
@@ -1086,7 +1112,7 @@ function getDetailColor(index) {
   if (index > 0)
     return arrDetailColor[index];
   else if (index == 0)
-    return arrDetailColor[common.random(1, arr.length - 1)];
+    return arrDetailColor[common.random(1, arrDetailColor.length - 1)];
   else if (index == -1)
     return arrDetailColor;
 }
@@ -1172,7 +1198,7 @@ function UploadUserConfig(callback) {
   if (folderOrder)
     param1.FolderOrder = folderOrder;
   
-
+  //console.log(param1);
   that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
     if (callback) {
       callback();
@@ -1377,6 +1403,75 @@ function searchInfomation(search,searchtype,author,shiciurl,callback){
   });
 }
 
+function downloadBishunKaitiImage(url,serverUrl,dataType,Fields,callback){
+  var param={};
+  param.Url=url;
+  param.DataType=dataType;
+
+  if (param.Url==serverUrl){
+    postData("GetBiShunByKaitiUrl",param, function (data) {
+      if (data) {
+        wx.downloadFile({
+          url: data, // 仅为示例，并非真实的资源
+          success(res) {
+            // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
+            if (res.statusCode === 200) {
+              //console.log("serverUrl2:" + serverUrl);
+              console.log(res.tempFilePath);
+              callback(change(Fields,res.tempFilePath,param));
+            }
+          },
+          complete(){
+            
+          }
+        });
+      }
+    });
+  }
+  else{
+    callback(change(Fields,serverUrl,param));
+  }
+
+  function change(Fields,filepath,param){
+    var iStart=0;
+    if (Fields.length==4)
+    iStart=1
+    for (var i = iStart; i < Fields.length; i++) {
+      for (var j = 0; j < Fields[i].length; j++) {
+        if (Fields[i][j].Type == "image") {
+          if (Fields[i][j].Content==param.Url){
+            Fields[i][j].Content = filepath;
+            if (param.DataType=="bishun"){
+              Fields[i][j].IsShowKaiti=true;
+              Fields[i][j].IsShowBishun=false;
+            }
+            else if (param.DataType=="kaiti"){
+              Fields[i][j].IsShowKaiti=false;
+              Fields[i][j].IsShowBishun=true;
+            }
+          }
+        }
+      }
+    }
+    return Fields;
+  }
+}
+
+function GetSoundError(str) {
+  var arr=constant.arrSoundError;
+  var result=str;
+  for(var i=0;i<arr.length;i++){
+      if (str.indexOf(arr[i].Word)>0){
+          result=common.ReplaceAllString(str,arr[i].Word,arr[i].Sound);
+          break;
+      }
+      else if (str==arr[i].Word){
+        result=arr[i].Sound;
+      }
+  }
+  return result;
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
@@ -1414,4 +1509,6 @@ module.exports = {
   getAwardData: getAwardData,
   replaceCardInfoString: replaceCardInfoString,
   searchInfomation:searchInfomation,
+  downloadBishunKaitiImage:downloadBishunKaitiImage,
+  GetSoundError:GetSoundError,
 }