2.3.61

app.js

@@ -1,8 +1,8 @@
 App({
   globalData: {
-    Version: "2.3.51",
-    IsProduction: true,
-    //IsProduction: false,
+    Version: "2.3.61",
+    //IsProduction: true,
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',
@@ -80,7 +80,8 @@ App({
       if (this.globalData.systemInfo.model.indexOf("X") >= 0
         || this.globalData.systemInfo.model.indexOf("11") >= 0
         || this.globalData.systemInfo.model.indexOf("12") >= 0
-        || this.globalData.systemInfo.model.indexOf("13") >= 0)
+        || this.globalData.systemInfo.model.indexOf("13") >= 0 
+        || this.globalData.systemInfo.model.indexOf("14") >= 0)
         this.globalData.IsIPhoneX=true;
     }
 
@@ -92,5 +93,5 @@ App({
       this.globalData.IsOppo=true;
     }
   }
-  
+
 })

app.json

@@ -1,7 +1,11 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/plan/taskBasic",
+    "pages/plan/taskHelp",
+    "pages/plan/taskFull",
 
+    "pages/main/remind",
     "pages/share/cardlist",
     
     "pages/share/shareitem",
@@ -35,12 +39,6 @@
 
     "pages/plan/clicktype",
     "pages/plan/colorplan",
-    "pages/plan/sortRule",
-    "pages/plan/setting",
-
-    "pages/plan/studyplan",
-    "pages/plan/studyplandetail",
-        
     "pages/other/family",
     "pages/other/recover",
     "pages/other/grade",
@@ -122,5 +120,6 @@
   "requiredBackgroundModes": [
     "audio"
   ],
+  "lazyCodeLoading": "requiredComponents",
   "sitemapLocation": "sitemap.json"
 }

pages/index/index.js

@@ -142,6 +142,18 @@ Page({
           gotoUrl: "../other/help?IsShare=1&id=" + options.ID+"&idchild="+options.IDChild,
         });
       }
+      else if (options.type == "remind") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../main/remind",
+        });
+      }
+      else if (options.type == "tips") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../other/tips",
+        });
+      }
       else if (options.type == "paycustom") {
         this.setData({
           gotoType: "other",

pages/main/default.js

@@ -145,6 +145,13 @@ Page({
         IsShowHelp: false,
       });
     }
+
+    //显示提醒练习
+    var IsNotShowRemindPractice = wx.getStorageSync("IsNotShowRemindPractice");
+    that.setData({
+      IsNotShowRemindPractice: IsNotShowRemindPractice,
+    });
+    
   },
   init: function () {
     //显示练习模式
@@ -213,11 +220,16 @@ Page({
     var that = this;
     main.UpdateMiaoguoCardTodayAll(true, function () {
       main.getTaskTodayList(function (data) {
+        
         if (data.IsMaintain == 1) {
           that.setData({
             IsMaintain: 1,
           });
         } else {
+          //若基础任务量存在，则重新获得配置数据
+          if (data.BasicCardLimit)
+            main.getUserConfig();
+
           var TodayTaskNumber = data.ListNew.length + data.ListReview.length + data.ListHistory.length;
           that.setData({
             DayNumber: data.DayNumber,
@@ -254,7 +266,7 @@ Page({
 
             } else {
 
-              if (app.globalData.MemoryLevel == 0 && data.DayNumber >= 8) {
+              if (app.globalData.MemoryLevel == 0 && data.DayNumber >= 30) {
                 var IsShowPatternMenu = wx.getStorageSync("IsShowPatternMenu");
                 if (!IsShowPatternMenu) {
                   wx.navigateTo({
@@ -524,9 +536,15 @@ Page({
       IsShowRemind: false,
     });
     wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 30, new Date())));
-    //判断每30天是否是高级模式
+    //判断每30天是否是完整模式
     wx.removeStorageSync('IsShowPatternMenu');
   },
+  closeRemindPractice: function () {
+    this.setData({
+      IsNotShowRemindPractice: 1,
+    });
+    wx.setStorageSync("IsNotShowRemindPractice", 1);
+  },
   showUserFamily: function () {
     this.setData({
       IsShowUserFamily: 2,
@@ -556,6 +574,13 @@ Page({
     });
     wx.setStorageSync('IsHelpAddInfomation', 0);
   },
+  gotoTaskSetting:function(e){
+    var taskSetting=wx.getStorageSync("TaskSetting");
+    if (taskSetting)
+      this.goto({currentTarget:{dataset:{url:"../plan/taskFull"}}});
+    else
+      this.goto({currentTarget:{dataset:{url:"../plan/taskBasic"}}});
+  },
   onShareAppMessage: function () {
     if (wx.getStorageSync("IsHelpAddInfomation") == 1) {
       return {

pages/main/default.wxml

@@ -21,10 +21,17 @@
   <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_goon.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
   <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_report.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
 
-  <view class="setting{{IsIPad}}" catchtap="goto" data-url="../plan/studyplan"></view>
+  <view class="setting{{IsIPad}}" catchtap="gotoTaskSetting"></view>
   
-  <view class='panelBottom FlexColumn' catchtap="">
+  <view class='panelBottom FlexColumn'>
 
+    <view class="PanelRemind" wx:if="{{!IsNotShowRemindPractice}}">
+      <image class="message_practise_index_02" src='{{ImagePath}}web/message_practise_index_02.png' />
+      <view class="PanelRemind1" bindtap="goto" data-url="./remind"></view>
+      <view class="PanelRemindClose FlexColumn" bindtap="closeRemindPractice">
+        <image class="universalpic_close_black" src='{{ImagePath}}web/universalpic_close_black.png' />
+      </view>
+    </view>
     <image class="study_index_footer" src='../images/practise_index_footer.png' />
 
     <view class='panelBottom1 FlexRow'>

pages/main/default.wxss

@@ -69,6 +69,16 @@ page{
   top:387rpx;
 }
 
+.settingOld{
+  width:150rpx;
+  height:168rpx;
+  position: fixed;
+  top:744rpx;
+  left:145rpx;
+  z-index: 10;
+  background-color: #9B9B9B;
+}
+
 .setting{
   width:150rpx;
   height:168rpx;
@@ -577,4 +587,34 @@ page{
   top:30rpx;
   right:30rpx;
   z-index: 10;
-}
+}
+
+.PanelRemind{
+  width:390rpx;
+  height:121rpx;
+  position: absolute;
+  right:-1rpx;
+  top:-74rpx;
+}
+.message_practise_index_02{
+  width:390rpx;
+  height:121rpx;
+}
+.PanelRemind1{
+  width:300rpx;
+  height:100rpx;
+  position: absolute;
+  left:0;
+  top:0;
+}
+.PanelRemindClose{
+  width:90rpx;
+  height:100rpx;
+  position: absolute;
+  right:0;
+  top:0;
+}
+.universalpic_close_black{
+  width:22rpx;
+  height:22rpx;
+}

pages/main/detail.js

@@ -413,9 +413,6 @@ Page({
 
                 if (!that.data.TaskInfo.IsNew)
                   recommend = getRecommendTime();
-                that.setData({
-                  Recommend: recommend,
-                });
               }
             }
 
@@ -424,13 +421,20 @@ Page({
 
             if (!that.data.TaskInfo.IsNew)
               recommend = getRecommendTime();
-            that.setData({
-              Recommend: recommend,
-            });
+            
           }
         }
+
+        var isShowPigeonhole=false;
+        if (that.getGreenDayNumberIsHalfAYear()){
+          recommend=0;
+          isShowPigeonhole=true;
+        }
+        //debugger;
         that.setData({
           IsShowAnswer: that.data.IsShowAnswer,
+          Recommend: recommend,
+          IsShowPigeonhole:isShowPigeonhole,
         });
         that.autoAudioPlayInit();
 
@@ -501,6 +505,19 @@ Page({
       }
     }
   },
+  getGreenDayNumberIsHalfAYear:function(){
+    var dayNum=this.data.TaskInfo.Number2;
+    if (dayNum.indexOf("d")>0){
+      dayNum=dayNum.replace("d","");
+      dayNum=Number(dayNum);
+      if (dayNum<183)
+        return false;
+      else
+        return true;
+    }
+    else
+      return false;
+  },
   gotoEdit: function () {
     var that = this;
     //console.log(res.tapIndex);
@@ -675,19 +692,26 @@ Page({
                 if (minute == 1) {
                   TaskList[0].Number0 = "1m";
                   TaskList[0].Number2 = "10m";
+                  if (app.globalData.MemoryLevel==1)
+                    TaskList[0].Number3 = "4d";
                 } else {
                   TaskList[0].Number0 = "10m";
                   TaskList[0].Number2 = "1d";
+                  if (app.globalData.MemoryLevel==1)
+                    TaskList[0].Number3 = "4d";
                 }
 
                 TaskList[0].Number0Str = main.getMemoryLevel(app.globalData.MemoryLevel, 0, TaskList[0].Number0);
                 TaskList[0].Number2Str = main.getMemoryLevel(app.globalData.MemoryLevel, 2, TaskList[0].Number2);
+                TaskList[0].Number3Str = main.getMemoryLevel(app.globalData.MemoryLevel, 3, TaskList[0].Number3);
 
                 delete TaskList[0].Number1;
                 delete TaskList[0].Number1Str;
 
-                delete TaskList[0].Number3;
-                delete TaskList[0].Number3Str;
+                if (!app.globalData.MemoryLevel){
+                  delete TaskList[0].Number3;
+                  delete TaskList[0].Number3Str;
+                }
 
                 TaskList[0].FirstTime = null;
                 TaskList[0].LastTime = null;

pages/main/detail.wxml

@@ -125,20 +125,20 @@
               <view class="Answer0 btnColor"></view>
             </view>
             <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
-              data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1}}">
+              data-time="{{TaskInfo.Number1}}" data-btnnumber="3" wx:if="{{TaskInfo.Number1 && !IsShowPigeonhole}}">
               <view class="btnTime">
                 {{TaskInfo.Number1Str}}
               </view>
-              <view wx:if='{{Recommend!=1}}' class="Answer1 btnColor"></view>
-              <view wx:if='{{Recommend==1 && MemoryLevel==1}}' class="Answer1Recommend Answer1 btnColor"></view>
+              <view wx:if="{{Recommend!=1}}" class="Answer1 btnColor"></view>
+              <view wx:if="{{Recommend==1 && MemoryLevel==1}}" class="Answer1Recommend Answer1 btnColor"></view>
             </view>
             <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
               data-time="{{TaskInfo.Number2}}" data-btnnumber="4">
               <view class="btnTime">
                 {{TaskInfo.Number2Str}}
               </view>
-              <view wx:if='{{Recommend!=2}}' class="Answer2 btnColor"></view>
-              <view wx:if='{{Recommend==2 && MemoryLevel==1}}' class="Answer1Recommend Answer2 btnColor"></view>
+              <view wx:if="{{Recommend!=2}}" class="Answer2 btnColor"></view>
+              <view wx:if="{{Recommend==2 && MemoryLevel==1}}" class="Answer1Recommend Answer2 btnColor"></view>
 
             </view>
             <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext'
@@ -146,13 +146,21 @@
               <view class="btnTime">
                 {{TaskInfo.Number3Str}}
               </view>
-              <view wx:if='{{Recommend!=3}}' class="Answer3 btnColor"></view>
-              <view wx:if='{{Recommend==3 && MemoryLevel==1}}' class="Answer1Recommend Answer3 btnColor"></view>
+              <view wx:if="{{Recommend!=3}}" class="Answer3 btnColor"></view>
+              <view wx:if="{{Recommend==3 && MemoryLevel==1}}" class="Answer1Recommend Answer3 btnColor"></view>
             </view>
             <view class="line2"></view>
             <view class="AnswerRight FlexColumn" hover-class='AnswerHover' catchtap='showOtherButton'>
               <image src="../images/universalpic_4blocks_gray_28x28.png" class='universalpic_4blocks_gray_28x28' />
             </view>
+            
+            <block wx:if="{{IsShowPigeonhole}}">
+              <view class="line4"></view>
+              <view class="AnswerRight1 FlexRow" catchtap='saveCardType' data-foldertype="0">
+                <image src="../images/mg4_iconTools_4.png" class='mg4_iconTools_4' />
+                <view class="text4">归档</view>
+              </view>
+            </block>
           </view>
           <view class="panelBottomAnswer0 FlexRow">
             <view class="AnswerLeft Answer00 FlexColumn" hover-class='AnswerHover' catchtap='saveCardType' data-foldertype="0">

pages/main/detail.wxss

@@ -987,3 +987,19 @@ page{
   border:3rpx solid #F1AB1E; 
   color:#F1AB1E 
 } 
+
+.line4{
+  width:2rpx;
+  height:28rpx;
+  background-color: #2D313E;
+}
+.mg4_iconTools_4{
+  width: 28rpx;
+  height:34rpx;
+  margin: 0 20rpx 0 30rpx;
+}
+
+.text4{
+  font-size: 24rpx;
+  margin-right: 42rpx;
+}

pages/main/health.wxml

@@ -16,10 +16,10 @@
     <view class="lineWidthAll FlexRow">
       <view class="lineWidth680"></view>
     </view>
-    <view class="help1 FlexRow" bindtap="goto" data-url="../plan/setting">
+    <view class="help1 FlexRow" bindtap="goto" data-url="../main/systemsetting">
       <view class="help10 FlexRow">
         <view class="help11 FlexColumn">
-          <view class="help111">前往「重置今天的任务量」</view>
+          <view class="help111">前往「重置今天的任务」</view>
         </view>
       </view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />

pages/main/remind.js

@@ -0,0 +1,105 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  onLoad: function (options) {
+    var that = this;
+    var arrTime = [];
+    for (var i = 0; i < 24; i++) {
+      if (i < 10) {
+        arrTime.push("0" + i + ":00");
+        arrTime.push("0" + i + ":30");
+      }
+      else {
+        arrTime.push(i + ":00");
+        arrTime.push(i + ":30");
+      }
+    }
+
+    var MessageTimeIndex=0;
+    for (var i = 0; i < arrTime.length; i++) {
+      if (arrTime[i] == app.globalData.userInfo.MessageTime){
+        MessageTimeIndex=i;
+        break;
+      }
+    }
+
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+      IsMessage: app.globalData.userInfo.IsMessage,
+      MessageTime: app.globalData.userInfo.MessageTime,
+      Subscribe: app.globalData.userInfo.Subscribe,
+      TimeArray: arrTime,
+      MessageTimeIndex: MessageTimeIndex,
+    });
+
+    wx.setNavigationBarColor({
+      frontColor: "#000000",
+      backgroundColor: "#ffffff",
+    });
+
+    wx.setStorageSync("IsNotShowRemindPractice", 1);
+  },
+  switch1Change: function (e) {
+    var that = this;
+    var IsMessage = 0;
+    if (e.detail.value)
+      IsMessage = 1;
+
+    var param = {
+      Content: IsMessage,
+    };
+    main.postData('UpdateUserMemberInfoPost?UserID='+app.globalData.userInfo.UserID+'&FieldType=2', param, function (data) {
+      app.globalData.userInfo.IsMessage = IsMessage;
+      that.setData({
+        IsMessage: app.globalData.userInfo.IsMessage,
+      });
+      wx.showToast({
+        title: '保存成功！',
+        icon: 'success',
+        duration: 1000
+      });
+    });
+  },
+  bindPickerChange: function (e) {
+    var that = this;
+
+    that.setData({
+      MessageTime: this.data.TimeArray[e.detail.value],
+      MessageTimeIndex: e.detail.value
+    });
+    var param = {
+      Content: that.data.MessageTime,
+    };
+    
+    main.postData('UpdateUserMemberInfoPost?UserID='+app.globalData.userInfo.UserID+'&FieldType=3', param, function (data) {
+      app.globalData.userInfo.MessageTime = that.data.MessageTime;
+      that.setData({
+        MessageTime: app.globalData.userInfo.MessageTime,
+      });
+      wx.showToast({
+        title: '保存成功！',
+        icon: 'success',
+        duration: 1000
+      });
+    });
+  },
+
+  showImage: function (e) {
+    var name=app.globalData.uploadImageUrl+'web/code_mgfwh.png';
+    wx.previewImage({
+      current: name,
+      urls: [name],
+    });
+      
+  },
+  onShareAppMessage: function () {
+    return {
+      title: "练习提醒",
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID+'&type=remind',
+      imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_lxtx.png",
+    }
+  },
+})

pages/main/remind.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "练习提醒",
+  "backgroundTextStyle": "dark"
+}

pages/main/remind.wxml

@@ -0,0 +1,36 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  
+  <view class="panelItem0 panelItem FlexRow">
+    <view class="panelItem1">提醒</view>
+    <view class="panelItem2 FlexRow">
+      <switch checked="{{IsMessage}}" bindchange="switch1Change" />
+    </view>
+  </view>
+  <view class="lineWidthAll FlexRow">
+			<view class="lineWidth720"></view>
+		</view>
+  <view class="panelItem FlexRow" bindtap='goto' data-url="./remind">
+    <view class="panelItem1">设置时间</view>
+    <view class="panelItem2 FlexRow">
+      <view wx:if="{{!IsMessage}}">关闭</view>
+      <picker  wx:if="{{IsMessage}}" class='Time' bindchange="bindPickerChange" value="{{MessageTimeIndex}}" range="{{TimeArray}}">
+        <view class="picker">
+          每天{{TimeArray[MessageTimeIndex]}}
+        </view>
+      </picker>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>  
+  <view class='lineFooter'></view>
+
+  <block wx:if="{{!Subscribe}}">
+    <text class="text1">在您规定的时间通过「秒过」公众号发送提醒。\n可在此确认是否关注了公众号。</text>
+    <view class="panelItem00 panelItem FlexRow" bindtap='showImage' data-url="../index/accredit">
+      扫码关注公众号
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+  
+  
+</view>

pages/main/remind.wxss

@@ -0,0 +1,45 @@
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  margin-top: 50rpx;
+}
+
+.panelItem00{
+  margin-top: 50rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: center;
+}
+
+.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;
+}
+
+.text1{
+  width:682rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #787878;
+  margin: 30rpx 0 0 0;
+}

pages/main/systemsetting.js

@@ -11,7 +11,7 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
-    
+ 
     that.setData({
       Containnerheight: main.getWindowHeight(),
       ProgramName: app.globalData.ProgramName,
@@ -25,28 +25,17 @@ Page({
       wx.setStorageSync("HasSound", that.data.HasSound);
     });
   },
-  updateMember: function () {
-    wx.navigateTo({
-      url: '../index/accredit',
-    });
-  },
-  gotoSymbol: function (e) {
-    wx.navigateTo({
-      url: '../main/symbolsetting',
-    });
-  },
-  gotoAbout: function (e) {
-    wx.navigateTo({
-      url: '../other/newuser?nobutton=true',
+  onShow:function(){
+    var that = this;
+
+    var messageInfo="关闭";
+    if (app.globalData.userInfo.IsMessage)
+      messageInfo="每天"+app.globalData.userInfo.MessageTime;
+    
+    that.setData({
+      MessageInfo: messageInfo,
     });
   },
-  gotoPayCustom:function(){
-    if (app.globalData.userInfo.UserID<=7){
-      wx.navigateTo({
-        url: '../other/paycustom',
-      });
-    }
-  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     var gotoType = e.currentTarget.dataset.type;
@@ -54,6 +43,7 @@ Page({
       wx.navigateTo({
         url: url,
       });
+      
     } else {
       wx.redirectTo({
         url: url,
@@ -68,6 +58,9 @@ Page({
     });
     wx.setStorageSync("HasSound", that.data.HasSound);
   },
+  resetTodayTask:function(){
+    main.ResetTodayTask();
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/systemsetting.wxml

@@ -4,6 +4,24 @@
     <view class="panelTitle1">通用</view>
     <view class="panelTitle2"></view>
   </view>
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../plan/pattern">
+    <view class="panelItem1">记忆评价</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../plan/clicktype">
+    <view class="panelItem1">显示答案的操作方式</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../plan/colorplan">
+    <view class="panelItem1">题卡主题色</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
   <view class="panelItem FlexRow" bindtap='goto' data-url="../other/family">
     <view class="panelItem1">家庭用户</view>
     <view class="panelItem2 FlexRow">
@@ -16,7 +34,16 @@
       <switch checked="{{HasSound}}" bindchange="switch1Change" />
     </view>
   </view>
-  <view class="panelItem FlexRow" bindtap='gotoSymbol'>
+
+  <view class="panelItem FlexRow" bindtap='goto' data-url="./remind">
+    <view class="panelItem1">练习提醒</view>
+    <view class="panelItem2 FlexRow">
+      <view>{{MessageInfo}}</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>  
+
+  <view class="panelItem FlexRow" bindtap='goto' data-url="./symbolsetting">
     <view class="panelItem1">符号栏</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -28,7 +55,7 @@
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="panelItem FlexRow" bindtap='gotoAbout'>
+  <view class="panelItem FlexRow" bindtap='goto' data-url="../other/newuser?nobutton=true">
     <view class="panelItem1">关于秒过</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -39,12 +66,16 @@
     返现推广计划（测试版）
   </view>  
   <view class='lineFooter'></view>
-  <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
+  <view class="panelItem01 panelItem00 panelItem FlexRow" bindtap='resetTodayTask'>
+    重置今天的任务
+  </view>
+  <view class='lineFooter'></view>
+  <view class="panelItem00 panelItem FlexRow" bindtap='goto' data-url="../index/accredit">
     重新获取用户信息
   </view>
   <view class="text2">{{ShowUserID}}</view>
   <view style='width:100%;height:50rpx;'></view>
-  <text class='text1' bindtap="gotoPayCustom">©2019 秒过™学习\n唱意教育微信小程序 版本 {{Version}}</text>
+  <text class='text1'> 秒过学习 {{Version}}\n©2017-2023 唱意教育小程序产品</text>
   <view style='width:100%;height:100rpx;'></view>
 
 </view>

pages/main/systemsetting.wxss

@@ -36,6 +36,10 @@
   font-weight: 400;
   justify-content: center;
 }
+.panelItem01{
+  color:#FE6659;
+  font-weight: 500;
+}
 
 .panelItem .panelItem1{
   margin-left: 30rpx;

pages/other/annualreport.wxml

@@ -98,7 +98,7 @@
 		</view>
 		<view class="line1"></view>
 		<view class="panelItem FlexRow" bindtap='goto' data-url="../plan/pattern">
-			<view class="text3">使用记忆评价高级模式让复习更精确</view>
+			<view class="text3">使用记忆评价完整模式让复习更精确</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>

pages/other/tips.js

@@ -35,7 +35,7 @@ Page({
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      path: app.globalData.SharePath + '?type=tips&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_tips.png",
     }
   },

pages/plan/studyplandetail.js

@@ -27,6 +27,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
       CardType:options.CardType,
     });
+    
     that.init();
   },
   init: function () {

pages/plan/taskBasic.js

@@ -0,0 +1,136 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import fanObj from '../template/FanObject';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    BtnCss1:"panel12112",
+    BtnCss5:"panel12113",
+    BtnCss10:"panel12112",
+    BtnImg1:"2",
+    BtnImg5:"3",
+    BtnImg10:"2",
+    BasicCardLimit:0,
+    Increase:5,
+    CardType:0,
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    
+    var studyPlan = app.globalData.TaskToday;
+    
+    var newLength=0;
+    if (studyPlan.ListNew && studyPlan.ListNew.length>0)
+      newLength=studyPlan.ListNew.length;
+
+    var reviewLength=0;
+    if (studyPlan.ListReview && studyPlan.ListReview.length>0)
+      reviewLength=studyPlan.ListReview.length;
+
+    var historyLength=0;
+    if (studyPlan.ListHistory && studyPlan.ListHistory.length>0)
+      historyLength=studyPlan.ListHistory.length;
+
+    var taskNumber = newLength + reviewLength + historyLength;
+    that.setData({
+      StudyPlan: studyPlan,
+      TaskNumber: taskNumber,
+      LimitTimeCardNum:studyPlan.NewLimitTimeToday+studyPlan.HistoryLimitTimeToday,
+    });
+
+    var backColor = "#f0f0f0";
+
+    var rate = 0;
+    if (studyPlan.CommonNewLength > 0 || studyPlan.CommonOldLength > 0) {
+      rate = studyPlan.CommonNewLength / (studyPlan.CommonNewLength + studyPlan.CommonOldLength);
+      backColor = "#EF7F57";
+    }
+
+    fanObj.init(that, rate, 96, 3.0, "#F8C6B4", backColor, studyPlan.CommonNewLength + studyPlan.CommonOldLength);
+
+    wx.showLoading();
+    common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
+      common.getStorageValue(that, "CardMaxNumberHistory", 100, function () {
+        common.getStorageValue(that, "BasicCardLimit", 0, function () {
+          var basicCardLimit=that.data.BasicCardLimit;
+          if (!basicCardLimit)
+            basicCardLimit=that.data.CardMaxNumberNew + that.data.CardMaxNumberHistory;
+          that.setData({
+            BasicCardLimit: basicCardLimit,
+          });
+          wx.hideLoading();
+        });
+      });
+    });
+    
+
+  },
+  clickBtnNumber:function(e){
+    var that = this;
+    var num=e.currentTarget.dataset.num;
+    
+    that.data["BtnCss1"]="panel12112";
+    that.data["BtnCss5"]="panel12112";
+    that.data["BtnCss10"]="panel12112";
+    that.data["BtnCss"+num]="panel12113";
+    that.data["BtnImg1"]=that.data["BtnCss1"].substr(9,1);
+    that.data["BtnImg5"]=that.data["BtnCss5"].substr(9,1);
+    that.data["BtnImg10"]=that.data["BtnCss10"].substr(9,1);
+    that.data["Increase"]=num;
+    that.setData(that.data);
+    
+  },
+  changeNum:function(e){
+    var num=e.currentTarget.dataset.num;
+    var total=this.data.BasicCardLimit+Number(num)*this.data.Increase;
+    if (total<10)
+      total=10;
+    else if (total>300)
+      total=300; 
+    this.setData({
+      BasicCardLimit:total,
+    });
+  },
+  goto: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  gotoReLaunch: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.reLaunch({
+      url: url,
+    });
+  },
+  gotoTaskList: function (e) {
+    var id=e.currentTarget.dataset.id;
+    main.GotoTaskList(id,this.data.CardType);
+  },
+  saveUserConfig:function(e){
+    var that = this;
+    main.getData("UpdateUserConfigBasicCardLimit?UserID=" + app.globalData.userInfo.UserID + "&BasicCardLimit=" + that.data.BasicCardLimit, function (data) {
+      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/plan/taskBasic.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarBackgroundColor": "#3157BA",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "秒过",
+  "backgroundColor": "#233E84",
+  "backgroundColorTop": "#3157BA",
+  "backgroundColorBottom": "#233E84"
+}

pages/plan/taskBasic.wxml

@@ -0,0 +1,182 @@
+<import src="../template/Fan.wxml" />
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class="mg4_practicePic_1" src="{{ImagePath}}web/mg4_practicePic_1.png" />
+  <image class="mg4_textH1_1" src="{{ImagePath}}web/mg4_textH1_1.png" />
+  <image class="mg4_textH2_1" src="{{ImagePath}}web/mg4_textH2_1.png" />
+  <view class="panel1 FlexColumn">
+    <view class="panel11 FlexRow">
+      <text class="text1">一天里\n最多想练习</text>
+      <view class="panel111 FlexRow">
+        <text class="text2">{{BasicCardLimit}}</text>
+        <text class="text3">张</text>
+      </view>
+    </view>
+    <view class="panel12 panel11 FlexRow">
+      <view class="panel121 FlexColumn">
+        <text class="text4">递增递减</text>
+        <view class="panel1211 FlexRow">
+          <view class="{{BtnCss1}} panel12111 FlexRow" bindtap="clickBtnNumber" data-num="1">
+            <image class="mg4_iconNum1_2" src="{{ImagePath}}web/mg4_iconNum1_{{BtnImg1}}.png" />
+          </view>
+          <view class="{{BtnCss5}} panel12111 FlexRow" bindtap="clickBtnNumber" data-num="5">
+            <image class="mg4_iconNum5_2" src="{{ImagePath}}web/mg4_iconNum5_{{BtnImg5}}.png" />
+          </view>
+          <view class="{{BtnCss10}} panel12111 FlexRow" bindtap="clickBtnNumber" data-num="10">
+            <image class="mg4_iconNum10_2" src="{{ImagePath}}web/mg4_iconNum10_{{BtnImg10}}.png" />
+          </view>
+        </view>
+      </view>
+
+      <view class="panel122 FlexColumn">
+        <text class="text4">可设置 <text class="text5">10-300</text></text>
+        <view class="panel1212 FlexRow">
+          <view class="panel12121 FlexRow" hover-class="panel12121Hover" bindtap="changeNum" data-num="-1">
+            <image class="mg4_iconMSymbol_1" src="{{ImagePath}}web/mg4_iconMSymbol_1.png" />
+          </view>
+          <view class="panel12121line"></view>
+          <view class="panel12122 FlexRow" hover-class="panel12122Hover" bindtap="changeNum" data-num="1">
+            <image class="mg4_iconMSymbol_2" src="{{ImagePath}}web/mg4_iconMSymbol_2.png" />
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="panel13" bindtap="saveUserConfig">
+      确定调整
+    </view>
+  </view>
+
+  <view class="panel2 panel1 FlexColumn">
+    <view class="panel21 FlexColumn">
+      <text class="text1">任务纵览</text>
+      <text class="text6">按序号阅读有助掌握当前情况，为设置提供依据</text>
+    </view>
+
+    <view class="panel22 FlexRow">
+      <view class="panel221 FlexColumn">
+        <view class="panel2211 FlexColumn">
+          <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+        </view>
+        <text class="text7">已到练习时间\n的题卡数量</text>
+        <text class="text8">{{LimitTimeCardNum}}</text>
+      </view>
+      <view class="panel221 FlexColumn">
+        <view class="panel2211 FlexColumn">
+          <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum2_1.png" />
+        </view>
+        <text class="text7">从中选出</text>
+        <text class="text8">{{StudyPlan.AlreadyPracticeNumber+TaskNumber}}</text>
+        <text class="text9">张题卡供今天练习</text>
+      </view>
+    </view>
+    <view class="panel23 FlexRow">
+      <view class="panel221 FlexColumn">
+        <view class="panel2211 FlexColumn">
+          <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum3_1.png" />
+        </view>
+        <text class="text7">现在已练完</text>
+        <text class="text8">{{StudyPlan.AlreadyPracticeNumber}}</text>
+        <text class="text9">张题卡</text>
+        <view class="text10" bindtap="gotoTaskList" data-id="2">
+          <image class="mg4_textH3_2" src="{{ImagePath}}web/mg4_textH3_1.png" />
+        </view>
+      </view>
+      <view class="panel221 FlexColumn">
+        <view class="panel2211 FlexColumn">
+          <image class="mg4_iconNum4_1" src="{{ImagePath}}web/mg4_iconNum4_1.png" />
+        </view>
+        <text class="text7">还有</text>
+        <text class="text8">{{TaskNumber}}</text>
+        <text class="text9">张题卡得练完</text>
+      </view>
+
+    </view>
+    <view class="panel24 FlexColumn">
+      <view class="panel2211 FlexColumn">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum5_1.png" />
+      </view>
+      <view class="text10" bindtap="gotoTaskList" data-id="1">
+        <image class="mg4_textH3_2" src="{{ImagePath}}web/mg4_textH3_2.png" />
+      </view>
+      <text class="text7">当前任务包括</text>
+      <view class="panel241 FlexColumn">
+
+        <view class="panel2411 FlexRow">
+          <view class="panel24111 FlexColumn">
+            <view class="text11"></view>
+            <view class="text12 panel241111">任务量</view>
+          </view>
+          <view class="panel24112 FlexRow">
+            <view class="panel24121 FlexColumn">
+              <view class="text11">日常题卡</view>
+              <view class="panel241111">
+                <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}"></template>
+              </view>
+              <view class="text14">{{StudyPlan.CommonNewLength}}</view>
+              <view class="text141 text14">{{StudyPlan.CommonOldLength}}</view>
+            </view>
+          </view>
+        </view>
+        <view class="panel242 FlexColumn">
+          <view class="panel2421 FlexRow">
+            <view class="text13">新题卡</view>
+            <view class="color1"></view>
+            <view class="text14"></view>
+          </view>
+          <view class="panel2421 FlexRow">
+            <view class="text13">旧题卡</view>
+            <view class="color2 color1"></view>
+            <view class="text14"></view>
+          </view>
+        </view>
+        <view class="panel243 FlexRow">
+          <view class="panel2431 FlexColumn">
+            <view class="panel24311 FlexRow">
+              <view class="text17">预计回想</view>
+              <view class="panel243111 FlexRow">
+                <view class="text18">{{StudyPlan.PracticeNumber}}</view>
+                <view class="text19">次</view>
+              </view>
+            </view>
+            <text class="text16">新题卡\n首次练习须回想两次</text>
+          </view>
+          <view class="panel2431 FlexColumn">
+            <view class="panel24311 FlexRow">
+              <view class="text17">预计用时</view>
+              <view class="panel243111 FlexRow">
+                <view class="text18">{{StudyPlan.PracticeTime}}</view>
+                <view class="text19">分钟</view>
+              </view>
+            </view>
+            <text class="text16">根据近期练习\n用时的估算</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <view class="panel3 panel1 FlexColumn" bindtap="gotoReLaunch" data-url="../../pages_test/test/index">
+    <view class="panel21 FlexColumn">
+      <view class="panel31 FlexRow">
+        <text class="text1">去「检验」逛逛</text>
+        <view class="panel311 FlexColumn">
+          <image class="mg4_iconNext_1" src="{{ImagePath}}web/mg4_iconNext_1.png" />
+        </view>
+      </view>
+      <text class="text6">题卡太少不够练？\n创建新题卡或去「检验」栏目生成课本知识点</text>
+    </view>
+
+  </view>
+  <image class="mg4_practicePic_2" src="{{ImagePath}}web/mg4_practicePic_2.png" />
+  <view class="panel4 panel1 FlexColumn" bindtap="goto" data-url="../../pages/plan/taskHelp?type=1">
+    <view class="panel21 FlexColumn">
+      <view class="panel31 FlexRow">
+        <text class="text1">完整版设置</text>
+        <view class="panel311 FlexColumn">
+          <image class="mg4_iconNext_1" src="{{ImagePath}}web/mg4_iconNext_1.png" />
+        </view>
+      </view>
+      <text class="text6">了解另一种功能更多，更为复杂的设置版本</text>
+    </view>
+  </view>
+</view>

pages/plan/taskBasic.wxss

@@ -0,0 +1,433 @@
+@import "../template/Fan.wxss";
+
+page {
+  background-color: #3157ba;
+}
+
+.container {
+  background-color: #3157ba;
+}
+
+.mg4_practicePic_1 {
+  width: 100%;
+  height: 1010rpx;
+  position: absolute;
+  top: 320rpx;
+}
+
+.mg4_textH1_1 {
+  width: 266rpx;
+  height: 187rpx;
+  justify-content: flex-start;
+  align-self: flex-start;
+  margin: 100rpx 0 0 60rpx;
+}
+
+.mg4_textH2_1 {
+  width: 132rpx;
+  height: 40rpx;
+  justify-content: flex-start;
+  align-self: flex-start;
+  margin: 40rpx 0 0 60rpx;
+}
+
+.panel1 {
+  margin-top: 60rpx;
+  width: 690rpx;
+  background-color: #fff;
+  box-shadow: 0 20rpx 0 0 #BCBCBC, 0 40rpx 0 0 rgba(0, 0, 0, 0.30);
+  border-radius: 40rpx;
+  color: #4D4D4D;
+  position: relative;
+  justify-content: flex-start;
+  min-height: 617rpx;
+}
+
+.panel11 {
+  width: 570rpx;
+  margin-top: 60rpx;
+  justify-content: space-between;
+}
+.panel12 {
+  margin-top: 30rpx;
+}
+.panel13{
+  margin: 60rpx 0 40rpx 0;
+  width: 610rpx;
+  line-height: 120rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #EB5C28;
+  text-align: center;
+}
+
+.text1 {
+  font-size: 36rpx;
+}
+
+.text2 {
+  font-family: Roboto-Black;
+  font-size: 132rpx;
+  text-align: right;
+}
+.text3 {
+  margin: 60rpx 0 0 10rpx;
+  font-size: 22rpx;
+}
+.text4 {
+  font-size: 24rpx;
+  margin-right: 20rpx;
+}
+.text5 {
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  text-align: right;
+}
+
+.text6 {
+  margin: 10rpx 0 0 0;
+  font-size: 22rpx;
+  font-weight: 400;
+}
+
+.panel121{
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panel12111{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 50%;
+  background-color: #f2f2f2;
+  margin:30rpx 20rpx 0 0;
+}
+
+.panel12113{
+  background-color: #2e2e2e;
+}
+
+.mg4_iconNum1_2 {
+  width: 10rpx;
+  height: 24rpx;
+}
+
+.mg4_iconNum5_2 {
+  width: 14rpx;
+  height: 24rpx;
+}
+
+.mg4_iconNum10_2 {
+  width: 26rpx;
+  height: 24rpx;
+}
+
+.panel122{
+  justify-content: flex-start;
+  align-items: flex-end;
+}
+
+.panel1212{
+  margin: 20rpx 0 0 0;
+  border-radius: 40rpx;
+  background: #2E2E2E;
+}
+
+.panel12121{
+  width:120rpx;
+  height:100rpx;
+  background: #2E2E2E;
+  border-radius: 40rpx 0 0 10rpx;
+}
+.panel12121Hover{
+  background: #4d4d4d;
+}
+
+.panel12122{
+  width:120rpx;
+  height:100rpx;
+  background: #2E2E2E;
+  border-radius: 0 10rpx 40rpx 0;
+}
+
+.panel12122Hover{
+  background: #4d4d4d;
+}
+
+.panel12121line{
+  width:4rpx;
+  height:40rpx;
+  background-color: #4D4D4D;
+}
+
+.mg4_iconMSymbol_2 {
+  width: 38rpx;
+  height: 36rpx;
+}
+
+.mg4_iconMSymbol_1 {
+  width: 24rpx;
+  height: 8rpx;
+}
+
+.panel2{
+  margin-top: 80rpx;
+  min-height: 210rpx;
+}
+
+.panel21{
+  margin: 60rpx 0 0 0;
+  align-items: flex-start;
+  width: 570rpx;
+}
+.panel22{
+  margin: 40rpx 0 0 0;
+  width: 630rpx;
+}
+
+.panel23{
+  width: 630rpx;
+}
+
+
+.panel221{
+  width: 310rpx;
+  height:252rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin: 5rpx;
+  position: relative;
+}
+
+.panel2211{
+  width: 30rpx;
+  height:30rpx;
+  background: #4d4d4d;
+  border-radius: 10rpx;
+  margin: 30rpx 0 0 30rpx;
+}
+
+.mg4_iconNum1_1{
+  width: 6rpx;
+  height:12rpx;
+}
+.mg4_iconNum2_1{
+  width: 8rpx;
+  height:12rpx;
+}
+.mg4_iconNum4_1{
+  width: 10rpx;
+  height:12rpx;
+}
+
+.text7{
+  margin: 30rpx 0 0 30rpx;
+  font-size: 28rpx;
+}
+
+.text8{
+  margin: 0 0 0 30rpx;
+  font-family: Roboto-Black;
+  font-size: 36rpx;
+}
+
+.text9{
+  margin: 0 0 0 30rpx;
+  font-size: 28rpx;
+}
+
+.text10{
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  font-size: 20rpx;
+  color: #EB5C28;
+  text-align: center;
+  width:100rpx;
+  line-height: 48rpx;
+  position: absolute;
+  top:20rpx;
+  right:20rpx;
+}
+
+.mg4_textH3_2{
+  width:80rpx;
+  height:20rpx;
+}
+
+.panel24{
+  width: 630rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin: 5rpx;
+  position: relative;
+  margin-bottom: 30rpx;
+}
+
+.panel241{
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  width:590rpx;
+  margin: 30rpx 0 20rpx 20rpx;
+  justify-content: flex-start;
+}
+
+.panel2411{
+  width:100%;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+
+.text11{
+  font-size: 24rpx;
+  height:33rpx;
+}
+
+.panel24111{
+  width:96rpx;
+  height:149rpx;
+  margin:30rpx 0 0 0;
+}
+
+
+.panel24112{
+  width:478rpx;
+  height:235rpx;
+  margin-top: 30rpx;
+  z-index: 20;
+  align-items: flex-start;
+}
+
+.panel241111{
+  margin-top: 20rpx;
+  width:96rpx;
+  height:96rpx;
+}
+
+.text12{
+  font-size: 24rpx;
+  font-weight: 400;
+  line-height:96rpx;
+  margin-left:80rpx;
+}
+
+.panel242{
+  width:570rpx;
+  height:116rpx;
+  background: #f2f2f2;
+  border-radius: 10rpx;
+  margin: -68rpx 0 0 0;
+}
+
+.panel2421{
+  justify-content: flex-start;
+  margin: 5rpx 0;
+  width: 100%;
+}
+
+.text13{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.color1{
+  width:16rpx;
+  height:16rpx;
+  border-radius: 4rpx;
+  background: #F8C6B4;
+  margin-left: 10rpx;
+}
+
+.color2{
+  background: #EF7F57;
+}
+
+.text14{
+  margin-top: 43rpx;
+  font-size: 24rpx;
+  font-family: Roboto-Black;
+}
+
+.text141{
+  margin-top: 15rpx;
+}
+
+.panel243{
+  width:570rpx;
+  margin: 10rpx 0 0 0;
+  justify-content: space-between;
+}
+
+.panel2431{
+  width:280rpx;
+  height:143rpx;
+  border-radius: 10rpx;
+  background: #f2f2f2;
+  margin-bottom: 10rpx;
+}
+
+.panel24311{
+  width:100%;
+  justify-content: space-between;
+}
+
+.panel243111{
+  margin-right: 30rpx;
+}
+
+.text17{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+.text18{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+}
+.text19{
+  font-size: 22rpx;
+}
+
+.text16{
+  width:250rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+  font-size: 22rpx;
+  color: #5A5A5A;
+  margin-top: 10rpx;
+}
+
+.mg4_practicePic_2{
+  width:100%;
+  height:460rpx;
+  margin-top: 80rpx;
+}
+
+.panel3{
+  margin-top: 80rpx;
+  min-height: 240rpx;
+}
+.panel31{
+  width:100%;
+  justify-content: flex-start;
+}
+.panel311{
+  margin-left: 18rpx;
+  width: 34rpx;
+  height: 34rpx;
+  border-radius: 50%;
+  background-color: #EB5C28;
+}
+.panel4{
+  margin-top: -310rpx;
+  min-height: 210rpx;
+}
+.mg4_iconNext_1{
+  width:14rpx;
+  height:20rpx;
+}

pages/plan/taskFull.js

@@ -0,0 +1,455 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+import fanObj from '../template/FanObject';
+import constant from '../../utils/constant';
+
+const app = getApp();
+var selectCommon=0;
+var selectUrgency=0;
+var historyLimitMax=5;
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    CardType:0,
+    CardTypeName:"日常",
+    CardType0On: 0,
+    CardType1On: 0,
+    CurrentCardTypeSetting:-1,
+    CardNumberNew: [],
+    CardNumberOld: [],
+    BasicCardLimitArr: [],
+    SortTypeArr:[0,0,1],
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    that.init();
+  },
+  init: function () {
+    var that = this;  
+    var studyPlan = app.globalData.TaskToday;
+    
+    var newLength=0;
+    if (studyPlan.ListNew && studyPlan.ListNew.length>0)
+      newLength=studyPlan.ListNew.length;
+
+    var reviewLength=0;
+    if (studyPlan.ListReview && studyPlan.ListReview.length>0)
+      reviewLength=studyPlan.ListReview.length;
+
+    var historyLength=0;
+    if (studyPlan.ListHistory && studyPlan.ListHistory.length>0)
+      historyLength=studyPlan.ListHistory.length;
+
+    var backColor = "#f0f0f0";
+    var rate = 0;
+    if (studyPlan.CommonNewLength > 0 || studyPlan.CommonOldLength > 0) {
+      rate = studyPlan.CommonNewLength / (studyPlan.CommonNewLength + studyPlan.CommonOldLength);
+      backColor = "#EF7F57";
+    }
+    var number1=studyPlan.CommonNewLength + studyPlan.CommonOldLength;
+    if (!number1)
+      number1=0;
+    fanObj.init(that, rate, 96, 3.0, "#F8C6B4", backColor, number1);
+  
+    var backColor2 = "#f0f0f0";
+    var rate2 = 0;
+    if (studyPlan.UrgentNewLength > 0 || studyPlan.UrgentOldLength > 0) {
+      rate2 = studyPlan.UrgentNewLength / (studyPlan.UrgentNewLength + studyPlan.UrgentOldLength);
+      backColor2 = "#EF7F57";
+    }
+    var number2=studyPlan.UrgentNewLength + studyPlan.UrgentOldLength;
+    if (!number2)
+      number2=0;    
+    fanObj.init2(that, rate2, 96, 3.0, "#F8C6B4", backColor2, number2);
+
+    
+    var taskNumber = newLength + reviewLength + historyLength;
+    that.setData({
+      StudyPlan: studyPlan,
+      TaskNumber: taskNumber,
+      LimitTimeCardNum:studyPlan.NewLimitTimeToday+studyPlan.HistoryLimitTimeToday,
+    });
+
+    common.getStorageValue(that, "CardType", 0, function () {
+      if (that.data.CardType==0 || that.data.CardType==2) {
+        that.setData({
+          CardType0On: 1,
+        });
+      }
+      if (that.data.CardType==1 || that.data.CardType==2) {
+        that.setData({
+          CardType1On: 1,
+        });
+      }
+      selectCommon= that.data.CardType0On;
+      selectUrgency= that.data.CardType1On;
+    });
+  },
+  showSetting:function(e){
+    var that = this; 
+    wx.showLoading();   
+    var cardtype=e.currentTarget.dataset.cardtype;
+    var cardtypename=e.currentTarget.dataset.cardtypename;
+    that.setData({
+      CurrentCardTypeSetting:cardtype,
+      CardTypeName:cardtypename
+    });
+    selectCommon= that.data.CardType0On;
+    selectUrgency= that.data.CardType1On;
+
+    var url = "GetMiaoguoCardTotal?UserID=" + app.globalData.userInfo.UserID + "&CardType=" + that.data.CurrentCardTypeSetting;
+    main.getData(url, function (data) {
+      wx.hideLoading();
+      if (data) {
+
+        var cardTotal = 0,limitNumber=0;
+
+        var info = app.globalData.TaskToday;
+
+        historyLimitMax=5;
+        if (that.data.CurrentCardTypeSetting==1) {
+          historyLimitMax=50;
+        }
+
+        that.data.BasicCardLimitArr=[];
+        for (var i = 10; i <= 300; i++) {
+          that.data.BasicCardLimitArr.push(i);
+        }
+
+        that.data.CardNumberNew=[];
+        for (var i = 0; i <= 200; i++) {
+          that.data.CardNumberNew.push(i);
+        }
+        that.data.CardNumberOld=[];        
+        for (var i = historyLimitMax; i <= 500; i++) {
+          that.data.CardNumberOld.push(i);
+        }
+
+        that.setData({
+          CardNumber: info.CardNumber,
+          CardNumberNew: that.data.CardNumberNew,
+          CardNumberOld: that.data.CardNumberOld,
+          BasicCardLimitArr: that.data.BasicCardLimitArr,
+        });
+
+        if (that.data.CurrentCardTypeSetting == 0) {
+          if (info.CardNumber > 0) {
+            limitNumber = data.NewLimitTimeToday + data.HistoryLimitTimeToday;
+            cardTotal = info.CardNumberCommon;
+          }
+        }
+        else if (that.data.CurrentCardTypeSetting == 1) {
+          if (info.CardNumber > 0) {
+            limitNumber = data.NewLimitTimeToday + data.HistoryLimitTimeToday;
+            cardTotal = info.CardNumberUrgent;
+          }
+        }
+
+        that.setData({
+          LimitCardNumber:limitNumber,
+          CardNumberCurrent: cardTotal,
+          
+          NewCardAll: data.NewCardAll,
+          HistoryCardAll: data.HistoryCardAll,
+          
+          NewToday: data.NewToday,
+          
+          NewLimitTimeToday: data.NewLimitTimeToday,
+          HistoryLimitTimeToday: data.HistoryLimitTimeToday,
+          
+          NewCardNumberAndLimitToday: data.NewCardNumberAndLimitToday,
+          HistoryCardNumberAndLimitToday: data.HistoryCardNumberAndLimitToday,
+        });
+
+        if (that.data.CurrentCardTypeSetting==0){
+          
+          common.getStorageValue(that, "BasicCardLimit", 0, function () {
+            that.setData({
+              BasicCardLimitIndex: that.data.BasicCardLimit-10,
+            });
+            if (that.data.BasicCardLimit>0){
+              that.setData({
+                ShowBasicCardLimit: 1,
+              });
+            }
+          });
+          common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
+            that.setData({
+              CardMaxNumberNewIndex: that.data.CardMaxNumberNew,
+            });
+          });
+          common.getStorageValue(that, "CardMaxNumberHistory", 90, function () {
+            that.setData({
+              CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - historyLimitMax,
+            });
+          });
+          common.getStorageValue(that, "SortTypeIndex", 0, function () {
+            that.data.SortTypeArr=[0,0,0];
+            that.data.SortTypeArr[2-that.data.SortTypeIndex]=1;
+            that.setData({
+              SortTypeArr: that.data.SortTypeArr,
+            });
+          });
+        }
+        else if (that.data.CurrentCardTypeSetting == 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 - historyLimitMax,
+            });
+          });
+        }
+      }
+    });
+  },
+  closeSetting:function(e){
+    var that = this;    
+    that.setData({
+      CurrentCardTypeSetting:-1,
+    });
+  },
+  gotoTaskList: function (e) {
+    var id=e.currentTarget.dataset.id;
+    main.GotoTaskList(id,this.data.CardType);
+  },
+  goto: function (e) {
+    var url=e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+  redirectTo: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.redirectTo({
+      url: url,
+    });
+  },
+  changePlanOK: function (e) {
+    var that = this;
+
+    var canSave=true;
+
+    var id=e.currentTarget.dataset.id;
+    var checked = e.detail.value;
+    
+    if (id==0){
+      selectCommon=checked;
+    }
+    else{
+      selectUrgency=checked;
+    }
+
+    if (!selectCommon && !selectUrgency){
+      wx.showModal({
+        title: '不能关闭',
+        content: '如要关闭本模式，请先启用另一种模式。日常、紧急两种模式可任选其一或同时使用，但不能同时关闭。',
+        confirmText: '好的',
+        showCancel: false,
+        success(res) { 
+          if (id==0){
+            selectCommon=1;
+            that.setData({
+              CardType0On:1,
+            });
+          }
+          else{
+            selectUrgency=1;
+            that.setData({
+              CardType1On:1,
+            });
+          }
+          canSave=false;         
+        }
+      });
+    }
+    else if (id==1 && selectUrgency && this.data.CardNumberCurrent==0){
+      wx.showModal({
+        title: '没有实际效果',
+        content: '紧急练习模式中没有题卡。请将已有的题卡放到紧急练习模式中，或直接创建用于紧急练习模式的新题卡。',
+        confirmText: '好的',
+        showCancel: false,
+      });
+    }
+
+    if (canSave)
+      that.saveSetting();
+  },
+  bindUpdateBasicCardLimit:function(e){
+    this.data.BasicCardLimitIndex = e.detail.value;
+
+    if (this.data.CurrentCardTypeSetting == 0) {
+      this.setData({
+        BasicCardLimitIndex: this.data.BasicCardLimitIndex,
+        BasicCardLimit: this.data.BasicCardLimitArr[this.data.BasicCardLimitIndex],
+      });
+
+      this.saveSetting();
+    }
+  },
+  bindUpdateCardNumberNewMax: function (e) {
+    this.data.CardMaxNumberNewIndex = e.detail.value;
+
+    if (this.data.CurrentCardTypeSetting == 0) {
+      this.setData({
+        CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
+        CardMaxNumberNew: this.data.CardNumberNew[this.data.CardMaxNumberNewIndex],
+      });
+    }
+    else if (this.data.CurrentCardTypeSetting == 1) {
+      this.setData({
+        CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
+        CardMaxNumberNewUrgent: this.data.CardNumberNew[this.data.CardMaxNumberNewIndex],
+      });
+    }
+
+    this.saveSetting();
+  },
+  bindUpdateCardNumberHistoryMax: function (e) {
+    this.data.CardMaxNumberHistoryIndex = e.detail.value;
+
+    if (this.data.CurrentCardTypeSetting == 0) {
+      this.setData({
+        CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
+        CardMaxNumberHistory: this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex],
+      });
+    }
+    else if (this.data.CurrentCardTypeSetting == 1) {
+      this.setData({
+        CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
+        CardMaxNumberHistoryUrgent: this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex],
+      });
+    }
+
+    this.saveSetting();
+  },
+  bindUpdateCardSortType: function (e) {
+    this.data.SortTypeIndex = e.currentTarget.dataset.id;
+    this.data.SortTypeArr=[0,0,0];
+    //注意索引和ID不一样
+    this.data.SortTypeArr[2-this.data.SortTypeIndex]=1;
+
+    if (this.data.CurrentCardTypeSetting == 0) {
+      this.setData({
+        SortTypeIndex: this.data.SortTypeIndex,
+        SortTypeArr: this.data.SortTypeArr,
+      });
+    }
+
+    this.saveSetting();
+  },
+  saveSetting:function(e){
+    var that = this;
+
+    if (this.data.CurrentCardTypeSetting == 0) {
+    
+      that.setData({
+        CardType0On:selectCommon,
+      });
+      if (that.data.ShowBasicCardLimit)
+        wx.setStorageSync("BasicCardLimit", that.data.BasicCardLimit);
+      else
+        wx.setStorageSync("BasicCardLimit", 0);
+        
+      wx.setStorageSync("CardMaxNumberNew", that.data.CardMaxNumberNew);
+      wx.setStorageSync("CardMaxNumberHistory", that.data.CardMaxNumberHistory);
+      wx.setStorageSync("SortTypeIndex", that.data.SortTypeIndex);
+    }
+    else if (this.data.CurrentCardTypeSetting == 1) {
+      that.setData({
+        CardType1On:selectUrgency,
+      });
+      wx.setStorageSync("CardType", that.data.CardType1On);
+      wx.setStorageSync("CardMaxNumberNewUrgent", that.data.CardMaxNumberNewUrgent);
+      wx.setStorageSync("CardMaxNumberHistoryUrgent", that.data.CardMaxNumberHistoryUrgent);
+    }
+
+    var cardtype=0;
+    
+    if (!that.data.CardType0On && that.data.CardType1On)
+      cardtype=1;
+    else if (that.data.CardType0On && that.data.CardType1On)
+      cardtype=2;
+    wx.setStorageSync("CardType", cardtype);
+      
+    main.UploadUserConfig(function () {
+      main.getTaskTodayList(function (data) { 
+        that.init();
+      });
+    });
+  }, 
+  changeBasicCardLimit:function(e){
+    var that=this;
+    var b=!this.data.ShowBasicCardLimit;
+    if (b){
+      wx.showModal({
+        title: '提醒',
+        content: '将停用您的自定义设置，交由系统根据练习数据智能配比新旧题卡上限，用户只规定限量的总数。',
+        confirmText: '继续',
+        showCancel: true,
+        success(res) { 
+          if (res.confirm) {
+            var cardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
+            var cardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+            var max=cardMaxNumberNew+cardMaxNumberHistory;
+            if (max>300)
+              max=300;
+            wx.setStorageSync("BasicCardLimit", max);
+            that.setData({
+              BasicCardLimit:max,
+            });
+            main.UploadUserConfig(function () {
+              main.getTaskTodayList(function (data) {});
+              that.setData({
+                ShowBasicCardLimit:b,
+              });
+            });
+          }
+        }
+      });
+    }
+    else{
+      wx.showModal({
+        title: '提醒',
+        content: '将由您设置新旧题卡上限数量。可随时改回由系统配比的功能。',
+        confirmText: '继续',
+        showCancel: true,
+        success(res) { 
+          if (res.confirm) {
+            var cardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
+            var cardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+            wx.setStorageSync("CardMaxNumberNew", 5);
+            wx.setStorageSync("CardMaxNumberHistory", cardMaxNumberNew+cardMaxNumberHistory-5);
+            wx.setStorageSync("BasicCardLimit", 0);
+            that.setData({
+              CardMaxNumberNew:5,
+              CardMaxNumberHistory:cardMaxNumberNew+cardMaxNumberHistory-5,
+            });
+            main.UploadUserConfig(function () {
+              main.getTaskTodayList(function (data) {});
+              that.setData({
+                ShowBasicCardLimit:b,
+              });
+            });
+          }
+        }
+      });
+    }
+    
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/plan/taskFull.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarBackgroundColor": "#3157BA",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "秒过",
+  "backgroundColor": "#3157BA",
+  "backgroundColorTop": "#3157BA",
+  "backgroundColorBottom": "#233E84"
+}

pages/plan/taskFull.wxml

@@ -0,0 +1,377 @@
+<import src="../template/Fan.wxml" />
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelNull"></view>
+  <image class="mg4_practicePic_3" src="{{ImagePath}}web/mg4_practicePic_3.png" />
+  <image class="mg4_practicePic_4" src="{{ImagePath}}web/mg4_practicePic_4.png" />
+  <image class="mg4_textH1_1" src="{{ImagePath}}web/mg4_textH1_1.png" />
+  <image class="mg4_textH2_2" src="{{ImagePath}}web/mg4_textH2_2.png" />
+  <view class="btnBasic FlexColumn" catchtap="goto" data-url="../../pages/plan/taskHelp?type=0">
+    <image class="mg4_textH3_4" src="{{ImagePath}}web/mg4_textH3_4.png" />
+  </view>
+
+  <view class="panel1 FlexColumn" catchtap="showSetting" data-cardtype="0" data-cardtypename="日常">
+    <view class="panel210 panel21 FlexRow">
+      <view class="panel31 FlexRow">
+        <text class="text1">日常练习设置</text>
+        <view class="panel311 FlexColumn">
+          <image class="mg4_iconNext_1" src="{{ImagePath}}web/mg4_iconNext_1.png" />
+        </view>
+      </view>
+      <view class="text2">
+        <block wx:if="{{CardType0On==0}}">未</block>启用
+      </view>
+    </view>
+  </view>
+
+  <view class="panel2 panel1 FlexColumn" catchtap="showSetting" data-cardtype="1" data-cardtypename="紧急">
+    <view class="panel210 panel21 FlexRow">
+      <view class="panel31 FlexRow">
+        <text class="text1">紧急练习设置</text>
+        <view class="panel311 FlexColumn">
+          <image class="mg4_iconNext_1" src="{{ImagePath}}web/mg4_iconNext_1.png" />
+        </view>
+      </view>
+      <view class="text2">
+        <block wx:if="{{CardType1On==0}}">未</block>启用
+      </view>
+    </view>
+  </view>
+
+  <view class="panel3 panel1 FlexColumn">
+    <view class="panel21 FlexColumn">
+      <text class="text1">任务纵览</text>
+      <text class="text6">按序号阅读有助掌握当前情况，为设置提供依据</text>
+    </view>
+
+    <view class="panel22 FlexRow">
+      <view class="panel221 FlexColumn">
+        <view class="panel2211 FlexColumn">
+          <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+        </view>
+        <text class="text7">今天已练完</text>
+        <text class="text8">{{StudyPlan.AlreadyPracticeNumber}}</text>
+        <text class="text9">张题卡</text>
+        <view class="text10" catchtap="gotoTaskList" data-id="2">
+          <image class="mg4_textH3_2" src="{{ImagePath}}web/mg4_textH3_1.png" />
+        </view>
+
+      </view>
+      <view class="panel221 FlexColumn">
+        <view class="panel2211 FlexColumn">
+          <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum2_1.png" />
+        </view>
+        <text class="text7">还有</text>
+        <text class="text8">{{TaskNumber}}</text>
+        <text class="text9">张题卡得练完</text>
+      </view>
+    </view>
+
+    <view class="panel24 FlexColumn">
+      <view class="panel2211 FlexColumn">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum3_1.png" />
+      </view>
+      <view class="text10" catchtap="gotoTaskList" data-id="1">
+        <image class="mg4_textH3_2" src="{{ImagePath}}web/mg4_textH3_2.png" />
+      </view>
+      <text class="text7">当前任务由以下内容组成</text>
+      <view class="panel241 FlexColumn">
+        <view class="panel2411 FlexRow">
+          <view class="panel24111 FlexColumn">
+            <view class="text11"></view>
+            <view class="text12 panel241111">任务量</view>
+          </view>
+          <view class="panel24112 FlexRow">
+            <view class="panel24121 FlexColumn" wx:if="{{CardType==0 || CardType==2}}">
+              <view class="text11">日常题卡</view>
+              <view class="panel241111">
+                <template class="fan" is="fanTemplate" data="{{Angle1,Angle2,BGColor,FanSize,FanScale,Color1,Color2,ShowNumber}}"></template>
+              </view>
+              <view class="text14">{{StudyPlan.CommonNewLength}}</view>
+              <view class="text141 text14">{{StudyPlan.CommonOldLength}}</view>
+            </view>
+
+            <image class="mg4_iconMSymbol_3" src="{{ImagePath}}web/mg4_iconMSymbol_3.png" wx:if="{{CardType==2}}" />
+
+            <view class="panel24121 FlexColumn" wx:if="{{CardType==1 || CardType==2}}">
+              <view class="text11">紧急题卡</view>
+              <view class="panel241111">
+                <template class="fan" is="fanTemplate2" data="{{Angle12,Angle22,BGColor2,FanSize2,FanScale2,Color12,Color22,ShowNumber2}}"></template>
+              </view>
+              <view class="text14">{{StudyPlan.UrgentNewLength}}</view>
+              <view class="text141 text14">{{StudyPlan.UrgentOldLength}}</view>
+            </view>
+
+            <block wx:if="{{StudyPlan.ListReview.length>0}}">
+              <image class="mg4_iconMSymbol_3" src="{{ImagePath}}web/mg4_iconMSymbol_3.png" />
+              <view class="panel241112 FlexColumn">
+                <view class="text33">{{StudyPlan.ListReview.length}}</view>
+                <view class="text34">补练</view>
+              </view>
+            </block>
+
+          </view>
+
+        </view>
+        <view class="panel242 FlexColumn">
+          <view class="panel2421 FlexRow">
+            <view class="text13">新题卡</view>
+            <view class="color1"></view>
+            <view class="text14"></view>
+          </view>
+          <view class="panel2421 FlexRow">
+            <view class="text13">旧题卡</view>
+            <view class="color2 color1"></view>
+            <view class="text14"></view>
+          </view>
+        </view>
+
+        <view class="text32">补练：上次没练完的题卡，延续到下次补练。</view>
+        
+        <view class="panel243 FlexRow">
+          <view class="panel2431 FlexColumn">
+            <view class="panel24311 FlexRow">
+              <view class="text17">预计回想</view>
+              <view class="panel243111 FlexRow">
+                <view class="text18">{{StudyPlan.PracticeNumber}}</view>
+                <view class="text19">次</view>
+              </view>
+            </view>
+            <text class="text16">新题卡\n首次练习可能回想两次</text>
+          </view>
+          <view class="panel2431 FlexColumn">
+            <view class="panel24311 FlexRow">
+              <view class="text17">预计用时</view>
+              <view class="panel243111 FlexRow">
+                <view class="text18">{{StudyPlan.PracticeTime}}</view>
+                <view class="text19">分钟</view>
+              </view>
+            </view>
+            <text class="text16">根据近期练习\n用时的估算</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+
+<!-- 日常和紧急设置 -->
+<view wx:if="{{CurrentCardTypeSetting>=0}}" catchtap="" class="container2 FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelHigh0 FlexColumn">
+    <view class="panelHigh1 FlexRow">
+      <view class="panelHigh11 FlexRow">
+        <view>{{CardTypeName}}练习设置</view>
+        <!-- <view class="panelHigh111 FlexRow">
+          <image class="mg4_textH3_3" src="{{ImagePath}}web/mg4_textH3_3.png" />
+        </view> -->
+      </view>
+      <view class="panelHigh12 FlexRow" catchtap="closeSetting">
+        <image class="mg4_iconMSymbol_4" src="{{ImagePath}}web/mg4_iconMSymbol_4.png" />
+      </view>
+    </view>
+  </view>
+
+  <scroll-view class="panelHigh FlexColumn" scroll-y="true" style='height:{{Containnerheight-280}}rpx;'>
+    <view class="panelHigh_0 FlexColumn">
+      <view class="panelHigh2 FlexRow">
+        <view class="text20" wx:if="{{CurrentCardTypeSetting==0}}">启用日常练习</view>
+        <view class="text20" wx:if="{{CurrentCardTypeSetting==1}}">启用紧急练习</view>
+        <switch wx:if="{{CurrentCardTypeSetting==0}}" class="panelHigh21" color="#EB5C28" checked="{{CardType0On}}" bindchange="changePlanOK" data-id="0" />
+        <switch wx:if="{{CurrentCardTypeSetting==1}}" class="panelHigh21" color="#EB5C28" checked="{{CardType1On}}" bindchange="changePlanOK" data-id="1" />
+      </view>
+      <view class="text21">参考数据</view>
+      <view class="panelHigh3 FlexRow">
+        <view class="panelHigh31 FlexCulomn">
+          <view class="panelHigh311">{{CardTypeName}}练习中有题卡</view>
+          <view class="color3 panelHigh311">其中到期题卡</view>
+          <view class="panelHigh311">到期时间是今天的</view>
+        </view>
+        <view class="panelHigh32 FlexCulomn">
+          <view class="panelHigh321">总数</view>
+          <view class="panelHigh322 FlexColumn">
+            <view class="text22">{{CardNumberCurrent}}</view>
+            <view class="color3 text221 text22">{{LimitCardNumber}}</view>
+            <view class="text221 text22">{{NewCardNumberAndLimitToday+HistoryCardNumberAndLimitToday}}</view>
+          </view>
+        </view>
+        <view class="panelHigh32 FlexCulomn">
+          <view class="panelHigh321">新题卡</view>
+          <view class="panelHigh322 FlexColumn">
+            <view class="text22">{{NewCardAll}}</view>
+            <view class="color3 text221 text22">{{NewLimitTimeToday}}</view>
+            <view class="text221 text22">{{NewCardNumberAndLimitToday}}</view>
+          </view>
+        </view>
+        <view class="panelHigh32 FlexCulomn">
+          <view class="panelHigh321">旧题卡</view>
+          <view class="panelHigh322 FlexColumn">
+            <view class="text22">{{HistoryCardAll}}</view>
+            <view class="color3 text221 text22">{{HistoryLimitTimeToday}}</view>
+            <view class="text221 text22">{{HistoryCardNumberAndLimitToday}}</view>
+          </view>
+        </view>
+      </view>
+      <text class="text23">每张题卡都有自己的「到期时间」。按「艾宾浩斯遗忘曲线」原理，到期的那天是最适合回顾的日子。题卡到期才练习。</text>
+      <view class="panelHigh40 panelHigh4 FlexColumn" wx:if="{{CurrentCardTypeSetting==1}}">
+        <view class="panelHigh41 FlexRow">
+          <view class="panelHigh411 FlexRow">
+            <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+          </view>
+          <text class="text26">紧急练习最多容纳200张题卡。如要练习更多的题卡，请前往「题卡」栏目调换题卡。</text>
+        </view>
+      </view>
+
+      <view class="panelLine"></view>
+      <view class="text21">任务限量</view>
+
+      <block wx:if="{{ShowBasicCardLimit && CurrentCardTypeSetting==0}}">
+        <picker class="panelHigh3" bindchange="bindUpdateBasicCardLimit" value="{{BasicCardLimitIndex}}" range="{{BasicCardLimitArr}}">
+          <view class="panelHigh3_0 panelHigh30 FlexRow">
+            <view class="panel32 FlexRow">
+              <image class="mg4_iconTools_3" src="{{ImagePath}}web/mg4_iconTools_3.png" />
+              <view class="panel321 FlexColumn">
+                <view class="text25">限量总数</view>
+              </view>
+            </view>
+
+            <view class="panelHigh33 FlexRow">
+              <view class="text31">
+                {{BasicCardLimit}}张
+              </view>
+              <image class="mg4_iconNext_2" src="../images/mg4_iconNext_2.png" />
+            </view>
+          </view>
+        </picker>
+
+        <text class="text23">任务太多，调低上限；限量范围10-300张题卡。</text>
+
+        <view class="panelBtn2 FlexRow" catchtap="changeBasicCardLimit">
+          <image class="mg4_textH3_5" src="{{ImagePath}}web/mg4_textH3_5.png" />
+        </view>
+      </block>
+      <block wx:if="{{!ShowBasicCardLimit || CurrentCardTypeSetting==1}}">
+        <view class="text30" wx:if="{{CurrentCardTypeSetting==0}}">设置限量总数{{CardMaxNumberNew+CardMaxNumberHistory}}张，由以下两项构成</view>
+        <view class="text30" wx:if="{{CurrentCardTypeSetting==1}}">设置限量总数{{CardMaxNumberNewUrgent+CardMaxNumberHistoryUrgent}}张，由以下两项构成</view>
+        <picker class="panelHigh3" bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumberNew}}">
+          <view class="panelHigh30 FlexRow">
+            <view class="panel32 FlexRow">
+              <image class="mg4_iconTools_3" src="{{ImagePath}}web/mg4_iconTools_3.png" />
+              <view class="panel321 FlexColumn">
+                <view class="text25">新题卡上限</view>
+                <view class="text24">目前到期{{NewLimitTimeToday}}张</view>
+              </view>
+            </view>
+
+            <view class="panelHigh33 FlexRow">
+              <view class="text31" wx:if="{{CurrentCardTypeSetting==0}}">
+                设置{{CardMaxNumberNew}}张
+              </view>
+              <view class="text31" wx:if="{{CurrentCardTypeSetting==1}}">
+                设置{{CardMaxNumberNewUrgent}}张
+              </view>
+              <image class="mg4_iconNext_2" src="../images/mg4_iconNext_2.png" />
+            </view>
+          </view>
+        </picker>
+
+        <picker class="panelHigh300 panelHigh3" bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumberOld}}">
+          <view class="panelHigh30 FlexRow">
+            <view class="panel32 FlexRow">
+              <image class="mg4_iconTools_3" src="{{ImagePath}}web/mg4_iconTools_3.png" />
+              <view class="panel321 FlexColumn">
+                <view class="text25">旧题卡上限</view>
+                <view class="text24">目前到期{{HistoryLimitTimeToday}}张</view>
+              </view>
+            </view>
+            <view class="panelHigh33 FlexRow">
+              <view class="text31" wx:if="{{CurrentCardTypeSetting==0}}">
+                设置{{CardMaxNumberHistory}}张
+              </view>
+              <view class="text31" wx:if="{{CurrentCardTypeSetting==1}}">
+                设置{{CardMaxNumberHistoryUrgent}}张
+              </view>
+              <image class="mg4_iconNext_2" src="../images/mg4_iconNext_2.png" />
+            </view>
+          </view>
+        </picker>
+
+        <view class="panelHigh4 FlexColumn" wx:if="{{CurrentCardTypeSetting==0}}">
+          <view class="panelHigh41 FlexRow">
+            <view class="panelHigh411 FlexRow">
+              <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+            </view>
+            <text class="text26">任务限量是一天里练习题卡的最大数量，并不一定天天有那么多，实际上任务量少于限量也是常态之一。</text>
+          </view>
+          <view class="panelHigh41 FlexRow">
+            <view class="panelHigh411 FlexRow">
+              <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum2_1.png" />
+            </view>
+            <text class="text26">上限设置偏大时，实际任务量可能没有那么多，因为到期题卡偏少时，没有那么多题卡可练。请观察上面的「参考数据 ➜ 其中到期题卡」这一行，有助预估调整后的结果。</text>
+          </view>
+          <view class="panelHigh41 FlexRow">
+            <view class="panelHigh411 FlexRow">
+              <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum3_1.png" />
+            </view>
+            <text class="text26">新题卡练习起来比旧题卡吃力，不宜多。新旧题卡设置的比例建议不高于1:5。保持经常练习是消耗新题卡库存的最佳方法。</text>
+          </view>
+        </view>
+        <view class="panelBtn2 FlexRow" catchtap="changeBasicCardLimit" wx:if="{{CurrentCardTypeSetting==0}}">
+          <image class="mg4_textH3_6" src="{{ImagePath}}web/mg4_textH3_6.png" />
+        </view>
+
+        <view class="panelHigh42 FlexRow" wx:if="{{CurrentCardTypeSetting==1}}">
+          紧急练习由于其特殊性，任务限量由用户直接设置，没有系统自动配比功能。其它方便与日常练习相同。
+        </view>
+      </block>
+
+      <block wx:if="{{CurrentCardTypeSetting==0}}">
+        <view class="panelLine"></view>
+        <view class="text21">优先规则</view>
+
+        <view class="panelHigh5 FlexColumn">
+          <view class="panelHigh51 FlexRow" catchtap="bindUpdateCardSortType" data-id="2">
+            <image wx:if="{{SortTypeArr[0]}}" class="mg4_iconMSymbol_5" src="{{ImagePath}}web/mg4_iconMSymbol_5.png" />
+            <view wx:if="{{!SortTypeArr[0]}}" class="mg4_iconMSymbol_5"></view>
+            <view>今天优先</view>
+          </view>
+          <view class="panelHighLine2"></view>
+          <view class="panelHigh51 FlexRow" catchtap="bindUpdateCardSortType" data-id="1">
+            <image wx:if="{{SortTypeArr[1]}}" class="mg4_iconMSymbol_5" src="{{ImagePath}}web/mg4_iconMSymbol_5.png" />
+            <view wx:if="{{!SortTypeArr[1]}}" class="mg4_iconMSymbol_5"></view>
+            <view>最早优先</view>
+          </view>
+          <view class="panelHighLine2"></view>
+          <view class="panelHigh51 FlexRow" catchtap="bindUpdateCardSortType" data-id="0">
+            <image wx:if="{{SortTypeArr[2]}}" class="mg4_iconMSymbol_5" src="{{ImagePath}}web/mg4_iconMSymbol_5.png" />
+            <view wx:if="{{!SortTypeArr[2]}}" class="mg4_iconMSymbol_5"></view>
+            <view>系统规划</view>
+          </view>
+        </view>
+
+        <view class="panelHigh4 FlexColumn">
+          <view class="panelHigh41 FlexRow">
+            <text class="text27">本功能规定每次练习优先选择哪个时间段的到期题卡。</text>
+          </view>
+          <view class="panelHigh41 FlexRow">
+            <view class="panelHigh411 FlexRow">
+              <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+            </view>
+            <view class="text26 FlexColumn"><text>今天优先</text><text class="text27">今天到期的题卡最适合马上回顾，另包括今天刚创建的新题卡。调整前请查看「参考数据 ➜ 其中今天到期的」，有助预估结果。</text></view>
+          </view>
+          <view class="panelHigh41 FlexRow">
+            <view class="panelHigh411 FlexRow">
+              <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum2_1.png" />
+            </view>
+            <view class="text26 FlexColumn"><text>最早优先</text><text class="text27">与今天优先相反，率先练习以前到期的题卡，越早越优先。适合在到期题卡量不大的情况下，集中补上落下的进度。 </text></view>
+          </view>
+          <view class="panelHigh41 FlexRow">
+            <view class="panelHigh411 FlexRow">
+              <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum3_1.png" />
+            </view>
+            <view class="text26 FlexColumn"><text>系统规划</text><text class="text27">默认方式，由智能系统根据每张题卡的练习情况自动安排。</text></view>
+          </view>
+        </view>
+      </block>
+      <view class="panelNull2"></view>
+    </view>
+  </scroll-view>
+</view>

pages/plan/taskFull.wxss

@@ -0,0 +1,729 @@
+@import "../template/Fan.wxss";
+
+page {
+  background-color: #233E84;
+}
+
+.container {
+  background-color: #233E84;
+}
+
+.panelNull{
+  width:100%;
+  height:317rpx;
+  background-color: #3157BA;
+  position: absolute;
+  top: 0;
+}
+
+.mg4_practicePic_3 {
+  width: 100%;
+  height: 420rpx;
+  position: absolute;
+  top: 317rpx;
+}
+
+.mg4_practicePic_4 {
+  width: 100%;
+  height: 826rpx;
+  position: absolute;
+  top: 1335rpx;
+}
+
+.mg4_textH1_1 {
+  width: 266rpx;
+  height: 187rpx;
+  justify-content: flex-start;
+  align-self: flex-start;
+  margin: 100rpx 0 0 60rpx;
+  z-index: 10;
+}
+
+.mg4_textH2_2 {
+  width: 132rpx;
+  height: 40rpx;
+  justify-content: flex-start;
+  align-self: flex-start;
+  margin: 40rpx 0 0 60rpx;
+  z-index: 10;
+}
+.btnBasic{
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  width:120rpx;
+  height:48rpx;
+  z-index: 10;
+  position: absolute;
+  top:327rpx;
+  left:242rpx;
+}
+
+.mg4_textH3_4{
+  width:100rpx;
+  height:21rpx;
+}
+
+
+.panel1 {
+  margin-top: 100rpx;
+  width: 690rpx;
+  background-color: #fff;
+  box-shadow: 0 20rpx 0 0 #BCBCBC, 0 40rpx 0 0 rgba(0, 0, 0, 0.30);
+  border-radius: 40rpx;
+  color: #4D4D4D;
+  position: relative;
+  justify-content: flex-start;
+  min-height: 170rpx;
+}
+
+.panel2{
+  margin-top: 80rpx;
+}
+
+
+.panel21{
+  margin: 60rpx 0 0 0;
+  align-items: flex-start;
+  justify-content: space-between;
+  width: 570rpx;
+}
+
+.panel210{
+  align-items: center;
+}
+
+.panel31{
+  justify-content: flex-start;
+}
+
+.panel311{
+  margin-left: 18rpx;
+  width: 34rpx;
+  height: 34rpx;
+  border-radius: 50%;
+  background-color: #EB5C28;
+}
+
+.text1 {
+  font-size: 36rpx;
+}
+
+.mg4_iconNext_1{
+  width:14rpx;
+  height:20rpx;
+}
+
+.text2{
+  font-size: 28rpx;
+  color: #787878;
+  text-align: right;
+}
+
+.text6 {
+  margin: 10rpx 0 0 0;
+  font-size: 22rpx;
+  font-weight: 400;
+}
+
+.panel3{
+  margin: 80rpx 0 115rpx 0;
+}
+
+.panel22{
+  margin: 40rpx 0 0 0;
+  width: 630rpx;
+}
+
+
+.panel221{
+  width: 310rpx;
+  height:252rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin: 5rpx;
+  position: relative;
+}
+
+.panel2211{
+  width: 30rpx;
+  height:30rpx;
+  background: #4d4d4d;
+  border-radius: 10rpx;
+  margin: 30rpx 0 0 30rpx;
+}
+
+.mg4_iconNum1_1{
+  width: 6rpx;
+  height:12rpx;
+}
+.mg4_iconNum2_1{
+  width: 8rpx;
+  height:12rpx;
+}
+.mg4_iconNum4_1{
+  width: 10rpx;
+  height:12rpx;
+}
+
+.text7{
+  margin: 30rpx 0 0 30rpx;
+  font-size: 28rpx;
+}
+
+.text8{
+  margin: 0 0 0 30rpx;
+  font-family: Roboto-Black;
+  font-size: 36rpx;
+}
+
+.text9{
+  margin: 0 0 0 30rpx;
+  font-size: 28rpx;
+}
+
+.text10{
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  font-size: 20rpx;
+  color: #EB5C28;
+  text-align: center;
+  width:100rpx;
+  line-height: 48rpx;
+  position: absolute;
+  top:20rpx;
+  right:20rpx;
+}
+
+.mg4_textH3_2{
+  width:80rpx;
+  height: 20rpx;
+}
+
+
+.panel24{
+  width: 630rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  align-items: flex-start;
+  justify-content: flex-start;
+  margin: 5rpx;
+  position: relative;
+  margin-bottom: 30rpx;
+}
+
+.panel241{
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  width:590rpx;
+  margin: 30rpx 0 20rpx 20rpx;
+  justify-content: flex-start;
+}
+
+.panel2411{
+  width:100%;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+
+.text11{
+  font-size: 24rpx;
+  height:33rpx;
+}
+
+.panel24112{
+  width:478rpx;
+  height:235rpx;
+  margin-top: 30rpx;
+  z-index: 20;
+  align-items: flex-start;
+}
+
+.panel24111{
+  width:96rpx;
+  height:149rpx;
+  margin:30rpx 0 0 0;
+}
+
+.panel241111{
+  margin-top: 20rpx;
+  width:96rpx;
+  height:96rpx;
+}
+
+.mg4_iconMSymbol_3{
+  width:20rpx;
+  height:20rpx;
+  margin: 92rpx 26rpx 0 26rpx;
+}
+
+.panel24122{
+  margin-top: 70rpx;
+  align-items: flex-start;
+}
+
+.text28{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+}
+.text29{
+  font-size: 22rpx;
+  margin-top: -5rpx;
+}
+
+.text12{
+  font-size: 24rpx;
+  font-weight: 400;
+  line-height:96rpx;
+  margin-left:80rpx;
+}
+
+.panel242{
+  width:570rpx;
+  height:116rpx;
+  background: #f2f2f2;
+  border-radius: 10rpx;
+  margin: -68rpx 0 0 0;
+}
+
+.panel2421{
+  justify-content: flex-start;
+  margin: 5rpx 0;
+  width: 100%;
+}
+
+.text13{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.color1{
+  width:16rpx;
+  height:16rpx;
+  border-radius: 4rpx;
+  background: #F8C6B4;
+  margin-left: 10rpx;
+}
+
+.color2{
+  background: #EF7F57;
+}
+
+.text14{
+  margin-top: 43rpx;
+  font-size: 24rpx;
+  font-family: Roboto-Black;
+}
+
+.text141{
+  margin-top: 15rpx;
+}
+
+.panel243{
+  width:570rpx;
+  margin: 10rpx 0 0 0;
+  justify-content: space-between;
+}
+
+.panel2431{
+  width:280rpx;
+  height:143rpx;
+  border-radius: 10rpx;
+  background: #f2f2f2;
+  margin-bottom: 10rpx;
+}
+
+.panel24311{
+  width:100%;
+  justify-content: space-between;
+}
+
+.panel243111{
+  margin-right: 30rpx;
+}
+
+
+.panel241112{
+  align-items: flex-start;
+  height:60rpx;
+  margin-top: 70rpx;
+}
+
+.text33{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  color: #4D4D4D;
+  text-align: center;
+}
+.text34{
+  font-size: 22rpx;
+  color: #4D4D4D;
+}
+.text32{
+  font-size: 22rpx;
+  font-weight: 400;
+  color: #5A5A5A;
+  align-self: flex-start;
+  margin: 20rpx 0 20rpx 30rpx;
+}
+
+.text17{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+.text18{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+}
+.text19{
+  font-size: 22rpx;
+}
+.text15{
+  font-weight: 400;
+  font-size: 22rpx;
+  color: #5A5A5A;
+  width:530rpx;
+  margin: 20rpx 0 20rpx 0;
+}
+.text16{
+  width:250rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+  font-size: 22rpx;
+  color: #5A5A5A;
+  margin-top: 10rpx;
+}
+
+.container2{
+  position: fixed;
+  top:0;
+  background-color: rgba(49,87,186,0.7);
+  z-index: 100;
+  width: 100%;
+  justify-content: flex-start;
+  font-weight: 500;
+}
+
+.panelHigh0{
+  width:100%;
+  background: #FFFFFF;
+  border-radius: 60rpx 60rpx 0 0;
+  min-height:140rpx;
+  color: #4D4D4D;
+  border-bottom: 1rpx solid #e3e3e3;
+  position: fixed;
+  top:100rpx;
+  z-index: 200;
+}
+
+.panelHigh{
+  width:100%;
+  background: #FFFFFF;
+  color: #4D4D4D;
+  margin-top: 240rpx;
+  z-index: 90;
+}
+
+.panelHigh1{
+  width:100%;
+  justify-content: space-between;
+}
+
+.panelHigh11{
+  margin-left: 50rpx;
+  font-size: 36rpx;
+}
+
+.panelHigh111{
+  background: #F2F2F2;
+  border-radius: 10rpx;
+  width:95rpx;
+  height:48rpx;
+  margin-left: 30rpx;
+}
+
+.panelHigh12{
+  margin-right: 50rpx;
+  width:50rpx;
+  height:50rpx;
+}
+
+.mg4_textH3_3{
+  width:75rpx;
+  height:20rpx;
+}
+.mg4_iconMSymbol_4{
+  width:22rpx;
+  height:22rpx;
+}
+
+.panelHigh2{
+  width: 710rpx;
+  height:100rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  margin-top: 60rpx;
+  justify-content: space-between;
+}
+
+.text20{
+  margin-left: 30rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+}
+
+.panelHigh21{
+  margin-right: 30rpx;
+}
+.text21{
+  align-self: flex-start;
+  margin: 60rpx 0 0 50rpx;
+  font-size: 32rpx;
+}
+.text30{
+  align-self: flex-start;
+  margin: 40rpx 0 0 50rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+  color: #2E2E2E;
+}
+
+.panelHigh3{
+  width:710rpx;
+  margin-top: 40rpx;
+
+  background: #F2F2F2;
+  border-radius: 20rpx;
+}
+
+.panelHigh30{
+  width:710rpx;
+  height: 143rpx;
+  justify-content: space-between;
+  font-size: 28rpx;
+  align-items: center;
+}
+
+.panelHigh3_0{
+  height:100rpx;
+}
+
+.panelHigh300{
+  margin-top: 30rpx;
+}
+
+
+.panelHigh31{
+  width:270rpx;
+  margin-top: 73rpx;
+}
+.panelHigh311{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-bottom: 30rpx;
+  margin-left: 30rpx;
+}
+
+.panelHigh321{
+  width: 130rpx;
+  margin: 30rpx 0 0 20rpx;
+  font-size: 24rpx;
+}
+.panelHigh322{
+  width: 130rpx;
+  height:200rpx;
+  margin: 20rpx 0 40rpx 0;
+  font-size: 24rpx;
+  background: #FFFFFF;
+  border-radius: 10rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.text22{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  margin: 20rpx 0 0 20rpx;
+}
+.text221{
+  margin: 30rpx 0 0 20rpx;
+}
+.text23{
+  font-size: 22rpx;
+  font-weight: 400;
+  color: #5A5A5A;
+  margin-top: 40rpx;
+  width:650rpx;
+}
+.panelLine{
+  width:710rpx;
+  height:1rpx;
+  background: #e3e3e3;
+  margin-top: 60rpx;
+}
+
+.panel321{
+  align-items: flex-start;
+  margin-left: 30rpx;
+}
+.text25{
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.mg4_iconNext_2{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+.panelHigh33{
+  margin-right: 30rpx;
+  color:#787878;
+}
+
+.text24{
+  font-size:24rpx;
+  font-weight: 400;
+  margin-top: 10rpx;
+}
+
+.text31{
+  font-size: 28rpx;
+  color: #787878;
+  text-align: right;
+}
+
+.panelHigh4{
+  width:710rpx;
+  margin-top: 40rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panelHigh40{
+  margin-top: 20rpx;
+}
+.panelHigh41{
+  margin: 20rpx 0 0 30rpx;
+  font-size: 22rpx;
+  font-weight: 400;
+  align-items: flex-start;
+}
+.panelHigh42{
+  width:650rpx;
+  margin: 40rpx 0 0 0;
+  font-size: 22rpx;
+  font-weight: 400;
+}
+.panelHigh411{
+  width:30rpx;
+  height:30rpx;
+  background: #4D4D4D;
+  border-radius: 10rpx;
+}
+
+.text26{
+  margin-left: 20rpx;
+  width: 600rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  color:#5A5A5A;
+}
+
+.panelHigh301{
+  margin-top: 60rpx;
+}
+
+.text27{
+  font-weight: 400;
+}
+
+.panelNull2{
+  width:100%;
+  height: 300rpx;
+}
+
+.panelBtn{
+  width:100%;
+  height: 200rpx;
+  background: #E8E6E4;
+  position: fixed;
+  align-items: flex-start;
+  bottom: 0;
+  z-index: 110;
+}
+.panelBtn1{
+  width:345rpx;
+  line-height: 100rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #EB5C28;
+  margin: 0 10rpx;
+  margin-top: 40rpx;
+}
+
+
+.color3{
+  color:#eb5c28;
+  font-weight: 500;
+}
+
+.mg4_iconTools_3{
+  width:34rpx;
+  height:36rpx;
+  margin-left: 30rpx;
+}
+
+.panelBtn2{
+  background: #F2F2F2;
+  border-radius: 10rpx;
+  align-self: start;
+  margin: 40rpx 0 0 50rpx;
+  padding: 8rpx 10rpx 11rpx 10rpx;
+}
+
+.mg4_textH3_5{
+  width:220rpx;
+  height:20rpx;
+}
+
+.mg4_textH3_6{
+  width:400rpx;
+  height:22rpx;
+}
+
+.panelHigh5{
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  width: 710rpx;
+  height:322rpx;
+  margin-top: 40rpx;
+}
+
+.panelHigh51{
+  width:100%;
+  height:111rpx;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #2E2E2E;
+  justify-content: flex-start;
+}
+
+.panelHighLine2{
+  width:610rpx;
+  height:1rpx;
+  background-color: #d4d4d4;
+  align-self: flex-end;
+}
+
+.mg4_iconMSymbol_5{
+  width:40rpx;
+  height:32rpx;
+  margin: 0 30rpx;
+}

pages/plan/taskHelp.js

@@ -0,0 +1,96 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    ImagePath: app.globalData.uploadImageUrl,
+    Expand:[false,false],
+    showFull:1,
+  },
+  onLoad: function (options) {
+    var that = this;
+    //debugger;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      showFull:Number(options.type),
+    });
+  },
+  expandHelp:function(e){
+    var id=e.currentTarget.dataset.id;
+    this.data.Expand[id]=!this.data.Expand[id];
+    this.setData({
+      Expand:this.data.Expand,
+    });
+  },
+  changeFull:function(e){
+    var that = this;
+    wx.showModal({
+      title: '提醒',
+      showCancel: true,
+      content: "启用后，将区分日常、紧急两种练习模式，可对更多项目进行设置。初次使用会有一定学习成本，选项附件均有说明助您了解情况。",
+      confirmText: "继续",
+      cancelText: "取消",
+      success(res) {
+        if (res.confirm) {
+          wx.setStorageSync("TaskSetting", 1);
+          main.UploadUserConfig(function () {
+            main.getTaskTodayList(function (data) { 
+              that.redirectTo({currentTarget:{dataset:{url:"../../pages/plan/taskFull"}}})
+            });
+          });
+        }
+      },
+    });
+  },
+  changeBasic:function(e){
+    var that = this;
+    wx.showModal({
+      title: '提醒',
+      showCancel: true,
+      content: "启用后，保留日常练习模式，紧急练习模式将关闭（如开启的话）。系统将重新规划任务内容，数量和配比可能会有变化。",
+      confirmText: "继续",
+      cancelText: "取消",
+      success(res) {
+        if (res.confirm) {
+          wx.setStorageSync("CardType", 0);
+          wx.setStorageSync("TaskSetting", 0);
+
+          var max = wx.getStorageSync("BasicCardLimit");
+          if (!max){
+            var cardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
+            var cardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
+            var max=cardMaxNumberNew+cardMaxNumberHistory;
+            if (max>300)
+              max=300;
+            wx.setStorageSync("BasicCardLimit", max);
+          }
+          main.UploadUserConfig(function () {
+            main.getTaskTodayList(function (data) { 
+              that.redirectTo({currentTarget:{dataset:{url:"../../pages/plan/taskBasic"}}});
+            });
+          });
+        } 
+      },
+    });
+  },
+  redirectTo: function (e) {
+    var url = e.currentTarget.dataset.url;
+    wx.navigateBack({
+      delta: 1,
+      complete:function(e){
+        wx.redirectTo({
+          url: url,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/plan/taskHelp.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#E8E6E4",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#E8E6E4",
+  "navigationBarTitleText": "帮助"
+}

pages/plan/taskHelp.wxml

@@ -0,0 +1,127 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image class="mg4_textH1_2" src="{{ImagePath}}web/mg4_textH1_2.png" />
+  <text class="text1">为了方便新用户逐步了解和使用秒过核心功能，在任务的设置方面，分为「基础版」和「完整版」两种控制方式。</text>
+  <view class="panel1 FlexColumn">
+    <view class="panel11 FlexRow" bindtap="expandHelp" data-id="0">
+      <text class="text2">两种版本怎么选</text>
+      <view class="panel12 FlexRow">
+        <image class="mg4_iconFold_2" src="{{ImagePath}}web/mg4_iconFold_2.png" wx:if="{{!Expand[0]}}" />
+        <image class="mg4_iconFold_2" src="{{ImagePath}}web/mg4_iconFold_1.png" wx:if="{{Expand[0]}}" />
+      </view>
+    </view>
+    <view class="panel13 FlexColumn" wx:if="{{Expand[0]}}">
+      <view class="text5">基础版</view>
+      <view class="text6">这是秒过默认设置方式，非常适合新用户在新手班、起步阶段使用。</view>
+      <view class="text7">操作简便，选项单一，只对任务限量进行设置，剩下工作交由系统的智能算法以您平时练习数据为依据对每次任务内容进行优化组合，无需对任务控制有太多了解就能达到效果。练习时间越长，结果越精准。</view>
+      <view class="text5">完整版</view>
+      <view class="text6">适合需要启用「紧急练习模式」、要对「日常练习模式」进行具体管理、对任务内容的细节控制有具体需要的用户。</view>
+      <view class="text7">选项丰富，细分为「日常」和「紧急」两种练习模式，可对任务内容进行自主控制。比基础版复杂许多，有学习成本。通常需要用户掌握「使用教学课程」中的相关知识，有一些使用经验，对秒过任务系统有一定程度的了解，才能有效配置，发挥完整版的效能。</view>
+    </view>
+    <view class="panel1Line"></view>
+    <view class="panel11 FlexRow" bindtap="expandHelp" data-id="1">
+      <text class="text2">完整版里有什么</text>
+      <view class="panel12 FlexRow">
+        <image class="mg4_iconFold_2" src="{{ImagePath}}web/mg4_iconFold_2.png" wx:if="{{!Expand[1]}}" />
+        <image class="mg4_iconFold_2" src="{{ImagePath}}web/mg4_iconFold_1.png" wx:if="{{Expand[1]}}" />
+      </view>
+    </view>
+    <view class="panel13 FlexRow" wx:if="{{Expand[1]}}">
+      <view class="text8">完整版具有以下功能</view>
+      <view class="panel1310 panel131 FlexColumn">
+        <view class="panel1311 FlexRow">
+          <image class="mg4_iconTools_2" src="{{ImagePath}}web/mg4_iconTools_2.png" />
+          紧急练习模式
+        </view>
+        <view class="text9">启用并配置紧急练习模式。紧急练习用于短期内强化练习，难度高，压力大，不适合日常使用。</view>
+      </view>
+      <view class="panel131 FlexColumn">
+        <view class="panel1311 FlexRow">
+          <image class="mg4_iconTools_2" src="{{ImagePath}}web/mg4_iconTools_2.png" />
+          模式整合
+        </view>
+        <view class="text9">可启用仅日常、仅紧急或日常+紧急的整合练习。日常练习任务限量可突破300张题卡。</view>
+      </view>
+      <view class="panel1310 panel131 FlexColumn">
+        <view class="panel1311 FlexRow">
+          <image class="mg4_iconTools_2" src="{{ImagePath}}web/mg4_iconTools_2.png" />
+          新旧题卡分开设置
+        </view>
+        <view class="text9">可对任务限量中的新旧题卡上限数量分开设置。</view>
+      </view>
+      <view class="panel131 FlexColumn">
+        <view class="panel1311 FlexRow">
+          <image class="mg4_iconTools_2" src="{{ImagePath}}web/mg4_iconTools_2.png" />
+          优先规则
+        </view>
+        <view class="text9">每次练习优先选择哪些到期题卡，按到期时间区间进行设置。</view>
+      </view>
+    </view>
+    <view class="panel1Line"></view>
+    <view class="button1" wx:if="{{!showFull}}" bindtap="changeBasic">启用基础版</view>
+    <view class="button1" wx:if="{{showFull}}" bindtap="changeFull">启用完整版</view>
+  </view>
+
+  <!-- 启用基础版帮助 -->
+  <view class="panel2 panel1 FlexColumn" wx:if="{{!showFull}}">
+    <text class="text3">启用后将带来以下变化</text>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+      </view>
+      <text class="text4">仅运行日常练习模式，紧急练习模式将自动关闭。</text>
+    </view>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum2_1.png" />
+      </view>
+      <text class="text4">您只能设置任务限量总数。其它项目由系统统一安排。</text>
+    </view>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum3_1.png" />
+      </view>
+      <text class="text4">任务限量最大数将回落到300张题卡，新旧题卡将由系统重新分配，具体数量会与您在完整版里的设置不一样。</text>
+    </view>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum4_1" src="{{ImagePath}}web/mg4_iconNum4_1.png" />
+      </view>
+      <text class="text4">您指定的优先规则不变，会继续作用于基础版。</text>
+    </view>
+    <view class="panel21Footer panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum5_1.png" />
+      </view>
+      <text class="text4">今天的练习记录会保留。</text>
+    </view>
+  </view>
+
+  <!-- 启用完整版帮助 -->
+  <view class="panel2 panel1 FlexColumn" wx:if="{{showFull}}">
+    <text class="text3">启用后将带来以下变化</text>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum1_1" src="{{ImagePath}}web/mg4_iconNum1_1.png" />
+      </view>
+      <text class="text4">界面会有较大变化，选项更多，数据更丰富，需要了解更多基础知识才能灵活使用。</text>
+    </view>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum2_1.png" />
+      </view>
+      <text class="text4">日常、紧急两种模式分开设置，模式启用才生效。</text>
+    </view>
+    <view class="panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum2_1" src="{{ImagePath}}web/mg4_iconNum3_1.png" />
+      </view>
+      <text class="text4">任务限量的新旧题卡配比可自定义设置。</text>
+    </view>
+    <view class="panel21Footer panel21 FlexRow">
+      <view class="panel211 FlexRow">
+        <image class="mg4_iconNum4_1" src="{{ImagePath}}web/mg4_iconNum4_1.png" />
+      </view>
+      <text class="text4">可随时换回「基础版」，请放心使用。</text>
+    </view>
+  </view>
+</view>

pages/plan/taskHelp.wxss

@@ -0,0 +1,170 @@
+.container{
+  background-color: #E8E6E4;
+}
+
+.mg4_textH1_2{
+  width:340rpx;
+  height:193rpx;
+  justify-content: flex-start;
+  align-self: flex-start;
+  margin: 100rpx 0 0 60rpx;
+}
+
+.text1{
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #2E2E2E;
+  width:610rpx;
+  margin-top: 60rpx;
+}
+
+.panel1{
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  width:690rpx;
+  margin-top: 68rpx;
+  justify-content: flex-start;
+}
+
+.panel11{
+  width:610rpx;
+  justify-content: space-between;
+  margin-top: 60rpx;
+}
+
+.panel12{
+  width:34rpx;
+  height:34rpx;
+  background: #EB5C28;
+  border-radius: 50%;
+  margin-right: 20rpx;
+}
+
+.text2{
+  font-size: 36rpx;
+  color: #4D4D4D;
+}
+
+.mg4_iconFold_2{
+  width:20rpx;
+  height:14rpx;
+}
+
+.panel1Line{
+  width:610rpx;
+  height:1rpx;
+  background-color: #e3e3e3;
+  margin: 60rpx 0 0 0;
+}
+
+.panel13{
+  width:610rpx;
+  font-size:24rpx;
+  color: #4D4D4D;
+  flex-wrap: wrap;
+}
+
+.text5{
+  font-size: 28rpx;
+  width:100%;
+  margin-top: 40rpx;
+}
+.text6{
+  color: #2e2e2e;
+  width:100%;
+  margin-top: 30rpx;
+}
+.text7{
+  width:100%;
+  font-weight: 400;
+  margin-top: 20rpx;
+}
+
+.text8{
+  width:100%;
+  font-weight: 400;
+  margin-top: 40rpx;
+}
+
+.panel131{
+  width:280rpx;
+  margin: 40rpx 0 0 0;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.panel1310{
+  margin: 40rpx 50rpx 0 0;
+}
+
+.mg4_iconTools_2{
+  width:28rpx;
+  height:28rpx;
+  margin-right: 20rpx;
+}
+
+.text9{
+  width:280rpx;
+  font-weight: 400;
+  margin-top: 14rpx;
+}
+
+.button1{
+  width:610rpx;
+  line-height:120rpx;
+  background: #F2F2F2;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #EB5C28;
+  text-align: center;
+  margin:60rpx 0 40rpx 0;
+}
+
+.panel2{
+  align-items: flex-start;
+  margin-bottom: 60rpx;
+}
+.text3{
+  font-size: 36rpx;
+  color: #4D4D4D;
+  margin: 60rpx 0 30rpx 40rpx;
+}
+
+.panel21{
+  width:100%;
+  justify-content: flex-start;
+  margin-bottom: 20rpx;
+  align-items: flex-start;
+}
+
+.panel21Footer{
+  margin-bottom: 60rpx;
+}
+
+.panel211{
+  width: 30rpx;
+  height:30rpx;
+  background: #4d4d4d;
+  border-radius: 10rpx;
+  margin: 0 0 0 40rpx;
+}
+
+.mg4_iconNum1_1{
+  width: 6rpx;
+  height:12rpx;
+}
+.mg4_iconNum2_1{
+  width: 8rpx;
+  height:12rpx;
+}
+.mg4_iconNum4_1{
+  width: 10rpx;
+  height:12rpx;
+}
+
+.text4{
+  width:560rpx;
+  font-size: 22rpx;
+  font-weight: 400;
+  margin-left: 20rpx;
+}

pages/share/shareindex.wxml

@@ -61,7 +61,7 @@
 
       <view class="panel2201 panel22 FlexColumn" wx:if="{{IsYearReport}}">
         <image lazy-load="true" class="qmjl_main_pic_5" src="{{ImagePath}}web/qmjl_main_pic_5.png"></image>
-        <view class="panel2201text1">2022年度勤勉接力统计于2022年12月30日结束。去年，您一共接力——{{Info.ShareNumberYear}}次。（有疑问请微信私聊天乐）</view>  
+        <view class="panel2201text1">2022年度勤勉接力统计于2022年12月30日结束。去年，您一共接力——{{Info.ShareNumberYearPrev}}次。（有疑问请微信私聊天乐）</view>  
         
         <block wx:if="{{Info.Award>0}}">
         <text class="panel2201text2">恭喜您\n获得{{Info.Award}}天有效期奖励</text>  

pages/share/shareitem.js

@@ -162,6 +162,9 @@ Page({
 
     var url1 = that.data.Info.MilestoneImage;
     var url3 = app.globalData.userInfo.AvatarUrl;
+    if (url3=="../images/universalpic_face_default_blue_120x120.png")
+      url3="https://miaguo-1253256735.file.myqcloud.com/web/universalpic_face_default_blue_120x120.png";
+
     var _uid = common.Encrypt(app.globalData.userInfo.UserID);
     if (_uid.indexOf("/") >= 0)
       _uid = common.ReplaceAllString(_uid, "/", "___");
@@ -174,6 +177,9 @@ Page({
       wx.hideLoading();
     }, 20000);
 
+    // console.log(url1);
+    // console.log(url3);
+    // console.log(url4);
     main.DownloadFile(url1,0,function (tempFilePath1) {
       main.DownloadFile(url3,0,function (tempFilePath3) {
         main.DownloadFile(url4,0,function (tempFilePath4) {
@@ -262,6 +268,10 @@ Page({
     var url1 = that.data.Info.Image.replace("_b_", "_d_");
     var url2 = that.data.Info.WordImage;
     var url3 = app.globalData.userInfo.AvatarUrl;
+
+    if (url3=="../images/universalpic_face_default_blue_120x120.png")
+      url3="https://miaguo-1253256735.file.myqcloud.com/web/universalpic_face_default_blue_120x120.png";
+
     var _uid = common.Encrypt(app.globalData.userInfo.UserID);
     if (_uid.indexOf("/") >= 0)
       _uid = common.ReplaceAllString(_uid, "/", "___");
@@ -274,6 +284,11 @@ Page({
       wx.hideLoading();
     }, 20000);
 
+    // console.log(url1);
+    // console.log(url2);
+    // console.log(url3);
+    // console.log(url4);
+
     main.DownloadFile(url1,0,function (tempFilePath1) {
       main.DownloadFile(url2,0,function (tempFilePath2) {
         main.DownloadFile(url3,0,function (tempFilePath3) {

pages/template/Fan.wxml

@@ -6,7 +6,7 @@
       <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;">
+    <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;font-size:{{(FanSize-FanSize/FanScale)*0.5}}rpx;">
       <block wx:if="{{ShowNumber}}">{{ShowNumber}}</block>
     </view>
   </view>
@@ -20,7 +20,7 @@
       <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;">
+    <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;font-size:{{(FanSize2-FanSize2/FanScale2)*0.5}}rpx;">
       <block wx:if="{{ShowNumber2}}">{{ShowNumber2}}</block>
     </view>
   </view>

pages/template/Fan.wxss

@@ -25,6 +25,7 @@
   left: 14rpx;
   top: 14rpx;
   font-family: 'Roboto-Black';
+  text-align: center;
 }
 
 .sx1 {

pages/template/FanObject.js

@@ -20,12 +20,11 @@ var fanObject = {
       FanScale: fanScale,
       Color1: color1,
       Color2: color2,
-      ShowNumber: ShowNumber,
+      ShowNumber: ShowNumber.toString(),
     });
 
   },
   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) {
@@ -45,7 +44,7 @@ var fanObject = {
       FanScale2: fanScale2,
       Color12: color12,
       Color22: color22,
-      ShowNumber2: ShowNumber2,
+      ShowNumber2: ShowNumber2.toString(),
     });
 
   }

pages_test/test/index.js

@@ -31,7 +31,6 @@ Page({
       });
     });
 
-
     canPress = true;
   },
   onShow: function () {

project.private.config.json

@@ -12,7 +12,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=paycustom&PayUserID=1&DayNumber=365&Price=199&Remark=test",
+          "query": "type=tips",
           "launchMode": "default",
           "scene": 1007
         },
@@ -37,8 +37,8 @@
           "scene": null
         },
         {
-          "name": "pages/main/orderform",
-          "pathName": "pages/main/orderform",
+          "name": "pages/plan/taskFull",
+          "pathName": "pages/plan/taskFull",
           "query": "",
           "launchMode": "default",
           "scene": null
@@ -46,5 +46,6 @@
       ]
     }
   },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "libVersion": "2.28.1"
 }

utils/main.js

@@ -1230,7 +1230,7 @@ function getPinyinNormal(pinyin) {
 function getHanzi(callback) {
   var that = this;
   wx.showLoading({
-    title: '请稍候',
+    title: '资料更新',
     mask: true,
   });
 
@@ -1264,7 +1264,7 @@ function getServerSoundErrorArr(){
 function getEnglish(callback) {
   var that = this;
   wx.showLoading({
-    title: '请稍候',
+    title: '资料更新',
     mask: true,
   });
 
@@ -1300,7 +1300,9 @@ function getEnglish(callback) {
 function UploadUserConfig(callback) {
   var that = this;
   var param1 = {};
+  param1.TaskSetting = wx.getStorageSync("TaskSetting");
   param1.CardType = wx.getStorageSync("CardType");
+  param1.BasicCardLimit = wx.getStorageSync("BasicCardLimit");
   param1.CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
   param1.CardMaxNumberHistory = wx.getStorageSync("CardMaxNumberHistory");
   param1.CardMaxNumberNewUrgent = wx.getStorageSync("CardMaxNumberNewUrgent");
@@ -1351,19 +1353,21 @@ function getUserConfig() {
     if (data && !data.CardType)
       data.CardType = 0;
 
-    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);
-    wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
-    wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
-    wx.setStorageSync("FolderOrderStr", data.FolderOrder);
-    wx.setStorageSync("IsFolderPractice", data.IsFolderPractice);
-    wx.setStorageSync("IsAutoSound", data.IsAutoSound);
+      wx.setStorageSync("TaskSetting", data.TaskSetting);
+      wx.setStorageSync("CardType", data.CardType);
+      wx.setStorageSync("BasicCardLimit", data.BasicCardLimit);
+      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);
+      wx.setStorageSync("SecondConfigArray", data.SecondConfigArray.split(","));
+      wx.setStorageSync("ColorIndexArr", data.ColorIndexArr.split(","));
+      wx.setStorageSync("FolderOrderStr", data.FolderOrder);
+      wx.setStorageSync("IsFolderPractice", data.IsFolderPractice);
+      wx.setStorageSync("IsAutoSound", data.IsAutoSound);
 
     var symbol1 = [];
     if (data.SymbolList) {
@@ -1839,6 +1843,7 @@ function downloadFile(url,isShowLoading,callback){
       wx.hideLoading();
     }, 5000);
   }
+  //console.log(url);
   wx.downloadFile({
     url: url,
     success(resDownload) {