1.0.1.4

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.0.1.3",
+    Version: "1.0.1.4",
     IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",

pages/index/index.js

@@ -4,7 +4,7 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSentence = [
   "荀子曰:\n君子博学而日参省乎己，\n则知明而行无过矣",
-  "为什么订正过的题目还会错？\n用秒过，不再错",
+  "为什么订正过的题目还会错？\n天天秒过，反复巩固，不再出错",
   "子曰:\n学而时习之，不亦悦乎。",
   "秒过之前，错字连篇\n秒过之后，错字罕见",
   "子曰:\n学而不思则罔\n思而不学则殆",
@@ -212,7 +212,9 @@ Page({
               });
             }, 2000);
 
-            that.getTaskTodayList();
+            main.UpdateMiaoguoCardTodayAll(function () {
+              that.getTaskTodayList();
+            });
           }
           that.getBaiduToken();
         }

pages/main/detail.js

@@ -36,7 +36,7 @@ Page({
       Containnerheight2: height - height2,
       IsShowAnswer: [0, 0],
       CanUndo: 1,
-      TaskInfo:{},
+      TaskInfo: {},
       IsIphoneX: main.checkIsIPhoneX(),
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
@@ -59,7 +59,7 @@ Page({
 
       that.setData({
         CanUndo: 0,
-        TaskInfo:{},
+        TaskInfo: {},
       });
       listTaskFinished = [];
       that.getTaskTime();
@@ -86,6 +86,7 @@ Page({
   },
   onUnload: function () {
     clearInterval(intervalSound);
+    main.UpdateMiaoguoCardTodayAll();
   },
   onPullDownRefresh: function () {
     this.onShowAnswer({ currentTarget: { dataset: { start: true } } });
@@ -194,7 +195,7 @@ Page({
 
     var taskInfo = TaskList[0];
     if (!taskInfo)
-      taskInfo={};
+      taskInfo = {};
 
     that.setData({
       NumberNew: arrNew.length,
@@ -296,84 +297,59 @@ Page({
   },
   gotoPrev: function () {
     var that = this;
-    wx.showLoading({
-      title: '请稍候',
-      mask: true,
-    });
+
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
-      //console.log(card);
-
-      var url = "UndoMiaoguoCard?";
-      url += "ID=" + card.Card.MiaoguoCardID;
-      url += "&UserID=" + app.globalData.userInfo.UserID;
-      url += "&IntervalTime=" + card.IntervalTime;
-      url += "&IntervalDay=" + card.Card.IntervalDay;
-      url += "&RepetitionCoefficient=" + card.Card.RepetitionCoefficient;
-      if (card.Card.FirstTime)
-        url += "&FirstTime=" + card.Card.FirstTime;
-      if (card.Card.LastTime)
-        url += "&LastTime=" + card.Card.LastTime;
-
-      main.getData(url, function (data) {
-        wx.hideLoading();
-        timeStart = new Date();
-
-        card.Card.Number0 = card.Number0Old;
-        card.Card.Number0Str = card.Number0StrOld;
-        card.Card.Number1 = card.Number1Old;
-        card.Card.Number1Str = card.Number1StrOld;
-        card.Card.Number2 = card.Number2Old;
-        card.Card.Number2Str = card.Number2StrOld;
-        card.Card.Number3 = card.Number3Old;
-        card.Card.Number3Str = card.Number3StrOld;
-
-        if (card.IsReviewOld)
-          card.Card.IsReview = card.IsReviewOld;
-
-        //去除重复
-        for (var i = 0; i < TaskList.length; i++) {
-          if (TaskList[i].MiaoguoCardID == card.Card.MiaoguoCardID) {
-            TaskList.splice(i, 1);
-          }
+      wx.setStorageSync("ListTaskFinished", listTaskFinished);
+
+
+      card.Card.Number0 = card.Number0Old;
+      card.Card.Number0Str = card.Number0StrOld;
+      card.Card.Number1 = card.Number1Old;
+      card.Card.Number1Str = card.Number1StrOld;
+      card.Card.Number2 = card.Number2Old;
+      card.Card.Number2Str = card.Number2StrOld;
+      card.Card.Number3 = card.Number3Old;
+      card.Card.Number3Str = card.Number3StrOld;
+
+      if (card.IsReviewOld)
+        card.Card.IsReview = card.IsReviewOld;
+
+      //去除重复
+      for (var i = 0; i < TaskList.length; i++) {
+        if (TaskList[i].MiaoguoCardID == card.Card.MiaoguoCardID) {
+          TaskList.splice(i, 1);
         }
+      }
 
-        TaskList.unshift(card.Card);
-        var canUndo = 1;
-        if (listTaskFinished.length == 0)
-          canUndo = 0;
+      TaskList.unshift(card.Card);
+      var canUndo = 1;
+      if (listTaskFinished.length == 0)
+        canUndo = 0;
 
-        arrImage = TaskList[0].ContentNew.Images;
-        arrImage2 = TaskList[0].ContentNew.Images2;
+      arrImage = TaskList[0].ContentNew.Images;
+      arrImage2 = TaskList[0].ContentNew.Images2;
 
-        that.setData({
-          IsShowAnswer: [0, 0],
-          TaskInfo: TaskList[0],
-          NumberNew: card.NumberNew,
-          NumberReview: card.NumberReview,
-          NumberHistory: card.NumberHistory,
-          CanUndo: canUndo,
-        });
+      that.setData({
+        IsShowAnswer: [0, 0],
+        TaskInfo: TaskList[0],
+        NumberNew: card.NumberNew,
+        NumberReview: card.NumberReview,
+        NumberHistory: card.NumberHistory,
+        CanUndo: canUndo,
+      });
 
-        wx.showToast({
-          title: '回到上一张',
-          mask: true,
-          image: "../images/universalpic_undo_white_120x90.png",
-        });
+      wx.showToast({
+        title: '回到上一张',
+        mask: true,
+        image: "../images/universalpic_undo_white_120x90.png",
       });
       that.setSoundFile(2);
     }
-    else {
-      wx.hideLoading();
-    }
   },
   gotoNext: function (e) {
     var that = this;
-    wx.showLoading({
-      title: '请稍候',
-      mask: true,
-    });
-
+    
     var btnnumber = e.currentTarget.dataset.btnnumber;
     var time = e.currentTarget.dataset.time;
 
@@ -469,106 +445,78 @@ Page({
     finishCard.BtnNumber = btnnumber;
     finishCard.LearningType = learningType;
 
-    //保存上传
-    var obj = {
-      MiaoguoCardID: TaskList[0].MiaoguoCardID,
-      IntervalTime: time,
-      BtnNumber: btnnumber,
-      LearningType: learningType,
-      IsUndo: 0,
-    }
-    this.saveCard(obj, function () {
-
-      wx.hideLoading();
-
-      //添加完成列表，去掉任务列表数据
-      listTaskFinished.push(finishCard);
-      TaskList.shift();
-
-      that.data.NumberNew = 0;
-      that.data.NumberHistory = 0;
-      that.data.NumberReview = 0;
-      var arrTemp = [];
-      for (var i = 0; i < TaskList.length; i++) {
-        if (TaskList[i].IsReview) {
-          if (TaskList[i].LimitTime < common.formatTime(new Date())) {
-            var card = TaskList.splice(i, 1);
-            TaskList.unshift(card[0]);
-          }
-          that.data.NumberReview++;
-        }
-        else if (TaskList[i].IsNew) {
-          that.data.NumberNew++;
-        }
-        else if (TaskList[i].IsHistory) {
-          that.data.NumberHistory++;
+    var duration = common.diffDate("s", timeStart, new Date());
+    if (finishCard.btnnumber == 1)
+      duration = 0;
+    finishCard.Duration = duration;
+
+    //添加完成列表，去掉任务列表数据
+    listTaskFinished.push(finishCard);
+    wx.setStorageSync("ListTaskFinished", listTaskFinished);
+    TaskList.shift();
+
+    that.data.NumberNew = 0;
+    that.data.NumberHistory = 0;
+    that.data.NumberReview = 0;
+    var arrTemp = [];
+    for (var i = 0; i < TaskList.length; i++) {
+      if (TaskList[i].IsReview) {
+        if (TaskList[i].LimitTime < common.formatTime(new Date())) {
+          var card = TaskList.splice(i, 1);
+          TaskList.unshift(card[0]);
         }
+        that.data.NumberReview++;
+      }
+      else if (TaskList[i].IsNew) {
+        that.data.NumberNew++;
+      }
+      else if (TaskList[i].IsHistory) {
+        that.data.NumberHistory++;
       }
+    }
 
-      //console.log(JSON.stringify(TaskList[0]));
+    //console.log(JSON.stringify(TaskList[0]));
 
-      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,
-        });
-        that.setSoundFile(1);
+    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,
+      });
+      that.setSoundFile(1);
+      main.UpdateMiaoguoCardTodayAll(function () {
         that.getTaskTime();
+      });
 
-      } else {
-        arrImage = TaskList[0].ContentNew.Images;
-        arrImage2 = TaskList[0].ContentNew.Images2;
+    } else {
+      arrImage = TaskList[0].ContentNew.Images;
+      arrImage2 = TaskList[0].ContentNew.Images2;
 
-        //任务没有完成，下一张卡片
-        that.setData({
-          IsShowAnswer: [0, 0],
-          TaskInfo: TaskList[0],
-          NumberNew: that.data.NumberNew,
-          NumberReview: that.data.NumberReview,
-          NumberHistory: that.data.NumberHistory,
-          CanUndo: 1,
-        });
+      //任务没有完成，下一张卡片
+      that.setData({
+        IsShowAnswer: [0, 0],
+        TaskInfo: TaskList[0],
+        NumberNew: that.data.NumberNew,
+        NumberReview: that.data.NumberReview,
+        NumberHistory: that.data.NumberHistory,
+        CanUndo: 1,
+      });
 
-        if (btnnumber == "1") {
-          that.setSoundFile(3);
-          wx.showToast({
-            title: '今天不练',
-            mask: true,
-            image: "../images/universalpic_shelve_white_120x120.png",
-          });
-        }
-        else
-          that.setSoundFile(0);
+      if (btnnumber == "1") {
+        that.setSoundFile(3);
+        wx.showToast({
+          title: '今天不练',
+          mask: true,
+          image: "../images/universalpic_shelve_white_120x120.png",
+        });
       }
-    });
-  },
-  saveCard: function (obj, callback) {
-    var url = "UpdateMiaoguoCardToday?";
-    url += "ID=" + obj.MiaoguoCardID;
-    url += "&UserID=" + app.globalData.userInfo.UserID;
-    url += "&IntervalTime=" + obj.IntervalTime;
-    url += "&BtnNumber=" + obj.BtnNumber;
-    url += "&LearningType=" + obj.LearningType;
-    url += "&FontSize=" + TaskList[0].FontSize;
-
-    var duration = common.diffDate("s", timeStart, new Date());
-    if (obj.btnnumber == 1)
-      duration = 0;
-    url += "&Duration=" + duration;
-
-    url += "&IsUndo=" + obj.IsUndo;
-    if (obj.LastTime)
-      url += "&LastTime=" + obj.LastTime;
-
-    main.getData(url, function (data) {
-      timeStart = new Date();
-      callback();
-    });
+      else
+        that.setSoundFile(0);
+    }
   },
   playSound: function (e) {
     var that = this;
@@ -793,13 +741,13 @@ Page({
                   urls: [res2.tempFilePath] // 需要预览的图片http链接列表
                 });
               },
-              fail:function(){
+              fail: function () {
                 wx.hideLoading();
               }
             })
           });
         }
-        else{
+        else {
           wx.hideLoading();
         }
       },

pages/main/detail.wxml

@@ -174,10 +174,6 @@
 
 
       <view class='panelLastFooter'>
-        <view class="panelLastFooter1 FlexRow" bindtap='gotoPrev' wx:if="{{CanUndo==1}}">
-          <image src="../images/universalpic_undo_gray_26x20.png" class='universalpic_undo_gray_26x20' />
-          <view>回到题卡</view>
-        </view>
         <view class="panelLastFooter1 FlexRow" bindtap='buildShareImage'>
           <image src="../images/universalpic_screenshot_gray_30x30.png" class='universalpic_screenshot_gray_30x30' />
           <view>群接力</view>

utils/main.js

@@ -531,6 +531,33 @@ function saveTempImage(serverUrl, tempUrl) {
   wx.setStorageSync("TempImageList", list);
 }
 
+function UpdateMiaoguoCardTodayAll(callback){
+  var that = this;
+  wx.showLoading({
+    title: '请稍候',
+    mask: true,
+  });
+  var list = wx.getStorageSync("ListTaskFinished");
+  if (list && list.length > 0) {
+    that.postData('UpdateMiaoguoCardTodayAll?UserID=' + app.globalData.userInfo.UserID, {
+      List: list,
+    }, function (data) {
+      wx.hideLoading();
+      if (data) {
+        wx.removeStorageSync("ListTaskFinished");
+      }
+      if (callback){
+        callback();
+      }
+    });
+  }
+  else{
+    if (callback) {
+      callback();
+    }
+  }
+}
+
 function updateSearchList(obj) {
   var arr = wx.getStorageSync("SearchWord3");
   if (!arr)
@@ -2212,4 +2239,5 @@ module.exports = {
   getMemoryLevelAll: getMemoryLevelAll,
   getMemoryLevel: getMemoryLevel,
   getShareImageBackColor: getShareImageBackColor,
+  UpdateMiaoguoCardTodayAll: UpdateMiaoguoCardTodayAll,
 }