2.1.15

app.js

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

pages/index/index.js

@@ -147,9 +147,10 @@ Page({
         var pid=options.PrintID;
         if (!pid)
           pid=options.P;
+        var puid=options.U;
         this.setData({
           gotoType: "other",
-          gotoUrl: "../main/mainlist?PrintID="+pid,
+          gotoUrl: "../main/mainlist?PrintID="+pid+"&PrintUserID="+puid,
         });
       }
       else if (options.type == "paycontinue") { 

pages/main/add.js

@@ -159,16 +159,26 @@ Page({
             card.CardType=0;
           
           card.IsCollect=list[i].IsCollect;
-          if (!card.IsCollect)
+          if (that.data.IsCollect) 
+            card.IsCollect=that.data.IsCollect;
+          else if (!card.IsCollect)
             card.IsCollect=0;
+
           card.FontSize=list[i].FontSize;
-          if (!card.FontSize)
+          if (that.data.FontSize) 
+            card.FontSize=that.data.FontSize;
+          else if (!card.FontSize)
             card.FontSize=48;
+
           card.FolderID=list[i].FolderID;
-          if (!card.FolderID)
+          if (that.data.FolderID) {
+            card.FolderID=that.data.FolderID;
+            card.FolderName=that.data.FolderName;
+          }
+          else if (!card.FolderID){
             card.FolderID=0;
-          card.FolderName=list[i].FolderName;
-
+          }
+          
           if (list[i].LimitTime)
             card.LimitTime=list[i].LimitTime;
           else if (that.data.LimitTime)

pages/main/cardmain.js

@@ -61,14 +61,17 @@ Page({
   getFolderList:function(e){
     var that=this;
     var list=app.globalData.FolderList;
-    common.getStorageValue(that, "FolderOrder", ["","","PanelBtnSelect","","",""], function () {
+    common.getStorageValue(that, "FolderOrder", ["","","","","","","",""], function () {
       if (list.length==0 || e){
         var order=that.data.FolderOrder;
         var url="GetUserFolderList?UserID="+app.globalData.userInfo.UserID;
         if (e){
-          url+="&OrderType="+e.currentTarget.dataset.order;
-          order=["","","","","",""];
+          //url+="&OrderType="+e.currentTarget.dataset.order;
+          order=["","","","","","","",""];
           order[e.currentTarget.dataset.index]="PanelBtnSelect";
+
+          wx.setStorageSync('FolderOrderStr', e.currentTarget.dataset.order);
+          main.UploadUserConfig();
         }
         
         main.getData(url, function (data) {

pages/main/cardmain.wxml

@@ -166,11 +166,14 @@
       </view>
       <view class="PanelOrder1 FlexRow">
         <view class="PanelOrder31">按题卡数量</view>
+        <view class="PanelOrder32 PanelOrder31">按卡单标题</view>
       </view>
       <view class="PanelOrder2 FlexRow">
         <view class="{{FolderOrder[4]}} PanelOrderBtn3 PanelOrderBtn" catchtap="getFolderList" data-order="Total asc" data-index='4'>较少</view>
-        <view class="{{FolderOrder[5]}} PanelOrderBtn"  catchtap="getFolderList" data-order="Total desc" data-index='5'>较多</view>
-        <view class="PanelOrderBtn0"></view>
+        <view class="{{FolderOrder[5]}} PanelOrderBtn" catchtap="getFolderList" data-order="Total desc" data-index='5'>较多</view>
+        <view class="{{FolderOrder[6]}} PanelOrderBtn" catchtap="getFolderList" data-order="Name asc" data-index='6'>a-z</view>
+        <view class="{{FolderOrder[7]}} PanelOrderBtn3 PanelOrderBtn"  catchtap="getFolderList" data-order="Name desc" data-index='7'>z-a</view>
+        
       </view>
       <view class="PanelOrderLine60"></view>
     </view>

pages/main/detail.js

@@ -4,14 +4,15 @@ import constant from '../../utils/constant';
 
 const app = getApp();
 
-const arrStudyPlan = ["日常","紧急"];
+const arrStudyPlan = ["日常", "紧急"];
 
 var innerAudioContext1;
 
 var listTaskFinished = []; //完成的任务
 var timeStart; //计算时长
 var timeHistory = 0; //已经过去的时间
-var TaskList = [];
+var TaskList = []; //任务列表
+var FolderList = []; //卡单列表
 var arrImage = [],
   arrImage2 = [];
 var intervalSound = 0,
@@ -21,13 +22,16 @@ var isExit = true;
 
 var isPlaying = false;
 
+var currentFolderID = -1; //当前练习卡单ID，没有时为-1
+var currentFolderStart = false;
+
 var timeoutPlayAudio;
 var tempPlayUrl = "";
 var tempPlayUrlLocal = "";
 var timeoutEveryCard = 0;
 var timeoutHide = 0;
 
-var arrAutoAudio=[];
+var arrAutoAudio = [];
 
 Page({
   data: {
@@ -37,19 +41,23 @@ Page({
     NumberHistory: 30,
     IsShowNumberInfo: false,
     IsMore: false,
+    IsShowOrder: false,
+    IsShowFolder: false,
     FontSizeArray: constant.arrFontSize,
     StudyPlanArray: arrStudyPlan,
     TaskInfo: {},
-    Color: {ID: 1},
-    IsAutoSound:false,//是否设置了自动播放
-    IsAutoSoundStart:false,//是否开始自动播放
-    Title:"",
+    Color: {
+      ID: 1
+    },
+    IsAutoSound: false, //是否设置了自动播放
+    IsAutoSoundStart: false, //是否开始自动播放
+    Title: "",
   },
   onReady: function () {
     var that = this;
     innerAudioContext1 = wx.createInnerAudioContext();
     innerAudioContext1.onPlay(() => {
-      console.log('开始播放')
+      //console.log('开始播放')
     });
     innerAudioContext1.onError((res) => {
       console.log("innerAudioContext1.errMsg:" + res.errMsg);
@@ -95,13 +103,13 @@ Page({
     this.getColor();
 
     this.getMemoryLevel();
-    
+
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
 
-    if (app.globalData.IsOppo){
+    if (app.globalData.IsOppo) {
       that.setData({
-        TextSpace:"nbsp",
+        TextSpace: "nbsp",
       });
     }
 
@@ -137,19 +145,22 @@ Page({
       }
     }
 
-    
-    if (that.data.IsMore){
+    if (that.data.IsMore) {
       //关于更改学习计划后处理
-      if (app.globalData.IsUpdateStudyPlan == 1){
-        that.gotoNext({ currentTarget: { dataset: { btnnumber:-2}}});
+      if (app.globalData.IsUpdateStudyPlan == 1) {
+        that.gotoNext({
+          currentTarget: {
+            dataset: {
+              btnnumber: -2
+            }
+          }
+        });
         app.globalData.IsUpdateStudyPlan = 0;
       }
       that.setData({
         IsMore: false,
       });
     }
-    
-    
     clearTimeout(timeoutHide);
     //console.log("显示");
   },
@@ -184,10 +195,10 @@ Page({
     });
     wx.stopPullDownRefresh();
   },
-  setSoundFile: function (isFinish) { 
+  setSoundFile: function (isFinish) {
     //isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
     var that = this;
-    if (that.data.HasSound){
+    if (that.data.HasSound) {
       var url = "/pages/sounds/";
       if (isFinish == 1) {
         url += "end.mp3";
@@ -228,6 +239,7 @@ Page({
   },
   getList: function () {
     var task = app.globalData.TaskToday;
+    FolderList = task.FolderName;
     var that = this;
     var arrNew = task.ListNew;
     var arrHistory = task.ListHistory;
@@ -280,15 +292,20 @@ Page({
 
     //处理列表
     TaskList = formatList(TaskList);
-
+    var taskInfo = {};
     if (TaskList.length > 0) {
       arrImage = TaskList[0].ContentNew.Images;
       arrImage2 = TaskList[0].ContentNew.Images2;
-    }
 
-    var taskInfo = TaskList[0];
-    if (!taskInfo)
-      taskInfo = {};
+      that.autoAudioPlayInit();
+      taskInfo = TaskList[0];
+
+      
+      common.getStorageValue(that, "IsFolderPractice", 0, function () {
+        if (that.data.IsFolderPractice==1)
+          that.onShowFolder();
+      });
+    }
 
     that.setData({
       NumberNew: arrNew.length,
@@ -298,7 +315,6 @@ Page({
       CanUndo: 0,
     });
 
-    that.autoAudioPlayInit();
 
     listTaskFinished = [];
     that.timeCompute(); //起始时间
@@ -344,23 +360,23 @@ Page({
       var start = e.currentTarget.dataset.start;
       var that = this;
       if (!(that.data.NumberNew == 0 &&
-        that.data.NumberReview == 0 &&
-        that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
+          that.data.NumberReview == 0 &&
+          that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
 
         var recommend = 0;
         if (start) {
           that.data.IsShowAnswer[0] = 0;
           that.data.IsShowAnswer[1] = 0;
         } else {
-          if (!that.data.IsShowAnswer){
-            that.data.IsShowAnswer=[0,0];
+          if (!that.data.IsShowAnswer) {
+            that.data.IsShowAnswer = [0, 0];
           }
-          if (that.data.IsShowAnswer[0]==0 && that.data.IsShowAnswer[1]==0) {
+          if (that.data.IsShowAnswer[0] == 0 && that.data.IsShowAnswer[1] == 0) {
             that.data.IsShowAnswer[0] = 1;
-            
+
             if (TaskList[0].ContentNew.Field[3].length == 0) {
               that.data.IsShowAnswer[1] = 1;
-              
+
               if (!that.data.TaskInfo.IsNew)
                 recommend = getRecommendTime();
               that.setData({
@@ -369,7 +385,7 @@ Page({
             }
           } else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
             that.data.IsShowAnswer[1] = 1;
-            
+
             if (!that.data.TaskInfo.IsNew)
               recommend = getRecommendTime();
             that.setData({
@@ -382,13 +398,53 @@ Page({
         });
         that.autoAudioPlayInit();
 
-        if (that.data.IsShowAnswer[1]){
-          var query = wx.createSelectorQuery().in(that)
-          query.select('#ViewField3').boundingClientRect(function(res){
-            if (res && res.top && res.top>130)
-              scroll(res.top-130);
-          }).exec();
+        if (that.data.IsShowAnswer[0]==1 && that.data.IsShowAnswer[1]==0) {
+          startScroll(2);
         }
+        else if (that.data.IsShowAnswer[0]==1 && that.data.IsShowAnswer[1]==1) {
+          if (that.data.TaskInfo.Content[3].Content){
+            startScroll(3);
+          }
+          else{
+            startScroll(2);
+          }
+        }
+      }
+
+      function startScroll(t){
+        var num=0;
+        setHeight("#ViewField1",function(h1){
+          num+=h1;
+          setHeight("#ViewFieldTag",function(hTag){
+            if (hTag>0)
+              num+=hTag+60;
+            console.log("hTag:"+(hTag));
+            
+            setHeight("#ViewField2",function(h2){
+              if (t==2){
+                if (h2>(app.globalData.systemInfo.screenHeight/3))
+                  scroll(num);
+              }
+              else{
+                num+=h2+20;
+                scroll(num);
+              }
+            });
+          });
+        });
+      }
+
+      function setHeight(obj,callback) {
+        var query = wx.createSelectorQuery().in(that);
+        query.select(obj).boundingClientRect(function (res) {
+          if (res && res.height){
+            console.log(obj+".height:"+res.height);
+            callback(res.height);
+          }
+          else{
+            callback(0);
+          }
+        }).exec();
       }
 
       function scroll(top) {
@@ -492,151 +548,152 @@ Page({
   //进入下一张题卡
   gotoNext: function (e) {
     var that = this;
-    //btnnumber可以有 5:秒过 4正常 3困难 2挪到最后 1搁置 0不过 -1今天要练 -2更改计划
+    //btnnumber可以有 5:秒过 4正常 3困难 2挪到最后 1搁置 0不过 -1今天要练 -2更改计划 -3卡单练习
     var btnnumber = e.currentTarget.dataset.btnnumber;
     //若是“挪到最后”
     if (btnnumber == 2) {
       var card = TaskList.splice(0, 1);
-      card[0].IsFinally=true;
-      card[0].LimitTime=common.formatTime(new Date(),"/",true)+" 23:59:59";
+      card[0].IsFinally = true;
+      card[0].LimitTime = common.formatTime(new Date(), "/", true) + " 23:59:59";
       TaskList.push(card[0]);
       that.setData({
         IsShowAnswer: [0, 0],
         TaskInfo: TaskList[0],
         CanUndo: 1,
         Recommend: 0,
-        IsMore: false,
+        IsShowOrder: false,
       });
-    }
-    else{
-      var time = e.currentTarget.dataset.time;
-      //处理当前卡片进入历史数组
-      var finishCard = {};
-      finishCard.Card = TaskList[0];
-
-      finishCard.NumberNew = this.data.NumberNew;
-      finishCard.NumberReview = this.data.NumberReview;
-      finishCard.NumberHistory = this.data.NumberHistory;
-
-      finishCard.Number0Old = TaskList[0].Number0;
-      finishCard.Number0StrOld = TaskList[0].Number0Str;
-      finishCard.Number1Old = TaskList[0].Number1;
-      finishCard.Number1StrOld = TaskList[0].Number1Str;
-      finishCard.Number2Old = TaskList[0].Number2;
-      finishCard.Number2StrOld = TaskList[0].Number2Str;
-      finishCard.Number3Old = TaskList[0].Number3;
-      finishCard.Number3StrOld = TaskList[0].Number3Str;
-
-      
-      //若是当前题卡更改学习计划
-      if (btnnumber==-2) {
-        for (var i = 0,flag=true; i < listTaskFinished.length;flag?i++:i){
-          if (listTaskFinished[i].Card.MiaoguoCardID==finishCard.Card.MiaoguoCardID){
-            listTaskFinished.splice(i,1);
-            flag=false;
+    } else {
+      //若是没有选择了卡单，或者刚刚选择卡单
+      if (currentFolderID == -1 || !currentFolderStart) {
+        
+        var time = e.currentTarget.dataset.time;
+        //处理当前卡片进入历史数组
+        var finishCard = {};
+        finishCard.Card = TaskList[0];
+
+        finishCard.NumberNew = this.data.NumberNew;
+        finishCard.NumberReview = this.data.NumberReview;
+        finishCard.NumberHistory = this.data.NumberHistory;
+
+        finishCard.Number0Old = TaskList[0].Number0;
+        finishCard.Number0StrOld = TaskList[0].Number0Str;
+        finishCard.Number1Old = TaskList[0].Number1;
+        finishCard.Number1StrOld = TaskList[0].Number1Str;
+        finishCard.Number2Old = TaskList[0].Number2;
+        finishCard.Number2StrOld = TaskList[0].Number2Str;
+        finishCard.Number3Old = TaskList[0].Number3;
+        finishCard.Number3StrOld = TaskList[0].Number3Str;
+
+
+        //若是当前题卡更改学习计划
+        if (btnnumber == -2) {
+          for (var i = 0, flag = true; i < listTaskFinished.length; flag ? i++ : i) {
+            if (listTaskFinished[i].Card.MiaoguoCardID == finishCard.Card.MiaoguoCardID) {
+              listTaskFinished.splice(i, 1);
+              flag = false;
+            } else
+              flag = true;
           }
-          else
-            flag=true;
-        }
-      }
-      else{
-        //若不是搁置
-        //算出下一次的时间
-        if (btnnumber != "1") {
-
-          //若是分钟，则进入复习列表
-          if (time.lastIndexOf("m") == time.length - 1) {
-            var minute = Number(time.substr(0, time.indexOf("m")));
-            TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
-            //若是新建，则10m 1d 4d
-            if (TaskList[0].IsNew) {
-              if (minute == 1) {
-                TaskList[0].Number0 = "1m";
-                TaskList[0].Number2 = "10m";
+        } else {
+          //若不是搁置
+          //算出下一次的时间
+          if (btnnumber != "1") {
+
+            //若是分钟，则进入复习列表
+            if (time.lastIndexOf("m") == time.length - 1) {
+              var minute = Number(time.substr(0, time.indexOf("m")));
+              TaskList[0].LimitTime = common.formatTime(common.addDate("n", minute, new Date()));
+              //若是新建，则10m 1d 4d
+              if (TaskList[0].IsNew) {
+                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;
+
+                delete TaskList[0].Number3;
+                delete TaskList[0].Number3Str;
+
+                TaskList[0].FirstTime = null;
+                TaskList[0].LastTime = null;
               }
-              else {
+              //若是历史的，则10m 1d
+              else if (TaskList[0].IsHistory) {
                 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].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
 
-              delete TaskList[0].Number3;
-              delete TaskList[0].Number3Str;
+                delete TaskList[0].Number1;
+                delete TaskList[0].Number1Str;
 
-              TaskList[0].FirstTime = null;
-              TaskList[0].LastTime = null;
-            }
-            //若是历史的，则10m 1d
-            else if (TaskList[0].IsHistory) {
-              TaskList[0].Number0 = "10m";
-              TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
+                TaskList[0].Number2 = "1d";
+                TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
 
-              delete TaskList[0].Number1;
-              delete TaskList[0].Number1Str;
+                delete TaskList[0].Number3;
+                delete TaskList[0].Number3Str;
+              }
 
-              TaskList[0].Number2 = "1d";
-              TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
+              finishCard.IsReviewOld = TaskList[0].IsReview;
 
-              delete TaskList[0].Number3;
-              delete TaskList[0].Number3Str;
+              TaskList[0].IsReview = true;
+              TaskList.push(TaskList[0]);
+            }
+            //若是天月年
+            else {
+              var dayNum = Number(time.substr(0, time.indexOf("d")));
+              var date = common.addDate("d", dayNum, new Date());
+              TaskList[0].LimitTime = common.formatTime(date);
             }
 
-            finishCard.IsReviewOld = TaskList[0].IsReview;
+          }
 
-            TaskList[0].IsReview = true;
-            TaskList.push(TaskList[0]);
+          //修改学习任务个数
+          var learningType = 0;
+          if (TaskList[0].IsReview) {
+            learningType = 2;
           }
-          //若是天月年
-          else {
-            var dayNum = Number(time.substr(0, time.indexOf("d")));
-            var date = common.addDate("d", dayNum, new Date());
-            TaskList[0].LimitTime = common.formatTime(date);
+          if (TaskList[0].IsNew) {
+            learningType = 0;
+          } else if (TaskList[0].IsHistory) {
+            learningType = 1;
           }
 
-        }
-
-        //修改学习任务个数
-        var learningType = 0;
-        if (TaskList[0].IsReview) {
-          learningType = 2;
-        }
-        if (TaskList[0].IsNew) {
-          learningType = 0;
-        } else if (TaskList[0].IsHistory) {
-          learningType = 1;
-        }
+          if (btnnumber == "1") {
+            learningType = 3;
+          }
 
-        if (btnnumber == "1") {
-          learningType = 3;
-        }
+          finishCard.IntervalTime = time;
+          finishCard.BtnNumber = btnnumber;
+          finishCard.LearningType = learningType;
 
-        finishCard.IntervalTime = time;
-        finishCard.BtnNumber = btnnumber;
-        finishCard.LearningType = learningType;
+          var duration = common.diffDate("s", timeStart, new Date());
+          if (finishCard.btnnumber == 1)
+            duration = 0;
+          finishCard.Duration = timeHistory + duration;
 
-        var duration = common.diffDate("s", timeStart, new Date());
-        if (finishCard.btnnumber == 1)
-          duration = 0;
-        finishCard.Duration = timeHistory + duration;
+          //console.log("CardTime:" + finishCard.Duration);
 
-        console.log("CardTime:" + finishCard.Duration);
+          timeHistory = 0;
+          that.timeCompute();
 
-        timeHistory = 0;
-        that.timeCompute();
+          finishCard.LastTime = common.formatTime(new Date());
+          //添加完成列表，去掉任务列表数据
+          listTaskFinished.push(finishCard);
+        }
 
-        finishCard.LastTime=common.formatTime(new Date());
-        //添加完成列表，去掉任务列表数据
-        listTaskFinished.push(finishCard);
+        wx.setStorageSync("ListTaskFinished", listTaskFinished);
+        TaskList.shift();
+        
       }
 
-      wx.setStorageSync("ListTaskFinished", listTaskFinished);
-      TaskList.shift();
-
       that.data.NumberNew = 0;
       that.data.NumberHistory = 0;
       that.data.NumberReview = 0;
@@ -652,12 +709,27 @@ Page({
         } else if (TaskList[i].IsHistory) {
           that.data.NumberHistory++;
         }
-        if (TaskList[i].IsFinally){
+        if (TaskList[i].IsFinally) {
           var card = TaskList.splice(i, 1);
           TaskList.push(card[0]);
         }
       }
 
+      currentFolderStart = false;
+      //若选择了卡单
+      var bFolder=false;
+      if (currentFolderID>=0){
+
+        for(var i=0;i<TaskList.length;i++){
+          if (TaskList[i].FolderID==currentFolderID){
+            var card = TaskList.splice(i, 1);
+            TaskList.unshift(card[0]);
+            bFolder=true;
+            break;
+          }
+        }
+      }
+
       //console.log(JSON.stringify(TaskList[0]));
       //如果所有任务完成
       if (that.data.NumberNew == 0 &&
@@ -682,6 +754,13 @@ Page({
       }
       //没有完成任务
       else {
+
+        //如果卡单内题卡已经练习完毕，则重新选择卡单
+        if (currentFolderID>=0 && !bFolder){
+          currentFolderID=-1;
+          that.onShowFolder();
+        }
+
         arrImage = TaskList[0].ContentNew.Images;
         arrImage2 = TaskList[0].ContentNew.Images2;
 
@@ -697,6 +776,9 @@ Page({
           IsMore: false,
         });
 
+        console.log("MiaoguoCardID:"+TaskList[0].MiaoguoCardID);
+        console.log("FolderID:"+TaskList[0].FolderID);
+
         that.autoAudioPlayInit();
 
         if (btnnumber == "1") {
@@ -729,22 +811,22 @@ Page({
       console.log("timeHistory:" + timeHistory);
 
       if (!(that.data.NumberNew == 0 &&
-        that.data.NumberReview == 0 &&
-        that.data.NumberHistory == 0)){
-          wx.showModal({
-            title: '提醒',
-            content: '您已等待了' + app.globalData.CardWaitTimeMax + '分钟',
-            showCancel: false,
-            confirmText: "知道了",
-            success(res) {
-              clearTimeout(timeoutEveryCard);
-              if (res.confirm) {
-                that.timeCompute();
-              }
-            },
-          });
-        }
-      
+          that.data.NumberReview == 0 &&
+          that.data.NumberHistory == 0)) {
+        wx.showModal({
+          title: '提醒',
+          content: '您已等待了' + app.globalData.CardWaitTimeMax + '分钟',
+          showCancel: false,
+          confirmText: "知道了",
+          success(res) {
+            clearTimeout(timeoutEveryCard);
+            if (res.confirm) {
+              that.timeCompute();
+            }
+          },
+        });
+      }
+
     }, app.globalData.CardWaitTimeMax * 60 * 1000);
   },
   gotoCollect: function () {
@@ -791,28 +873,37 @@ Page({
           TodayTime: duration,
           Speed1: speed1 + "张题卡",
           Speed2: speed2,
-          Title:"报告",
+          Title: "报告",
         });
 
       }
     });
   },
   showNumberContainner: function () {
-    this.setData({
-      IsShowNumberInfo: true,
-    });
-    this.setData({
-      Title:"进度",
-    });
+    if (!this.data.Title) {
+      this.setData({
+        IsShowNumberInfo: true,
+        IsMore: false,
+        IsShowOrder: false,
+        IsShowFolder: false,
+      });
+      this.setData({
+        Title: "进度",
+      });
+      clearTimeout(timeoutEveryCard);
+    }
   },
   closeNumberContainner: function () {
     this.setData({
       IsShowNumberInfo: false,
       IsMore: false,
+      IsShowOrder: false,
+      IsShowFolder: false,
     });
     this.setData({
       Title: "",
     });
+    this.timeCompute();
   },
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
@@ -874,8 +965,54 @@ Page({
     this.setData({
       IsMore: true,
       FontSizeArray: this.data.FontSizeArray,
+      Title: "更多功能",
+    });
+    clearTimeout(timeoutEveryCard);
+  },
+
+  onShowOrder: function () {
+    this.setData({
+      IsShowOrder: true,
+      Title: "出题顺序",
+    });
+    clearTimeout(timeoutEveryCard);
+  },
+  onShowFolder: function () {
+    for (var j = 0; j < FolderList.length; j++) {
+      FolderList[j].Total = 0;
+      for (var i = 0; i < TaskList.length; i++) {
+        if (TaskList[i].FolderID == FolderList[j].FolderID) {
+          FolderList[j].Total++;
+        }
+      }
+    }
+    for (var j = 0; j < FolderList.length; j++) {
+      if (FolderList[j].Total == 0){
+        FolderList.splice(j--,1);
+      }
+    }
+
+    this.setData({
+      IsShowFolder: true,
+      IsShowNumberInfo: false,
+      IsMore: false,
+      IsShowOrder: false,
+      FolderList: FolderList,
+      Title: " ",
     });
   },
+  setCurrentFolder: function (e) {
+    currentFolderID = e.currentTarget.dataset.folderid;
+    currentFolderStart = true;
+    this.gotoNext({
+      currentTarget: {
+        dataset: {
+          btnnumber: -3
+        }
+      }
+    });
+    this.closeNumberContainner();
+  },
   onClose: function () {
     wx.navigateBack({
       delta: 1,
@@ -886,11 +1023,11 @@ Page({
     if (!index) {
       index = 0;
     }
-    if (index>1)
-      index=1;
+    if (index > 1)
+      index = 1;
     app.globalData.MemoryLevel = index;
     this.setData({
-      MemoryLevel:index,
+      MemoryLevel: index,
     });
   },
 
@@ -936,8 +1073,8 @@ Page({
 
           canvas.setFontSize(68);
           if (!that.data.TodayTime)
-            that.data.TodayTime=0;
-            
+            that.data.TodayTime = 0;
+
           canvas.fillText(that.data.TodayTime, 390, 148);
 
           canvas.font = "normal 500 68px caption";
@@ -974,7 +1111,7 @@ Page({
                   urls: [res2.tempFilePath] // 需要预览的图片http链接列表
                 });
 
-                main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) { });
+                main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
               },
               fail: function (e) {
                 wx.hideLoading();
@@ -986,13 +1123,13 @@ Page({
           wx.hideLoading();
         }
       },
-      fail: function () {
+      fail: function (e) {
         wx.hideLoading();
       }
     });
   },
-  saveCardType:function(){
-    var that=this;
+  saveCardType: function () {
+    var that = this;
     var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
     url += "&CardType=-1";
     url += "&ID=" + TaskList[0].MiaoguoCardID;
@@ -1000,18 +1137,27 @@ Page({
       TaskList.splice(0, 1);
       that.setData({
         TaskInfo: TaskList[0],
-        IsShowAnswer:[0,0],
+        IsShowAnswer: [0, 0],
       });
       that.closeNumberContainner();
     });
   },
-  switchSound:function(e){
-    var that=this;
-    var autoAudio=!that.data.IsAutoSound;
+  saveIsFolderPractice:function(e){
+    var that = this;
+    var IsFolderPractice = that.data.IsFolderPractice==0 ? 1 : 0;
     that.setData({
-      IsAutoSound:autoAudio,
+      IsFolderPractice: IsFolderPractice,
     });
-    if (autoAudio){
+    wx.setStorageSync('IsFolderPractice', IsFolderPractice);
+    main.UploadUserConfig();
+  },
+  switchSound: function (e) {
+    var that = this;
+    var autoAudio = !that.data.IsAutoSound;
+    that.setData({
+      IsAutoSound: autoAudio,
+    });
+    if (autoAudio) {
       wx.setStorageSync('IsAutoSound', 1);
       wx.showModal({
         title: '提醒',
@@ -1019,80 +1165,83 @@ Page({
         showCancel: false,
         confirmText: "知道了",
         success(res) {
-          
+
         },
       });
-    }
-    else{
+    } else {
       wx.setStorageSync('IsAutoSound', 0);
     }
+    main.UploadUserConfig();
   },
-  autoAudioPlayInit:function(){
-    var that=this;
-    common.getStorageValue(that, "IsAutoSound", 0, function () {
-      if (that.data.IsAutoSound==1){
-        var taskInfo=that.data.TaskInfo;
-        var field={};
-        var fieldNumber=1;
-        if (that.data.IsShowAnswer[0]==1)
-          fieldNumber=2;
-        if (that.data.IsShowAnswer[1]==1 && taskInfo.ContentNew.Field[3].length>0)
-          fieldNumber=3;
-        field=taskInfo.ContentNew.Field[fieldNumber];
-        arrAutoAudio=[];
-        for(var i=0;i<field.length;i++){
-          if (field[i].Type=="sound" || field[i].Type=="recorder"){
-            field[i].FieldNumber=fieldNumber;
+  autoAudioPlayInit: function () {
+    var that = this;
+    common.getStorageValue(that, "IsAutoSound", 1, function () {
+      if (that.data.IsAutoSound == 1) {
+        var taskInfo = that.data.TaskInfo;
+        var field = {};
+        var fieldNumber = 1;
+        if (that.data.IsShowAnswer[0] == 1)
+          fieldNumber = 2;
+        if (that.data.IsShowAnswer[1] == 1 && taskInfo.ContentNew.Field[3].length > 0)
+          fieldNumber = 3;
+        field = taskInfo.ContentNew.Field[fieldNumber];
+        arrAutoAudio = [];
+        for (var i = 0; i < field.length; i++) {
+          if (field[i].Type == "sound" || field[i].Type == "recorder") {
+            field[i].FieldNumber = fieldNumber;
             arrAutoAudio.push(field[i]);
           }
         }
-        
-        if (arrAutoAudio.length>0){
+
+        if (arrAutoAudio.length > 0) {
           that.setData({
-            IsAutoSoundStart:true,
+            IsAutoSoundStart: true,
           });
-          that.autoAudioPlayStart();  
+          that.autoAudioPlayStart();
         }
       }
     });
   },
-  autoAudioPlayStart:function(){
-    var that=this;
-    if (arrAutoAudio.length>0){
-      var item=arrAutoAudio[0];
-      if (item.Type=="recorder")
-        item.Content=item.Type;
-      that.playSound({currentTarget:{dataset:{
-        content:item.Content,
-        soundmark:item.SoundMark,
-        fieldid:item.FieldNumber,
-      }}});
-      arrAutoAudio.splice(0,1);
-      
+  autoAudioPlayStart: function () {
+    var that = this;
+    if (arrAutoAudio.length > 0) {
+      var item = arrAutoAudio[0];
+      if (item.Type == "recorder")
+        item.Content = item.Type;
+      that.playSound({
+        currentTarget: {
+          dataset: {
+            content: item.Content,
+            soundmark: item.SoundMark,
+            fieldid: item.FieldNumber,
+          }
+        }
+      });
+      arrAutoAudio.splice(0, 1);
+
     }
   },
-  autoAudioPlayEnd:function(){
-    var that=this;
-    arrAutoAudio=[];
+  autoAudioPlayEnd: function () {
+    var that = this;
+    arrAutoAudio = [];
     if (innerAudioContext1) {
       innerAudioContext1.stop();
     }
     that.audioCtx.pause();
-  
+
     that.setData({
-      IsAutoSoundStart:false,
+      IsAutoSoundStart: false,
     });
   },
   //音频播放结束
   audioBindEnded: function () {
-    var that=this;
+    var that = this;
     isPlaying = false;
-    if (arrAutoAudio.length>0){
+    if (arrAutoAudio.length > 0) {
       that.autoAudioPlayStart();
-    }
-    else{
+    } else {
       that.setData({
-        IsAutoSoundStart:false,
+        IsAutoSoundStart: false,
       });
     }
   },
@@ -1178,13 +1327,19 @@ Page({
     wx.navigateTo({
       url: url,
     });
+  },
+  getNull: function () {
+
   },
   //获取导航栏高度
   getBarInfo(e) {
-    var h=e.detail.topBarHeight;
-    h=h*2;
-    this.setData({ 
-       topBarHeight: h,
+    var h = e.detail.topBarHeight;
+    h = h * 2;
+    if (app.globalData.IsIPad){
+      h+=25;
+    }
+    this.setData({
+      topBarHeight: h,
     })
   },
   onShareAppMessage: function () {

pages/main/detail.wxml

@@ -1,6 +1,6 @@
 <import src="../template/cardShow.wxml" />
-<navigation-bar show="true" center="true" left="true" background="{{Color.BackColor}}" color="#fff">
-    <view slot="left" bindtap="onClose">
+<navigation-bar show="true" center="true" bindgetBarInfo="getBarInfo" left="true" background="{{Color.BackColor}}" color="#fff">
+    <view slot="left" bindtap="onClose" wx:if="{{NumberNew+NumberReview+NumberHistory>0}}">
       <view class="square">退出练习</view>
     </view>
     <view slot="center" bindtap="showNumberContainner" class='panelNumber FlexRow'>
@@ -31,6 +31,11 @@
 
     <!-- 工具栏 -->
     <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
+      <view class='panelCancel FlexRow' catchtap='onShowOrder'>
+        <view class='panelCancel0 FlexRow'>
+          <image src="../images/universalpic_4blocks_gray_28x28.png" class='universalpic_4blocks_gray_28x28' />
+        </view>
+      </view>
       <view class='panelCancel FlexRow' catchtap='gotoCollect'>
         <view class='panelCancel0 FlexRow'>
           <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_star_gray_34x34.png" class='universalpic_star_gray_34x34' />
@@ -203,15 +208,17 @@
   </view>
 
   <!-- 更多功能 -->
-  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" catchtap="getNull" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
     <view class="numberContainerFooter1 FlexColumn">
+           
       <view class='lineFooter'></view>
-      <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">
-        <image src="../images/universalpic_sendtoback_gray_30x26.png" class='universalpic_sendtoback_gray_30x26' />
-        <view class='numberContainerFooter111'>挪到最后</view>
-      </view>      
+
+      <view class='numberContainerFooter102 FlexRow' catchtap='saveCardType'>
+        <image src="../images/universalpic_practisemodel_gray_30x28.png" class='universalpic_practisemodel_gray_30x28' />
+        <view class='numberContainerFooter111'>归档题卡</view>
+      </view>
       <view class='lineFooter'></view>
-      
+
       <view class='numberContainerFooter101 FlexRow'>
         <image src="../images/universalpic_typesize_gray_30x18.png" class='universalpic_typesize_gray_30x18' />
         <view class='numberContainerFooter11 FlexColumn'>
@@ -222,26 +229,84 @@
         </view>
       </view>
       <view class='lineFooter'></view>
-
-      <view class='numberContainerFooter102 FlexRow' catchtap='saveCardType'>
-        <image src="../images/universalpic_practisemodel_gray_30x28.png" class='universalpic_practisemodel_gray_30x28' />
-        <view class='numberContainerFooter111'>把这张题卡归档</view>
-      </view>
-            
-      <view class='lineFooter'></view>
       
       <view class='numberContainerFooter102 FlexRow'>
         <image src="../images/universalpic_autoread_gray_30x23.png" class='universalpic_autoread_gray_30x23' />
         <view class='numberContainerFooter111'>自动播放题卡里的声音</view>
         <switch class="switch" color="#4CD964" checked="{{IsAutoSound}}" bindchange="switchSound"/>
       </view>
-            
       <view class='lineFooter'></view>
     </view>
     <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
       <view>关闭</view>
     </view>
   </view>
+
+  <!-- 出题顺序 -->
+  <view wx:if="{{IsShowOrder}}" class="numberContainer FlexColumn" catchtap="getNull" style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+    <view class="numberContainerFooter1 FlexColumn">
+      <view class='lineFooter'></view>
+      <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">
+        <image src="../images/universalpic_sendtoback_gray_30x26.png" class='universalpic_sendtoback_gray_30x26' />
+        <view class='numberContainerFooter111'>挪到最后</view>
+      </view>      
+      <view class='lineFooter'></view>
+      
+      
+      <view class='numberContainerFooter107 FlexRow' catchtap='onShowFolder'>
+        <view class="MenuLeft FlexRow">
+        <image src="../images/universalpic_cardlist_gray_30x28.png" class='universalpic_cardlist_gray_30x28' />
+        <view class='numberContainerFooter111'>卡单优先</view>
+        </view>
+        <view class="MenuRight">
+        <image src='../images/universalpic_indicator_right_white.png' class="Arrow" />
+        </view>
+			</view>
+      <view class='lineFooter'></view>
+    </view>
+    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'>
+      <view>关闭</view>
+    </view>
+  </view>
+
+  <!-- 卡单 -->
+  <view wx:if="{{IsShowFolder}}" class="numberContainer FlexColumn" catchtap="getNull"
+  style='min-height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};top:{{topBarHeight}}rpx;'>
+    <view class='numberContainerFooter106 FlexColumn'>
+      <view class="numberContainerFooter1061">按卡单优先出题</view>
+      <view class="numberContainerFooter1062">如果想改变任务量的出题顺序（如，早上练诗词，晚上练识字，睡前练单词，计算题集中在作业后等），首先利用卡单给题卡做分类，然后在这里选择优先出题的卡单。</view>
+    </view>
+    <scroll-view scroll-y="true" class="FolderList FlexColumn" style="height:{{Containnerheight-450}}rpx;">
+      <view class="FolderItem FlexRow" catchtap="setCurrentFolder" data-folderid='0' wx:if="{{FolderList[0].FolderID==0 && FolderList[0].Total>0}}">
+        <view class="FolderItem1">没有卡单的题卡</view>
+        <view class="MenuRight FlexRow">
+          <view class="FolderItem2 FolderItem1">{{FolderList[0].Total}}张</view>  
+          <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			  </view>
+      </view>
+      <view class="FolderTitle" wx:if="{{FolderList.length>1 || FolderList[0].FolderID>0}}">可优先出题的卡单</view>
+      <view class="FolderTitle" wx:if="{{FolderList.length==1 && FolderList[0].FolderID==0}}">任务量里没有卡单</view>
+      <view class="FolderItem0 FolderItem FlexRow" wx:for="{{FolderList}}" catchtap="setCurrentFolder" data-folderid='{{item.FolderID}}'
+       wx:key="*this" wx:if="{{item.FolderID!=0}}">
+        <view class="FolderItem1">{{item.FolderName}}</view>
+        <view class="MenuRight FlexRow">
+          <view class="FolderItem2 FolderItem1">{{item.Total}}张</view>  
+          <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			  </view>
+      </view>
+      <view style="height:60rpx"></view>
+    </scroll-view>
+    <view class='numberContainerFooter105 FlexRow' style="background-color:{{Color.BackColor}};">
+      <view class="numberContainerFooter1051 FlexColumn">
+        <view class="numberContainerFooter10511">每次练习都要选</view>
+        <view class="numberContainerFooter10512">开始练习时，只要任务量里有卡单就自动开启本功能</view>
+      </view>
+      <switch class="switch" checked="{{IsFolderPractice}}" bindchange="saveIsFolderPractice"/>
+    </view>
+    <view class="numberContaineFooter FlexRow" catchtap='closeNumberContainner'  style="background-color:{{Color.BackColor}};z-index:50;">
+      <view>取消</view>
+    </view>
+  </view>
 </view>
 
 <canvas class='Canvas' canvas-id="shareCanvas"></canvas>

pages/main/detail.wxss

@@ -25,7 +25,7 @@ page{
 .panelCancel {
   width: 100rpx;
   height: 110rpx;
-  margin: 0 40rpx;
+  margin: 0 10rpx;
 }
 
 .panelCancel0 {
@@ -35,6 +35,10 @@ page{
   border-radius: 50%;
 }
 
+.universalpic_4blocks_gray_28x28{
+  width: 28rpx;
+  height: 28rpx;
+}
 .universalpic_undo_white_30p_26x20 {
   width: 26rpx;
   height: 19rpx;
@@ -738,4 +742,103 @@ page{
   font-size:20rpx;
   color:#D2D2D2;
   line-height: 70rpx;
+}
+
+.universalpic_cardlist_gray_30x28{
+  width:30rpx;
+  height:28rpx;
+  margin: 0 30rpx;
+}
+
+.numberContainerFooter107{
+  width:100%;
+  justify-content: space-between;
+  height:132rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.numberContainerFooter106{
+  width:100%;
+  justify-content: flex-start;
+  align-items: flex-start;
+  position: absolute;
+  top:30rpx;
+  z-index: 10;
+}
+.numberContainerFooter1061{
+  font-size:32rpx;
+  margin:0 0 0 30rpx;
+}
+.numberContainerFooter1062{
+  font-size:20rpx;
+  color:rgba(255, 255, 255, 0.6);
+  margin:4rpx 0 0 30rpx;
+  width:690rpx;
+}
+
+.FolderList{
+  width:100%;
+  height:780rpx;
+  background-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top:200rpx;
+  z-index: 10;
+  justify-content: flex-start;
+}
+
+.FolderItem{
+  width:710rpx;
+  height:100rpx;
+  border-radius: 10rpx;
+  border:2rpx solid rgba(255,255,255,0.2);
+  margin:30rpx 0 0 20rpx;
+  justify-content: space-between;
+}
+
+.FolderItem0{
+  margin:20rpx 0 0 20rpx;
+}
+.FolderItem1{
+  margin:0 30rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}
+.FolderItem2{
+  color:rgba(255, 255, 255, 0.4);
+  font-weight: 500;
+}
+
+.FolderTitle{
+  margin:50rpx 50rpx 0 50rpx;
+  width:650rpx;
+  font-size:28rpx;
+}
+
+.numberContainerFooter105{
+  width:100%;
+  height: 125rpx;
+  position: fixed;
+  bottom:131rpx;
+  justify-content: space-between;
+  z-index: 50;
+}
+
+
+.numberContainerFooter1051{
+  align-items: flex-start;
+  margin: 0 0 0 30rpx;
+}
+
+.numberContainerFooter10511{
+  font-size:24rpx;
+  font-weight: 400;
+}
+.numberContainerFooter10512{
+  font-size:20rpx;
+  color:rgba(255, 255, 255, 0.6);
 }

pages/main/mainlist.js

@@ -112,7 +112,25 @@ Page({
       that.setData({
         PrintID: options.PrintID,
       });
-      that.getPrintList();
+
+      if (options.PrintUserID!=app.globalData.userInfo.UserID){
+        wx.showModal({
+          title: '提醒',
+          showCancel: false,
+          content: '此打印卷非您微信号生成，请扫描您生成的打印卷查看答案！',
+          confirmText: '知道了',
+          success(res) {
+            if (res.confirm) {
+              wx.navigateBack({
+                delta: 1,
+              });
+            }
+          }
+        });
+      }
+      else{
+        that.getPrintList();
+      }      
     } else if (options.FolderID) { //卡单题卡情况
       wx.setNavigationBarTitle({
         title: "卡单"

pages/template/cardShow.wxml

@@ -1,6 +1,6 @@
 <template name="CardShow">
   <!-- 第一段 -->
-  <view class="panelField1 FlexColumn">
+  <view id="ViewField1" class="panelField1 FlexColumn">
     <view class="editFieldNull"></view>
     <view class="panelField11 panelItem FlexRow" style="font-size:{{FontSize}}rpx;">
       <text class="textProblem" style='background-color:{{Color.LineColor}};'>题目</text>
@@ -38,7 +38,7 @@
   </view>
 
   <!-- 标签 -->
-  <view class="panelTag FlexColumn" wx:if="{{Tags.length>0}}">
+  <view id="ViewFieldTag" class="panelTag FlexColumn" wx:if="{{Tags.length>0}}">
     <view class="panelTag1 FlexRow">
       <view class="tag" wx:for="{{Tags}}" wx:key="index" style='color:{{Color.LineColor}};'>{{item}}</view>
     </view>

pages/test/list.wxml

@@ -17,8 +17,8 @@
 					<view class="right1 FlexRow">
 						<image wx:if="{{item.TestTypeRead==1}}" class="examine_willread_gray_22x22" src="../images/examine_willread_green_22x22.png"></image>
 						<image wx:if="{{!item.TestTypeRead}}" class="examine_willread_gray_22x22" src="../images/examine_willread_gray_22x22.png"></image>
-						<image wx:if="{{ListType!='english' && item.TestTypeWrite==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
-						<image wx:if="{{ListType!='english' && !item.TestTypeWrite}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
+						<image wx:if="{{item.TestTypeWrite==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
+						<image wx:if="{{!item.TestTypeWrite}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
 					</view>
 					<view class="right2">{{item.Words.length}}个<block wx:if="{{ListType=='english'}}">单词</block><block wx:if="{{ListType=='hanzi'}}">字</block></view>
 				</view>

project.config.json

@@ -116,7 +116,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=print&P=184&U=1",
+          "query": "type=print&P=184&U=2",
           "scene": 1047
         },
         {

utils/main.js

@@ -1145,7 +1145,9 @@ function UploadUserConfig(callback) {
   param1.ClickType = wx.getStorageSync("ClickType");
   param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray").join(",");
   param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr").join(",");
-
+  param1.IsFolderPractice = wx.getStorageSync("IsFolderPractice");
+  param1.IsAutoSound = wx.getStorageSync("IsAutoSound");
+  
   var symboMain = wx.getStorageSync("SymbolMain");
   var symbol1 = [];
   for (var i = 0; i < symboMain.length; i++) {
@@ -1154,6 +1156,11 @@ function UploadUserConfig(callback) {
   symbol1 = JSON.stringify(symbol1);
   param1.SymbolList = symbol1;
 
+  var folderOrder=wx.getStorageSync("FolderOrderStr");
+  if (folderOrder)
+    param1.FolderOrder = folderOrder;
+  
+
   that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
     if (callback) {
       callback();
@@ -1188,7 +1195,10 @@ function getUserConfig() {
     wx.setStorageSync("ClickType", data.ClickType);
     wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
     wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
-
+    wx.setStorageSync("FolderOrderStr", data.FolderOrder);
+    wx.setStorageSync("IsFolderPractice", data.IsFolderPractice);
+    wx.setStorageSync("IsAutoSound", data.IsAutoSound);
+    
     var symbol1 = [];
     if (data.SymbolList) {
       for (var i = 0; i < data.SymbolList.length; i++) {