1.6.0

app.js

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

app.json

@@ -1,8 +1,9 @@
 {
   "pages": [
+
     "pages/index/index",
-    
     "pages/main/preview",
+    "pages/plan/pattern",
    
     "pages/index/accredit",
     "pages/index/openSetting",
@@ -27,10 +28,8 @@
     "pages/main/symbolsetting",
     "pages/main/previewMenu",
 
-    "pages/plan/recommend",
     "pages/plan/clicktype",
     "pages/plan/colorplan",
-    "pages/plan/memoryLevel",
     "pages/plan/sortRule",
     "pages/plan/setting",
 

pages/index/index.js

@@ -314,10 +314,7 @@ Page({
     main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
 
       var cardType=wx.getStorageSync("CardType");
-      //若是用户在别的设备修改了计划，则删除原有的数据
-      if (cardType!=data.CardType){
-        wx.removeStorageSync("StudyPlan");
-      }
+      
       wx.setStorageSync("CardType", data.CardType);
 
       wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);

pages/index/index.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "秒过",
+  "navigationBarTitleText": "秒过™",
   "enablePullDownRefresh": true
 }

pages/main/add.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "添加题卡",
+  "navigationBarTitleText": "新建题卡",
   "backgroundColor": "#F0F0F0"
 }

pages/main/default.js

@@ -5,15 +5,17 @@ const app = getApp();
 
 Page({
   data: {
-    IsTempCardNoSaved:false,
-    IsExit:false,
+    IsTempCardNoSaved: false,
+    IsExit: false,
     DayNumber: 0,
     TodayTaskNumber: 0,
     IsStart: 0,
     IsShowMarketing: 1,
-    IsMaintain:0,
+    IsMaintain: 0,
     IsIPhoneX: app.globalData.IsIPhoneX,
     ImagePath: app.globalData.uploadImageUrl,
+    SelectUserData: app.globalData.SelectUserData,
+    IsShowUserID: false,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -27,27 +29,25 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
-    if (app.globalData.IsIPad){
+    if (app.globalData.IsIPad) {
       that.setData({
         IsIPad: "_iPad",
       });
 
-      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth){
+      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
         that.setData({
-          IsExit:true,
+          IsExit: true,
         });
       }
     }
 
-    this.checkMemory();
-
   },
-  onHide:function(){
+  onHide: function () {
     wx.hideLoading();
   },
   onShow: function () {
     var that = this;
-    if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser==1 && app.globalData.userInfo.IsShow == 1) {
+    if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser == 1 && app.globalData.userInfo.IsShow == 1) {
       if (app.globalData.userInfo.Subscribe == 0) {
         wx.redirectTo({
           url: '../other/newuser',
@@ -65,20 +65,20 @@ Page({
                 });
                 app.globalData.GotoUrl = "";
               }
-              else{
+              else {
                 wx.redirectTo({
                   url: '../other/newuser',
                 });
               }
             }
             else if (app.globalData.userInfo.IsMember && app.globalData.userInfo.IsShow == 1) {
-              if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6")>=0){
+              if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6") >= 0) {
                 wx.navigateTo({
                   url: app.globalData.GotoUrl,
                 });
                 app.globalData.GotoUrl = "";
               }
-              else{
+              else {
                 var productServiceTime = common.formatDateCHS(common.formatTime(new Date(app.globalData.userInfo.ProductServiceTime)));
                 var today = common.formatDateCHS(common.formatTime(new Date()));
                 if (productServiceTime < today) {
@@ -99,7 +99,7 @@ Page({
                   app.globalData.GotoUrl = "";
                 }
               }
-              
+
             }
             else if (app.globalData.userInfo.IsShow == 0) {
               main.buildInitData(function () { });
@@ -109,12 +109,6 @@ Page({
               IsAccredit: true,
             });
 
-            common.getStorageValue(that, "UserName", "秒过", function () {
-              wx.setNavigationBarTitle({
-                title: that.data.UserName
-              });
-            });
-
             //判断是否出现推广广告
             common.getStorageValue(that, "IsShowMarketing", app.globalData.userInfo.HasIntroducer, function () {
               if (app.globalData.userInfo.HasIntroducer == 0 && that.data.IsShowMarketing == 3) {
@@ -151,25 +145,25 @@ Page({
       });
     }
 
-    
+
     wx.setNavigationBarColor({
       frontColor: "#ffffff",
       backgroundColor: "#3157BA",
     });
   },
-  init:function(){
+  init: function () {
     //显示学习方案
     var cardType = wx.getStorageSync("CardType");
     if (!cardType)
       cardType = 0;
     this.setData({
-      CardType:cardType,
+      CardType: cardType,
     });
 
     //题卡主题色
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");
     if (!arrColorIndex) {
-      app.globalData.ColorIndex = common.random(1,4);
+      app.globalData.ColorIndex = common.random(1, 4);
     }
     else {
       app.globalData.ColorIndex = arrColorIndex[common.random(0, arrColorIndex.length - 1)];
@@ -178,7 +172,7 @@ Page({
     var clickType = wx.getStorageSync("ClickType");
     if (!clickType)
       clickType = 0;
-    app.globalData.ClickType=clickType;
+    app.globalData.ClickType = clickType;
 
     //显示命名方式
     var MemoryLevel = wx.getStorageSync("MemoryLevel");
@@ -198,7 +192,7 @@ Page({
       url: url,
     });
 
-    if (url =="../marketing/index"){
+    if (url == "../marketing/index") {
       this.setData({
         IsShowMarketing: 2,
       });
@@ -207,15 +201,15 @@ Page({
   },
   //得到当天任务
   getTaskTodayList: function () {
-    var that=this;
+    var that = this;
     main.UpdateMiaoguoCardTodayAll(true, function () {
       main.getTaskTodayList(function (data) {
-        if (data.IsMaintain==1){
+        if (data.IsMaintain == 1) {
           that.setData({
-            IsMaintain:1,
+            IsMaintain: 1,
           });
         }
-        else{
+        else {
           var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
           that.setData({
             DayNumber: data.DayNumber,
@@ -226,10 +220,10 @@ Page({
       });
     });
   },
-  isNoSavedCard:function(){
-    var that=this;
+  isNoSavedCard: function () {
+    var that = this;
     //判断是否有未保存的卡
-    if (app.globalData.userInfo.IsMaintain==1) {
+    if (app.globalData.userInfo.IsMaintain == 1) {
       that.setData({
         IsMaintain: app.globalData.userInfo.IsMaintain,
       });
@@ -248,7 +242,7 @@ Page({
         backgroundColor: "#0B8457",
       })
     }
-    else{
+    else {
       that.setData({
         IsTempCardNoSaved: false,
       });
@@ -258,44 +252,69 @@ Page({
       });
     }
   },
-  onOpenTempCard:function(){
+  onOpenTempCard: function () {
     var card = wx.getStorageSync("TempCardNoSaved");
-    app.globalData.CardList=[card];
+    app.globalData.CardList = [card];
     wx.navigateTo({
-      url: './add?type=add2&id='+card.MiaoguoCardID,
+      url: './add?type=add2&id=' + card.MiaoguoCardID,
     });
   },
-  onGiveupTempCard:function(){
-    var that=this;
+  onGiveupTempCard: function () {
+    var that = this;
     wx.removeStorageSync("TempCardNoSaved");
     that.isNoSavedCard();
   },
-  gotoSearchCard:function(){
+  gotoSearchCard: function () {
     wx.reLaunch({
       url: './searchCard',
     });
   },
-  closeMarketing:function(){
+  closeMarketing: function () {
     this.setData({
-      IsShowMarketing:3,
+      IsShowMarketing: 3,
     });
     wx.setStorageSync("IsShowMarketing", 3);
-    wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d",7,new Date())));
+    wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 7, new Date())));
 
   },
-  checkMemory: function () {
-    wx.onMemoryWarning(function () {
-      // wx.showModal({
-      //   title: '手机内存不足',
-      //   content: '请先清理内存再用秒过。内存不足会导致小程序异常或被迫退出。',
-      //   showCancel: false,
-      //   confirmText: '知道了',
-      //   success: function (res) {
-
-      //   }
-      // });
+  showUserID:function(){
+    var that = this;
+    if (app.globalData.userInfo.UserID == 1) {
+      that.setData({
+        IsShowUserID: true,
+        ChangeuUserID:2,
+      });
+    }
+  },
+  onKeyInput: function (e) {
+    var id = e.detail.value;
+    var that = this;
+    that.setData({
+      ChangeuUserID: id,
     });
   },
+  setSelectUser: function (e) {
+    var that = this;
+    if (app.globalData.userInfo.UserID == 1
+      || app.globalData.userInfo.UserID == 2) {
+      var userid = that.data.ChangeuUserID;
+      wx.setStorageSync("UserID", userid);
+      
+      app.globalData.userInfo.UserID = userid;
+      var url = "GetMiaoguoWXUserInfo?UserID=" + app.globalData.userInfo.UserID + "&FieldStr=NickName";
+      main.getData(url, function (data) {
+        if (data) {
+          wx.setNavigationBarTitle({
+            title: data.NickName
+          });
+        }
+      });
+      that.setData({
+        IsShowUserID: false,
+      });
+      that.onShow();
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.wxml

@@ -17,8 +17,6 @@
 
   <view class='panelBottom FlexColumn'>
 
-    <!-- <image class="study_index_banner_close" src='../images/study_index_banner_close.png' bindtap="closeMarketing" wx:if="{{IsShowMarketing===2}}"/>
-    <image class="study_index_banner" src='{{ImagePath}}web/study_index_banner200112.png' bindtap="goto" data-url="../marketing/index" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}" /> -->
     <image class="study_index_footer" src='../images/study_index_footer.png' wx:if="{{IsShowMarketing===3}}" />
 
     <view class="adPanel FlexColumn" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}">
@@ -41,7 +39,7 @@
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="./add?type=add&id=0">
         <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
-        <view>新增</view>
+        <view>新建</view>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap='gotoSearchCard'>
@@ -51,7 +49,10 @@
     </view>
     <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
+
+  <view class="ChangeUser" bindtap="showUserID"></view>
 </view>
+
 <view wx:if="{{IsTempCardNoSaved}}" class="TempCardNoSaved container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
   <text class='RemindText'>新消息\n刚刚救回了一张尚未\n保存的题卡</text>
@@ -69,4 +70,10 @@
 <view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class='IsExitText'>请关闭微信(务必)，竖起屏幕，再打开秒过学习小程序</view>
   <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>
-</view>
+</view>
+
+<view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+    <input class='input' type="number" value="{{ChangeuUserID}}" bindinput="onKeyInput" />
+    <button class="btnShowUserID" bindtap="setSelectUser">确定</button>
+</view>
+

pages/main/default.wxss

@@ -263,4 +263,23 @@
   width:100rpx;
   font-size:36rpx;
   text-align: center;
+}
+
+.ChangeUser{
+  position: fixed;
+  top:30rpx;
+  left:0;
+  z-index: 100;
+  width:100rpx;
+  height:100rpx;
+}
+.input{
+  background-color: #fff;
+  color:#1e1e1e;
+  text-align: center;
+  font-size:24rpx;
+  margin-top: 30rpx;
+}
+.btnShowUserID{
+  margin-top: 30rpx;
 }

pages/main/detail.js

@@ -64,9 +64,8 @@ Page({
     FontSizeArray: arrFontSize,
     ArrDelayedTime: arrDelayedTime,
     TaskInfo: {},
-    Color: {
-      ID: 1
-    },
+    Color: {ID: 1},
+    TopNumber:156,
   },
   onReady: function () {
     var that = this;
@@ -90,6 +89,19 @@ Page({
       height2 = 670;
     }
 
+
+    if (app.globalData.IsAndroid) {
+      that.setData({
+        TopNumber: 150,
+      });
+    }
+    else if (app.globalData.IsIPad) {
+      that.setData({
+        TopNumber: 59,
+      });
+    }
+
+
     that.setData({
       Containnerheight: height,
       Containnerheight2: height - height2,
@@ -516,7 +528,7 @@ Page({
         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
+          //若是新建，则10m 1d 4d
           if (TaskList[0].IsNew) {
             if (minute==1){
               TaskList[0].Number0 = "1m";
@@ -925,7 +937,12 @@ Page({
     if (!index) {
       index = 0;
     }
+    if (index>1)
+      index=1;
     app.globalData.MemoryLevel = index;
+    this.setData({
+      MemoryLevel:index,
+    });
   },
 
   buildShareImage: function () {

pages/main/detail.wxml

@@ -10,7 +10,7 @@
   <block wx:if="{{(NumberNew+NumberReview+NumberHistory)>0}}">
 
     <!-- 工具栏 -->
-    <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};'>
+    <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};top:{{TopNumber}}rpx;'>
       <view class='panelCancel FlexRow' catchtap='gotoCollect'>
         <view class='panelCancel0 FlexRow'>
           <image hidden='{{TaskInfo.IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
@@ -39,9 +39,9 @@
           <view class='panelNumber2 panelNumber1'>{{NumberNew+NumberReview+NumberHistory}}</view>
         </view>
       </view>
-      <view class='panelCancel FlexRow' catchtap='gotoNext' data-time="1d" data-btnnumber="1">
+      <view class='panelCancel FlexRow' catchtap="gotoEdit">
         <view class='panelCancel0 FlexRow'>
-          <image src="../images/universalpic_shelve_gray_26x26.png" class='universalpic_shelve_white_26x26' />
+          <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
         </view>
       </view>
       <view class='panelCancel FlexRow' wx:if="{{CanUndo==0}}">
@@ -86,23 +86,31 @@
               {{TaskInfo.Number1Str}}
             </view>
             <view wx:if='{{Recommend!=1}}' class="Answer1 btnColor"></view>
-            <view wx:if='{{Recommend==1}}' class="Answer1Recommend Answer1 btnColor"></view>
+            <view wx:if='{{Recommend==1 && MemoryLevel==1}}' class="Answer1Recommend Answer1 btnColor"></view>
           </view>
           <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
             <view class="btnTime">
               {{TaskInfo.Number2Str}}
             </view>
             <view wx:if='{{Recommend!=2}}' class="Answer2 btnColor"></view>
-            <view wx:if='{{Recommend==2}}' class="Answer1Recommend Answer2 btnColor"></view>
+            <view wx:if='{{Recommend==2 && MemoryLevel==1}}' class="Answer1Recommend Answer2 btnColor"></view>
 
           </view>
-          <view class="AnswerRight Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3}}">
+          <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="{{TaskInfo.Number3}}" data-btnnumber="5" wx:if="{{TaskInfo.Number3 && MemoryLevel==1}}">
             <view class="btnTime">
               {{TaskInfo.Number3Str}}
             </view>
             <view wx:if='{{Recommend!=3}}' class="Answer3 btnColor"></view>
-            <view wx:if='{{Recommend==3}}' class="Answer1Recommend Answer3 btnColor"></view>
+            <view wx:if='{{Recommend==3 && MemoryLevel==1}}' class="Answer1Recommend Answer3 btnColor"></view>
           </view>
+          <view class="line2"></view>
+          <view class="AnswerRight FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-time="1d" data-btnnumber="1">
+            <view class="btnTime">
+              搁置
+            </view>
+            <view class="Answer4 btnColor"></view>
+          </view>
+          
         </view>
       </view>
 
@@ -200,11 +208,6 @@
         </view>
       </block>
       <view class='lineFooter'></view>
-      <view class='numberContainerFooter102 FlexRow' catchtap="gotoEdit">
-        <image src="../images/universalpic_edit_gray_25x25.png" class='universalpic_edit_gray_25x25' />
-        <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'>

pages/main/detail.wxss

@@ -20,7 +20,7 @@ page{
   position: fixed;
   top: 156rpx;
   font-size: 20rpx;
-  z-index: 10;
+  z-index: 20;
 }
 
 .panelCancel {
@@ -46,9 +46,9 @@ page{
   height: 8rpx;
 }
 
-.universalpic_shelve_white_26x26 {
-  width: 26rpx;
-  height: 26rpx;
+.universalpic_edit_gray_25x25 {
+  width: 25rpx;
+  height: 25rpx;
 }
 
 .universalpic_fav_default_gray_26x24 {
@@ -379,7 +379,7 @@ page{
 
 .Answer {
   flex: 1;
-  font-size: 28rpx;
+  font-size: 24rpx;
   justify-content: flex-start;
   height: 140rpx;
 }
@@ -392,46 +392,61 @@ page{
 .AnswerRight{
   border-top-right-radius: 20rpx;
   border-bottom-right-radius: 20rpx;
+  width:110rpx;
+  font-size: 24rpx;
+  justify-content: flex-start;
+  height: 140rpx;
+}
+
+.line2{
+  width:2rpx;
+  height:70rpx;
+  background-color: #2D313E;
 }
 
 .AnswerHover{
   background-color: #262935;
 }
 
-.Answer .btnColor {
+.btnColor {
   height: 14rpx;
   width: 75%;
   border-radius: 4rpx;
   margin-top: 16rpx;
 }
 
-.Answer .btnTime {
+.btnTime {
   margin-top: 34rpx;
 }
 
-.Answer .Answer0 {
+.Answer0 {
   background-color: #fe6659;
 }
 
-.Answer .Answer1 {
+.Answer1 {
   background-color: #ffbc00;
 }
 
-.Answer .Answer1Recommend {
+.Answer1Recommend {
   height: 50rpx;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
   margin-top: 16rpx;
 }
 
-.Answer .Answer2 {
+.Answer2 {
   background-color: #329468;
 }
 
-.Answer .Answer3 {
+.Answer3 {
   background-color: #0a60be;
 }
 
+.Answer4 {
+  background-color: #3C4152;
+  width:30rpx;
+}
+
 .footer0 {
   height: 180rpx;
   width: 100%;
@@ -653,12 +668,6 @@ page{
   margin: 0 30rpx 0 30rpx;
 }
 
-.universalpic_edit_gray_25x25{
-  width: 25rpx; 
-  height: 25rpx;
-  margin: 0 30rpx 0 30rpx;
-}
-
 .universalpic_bell_gray_30x30{
   width:30rpx;
   height:30rpx;

pages/main/previewMenu.js

@@ -6,9 +6,9 @@ const app = getApp();
 Page({
   data: {
     MenuArr: [
-      { CardType: 0, Name: "日常练习", Remark: "需要长期记忆不能遗忘的题卡" },
-      { CardType: 1, Name: "紧急练习", Remark: "紧急或临时要练习的题卡，需要近期强化巩固的题卡" },
-      { CardType: -1, Name: "留白题卡", Remark: "提前制作的、他人分享的、暂时无需练习的题卡" },
+      { CardType: 0, Name: "日常练习", Remark: "常规长期记忆，系统首选" },
+      { CardType: 1, Name: "紧急练习", Remark: "临时短期记忆，容量200张" },
+      { CardType: -1, Name: "留白题卡", Remark: "暂不练习，到期时间留白" },
     ]
   },
   onLoad: function (options) {
@@ -17,28 +17,50 @@ Page({
       Containnerheight: main.getWindowHeight(),
       CardType:options.CardType,
       MiaoguoCardID:options.ID,
+      CardNumberUrgent: app.globalData.TaskToday.CardNumberUrgent,
     });
   },
   changeCardType:function(e){
     var that = this;
     var cardType=e.currentTarget.dataset.cardtype;
     if (cardType!=that.data.CardType){
-      var url ='UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
-      url += "&CardType=" + cardType;
-      url += "&ID=" + that.data.MiaoguoCardID;
-      main.getData(url, function (data) {
-        var list = app.globalData.CardList;
-        for (var i = 0; i < list.length; i++) {
-          if (list[i].MiaoguoCardID==that.data.MiaoguoCardID)
-            list[i].CardType=cardType;
-        }
-        app.globalData.CardList = list;
-        wx.navigateBack({
-          delta: 1,
+      if (cardType == 1 && that.data.CardNumberUrgent>=200){
+        wx.showToast({
+          title: '紧急练习容量已满',
+        })
+      }
+      else{
+        that.setData({
+          CardType: cardType,
         });
-      });
+      }
     }
   },
+  close:function(){
+    wx.navigateBack({
+      delta: 1,
+    });
+  },
+  save:function(){
+    var that = this;
+    var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
+    url += "&CardType=" + that.data.CardType;
+    url += "&ID=" + that.data.MiaoguoCardID;
+    main.getData(url, function (data) {
+      var list = app.globalData.CardList;
+      for (var i = 0; i < list.length; i++) {
+        if (list[i].MiaoguoCardID == that.data.MiaoguoCardID)
+          list[i].CardType = that.data.CardType;
+      }
+      app.globalData.CardList = list;
+      if (that.data.CardType==1){
+        app.globalData.TaskToday.CardNumberUrgent++;
+      }
+
+      that.close();
+    });
+    
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/previewMenu.wxml

@@ -1,23 +1,33 @@
 <view class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelStudyPlan FlexColumn">
     <block wx:for="{{MenuArr}}" wx:key="index">
-    <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-      <view class="lineWidth720"></view>
-    </view>
-    <view class="panelStudyPlan1 FlexRow" bindtap="changeCardType" data-cardtype="{{item.CardType}}">
-      <view class="imgTrue"><block wx:if="{{CardType==item.CardType}}">✓</block></view>
-      <view class="panelStudyPlan11 FlexColumn">
-        <view class="text7">{{item.Name}}</view>
-        <view class="text6">{{item.Remark}}</view>
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelStudyPlan1 FlexRow" bindtap="changeCardType" data-cardtype="{{item.CardType}}">
+        <view class="imgTrue FlexRow">
+          <block wx:if="{{CardType==item.CardType}}">
+            <image class="universalpic_checked_blue_40x40" src='../images/universalpic_checked_blue_40x40.png' />
+          </block>
+        </view>
+        <view class="panelStudyPlan11 FlexColumn">
+          <view class="text7">{{item.Name}} <text class="text71 text7" wx:if="{{item.CardType==1 && CardNumberUrgent>=200}}">（容量已满不能转到这里）</text></view>
+          <view class="text6">{{item.Remark}}</view>
+        </view>
       </view>
-    </view>
     </block>
   </view>
   <view class='lineFooter'></view>
   <view class="panelHelp FlexRow">
-      <image class="universalpic_exmark_deepyellow_70x70" src='../images/universalpic_exmark_deepyellow_70x70.png' />
-      <text class="text8">
-      添加到“紧急练习”的旧题卡将被重置操作数据（包括记忆评价结果、到期时间等），在您确认保存后，此操作不能撤销，数据不能回溯，所以请谨慎检查。这种现象仅存在于“添加题卡到紧急练习中”，从紧急练习里移出题卡，以及“日常练习、留白题卡的添加或移出”均会继承原本的操作数据，不会被重置。\n暂时不想练的题卡请移往“留白题卡”，不建议删除。
+    <image class="universalpic_exmark_deepyellow_70x70" src='../images/universalpic_exmark_deepyellow_70x70.png' />
+    <text class="text8">
+      添加到“紧急练习”的旧题卡将被重置操作数据（包括记忆评价结果、到期时间等），在您确定后，因数据无法回溯，所以此操作不能撤销，务请谨慎。这种现象仅存在于“添加题卡到紧急练习中”，从紧急练习里移出题卡，以及“日常练习、留白区的添加或移出”均会继承原本的操作数据，不会被重置。\n暂时不想练的题卡请移往“留白区”，不建议删除。
       </text>
   </view>
+
+  <view class="panelFooter FlexRow">
+    <view class="btn" bindtap="close">取消</view>
+    <view class="line1"></view>
+    <view class="btn2 btn" bindtap="save">确定</view>
+  </view>
 </view>

pages/main/previewMenu.wxss

@@ -13,13 +13,22 @@
   height:133rpx;
   justify-content: flex-start;
 }
+
 .imgTrue{
   width:100rpx;
   height:134rpx;
-  text-align: center;
-  line-height: 134rpx;
-  font-size:50rpx;
-  color:#0071EF;
+}
+
+.universalpic_checked_blue_40x40{
+  width:40rpx;
+  height:40rpx;
+}
+
+.universalpic_exmark_deepyellow_70x70{
+  width:70rpx;
+  height:70rpx;
+  margin-right: 30rpx;
+  margin-top: 28rpx;
 }
 
 .panelStudyPlan11{
@@ -29,6 +38,11 @@
 .text7{
   font-size:28rpx;
   margin-bottom: 4rpx;
+  font-weight: 400;
+}
+
+.text71{
+  color:#FE6659;
 }
 
 .text6{
@@ -55,4 +69,31 @@
 .text8{
   width:550rpx;
   font-size:20rpx;
+}
+
+.panelFooter{
+  width:100%;
+  position: fixed;
+  bottom: 0;
+  border-top: 1rpx solid #D2D2D2;
+}
+
+.panelFooter .btn{
+  width:50%;
+  height:121rpx;
+  text-align: center;
+  line-height: 121rpx;
+  color:#FE6659;
+  font-size:28rpx;
+  background-color: #fff;
+}
+
+.panelFooter .btn2{
+ color:#0071EF;
+}
+
+.line1{
+  width:2rpx;
+  height:30rpx;
+  background-color: #D2D2D2;
 }

pages/main/searchCard.wxml

@@ -133,7 +133,7 @@
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
         <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
-        <view>添加</view>
+        <view>新建</view>
       </view>
       <view class='line1'></view>
       <view class='panelBottom11 FlexColumn'>

pages/main/searchCardList.wxss

@@ -122,6 +122,7 @@
   font-size: 30rpx;
   overflow: hidden;
   max-width:400rpx;
+  min-width:350rpx;
 }
 
 .panelItem1 .Text2 {
@@ -130,6 +131,7 @@
   overflow: hidden;
   color: #787878;
   max-width:400rpx;
+  min-width:350rpx;
 }
 
 .panelItem2 {

pages/plan/memoryLevel.js

@@ -1,48 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-    ImagePath: app.globalData.uploadImageUrl,
-  },
-  onLoad: function () {
-    var that = this;
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-    });
-    that.init(app.globalData.MemoryLevel);
-  },
-  init:function(index){
-    var that = this;
-    var list = main.getMemoryLevelAll();
-    for (var i = 0; i < list.length; i++) {
-      if (i == index) {
-        list[i].SelectedCSS = "selected";
-      }
-      else {
-        list[i].SelectedCSS = "";
-      }
-    }
-
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-      List: list,
-    });
-  },
-  onSelected:function(e){
-    var index=e.currentTarget.dataset.index;
-    this.init(index);
-    wx.setStorageSync("MemoryLevel", index);
-    app.globalData.MemoryLevel=index;
-    main.UploadUserConfig();
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
-});

pages/plan/memoryLevel.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "命名方式",
-  "backgroundColor": "#F0F0F0"
-}

pages/plan/memoryLevel.wxml

@@ -1,66 +0,0 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view style='height:20rpx'></view>
-  <view class="panelItem FlexColumn">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">用途说明</view>
-    </view>
-    <view class="panelItem2">“记忆评价”是位于“学习中”界面底部的一行4色按钮。从左向最右分别是：红色、黄色、绿色和蓝色，它们的作用如下图：</view>
-
-    <image class="help_picture_fourcolor" src='{{ImagePath}}web/help_picture_fourcolor.png' />
-    <text class="panelItem1">请您根据孩子答题时的表现，从AI给出的选项中选择对应的“记忆评价”。\n
-为了方便辨识，您可根据自己的喜好选择一款更舒服的命名方式。名称虽有不同，但其背后的功能是一致的。</text>
-  </view>
-
-  <view class="panelTitle0 panelTitle FlexRow">
-    <view class="panelTitle1">方式</view>
-  </view>
-
-  <view class='panel FlexColumn'>
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle2 panelTitle1">通俗易懂，对照孩子的表现</view>
-    </view>
-
-    <view class='{{item.SelectedCSS}} panelSelected FlexRow' wx:for="{{List}}" wx:key="index" wx:if="{{index<3}}" bindtap="onSelected" data-index="{{index}}">
-      <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCSS}}">
-        <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
-      </view>
-      <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
-      </view>
-      <view class='panelSelected1 FlexColumn'>
-        <view class='text1'>{{item.Key}}</view>
-        <view class='panelSelected11 FlexRow'>
-          <view class='panelSelected111 FlexColumn' wx:for="{{[0,1,2,3]}}" wx:key="index" wx:for-item="itemChild">
-            <view class='Answer{{itemChild}} color'></view>
-            <view class='text2'>{{item.Value[itemChild]}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle3 panelTitle1">科学表达，遵循记忆规律</view>
-    </view>
-
-    <view class='{{item.SelectedCSS}} panelSelected FlexRow' wx:for="{{List}}" wx:key="index" wx:if="{{index==3}}" bindtap="onSelected" data-index="{{index}}">
-      <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCSS}}">
-        <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
-      </view>
-      <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
-      </view>
-      <view class='panelSelected1 FlexColumn'>
-        <view class='text1'>{{item.Key}}</view>
-        <view class='panelSelected11 FlexRow'>
-          <view class='panelSelected111 FlexColumn' wx:for="{{[0,1,2,3]}}" wx:key="index" wx:for-item="itemChild">
-            <view class='Answer{{itemChild}} color'></view>
-            <view class='text2'>{{item.Value[itemChild]}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="panelItem FlexRow">
-      <view class="panelItem3">再现间隔是对“记忆评价”的最直观和科学的理解方式（官方推荐）。它的重点是，告知该题卡根据正常记忆规律可在多长时间后再现。由此，家长可依据孩子答题时不同程度的表现进行判断，希望该题卡在多久后再次练习。建议，越熟练的间隔越久，越生疏的间隔越短。</view>
-    </view>
-  </view>
-  <view style='height:100rpx'></view>
-</view>

pages/plan/memoryLevel.wxss

@@ -1,148 +0,0 @@
-.panelTitle {
-  width: 100%;
-  margin-top: 50rpx;
-  justify-content: flex-start;
-}
-
-.panelTitle0 {
-  margin-top: 50rpx;
-}
-
-.panelTitle .panelTitle1 {
-  font-size: 32rpx;
-  margin-left: 30rpx;
-  margin-bottom: 30rpx;
-}
-
-.panelItem {
-  width: 100%;
-  justify-content: space-between;
-  font-size: 28rpx;
-  min-height: 100rpx;
-  background-color: #fff;
-}
-
-
-.panelItem2 {
-  width: 690rpx;
-  font-weight: 400;
-  font-size: 24rpx;
-  margin: 0 0 30rpx 0;
-}
-
-.help_picture_fourcolor{
-  width:688rpx;
-  height:730rpx;
-}
-
-.panelItem1{
-  width:690rpx;
-  margin: 40rpx 0 40rpx 0;
-  font-weight: 400;
-  font-size:24rpx;
-}
-
-.panel{
-  width:100%;
-  background-color: #fff;
-}
-
-.panelTitle .panelTitle2{
-  margin: 20rpx 0 30rpx 30rpx;
-  font-size:28rpx;
-  font-weight: 400;
-}
-.panelTitle .panelTitle3{
-  margin: 0 0 30rpx 30rpx;
-  font-size:28rpx;
-  font-weight: 400;
-}
-
-
-.panelSelected{
-  width:690rpx;
-  height:173rpx;
-  border-radius: 10rpx;
-  border:1rpx solid #9B9B9B;
-  margin-bottom: 30rpx;
-}
-
-.panelSelected .panelSelected0{
-  border-radius: 50%;
-  width:34rpx;
-  height:34rpx;
-  background-color: #0071EF;
-  border: 3rpx solid #0071EF;
-  margin-left: 30rpx;
-  
-} 
-.universalpic_checked_white_22x17{
-  width:22rpx;
-  height:17rpx;
-}
-.panelSelected .panelSelected00{
-  background-color: #F8F8F8;
-  border: 3rpx solid #D2D2D2;
-}
-
-.panelSelected .panelSelected1{
-  width:600rpx;
-  align-items: flex-start;
-  margin-left: 20rpx;
-}
-
-
-.panelSelected .panelSelected11{
-  justify-content: flex-start;
-}
-
-.panelSelected .panelSelected111{
-  align-items: flex-start;
-    margin-right: 10rpx;
-}
-
-.panelSelected .text1{
-  font-size:29rpx;
-  font-weight: 400;
-  margin-bottom: 20rpx;
-}
-.panelSelected .text2{
-  font-size:24rpx;
-  font-weight: 400;
-}
-
-.color{
-  width:130rpx;
-  height:10rpx;
-  margin-bottom: 10rpx;
-}
-.Answer0 {
-  background-color: #FE6659;
-}
-
-.Answer1 {
-  background-color: #FFBC00;
-}
-
-.Answer2 {
-  background-color: #329468;
-}
-
-.Answer3 {
-  background-color: #0A60BE;
-}
-
-.selected{
-  border:5rpx solid #0071EF;
-  width:686rpx;
-  height:170rpx;
-}
-
-
-.panelItem3 {
-  width: 690rpx;
-  font-weight: 400;
-  font-size: 24rpx;
-  margin: 0 0 30rpx 30rpx;
-  color: #787878;
-}

pages/plan/recommend.js

@@ -2,12 +2,12 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const DefaultSecondArray=[5,40,60];
+const DefaultSecondArray = [5, 40, 60];
 
 Page({
   data: {
-    ImagePath: app.globalData.uploadImageUrl,
-    IsChangeRecommend: true,
+    MemoryLevel:0,
+    IsChangeRecommend: false,
     SecondConfig: [{
       Key: "蓝色",
     }, {
@@ -15,26 +15,26 @@ Page({
     }, {
       Key: "黄色",
     }
-    ]
+    ],
   },
   onLoad: function (options) {
     var that = this;
-    
-    that.init();
-
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      ArrMemoryLevelAll: main.getMemoryLevelAll(),
     });
+
+    that.init();
   },
-  init:function(){
-    var that=this;
+  init: function (id) {
+    var that = this;
     var secondConfig = wx.getStorageSync("SecondConfigArray");
-    
-    if (!secondConfig || secondConfig[0]==0){
+
+    if (!secondConfig || secondConfig[0] == 0) {
       that.data.IsChangeRecommend = false;
-      secondConfig=[0,0,0];
+      secondConfig = [0, 0, 0];
     }
-    else{
+    else {
       secondConfig = DefaultSecondArray;
       that.data.IsChangeRecommend = true;
       for (var j = 0; j < 3; j++) {
@@ -46,12 +46,46 @@ Page({
         that.data.SecondConfig[j].NumberArray = arr;
       }
     }
-    
+
     that.setData({
       IsChangeRecommend: that.data.IsChangeRecommend,
       SecondConfig: that.data.SecondConfig,
     });
     wx.setStorageSync("SecondConfigArray", secondConfig);
+
+    var MemoryLevel = wx.getStorageSync("MemoryLevel");
+    if (!MemoryLevel) {
+      MemoryLevel = 0;
+    }
+    else if (MemoryLevel>0){
+      MemoryLevel=1;
+    }
+    app.globalData.MemoryLevel = MemoryLevel;
+  },
+  selectPattern:function(e){
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    that.setData({
+      MemoryLevel:index,
+    });
+    wx.setStorageSync("MemoryLevel", index);
+    app.globalData.MemoryLevel = index;
+    main.UploadUserConfig();
+  },
+  switch1Change(e) {
+    var that = this;
+    that.data.IsChangeRecommend = e.detail.value;
+
+    that.setData({
+      IsChangeRecommend: that.data.IsChangeRecommend,
+    });
+    if (that.data.IsChangeRecommend)
+      wx.setStorageSync("SecondConfigArray", DefaultSecondArray);
+    else
+      wx.setStorageSync("SecondConfigArray", [0, 0, 0]);
+
+    main.UploadUserConfig();
+    that.init();
   },
   bindRecommendTime: function (e) {
     var that = this;
@@ -76,21 +110,6 @@ Page({
       main.UploadUserConfig();
     }
   },
-  switch1Change(e) {
-    var that = this;
-    that.data.IsChangeRecommend = e.detail.value;
-    
-    that.setData({
-      IsChangeRecommend: that.data.IsChangeRecommend,
-    });
-    if (that.data.IsChangeRecommend)
-      wx.setStorageSync("SecondConfigArray", DefaultSecondArray);
-    else
-      wx.setStorageSync("SecondConfigArray", [0, 0, 0]);
-    
-    main.UploadUserConfig();
-    that.init();
-  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/plan/pattern.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "模式",
+  "backgroundColor": "#F0F0F0"
+}

pages/plan/pattern.wxml

@@ -0,0 +1,91 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="line"></view>
+  <view class="panelTitle FlexRow">
+    <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
+    <view class="panelTitle1">样式预览</view>
+  </view>
+  <view class="lineWidthAll0 lineWidthAll FlexRow">
+    <view class="lineWidth690"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelBtn FlexRow" wx:for="{{ArrMemoryLevelAll[MemoryLevel].Value}}" wx:key="index" wx:if="{{item.IsShow}}">
+      <view class="panelBtn1 FlexColumn">
+        <view class="text1">{{item.Name}}</view>
+        <view class="buttonStyle" style="width:{{item.W}}rpx;height:{{item.H}}rpx;background-color:{{item.BGColor}};"></view>
+      </view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="line"></view>
+  <view class="panelItem FlexColumn">
+    <block wx:for="{{ArrMemoryLevelAll}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth650"></view>
+      </view>
+      <view class="panelItem1 FlexRow" bindtap="selectPattern" data-index="{{index}}">
+        <view class="imgTrue FlexRow">
+          <block wx:if="{{index==MemoryLevel}}">
+            <image class="universalpic_checked_blue_40x40" src='../images/universalpic_checked_blue_40x40.png' />
+          </block>
+        </view>
+        <view class="panelItem11 FlexColumn">
+          <view class="text2">{{item.Name}}</view>
+          <text class="text3">{{item.Name2}}</text>
+        </view>
+      </view>
+    </block>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="line"></view>
+  <block wx:if="{{MemoryLevel==1}}">
+    <view class="panelItem2 panelItem FlexRow">
+      <view class="panelItem21">时间指标</view>
+      <view class="panelItem22 FlexRow">
+        <switch checked="{{IsChangeRecommend}}" bindchange="switch1Change" />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+    <view class="line"></view>
+    <block wx:if="{{IsChangeRecommend}}">
+      <view class="panelTitle2 FlexRow">
+        <view class="panelTitle21">熟练程度（由高到低）</view>
+        <view class="panelTitle22">倒计时范围</view>
+      </view>
+      <block wx:for="{{SecondConfig}}" wx:key="index">
+        <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+          <view class="lineWidth720"></view>
+        </view>
+        <view class="panelItem3 panelItem FlexRow">
+          <view class="panelItem31">{{item.Key}}按键凸起</view>
+          <view class="panelItem32 FlexRow">
+            <picker bindchange="bindRecommendTime" data-index="{{index}}" value="{{item.Value-3}}" range="{{item.NumberArray}}">
+              <view class="picker">
+                {{item.Value}}秒内
+              </view>
+            </picker>
+            <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+          </view>
+        </view>
+      </block>
+      <view class='lineFooter'></view>
+      <view class="line"></view>
+    </block>
+  </block>
+  <view class="panelItem3 panelItem FlexRow">
+    <view class="panelItem31">帮助：记忆评价的作用</view>
+    <view class="panelItem32 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem3 panelItem FlexRow">
+    <view class="panelItem31">帮助：时间指标的作用</view>
+    <view class="panelItem32 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view style='height:100rpx'></view>
+</view>

pages/plan/pattern.wxss

@@ -0,0 +1,136 @@
+.container{
+  font-size:28rpx;
+}
+
+.line{
+  width:100%;
+  height:30rpx;
+  background-color: #F0F0F0;
+}
+
+.lineWidthAll0{
+  justify-content: center;
+}
+
+.panelTitle{
+  width:100%;
+  justify-content: flex-start;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.universalpic_plan_2line_black_30x32{
+  width:30rpx;
+  height:32rpx;
+  margin-left: 30rpx;
+}
+
+.panelTitle1{
+  margin-left: 20rpx;
+  color:#4D4D4D;
+}
+
+.panelItem{
+  width:100%;
+  background-color: #fff;
+}
+
+.panelBtn{
+  margin: 40rpx 0 30rpx 0;
+}
+
+.panelBtn1{
+  height:82rpx;
+  font-size:20rpx;
+  justify-content: flex-start;
+}
+
+.buttonStyle{
+  border-radius: 5rpx;
+  margin: 4rpx 5rpx 0 5rpx;
+}
+
+.universalpic_checked_blue_40x40{
+  width:40rpx;
+  height:40rpx;
+}
+
+.panelItem0{
+  justify-content: flex-start;
+}
+.imgTrue{
+  width:100rpx;
+  height:134rpx;
+}
+
+.panelItem1{
+  width:100%;
+  height:160rpx;
+  justify-content: flex-start;
+}
+
+.panelItem11{
+  width:620rpx;
+  align-items: flex-start;
+}
+
+.text2{
+  font-size:28rpx;
+  font-weight: 400;
+}
+.text3{
+  font-size:20rpx;
+  color:#787878;
+  margin-top: 4rpx;
+}
+
+.panelItem2{
+  justify-content: space-between;
+}
+
+.panelItem21{
+  margin: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem22{
+  margin-right: 30rpx;
+}
+
+.panelTitle2{
+  width:100%;
+  justify-content: space-between;
+  color:#787878;
+  font-size:20rpx;
+  align-items: flex-start;
+}
+.panelTitle21{
+  margin-left: 30rpx;
+  margin-bottom: 20rpx;
+}
+.panelTitle22{
+  margin-right: 76rpx;
+}
+
+.panelItem3{
+  height:100rpx;
+  justify-content: space-between;
+}
+
+.panelItem31{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+
+.panelItem32{
+  margin-right: 25rpx;
+  justify-content: flex-end;
+  color:#787878;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}

pages/plan/recommend.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "选择建议",
-  "backgroundColor": "#F0F0F0"
-}

pages/plan/recommend.wxml

@@ -1,52 +0,0 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view style='height:20rpx'></view>
-  <view class="panelItem FlexColumn">
-    <view class="panelTitle0 panelTitle FlexRow">
-      <view class="panelTitle1">用途说明</view>
-    </view>
-    <text class="panelItem2">在孩子没有错答的情况下，面对“记忆评价”的黄、绿、蓝色选项时，如果您不知道该选哪个，该功能可为您提供计时参考。计时的用意，是把“回答问题的速度”的快慢用做衡量熟练程度的额外指标，在排除环境因素造成的影响后，为您提供一种简单易行的参考。\n
-请在已了解“记忆评价”的基础上启用，在尚未入门的情况下可能会干扰到您对整体功能的理解。\n
-在“学习中”它将以如下形式出现：</text>
-    <image class="help_picture_chooseadvice" src='{{ImagePath}}web/help_picture_chooseadvice.png' />
-
-  </view>
-  <view class='lineFooter'></view>
-  <view style='height:50rpx'></view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">计时参考</view>
-    <view class="panelItem3 FlexRow">
-      <switch checked="{{IsChangeRecommend}}" bindchange="switch1Change" />
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-
-  <block wx:if="{{IsChangeRecommend}}">
-    <view class="panelTitle FlexRow">
-      <view class="panelTitle1">计时设定</view>
-    </view>
-    <block wx:for="{{SecondConfig}}" wx:key="index">
-      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
-        <view class="lineWidth720"></view>
-      </view>
-      <view class="panelItem FlexRow">
-        <view class="panelItem1">“{{item.Key}}”按钮高亮</view>
-        <view class="panelItem3 FlexRow">
-          <picker bindchange="bindRecommendTime" data-index="{{index}}" value="{{item.Value-3}}" range="{{item.NumberArray}}">
-            <view class="picker">
-              {{item.Value}}秒范围内
-            </view>
-          </picker>
-          <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-        </view>
-      </view>
-    </block>
-    <view class='lineFooter'></view>
-    <text class="panelItem4">使用中请注意如下要点：\n
-计时范围是从显示题卡开始到显示记忆评价结束（点击看答案或下一段按钮后），按“计间设定”的要求给出参考建议。您可根据孩子的个体情况设定更理想的时间范围。\n
-该功能对新题卡不起作用，仅对旧题卡计时。\n
-在答错的情况下，请无视建议，直接点击红色按钮（红色代表答错重来）。</text>
-    
-  </block>
-
-  <view style='height:70rpx'></view>
-</view>

pages/plan/recommend.wxss

@@ -1,84 +0,0 @@
-.panelTitle{
-  width:100%;
-  margin-top: 50rpx;
-  justify-content: flex-start;
-}
-
-.panelTitle0{
-  margin-top: 40rpx;
-}
-
-.panelTitle .panelTitle1{
-  font-size:32rpx;
-  margin-left: 30rpx;
-  margin-bottom: 30rpx;
-}
-
-.panelItem{
-  width:100%;
-  justify-content: space-between;
-  font-size:28rpx;
-  min-height:100rpx;
-  background-color: #fff;
-}
-
-.panelItem0{
-  width:690rpx;
-  height:100rpx;
-  color:#fff;
-  border-radius: 10rpx;
-  margin-bottom: 30rpx;
-  border:1rpx solid #9B9B9B;
-}
-
-.panelItemSelected{
-  border:5rpx solid #fff;
-  box-shadow:0 0 0 3px #0071EF;
-}
-
-.panelItem01{
-  width:100%;
-  line-height: 100rpx;
-  padding-left: 30rpx;
-  font-weight: 400;
-  border-radius: 10rpx;
-}
-
-.panelItem .panelItem1{
-  margin-left: 30rpx;
-  font-weight: 400;
-}
-
-.panelItem2{
-  width:690rpx;
-  font-weight: 400;
-  font-size:24rpx;
-}
-
-.help_picture_chooseadvice{
-  width:688rpx;
-  height:265rpx;
-  margin: 40rpx 0;
-}
-
-.panelItem .panelItem3{
-  margin-right: 25rpx;
-  justify-content: flex-end;
-  color:#787878;
-}
-
-
-.Arrow{
-  width:16rpx;
-  height:26rpx;
-  margin-left: 30rpx;
-}
-
-
-.panelItem4 {
-  width: 690rpx;
-  font-weight: 400;
-  font-size: 24rpx;
-  margin: 30rpx;
-  color: #787878;
-}

pages/plan/setting.js

@@ -3,65 +3,17 @@ import main from '../../utils/main';
 
 const app = getApp();
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
-var arrUserName = ["程晟涵", "临时"];
-var arrUserID = app.globalData.SelectUserData;
 
 Page({
   data: {
-    IsShowChange: false,
-    RecommendName: "启用",
-    ChildUserID: 0,
-  },
-  onPullDownRefresh: function () {
-    //得到当天任务
-    var that = this;
-    main.postData('UploadUserConfig?Type=getData&UserID=' + app.globalData.userInfo.UserID, {}, function (data) {
-      if (data) {
-        wx.setStorageSync("CardMaxNumberNew", data.CardMaxNumberNew);
-        wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
-        wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
-        wx.setStorageSync("MemoryLevel", data.MemoryLevel);
-        wx.setStorageSync("ClickType", data.ClickType);
-        wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
-        wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
-        that.onLoad();
-        that.onShow();
-      }
-    });
-    wx.stopPullDownRefresh();
-    
   },
   onLoad: function () {
     var that = this;
 
-    var taskNumber = app.globalData.TaskToday.ListNew.length + app.globalData.TaskToday.ListReview.length + app.globalData.TaskToday.ListHistory.length;
-    var cardEveryTime = 1 + Math.round(app.globalData.TaskToday.CardEveryTime / 60 * taskNumber);
-    
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      MinSecond: 10,
-      TimeSecond: 60,
-      TaskNumber: taskNumber,
-      CardEveryTime:cardEveryTime,
-      CardLimitTimeNumber: app.globalData.TaskToday.CardLimitTimeNumber,
-    });
-
-    common.getStorageValue(this, "UserID", 1, function () {
-      for (var i = 0; i < arrUserID.length; i++) {
-        if (arrUserID[i] == that.data.UserID) {
-          that.setData({
-            UserName: arrUserName[i],
-          });
-          break;
-        }
-      }
     });
-
-    if (app.globalData.userInfo.UserID == 1 || app.globalData.userInfo.UserID == 2) {
-      that.setData({
-        IsShowChange: true,
-      });
-    }
+    
   },
   onShow: function () {
     var that = this;
@@ -79,58 +31,21 @@ Page({
       });
     }
 
-    var secondConfig = wx.getStorageSync("SecondConfigArray");
-    if (secondConfig && secondConfig[0] > 0) {
-      that.setData({
-        RecommendName: "启用",
-      });
-    }
-    else {
-      that.setData({
-        RecommendName: "禁用",
-      });
-    }
-
     that.setData({
       ClickTypeName: arrClickType[app.globalData.ClickType],
     });
 
-    this.getMemoryLevel();
-
     common.getStorageValue(that, "CardType", 0, function () {});
 
   },
-  
-  setSelectUser: function () {
-    var that = this;
-    wx.showActionSheet({
-      itemList: arrUserName,
-      success(res) {
-        for (var i = 0; i < arrUserName.length; i++) {
-          if (i == res.tapIndex) {
-            that.setData({
-              UserName: arrUserName[i],
-            });
-            wx.setStorageSync("UserID", arrUserID[i]);
-            wx.setStorageSync("UserName", arrUserName[i]);
-            app.globalData.userInfo.UserID = arrUserID[i];
-            break;
-          }
-        }
-      },
-      fail(res) {
-        console.log(res.errMsg)
-      }
-    })
-  },
   setColorPlan: function () {
     wx.navigateTo({
       url: './colorplan',
     })
   },
-  setMemoryLevel: function () {
+  setPattern: function () {
     wx.navigateTo({
-      url: './memoryLevel',
+      url: './pattern',
     })
   },
   setClickType: function () {
@@ -138,29 +53,6 @@ Page({
       url: './clicktype',
     })
   },
-  
-  getMemoryLevel: function () {
-    var that = this;
-    var index = wx.getStorageSync("MemoryLevel");
-    if (!index) {
-      index = 0;
-    }
-    app.globalData.MemoryLevel = index;
-    var list = main.getMemoryLevelAll();
-    for (var i = 0; i < list.length; i++) {
-      if (i == index) {
-        that.setData({
-          MemoryLevelName: list[i].Key,
-        });
-        break;
-      }
-    }
-  },
-  setRecommend: function () {
-    wx.navigateTo({
-      url: './recommend',
-    })
-  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages/plan/setting.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "练习方案",
+  "navigationBarTitleText": "计划设置",
   "backgroundColor": "#F0F0F0",
   "backgroundTextStyle":"dark",
   "enablePullDownRefresh": true

pages/plan/setting.wxml

@@ -1,31 +1,4 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <!-- <view class="panelTitle FlexRow">
-    <view class="panelTitle1">任务量</view>
-    <view class="panelTitle2"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='setTaskLimit'>
-    <view class="panelItem1">数量限制</view>
-    <view class="panelItem2 FlexRow">
-      <view class="picker">
-        每天最多{{CardMaxNumberNew+CardMaxNumberHistory}}张
-      </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='setSortType'>
-    <view class="panelItem1">优先规则</view>
-    <view class="panelItem2 FlexRow">
-      <view class="picker">
-        {{SortType}}
-      </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-   -->
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">方案管理</view>
     <view class="panelTitle2"></view>
@@ -56,24 +29,9 @@
     <view class="panelTitle1">记忆评价</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap='setMemoryLevel'>
-    <view class="panelItem1">命名方式</view>
+  <view class="panelItem FlexRow" bindtap='setPattern'>
+    <view class="panelItem1">模式</view>
     <view class="panelItem2 FlexRow">
-      <view class="picker">
-        {{MemoryLevelName}}
-      </view>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap='setRecommend'>
-    <view class="panelItem1">计时参考</view>
-    <view class="panelItem2 FlexRow">
-      <view class="picker">
-        {{RecommendName}}
-      </view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
@@ -104,17 +62,4 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  
-  <block wx:if="{{IsShowChange}}">
-    <view class="panelItemBottom panelItem FlexRow" bindtap='setSelectUser'>
-      <view class="panelItem1">当前帐号</view>
-      <view class="panelItem2 FlexRow">
-        <view class="picker">
-          {{UserName}}
-        </view>
-        <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-  </block>
 </view>

pages/plan/studyplan.js

@@ -11,6 +11,13 @@ Page({
     IsChangeStudyPLan:false,
     BtnArray: [{ Name: "日常练习", Selected: 1 }, { Name: "紧急练习", Selected: 0 }, { Name: "整体练习", Selected: 0 }],
   },
+  onPullDownRefresh: function () {
+    var that = this;
+    main.getTaskTodayList(function (data) {
+      that.init();
+    });
+    wx.stopPullDownRefresh();
+  },
   onLoad: function (options) {
     var that = this;
     
@@ -21,12 +28,13 @@ Page({
     that.init();
   },
   onShow:function(){
-    cardNumberCommon = app.globalData.TaskToday.CardNumberCommon;
-    cardNumberUrgent = app.globalData.TaskToday.CardNumberUrgent;
     this.init();
   },
   init: function () {
     var that = this;
+    cardNumberCommon = app.globalData.TaskToday.CardNumberCommon;
+    cardNumberUrgent = app.globalData.TaskToday.CardNumberUrgent;
+
     common.getStorageValue(that, "CardType", 0, function () {
       that.data.BtnArray[0].Selected = 0;
       that.data.BtnArray[1].Selected = 0;
@@ -37,14 +45,13 @@ Page({
         BtnArray: that.data.BtnArray,
       });
     });
-
-    var studyPlan = wx.getStorageSync("StudyPlan");
-    var planNumber = studyPlan.CommonNewLength + studyPlan.CommonOldLength + studyPlan.UrgentNewLength+studyPlan.UrgentOldLength;
-    var taskNumber = app.globalData.TaskToday.ListNew.length + app.globalData.TaskToday.ListReview.length + app.globalData.TaskToday.ListHistory.length;
-    var progress = Math.round(100 * (planNumber - taskNumber) / planNumber);
+    var studyPlan = app.globalData.TaskToday;
+    var taskNumber = studyPlan.ListNew.length + studyPlan.ListReview.length + studyPlan.ListHistory.length;
+    var progress=0;
+    if (studyPlan.AlreadyPracticeNumber + taskNumber>0)
+      progress = Math.round(100 * studyPlan.AlreadyPracticeNumber / (taskNumber+studyPlan.AlreadyPracticeNumber));
     that.setData({
       StudyPlan: studyPlan,
-      PlanNumber: planNumber,
       TaskNumber: taskNumber,
       Progress:progress,
     });
@@ -57,7 +64,7 @@ Page({
       backColor = "#00B6DD";
     }
       
-    fanObj.init(that, rate, 100, 3.8, "#008CAA", backColor, studyPlan.CommonNewLength + studyPlan.CommonOldLength);
+    fanObj.init(that, rate, 100, 3.0, "#008CAA", backColor, studyPlan.CommonNewLength + studyPlan.CommonOldLength);
     
     var backColor2 = "#f0f0f0";
     var rate2 = 0;
@@ -65,7 +72,7 @@ Page({
       rate2 = studyPlan.UrgentNewLength / (studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
       backColor2 = "#FFCC00";
     }
-    fanObj.init2(that, rate2, 100, 3.8, "#DDB100", backColor2, studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
+    fanObj.init2(that, rate2, 100, 3.0, "#DDB100", backColor2, studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
 
   },
   btnSelected:function(e){
@@ -114,7 +121,6 @@ Page({
       CardType: that.data.NewCardType,
     });
     wx.setStorageSync("CardType", that.data.CardType);
-    wx.removeStorageSync("StudyPlan");
 
     main.UploadUserConfig(function(){
       main.getTaskTodayList(function (data) {

pages/plan/studyplan.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "学习计划",
-  "backgroundColorBottom": "#f0f0f0"
+  "backgroundColorBottom": "#f0f0f0",
+  "enablePullDownRefresh": true
 }

pages/plan/studyplan.wxml

@@ -1,25 +1,26 @@
 <import src="../template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle0">当前的学习计划</view>
-  </view>
-  <view class="panelButton FlexRow">
-    <view class="panelButton1{{BtnArray[0].Selected}} FlexRow" bindtap="btnSelected" data-id="0">
-      <view class="text1">{{BtnArray[0].Name}}</view>
-    </view>
-    <view class="line1"></view>
-    <view class="panelButton1{{BtnArray[1].Selected}} FlexRow" bindtap="btnSelected" data-id="1">
-      <view class="text1">{{BtnArray[1].Name}}</view>
+  <view class="panelTop FlexColumn">
+    <view class="panelTitle0 FlexRow">
+      <view class="panelTitle00">当前的学习计划</view>
     </view>
-    <view class="line1"></view>
-    <view class="panelButton1{{BtnArray[2].Selected}} FlexRow" bindtap="btnSelected" data-id="2">
-      <view class="text1">{{BtnArray[2].Name}}</view>
+    <view class="panelButton FlexRow">
+      <view class="panelButton1{{BtnArray[0].Selected}} FlexRow" bindtap="btnSelected" data-id="0">
+        <view class="text1">{{BtnArray[0].Name}}</view>
+      </view>
+      <view class="line1"></view>
+      <view class="panelButton1{{BtnArray[1].Selected}} FlexRow" bindtap="btnSelected" data-id="1">
+        <view class="text1">{{BtnArray[1].Name}}</view>
+      </view>
+      <view class="line1"></view>
+      <view class="panelButton1{{BtnArray[2].Selected}} FlexRow" bindtap="btnSelected" data-id="2">
+        <view class="text1">{{BtnArray[2].Name}}</view>
+      </view>
     </view>
+    <view class='lineFooter'></view>
   </view>
-  <view class='lineFooter'></view>
-  <view class="line"></view>
-
+  <view class="line0 line"></view>
   <view class="panelTitle FlexRow">
     <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
     <view class="panelTitle1">参考数据</view>
@@ -29,11 +30,11 @@
   </view>
   <view class="panelItem FlexRow">
     <view class="left FlexColumn">
-      <view class="text2">计划任务量</view>
-      <view class="text3">今天需要练习的题卡总数，方案调整时会被更新</view>
+      <view class="text2">任务量</view>
+      <view class="text3">今天需要练习的题卡总数</view>
     </view>
     <view class="right FlexRow">
-      <view class="Number">{{PlanNumber}}</view>
+      <view class="Number">{{TaskNumber}}</view>
       <view class="text4">张</view>
     </view>
   </view>
@@ -82,33 +83,47 @@
         </view>
       </view>
     </view>
-    <block wx:if="{{StudyPlan.ListReviewLength>0}}">
-    <view class="text5">其中还有</view>
-    <view class="panelItem13 FlexRow">
-      <view class="text6">上次练习未练完的题卡</view>
-      <view class="Number1">{{StudyPlan.ListReviewLength}}</view>
-      <view class="text6">张</view>
-    </view>
+    <block wx:if="{{StudyPlan.ListReview.length>0}}">
+      <view class="text5">其中还有</view>
+      <view class="panelItem13 FlexRow">
+        <view class="text6">上次练习未练完的题卡</view>
+        <view class="Number1">{{StudyPlan.ListReview.length}}</view>
+        <view class="text6">张</view>
+      </view>
     </block>
-    <view style="height:42rpx;" wx:if="{{StudyPlan.ListReviewLength==0}}"></view>
+    <view style="width:100%;height:42rpx;" wx:if="{{StudyPlan.ListReview.length==0}}"></view>
   </view>
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth690"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem2 FlexRow">
-      <view class="text2">预计锻炼回想</view>
-      <view class="right FlexRow">
-        <view class="Number2">{{StudyPlan.PracticeNumber}}</view>
-        <view class="text6">次</view>
+    <view class="panelItem2 FlexColumn">
+      <view class="panelItem21 FlexRow">
+        <view class="text21">预计回想</view>
+        <view class="right FlexRow">
+          <view class="Number2">{{StudyPlan.PracticeNumber}}</view>
+          <view class="text6">次</view>
+        </view>
       </view>
-    </view>
-    <view class="panelItem2 FlexRow">
-      <view class="text2">预计练习用时</view>
-      <view class="right FlexRow">
-        <view class="Number2">{{StudyPlan.PracticeTime}}</view>
-        <view class="text6">分钟</view>
+      <view class="text22">新题卡需回想两次</view>
+    </view>
+    <view class="panelItem2 FlexColumn">
+      <view class="panelItem21 FlexRow">
+        <view class="text21">预计用时</view>
+        <view class="right FlexRow">
+          <view class="Number2">{{StudyPlan.PracticeTime}}</view>
+          <view class="text6">分钟</view>
+        </view>
       </view>
+      <view class="text22">根据近期估算参考</view>
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth750"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem4 FlexRow" bindtap="gotoTaskList" data-id="1">
+      <view class="text8">未练完的题卡</view>
     </view>
   </view>
   <view class='lineFooter'></view>
@@ -122,46 +137,36 @@
   </view>
   <view class="panelItem FlexColumn">
     <view class="panelItem FlexRow">
-      <view class="text7">进度</view>
+      <view class="text7">当日练完</view>
+      <view class="right FlexRow">
+        <view class="Number2">{{StudyPlan.AlreadyPracticeNumber}}</view>
+        <view class="text6">张</view>
+      </view>
     </view>
-    <view class="panelItem12 panelItem1 FlexRow">
+    <view class="panelItem1 FlexRow">
       <view class="progress">
         <view class="progress1" style="width:{{Progress}}%;"></view>
       </view>
-      <view class="Number3">{{Progress}}%</view>
     </view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem3 FlexRow">
-      <view class="text9">练完</view>
-      <view class="right FlexRow">
-        <view class="Number2">{{PlanNumber-TaskNumber}}</view>
-        <view class="text6">张</view>
-      </view>
-    </view>
-    <view class="panelItem3 FlexRow">
-      <view class="text9">未练完</view>
+    <view class="panelItem FlexRow">
+      <view class="text71">进度</view>
       <view class="right FlexRow">
-        <view class="Number2">{{TaskNumber}}</view>
-        <view class="text6">张</view>
+        <view class="Number4">{{Progress}}%</view>
       </view>
     </view>
   </view>
+
   <view class="lineWidthAll FlexRow">
-    <view class="lineWidth690"></view>
+    <view class="lineWidth750"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem2 FlexRow" bindtap="gotoTaskList" data-id="2">
-      <view class="text8">实际练完的题卡</view>
-    </view>
-    <view class="line3"></view>
-    <view class="panelItem2 FlexRow" bindtap="gotoTaskList" data-id="1">
-      <view class="text8">未练完的题卡</view>
+    <view class="panelItem4 FlexRow" bindtap="gotoTaskList" data-id="2">
+      <view class="text8">练完的题卡</view>
     </view>
   </view>
   <view class='lineFooter'></view>
   <view class="panelFooter FlexRow">
-    <view class="btnChange" bindtap="goto" data-url="./setting">调整学习计划</view>
+    <view class="btnChange" bindtap="goto" data-url="./setting">设置学习计划</view>
   </view>
 </view>
 
@@ -174,7 +179,7 @@
   <text class='RemindText5 RemindText4'>功能说明</text>
   <text class='RemindText4' space="ensp">∙ 初次使用前，请先登录官网为方案增添一些题卡。</text>
   <text class='RemindText4' space="ensp">∙ 整体练习融合了日常练习和紧急练习，需要两个方案都\n  有题卡才能使用。</text>
-  <text class='RemindText4' space="ensp">∙ 日常、紧急练习方案的任务量是各自独立的，请在学习\n  计划页面底部点击“调整练习方案”进行配置。</text>
+  <text class='RemindText4' space="ensp">∙ 日常、紧急练习方案的任务量是各自独立的，请在学习\n  计划页面底部点击“设置学习计划”进行配置。</text>
 </view>
 
 <view wx:if="{{IsChangeStudyPLan}}" class="TempContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>

pages/plan/studyplan.wxss

@@ -8,6 +8,22 @@
   justify-content: center;
 }
 
+.panelTop{
+  position: fixed;
+  top:0;
+  width:100%;
+  z-index: 100;
+}
+
+.line{
+  width:100%;
+  height:30rpx;
+  background-color: #F0F0F0;
+}
+.line0{
+  height:267rpx;
+}
+
 .panelTitle{
   width:100%;
   justify-content: flex-start;
@@ -15,16 +31,23 @@
   background-color: #fff;
 }
 
+.panelTitle0{
+  width:100%;
+  justify-content: flex-start;
+  background-color: #fff;
+}
+
+.panelTitle00{
+  margin: 20rpx 30rpx;
+  color:#4D4D4D;
+}
+
 .universalpic_plan_2line_black_30x32{
   width:30rpx;
   height:32rpx;
   margin-left: 30rpx;
 }
 
-.panelTitle0{
-  margin-left: 30rpx;
-  color:#4D4D4D;
-}
 
 .panelTitle1{
   margin-left: 20rpx;
@@ -69,12 +92,6 @@
   margin-bottom: 30rpx;
 }
 
-.line{
-  width:100%;
-  height:30rpx;
-  background-color: #F0F0F0;
-}
-
 .panelItem{
   width:100%;
   background-color: #fff;
@@ -139,11 +156,21 @@
   background-color: #E3E3E3;
 }
 
-
 .text7{
   font-weight: 400;
   align-self: flex-start;
-  margin: 30rpx 0 40rpx 30rpx;
+  margin: 30rpx 0 20rpx 30rpx;
+}
+
+.text71{
+  font-weight: 400;
+  font-size:24rpx;
+  margin: 20rpx 0 30rpx 30rpx;
+}
+
+.Number4{
+  font-size:28rpx;
+  font-family: Roboto-Black;
 }
 
 
@@ -160,13 +187,11 @@
 
 .text5{
   font-size:24rpx;
-  margin-top:20rpx;
   color:#4D4D4D;
 }
 
 .list{
   align-items: flex-start;
-  width:168rpx;
   margin-top:20rpx;
 }
 
@@ -216,8 +241,25 @@
 
 .panelItem2{
   width:50%;
-  height:103rpx;
-  justify-content: space-around;
+  align-items: flex-start;
+}
+
+.panelItem21{
+  width:100%;
+  height:40rpx;
+  justify-content: space-between;
+  margin-top: 30rpx;
+}
+
+.text21{
+  font-size:28rpx;
+  margin: 0 0 0 30rpx;
+  font-weight: 400;
+}
+.text22{
+  font-size:20rpx;
+  color:#787878;
+  margin: 4rpx 0 30rpx 30rpx;
 }
 
 .panelItem3{
@@ -226,6 +268,12 @@
   justify-content: space-between;
 }
 
+.panelItem4{
+  width:100%;
+  height:103rpx;
+}
+
+
 .Number2{
   font-size: 36rpx;
   font-family: 'Roboto-Black';
@@ -243,12 +291,10 @@
 }
 
 .progress{
-  width:590rpx;
+  width:690rpx;
   height:14rpx;
   border-radius: 7rpx;
   background-color: #F0F0F0;
-  margin-right: 31rpx;
-  margin-left: 30rpx;
 }
 
 .progress1{
@@ -264,13 +310,6 @@
   margin-right: 30rpx;
 }
 
-
-.panelItem12{
-  margin-top: -35rpx;
-  justify-content: space-between;
-}
-
-
 .text8{
   font-size: 24rpx;
   color:#0071EF;

pages/plan/studyplandetail.js

@@ -4,12 +4,22 @@ import fanObj from '../template/FanObject';
 
 const app = getApp();
 const arrSortType = ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"];
+var historyLimitMax=5;
 
 Page({
   data: {
     CardNumberNew: [],
     CardNumberOld: [],
   },
+  onPullDownRefresh: function () {
+    var that = this;
+    main.UploadUserConfig(function () {
+      main.getTaskTodayList(function (data) { 
+        that.init();
+      });
+    });
+    wx.stopPullDownRefresh();
+  },
   onLoad: function (options) {
     var that = this;
 
@@ -23,8 +33,9 @@ Page({
     var that = this;
     var info = app.globalData.TaskToday;
 
-    
+    historyLimitMax=5;
     if (that.data.CardType==1) {
+      historyLimitMax=50;
       wx.setNavigationBarTitle({
         title: "紧急练习方案"
       });
@@ -33,7 +44,8 @@ Page({
     for (var i = 0; i <= 200; i++) {
       that.data.CardNumberNew.push(i);
     }
-    for (var i = 5; i <= 500; i++) {
+    
+    for (var i = historyLimitMax; i <= 500; i++) {
       that.data.CardNumberOld.push(i);
     }
 
@@ -54,20 +66,26 @@ Page({
           if (info.CardNumber > 0) {
             limitNumber = data.NewCardNumber + data.LimitCardNumber;
             cardTotal = info.CardNumberCommon;
-            rate = limitNumber / cardTotal;
+            if (cardTotal>0)
+              rate = limitNumber / cardTotal;
+            else
+              rate = 0;  
           }
         }
         else if (that.data.CardType == 1) {
           if (info.CardNumber > 0) {
             limitNumber = data.NewCardNumber + data.LimitCardNumber;
             cardTotal = info.CardNumberUrgent;
-            rate = limitNumber / cardTotal;
+            if (cardTotal>0)
+              rate = limitNumber / cardTotal;
+            else
+              rate = 0;
           }
           wx.setNavigationBarTitle({
             title: "紧急练习方案"
           });
         }
-        fanObj.init(that, rate, 100, 3.8, "#FF8C83", "#f0f0f0", limitNumber);
+        fanObj.init(that, rate, 100, 3.0, "#FF8C83", "#f0f0f0", limitNumber);
 
 
         that.setData({
@@ -91,7 +109,7 @@ Page({
       });
       common.getStorageValue(that, "CardMaxNumberHistory", 100, function () {
         that.setData({
-          CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - 5,
+          CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - historyLimitMax,
         });
       });
       common.getStorageValue(that, "SortTypeIndex", 0, function () {
@@ -108,7 +126,7 @@ Page({
       });
       common.getStorageValue(that, "CardMaxNumberHistoryUrgent", 100, function () {
         that.setData({
-          CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistoryUrgent - 5,
+          CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistoryUrgent - historyLimitMax,
         });
       });
     }
@@ -141,10 +159,7 @@ Page({
       });
       wx.setStorageSync("CardMaxNumberNewUrgent", this.data.CardNumberNew[this.data.CardMaxNumberNewIndex]);
     }
-    wx.removeStorageSync("StudyPlan");
-    main.UploadUserConfig(function () {
-      main.getTaskTodayList(function (data) {});
-    });
+    this.onPullDownRefresh();
   },
   bindUpdateCardNumberHistoryMax: function (e) {
     this.data.CardMaxNumberHistoryIndex = e.detail.value;
@@ -163,10 +178,7 @@ Page({
       });
       wx.setStorageSync("CardMaxNumberHistoryUrgent", this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex]);
     }
-    wx.removeStorageSync("StudyPlan");
-    main.UploadUserConfig(function () {
-      main.getTaskTodayList(function (data) { });
-    });
+    this.onPullDownRefresh();
   },
   onShareAppMessage: function () {
     return {

pages/plan/studyplandetail.json

@@ -1,3 +1,5 @@
 {
-  "navigationBarTitleText": "日常练习方案"
+  "navigationBarTitleText": "日常练习方案",
+  "enablePullDownRefresh": true
+
 }

pages/plan/studyplandetail.wxml

@@ -1,6 +1,7 @@
 <import src="../template/Fan.wxml" />
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="line"></view>
   <view class="panelTitle FlexRow">
     <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_data_black_30x32.png" />
     <view class="panelTitle1">参考数据</view>
@@ -21,18 +22,18 @@
         </view>
         <view class="item FlexRow">
           <view class="block2 block"></view>
-          <view class="text6">本方案已有</view>
+          <view class="text6">方案有题卡</view>
           <view class="Number1">{{CardNumberCurrent}}</view>
           <view class="text6">张</view>
         </view>
         <view class="item FlexRow">
           <view class="block"></view>
-          <view class="text6">其中今天增添</view>
-          <view class="Number1">{{NewCardNumberToday+HistoryCardNumberToday}}</view>
+          <view class="text6">其中今天新建</view>
+          <view class="Number1">{{NewCardNumberToday}}</view>
           <view class="text6">张</view>
         </view>
       </view>
-      <view class="cardFull" wx:if="CardType==1 && CardNumberCurrent>=200">容量已满</view>
+      <view class="cardFull" wx:if="{{CardType==1 && CardNumberCurrent>=200}}">容量已满</view>
       
     </view>
     <view class="line2"></view>
@@ -51,7 +52,10 @@
             <view class="text6">张</view>
           </view>
           <view class="item FlexRow">
-            <text class="text9">到期数量较多时请调整任务限量限制当天需要练习的题卡数</text>
+            <text class="text9">到期数量较多时请调整任务限量</text>
+          </view>
+          <view class="item FlexRow">
+            <text class="text9">限制当天需要练习的题卡数</text>
           </view>
         </view>
       </view>
@@ -63,6 +67,7 @@
           <view class="item FlexRow">
             <view class="text6">新</view>
             <view class="Number1">{{NewCardNumberToday}}</view>
+            <view class="text6">张</view>
             <view style="width:10rpx"></view>
             <view class="text6">旧</view>
             <view class="Number1">{{HistoryCardNumberToday}}</view>
@@ -75,13 +80,16 @@
 
         <view class="list1 list FlexColumn" wx:if="{{CardType==1}}">
           <view class="item FlexRow">
-            <view class="text6">本方案最多可容纳</view>
-            <view class="Number1">200</view>
+            <view class="text6">本方案最多容纳</view>
+            <view class="Number11 Number1">200</view>
             <view class="text6">张</view>
           </view>
           <view class="item FlexRow">
             <text class="text9">使用过程中请适当调配题卡</text>
           </view>
+          <view class="item FlexRow">
+            <text class="text9">于官网操作更便捷</text>
+          </view>
         </view>
       </view>
     </view>

pages/plan/studyplandetail.wxss

@@ -4,6 +4,12 @@
   font-size:28rpx;
 }
 
+.line{
+  width:100%;
+  height:30rpx;
+  background-color: #F0F0F0;
+}
+
 .lineWidthAll1{
   width: 100%;
   background-color: #fff;
@@ -20,13 +26,14 @@
   width:30rpx;
   height:32rpx;
   margin-left: 30rpx;
+  margin-right: 20rpx;
 }
 
 .panelTitle1{
   margin-left: 10rpx;
+  color: #4D4D4D;
 }
 
-
 .panelItem{
   width:100%;
   background-color: #fff;
@@ -89,11 +96,9 @@
 
 .list{
   align-items: flex-start;
-  width:240rpx;
   font-size:24rpx;
 }
 .list1{
-  width:300rpx;
   align-items: flex-start;
 }
 
@@ -119,11 +124,15 @@
 }
 
 .Number1{
-  font-size: 20rpx;
+  font-size: 24rpx;
   font-family: Roboto-Black;
   margin: 0 5rpx 0rpx 5rpx;
 }
 
+.Number11{
+  color:#787878;
+}
+
 .text6{
   font-size:24rpx;
   color:#787878;

utils/constant.js

@@ -1,18 +1,25 @@
 module.exports = {
-  arrMemoryLevelAll:[
+  arrMemoryLevelAll: [
     {
-      Key: "长文",
-      Value: ["答错重来", "困难犹豫", "短暂思考", "脱口而出"]
-    }, {
-      Key: "短文",
-      Value: ["答错", "生疏", "一般", "流利"]
-    }, {
-      Key: "特色",
-      Value: ["不过", "难过", "通过", "秒过"]
-    }, {
-      Key: "再现间隔",
-      Value: ["<10分钟", "2天", "4天", "8天"]
+      Name: "基本模式",
+      Name2: "三色按键，通俗易懂，容易操作，适合初学者",
+      Value: [
+        { Name: "答错", IsShow: true, BGColor: "#FE6659", W: 210, H: 10 },
+        { Name: "生疏", IsShow: true, BGColor: "#FFBC00", W: 210, H: 10 },
+        { Name: "答对", IsShow: true, BGColor: "#329468", W: 210, H: 10 },
+        { Name: "秒过", IsShow: false, BGColor: "#0A60BE", W: 155, H: 50 },
+      ],
     },
+    {
+      Name: "高级模式",
+      Name2: "四色按键，配有时间指标功能，能更准确地操作记忆评价，对长期使用有极大帮助，适合已掌握基础使用知识的用户",
+      Value: [
+        { Name: "1分钟内", IsShow: true, BGColor: "#FE6659", W: 155, H: 10 },
+        { Name: "明天", IsShow: true, BGColor: "#FFBC00", W: 155, H: 10 },
+        { Name: "3天后", IsShow: true, BGColor: "#329468", W: 155, H: 10 },
+        { Name: "6天后", IsShow: true, BGColor: "#0A60BE", W: 155, H: 50 },
+      ]
+    }
   ],
   arrShareImageBackColor:[
     "#616161",

utils/main.js

@@ -541,23 +541,6 @@ function getTaskTodayList(callback) {
     if (data) {
       app.globalData.TaskToday = data;
       
-
-      //存储当天的学习计划
-      var StudyPlan = wx.getStorageSync("StudyPlan");
-      var today = common.formatTime(new Date(), "-",true);
-      if (!StudyPlan || StudyPlan.Today < today){
-        var StudyPlan = {};
-        StudyPlan.UrgentNewLength = data.UrgentNewLength;
-        StudyPlan.UrgentOldLength = data.UrgentOldLength;
-        StudyPlan.CommonNewLength = data.CommonNewLength;
-        StudyPlan.CommonOldLength = data.CommonOldLength;
-        StudyPlan.ListReviewLength = data.ListReview.length;
-        StudyPlan.PracticeNumber = data.PracticeNumber;
-        StudyPlan.PracticeTime = data.PracticeTime;
-        StudyPlan.Today = today;
-        wx.setStorageSync("StudyPlan", StudyPlan);
-      }
-
       callback(data);
     }
   });
@@ -792,8 +775,8 @@ function getMemoryLevelAll() {
 
 function getMemoryLevel(index, number, time) {
   var arr = getMemoryLevelAll();
-  if (index < 3)
-    return arr[index].Value[number];
+  if (index < 1)
+    return arr[index].Value[number].Name;
   else
     return replaceStr(time);
 
@@ -804,18 +787,25 @@ function getMemoryLevel(index, number, time) {
       if (dayNum >= 365) {
         var year1 = Math.floor(dayNum / 365);
         var year = year1 + Math.round(10 * (dayNum - year1 * 365) / 365) / 10;
-        result = year + "年";
+        result = year + "年后";
       } else {
         if (dayNum > 31) {
           var month1 = Math.floor(dayNum / 30);
           var month = month1 + Math.round(10 * (dayNum - month1 * 30) / 30) / 10;
-          result = month + "月";
-        } else
-          result = data.replace("d", "天");
+          result = month + "月后";
+        } else{
+          result = Number(data.replace("d", ""));
+          if (result==1)
+            result="明天";
+          else if (result==2)
+            result="后天";
+          else
+            result=(result-1)+"天后";
+        }
       }
 
     } else if (data.indexOf("m") > 0)
-      result = "<" + data.replace("m", "分钟");
+      result = data.replace("m", "分钟内");
     return result;
   }
 }