chengjie 5 年之前
父节点
当前提交
0795e90229
共有 3 个文件被更改,包括 14 次插入6 次删除
  1. 1 1
      app.js
  2. 10 4
      pages/main/detail.js
  3. 3 1
      utils/main.js

+ 1 - 1
app.js

@@ -1,6 +1,6 @@
1
 App({
1
 App({
2
   globalData: {
2
   globalData: {
3
-    Version: "1.5.16",
3
+    Version: "1.5.18",
4
     IsProduction: true,
4
     IsProduction: true,
5
     ShareTitle: "高效学习从秒过开始",
5
     ShareTitle: "高效学习从秒过开始",
6
     SharePath: "pages/index/index",
6
     SharePath: "pages/index/index",

+ 10 - 4
pages/main/detail.js

@@ -517,15 +517,21 @@ Page({
517
           TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
517
           TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
518
           //若是新增,则10m 1d 4d
518
           //若是新增,则10m 1d 4d
519
           if (TaskList[0].IsNew) {
519
           if (TaskList[0].IsNew) {
520
-            TaskList[0].Number0 = "10m";
520
+            if (minute==1){
521
+              TaskList[0].Number0 = "1m";
522
+              TaskList[0].Number2 = "10m";
523
+            }
524
+            else{
525
+              TaskList[0].Number0 = "10m";
526
+              TaskList[0].Number2 = "1d";
527
+            }
528
+
521
             TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
529
             TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
530
+            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
522
 
531
 
523
             delete TaskList[0].Number1;
532
             delete TaskList[0].Number1;
524
             delete TaskList[0].Number1Str;
533
             delete TaskList[0].Number1Str;
525
 
534
 
526
-            TaskList[0].Number2 = "1d";
527
-            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
528
-
529
             delete TaskList[0].Number3;
535
             delete TaskList[0].Number3;
530
             delete TaskList[0].Number3Str;
536
             delete TaskList[0].Number3Str;
531
 
537
 

+ 3 - 1
utils/main.js

@@ -831,7 +831,9 @@ function GetHanziUnitWords(unitsID, testType, callback) {
831
         taskInfo.Word = words[k].Name;
831
         taskInfo.Word = words[k].Name;
832
 
832
 
833
         var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
833
         var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
834
-        taskInfo.ReadString = words[k].Name + pinyinNormal + "," + words[k].CombineWords + "的" + words[k].Name + pinyinNormal;
834
+        var combineWords = common.ReplaceAllString(words[k].CombineWords, words[k].Name, words[k].Name+pinyinNormal);
835
+          
836
+        taskInfo.ReadString = words[k].Name + pinyinNormal + "," + combineWords + "的" + words[k].Name + pinyinNormal;
835
 
837
 
836
         if (testType == "read") {
838
         if (testType == "read") {
837
           taskInfo.Content[0].Content = ["怎么念"];
839
           taskInfo.Content[0].Content = ["怎么念"];