2.1.34

app.js

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

pages/index/index.js

@@ -72,7 +72,10 @@ Page({
         }
         else{
           if (app.globalData.LessonID === "all") {
-            url = '../other/lessonlist?listtype='+options.ListType;
+            if (!options.ListType)
+              url = '../other/lessonlistselect';
+            else
+              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

@@ -192,9 +192,11 @@ Page({
       }
 
       var arrTagTemp=[];
-      for(var j=0;j<card.Tags.length;j++){
-        if (card.Tags[j])
-          arrTagTemp.push(card.Tags[j]);
+      if (card.Tags && card.Tags.length>0){
+        for(var j=0;j<card.Tags.length;j++){
+          if (card.Tags[j])
+            arrTagTemp.push(card.Tags[j]);
+        }
       }
       card.Tags=arrTagTemp;
 

pages/main/addInfomationDetail.js

@@ -351,7 +351,9 @@ Page({
           obj.TypeName="D";
           if (data.ENG.Soundmark)
             obj.Remark=data.ENG.Soundmark.Eng;
-          obj.Content=data.ENG.Paraphrase[0].ParaphraseList;
+
+          if (data.ENG.Paraphrase && data.ENG.Paraphrase[0] && data.ENG.Paraphrase[0].ParaphraseList)
+            obj.Content=data.ENG.Paraphrase[0].ParaphraseList;
 
           obj.Url="&UserID="+app.globalData.userInfo.UserID+"&Word="+obj.Key;
         }

pages/main/default.js

@@ -298,9 +298,10 @@ Page({
     if (app.globalData.userInfo.UserID == 1
       || app.globalData.userInfo.UserID == 3 
       || app.globalData.userInfo.UserID == 4) {
-        var userid=2;
-        if (app.globalData.userInfo.UserID>=3)
-          userid = app.globalData.userInfo.UserID;
+      
+      var userid=2;
+      if (app.globalData.userInfo.UserID>=3)
+        userid = app.globalData.userInfo.UserID;
 
       that.setData({
         IsShowUserID: true,

pages/main/default.wxml

@@ -87,10 +87,6 @@
       <input class='input2 input' type="number"  always-embed="true"  placeholder="版本号" value="{{VersionID}}" bindinput="onKeyInput" data-type="versionid"/>
       <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="1">开通</button>
     </view>
-
-    <view class="panel2 FlexRow">
-     <button class="btn2" bindtap="goto" data-url="../other/webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">跳转公众号</button>
-    </view>
 </view>
 
 <view  wx:if="{{IsShowRemind}}" class="IsRemindContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>

pages/main/mainlist.js

@@ -716,9 +716,10 @@ Page({
       });
     }
     else{
-      if (datatype.indexOf("7")>0)
+
+      if (datatype && datatype.indexOf("7")>0)
         dayNumber=7;
-      else if (datatype.indexOf("30")>0)
+      else if (datatype && datatype.indexOf("30")>0)
         dayNumber=30;
       
       if (datatype.indexOf("TimeShort")>=0)

pages/main/preview.js

@@ -642,22 +642,27 @@ Page({
   },
   onShareAppMessage: function () {
     var that = this;
-    this.setData({
-      ShowType: 'sharepreview',
-      IsCardInfoCloseMenu: 1,
-    });
-
-    var url = 'ShareMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
-    url += "&MiaoguoCardID=" + that.data.MiaoguoCardID;
-    main.getData(url, function (data) { });
+    
 
-    setTimeout(function () {
+    if (that.data.ShowType!="share"){
       that.setData({
-        ShowType: 'show',
+        ShowType: 'sharepreview',
+        IsCardInfoCloseMenu: 1,
       });
-      common.getStorageValue(that, "IsCardInfoCloseMenu", 1, function () {});
-
-    }, 1000);
+      
+      var url = 'ShareMiaoguoCard?UserID=' + app.globalData.userInfo.UserID;
+      url += "&MiaoguoCardID=" + that.data.MiaoguoCardID;
+      main.getData(url, function (data) { });
+  
+      setTimeout(function () {
+        that.setData({
+          ShowType: 'show',
+        });
+        common.getStorageValue(that, "IsCardInfoCloseMenu", 1, function () {});
+  
+      }, 1000);
+    }
+    
     return {
       title: '我的分享',
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=share&ColorIndex=' + app.globalData.ColorIndex + '&MiaoguoCardID=' + this.data.MiaoguoCardID,

pages/other/homework.js

@@ -13,7 +13,7 @@ Page({
     var userid = app.globalData.userInfo.UserID;
     if (options.UserID)
       userid = options.UserID;
-      
+
     var EndTime = "";
     if (options.EndTime){
       EndTime = options.EndTime;

pages/other/lessonlist.js

@@ -4,54 +4,56 @@ import main from '../../utils/main';
 const app = getApp();
 
 Page({
-  data: {
-  },
+  data: {},
   onLoad: function (options) {
     var that = this;
     that.setData({
       CheckListUserID: app.globalData.userInfo.UserID,
       Containnerheight: main.getWindowHeight(),
       UserID: app.globalData.userInfo.UserID,
-      ListType:options.listtype,
+      ListType: options.listtype,
     });
 
     var userid = app.globalData.userInfo.UserID;
     main.getData("GetMiaoguoLesson2?UserID=" + userid, function (data) {
       if (data) {
-        
-        var arr=[];
-        if (that.data.ListType=="simple"){
+
+        var arr = [];
+        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);
-          
+
+          arr[0].Text = "前言";
+          arr[1].Text = "基本操作";
+          arr[1].Time = "时长约10分钟";
+
+
+          arr[1].List[5] = data[2].List[4];
+          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.splice(6, 1);
+
+
+          arr[1].List[4].Title = "通过【检验】生成字词、古诗词、英语题卡";
+          arr[1].List[3].Title = "通过【加资料】制作字词、古诗词、英语题卡";
+          arr[1].List[2].Title = "制作任何知识点的普通题卡";
+
+
           wx.setNavigationBarTitle({
             title: '简要版',
           });
-        }
-        else{
+        } else {
           wx.setNavigationBarTitle({
             title: '完整版',
           });
-          for(var i=0;i<4;i++)
+          for (var i = 0; i < 4; i++)
             arr.push(data[i]);
         }
-        
+
         that.setData({
           List: arr,
         });
@@ -62,34 +64,62 @@ Page({
   },
   gotoLesson: function (e) {
     var id = e.currentTarget.dataset.id;
-    var idchild="";
-    if (e.currentTarget.dataset.idchild && id>1)
-      idchild = '&LessonPage=' +e.currentTarget.dataset.idchild;
-    
-    if (e.currentTarget.dataset.url){
+    var idchild = "";
+    if (e.currentTarget.dataset.idchild && id > 1)
+      idchild = '&LessonPage=' + e.currentTarget.dataset.idchild;
+
+    if (e.currentTarget.dataset.url) {
+      if (this.data.ListType == "simple") {
+        switch (e.currentTarget.dataset.idchild) {
+          case 1:
+            id = 3;
+            idchild = "&LessonPage=1";
+            break;
+          case 2:
+            id = 3;
+            idchild = "&LessonPage=2";
+            break;
+          case 3:
+            id = 2;
+            idchild = "&LessonPage=1";
+            break;
+          case 4:
+            id = 2;
+            idchild = "&LessonPage=2";
+            break;
+          case 5:
+            id = 2;
+            idchild = "&LessonPage=3";
+            break;
+          case 6:
+            id = 3;
+            idchild = "&LessonPage=5";
+            break;
+
+        }
+      }
       wx.navigateTo({
-        url: '../other/video?LessonID=' + id +idchild+"&imageurl="+e.currentTarget.dataset.imageurl+"&url="+e.currentTarget.dataset.url+"&title="+e.currentTarget.dataset.title,
+        url: '../other/video?LessonID=' + id + idchild +"&title=" + e.currentTarget.dataset.title+ "&imageurl=" + e.currentTarget.dataset.imageurl + "&url=" + e.currentTarget.dataset.url,
       });
-    }
-    else{
-      if (id!=2 && id!=3){
+    } else {
+      if (id != 2 && id != 3) {
         wx.navigateTo({
-          url: '../other/lesson?LessonID=' + id +idchild,
+          url: '../other/lesson?LessonID=' + id + idchild,
         });
       }
     }
   },
   onShareAppMessage: function () {
-    var title="完整版教学课程";
-    if (this.data.ListType=="simple"){
-      title="简要版教学课程";
+    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;
+    var url = app.globalData.SharePath + '?type=lesson&LessonID=all&ListType=' + this.data.ListType + '&UserID=' + app.globalData.userInfo.UserID;
     console.log(url);
     return {
       title: title,
       path: url,
-      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_lesson_a00.png",
+      imageUrl: app.globalData.uploadImageUrl + "web/program_screenshot_lesson_a00.png",
     }
   },
-})
+})

pages/other/lessonlistselect.js

@@ -21,9 +21,9 @@ Page({
   },
   onShareAppMessage: function () {
     return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?LessonID=all&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
+      title: "课程教材",
+      path: app.globalData.SharePath + '?type=lesson&LessonID=all&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_lesson_a00.png",
     }
   },
 })

pages/other/userbook.js

@@ -58,9 +58,13 @@ Page({
   onLoad: function () {
     var that = this;
 
-    var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
-    var endDate=common.formatTime(common.addDate("y", 1, new Date(app.globalData.userInfo.ProductServiceTime)));
-    
+    var productServiceTime="";
+    var endDate="";
+    if (app.globalData.userInfo.ProductServiceTime){
+      productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
+      endDate=common.formatTime(common.addDate("y", 1, new Date(app.globalData.userInfo.ProductServiceTime)));
+    }
+      
     var arr = [];
     for (var i = arrInformation.length - 1; i >= 1; i--) {
       arr.push(arrInformation[i]);

pages/other/video.js

@@ -80,9 +80,11 @@ Page({
   onShareAppMessage: function () {
     var title ="课程";
     var imageUrl = app.globalData.uploadImageUrl+"web/"+this.data.ImageUrl;
+    var path=app.globalData.SharePath + '?type=video&LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID;
+    console.log("path:"+path);
     return {
       title: title,
-      path: app.globalData.SharePath + '?type=video&LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
+      path: path,
       imageUrl: imageUrl
     }
   },

project.private.config.json

@@ -1,4 +1,5 @@
 {
+  "setting": {},
   "condition": {
     "plugin": {
       "list": []
@@ -70,7 +71,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=lesson&LessonID=all&ListType=simple&UserID=1",
+          "query": "type=video&LessonID=3&LessonPage=5&UserID=1",
           "scene": 1047
         },
         {

utils/constant.js

@@ -1,14 +1,20 @@
 module.exports = {
   arrSoundError:[
     {
-        Word: "藤蔓",
-        Sound: "藤蔓(wan4)",
+      Word: "藤蔓",
+      Sound: "藤蔓(wan4)",
     }, {
-        Word: "呲牙",
-        Sound: "呲(ci1)牙",
+      Word: "呲牙",
+      Sound: "呲(ci1)牙",
     }, {
-        Word: "呢(ne)",
-        Sound: "呢",
+      Word: "呢(ne)",
+      Sound: "呢",
+    }, {
+      Word: "卑劣",
+      Sound: "卑(liè)",
+    }, {
+      Word: "刚才",
+      Sound: "(gāng)(cái)",
     },
   ],
   arrMenuText: [{

utils/main.js

@@ -656,7 +656,7 @@ function updateSearchList(obj,callback) {
   if (!arr)
     arr = [];
 
-  if (obj.Type == "shici") {
+  if (obj && obj.Type && obj.Type == "shici") {
     if (obj.Value.CHN.ShiciTitle)
       obj.Key = obj.Value.CHN.ShiciTitle;
     if (obj.Key.indexOf("《") == 0)