1.5.18

app.js

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

pages/main/detail.js

@@ -517,15 +517,21 @@ Page({
           TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
           //若是新增，则10m 1d 4d
           if (TaskList[0].IsNew) {
-            TaskList[0].Number0 = "10m";
+            if (minute==1){
+              TaskList[0].Number0 = "1m";
+              TaskList[0].Number2 = "10m";
+            }
+            else{
+              TaskList[0].Number0 = "10m";
+              TaskList[0].Number2 = "1d";
+            }
+
             TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
             delete TaskList[0].Number1;
             delete TaskList[0].Number1Str;
 
-            TaskList[0].Number2 = "1d";
-            TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
-
             delete TaskList[0].Number3;
             delete TaskList[0].Number3Str;
 

utils/main.js

@@ -831,7 +831,9 @@ function GetHanziUnitWords(unitsID, testType, callback) {
         taskInfo.Word = words[k].Name;
 
         var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
-        taskInfo.ReadString = words[k].Name + pinyinNormal + "," + words[k].CombineWords + "的" + words[k].Name + pinyinNormal;
+        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 = ["怎么念"];