1.2.0

app.js

@@ -26,7 +26,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.34",
+    Version: "1.2.0",
     IsProduction: false,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",

app.json

@@ -1,16 +1,10 @@
 {
   "pages": [
     "pages/index/index",
-    "marketing/main/extenduser",
-    "marketing/main/shareuser",
-    "marketing/main/index",
     "pages/index/accredit",
-    "pages/main/recommend",
-    "pages/main/clicktype",
-    "pages/other/lesson",
-    "pages/main/colorplan",
     "pages/index/notice",
     "pages/index/openSetting",
+
     "pages/main/default",
     "pages/main/cardInfo",
     "pages/main/preview",
@@ -22,13 +16,26 @@
     "pages/main/searchWeb1",
     "pages/main/searchWeb",
     "pages/main/detail",
-    "pages/main/memoryLevel",
+    
+    "pages/plan/recommend",
+    "pages/plan/clicktype",
+    "pages/plan/colorplan",
+    "pages/plan/memoryLevel",
+    "pages/plan/taskLimit",
+    "pages/plan/sortRule",
+    "pages/plan/setting",
+    
+    "marketing/main/extenduser",
+    "marketing/main/shareuser",
+    "marketing/main/index",
+    
     "pages/other/lessonlist",
     "pages/other/userlist",
     "pages/other/binding",
     "pages/other/homework",
-    "pages/other/pay",
-    "pages/main/setting"
+    "pages/other/lesson",
+    "pages/other/pay"
+    
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",

marketing/main/extenduser.js

@@ -10,6 +10,13 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    var pageType = 0;
+    if (options.PageType == 1) {
+      pageType = 1;
+      wx.setNavigationBarTitle({
+        title: "奖励名单"
+      });
+    }
     this.setData({
       Containnerheight: main.getWindowHeight(),
       ArrMenu: [
@@ -19,6 +26,12 @@ Page({
       ],
       Filter1: ArrFilter1[0],
       Filter2: ArrFilter2[0],
+      ArrAward: [
+        { Name: "等待出账", Remark: "等待用户渡过7天退款期的名单",List:[] },
+        { Name: "出账", Remark: "已符合奖励条件的名单", List: [] },
+        { Name: "结算完成", Remark: "已发放奖励的名单", List: [] },
+      ],
+      PageType: pageType,
     });
     this.init();
   },
@@ -28,9 +41,33 @@ Page({
       wx.hideLoading();
       if (data) {
         AllList = data;
-        that.setData({
-          List: data,
-        });
+        if (that.data.PageType == 0) {
+          that.setData({
+            List: data,
+          });
+        }
+        else {
+          var sevenday = common.formatTime(common.addDate("d",-7,new Date()));
+          for (var i = 0; i < AllList.length; i++) {
+            if (AllList[i].IsPay == 1 && AllList[i].IsMember == 1){
+              var payTime = AllList[i].PayTime;
+              if (sevenday < payTime) {
+                that.data.ArrAward[0].List.push(AllList[i]);
+              }
+              else {
+                if (AllList[i].IsRebate == 0) {
+                  that.data.ArrAward[1].List.push(AllList[i]);
+                }
+                else {
+                  that.data.ArrAward[2].List.push(AllList[i]);
+                }
+              }
+            }
+          }
+          that.setData({
+            ArrAward: that.data.ArrAward,
+          });
+        }
       }
     });
   },
@@ -65,6 +102,10 @@ Page({
       Filter1: ArrFilter1[0],
       Filter2: ArrFilter2[0],
     });
+
+    wx.pageScrollTo({
+      scrollTop: 0,
+    });
   },
   filterData1: function (e) {
     var that = this;
@@ -96,10 +137,10 @@ Page({
         var list = [];
         for (var i = 0; i < AllList.length; i++) {
           if (res.tapIndex == 1) {
-            if (AllList[i].IsPay == 0)
+            if (AllList[i].IsPay == 0 && AllList[i].IsMember == 1)
               list.push(AllList[i]);
           }
-          else
+          else if (AllList[i].IsMember == 1)
             list.push(AllList[i]);
         }
 

marketing/main/extenduser.wxml

@@ -1,4 +1,5 @@
-<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+<!-- 推广名单 -->
+<view wx:if="{{PageType==0}}" class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexRow">
     <view class="panelTop1 FlexColumn" wx:for="{{ArrMenu}}" wx:key="*this" bindtap="changeMenu" data-id="{{index}}">
       <view class="panelTop11{{item.Selected}}">{{item.Name}}</view>
@@ -20,7 +21,7 @@
         <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
       </view>
     </view>
-    <view class="lineWidthAll FlexRow">
+    <view class="lineWidthAll FlexRow" wx:if="{{ArrMenu[2].Selected==0}}">
       <view class="lineWidth720"></view>
     </view>
     <view class="panel2 FlexRow">
@@ -29,16 +30,42 @@
     <view class="panel3 FlexColumn">
       <view class="panel31 FlexRow">
         <view class="panelUser FlexColumn" wx:if="{{ArrMenu[0].Selected==1}}">
-            <image src='../images/universalpic_add_gray_114x114.png' class="Avatar" />
-            <view class="NickName">去推荐</view>
+          <image src='../images/universalpic_add_gray_114x114.png' class="Avatar" />
+          <view class="NickName">去推荐</view>
         </view>
         <view class="panelUser FlexColumn" wx:for="{{List}}" wx:key="*this">
-            <image src='{{item.AvatarUrl}}' lazy-load="true" class="Avatar" />
-            <view class="NickName">{{item.NickName}}</view>
+          <image src='{{item.AvatarUrl}}' lazy-load="true" class="Avatar" />
+          <view class="NickName">{{item.NickName}}</view>
         </view>
       </view>
     </view>
     <view class="footer"></view>
   </view>
-  
+
+</view>
+
+<!-- 奖励名单 -->
+<view wx:if="{{PageType==1}}" class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  <block wx:for="{{ArrAward}}" wx:key="*this" wx:for-item="itemParent">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">{{itemParent.Name}}</view>
+      <view class="panelTitle2"></view>
+    </view>
+    <view class="panel0 FlexColumn">
+      <view class="panel4 FlexColumn">
+        <view class="panel21 left">{{itemParent.Remark}}人</view>
+        <view class="left">共{{itemParent.List.length}}人</view>
+      </view>
+      <view class="panel3 FlexColumn">
+        <view class="panel31 FlexRow">
+          <view class="panelUser FlexColumn" wx:for="{{itemParent.List}}" wx:key="*this">
+            <image src='{{item.AvatarUrl}}' lazy-load="true" class="Avatar" />
+            <view class="NickName">{{item.NickName}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </block>
+
+  <view class="footer"></view>
 </view>

marketing/main/extenduser.wxss

@@ -1,5 +1,8 @@
 .panelTop{
   width:100%;
+  position: fixed;
+  top:0;
+  border-bottom: 1rpx solid #d2d2d2;
 }
 
 .panelTop1{
@@ -35,7 +38,7 @@
 
 .panel{
   width:100%;
-  margin-top: 20rpx;
+  margin-top: 110rpx;
   background-color: #fff;
   justify-content: flex-start;
 }
@@ -47,7 +50,6 @@
   font-size:28rpx;
 }
 
-
 .left{
   margin-left: 30rpx;
 }
@@ -97,6 +99,35 @@
   margin-top: 10rpx;
 }
 
+.panelTitle{
+  width:100%;
+  justify-content: space-between;
+  background-color: #f0f0f0;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin: 50rpx 0 30rpx 30rpx;
+}
+
+.panel0{
+  width:100%;
+  background-color: #fff;
+  justify-content: flex-start;
+}
+
+.panel4{
+  width:100%;
+  align-items: flex-start;
+  font-weight: 400;
+  font-size:24rpx;
+  margin-top: 30rpx;
+}
+
+.panel21{
+  font-size:28rpx;
+}
+
+
 .footer{
   width:100%;
   height:100rpx;

marketing/main/index.js

@@ -11,9 +11,9 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
   },
-  gogoExtendUser: function(){
+  gogoExtendUser: function(e){
     wx.navigateTo({
-      url: './extenduser',
+      url: './extenduser?PageType='+e.currentTarget.dataset.id,
     });
   },
   gogoShareUser: function () {

marketing/main/index.wxml

@@ -1,9 +1,10 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
+  
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">推广</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow">
+  <!-- <view class="panelItem FlexRow">
     <view class="panelItem1">规则说明</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -11,7 +12,7 @@
   </view>
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
-  </view>
+  </view> -->
   <view class="panelItem FlexRow"  bindtap="gogoShareUser">
     <view class="panelItem1">我的宣传品</view>
     <view class="panelItem2 FlexRow">
@@ -21,7 +22,7 @@
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap="gogoExtendUser">
+  <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="0">
     <view class="panelItem1">推广名单</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -33,13 +34,13 @@
     <view class="panelTitle1">奖励</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow">
+  <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="1">
     <view class="panelItem1">奖励名单</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="lineWidthAll FlexRow">
+  <!-- <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
   <view class="panelItem FlexRow">
@@ -56,10 +57,10 @@
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
-  </view>
+  </view> -->
   <view class='lineFooter'></view>
 
-  <view class="panelTitle FlexRow">
+  <!-- <view class="panelTitle FlexRow">
     <view class="panelTitle1">辅助</view>
     <view class="panelTitle2"></view>
   </view>
@@ -69,6 +70,5 @@
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class='lineFooter'></view>
-
+  <view class='lineFooter'></view> -->
 </view>

marketing/main/index.wxss

@@ -52,4 +52,4 @@
   width:16rpx;
   height:26rpx;
   margin-left: 30rpx;
-}
+}

pages/index/index.js

@@ -214,11 +214,11 @@ Page({
           //测试
           //var url = '../../package4/main/giftcard?GiftID=89542&UserID=1';
           //var url = '../main/share';
-          var url = '../../marketing/main/index';
-          wx.redirectTo({
-            url: url,
-          });
-          return;
+          // var url = '../../marketing/main/index';
+          // wx.redirectTo({
+          //   url: url,
+          // });
+          // return;
 
 
           if (that.data.MiaoguoCardID) {

pages/main/default.js

@@ -135,7 +135,7 @@ Page({
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
-      url: './' + url,
+      url: url,
     })
   },
   //得到当天任务
@@ -152,11 +152,6 @@ Page({
       });
     });
   },
-  gotoCard: function () {
-    wx.redirectTo({
-      url: './searchCard',
-    })
-  },
   isNoSavedCard:function(){
     var that=this;
     //判断是否有未保存的卡

pages/main/default.wxml

@@ -1,15 +1,17 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
   <view class='panel1 FlexColumn'>
-    <view class='text1'>第{{DayNumber}}个使用日</view>
-    <view class='panel11 FlexRow' bindtap="goto" data-url="setting">
+    <view class='text1 FlexRow'>第<text class="text11">{{DayNumber}}</text>天</view>
+    <view class='text3' wx:if="{{TodayTaskNumber>0 && IsStart==0}}">剩余任务</view>
+    <view class='text3' wx:if="{{TodayTaskNumber>0 && IsStart==1}}">今天任务</view>
+    <view class='panel11 FlexRow' bindtap="goto" data-url="../plan/setting">
       <view class='universalpic_setup_gray_40x40'></view>
       <view class='text2'>{{TodayTaskNumber}}</view>
-      <image class="universalpic_setup_gray_40x40" src='../images/universalpic_setup_gray_40x40.png' />
+      <image class="universalpic_setup_white_50x50" src='../images/universalpic_setup_white_50x50.png' />
     </view>
   </view>
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/study_index_start.png' bindtap="goto" data-url="detail" />
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_goon.png' bindtap="goto" data-url="detail" />
-  <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_report.png' bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="study_index_start{{IsIPad}}" src='../images/study_index_start.png' bindtap="goto" data-url="./detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_goon.png' bindtap="goto" data-url="./detail" />
+  <image wx:if="{{TodayTaskNumber==0}}" class="study_index_start{{IsIPad}}" src='../images/study_index_report.png' bindtap="goto" data-url="./detail" />
 
   <view class='panelBottom FlexColumn'>
 
@@ -21,12 +23,12 @@
         <view class='text5'>学习</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
+      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="./add?type=add&id=0">
         <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
         <view>添加</view>
       </view>
       <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap='gotoCard'>
+      <view class='panelBottom11 FlexColumn' bindtap='goto'  data-url="./searchCard">
         <image class="program_tabbar_study_default" src='../images/program_tabbar_note_default.png' />
         <view>题卡</view>
       </view>

pages/main/default.wxss

@@ -4,13 +4,21 @@
 
 .panel1 {
   position: fixed;
-  top:120rpx;
+  top:100rpx;
   color: #fff;
 }
 
 .panel1 .text1 {
   font-size: 36rpx;
 }
+.panel1 .text11 {
+  font-size: 40rpx;
+  font-family: 'Roboto-Black';
+}
+.panel1 .text3 {
+  font-size: 28rpx;
+  margin-top: 10rpx;
+}
 
 .panel1 .text2 {
   font-family: 'Roboto-Black';
@@ -18,10 +26,14 @@
   margin: 0 10rpx;
 }
 
-.universalpic_setup_gray_40x40 {
-  width: 40rpx;
-  height: 40rpx;
-  margin-top: 75rpx;
+.panel1 .panel11{
+  margin-right: -50rpx;
+}
+
+.universalpic_setup_white_50x50 {
+  width: 50rpx;
+  height: 50rpx;
+  margin-top: 60rpx;
 }
 
 .study_index_start {

pages/main/setting.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "练习方案",
-  "backgroundColor": "#F0F0F0",
-  "enablePullDownRefresh": true
-}

pages/other/lessonlist.js

@@ -25,6 +25,11 @@ Page({
       url: '../other/userlist',
     });
   },
+  gotoMarketingUserList: function (e) {
+    wx.navigateTo({
+      url: '../../marketing/main/index',
+    });
+  },
   gotoCheckList: function(){
     var url = '../other/homework';
     if (this.data.CheckListUserID)

pages/other/lessonlist.wxml

@@ -16,6 +16,8 @@
   <view style='height:100rpx;'></view>
   <button bindtap='gotoUserList'>审核用户</button>
   <view style='height:100rpx;'></view>
+  <button bindtap='gotoMarketingUserList'>推广用户</button>
+  <view style='height:100rpx;'></view>
   <input class='input' maxlength='4' auto-focus bindinput="onKeyInput" value="{{CheckListUserID}}"  />
   <button bindtap='gotoCheckList'>CheckList</button>
 </view>

pages/main/setting.js

@@ -2,11 +2,10 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间较近的题卡"];
-const arrSortType2 = ["随机的", "较早的", "较近的"];
+const arrSortType = ["自由安排的", "到期时间较早的", "到期时间较近的"];
 const arrClickType = ["专属按钮", "点击空白", "两种方式"];
 var arrUserName = ["程晟涵", "临时"];
-var arrUserID = [2, 102];
+var arrUserID = [2, 662];
 
 Page({
   data: {
@@ -55,6 +54,9 @@ Page({
       isPay = false;
     }
 
+    var taskNumber = app.globalData.TaskToday.ListNew.length + app.globalData.TaskToday.ListReview.length + app.globalData.TaskToday.ListHistory.length;
+    var cardEveryTime = 1 + Math.round(app.globalData.TaskToday.CardEveryTime / 60 * taskNumber);
+    
     that.setData({
       Containnerheight: main.getWindowHeight(),
       CardNumber: that.data.CardNumber,
@@ -64,23 +66,11 @@ Page({
       ProductServiceTime: productServiceTime,
       IsPay: isPay,
       IsShow: app.globalData.IsShow,
+      TaskNumber: taskNumber,
+      CardEveryTime:cardEveryTime,
+      CardLimitTimeNumber: app.globalData.TaskToday.CardLimitTimeNumber,
     });
 
-    common.getStorageValue(this, "CardMaxNumberNew", 10, function () {
-      that.setData({
-        CardMaxNumberNewIndex: that.data.CardMaxNumberNew - 5,
-      });
-    });
-    common.getStorageValue(this, "CardMaxNumberHistory", 30, function () {
-      that.setData({
-        CardMaxNumberHistoryIndex: that.data.CardMaxNumberHistory - 5,
-      });
-    });
-    common.getStorageValue(this, "SortTypeIndex", 0, function () {
-      that.setData({
-        SortType: arrSortType2[that.data.SortTypeIndex],
-      });
-    });
     common.getStorageValue(this, "UserID", 1, function () {
       for (var i = 0; i < arrUserID.length; i++) {
         if (arrUserID[i] == that.data.UserID) {
@@ -101,6 +91,16 @@ Page({
   },
   onShow: function () {
     var that = this;
+    common.getStorageValue(this, "CardMaxNumberNew", 10, function () {
+    });
+    common.getStorageValue(this, "CardMaxNumberHistory", 30, function () {
+    });
+    common.getStorageValue(this, "SortTypeIndex", 0, function () {
+      that.setData({
+        SortType: arrSortType[that.data.SortTypeIndex],
+      });
+    });
+    
     var colorIndex = wx.getStorageSync("ColorIndexArr");
     if (!colorIndex || colorIndex.length > 1) {
       this.setData({
@@ -132,38 +132,9 @@ Page({
 
     this.getMemoryLevel();
   },
-  bindUpdateCardNumberNewMax: function (e) {
-    this.data.CardMaxNumberNewIndex = e.detail.value;
-    this.setData({
-      CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
-      CardMaxNumberNew: this.data.CardNumber[this.data.CardMaxNumberNewIndex],
-    });
-    wx.setStorageSync("CardMaxNumberNew", this.data.CardNumber[this.data.CardMaxNumberNewIndex]);
-    main.UploadUserConfig();
-  },
-  bindUpdateCardNumberHistoryMax: function (e) {
-    this.data.CardMaxNumberHistoryIndex = e.detail.value;
-    this.setData({
-      CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
-      CardMaxNumberHistory: this.data.CardNumber[this.data.CardMaxNumberHistoryIndex],
-    });
-    wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumber[this.data.CardMaxNumberHistoryIndex]);
-    main.UploadUserConfig();
-  },
   setSortType: function () {
-    var that = this;
-    wx.showActionSheet({
-      itemList: arrSortType,
-      success(res) {
-        that.setData({
-          SortType: arrSortType2[res.tapIndex],
-        });
-        wx.setStorageSync("SortTypeIndex", res.tapIndex);
-        main.UploadUserConfig();
-      },
-      fail(res) {
-        console.log(res.errMsg)
-      }
+    wx.navigateTo({
+      url: './sortRule',
     })
   },
   setSelectUser: function () {
@@ -235,6 +206,11 @@ Page({
       url: './recommend',
     })
   },
+  setTaskLimit: function () {
+    wx.navigateTo({
+      url: './taskLimit',
+    })
+  },
   gotoPay: function () {
     var payindex = 3;
     if (app.globalData.userInfo.IsFinishTask == 1)

pages/plan/setting.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarBackgroundColor": "#4EC3FF",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "练习方案",
+  "backgroundColor": "#F0F0F0",
+  "backgroundTextStyle":"dark",
+  "backgroundColorTop":"#4EC3FF",
+  "enablePullDownRefresh": true
+}

pages/main/setting.wxml

@@ -1,43 +1,57 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src='../images/study_plan_header.png' class="study_plan_header" />
+  <view class="panelTop FlexRow">
+    <view class="panelTop1">今天的学习任务</view>
+  </view>
+  <view class="panelTask FlexColumn">
+    <view class="panelTaskItem FlexRow">
+      <view class="panelTaskItem1">初始任务量</view>
+      <view class="panelTaskItem2">新{{CardMaxNumberNew}}张 旧{{CardMaxNumberHistory}}张 / 共{{CardMaxNumberNew+CardMaxNumberHistory}}张</view>
+    </view>
+    <view class="lineWidth7201 lineWidth720"></view>
+    <view class="panelTaskItem FlexRow">
+      <view class="panelTaskItem1">剩余任务量</view>
+      <view class="panelTaskItem2">{{TaskNumber}}张</view>
+    </view>
+    <view class="lineWidth7201 lineWidth720"></view>
+    <view class="panelTaskItem FlexRow">
+      <view class="panelTaskItem1 FlexRow">
+        <image src='../images/universalpic_bell_green_30x30.png' class="universalpic_bell_green_30x30" />
+        <view>全部做完可能用时</view>
+      </view>
+      <view class="panelTaskItem2">{{CardEveryTime}}分钟</view>
+    </view>
+    <view class="lineWidth670"></view>
+    <view class="panelTaskItem FlexRow">
+      <view class="panelTaskItem1 FlexRow">
+        <image src='../images/universalpic_file_green_30x30.png' class="universalpic_file_green_30x30" />
+        <view>到期题卡数量</view>
+        <image src='../images/universalpic_help_green_26x26.png' class="universalpic_help_green_26x26" />
+        
+      </view>
+      <view class="panelTaskItem2">{{CardLimitTimeNumber}}张</view>
+    </view>
+    <view class="lineWidthAll2 FlexRow">
+    </view>
+  </view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">任务量</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">新题卡数量上限</view>
+  <view class="panelItem FlexRow" bindtap='setTaskLimit'>
+    <view class="panelItem1">数量限制</view>
     <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumber}}">
-        <view class="picker">
-          {{CardMaxNumberNew}}张
-        </view>
-      </picker>
+      <view class="picker">
+        每天最多{{CardMaxNumberNew+CardMaxNumberHistory}}张
+      </view>
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">旧题卡数量上限</view>
-    <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumber}}">
-        <view class="picker">
-          {{CardMaxNumberHistory}}张
-        </view>
-      </picker>
-      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view>
-  <view class='lineFooter'></view>
-
-  <view class="panelEveryDay">每天{{CardMaxNumberNew+CardMaxNumberHistory}}张题卡</view>
-
-  <view class="panelTitle FlexRow">
-    <view class="panelTitle1">学习内容</view>
-    <view class="panelTitle2"></view>
-  </view>
   <view class="panelItem FlexRow" bindtap='setSortType'>
-    <view class="panelItem1">当到期题卡数大于任务量时优先安排</view>
+    <view class="panelItem1">优先规则</view>
     <view class="panelItem2 FlexRow">
       <view class="picker">
         {{SortType}}
@@ -73,7 +87,7 @@
   </view>
   <view class='lineFooter'></view>
   <view class="panelTitle FlexRow">
-    <view class="panelTitle1">辅助</view>
+    <view class="panelTitle1">辅助功能</view>
     <view class="panelTitle2"></view>
   </view>
   <view class="panelItem FlexRow" bindtap='setClickType'>
@@ -98,7 +112,7 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <view class="panelTitle FlexRow" wx:if="{{ChildUserID==0}}">
+  <!-- <view class="panelTitle FlexRow" wx:if="{{ChildUserID==0}}">
     <view class="panelTitle1">系统</view>
     <view class="panelTitle2"></view>
   </view>
@@ -113,15 +127,15 @@
   <view class="panelItem00 panelItem FlexRow" bindtap='updateMember'>
     重启小程序
   </view>
-  <view class='lineFooter'></view>
+  <view class='lineFooter'></view> -->
 
-  <view class='text2'>有效期 {{ProductServiceTime}}</view>
+  <!-- <view class='text2'>有效期 {{ProductServiceTime}}</view>
   <block wx:if="{{ChildUserID==0 && IsPay && IsShow}}">
     <view class="panelItem00 panelItem FlexRow" bindtap='gotoPay'>
       续费
     </view>
     <view class='lineFooter'></view>
-  </block>
+  </block> -->
 
   <view style='width:100%;height:100rpx;' bindtap='gotoPayTemp'></view>
   <text class='text1'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>

pages/main/setting.wxss

@@ -1,3 +1,64 @@
+.study_plan_header{
+  width:100%;
+  height: 180rpx;
+}
+.panelTop{
+  width:100%;
+  justify-content: flex-start;
+  height:105rpx;
+  background-color: #2B2F3A;
+}
+.panelTop1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  color:#F0F0F0;
+}
+
+
+.panelTask{
+  width:100%;
+  background-color: #228160;
+  color:#E3E3E3;
+  font-size:28rpx;
+  align-items: flex-end;
+}
+.panelTask .panelTaskItem{
+  width:720rpx;
+  height:101rpx;
+  justify-content: space-between;
+}
+.panelTask .panelTaskItem2{
+  margin-right: 30rpx;
+}
+.lineWidth7201{
+  background-color: #0E5433;
+}
+.lineWidth670{
+  width: 670rpx;
+  height: 1rpx;
+  background-color: #0E5433; 
+}
+.universalpic_bell_green_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin-right: 20rpx;
+}
+.universalpic_file_green_30x30{
+  width:30rpx;
+  height:28rpx;
+  margin-right: 20rpx;
+}
+.universalpic_help_green_26x26{
+  width:26rpx;
+  height:26rpx;
+  margin-left: 10rpx;
+}
+.lineWidthAll2{
+  width:100%;
+  height:20rpx;
+  background-color: #CA8770;
+}
+
 .panelTitle{
   width:100%;
   margin-top: 50rpx;
@@ -61,21 +122,6 @@
   text-align: center;
 }
 
-.panelEveryDay{
-  height:45rpx;
-  border-radius: 22rpx;
-  background-color: #fff;
-  border:1rpx solid #287BE8;
-  text-align: center;
-  line-height: 45rpx;
-  font-size:28rpx;
-  color:#0071EF;
-  align-self: flex-start;
-  margin: 30rpx 0 0 30rpx;
-  padding: 0 20rpx;
-}
-
-
 .text2{
   margin-top: 50rpx;
   font-size:24rpx;

pages/plan/sortRule.js

@@ -0,0 +1,76 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: [
+      {
+        Name: "自由安排",
+        Remark: "对时间早晚没有要求，交由系统根据学习情况安排。",
+        SelectedCSS: "",
+      },
+      {
+        Name: "优先安排到期时间较早的题卡",
+        Remark: "想优先做完以往积压的题卡可选此项。从到期时间较早的往较近的安排题卡。",
+        SelectedCSS: "",
+      },
+      {
+        Name: "优先安排到期时间较近的题卡",
+        Remark: "想优先做完近期添加的，和最适合当天回想的知识可选此项。从到期时间较近的（如当日）往积压较早的安排题卡。",
+        SelectedCSS: "",
+      },
+      
+    ],
+  },
+  onLoad: function (options) {
+    var that = this;
+
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    that.init();
+  },
+  init: function () {
+    var that = this;
+    common.getStorageValue(this, "SortTypeIndex", 0, function () {
+      
+      for (var i = 0; i < that.data.List.length; i++) {
+        if (i == that.data.SortTypeIndex)
+          that.data.List[i].SelectedCSS = "panelItemSelected";
+      }
+      that.setData({
+        List: that.data.List,
+      });
+    });
+  },
+  selectType: function (e) {
+    var that = this;
+    var index = e.currentTarget.dataset.index;
+    for (var i = 0; i < that.data.List.length; i++) {
+      that.data.List[i].SelectedCSS = "";
+      if (i == index) {
+        if (that.data.List[i].SelectedCSS == "")
+          that.data.List[i].SelectedCSS = "panelItemSelected";
+        else
+          that.data.List[i].SelectedCSS = "";
+      }
+    }
+
+    that.setData({
+      List: that.data.List,
+    });
+
+    wx.setStorageSync("SortTypeIndex", index);
+    main.UploadUserConfig();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/plan/sortRule.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "优先规则"
+}

pages/plan/sortRule.wxml

@@ -0,0 +1,37 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view style='height:20rpx'></view>
+  <view class="panelItem FlexColumn">
+    <view class="panelTitle0 panelTitle FlexRow">
+      <view class="panelTitle1">用途说明</view>
+    </view>
+    <text class="text2">当“到期题卡数量”大于“数量限制”时，一部分题卡将挪去下次练习；当下次练习开始时，可供练习的内容就包含了之前被积压的题卡和当日到期的题卡。那么，哪些题卡可以被优先放入任务量中呢？该功能就是起到选择“优先规则”的作用。
+    </text>
+    <view style="height:40rpx;"></view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">规则</view>
+  </view>
+  <view class="panelItem FlexColumn">
+    <view style="height:40rpx;"></view>
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="{{item.SelectedCSS}} panelSelected FlexRow" bindtap="selectType" data-index="{{index}}">
+        <view class='panelSelected0 FlexRow' hidden="{{!item.SelectedCSS}}">
+          <image src='../images/universalpic_checked_white_22x17.png' class="universalpic_checked_white_22x17" />
+        </view>
+        <view class='panelSelected00 panelSelected0' hidden="{{item.SelectedCSS}}">
+        </view>
+        <view class='panelSelected1 FlexColumn'>
+          <view class='text1'>{{item.Name}}</view>
+          <image wx:if="{{item.Image}}" src='../images/{{item.Image}}.png' class="{{item.Image}}" />
+          <view style="height:10rpx;" wx:if="{{!item.Image}}"></view>
+        </view>
+      </view>
+      <view class='Remark' wx:if="{{item.Remark}}">{{item.Remark}}</view>
+    </block>
+  </view>
+  
+  <view class='lineFooter'></view>
+  <view style='height:100rpx'></view>
+</view>

pages/plan/sortRule.wxss

@@ -0,0 +1,118 @@
+.panelTitle {
+  width: 100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+
+.panelTitle0 {
+  margin-top: 40rpx;
+}
+
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.text2{
+  font-size:24rpx;
+  font-weight: 400;
+  width:690rpx;
+}
+
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  min-height: 100rpx;
+  background-color: #fff;
+}
+
+.panelItem01 {
+  width: 100%;
+  line-height: 100rpx;
+  padding-left: 30rpx;
+  font-weight: 400;
+  border-radius: 10rpx;
+}
+
+.panelItem .panelItem1 {
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem2 {
+  width: 690rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+}
+
+.help_picture_clickshow_01 {
+  width: 688rpx;
+  height: 447rpx;
+  margin: 40rpx 0;
+}
+
+.panelSelected {
+  width: 690rpx;
+  border-radius: 10rpx;
+  border: 1rpx solid #9b9b9b;
+  margin-bottom: 30rpx;
+  justify-content: flex-start;
+}
+
+.panelSelected .panelSelected0 {
+  border-radius: 50%;
+  width: 40rpx;
+  height: 40rpx;
+  background-color: #0071ef;
+  border: 3rpx solid #0071ef;
+  margin-left: 30rpx;
+}
+
+.universalpic_checked_white_22x17 {
+  width: 22rpx;
+  height: 17rpx;
+}
+
+.panelSelected .panelSelected00 {
+  background-color: #f8f8f8;
+  border: 3rpx solid #d2d2d2;
+}
+
+.panelSelected .panelSelected1 {
+  align-items: flex-start;
+  margin-left: 20rpx;
+}
+
+.panelSelected .panelSelected11 {
+  justify-content: flex-start;
+}
+
+.panelSelected .panelSelected111 {
+  align-items: flex-start;
+  margin-right: 10rpx;
+}
+
+.panelSelected .text1 {
+  font-size: 28rpx;
+  font-weight: 400;
+  margin: 30rpx 0 20rpx 0;
+  color:#1e1e1e;
+}
+
+
+.panelItemSelected {
+  border: 5rpx solid #fff;
+  box-shadow: 0 0 0 3px #0071ef;
+}
+
+
+.Remark {
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #787878;
+  width: 690rpx;
+  margin: 0 0 30rpx 0;
+}

pages/plan/taskLimit.js

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

pages/plan/taskLimit.json

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

pages/plan/taskLimit.wxml

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

pages/plan/taskLimit.wxss

@@ -0,0 +1,54 @@
+.panelTitle {
+  width: 100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+
+.panelTitle0 {
+  margin-top: 40rpx;
+}
+
+.panelTitle .panelTitle1 {
+  font-size: 32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.text1{
+  font-size:24rpx;
+  font-weight: 400;
+  width:690rpx;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  min-height: 100rpx;
+  background-color: #fff;
+}
+
+
+.panelItem01 {
+  width: 100%;
+  line-height: 100rpx;
+  padding-left: 30rpx;
+  font-weight: 400;
+  border-radius: 10rpx;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}

project.config.json

@@ -11,10 +11,18 @@
 		"newFeature": true,
 		"autoAudits": false,
 		"uglifyFileName": false,
-		"checkInvalidKey": true
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"enhance": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.0.4",
+	"libVersion": "2.7.3",
 	"appid": "wx84b3feac6069eec3",
 	"projectname": "miaoguo_master",
 	"debugOptions": {
@@ -41,7 +49,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 3,
 			"list": [
 				{
 					"id": 0,
@@ -66,10 +74,17 @@
 				},
 				{
 					"id": 3,
-					"name": "临时",
-					"pathName": "pages/index/index",
-					"query": "UserID=1&Share=1&ColorIndex=0&MiaoguoCardID=36119",
+					"name": "pages/plan/sortRule",
+					"pathName": "pages/plan/sortRule",
+					"query": "",
 					"scene": 1001
+				},
+				{
+					"id": 4,
+					"name": "marketing/main/index",
+					"pathName": "marketing/main/index",
+					"query": "",
+					"scene": 1047
 				}
 			]
 		}

utils/main.js

@@ -1,5 +1,6 @@
 import common from '../utils/util';
 var app = getApp();
+var dataSendTimeout=0;
 
 function getData(url, callback) {
   if (!app.globalData.IsProduction)
@@ -653,9 +654,22 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
       title: '请稍候',
       mask: true,
     });
-    setTimeout(function () {
+    dataSendTimeout=setTimeout(function () {
       wx.hideLoading();
-    }, 10000);
+      wx.showModal({
+        title: '提醒',
+        showCancel: false,
+        content: "服务器有点繁忙，数据获取可能不及时，请关闭小程序稍候再试！",
+        confirmText: "知道了",
+        success(res) {
+          if (res.confirm) {
+            wx.reLaunch({
+              url: '../index/index',
+            })
+          }
+        },
+      });
+    }, 30000);
   }
   var list = wx.getStorageSync("ListTaskFinished");
   if (list && list.length > 0) {
@@ -676,6 +690,7 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
     }, function (data) {
       if (isShowLoading) {
         wx.hideLoading();
+        clearTimeout(dataSendTimeout);
       }
       if (data) {
         wx.removeStorageSync("ListTaskFinished");
@@ -686,6 +701,8 @@ function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
     });
   }
   else {
+    wx.hideLoading();
+    clearTimeout(dataSendTimeout);
     if (callback) {
       callback();
     }