2.3.64

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.61",
+    Version: "2.3.64",
     //IsProduction: true,
     IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
@@ -42,7 +42,6 @@ App({
     SearchItem: {},//资料搜索项信息，用于资料搜索时用
     TempFieldNumber: 0,//资料搜索时的段落编号
     TempSearchBackNumber: 3,//资料搜索时返回的页面数
-    IsShowSettingRemind: 3,//首页显示设置提醒日期限制
     TempStr:"",//临时字符串。用于不能传递的一些参数
     TempStr2:"",//临时字符串。用于不能传递的一些参数
     FolderList:[],//卡单列表

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    
     "pages/plan/taskBasic",
     "pages/plan/taskHelp",
     "pages/plan/taskFull",

pages/index/index.js

@@ -260,6 +260,8 @@ Page({
         else {
           app.globalData.userInfo = data;
 
+          //debugger;
+
           var isShow = data.IsShow;
           if (isShow == -1) {
             isShow = 0;

pages/index/test.js

@@ -1,54 +1,116 @@
+var wxCharts = require('../template/wxcharts-min.js');
+
+var ringChart = null;
+
 Page({
   data: {
-   navbarInitTop: 0, //导航栏初始化距顶部的距离
-   isFixedTop: false, //是否固定顶部
+    navbarInitTop: 0, //导航栏初始化距顶部的距离
+    isFixedTop: false, //是否固定顶部
   },
-  
+
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
-  
+  onLoad: function (options) {
+
   },
-  
+
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
-   var that = this;
-  
-   if (that.data.navbarInitTop == 0) {
-  
-    //获取节点距离顶部的距离
-    wx.createSelectorQuery().select('#navbar').boundingClientRect(function(rect) {
-     if (rect && rect.top > 0) {
-      var navbarInitTop = parseInt(rect.top);
-      that.setData({
-       navbarInitTop: navbarInitTop
-      });
-     }
-    }).exec();
-  
-   }
+  onShow: function () {
+    var that = this;
+
+    if (that.data.navbarInitTop == 0) {
+
+      //获取节点距离顶部的距离
+      wx.createSelectorQuery().select('#navbar').boundingClientRect(function (rect) {
+        if (rect && rect.top > 0) {
+          var navbarInitTop = parseInt(rect.top);
+          that.setData({
+            navbarInitTop: navbarInitTop
+          });
+        }
+      }).exec();
+
+    }
   },
-  
+
   /**
    * 监听页面滑动事件
    */
-  onPageScroll: function(e) {
-   var that = this;
-   var scrollTop = parseInt(e.scrollTop); //滚动条距离顶部高度
-  
-   //判断'滚动条'滚动的距离 和 '元素在初始时'距顶部的距离进行判断
-   var isSatisfy = scrollTop >= that.data.navbarInitTop ? true : false;
-   //为了防止不停的setData, 这儿做了一个等式判断。 只有处于吸顶的临界值才会不相等
-   if (that.data.isFixedTop === isSatisfy) {
-    return false;
-   }
-  
-   that.setData({
-    isFixedTop: isSatisfy
-   });
+  onPageScroll: function (e) {
+    var that = this;
+    var scrollTop = parseInt(e.scrollTop); //滚动条距离顶部高度
+
+    //判断'滚动条'滚动的距离 和 '元素在初始时'距顶部的距离进行判断
+    var isSatisfy = scrollTop >= that.data.navbarInitTop ? true : false;
+    //为了防止不停的setData, 这儿做了一个等式判断。 只有处于吸顶的临界值才会不相等
+    if (that.data.isFixedTop === isSatisfy) {
+      return false;
+    }
+
+    that.setData({
+      isFixedTop: isSatisfy
+    });
+  },
+
+  touchHandler: function (e) {
+    console.log(ringChart.getCurrentDataIndex(e));
+  },
+  updateData: function () {
+    ringChart.updateData({
+      title: {
+        name: '80%'
+      },
+      subtitle: {
+        color: '#ff0000'
+      }
+    });
+  },
+  onReady: function (e) {
+    
+
+    ringChart = new wxCharts({
+      animation: false,
+      canvasId: 'ringCanvas',
+      type: 'ring',
+      extra: {
+        ringWidth: 8,
+        pie: {
+          offsetAngle: -90
+        }
+      },
+      title: {
+        name: '70',
+        color: '#000',
+        fontSize: 16
+      },
+      subtitle: {
+      },
+      series: [{
+        name: '',
+        data: 15,
+        stroke: false
+      }, {
+        name: '',
+        data: 35,
+        stroke: false
+      }],
+      disablePieStroke: true,
+      width: 100,
+      height: 100,
+      dataLabel: false,
+      legend: false,
+      background: '#f5f5f5',
+      padding: 0,
+      yAxisWidth: 0,
+      yAxisSplit: 0,
+      xAxisHeight: 0,
+      xAxisLineHeight: 0,
+      legendHeight: 0,
+      yAxisTitleWidth: 0,
+    });
+    
   }
- })
- 
+})

pages/index/test.wxml

@@ -1,4 +1,7 @@
-<view style="width: 90%; height: 300rpx; background: #f0f0f0; margin: 30rpx auto;"></view>
+
+<view style="width: 90%; height: 300rpx; background: #f0f0f0; margin: 30rpx auto;">
+  <canvas canvas-id="ringCanvas" class="canvas" bindtouchstart="touchHandler"></canvas>
+</view>
 <view class="navbar-wrap">
  <view class="column {{isFixedTop?'fixed':''}}" id="navbar">
   <view class="block active">新品推荐</view>

pages/index/test.wxss

@@ -27,4 +27,8 @@ view, text {
 
   border-bottom: solid 1rpx #1e1e1e;
  }
-  
+  
+ .canvas{
+   width:160rpx;
+   height:160rpx;
+ }

pages/main/cardmain.js

@@ -24,13 +24,13 @@ Page({
       IsShow: isshow,
     });
 
-    var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
-    //console.log(year);
-    if (new Date().getFullYear()>=2023 && year<2023){
-      that.setData({
-        IsYearReport: true,
-      });
-    }
+    // var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
+    // //console.log(year);
+    // if (new Date().getFullYear()>=2023 && year<2023){
+    //   that.setData({
+    //     IsYearReport: true,
+    //   });
+    // }
 
     canPress=true;
 

pages/main/default.js

@@ -56,6 +56,8 @@ Page({
   },
   onShow: function () {
     var that = this;
+    //debugger;
+
     if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser == 1 && app.globalData.userInfo.isShow == 1) {
       if (app.globalData.userInfo.Subscribe == 0) {
         wx.navigateTo({
@@ -202,10 +204,6 @@ Page({
         wx.setStorageSync("IsShowMarketingTime", common.formatTime(common.addDate("d", 30, new Date())));
       }
 
-      if (url == "../plan/studyplan" && this.data.DayNumber <= app.globalData.IsShowSettingRemind) {
-        wx.setStorageSync('IsShowSettingRemind', this.data.DayNumber);
-      }
-
       canPress=false;
       //console.log("canPress:"+canPress);
       setTimeout(function(){
@@ -237,22 +235,6 @@ Page({
             IsStart: data.IsStart,
           });
 
-
-
-          //是否显示提示任务量设置
-          if (that.data.DayNumber <= app.globalData.IsShowSettingRemind) {
-            var IsShowSettingRemind = wx.getStorageSync("IsShowSettingRemind");
-            if (!IsShowSettingRemind || IsShowSettingRemind < that.data.DayNumber) {
-              that.setData({
-                IsShowSettingRemind: 1,
-              });
-            } else {
-              that.setData({
-                IsShowSettingRemind: 0,
-              });
-            }
-          }
-
           //判断是否出现推广广告
           common.getStorageValue(that, "IsShowMarketingTime", "2020-01-01 00:00:00", function () {
             if (that.data.IsShowMarketingTime < common.formatTime(new Date())) {

pages/main/default.wxml

@@ -16,7 +16,6 @@
     <image class="icon_nextpage_2" src="../images/icon_nextpage_2.png" ></image>
   </view>
 
-  <image class="message_practise_index_01{{IsIPad}}" src='../images/message_practise_index_01.png' wx:if="{{IsShowSettingRemind}}" />
   <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/practise_index_start.png' bindtap="goto" data-url="./detail?CardType={{CardType}}" />
   <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}}" />

pages/main/default.wxss

@@ -41,19 +41,6 @@ page{
   margin-top: 60rpx;
 }
 
-.message_practise_index_01{
-  width: 460rpx;
-  height: 143rpx;
-  position: fixed;
-  top:374rpx;
-}
-
-.message_practise_index_01_iPad{
-  width: 460rpx;
-  height: 143rpx;
-  position: fixed;
-  top:270rpx;
-}
 
 .study_index_start {
   width: 480rpx;

pages/main/detail.js

@@ -979,7 +979,7 @@ Page({
             title: '提醒',
             showCancel: false,
             confirmText: '知道了',
-            content: "也许您已经发现「报告」上的数据有些异样。这是由于本次练习从昨天开始到今天结束，发生了「跨天」的情况。虽然报告内容不够正确，但练习数据不会受到影响，这个问题将在日后得到改善。请不用担心。"
+            content: "也许您已经发现「报告」上的数据有些异样。这可能是由于本次练习从昨天开始到今天结束，发生了「跨天」的情况，也可能是其他异常情况。虽然报告内容不够正确，但练习数据不会受到影响，这个问题将在日后得到改善。请不用担心。"
           });
         }
       }
@@ -1464,6 +1464,9 @@ Page({
     }
     timeoutEveryCard=[];
   },
+  resetTodayTask:function(){
+    main.ResetTodayTask();
+  },
   //获取导航栏高度
   getBarInfo(e) {
     var h = e.detail.topBarHeight;

pages/main/detail.wxml

@@ -216,10 +216,10 @@
           </view>
         </view>
       </view>
-      <view class="panelLastTime4 FlexRow" catchtap="goto" data-url="../plan/setting?Type=ShowReset">
+      <view class="panelLastTime4 FlexRow" catchtap="resetTodayTask" >
         <view class="panelLastTime41 FlexRow">
           <image src="../images/icon_reload_1.png" class='icon_reload_1' />
-          <view>重置今天的任务量</view>
+          <view>重置今天的任务</view>
         </view>
         <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
       </view>

pages/plan/studyplandetail.js

@@ -115,7 +115,7 @@ Page({
           CardMaxNumberNewIndex: that.data.CardMaxNumberNew,
         });
       });
-      common.getStorageValue(that, "CardMaxNumberHistory", 100, function () {
+      common.getStorageValue(that, "CardMaxNumberHistory", 40, function () {
         that.setData({
           CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - historyLimitMax,
         });
@@ -132,7 +132,7 @@ Page({
           CardMaxNumberNewIndex: that.data.CardMaxNumberNewUrgent,
         });
       });
-      common.getStorageValue(that, "CardMaxNumberHistoryUrgent", 100, function () {
+      common.getStorageValue(that, "CardMaxNumberHistoryUrgent", 40, function () {
         that.setData({
           CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistoryUrgent - historyLimitMax,
         });

pages/plan/taskBasic.js

@@ -61,7 +61,7 @@ Page({
 
     wx.showLoading();
     common.getStorageValue(that, "CardMaxNumberNew", 10, function () {
-      common.getStorageValue(that, "CardMaxNumberHistory", 100, function () {
+      common.getStorageValue(that, "CardMaxNumberHistory", 40, function () {
         common.getStorageValue(that, "BasicCardLimit", 0, function () {
           var basicCardLimit=that.data.BasicCardLimit;
           if (!basicCardLimit)

pages/plan/taskBasic.wxss

@@ -430,4 +430,10 @@ page {
 .mg4_iconNext_1{
   width:14rpx;
   height:20rpx;
+}
+
+.canvas{
+  width:100rpx;
+  height:100rpx;
+  margin: -1rpx 0 0 -1rpx;
 }

project.private.config.json

@@ -37,8 +37,8 @@
           "scene": null
         },
         {
-          "name": "pages/plan/taskFull",
-          "pathName": "pages/plan/taskFull",
+          "name": "pages/index/test",
+          "pathName": "pages/index/test",
           "query": "",
           "launchMode": "default",
           "scene": null