1.1.28

app.js

@@ -26,8 +26,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.27",
-    IsProduction: true,
+    Version: "1.1.28",
+    IsProduction: false,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/main/default.js

@@ -8,8 +8,8 @@ Page({
     IsTempCardNoSaved:false,
     IsExit:false,
     DayNumber: 0,
-    TodayTaskNumber: 1,
-    IsStart: 1,
+    TodayTaskNumber: 0,
+    IsStart: 0,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({

pages/main/searchWeb1.js

@@ -112,7 +112,7 @@ Page({
     });
     wx.removeStorageSync("SearchTextList");
   },
-  searchResult: function (search, searchType, author,shiciUrl) {
+  searchResult: function (search,searchType,author,shiciUrl) {
 
     wx.showLoading({
       title: '查询中',
@@ -123,7 +123,7 @@ Page({
     
     var that = this;
 
-    var url = 'GetMiaoguoAISearch?UserID=' + app.globalData.userInfo.UserID;
+    var url = 'GetMiaoguoAISearch2?UserID=' + app.globalData.userInfo.UserID;
     url += "&Word=" + search;
     if (searchType)
       url += "&SearchType=" + searchType;

pages/main/searchWeb2.js

@@ -26,66 +26,7 @@ Page({
   },
   getListFinished: function (data) {
     var that = this;
-    if (data.CHN) {
-      if (data.CHN.PinYin) {
-        for (var i = 0; i < data.CHN.PinYin.length; i++) {
-          var item = data.CHN.PinYin[i].explain;
-          item = common.ReplaceAllString(item, "<p>", "");
-          item = common.ReplaceAllString(item, "<span>", "");
-          item = common.ReplaceAllString(item, "</span>", "");
-          item = common.ReplaceAllString(item, "\r", "");
-          item = common.ReplaceAllString(item, "\n", "");
-
-          var arr = item.split("</p>");
-          arr.pop();
-          data.CHN.PinYin[i].explain = arr.join("\n");
-        }
-      }
-
-      if (data.CHN.HanZi) {
-        if (data.CHN.HanZi.length >= 2 && data.CHN.HanZi.length <= 4 && data.CHN.PinYin && data.CHN.PinYin.length > 0) {
-          data.CHN.TianKong = [];
-          var arrPinyin = data.CHN.PinYin[0].pinyin.split(" ");
-          for (var i = 0; i < data.CHN.HanZi.length; i++) {
-            var str = data.CHN.HanZi.replace(data.CHN.HanZi[i], arrPinyin[i]);
-            data.CHN.TianKong.push(str);
-          }
-        }
-      }
-
-      //判断诗词单词是否过长，过长就分段显示
-      if (data.CHN.PeomContent) {
-        data.CHN.PeomContentIsLong = false;
-        if (data.CHN.PeomContent.length > 1 ) {
-          for (var i = 0; i < data.CHN.PeomContent.length; i++) {
-            if (data.CHN.PeomContent[i]){
-              var item = data.CHN.PeomContent[i].join("");
-              if (item && item.length>18){
-                data.CHN.PeomContentIsLong = true;
-                break;
-              }
-            }
-          }
-        }
-        else if (data.CHN.PeomContent.length == 1) {
-          
-          for (var i = 0; i < data.CHN.PeomContent[0].length; i++) {
-            var item = data.CHN.PeomContent[0][i];
-            if (item && item.length > 18) {
-              data.CHN.PeomContentIsLong = true;
-              break;
-            }
-          }
-        }
-
-        if (data.CHN.Dynasty)
-          data.CHN.Dynasty="["+data.CHN.Dynasty+"]";
-
-        if (data.CHN.HanZi.indexOf("《") < 0 && data.CHN.HanZi.indexOf("》") < 0)
-          data.CHN.HanZi = "《" + data.CHN.HanZi + "》";
-      }
-    }
-
+    
     if (data.ENG && data.ENG.Paraphrase && common.checkIsArray(data.ENG.Paraphrase)) {
 
       for (var i = 0; i < data.ENG.Paraphrase.length; i++) {

pages/main/searchWeb2.wxml

@@ -64,7 +64,7 @@
     <view class='lineFooter'></view>
   </block>
 
-  <!-- 笔顺数组 -->
+  <!-- 楷书数组 -->
   <block wx:if="{{Result.CHN.BiShunArr && Result.CHN.BiShunArr.length>0}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">书写</view>

pages/main/setting.js

@@ -6,7 +6,7 @@ const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间
 const arrSortType2 = ["随机的", "较早的", "较近的"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan", "临时"];
-var arrUserID = [2, 11, 8, 9, 10, 95];
+var arrUserID = [2, 11, 8, 9, 10, 309];
 
 Page({
   data: {

pages/other/lesson.js

@@ -70,7 +70,11 @@ Page({
       url += "&Content=" + currentContent.join(",");
 
       main.getData(url, function (data) {
-        currentContent = [];
+        if (currentContent.length>0){
+          var lastNum = currentContent[currentContent.length-1];
+          currentContent=[];
+          currentContent.push(lastNum);
+        }
       });
     }
   },
@@ -91,15 +95,14 @@ Page({
   },
   bindEnded: function () {
     var id = this.data.LessonPage;
-    if (id < this.data.ArrTirtle.length)
+    this.InsertMiaoguoUserLesson();
+    if (id < this.data.ArrTirtle.length){
       this.playAudio({ currentTarget: { dataset: { id: id } } });
-      if(currentContent.length>3)
-        this.InsertMiaoguoUserLesson();
+    }
     else{
       this.setData({
         IsPause: true,
       });
-      this.InsertMiaoguoUserLesson();
     }
   },
   audioPlay: function () {
@@ -130,7 +133,6 @@ Page({
     var imageUrl = '../images/program_screenshot_l' + this.data.LessonID + '.png';
     if (this.data.LessonPage>0){
       title = this.data.ArrTirtle[this.data.LessonPage - 1].Title;
-      imageUrl=this.data.ImageUrl;
     }
     return {
       title: title,