1.6.0

app.json

@@ -1,6 +1,9 @@
 {
   "pages": [
     "pages/index/index",
+    
+    "pages/main/preview",
+   
     "pages/index/accredit",
     "pages/index/openSetting",
 
@@ -12,7 +15,6 @@
 
     "pages/main/default",
     "pages/main/cardInfo",
-    "pages/main/preview",
     "pages/main/searchCardList",
     "pages/main/searchCard1",
     "pages/main/searchCard",
@@ -23,14 +25,17 @@
     "pages/main/detail",
     "pages/main/systemsetting",
     "pages/main/symbolsetting",
-    
+    "pages/main/previewMenu",
+
     "pages/plan/recommend",
     "pages/plan/clicktype",
     "pages/plan/colorplan",
     "pages/plan/memoryLevel",
-    "pages/plan/taskLimit",
     "pages/plan/sortRule",
     "pages/plan/setting",
+
+    "pages/plan/studyplan",
+    "pages/plan/studyplandetail",
     
     "pages/marketing/extenduser",
     "pages/marketing/shareuser",

app.wxss

@@ -53,6 +53,11 @@
   height: 1rpx;
   background-color: #E3E3E3; 
 }
+.lineWidth690{
+  width: 690rpx;
+  height: 1rpx;
+  background-color: #E3E3E3; 
+}
 .lineWidth680{
   width: 680rpx;
   height: 1rpx;

pages/index/index.js

@@ -313,8 +313,17 @@ Page({
     var that = this;
     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);
       wx.setStorageSync("CardMaxNumberHistory", data.CardMaxNumberHistory);
+      wx.setStorageSync("CardMaxNumberNewUrgent", data.CardMaxNumberNewUrgent);
+      wx.setStorageSync("CardMaxNumberHistoryUrgent", data.CardMaxNumberHistoryUrgent);
       wx.setStorageSync("SortTypeIndex", data.SortTypeIndex);
       wx.setStorageSync("MemoryLevel", data.MemoryLevel);
       wx.setStorageSync("ClickType", data.ClickType);

pages/main/cardInfo.wxml

@@ -3,7 +3,7 @@
     <view class="panelTitle1">时间</view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">添加题卡</view>
+    <view class="panelItem1">题卡创建</view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.CreateTimeStr}}
     </view>
@@ -30,7 +30,7 @@
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
-    <view class="panelItem1">到期时间</view>
+    <view class="panelItem1">到期（题卡可再现的具体时间）</view>
     <view class="panelItem2 FlexRow">
       {{CardInfo.LimitTimeStr}}
     </view>

pages/main/default.js

@@ -47,7 +47,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (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',
@@ -158,6 +158,14 @@ Page({
     });
   },
   init:function(){
+    //显示学习方案
+    var cardType = wx.getStorageSync("CardType");
+    if (!cardType)
+      cardType = 0;
+    this.setData({
+      CardType:cardType,
+    });
+
     //题卡主题色
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");
     if (!arrColorIndex) {

pages/main/default.wxml

@@ -1,25 +1,38 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class='panel1 FlexColumn' bindtap="goto" data-url="../plan/setting">
-    <view class='text1 FlexRow'>第<text class="text11">{{DayNumber}}</text>天</view>
-    <view class='text3' wx:if="{{TodayTaskNumber>0 && IsStart==0}}">剩余任务</view>
-    <view class='text3' wx:if="{{TodayTaskNumber>0 && IsStart==1}}">今天任务</view>
-    <view class='panel11 FlexRow' >
-      <view class='universalpic_setup_gray_40x40'></view>
+  <view class='panel1{{IsIPad}} FlexColumn'>
+    <view class='text1 FlexRow'>第
+      <text class="text11">{{DayNumber}}</text>天</view>
+    <view class='text3' wx:if="{{CardType==0}}">日常练习</view>
+    <view class='text3' wx:if="{{CardType==1}}">紧急练习</view>
+    <view class='text3' wx:if="{{CardType==2}}">整体练习</view>
+    <view class='panel11 FlexRow'>
       <view class='text2'>{{TodayTaskNumber}}</view>
-      <image class="universalpic_setup_white_50x50" src='../images/universalpic_setup_white_50x50.png' />
     </view>
   </view>
   <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/study_index_start.png' bindtap="goto" data-url="./detail" />
   <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_goon.png' bindtap="goto" data-url="./detail" />
   <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_report.png' bindtap="goto" data-url="./detail" />
 
+  <image class="study_index_plan{{IsIPad}}" src="../images/study_index_plan.png" bindtap="goto" data-url="../plan/studyplan" />
+
   <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' />
+    <!-- <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}}">
+      <view class="adLine1 FlexRow" bindtap="goto" data-url="../marketing/index">
+        <view class="text6">秒过推广计划 120天有效期等您来拿</view>
+      </view>
+      <view class="adLine2"></view>
+      <view class="adLine3"></view>
+      <view class="chalk1 chalk"><view class="chalk11 chalk"></view></view>
+      <view class="chalk2 chalk"><view class="chalk11 chalk"></view></view>
+      <image class="study_index_board_close" src='../images/study_index_board_close.png' wx:if="{{IsShowMarketing===2}}" catchtap="closeMarketing"/>
+      <image class="avatar" src='../images/study_index_board_avater01.png' />
+      <image class="message" src='../images/study_index_board_message.png' />
+    </view>
     <view class='panelBottom1 FlexRow'>
       <view class='panelBottom11 FlexColumn'>
         <image class="program_tabbar_study_default" src='../images/program_tabbar_study_normal.png' />
@@ -28,7 +41,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'>
@@ -54,6 +67,6 @@
 </view>
 
 <view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class='IsExitText'>请竖起屏幕再打开小程序</view>
+  <view class='IsExitText'>请关闭微信(务必)，竖起屏幕，再打开秒过学习小程序</view>
   <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>
 </view>

pages/main/default.wxss

@@ -4,30 +4,31 @@
 
 .panel1 {
   position: fixed;
-  top:100rpx;
+  top:80rpx;
   color: #fff;
 }
 
-.panel1 .text1 {
+.panel1_iPad {
+  position: fixed;
+  top:0rpx;
+  color: #fff;
+}
+
+.text1 {
   font-size: 36rpx;
 }
-.panel1 .text11 {
+.text11 {
   font-size: 40rpx;
   font-family: 'Roboto-Black';
 }
-.panel1 .text3 {
+.text3 {
   font-size: 28rpx;
   margin-top: 10rpx;
 }
 
-.panel1 .text2 {
+.text2 {
   font-family: 'Roboto-Black';
   font-size: 168rpx;
-  margin: 0 10rpx;
-}
-
-.panel1 .panel11{
-  margin-right: -50rpx;
 }
 
 .universalpic_setup_white_50x50 {
@@ -41,23 +42,38 @@
   width: 377rpx;
   height: 240rpx;
   position: fixed;
-  top:523rpx;
+  top:437rpx;
 }
 
 .study_index_start_iPad {
   width: 377rpx;
   height: 240rpx;
   position: fixed;
-  top:433rpx;
+  top:297rpx;
 }
 
+.study_index_plan{
+  width:110rpx;
+  height:144rpx;
+  position: fixed;
+  top:745rpx;
+}
+
+.study_index_plan_iPad{
+  width:110rpx;
+  height:144rpx;
+  position: fixed;
+  top:545rpx;
+}
+
+
 .panelBottom {
   position: fixed;
   bottom:0;
   width: 100%;
 }
 
-.study_index_banner{
+/* .study_index_banner{
   width: 360rpx;
   height: 148rpx;
   align-self: flex-end;
@@ -74,11 +90,89 @@
   margin-right: 20rpx;
   margin-bottom: -50rpx;
   position: relative;
+} */
+
+.adPanel{
+  width:100%;
+  height:174rpx;
+  justify-content: flex-end;
+  position: relative;
+}
+.adLine1{
+  width:100%;
+  height:120rpx;
+  background-color: #222D4C;
+  border-top-left-radius: 14rpx;
+  border-top-right-radius: 14rpx;
+  
+}
+.text6{
+  margin-left: 15rpx;
+  font-size:28rpx;
+  color:#E3E3E3;
+}
+.adLine2{
+  width:100%;
+  height:20rpx;
+  background-color: #FFC48D;
+}
+.adLine3{
+  width:100%;
+  height:10rpx;
+  background-color: #CA8770;
+}
+.avatar{
+  width:110rpx;
+  height:169rpx;
+  position: absolute;
+  bottom:0;
+  left:30rpx;
+}
+.message{
+  width:103rpx;
+  height:41rpx;
+  position: absolute;
+  top:0;
+  left:160rpx;
+}
+
+.chalk{
+  height:8rpx;
+  border-radius: 4rpx;
+}
+.chalk1{
+  width:34rpx;
+  position: absolute;
+  bottom:30rpx;
+  right:90rpx;
+  background-color: #E3E3E3;
+}
+
+.chalk11{
+  width:28rpx;
+  background-color: rgba(0,0,0,0.2);
+}
+
+.chalk2{
+  width:34rpx;
+  position: absolute;
+  bottom:30rpx;
+  right:40rpx;
+  background-color: #19C575;
+}
+
+
+.study_index_board_close{
+  width:70rpx;
+  height:70rpx;
+  position: absolute;
+  right:10rpx;
+  top:49rpx;
 }
 
 .study_index_footer{
   width: 100%;
-  height:130rpx;
+  height:140rpx;
 }
 .panelBottom1 {
   width: 100%;

pages/main/detail.js

@@ -479,6 +479,7 @@ Page({
     if (btnnumber == 2) {
       var card = TaskList.splice(0, 1);
       card[0].IsFinally=true;
+      card[0].LimitTime=common.formatTime(new Date(),"/",true)+" 23:59:59";
       TaskList.push(card[0]);
       that.setData({
         IsShowAnswer: [0, 0],
@@ -1021,6 +1022,10 @@ Page({
       }
     });
   },
+  //获取导航栏高度
+  getBarInfo(e) {
+    this.setData({ topBarHeight: e.detail.topBarHeight })
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/detail.json

@@ -1,5 +1,9 @@
 {
   "navigationBarTitleText": "学习中",
   "navigationBarTextStyle": "white",
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },
+  "navigationStyle": "custom"
 }

pages/main/detail.wxml

@@ -1,4 +1,9 @@
 <import src="../template/cardShow.wxml" />
+<navigation-bar title="学习中" bindgetBarInfo="getBarInfo" show="true" left="true" background="{{Color.BackColor}}" color="#fff">
+    <view slot="left" bindtap="onClose">
+      <view class="square">退出练习</view>
+    </view>
+</navigation-bar>
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}}' bindtap='onShowAnswer' data-type="all">
   <!-- 练习中 -->
@@ -137,7 +142,7 @@
     </view>
   </block>
   <!-- 今日任务量 -->
-  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
+  <view wx:if="{{IsShowNumberInfo}}" class="numberContainer FlexColumn" style='height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
       <view class="numberContainer12 FlexRow">
@@ -155,14 +160,14 @@
         <view class="lineWidth720"></view>
       </view>
       <view class="numberContainer12 FlexRow">
-        <view class='left'>及时强化</view>
+        <view class='left'>本轮及时强化 / 并回顾上次练习未练完的题卡</view>
         <view class='right3'>{{NumberReview}}张</view>
       </view>
       <view class="lineWidthAll FlexRow">
         <view class="lineWidth720"></view>
       </view>
       <view class="numberContainer12 FlexRow">
-        <view class='left'>剩余任务</view>
+        <view class='left' style='color:{{Color.LineColor}};'>未练完总计</view>
         <view class='right3' style='color:{{Color.LineColor}};'>{{NumberNew+NumberReview+NumberHistory}}张</view>
       </view>
       <view class='lineFooter'></view>
@@ -174,7 +179,7 @@
   </view>
 
   <!-- 更多功能 -->
-  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
+  <view wx:if="{{IsMore}}" class="numberContainer FlexColumn" style='height:{{Containnerheight+100}}rpx;background-color:{{Color.BackColor}};'>
     <view class="numberContainerFooter1 FlexColumn">
       <view class='lineFooter'></view>
       <view class='numberContainerFooter102 FlexRow' catchtap='gotoNext' data-btnnumber="2">

pages/main/detail.wxss

@@ -1,9 +1,24 @@
+page{
+  background-color: #D2D2D2;
+}
+
+.square{
+  background-color: #181A21;
+  width:136rpx;
+  line-height:53rpx;
+  text-align: center;
+  color: #fff;
+  border-radius:10rpx;
+  font-size:24rpx;
+  font-weight: 500;
+}
+
 /* 工具栏 */
 .panelTop {
   width: 100%;
   height: 110rpx;
   position: fixed;
-  top: 0;
+  top: 156rpx;
   font-size: 20rpx;
   z-index: 10;
 }
@@ -430,7 +445,7 @@
   justify-content: flex-start;
   align-items: flex-start;
   position: fixed;
-  top: 0;
+  top: 156rpx;
   color: #fff;
   z-index: 20;
 }

pages/main/preview.js

@@ -16,6 +16,7 @@ var tempPlayUrlLocal = "";
 Page({
   data: {
     IsExistCard: false,
+    Containnerheight:1440,
   },
   onReady: function () {
     var that=this;
@@ -169,6 +170,7 @@ Page({
         card.LimitTime = list[i].LimitTime;
         card.FontSize = list[i].FontSize;
         card.IsCollect = list[i].IsCollect;
+        card.CardType = list[i].CardType;
         break;
       }
     }
@@ -235,6 +237,7 @@ Page({
     }
     this.setData({
       ID: card.MiaoguoCardID,
+      CardType:card.CardType,
       Field: card.Field,
       Tags: card.Tags,
       TagWidth: TagWidth,
@@ -253,97 +256,102 @@ Page({
 
     isPlaying = false;
   },
-  practiceToday: function () {
-    var that = this;
-    wx.showModal({
-      title: '要今天练吗？',
-      content: '这张题卡今天必须练习',
-      success(res) {
-        if (res.confirm) {
-
-          var arr = [];
-          var obj = {};
-          obj.Card = {};
-          obj.Card.MiaoguoCardID = that.data.ID;
-          obj.BtnNumber = -1;
-          obj.LearningType = 2;
-          arr.push(obj);
-
-          wx.setStorageSync("ListTaskFinished", arr);
-
-          main.UpdateMiaoguoCardTodayAll(false, function () {
-            var time = common.formatTime(new Date());
-            that.setData({
-              LimitTimeStr: common.formatDateCHS(time),
-              IsTodayPractice: false,
-            });
-            var list = app.globalData.CardList;
-            for (var i = 0; i < list.length; i++) {
-              if (that.data.ID == list[i].MiaoguoCardID) {
-                list[i].LimitTime = time;
-                list[i].LimitTimeStr = "今天";
-                break;
-              }
-            }
-            app.globalData.CardList = list;
-            wx.showToast({
-              title: '改为今天练',
-              icon: 'none',
-            });
-          });
-        }
-        else if (res.cancel) {
-
-        }
-      }
-    })
-  },
-  shelveTask: function () {
-    //搁置题卡，今天不练
-    var that = this;
-    wx.showModal({
-      title: '今天不练吗？',
-      content: '这张题卡今天不练习',
-      success(res) {
-        if (res.confirm) {
-
-          var arr = [];
-          var obj = {};
-          obj.Card = {};
-          obj.Card.MiaoguoCardID = that.data.MiaoguoCardID;
-          obj.IntervalTime = "1d";
-          obj.BtnNumber = 1;
-          obj.Duration = 0;
-          obj.LearningType = 3;
-          arr.push(obj);
-
-          wx.setStorageSync("ListTaskFinished", arr);
-          main.UpdateMiaoguoCardTodayAll(false, function () {
-            var time = common.formatTime(common.addDate("d", 1, new Date()));
-            that.setData({
-              LimitTimeStr: common.formatDateCHS(time),
-              IsTodayPractice: true,
-            });
-            var list = app.globalData.CardList;
-            for (var i = 0; i < list.length; i++) {
-              if (that.data.ID == list[i].MiaoguoCardID) {
-                list[i].LimitTime = time;
-                list[i].LimitTimeStr = "明天";
-                break;
-              }
-            }
-            app.globalData.CardList = list;
-            wx.showToast({
-              title: '改为明天练',
-              icon: 'none',
-            });
-          });
-        }
-        else if (res.cancel) {
-
-        }
-      }
-    })
+  // practiceToday: function () {
+  //   var that = this;
+  //   wx.showModal({
+  //     title: '要今天练吗？',
+  //     content: '这张题卡今天必须练习',
+  //     success(res) {
+  //       if (res.confirm) {
+
+  //         var arr = [];
+  //         var obj = {};
+  //         obj.Card = {};
+  //         obj.Card.MiaoguoCardID = that.data.ID;
+  //         obj.BtnNumber = -1;
+  //         obj.LearningType = 2;
+  //         arr.push(obj);
+
+  //         wx.setStorageSync("ListTaskFinished", arr);
+
+  //         main.UpdateMiaoguoCardTodayAll(false, function () {
+  //           var time = common.formatTime(new Date());
+  //           that.setData({
+  //             LimitTimeStr: common.formatDateCHS(time),
+  //             IsTodayPractice: false,
+  //           });
+  //           var list = app.globalData.CardList;
+  //           for (var i = 0; i < list.length; i++) {
+  //             if (that.data.ID == list[i].MiaoguoCardID) {
+  //               list[i].LimitTime = time;
+  //               list[i].LimitTimeStr = "今天";
+  //               break;
+  //             }
+  //           }
+  //           app.globalData.CardList = list;
+  //           wx.showToast({
+  //             title: '改为今天练',
+  //             icon: 'none',
+  //           });
+  //         });
+  //       }
+  //       else if (res.cancel) {
+
+  //       }
+  //     }
+  //   })
+  // },
+  // shelveTask: function () {
+  //   //搁置题卡，今天不练
+  //   var that = this;
+  //   wx.showModal({
+  //     title: '今天不练吗？',
+  //     content: '这张题卡今天不练习',
+  //     success(res) {
+  //       if (res.confirm) {
+
+  //         var arr = [];
+  //         var obj = {};
+  //         obj.Card = {};
+  //         obj.Card.MiaoguoCardID = that.data.MiaoguoCardID;
+  //         obj.IntervalTime = "1d";
+  //         obj.BtnNumber = 1;
+  //         obj.Duration = 0;
+  //         obj.LearningType = 3;
+  //         arr.push(obj);
+
+  //         wx.setStorageSync("ListTaskFinished", arr);
+  //         main.UpdateMiaoguoCardTodayAll(false, function () {
+  //           var time = common.formatTime(common.addDate("d", 1, new Date()));
+  //           that.setData({
+  //             LimitTimeStr: common.formatDateCHS(time),
+  //             IsTodayPractice: true,
+  //           });
+  //           var list = app.globalData.CardList;
+  //           for (var i = 0; i < list.length; i++) {
+  //             if (that.data.ID == list[i].MiaoguoCardID) {
+  //               list[i].LimitTime = time;
+  //               list[i].LimitTimeStr = "明天";
+  //               break;
+  //             }
+  //           }
+  //           app.globalData.CardList = list;
+  //           wx.showToast({
+  //             title: '改为明天练',
+  //             icon: 'none',
+  //           });
+  //         });
+  //       }
+  //       else if (res.cancel) {
+
+  //       }
+  //     }
+  //   })
+  // },
+  showMenu:function(){
+    wx.navigateTo({
+      url: './previewMenu?ID='+this.data.MiaoguoCardID+'&CardType=' + this.data.CardType,
+    });
   },
   copyCard: function () {
     if (!isCopying) {

pages/main/preview.wxml

@@ -5,8 +5,9 @@
   <block wx:if="{{ShowType=='show'}}">
     <view class="panelTop FlexRow">
       <view class='left FlexColumn'>
-        <view class="text3" bindtap='practiceToday' hidden="{{!IsTodayPractice}}">今天必练</view>
-        <view class="text4 text3" bindtap='shelveTask' hidden="{{IsTodayPractice}}">搁置</view>
+        <view class="text3" bindtap='showMenu' wx:if="{{CardType==0}}">日常练习</view>
+        <view class="text3" bindtap='showMenu' wx:if="{{CardType==1}}">紧急练习</view>
+        <view class="text3" bindtap='showMenu' wx:if="{{CardType==-1}}">留白题卡</view>
       </view>
       <view class='right FlexRow'>
         <view class="panelTopBtn FlexRow" bindtap='getDetailInfo'>
@@ -17,7 +18,7 @@
         </view>
         <view class="panelTopBtn FlexRow" bindtap='gotoCollect'>
           <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_default_black_26x24.png' wx:if="{{!IsCollect}}" />
-          <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_enable_red_26x24.png'  wx:if="{{IsCollect}}" />
+          <image class="universalpic_fav_default_black_26x24" src='../images/universalpic_fav_enable_red_26x24.png' wx:if="{{IsCollect}}" />
         </view>
         <view class="panelTopBtn FlexRow" bindtap='deleteCard'>
           <image class="universalpic_del_black_20x28" src='../images/universalpic_del_black_20x28.png' />
@@ -29,9 +30,9 @@
 
   <!-- 幻灯片播放 -->
   <block wx:if="{{ShowType=='play'}}">
-    <view class="panelTop FlexRow"  style='background-color:{{Color.BackColor}};border-bottom:0;'>
+    <view class="panelTop FlexRow" style='background-color:{{Color.BackColor}};border-bottom:0;'>
       <view class='left' catchtap='gotoCollect'>
-      <view class='panelCancel0 FlexRow'>
+        <view class='panelCancel0 FlexRow'>
           <image hidden='{{IsCollect}}' src="../images/universalpic_fav_default_gray_26x24.png" class='universalpic_fav_default_gray_26x24' />
           <image hidden='{{!IsCollect}}' src="../images/universalpic_fav_enable_tc0{{Color.ID}}_26x24.png" class='universalpic_fav_default_gray_26x24' />
         </view>
@@ -50,7 +51,7 @@
   </block>
 
   <template is="CardShow" data="{{Color:Color,Field:Field,Tags:Tags,IsShowAnswer:IsShowAnswer,TagWidth:TagWidth,FontSize:FontSize,LimitTimeStr:LimitTimeStr,ShowType:ShowType}}" />
-  
+
   <view style='height:150rpx'></view>
 
   <view class='footer FlexColumn' style='background-color:{{Color.BackColor}}'>
@@ -83,7 +84,7 @@
       <view class='btn2 FlexRow'>
         <button class="btn23 btn21" catchtap="copyCard">另存为我的题卡</button>
       </view>
-      
+
       <view class='btn1'></view>
     </view>
 
@@ -104,7 +105,6 @@
       <view class='btn1' wx:if="{{NextID==0}}"></view>
     </view>
   </view>
-  
 </view>
 
 <audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages/main/preview.wxss

@@ -447,4 +447,5 @@
 .universalpic_home_gray_36x36{
   width: 36rpx;
   height: 36rpx;
-}
+}
+

pages/main/previewMenu.js

@@ -0,0 +1,49 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    MenuArr: [
+      { CardType: 0, Name: "日常练习", Remark: "需要长期记忆不能遗忘的题卡" },
+      { CardType: 1, Name: "紧急练习", Remark: "紧急或临时要练习的题卡，需要近期强化巩固的题卡" },
+      { CardType: -1, Name: "留白题卡", Remark: "提前制作的、他人分享的、暂时无需练习的题卡" },
+    ]
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      CardType:options.CardType,
+      MiaoguoCardID:options.ID,
+    });
+  },
+  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,
+        });
+      });
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/previewMenu.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "菜单"
+}

pages/main/previewMenu.wxml

@@ -0,0 +1,23 @@
+<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>
+    </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暂时不想练的题卡请移往“留白题卡”，不建议删除。
+      </text>
+  </view>
+</view>

pages/main/previewMenu.wxss

@@ -0,0 +1,58 @@
+/* 菜单 */
+.container2{
+  background-color: #f0f0f0;
+}
+
+.panelStudyPlan{
+  width:100%;
+  background-color: #fff;
+  margin-top: 30rpx;
+}
+.panelStudyPlan1{
+  width:100%;
+  height:133rpx;
+  justify-content: flex-start;
+}
+.imgTrue{
+  width:100rpx;
+  height:134rpx;
+  text-align: center;
+  line-height: 134rpx;
+  font-size:50rpx;
+  color:#0071EF;
+}
+
+.panelStudyPlan11{
+  align-items: flex-start;
+}
+
+.text7{
+  font-size:28rpx;
+  margin-bottom: 4rpx;
+}
+
+.text6{
+  font-size:20rpx;
+  color:#787878;
+}
+
+.panelHelp{
+  width:710rpx;
+  height:256rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  margin-top: 30rpx;
+  align-items: flex-start;
+}
+
+.universalpic_exmark_deepyellow_70x70{
+  width:70rpx;
+  height:70rpx;
+  margin-right: 30rpx;
+  margin-top: 28rpx;
+}
+
+.text8{
+  width:550rpx;
+  font-size:20rpx;
+}

pages/main/searchCard.js

@@ -98,17 +98,22 @@ Page({
     else{
       var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
       var isCollect = e.currentTarget.dataset.iscollect;
-      if (!isCollect) 
-        isCollect=0;
+      if (!isCollect)
+        isCollect = 0;
+      url += "&IsCollect=" + isCollect;
+
+      var cardType = 2;
+      if (e.currentTarget.dataset.cardtype){
+        cardType = e.currentTarget.dataset.cardtype;
+        url += "&CardType=" + cardType;
+      }
 
-      url+="&IsCollect="+isCollect;
-      
       main.getData(url, function (data) {
         wx.hideLoading();
         if (data) {
           app.globalData.CardList= data.List;
           wx.navigateTo({
-            url: './searchCardList?type=0&Count=' + data.Count+'&IsCollect='+isCollect,
+            url: './searchCardList?type=0&Count=' + data.Count+'&IsCollect='+isCollect+'&CardType='+cardType,
           });
         }
       });

pages/main/searchCard.wxml

@@ -1,49 +1,92 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-	<view class='panel'>
-		<view class="panelSearch FlexRow">
-			<view class="panelSearch1 FlexRow" bindtap="onSearch">
-				<image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-				<view>搜索我的题卡</view>
-			</view>
-		</view>
-		<block wx:if="{{IsShow==0}}">
-			<view class='panelBtn FlexColumn'>
-				<view class="panelItem3 panelItem FlexRow" bindtap="gotoAccredit">
-					<view class="panelItem1 FlexRow">
-						<image class="avatar" src='{{AvatarUrl}}' />
-						<view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
-						<view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
-					</view>
-					<view class="panelItem2 FlexRow">
-					</view>
-				</view>
-			</view>
-			<view class='lineFooter'></view>
-		</block>
-		<view class='panelBtn FlexColumn'>
-			<view class="panelItem FlexRow" bindtap="getList" data-id="0">
-				<view class="panelItem1">
-					全部题卡
-				</view>
-				<view class="panelItem2 FlexRow">
-					<view>{{CardNumber}}</view>
-					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-				</view>
-			</view>
-			<view class="lineWidthAll FlexRow">
-				<view class="lineWidth720"></view>
-			</view>
-			<view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
-				<view class="panelItem1 FlexRow">
-					<image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
-					<view>收藏夹</view>
-				</view>
-				<view class="panelItem2 FlexRow">
-					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-				</view>
-			</view>
-		</view>
-		<view class='lineFooter'></view>
+  <view class='panel'>
+    <view class="panelSearch FlexRow">
+      <view class="panelSearch1 FlexRow" bindtap="onSearch">
+        <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+        <view>搜索我的题卡</view>
+      </view>
+    </view>
+    <block wx:if="{{IsShow==0}}">
+      <view class='panelBtn FlexColumn'>
+        <view class="panelItem3 panelItem FlexRow" bindtap="gotoAccredit">
+          <view class="panelItem1 FlexRow">
+            <image class="avatar" src='{{AvatarUrl}}' />
+            <view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
+            <view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
+          </view>
+          <view class="panelItem2 FlexRow">
+          </view>
+        </view>
+      </view>
+      <view class='lineFooter'></view>
+    </block>
+    <block wx:if="{{IsShow==1}}">
+      <view class="panelTitle FlexRow">
+        <view class="panelTitle1">题卡管理</view>
+        <view class="panelTitle2"></view>
+      </view>
+    </block>
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0">
+        <view class="panelItem1">
+          所有题卡
+        </view>
+        <view class="panelItem2 FlexRow">
+          <view>{{CardNumber}}</view>
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-cardtype="0">
+        <view class="panelItem1 FlexRow">
+          属于日常练习方案的题卡
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-cardtype="1">
+        <view class="panelItem1 FlexRow">
+          属于紧急练习方案的题卡
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+
+      <view class="lineWidthAll FlexRow">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-cardtype="-1">
+        <view class="panelItem1 FlexRow">
+          属于留白题卡
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+    </view>
+
+    <view class='lineFooter'></view>
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
+        <view class="panelItem1 FlexRow">
+          <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
+          <view>收藏夹</view>
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+    </view>
+
+    <!-- <view class='lineFooter'></view>
 		<view class='panelBtn FlexColumn'>
 			<view class="panelItem FlexRow" bindtap="getList" data-id="1">
 				<view class="panelItem1">
@@ -53,19 +96,19 @@
 					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
 				</view>
 			</view>
-		</view>
-		<view class='lineFooter'></view>
-		<view class='panelBtn FlexColumn'>
-			<view class="panelItem FlexRow" bindtap="gotoUserbook">
-				<view class="panelItem1">
-					用户手册
-				</view>
-				<view class="panelItem2 FlexRow">
-					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-				</view>
-			</view>
-		</view>
-		<view class='lineFooter'></view>
+		</view> -->
+    <view class='lineFooter'></view>
+    <view class='panelBtn FlexColumn'>
+      <view class="panelItem FlexRow" bindtap="gotoUserbook">
+        <view class="panelItem1">
+          用户手册
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+    </view>
+    <!-- <view class='lineFooter'></view>
 		<block wx:if="{{IsYearReport}}">
 			<view class='panelBtn FlexColumn'>
 				<view class="panelItem FlexRow" bindtap="gotoAnnualReport">
@@ -76,29 +119,29 @@
 						<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
 					</view>
 				</view>
-			</view>
+			</view> 
 			<view class='lineFooter'></view>
-		</block>
-	</view>
-	<view class='panelBottom FlexColumn'>
+		</block> -->
+  </view>
+  <view class='panelBottom FlexColumn'>
 
-		<view class='panelBottom1 FlexRow'>
-			<view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
-				<image class="program_tabbar_study_default" src='../images/program_tabbar_study_default.png' />
-				<view>学习</view>
-			</view>
-			<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 class='line1'></view>
-			<view class='panelBottom11 FlexColumn'>
-				<image class="program_tabbar_study_default" src='../images/program_tabbar_note_normal.png' />
-				<view class='text5'>题卡</view>
-			</view>
-		</view>
+    <view class='panelBottom1 FlexRow'>
+      <view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_study_default.png' />
+        <view>学习</view>
+      </view>
+      <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 class='line1'></view>
+      <view class='panelBottom11 FlexColumn'>
+        <image class="program_tabbar_study_default" src='../images/program_tabbar_note_normal.png' />
+        <view class='text5'>题卡</view>
+      </view>
+    </view>
 
-		<view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
-	</view>
+    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+  </view>
 </view>

pages/main/searchCard.wxss

@@ -27,6 +27,17 @@
   margin-right: 10rpx;
 }
 
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 10rpx;
+}
+
 
 .panelBottom {
   position: fixed;

pages/main/searchCard1.js

@@ -14,7 +14,7 @@ Page({
       
     });
 
-    common.getStorageValue(that, "SearchCardTextList", [], function () {
+    common.getStorageValue(that, "SearchTextList", [], function () {
     });
   },
   onShow:function(){
@@ -50,7 +50,7 @@ Page({
       });
 
       setTimeout(function () {
-        var arr = that.data.SearchCardTextList;
+        var arr = that.data.SearchTextList;
         for (var i = 0; i < arr.length; i++) {
           if (arr[i] == search) {
             arr.splice(i, 1);
@@ -63,9 +63,9 @@ Page({
           arr.pop();
         }
 
-        wx.setStorageSync("SearchCardTextList", arr);
+        wx.setStorageSync("SearchTextList", arr);
         that.setData({
-          SearchCardTextList: arr,
+          SearchTextList: arr,
         });
       }, 2000);
     }
@@ -83,9 +83,9 @@ Page({
   deleteItem: function (e) {
     var that = this;
     that.setData({
-      SearchCardTextList: [],
+      SearchTextList: [],
     });
-    wx.removeStorageSync("SearchCardTextList");
+    wx.removeStorageSync("SearchTextList");
   },
   onShareAppMessage: function () {
     return {

pages/main/searchCard1.wxml

@@ -14,7 +14,7 @@
     </view>
     <view class='lineFooter'></view>
 
-    <block wx:if="{{SearchCardTextList.length>0}}">
+    <block wx:if="{{SearchTextList.length>0}}">
       <view class="panelTitle0 panelTitle FlexRow">
         <view class="panelTitle3">近期搜索</view>
         <view class="panelTitle4 FlexRow" bindtap='deleteItem'>
@@ -23,7 +23,7 @@
       </view>
 
       <view class='panelItemSearch0 FlexRow'>
-        <view class="panelTag FlexRow" wx:for="{{SearchCardTextList}}" wx:key="index" bindtap='onSearch' data-search="{{item}}">
+        <view class="panelTag FlexRow" wx:for="{{SearchTextList}}" wx:key="index" bindtap='onSearch' data-search="{{item}}">
           <view class="panelTag0">{{item}}</view>
         </view>
       </view>

pages/main/searchCardList.js

@@ -5,7 +5,8 @@ const app = getApp();
 var intervalRefresh = 0;
 var arrOrder = [
   {},
-  { Name: "最近添加", Value: "ac.MiaoguoCardID desc", CSS: "numberContainerFooter1121Select" },
+  { Name: "最近更新", Value: "ac.UpdateTime desc", CSS: "numberContainerFooter1121Select" },
+  { Name: "最近添加", Value: "ac.MiaoguoCardID desc", },
   { Name: "较早添加", Value: "ac.MiaoguoCardID asc" },
   { Name: "练习较多", Value: "ac.LearnNumber desc,ac.MiaoguoCardID desc" },
   { Name: "练习较少", Value: "ac.LearnNumber,ac.MiaoguoCardID" },
@@ -16,12 +17,16 @@ Page({
   data: {
     HasPage: false,
     ArrOrder: arrOrder,
-    OrderType: 0,
+    OrderType: 1,
+    CardType:2,
   },
   onLoad: function (options) {
     var that = this;
 
     var Search = "", IsToday = 0, IsCollect = 0;
+    var count = 0;
+    if (options.Count)
+      count = options.Count;
 
     if (options.search) {
       Search = options.search;
@@ -32,7 +37,13 @@ Page({
     else if (options.type == 1) {
       IsToday = 1;
       wx.setNavigationBarTitle({
-        title: "任务清单"
+        title: "未练完的题卡"
+      });
+    }
+    else if (options.type == 2) {
+      IsToday = 2;
+      wx.setNavigationBarTitle({
+        title: "实际练完的题卡"
       });
     }
     else if (options.IsCollect == 1) {
@@ -41,10 +52,19 @@ Page({
       });
       IsCollect = 1;
     }
-
-    var count = 0;
-    if (options.count)
-      count = options.count;
+    else if (options.CardType != 2) {
+      var title = "日常练习";
+      if (options.CardType == 1)
+        title = "紧急练习";
+      else if (options.CardType == -1)
+        title = "留白";
+      wx.setNavigationBarTitle({
+        title: title + "题卡",
+      });
+      that.setData({
+        CardType: options.CardType,
+      });
+    }
 
     that.setData({
       IsCollect: IsCollect,
@@ -52,8 +72,8 @@ Page({
       IsToday: IsToday,
       Count: count,
       Containnerheight: main.getWindowHeight(),
-      PageType:options.type,
-      IsNew:options.IsNew,
+      PageType: options.type,
+      IsNew: options.IsNew,
     });
   },
   onShow: function () {
@@ -109,13 +129,13 @@ Page({
     }
 
     if (!that.data.IsCollect && !that.data.IsToday && !that.data.Search) {
-      main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID, function (data) {
+      main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID+"&CardType="+that.data.CardType, function (data) {
         if (data) {
           that.setData({
             Count: data.CardNumber,
           });
           var hasPage = false;
-          if (list.length < that.data.Count && that.data.IsToday == 0 && !that.data.IsCollect)
+          if (list.length < that.data.Count && list.length>=20 && that.data.IsToday == 0 && !that.data.IsCollect)
             hasPage = true;
 
           that.setData({
@@ -142,6 +162,7 @@ Page({
       that.setData({
         Count: list.length,
       });
+
       var hasPage = false;
       if (list.length < that.data.Count && that.data.IsToday == 0 && !that.data.IsCollect)
         hasPage = true;
@@ -244,6 +265,10 @@ Page({
     var id = e.currentTarget.dataset.id;
     if (id && id > 0)
       url += "&PageID=" + id;
+      
+    if (that.data.CardType)
+      url += "&CardType=" + that.data.CardType;
+
     if (that.data.Search)
       url += "&Key=" + that.data.Search;
 
@@ -256,10 +281,10 @@ Page({
       if (data) {
 
         var list = app.globalData.CardList;
-        
+
         for (var i = 0; i < data.List.length; i++) {
           data.List[i].LastTimeStr = common.formatDateCHS(data.List[i].LastTime);
-          
+
           list.push(data.List[i]);
         }
         app.globalData.CardList = list;
@@ -271,7 +296,7 @@ Page({
           });
         }
 
-        if (orderType>0){
+        if (orderType > 0) {
           wx.setNavigationBarTitle({
             title: "全部题卡：" + arrOrder[orderType].Name,
           });

pages/main/searchCardList.wxml

@@ -23,7 +23,7 @@
   <block wx:if="{{List.length>0}}">
     <view style='width:100%;height:120rpx;margin-top:0rpx;' wx:if="{{!Search}}"></view>
     <view style='width:100%;height:250rpx;margin-top:0rpx;' wx:if="{{Search}}"></view>
-    <view class="remind" wx:if="{{IsToday}}">内容仅供参考。任务由系统实时生成，题卡并不固定。</view>
+    <view class="remind" wx:if="{{IsToday==1}}">内容仅供参考。任务由系统实时生成，题卡并不固定。</view>
     <block wx:for="{{List}}" wx:key="index">
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth720"></view>
@@ -39,9 +39,10 @@
               </view>
             </view>
             <view class="panelItem2 FlexColumn">
-              <view wx:if="{{OrderType<=2}}">{{item.CreateTimeStr}}</view>
-              <view wx:if="{{OrderType==3 || OrderType==4}}">{{item.LearnNumber}}次</view>
-              <view wx:if="{{OrderType==5}}">{{item.LastTimeStr}}</view>
+              <view wx:if="{{OrderType==1}}">{{item.UpdateTimeStr}}</view>
+              <view wx:if="{{OrderType==2 || OrderType==3}}">{{item.CreateTimeStr}}</view>
+              <view wx:if="{{OrderType==4 || OrderType==5}}">{{item.LearnNumber}}次</view>
+              <view wx:if="{{OrderType==6}}">{{item.LastTimeStr}}</view>
               <view class='panelItem21'>
                 <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' wx:if="{{item.IsCollect==1}}" />
               </view>
@@ -84,10 +85,15 @@
       <view class='Text4'>在“查看题卡、学习中”界面里，点爱心图标把题卡收藏到这里。</view>
     </view>
 
-    <view class='panelNull FlexColumn' wx:if="{{IsToday}}">
+    <view class='panelNull FlexColumn' wx:if="{{IsToday==1}}">
       <view class='Text3'>今天剩余任务量</view>
       <view class='Text4'>没有需要练习的题卡了。</view>
     </view>
+
+    <view class='panelNull FlexColumn' wx:if="{{IsToday==2}}">
+      <view class='Text3'>今天没有练习过题卡</view>
+      <view class='Text4'>请先完成任务后再来查看。</view>
+    </view>
   </block>
 </view>
 

pages/main/searchCardList.wxss

@@ -121,6 +121,7 @@
   font-weight: 400;
   font-size: 30rpx;
   overflow: hidden;
+  max-width:400rpx;
 }
 
 .panelItem1 .Text2 {
@@ -128,6 +129,7 @@
   font-size: 24rpx;
   overflow: hidden;
   color: #787878;
+  max-width:400rpx;
 }
 
 .panelItem2 {

pages/main/searchWeb2.js

@@ -213,6 +213,13 @@ Page({
 
             if (list[i].Content[item.Number].Content.indexOf("\n\n")==0)
               list[i].Content[item.Number].Content=list[i].Content[item.Number].Content.substr(2);
+            
+            if (item.Tag == "诗词"){
+              if (list[i].Content[item.Number].Content.indexOf("\n")>0 && list[i].Content[item.Number].Content.indexOf("[")!=0){
+                list[i].Content[item.Number].Content="\n\n"+list[i].Content[item.Number].Content;
+              }
+            }
+            
           }
           break;
         }

pages/main/searchWeb2.wxml

@@ -286,12 +286,11 @@
     <view class='lineFooter'></view>
   </block>
 
-
   <!-- 英文原文 -->
   <block wx:if="{{Result.ENG.Word && Result.ENG.Word.length>0 && !Result.CHN.HanZi}}">
     <view class="panelTitle0 panelTitle FlexColumn">
       <view class="panelTitle3">搜索内容</view>
-      <view class="panelTitle4" wx:if="{{Result.ENG.WordFrequency}}">该单词在{{Result.ENG.WordFrequency.Max}}常用词汇范围内</view>
+      <view class="panelTitle4" wx:if="{{Result.ENG.WordFrequency}}">该单词大约在{{Result.ENG.WordFrequency.Max}} 词频范围内</view>
       <view style="height:30rpx"></view>
     </view>
     <view class="panelItem FlexRow">

pages/plan/setting.js

@@ -2,7 +2,6 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSortType = ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "临时"];
 var arrUserID = app.globalData.SelectUserData;
@@ -66,15 +65,6 @@ Page({
   },
   onShow: function () {
     var that = this;
-    common.getStorageValue(this, "CardMaxNumberNew", 10, function () {
-    });
-    common.getStorageValue(this, "CardMaxNumberHistory", 30, function () {
-    });
-    common.getStorageValue(this, "SortTypeIndex", 0, function () {
-      that.setData({
-        SortType: arrSortType[that.data.SortTypeIndex],
-      });
-    });
     
     var colorIndex = wx.getStorageSync("ColorIndexArr");
     if (!colorIndex || colorIndex.length > 1) {
@@ -106,12 +96,11 @@ Page({
     });
 
     this.getMemoryLevel();
+
+    common.getStorageValue(that, "CardType", 0, function () {});
+
   },
-  setSortType: function () {
-    wx.navigateTo({
-      url: './sortRule',
-    })
-  },
+  
   setSelectUser: function () {
     var that = this;
     wx.showActionSheet({
@@ -172,12 +161,12 @@ Page({
       url: './recommend',
     })
   },
-  setTaskLimit: function () {
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
     wx.navigateTo({
-      url: './taskLimit',
-    })
+      url: url,
+    });
   },
-  
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/plan/setting.wxml

@@ -1,40 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <!-- <image src='../images/study_plan_header.png' class="study_plan_header" />
-  <view class="panelTop FlexRow">
-    <view class="panelTop1">今天的学习任务</view>
-  </view>
-  <view class="panelTask FlexColumn">
-    <view class="panelTaskItem FlexRow">
-      <view class="panelTaskItem1">初始任务量</view>
-      <view class="panelTaskItem2">新{{CardMaxNumberNew}}张 旧{{CardMaxNumberHistory}}张 / 共{{CardMaxNumberNew+CardMaxNumberHistory}}张</view>
-    </view>
-    <view class="lineWidth7201 lineWidth720"></view>
-    <view class="panelTaskItem FlexRow">
-      <view class="panelTaskItem1">剩余任务量</view>
-      <view class="panelTaskItem2">{{TaskNumber}}张</view>
-    </view>
-    <view class="lineWidth7201 lineWidth720"></view>
-    <view class="panelTaskItem FlexRow">
-      <view class="panelTaskItem1 FlexRow">
-        <image src='../images/universalpic_bell_green_30x30.png' class="universalpic_bell_green_30x30" />
-        <view>全部做完可能用时</view>
-      </view>
-      <view class="panelTaskItem2">{{CardEveryTime}}分钟</view>
-    </view>
-    <view class="lineWidth670"></view>
-    <view class="panelTaskItem FlexRow">
-      <view class="panelTaskItem1 FlexRow">
-        <image src='../images/universalpic_file_green_30x30.png' class="universalpic_file_green_30x30" />
-        <view>到期题卡数量</view>
-        <image src='../images/universalpic_help_green_26x26.png' class="universalpic_help_green_26x26" />
-        
-      </view>
-      <view class="panelTaskItem2">{{CardLimitTimeNumber}}张</view>
-    </view>
-    <view class="lineWidthAll2 FlexRow">
-    </view>
-  </view> -->
-  <view class="panelTitle FlexRow">
+  <!-- <view class="panelTitle FlexRow">
     <view class="panelTitle1">任务量</view>
     <view class="panelTitle2"></view>
   </view>
@@ -59,6 +24,33 @@
       <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>
+  </view>
+  <view class="panelItem FlexRow" bindtap="goto" data-url="./studyplandetail?CardType=0">
+    <view class="panelItem1">日常练习方案</view>
+    <view class="panelItem2 FlexRow">
+      <view class="picker" wx:if="{{CardType==0}}">
+        首选
+      </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="goto" data-url="./studyplandetail?CardType=1">
+    <view class="panelItem1">紧急练习方案</view>
+    <view class="panelItem2 FlexRow">
+      <view class="picker" wx:if="{{CardType==1}}">
+        首选
+      </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>

pages/plan/sortRule.wxml

@@ -34,4 +34,4 @@
   
   <view class='lineFooter'></view>
   <view style='height:100rpx'></view>
-</view>
+</view>

pages/plan/sortRule.wxss

@@ -115,4 +115,5 @@
   color: #787878;
   width: 690rpx;
   margin: 0 0 30rpx 0;
-}
+}
+

pages/plan/studyplan.js

@@ -0,0 +1,198 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import fanObj from '../template/FanObject';
+
+const app = getApp();
+var cardNumberCommon = 0;
+var cardNumberUrgent = 0;
+
+Page({
+  data: {
+    IsChangeStudyPLan:false,
+    BtnArray: [{ Name: "日常练习", Selected: 1 }, { Name: "紧急练习", Selected: 0 }, { Name: "整体练习", Selected: 0 }],
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init();
+  },
+  onShow:function(){
+    cardNumberCommon = app.globalData.TaskToday.CardNumberCommon;
+    cardNumberUrgent = app.globalData.TaskToday.CardNumberUrgent;
+    this.init();
+  },
+  init: function () {
+    var that = this;
+    common.getStorageValue(that, "CardType", 0, function () {
+      that.data.BtnArray[0].Selected = 0;
+      that.data.BtnArray[1].Selected = 0;
+      that.data.BtnArray[2].Selected = 0;
+      that.data.BtnArray[that.data.CardType].Selected = 1;
+
+      that.setData({
+        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);
+    that.setData({
+      StudyPlan: studyPlan,
+      PlanNumber: planNumber,
+      TaskNumber: taskNumber,
+      Progress:progress,
+    });
+
+    var backColor="#f0f0f0";
+
+    var rate = 0;
+    if (studyPlan.CommonNewLength>0 || studyPlan.CommonOldLength>0){
+      rate = studyPlan.CommonNewLength / (studyPlan.CommonNewLength + studyPlan.CommonOldLength);
+      backColor = "#00B6DD";
+    }
+      
+    fanObj.init(that, rate, 100, 3.8, "#008CAA", backColor, studyPlan.CommonNewLength + studyPlan.CommonOldLength);
+    
+    var backColor2 = "#f0f0f0";
+    var rate2 = 0;
+    if (studyPlan.UrgentNewLength>0 || studyPlan.UrgentOldLength>0){
+      rate2 = studyPlan.UrgentNewLength / (studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
+      backColor2 = "#FFCC00";
+    }
+    fanObj.init2(that, rate2, 100, 3.8, "#DDB100", backColor2, studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
+
+  },
+  btnSelected:function(e){
+    var that = this;
+    var id = e.currentTarget.dataset.id;
+
+    if (id!=that.data.CardType){
+      var oldName = "", newName = "";
+      for (var i = 0; i < that.data.BtnArray.length; i++) {
+        if (that.data.BtnArray[i].Selected == 1) {
+          oldName = that.data.BtnArray[i].Name;
+        }
+        if (id == i) {
+          newName = that.data.BtnArray[i].Name;
+        }
+      }
+
+      if (((id == 1 || id == 2) && cardNumberUrgent == 0) || ((id == 0 || id == 2) && cardNumberCommon == 0)) {
+        if (cardNumberCommon == 0)
+          newName = "日常练习";
+        if (cardNumberUrgent == 0)
+          newName = "紧急练习";
+        that.setData({
+          IsNullCard: true,
+          NewName: newName,
+        });
+      }
+      else {
+        that.setData({
+          IsChangeStudyPLan: true,
+          OldName: oldName,
+          NewName: newName,
+          NewCardType: id,
+        });
+      }
+
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#0B8457',
+      });
+    }
+  },
+  changePlan:function(){
+    var that=this;
+    that.setData({
+      CardType: that.data.NewCardType,
+    });
+    wx.setStorageSync("CardType", that.data.CardType);
+    wx.removeStorageSync("StudyPlan");
+
+    main.UploadUserConfig(function(){
+      main.getTaskTodayList(function (data) {
+        that.init();
+        that.close();
+      });
+    });
+  },
+  close:function(){
+    var that = this;
+    that.setData({
+      IsChangeStudyPLan: false,
+      IsNullCard: false,
+    });
+    wx.setNavigationBarColor({
+      frontColor: '#000000',
+      backgroundColor: '#ffffff',
+    });
+  },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  gotoTaskList:function(e){
+    wx.showLoading({
+      title: '请稍候',
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+
+    var that = this;
+    //未练完的题卡
+    if (e.currentTarget.dataset.id==1){
+      main.getTaskTodayList(function (task) {
+        var list = [];
+        for (var i = 0; i < task.ListNew.length; i++) {
+          list.push(task.ListNew[i]);
+        }
+        for (var i = 0; i < task.ListHistory.length; i++) {
+          list.push(task.ListHistory[i]);
+        }
+        for (var i = 0; i < task.ListReview.length; i++) {
+          list.push(task.ListReview[i]);
+        }
+        app.globalData.CardList = list;
+        wx.navigateTo({
+          url: '../main/searchCardList?type=1&Count=' + list.length,
+        });
+      });
+    }
+    else{
+      var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=2&CardType="+that.data.CardType;
+      main.getData(url, function (data) {
+        if (data) {
+          var list = [];
+
+          for (var i = 0; i < data.List.length; i++) {
+            data.List[i].LastTimeStr = common.formatDateCHS(data.List[i].LastTime);
+
+            list.push(data.List[i]);
+          }
+          app.globalData.CardList = list;
+          wx.navigateTo({
+            url: '../main/searchCardList?type=2&Count=' + list.length,
+          });
+        }
+      });
+    }
+    
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/plan/studyplan.json

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

pages/plan/studyplan.wxml

@@ -0,0 +1,197 @@
+<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>
+    <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 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="lineWidthAll FlexRow">
+    <view class="lineWidth690"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="left FlexColumn">
+      <view class="text2">计划任务量</view>
+      <view class="text3">今天需要练习的题卡总数，方案调整时会被更新</view>
+    </view>
+    <view class="right FlexRow">
+      <view class="Number">{{PlanNumber}}</view>
+      <view class="text4">张</view>
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth690"></view>
+  </view>
+  <view class="panelItem FlexColumn">
+    <view class="panelItem FlexRow">
+      <view class="text7">数量组成</view>
+    </view>
+    <view class="panelItem10 panelItem1 FlexRow">
+      <view class="panelItem11 FlexColumn" wx:if="{{CardType==0 || CardType==2}}">
+        <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
+        </template>
+        <view class="list FlexColumn">
+          <view class="item FlexRow">
+            <view class="block1 block"></view>
+            <view class="text6">新题卡</view>
+            <view class="Number1">{{StudyPlan.CommonNewLength}}</view>
+            <view class="text6">张</view>
+          </view>
+          <view class="item FlexRow">
+            <view class="block2 block"></view>
+            <view class="text6">旧题卡</view>
+            <view class="Number1">{{StudyPlan.CommonOldLength}}</view>
+            <view class="text6">张</view>
+          </view>
+        </view>
+      </view>
+      <view class="panelItem11 FlexColumn" wx:if="{{CardType==1 || CardType==2}}">
+        <template class="fan" is="fanTemplate2" data="{{Angle12,Angle22,BGColor2,FanSize2,FanScale2,Color12,Color22,ShowNumber2}}">
+        </template>
+        <view class="list FlexColumn">
+          <view class="item FlexRow">
+            <view class="block3 block"></view>
+            <view class="text6">新题卡</view>
+            <view class="Number1">{{StudyPlan.UrgentNewLength}}</view>
+            <view class="text6">张</view>
+          </view>
+          <view class="item FlexRow">
+            <view class="block4 block"></view>
+            <view class="text6">旧题卡</view>
+            <view class="Number1">{{StudyPlan.UrgentOldLength}}</view>
+            <view class="text6">张</view>
+          </view>
+        </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>
+    <view style="height:42rpx;" wx:if="{{StudyPlan.ListReviewLength==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>
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="text2">预计练习用时</view>
+      <view class="right FlexRow">
+        <view class="Number2">{{StudyPlan.PracticeTime}}</view>
+        <view class="text6">分钟</view>
+      </view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="line"></view>
+  <view class="panelTitle FlexRow">
+    <image class="universalpic_plan_2line_black_30x32" src="../images/universalpic_plan_done_black_30x32.png" />
+    <view class="panelTitle1">完成情况</view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth690"></view>
+  </view>
+  <view class="panelItem FlexColumn">
+    <view class="panelItem FlexRow">
+      <view class="text7">进度</view>
+    </view>
+    <view class="panelItem12 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="right FlexRow">
+        <view class="Number2">{{TaskNumber}}</view>
+        <view class="text6">张</view>
+      </view>
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth690"></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>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="panelFooter FlexRow">
+    <view class="btnChange" bindtap="goto" data-url="./setting">调整学习计划</view>
+  </view>
+</view>
+
+<view wx:if="{{IsNullCard}}" class="TempContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+  <text class='RemindText'>没有题卡不能使用</text>
+  <text class='RemindText2'>{{NewName}}方案中没有题卡，\n请登录官网为方案增添题卡后再试。</text>
+  <text class='RemindText3' catchtap="goto" data-url="../other/help?id=0&idchild=1">秒过官网地址</text>
+  <view class='btn1' catchtap="close">知道了</view>
+  <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>
+</view>
+
+<view wx:if="{{IsChangeStudyPLan}}" class="TempContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <image class="Avatar" src='../images/universalpic_logo_200x200.png' />
+  <text class='RemindText'>首选变更</text>
+  <text class='RemindText2 FlexRow'>
+  <text>要从</text>
+  <text class="color2">{{OldName}}</text>
+  <text>更改为</text>
+  <text class="color2">{{NewName}}</text>
+  <text>吗？</text>
+  </text>
+  <view class="FlexRow">
+    <view class='btn2 btn1' catchtap="close">取消</view>
+    <view class='btn2 btn1' catchtap="changePlan">确定</view>
+  </view>
+  <text class='RemindText5 RemindText4'>变更后，会发生什么</text>
+  <text class='RemindText4' space="ensp">∙ 重新规划学习计划并刷新首页大数字；请回到首页重新\n  开始今天的练习。</text>
+  <text class='RemindText4' space="ensp">∙ 系统将保存最终设定作为学习计划的首选模式，下次练\n  习不用重复更改。</text>
+</view>

pages/plan/studyplan.wxss

@@ -0,0 +1,362 @@
+@import "../template/Fan.wxss";
+
+.container{
+  font-size:28rpx;
+}
+
+.lineWidthAll{
+  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;
+}
+
+.panelTitle0{
+  margin-left: 30rpx;
+  color:#4D4D4D;
+}
+
+.panelTitle1{
+  margin-left: 20rpx;
+  color:#4D4D4D;
+}
+
+.panelButton{
+  width:100%;
+  height:137rpx;
+  background-color: #fff;
+  justify-content: center;
+}
+
+.panelButton10{
+  width:230rpx;
+  height:106rpx;
+  background-color: #fff;
+  border-radius: 0rpx;
+  margin-bottom: 30rpx;
+  font-size:32rpx;
+  color:#4D4D4D;
+}
+
+.panelButton11{
+  width:230rpx;
+  height:106rpx;
+  background-color: #0071EF;
+  border-radius: 10rpx;
+  color:#fff;
+  margin-bottom: 30rpx;
+  font-size:32rpx;
+}
+
+.text1{
+  margin: 0 20rpx;
+}
+
+.line1{
+  width:2rpx;
+  height:20rpx;
+  background-color: #D2D2D2;
+  margin-bottom: 30rpx;
+}
+
+.line{
+  width:100%;
+  height:30rpx;
+  background-color: #F0F0F0;
+}
+
+.panelItem{
+  width:100%;
+  background-color: #fff;
+  justify-content: space-between;
+}
+
+.left{
+  margin-left: 30rpx;
+  align-items: flex-start;
+}
+.left1{
+  margin-left: 30rpx;
+  width:460rpx;
+  justify-content: flex-start;
+}
+
+.text2{
+  font-weight: 400;
+  margin-top: 30rpx;
+  align-self: flex-start;
+}
+.text3{
+  font-size: 20rpx;
+  color:#787878;
+  margin-bottom: 34rpx;
+  margin-top: 4rpx;
+}
+.right{
+  margin-right: 30rpx;
+}
+
+.Number{
+  font-size: 64rpx;
+  font-family: Roboto-Black;
+}
+
+.text4{
+  font-size: 20rpx;
+  margin-bottom: -20rpx;
+  margin-left:4rpx; 
+  color:#4D4D4D;
+}
+
+.panelItem1{
+  width:100%;
+  background-color: #fff;
+}
+
+.panelItem10{
+  width:100%;
+  justify-content: space-around;
+}
+
+.panelItem11{
+  width:230rpx;
+  height:219rpx;
+}
+
+.line2{
+  width:2rpx;
+  height:219rpx;
+  background-color: #E3E3E3;
+}
+
+
+.text7{
+  font-weight: 400;
+  align-self: flex-start;
+  margin: 30rpx 0 40rpx 30rpx;
+}
+
+
+.fan{
+  width:100rpx;
+  height:100rpx;
+  background-color: #fff;
+  position: relative;
+  z-index: 10;
+  text-align: center;
+  line-height: 100rpx;
+  font-size:28;
+}
+
+.text5{
+  font-size:24rpx;
+  margin-top:20rpx;
+  color:#4D4D4D;
+}
+
+.list{
+  align-items: flex-start;
+  width:168rpx;
+  margin-top:20rpx;
+}
+
+.item{
+  width:100%;
+  justify-content: flex-start;
+}
+
+.block{
+  width:10rpx;
+  height:10rpx;
+  margin-right: 10rpx;
+}
+.block1{
+  background-color: #008CAA;
+  border:1rpx solid #016175;
+}
+.block2{
+  background-color: #00B6DD;
+  border:1rpx solid #00829E;
+}
+.block3{
+  background-color: #DDB100;
+  border:1rpx solid #9D7E01;
+}
+.block4{
+  background-color: #FFCC03;
+  border:1rpx solid #AE8B00;
+}
+.block5{
+  background-color: #FF8C83;
+  border:1rpx solid #BF524A;
+}
+.block6{
+  background-color: #fff;
+  border:1rpx solid #fff;
+}
+.Number1{
+  font-size: 24rpx;
+  font-family: 'Roboto-Black';
+  margin: 0 5rpx 0rpx 5rpx;
+}
+
+.panelItem13{
+  margin: 0 0 42rpx 0;
+}
+
+.panelItem2{
+  width:50%;
+  height:103rpx;
+  justify-content: space-around;
+}
+
+.panelItem3{
+  width:50%;
+  height:103rpx;
+  justify-content: space-between;
+}
+
+.Number2{
+  font-size: 36rpx;
+  font-family: 'Roboto-Black';
+}
+
+.text6{
+  font-size: 24rpx;
+  margin-left:4rpx; 
+  color:#787878;
+}
+
+.text9{
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.progress{
+  width:590rpx;
+  height:14rpx;
+  border-radius: 7rpx;
+  background-color: #F0F0F0;
+  margin-right: 31rpx;
+  margin-left: 30rpx;
+}
+
+.progress1{
+  width:80%;
+  height:14rpx;
+  border-radius: 7rpx;
+  background-color: #19C575;
+}
+
+.Number3{
+  font-size: 36rpx;
+  font-family: 'Roboto-Black';
+  margin-right: 30rpx;
+}
+
+
+.panelItem12{
+  margin-top: -35rpx;
+  justify-content: space-between;
+}
+
+
+.text8{
+  font-size: 24rpx;
+  color:#0071EF;
+}
+
+.line3{
+  width:2rpx;
+  height:20rpx;
+  background-color: #D2D2D2;
+}
+
+.panelFooter{
+  width:100%;
+  height:210rpx;
+  background-color: #F0F0F0;
+}
+
+.btnChange{
+  width:710rpx;
+  height:110rpx;
+  border-radius: 20rpx;
+  border:1rpx solid #787878;
+  color: #0071EF;
+  background-color: #fff;
+  line-height: 110rpx;
+  font-size:36rpx;
+  text-align: center;
+}
+
+/* 临时页面 */
+
+.TempContainer{
+  background-color: #0B8457;
+  position: fixed;
+  top:0;
+  z-index: 100;
+}
+.TempContainer .Avatar{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 150rpx;
+  border-radius: 50%;
+}
+.TempContainer .RemindText{
+  font-size:54rpx;
+  color:#fff;
+  margin-top: 170rpx;
+  text-align: center;
+}
+.TempContainer .RemindText2{
+  font-size:32rpx;
+  color:#fff;
+  text-align: center;
+}
+.TempContainer .RemindText3{
+  font-size:28rpx;
+  color:#B6F57F;
+  text-decoration: underline;
+  margin-top: 40rpx;
+}
+.TempContainer .btn1{
+  font-size:36rpx;
+  color:#fff;
+  margin-top: 40rpx;
+  border:1rpx solid #fff;
+  text-align: center;
+  width:600rpx;
+  line-height: 90rpx;
+  border-radius: 14rpx;
+}
+
+.TempContainer .RemindText4{
+  font-size:24rpx;
+  color:#fff;
+  width:620rpx;
+}
+
+.TempContainer .RemindText5{
+  margin-top: 60rpx;
+}
+
+.TempContainer .color2{
+  color:#B6F57F;
+}
+
+.TempContainer .btn2{
+  width:290rpx;
+  margin: 60rpx 15rpx 0 15rpx;
+}

pages/plan/studyplandetail.js

@@ -0,0 +1,178 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import fanObj from '../template/FanObject';
+
+const app = getApp();
+const arrSortType = ["自由安排", "到期时间较早的题卡", "到期时间较近的题卡"];
+
+Page({
+  data: {
+    CardNumberNew: [],
+    CardNumberOld: [],
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      CardType:options.CardType,
+    });
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    var info = app.globalData.TaskToday;
+
+    
+    if (that.data.CardType==1) {
+      wx.setNavigationBarTitle({
+        title: "紧急练习方案"
+      });
+    }
+    
+    for (var i = 0; i <= 200; i++) {
+      that.data.CardNumberNew.push(i);
+    }
+    for (var i = 5; i <= 500; i++) {
+      that.data.CardNumberOld.push(i);
+    }
+
+    that.setData({
+      CardNumber: info.CardNumber,
+      CardNumberNew: that.data.CardNumberNew,
+      CardNumberOld: that.data.CardNumberOld,
+    });
+
+
+    var url = "GetMiaoguoCardTotal?UserID=" + app.globalData.userInfo.UserID + "&CardType=" + that.data.CardType;
+    main.getData(url, function (data) {
+      if (data) {
+
+        var rate = 0, cardTotal = 0,limitNumber=0;
+
+        if (that.data.CardType == 0) {
+          if (info.CardNumber > 0) {
+            limitNumber = data.NewCardNumber + data.LimitCardNumber;
+            cardTotal = info.CardNumberCommon;
+            rate = limitNumber / cardTotal;
+          }
+        }
+        else if (that.data.CardType == 1) {
+          if (info.CardNumber > 0) {
+            limitNumber = data.NewCardNumber + data.LimitCardNumber;
+            cardTotal = info.CardNumberUrgent;
+            rate = limitNumber / cardTotal;
+          }
+          wx.setNavigationBarTitle({
+            title: "紧急练习方案"
+          });
+        }
+        fanObj.init(that, rate, 100, 3.8, "#FF8C83", "#f0f0f0", limitNumber);
+
+
+        that.setData({
+          LimitCardNumber:limitNumber,
+          CardNumberCurrent: cardTotal,
+          NewCardNumber: data.NewCardNumber,
+          NewCardNumberToday: data.NewCardNumberToday,
+          HistoryCardNumber: data.LimitCardNumber,
+          HistoryCardNumberToday: data.LimitCardNumberToday,
+        });
+      }
+    });
+  },
+  onShow:function(){
+    var that = this;
+    if (that.data.CardType=="0"){
+      common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
+        that.setData({
+          CardMaxNumberNewIndex: that.data.CardMaxNumberNew,
+        });
+      });
+      common.getStorageValue(that, "CardMaxNumberHistory", 100, function () {
+        that.setData({
+          CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - 5,
+        });
+      });
+      common.getStorageValue(that, "SortTypeIndex", 0, function () {
+        that.setData({
+          SortType: arrSortType[that.data.SortTypeIndex],
+        });
+      });
+    }
+    else if (that.data.CardType == "1") {
+      common.getStorageValue(that, "CardMaxNumberNewUrgent", 10, function () {
+        that.setData({
+          CardMaxNumberNewIndex: that.data.CardMaxNumberNewUrgent,
+        });
+      });
+      common.getStorageValue(that, "CardMaxNumberHistoryUrgent", 100, function () {
+        that.setData({
+          CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistoryUrgent - 5,
+        });
+      });
+    }
+
+  },
+  setTaskLimit: function (e) {
+    wx.navigateTo({
+      url: './taskLimit?CardType='+this.data.CardType,
+    })
+  },
+  setSortType: function () {
+    wx.navigateTo({
+      url: './sortRule',
+    })
+  },
+  bindUpdateCardNumberNewMax: function (e) {
+    this.data.CardMaxNumberNewIndex = e.detail.value;
+
+    if (this.data.CardType == "0") {
+      this.setData({
+        CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
+        CardMaxNumberNew: this.data.CardNumberNew[this.data.CardMaxNumberNewIndex],
+      });
+      wx.setStorageSync("CardMaxNumberNew", this.data.CardNumberNew[this.data.CardMaxNumberNewIndex]);
+    }
+    else if (this.data.CardType == "1") {
+      this.setData({
+        CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
+        CardMaxNumberNewUrgent: this.data.CardNumberNew[this.data.CardMaxNumberNewIndex],
+      });
+      wx.setStorageSync("CardMaxNumberNewUrgent", this.data.CardNumberNew[this.data.CardMaxNumberNewIndex]);
+    }
+    wx.removeStorageSync("StudyPlan");
+    main.UploadUserConfig(function () {
+      main.getTaskTodayList(function (data) {});
+    });
+  },
+  bindUpdateCardNumberHistoryMax: function (e) {
+    this.data.CardMaxNumberHistoryIndex = e.detail.value;
+
+    if (this.data.CardType == "0") {
+      this.setData({
+        CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
+        CardMaxNumberHistory: this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex],
+      });
+      wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex]);
+    }
+    else if (this.data.CardType == "1") {
+      this.setData({
+        CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
+        CardMaxNumberHistoryUrgent: this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex],
+      });
+      wx.setStorageSync("CardMaxNumberHistoryUrgent", this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex]);
+    }
+    wx.removeStorageSync("StudyPlan");
+    main.UploadUserConfig(function () {
+      main.getTaskTodayList(function (data) { });
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/plan/studyplandetail.json

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

pages/plan/studyplandetail.wxml

@@ -0,0 +1,163 @@
+<import src="../template/Fan.wxml" />
+
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <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="lineWidthAll1 FlexRow">
+    <view class="lineWidth690"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1 FlexColumn">
+      <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}">
+      </template>
+      <view class="list FlexColumn">
+        <view class="item FlexRow">
+          <view class="block1 block"></view>
+          <view class="text6">已到期题卡</view>
+          <view class="Number1">{{LimitCardNumber}}</view>
+          <view class="text6">张</view>
+        </view>
+        <view class="item FlexRow">
+          <view class="block2 block"></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>
+      </view>
+      <view class="cardFull" wx:if="CardType==1 && CardNumberCurrent>=200">容量已满</view>
+      
+    </view>
+    <view class="line2"></view>
+    <view class="panelItem1 FlexColumn">
+      <view class="panelItem11 FlexColumn">
+        <view class="list1 list FlexColumn">
+          <view class="item FlexRow">
+            <view class="text6">已到期</view>
+            <view style="width:10rpx"></view>
+            <view class="text6">新</view>
+            <view class="Number1">{{NewCardNumber}}</view>
+            <view class="text6">张</view>
+            <view style="width:10rpx"></view>
+            <view class="text6"> 旧</view>
+            <view class="Number1">{{HistoryCardNumber}}</view>
+            <view class="text6">张</view>
+          </view>
+          <view class="item FlexRow">
+            <text class="text9">到期数量较多时请调整任务限量限制当天需要练习的题卡数</text>
+          </view>
+        </view>
+      </view>
+      <view class="panelItem12 panelItem11 FlexColumn">
+        <view class="list1 list FlexColumn" wx:if="{{CardType==0}}">
+          <view class="item FlexRow">
+            <view class="text6">其中今天到期</view>
+          </view>
+          <view class="item FlexRow">
+            <view class="text6">新</view>
+            <view class="Number1">{{NewCardNumberToday}}</view>
+            <view style="width:10rpx"></view>
+            <view class="text6">旧</view>
+            <view class="Number1">{{HistoryCardNumberToday}}</view>
+            <view class="text6">张</view>
+          </view>
+          <view class="item FlexRow">
+            <text class="text9">该数量较多时可调整选取规则</text>
+          </view>
+        </view>
+
+        <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>
+          <view class="item FlexRow">
+            <text class="text9">使用过程中请适当调配题卡</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  <view class="line"></view>
+
+  <view class="panelTitle3 FlexRow">
+    <view class="left">任务限制</view>
+    <view class="right"></view>
+  </view>
+  
+  <picker class="panelItem0" bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumberNew}}">
+		<view class="panelItem FlexRow">
+			<view class="panelItem3">新题卡数量上限</view>
+			<view class="panelItem4 FlexRow">
+				<view class="picker" wx:if="{{CardType=='0'}}">
+					{{CardMaxNumberNew}}张
+				</view>
+        <view class="picker" wx:if="{{CardType=='1'}}">
+					{{CardMaxNumberNewUrgent}}张
+				</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			</view>
+		</view>
+	</picker>
+	<view class="lineWidthAll FlexRow">
+		<view class="lineWidth720"></view>
+	</view>
+	<picker class="panelItem0" bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumberOld}}">
+		<view class="panelItem FlexRow">
+			<view class="panelItem3">旧题卡数量上限</view>
+			<view class="panelItem4 FlexRow">
+				<view class="picker" wx:if="{{CardType=='0'}}">
+					{{CardMaxNumberHistory}}张
+				</view>
+				<view class="picker" wx:if="{{CardType=='1'}}">
+					{{CardMaxNumberHistoryUrgent}}张
+				</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			</view>
+		</view>
+	</picker>
+	<view class='lineFooter'></view>
+  
+  <block wx:if="{{CardType=='0'}}">
+  <view class="panelTitle3 FlexRow">
+    <view class="left">内容组织</view>
+    <view class="right"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='setSortType'>
+    <view class="panelItem3">优先规则</view>
+    <view class="panelItem4 FlexRow">
+      <view class="picker">
+        {{SortType}}
+      </view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  </block>
+  <view class='lineFooter'></view>
+  <view class="panelItem5 FlexRow">
+    <image src='../images/universalpic_exmark_black_26x26.png' class="universalpic_exmark_black_26x26" />
+    <view class="text7">如要调整方案中的题卡内容请至官网www.kylx365.com</view>
+  </view>
+  <view style="height:50rpx;"></view>
+  <view class="panelItem FlexColumn">
+		<view class="panelTitle00 panelTitle FlexRow">
+			<view class="panelTitle2">任务限量用途说明</view>
+		</view>
+		<text class="text8">限制“今天学习任务”（任务量）的题卡数量。当任务量太多学习时间过长时，通过限制新、旧题卡数量把学习时间和难度控制在可接受范围内。\n
+      通常，新题卡比旧题卡难度较大，练习时间也更长。建议新、旧题卡数量之比维持的1:3到1:5之间。\n
+      常见误区：本功能用于对数量的“限制”，而不是要求任务量必须达到这个数量。假设，数量限制是50张题卡，但到期题卡仅有30张时，则按实际情况练习30张，并不会补足20张题卡。当日最适合回想的知识是根据到期时间来安排的，和数量限制无关。另一方面，要让本功能发挥作用，必须有足够的题卡数量和较多的到期题卡数量。
+    </text>
+		<view style="height:40rpx;"></view>
+	</view>
+	<view class='lineFooter'></view>
+  <view style="height:100rpx;"></view>
+</view>

pages/plan/studyplandetail.wxss

@@ -0,0 +1,207 @@
+@import "../template/Fan.wxss";
+
+.container{
+  font-size:28rpx;
+}
+
+.lineWidthAll1{
+  width: 100%;
+  background-color: #fff;
+  height: 1rpx;
+}
+.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: 10rpx;
+}
+
+
+.panelItem{
+  width:100%;
+  background-color: #fff;
+  justify-content: space-between;
+}
+
+.panelItem1{
+  width:50%;
+  height:319rpx;
+  position: relative;
+}
+
+.cardFull{
+  position: absolute;
+  width:120rpx;
+  height:40rpx;
+  color:#fff;
+  background-color: #FE6659;
+  border-radius: 20rpx;
+  line-height: 40rpx;
+  font-size:20rpx;
+  text-align: center;
+  top:40rpx;
+  left:30rpx;
+  z-index: 20;
+}
+
+.line2{
+  width:2rpx;
+  height:219rpx;
+  background-color: #E3E3E3;
+}
+
+.panelItem11{
+  margin-left: 40rpx;
+  align-items: flex-start;
+  align-self: flex-start;
+}
+
+.panelItem12{
+  margin-top: 27rpx;
+}
+
+.fan{
+  width:100rpx;
+  height:100rpx;
+  background-color: #fff;
+  position: relative;
+  z-index: 10;
+  text-align: center;
+  line-height: 100rpx;
+  font-size:28;
+  margin-bottom: 20rpx;
+}
+
+.text5{
+  font-size:24rpx;
+  margin-top:20rpx;
+}
+
+.list{
+  align-items: flex-start;
+  width:240rpx;
+  font-size:24rpx;
+}
+.list1{
+  width:300rpx;
+  align-items: flex-start;
+}
+
+.item{
+  width:100%;
+  justify-content: flex-start;
+  margin-bottom: 5rpx; 
+}
+
+.block{
+  width:10rpx;
+  height:10rpx;
+  margin-right: 10rpx;
+  background-color: #fff;
+}
+.block1{
+  background-color: #FF8C83;
+  border:1rpx solid #BF524A;
+}
+.block2{
+  background-color: #F0F0F0;
+  border:1rpx solid #9B9B9B;
+}
+
+.Number1{
+  font-size: 20rpx;
+  font-family: Roboto-Black;
+  margin: 0 5rpx 0rpx 5rpx;
+}
+
+.text6{
+  font-size:24rpx;
+  color:#787878;
+}
+
+.text9{
+  font-size:20rpx;
+  color:#787878;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+.panelTitle3{
+  width:100%;
+  background-color:  #F0F0F0;
+  height:75rpx;
+  align-items: flex-start;
+  justify-content: space-between;
+  margin-top: 50rpx;
+}
+.left{
+  margin: 0 0 30rpx 30rpx;
+  font-size:32rpx;
+}
+
+.panelItem0 {
+  width: 100%;
+}
+
+.panelItem3{
+  margin-left: 30rpx;
+  line-height: 101rpx;
+  font-weight: 400;
+}
+.panelItem4{
+  margin-right: 30rpx;
+}
+
+.picker{
+  color:#787878;
+  font-weight: 400;
+}
+
+.universalpic_exmark_black_26x26{
+  width:26rpx;
+  height:26rpx;
+  margin-right: 10rpx;
+}
+
+
+.panelItem5{
+  width:100%;
+  background-color: #F0F0F0;
+  margin-top: 30rpx;
+}
+.text7{
+  font-size:24rpx;
+  font-weight: 400;
+}
+
+
+.panelTitle00 {
+  margin-top: 20rpx;
+}
+
+.panelTitle2 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+
+.text8{
+  font-size:24rpx;
+  font-weight: 400;
+  width:690rpx;
+}

pages/plan/taskLimit.js

@@ -1,68 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-
-Page({
-  data: {
-    CardNumberNew: [],
-    CardNumberOld: [],
-  },
-  onLoad: function (options) {
-    var that = this;
-
-    for (var i = 5; i <= 200; i++) {
-      that.data.CardNumberNew.push(i);
-    }
-    for (var i = 5; i <= 500; i++) {
-      that.data.CardNumberOld.push(i);
-    }
-
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-      CardNumberNew: that.data.CardNumberNew,
-      CardNumberOld: that.data.CardNumberOld,
-    });
-
-    that.init();
-  },
-  init: function () {
-    var that=this;
-    common.getStorageValue(this, "CardMaxNumberNew", 10, function () {
-      that.setData({
-        CardMaxNumberNewIndex: that.data.CardMaxNumberNew - 5,
-      });
-    });
-    common.getStorageValue(this, "CardMaxNumberHistory", 30, function () {
-      that.setData({
-        CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - 5,
-      });
-    });
-  },
-  bindUpdateCardNumberNewMax: function (e) {
-    this.data.CardMaxNumberNewIndex = e.detail.value;
-    this.setData({
-      CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
-      CardMaxNumberNew: this.data.CardNumberNew[this.data.CardMaxNumberNewIndex],
-    });
-    wx.setStorageSync("CardMaxNumberNew", this.data.CardNumberNew[this.data.CardMaxNumberNewIndex]);
-    main.UploadUserConfig();
-  },
-  bindUpdateCardNumberHistoryMax: function (e) {
-    this.data.CardMaxNumberHistoryIndex = e.detail.value;
-    this.setData({
-      CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
-      CardMaxNumberHistory: this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex],
-    });
-    wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex]);
-    main.UploadUserConfig();
-  },
-  
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImage,
-    }
-  },
-})

pages/plan/taskLimit.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "数量限制"
-}

pages/plan/taskLimit.wxml

@@ -1,45 +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="text1">限制“今天学习任务”（任务量）的题卡数量。当任务量太多学习时间过长时，通过限制新、旧题卡数量把学习时间和难度控制在可接受范围内。\n
-      通常，新题卡比旧题卡难度较大，练习时间也更长。建议新、旧题卡数量之比维持的1:3到1:5之间。\n
-      常见误区：本功能用于对数量的“限制”，而不是要求任务量必须达到这个数量。假设，数量限制是50张题卡，但到期题卡仅有30张时，则按实际情况练习30张，并不会补足20张题卡。当日最适合回想的知识是根据到期时间来安排的，和数量限制无关。另一方面，要让本功能发挥作用，必须有足够的题卡数量和较多的到期题卡数量。
-    </text>
-    <view style="height:40rpx;"></view>
-  </view>
-  <view class='lineFooter'></view>
-
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">限制</view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">新题卡数量上限</view>
-    <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumberNew}}">
-        <view class="picker">
-          {{CardMaxNumberNew}}张
-        </view>
-      </picker>
-      <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">
-    <view class="panelItem1">旧题卡数量上限</view>
-    <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumberOld}}">
-        <view class="picker">
-          {{CardMaxNumberHistory}}张
-        </view>
-      </picker>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-  <view style='height:100rpx'></view>
-</view>

pages/plan/taskLimit.wxss

@@ -1,54 +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;
-}
-
-.text1{
-  font-size:24rpx;
-  font-weight: 400;
-  width:690rpx;
-}
-
-.panelItem {
-  width: 100%;
-  justify-content: space-between;
-  font-size: 28rpx;
-  min-height: 100rpx;
-  background-color: #fff;
-}
-
-
-.panelItem01 {
-  width: 100%;
-  line-height: 100rpx;
-  padding-left: 30rpx;
-  font-weight: 400;
-  border-radius: 10rpx;
-}
-
-.panelItem .panelItem1{
-  margin-left: 30rpx;
-  font-weight: 400;
-}
-.panelItem .panelItem2{
-  margin-right: 30rpx;
-  color:#787878;
-  font-weight: 400;
-}
-
-.Arrow{
-  width:16rpx;
-  height:26rpx;
-  margin-left: 30rpx;
-}

pages/template/Fan.js

@@ -0,0 +1,2 @@
+Page({data: {},});
+

pages/template/Fan.json

@@ -0,0 +1 @@
+{}

pages/template/Fan.wxml

@@ -0,0 +1,27 @@
+<template name="fanTemplate">
+  <view class="fan">
+    <view class="shanxing" style="width:{{FanSize}}rpx;height:{{FanSize}}rpx;background-color:{{Color2}};">
+      <view class="sx1" style="clip: rect(0, {{FanSize/2}}rpx, {{FanSize}}rpx, 0);transform: rotate({{Angle1}}deg);background-color:{{Color1}};">
+      </view>
+      <view class="sx2" style="clip: rect(0, {{FanSize/2}}rpx, {{FanSize}}rpx, 0);transform: rotate({{Angle2}}deg);{{BGColor}}">
+      </view>
+    </view>
+    <view class="shanxingSmall" style="width:{{FanSize-FanSize/FanScale}}rpx;height:{{FanSize-FanSize/FanScale}}rpx;line-height:{{FanSize-FanSize/FanScale}}rpx;left:{{FanSize/(FanScale*2)}}rpx;top:{{FanSize/(FanScale*2)}}rpx;">
+      {{ShowNumber}}
+    </view>
+  </view>
+</template>
+
+<template name="fanTemplate2">
+  <view class="fan">
+    <view class="shanxing" style="width:{{FanSize2}}rpx;height:{{FanSize2}}rpx;background-color:{{Color22}};">
+      <view class="sx1" style="clip: rect(0, {{FanSize2/2}}rpx, {{FanSize2}}rpx, 0);transform: rotate({{Angle12}}deg);background-color:{{Color12}};">
+      </view>
+      <view class="sx2" style="clip: rect(0, {{FanSize2/2}}rpx, {{FanSize2}}rpx, 0);transform: rotate({{Angle22}}deg);{{BGColor2}}">
+      </view>
+    </view>
+    <view class="shanxingSmall" style="width:{{FanSize2-FanSize2/FanScale2}}rpx;height:{{FanSize2-FanSize2/FanScale2}}rpx;line-height:{{FanSize2-FanSize2/FanScale2}}rpx;left:{{FanSize2/(FanScale2*2)}}rpx;top:{{FanSize2/(FanScale2*2)}}rpx;">
+      {{ShowNumber2}}
+    </view>
+  </view>
+</template>

pages/template/Fan.wxss

@@ -0,0 +1,52 @@
+.fan {
+  position: relative;
+}
+
+.shanxing {
+  width:100rpx;
+  height:100rpx;
+  border-radius: 50%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-color: #F0F0F0;
+}
+.shanxing2 {
+  background-color: #FF8C83;
+}
+
+.shanxingSmall {
+  width: 72rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  border-radius: 50%;
+  background-color: #fff;
+  position: absolute;
+  left: 14rpx;
+  top: 14rpx;
+  font-family: 'Roboto-Black';
+  color:#1e1e1e;
+}
+
+.sx1 {
+  position: absolute;
+  width:100%;
+  height: 100%;
+  clip: rect(0, 100rpx, 200rpx, 0); /*这个clip属性用来绘制半圆，在clip的rect范围内的内容显示出来，使用clip属性，元素必须是absolute的 */
+  border-radius: 50%;
+
+  background-color: #4cdf95;
+  transform: rotate(180deg);
+}
+
+.sx2 {
+  position: absolute;
+  width:100%;
+  height: 100%;
+  clip: rect(0, 100rpx, 200rpx, 0);
+  border-radius: 50%;
+  
+  background-color: #f0f0f0;
+  transform: rotate(-150deg);
+
+}

pages/template/FanObject.js

@@ -0,0 +1,53 @@
+var fanObject = {
+  init: function (that, rateResult, fanSize, fanScale, color1, color2, ShowNumber) {
+    
+    var rate=rateResult;
+    var angle1 = (360 * rate), angle2 = 0, bgColor = "background-color:" + color2;
+    if (rate > 0.5) {
+      angle1 = 180;
+      angle2 = (360 * (rate - 0.5) - 180);
+      bgColor = "background-color:" + color1;
+    }
+    else {
+      bgColor = "background-color:" + color2;
+    }
+
+    that.setData({
+      Angle1: angle1,
+      Angle2: angle2,
+      BGColor: bgColor,
+      FanSize: fanSize,
+      FanScale: fanScale,
+      Color1: color1,
+      Color2: color2,
+      ShowNumber: ShowNumber,
+    });
+
+  },
+  init2: function (that, rateResult2, fanSize2, fanScale2, color12, color22, ShowNumber2) {
+    
+    var rate2 = rateResult2;
+    var angle12 = (360 * rate2), angle22 = 0, bgColor2 = "background-color:" + color22;
+    if (rate2 > 0.5) {
+      angle12 = 180;
+      angle22 = (360 * (rate2 - 0.5) - 180);
+      bgColor2 = "background-color:" + color12;
+    }
+    else {
+      bgColor2 = "background-color:" + color22;
+    }
+
+    that.setData({
+      Angle12: angle12,
+      Angle22: angle22,
+      BGColor2: bgColor2,
+      FanSize2: fanSize2,
+      FanScale2: fanScale2,
+      Color12: color12,
+      Color22: color22,
+      ShowNumber2: ShowNumber2,
+    });
+
+  }
+}
+export default fanObject;

utils/main.js

@@ -529,23 +529,8 @@ function getTaskTodayList(callback) {
   }, 2000);
 
   var that = this;
-  var CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
-  if (!CardMaxNumberNew)
-    CardMaxNumberNew = 10;
-
-  var CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
-  if (!CardMaxNumberHistory)
-    CardMaxNumberHistory = 30;
-
-  var SortTypeIndex = wx.getStorageSync("SortTypeIndex");
-  if (!SortTypeIndex)
-    SortTypeIndex = 0;
-
-  var url = 'GetMiaoguoCardToday?UserID=' + app.globalData.userInfo.UserID;
-  url += "&New=" + CardMaxNumberNew;
-  url += "&History=" + CardMaxNumberHistory;
-  url += "&SortTypeIndex=" + SortTypeIndex;
-
+  var url = 'GetMiaoguoCardToday2?UserID=' + app.globalData.userInfo.UserID;
+  
   getData(url, function (data) {
     clearTimeout(intervalTask);
     if (isNotData) {
@@ -555,6 +540,24 @@ 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);
     }
   });
@@ -619,11 +622,14 @@ function saveTempImage(serverUrl, tempUrl) {
   }
 }
 
-function UploadUserConfig() {
+function UploadUserConfig(callback) {
   var that = this;
   var param1 = {};
+  param1.CardType = wx.getStorageSync("CardType");
   param1.CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
   param1.CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+  param1.CardMaxNumberNewUrgent = wx.getStorageSync("CardMaxNumberNewUrgent");
+  param1.CardMaxNumberHistoryUrgent = wx.getStorageSync("CardMaxNumberHistoryUrgent");
   param1.SortTypeIndex = wx.getStorageSync("SortTypeIndex");
   param1.MemoryLevel = wx.getStorageSync("MemoryLevel");
 
@@ -631,7 +637,11 @@ function UploadUserConfig() {
   param1.SecondConfigArray = wx.getStorageSync("SecondConfigArray");
   param1.ColorIndexArr = wx.getStorageSync("ColorIndexArr");
 
-  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {});
+  that.postData('UploadUserConfig?Type=update&UserID=' + app.globalData.userInfo.UserID, param1, function (data) {
+    if (callback){
+      callback();
+    }
+  });
 }
 
 function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {