2.3.64

app.js

@@ -1,8 +1,8 @@
 App({
   globalData: {
-    Version: "2.3.64",
-    //IsProduction: true,
-    IsProduction: false,
+    Version: "2.3.70",
+    IsProduction: true,
+    //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/index/index.js

@@ -67,7 +67,7 @@ Page({
       else if (options.type == "family") {
         var url="../other/family";
         if (options.PanelType==1)
-          url="../other/family?PanelType=1&Time="+options.Time+"&MainUserID="+options.MainUserID+ "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl;
+          url="../other/family?PanelType=1&Time="+options.Time+"&CurrentUserID="+options.CurrentUserID+ "&NickName=" + options.NickName + "&AvatarUrl=" + options.AvatarUrl;
         this.setData({
           gotoType: "other",
           gotoUrl: url,

pages/main/addInfomationDetail.js

@@ -31,11 +31,10 @@ Page({
       that.setData({
         IsShowHelp: true,
       });
-      main.ShowHelp(that, "#helpTianKong0", "down", "选择拼音作为问题，点一下","Left");
-    }
-    else{
+      main.ShowHelp(that, "#helpTianKong0", "down", "选择拼音作为问题，点一下", "Left");
+    } else {
       that.setData({
-        IsShowHelp:false,
+        IsShowHelp: false,
       });
     }
   },
@@ -164,11 +163,11 @@ Page({
         IsShowHelp: true,
       });
       if (this.data.CSS[css].Number == 0)
-        main.ShowHelp(that, "#HelpHanZi", "down", "选择文字作为答案，\n点两下，注意是点两下","Left");
+        main.ShowHelp(that, "#HelpHanZi", "down", "选择文字作为答案，\n点两下，注意是点两下", "Left");
       else if (this.data.CSS[css].Number == 1)
-        main.ShowHelp(that, "#HelpHanZi", "down", "选择文字作为答案，\n点两下，注意是点两下\n让左侧数字成为2","Left");
+        main.ShowHelp(that, "#HelpHanZi", "down", "选择文字作为答案，\n点两下，注意是点两下\n让左侧数字成为2", "Left");
       else if (this.data.CSS[css].Number == 2)
-        main.ShowHelp(that, "#btnAdd", "down", "请点“添加”按钮","Left");
+        main.ShowHelp(that, "#btnAdd", "down", "请点“添加”按钮", "Left");
     }
   },
   addData: function () {
@@ -257,17 +256,15 @@ Page({
                   }
                   str = arr2.join("\n");
                 }
-              } 
-              else if (item.Tag == "释义"){
-                if (item.Content.indexOf("[读 src=")>=0){
-                  var sound=item.Content.substring(item.Content.indexOf("[读"));
-                  sound=sound.substring(sound.indexOf("src='")+5,sound.indexOf("']"));
+              } else if (item.Tag == "释义") {
+                if (item.Content.indexOf("[读 src=") >= 0) {
+                  var sound = item.Content.substring(item.Content.indexOf("[读"));
+                  sound = sound.substring(sound.indexOf("src='") + 5, sound.indexOf("']"));
                   var sound2 = main.GetSoundError(sound);
-                  item.Content=item.Content.replace(sound,sound2);
+                  item.Content = item.Content.replace(sound, sound2);
                 }
                 str = item.Content;
-              }
-              else
+              } else
                 str = item.Content;
             }
 

pages/main/default.js

@@ -59,11 +59,17 @@ Page({
     //debugger;
 
     if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser == 1 && app.globalData.userInfo.isShow == 1) {
-      if (app.globalData.userInfo.Subscribe == 0) {
+      if (app.globalData.userInfo.Subscribe == 0 && app.globalData.userInfo.IsApply==0) {
         wx.navigateTo({
           url: '../other/newuser',
         });
       }
+      else{
+        wx.navigateTo({
+          url: '../other/userbook',
+        });
+        app.globalData.GotoUrl = "";
+      }
     } else {
       wx.getSetting({
         success(res) {
@@ -73,7 +79,7 @@ Page({
             });
           } else {
             if (!app.globalData.userInfo.IsTryOut && app.globalData.userInfo.isShow == 1) {
-              if (app.globalData.userInfo.Subscribe == 1) {
+              if (app.globalData.userInfo.IsApply==1) {
                 wx.navigateTo({
                   url: '../other/userbook',
                 });
@@ -82,7 +88,7 @@ Page({
                 wx.redirectTo({
                   url: '../other/newuser',
                 });
-              }
+              }                
             } else if (app.globalData.userInfo.IsTryOut && app.globalData.userInfo.isShow == 1) {
               if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6") >= 0) {
                 wx.navigateTo({

pages/main/detail.js

@@ -20,6 +20,9 @@ var intervalSound = 0,
 var isCollecting = false;
 var isExit = true;
 
+var unableNum=0; //练习中的不会的数量
+var pigeonholeNum=0; //练习中的归档数量
+
 var isPlaying = false;
 
 var currentFolderID = -1; //当前练习卡单ID，没有时为-1
@@ -84,6 +87,9 @@ Page({
       });
     }
 
+    pigeonholeNum=0;//归档数为0
+    unableNum=0;//不会题卡数的数量
+
     that.setData({
       Containnerheight: height,
       Containnerheight2: height - height2,
@@ -168,7 +174,12 @@ Page({
   },
   startTask: function () {
     var that=this;
-    var url = 'StartMiaoguoTask?UserID=' + app.globalData.userInfo.UserID;
+
+    var url2="";
+    if (app.globalData.userInfo.CurrentUserID)
+      url2='&CurrentUserID='+app.globalData.userInfo.CurrentUserID;
+
+    var url = 'StartMiaoguoTask?UserID=' + app.globalData.userInfo.UserID+url2;
     main.getData(url, function (data,err) {
       //console.log(err);
       if (err && err.errCode==100){
@@ -510,7 +521,7 @@ Page({
     if (dayNum.indexOf("d")>0){
       dayNum=dayNum.replace("d","");
       dayNum=Number(dayNum);
-      if (dayNum<183)
+      if (dayNum<366)
         return false;
       else
         return true;
@@ -966,6 +977,7 @@ Page({
         }
         
         app.globalData.TaskToday.DayNumber = data.DayNumber;
+
         that.setData({
           TodayTime: duration,
           Title: "报告",
@@ -982,6 +994,24 @@ Page({
             content: "也许您已经发现「报告」上的数据有些异样。这可能是由于本次练习从昨天开始到今天结束，发生了「跨天」的情况，也可能是其他异常情况。虽然报告内容不够正确，但练习数据不会受到影响，这个问题将在日后得到改善。请不用担心。"
           });
         }
+
+        if (pigeonholeNum>0 || unableNum>0){
+          var str="今天的练习中，您有：";
+          if (unableNum>0)
+            str+=unableNum+"张题卡选择不会，";
+          if (pigeonholeNum>0)
+            str+=pigeonholeNum+"张题卡选择归档，";
+          str+="系统已补充"+(pigeonholeNum+unableNum)+"张题卡填补空缺。请回到首页继续完成练习。";
+          wx.showModal({
+            title: '提醒',
+            showCancel: false,
+            confirmText: '知道了',
+            content: str,
+            complete:function(){
+              that.onClose();
+            }
+          });
+        }
       }
     });
   },
@@ -1187,6 +1217,21 @@ Page({
       MemoryLevel: index,
     });
   },
+  saveCardType2:function(event){
+    var that = this;
+    wx.showModal({
+      title: '提醒',
+      content: '要归档这张题卡吗？归档后可在「题卡」栏目的归档分类里找回。',
+      showCancel: true,
+      cancelText:"取消",
+      confirmText: "确认归档",
+      confirmColor:"#ff0000",
+      success(res) {
+        if (res.confirm)
+          that.saveCardType(event);
+      },
+    });
+  },
   saveCardType: function (event) {
     var that = this;
     var foldertype = event.currentTarget.dataset.foldertype;
@@ -1196,6 +1241,11 @@ Page({
     url += "&ID=" + TaskList[0].MiaoguoCardID;
     main.getData(url, function (data) {
 
+      if (foldertype==1)
+        unableNum++;
+      else
+        pigeonholeNum++;
+
       //归档后要修改上方的数字
       if (that.data.TaskInfo.IsNew){
         that.setData({
@@ -1465,7 +1515,19 @@ Page({
     timeoutEveryCard=[];
   },
   resetTodayTask:function(){
-    main.ResetTodayTask();
+    var that=this;
+    wx.showModal({
+      title: '提醒',
+      content: '本功能将清除今天的练习数据，可用于重做今天的练习任务。此功能执行后无法撤销，请谨慎使用。前往重置将帮您打开「设置」界面，请自行点击「重置今天的任务」按键。',
+      showCancel: true,
+      cancelText:"取消",
+      confirmText: "前往重置",
+      confirmColor:"#ff0000",
+      success(res) {
+        if (res.confirm)
+          that.goto({currentTarget:{dataset:{url:"./systemsetting"}}});
+      },
+    });
   },
   //获取导航栏高度
   getBarInfo(e) {

pages/main/detail.wxml

@@ -125,7 +125,7 @@
               <view class="Answer0 btnColor"></view>
             </view>
             <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
-              data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1 && !IsShowPigeonhole}}">
+              data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
               <view class="btnTime">
                 {{TaskInfo.Number1Str}}
               </view>
@@ -142,7 +142,7 @@
 
             </view>
             <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
-              data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3 && MemoryLevel==1}}">
+              data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3 && !IsShowPigeonhole && MemoryLevel==1}}">
               <view class="btnTime">
                 {{TaskInfo.Number3Str}}
               </view>
@@ -156,7 +156,7 @@
             
             <block wx:if="{{IsShowPigeonhole}}">
               <view class="line4"></view>
-              <view class="AnswerRight1 FlexRow" catchtap='saveCardType' data-foldertype="0">
+              <view class="AnswerRight1 FlexRow" catchtap='saveCardType2' data-foldertype="0" data-type="1">
                 <image src="../images/mg4_iconTools_4.png" class='mg4_iconTools_4' />
                 <view class="text4">归档</view>
               </view>

pages/other/family.js

@@ -60,7 +60,7 @@ Page({
 
     if (panelType==1){
       that.setData({
-        MainUserID:options.MainUserID,
+        CurrentUserID:options.CurrentUserID,
         NickName:options.NickName,
         HelpList:constant.arrFamilyHelpListAccept,
         Time:options.Time,
@@ -188,7 +188,7 @@ Page({
         success(res) {},
       });
     }
-    else if (that.data.MainUserID==app.globalData.userInfo.UserID){
+    else if (that.data.CurrentUserID==app.globalData.userInfo.UserID){
       wx.showModal({
         title: '接受失败',
         content: '不能自己和自己建立家庭帐号，请发给另外一个微信号。',
@@ -205,7 +205,7 @@ Page({
         confirmText: "接受",
         success(res) {
           if (res.confirm) {
-            main.getData("updateMiaoguoFamily?UpdateType=add&Time="+that.data.Time+"&UserID=" + that.data.MainUserID+"&NewUserID=" + app.globalData.userInfo.UserID, function (data) {
+            main.getData("updateMiaoguoFamily?UpdateType=add&Time="+that.data.Time+"&UserID=" + that.data.CurrentUserID+"&NewUserID=" + app.globalData.userInfo.UserID, function (data) {
               if (data==0){
                 app.globalData.FamilyUsers=[];
                 wx.reLaunch({
@@ -245,7 +245,7 @@ Page({
   },
   onShareAppMessage: function () {
     if (this.data.PanelType==0 && this.data.FamilyUsers.length<2 && this.data.IsMember==1) {
-      var path=app.globalData.SharePath + '?type=family&PanelType=1&MainUserID=' + app.globalData.userInfo.UserID;
+      var path=app.globalData.SharePath + '?type=family&PanelType=1&CurrentUserID=' + app.globalData.userInfo.UserID;
       path += "&Time=" + common.formatTime(new Date(),"-");
       path += "&NickName=" + app.globalData.userInfo.NickName;
       path += "&AvatarUrl=" + app.globalData.userInfo.AvatarUrl;

pages/other/userbook.js

@@ -79,7 +79,7 @@ Page({
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
       ClassTotalDayNumber: app.globalData.userInfo.ClassTotalDayNumber,
       ChildUserID: app.globalData.userInfo.ChildUserID,
-      MainUserID: app.globalData.userInfo.MainUserID,
+      CurrentUserID: app.globalData.userInfo.CurrentUserID,
       UserID:app.globalData.userInfo.UserID,
       ShowUserID:app.globalData.userInfo.ShowUserID,
     });
@@ -139,7 +139,7 @@ Page({
       });
     }
 
-    if (that.data.IsLoseEfficacy==1 && that.data.MainUserID!=that.data.UserID){
+    if (that.data.IsLoseEfficacy==1 && that.data.CurrentUserID!=that.data.UserID){
       wx.showModal({
         title: '帐号过期',
         content: '该帐号已过期，重启微信可回到您原本的秒过，「家庭用户」已自动解除。如想为该帐号续费，请使用该帐号原本对应的微信打开秒过就能续费了（其它微信不能代付）。',
@@ -173,7 +173,7 @@ Page({
     });
   },
   updateMember: function () {
-    if (!this.data.ChildUserID && this.data.UserID==this.data.MainUserID){
+    if (!this.data.ChildUserID && this.data.UserID==this.data.CurrentUserID){
       wx.navigateTo({
         url: '../index/accredit',
       });

pages/other/userbook.wxml

@@ -34,17 +34,17 @@
     </view>
     <view class="panel2 FlexRow" wx:if="{{IsShow==1 && (IsPay==1 || (PanelShow>=2 && ClassDayNumber<ClassTotalDayNumber) )}}">
       
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1 && MainUserID==UserID}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/coupon" wx:if="{{IsPay==1 && CurrentUserID==UserID}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_coupon.png' />
         <view>优惠券</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) && !ChildUserID && MainUserID==UserID }}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) && !ChildUserID && CurrentUserID==UserID }}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
       
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) && !ChildUserID && MainUserID==UserID }}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) && !ChildUserID && CurrentUserID==UserID }}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
@@ -59,7 +59,7 @@
         <view>推广计划</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding"  wx:if="{{!ChildUserID && MainUserID==UserID}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="./binding"  wx:if="{{!ChildUserID && CurrentUserID==UserID}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_link.png' />
         <view>帐号绑定</view>
       </view>

pages/plan/taskBasic.js

@@ -120,7 +120,11 @@ Page({
   },
   saveUserConfig:function(e){
     var that = this;
-    main.getData("UpdateUserConfigBasicCardLimit?UserID=" + app.globalData.userInfo.UserID + "&BasicCardLimit=" + that.data.BasicCardLimit, function (data) {
+    var url2="";
+    if (app.globalData.userInfo.CurrentUserID)
+      url2='&CurrentUserID='+app.globalData.userInfo.CurrentUserID;
+
+    main.getData("UpdateUserConfigBasicCardLimit?UserID=" + app.globalData.userInfo.UserID + "&BasicCardLimit=" + that.data.BasicCardLimit+url2, function (data) {
       wx.navigateBack({
         delta: 1,
       });

project.config.json

@@ -37,7 +37,8 @@
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
     "ignoreUploadUnusedFiles": true,
-    "useStaticServer": true
+    "useStaticServer": true,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.18.0",

utils/main.js

@@ -1328,7 +1328,11 @@ function UploadUserConfig(callback) {
   if (folderOrder)
     param1.FolderOrder = folderOrder;
 
+  if (app.globalData.userInfo.CurrentUserID)
+    param1.CurrentUserID=app.globalData.userInfo.CurrentUserID;
+
   //console.log(param1);
+  //debugger;
   that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
     if (callback) {
       callback();
@@ -1803,13 +1807,11 @@ function resetTodayTask(){
     title: '提醒',
     content: '此操作无法撤销。确认重置今天的任务量吗？',
     showCancel:true,
-    cancelText:"确定",
-    confirmColor:"#000000",
-    confirmText:"取消",
+    cancelText:"取消",
+    confirmColor:"#ff0000",
+    confirmText:"确定",
     success (res) {
       if (res.confirm) {
-        //console.log('用户点击取消');
-      } else if (res.cancel) {
         //console.log('用户点击确定')
         var url = "ResetMiaoguoCardTask?UserID=" + app.globalData.userInfo.UserID;
         getData(url, function (data) {